[kubernetes] Bump to upstream c6158b8aa9c40fbf1732650a8611429536466b21
Eric Paris
eparis at fedoraproject.org
Thu Nov 20 19:46:44 UTC 2014
commit 45b1935f75da42315465aad8e0baff5b91233e10
Author: Eric Paris <eparis at redhat.com>
Date: Thu Nov 20 14:46:07 2014 -0500
Bump to upstream c6158b8aa9c40fbf1732650a8611429536466b21
.gitignore | 1 +
0001-remove-all-third-party-software.patch |200128 ++++++++++----------
...ode.google.com-p-go.net-until-fedora-pack.patch | 82 +
kubernetes.spec | 10 +-
sources | 2 +-
5 files changed, 100243 insertions(+), 99980 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 961932a..ab944ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@
/kubernetes-6c70227.tar.gz
/kubernetes-30fcf24.tar.gz
/kubernetes-df0981b.tar.gz
+/kubernetes-c6158b8.tar.gz
diff --git a/0001-remove-all-third-party-software.patch b/0001-remove-all-third-party-software.patch
index 9643a8b..7660ddf 100644
--- a/0001-remove-all-third-party-software.patch
+++ b/0001-remove-all-third-party-software.patch
@@ -1,7 +1,7 @@
-From 109161045357de04185fb88b3ae9fcd38b401872 Mon Sep 17 00:00:00 2001
+From 7f8761307ff8962ac1e7f548485ff748f8a3e9a1 Mon Sep 17 00:00:00 2001
From: Eric Paris <eparis at redhat.com>
Date: Thu, 21 Aug 2014 13:55:27 -0400
-Subject: [PATCH] remove all third party software
+Subject: [PATCH 1/2] remove all third party software
---
Godeps/Godeps.json | 158 -
@@ -47,102 +47,6 @@ Subject: [PATCH] remove all third party software
.../code.google.com/p/go-uuid/uuid/uuid_test.go | 390 -
.../src/code.google.com/p/go-uuid/uuid/version1.go | 41 -
.../src/code.google.com/p/go-uuid/uuid/version4.go | 25 -
- .../code.google.com/p/go.net/context/context.go | 431 -
- .../p/go.net/context/context_test.go | 553 -
- .../p/go.net/context/withtimeout_test.go | 26 -
- .../src/code.google.com/p/go.net/html/atom/atom.go | 78 -
- .../p/go.net/html/atom/atom_test.go | 109 -
- .../src/code.google.com/p/go.net/html/atom/gen.go | 636 -
- .../code.google.com/p/go.net/html/atom/table.go | 694 -
- .../p/go.net/html/atom/table_test.go | 341 -
- .../p/go.net/html/charset/charset.go | 227 -
- .../p/go.net/html/charset/charset_test.go | 200 -
- .../code.google.com/p/go.net/html/charset/gen.go | 107 -
- .../code.google.com/p/go.net/html/charset/table.go | 235 -
- .../go.net/html/charset/testdata/HTTP-charset.html | 48 -
- .../html/charset/testdata/HTTP-vs-UTF-8-BOM.html | 48 -
- .../charset/testdata/HTTP-vs-meta-charset.html | 49 -
- .../charset/testdata/HTTP-vs-meta-content.html | 49 -
- .../charset/testdata/No-encoding-declaration.html | 47 -
- .../p/go.net/html/charset/testdata/README | 1 -
- .../go.net/html/charset/testdata/UTF-16BE-BOM.html | Bin 2670 -> 0 bytes
- .../go.net/html/charset/testdata/UTF-16LE-BOM.html | Bin 2682 -> 0 bytes
- .../testdata/UTF-8-BOM-vs-meta-charset.html | 49 -
- .../testdata/UTF-8-BOM-vs-meta-content.html | 48 -
- .../charset/testdata/meta-charset-attribute.html | 48 -
- .../charset/testdata/meta-content-attribute.html | 48 -
- .../src/code.google.com/p/go.net/html/const.go | 100 -
- .../src/code.google.com/p/go.net/html/doc.go | 106 -
- .../src/code.google.com/p/go.net/html/doctype.go | 156 -
- .../src/code.google.com/p/go.net/html/entity.go | 2253 ---
- .../code.google.com/p/go.net/html/entity_test.go | 29 -
- .../src/code.google.com/p/go.net/html/escape.go | 258 -
- .../code.google.com/p/go.net/html/escape_test.go | 97 -
- .../code.google.com/p/go.net/html/example_test.go | 40 -
- .../src/code.google.com/p/go.net/html/foreign.go | 226 -
- .../src/code.google.com/p/go.net/html/node.go | 193 -
- .../src/code.google.com/p/go.net/html/node_test.go | 146 -
- .../src/code.google.com/p/go.net/html/parse.go | 2092 ---
- .../code.google.com/p/go.net/html/parse_test.go | 388 -
- .../src/code.google.com/p/go.net/html/render.go | 271 -
- .../code.google.com/p/go.net/html/render_test.go | 156 -
- .../p/go.net/html/testdata/go1.html | 2237 ---
- .../p/go.net/html/testdata/webkit/README | 28 -
- .../p/go.net/html/testdata/webkit/adoption01.dat | 194 -
- .../p/go.net/html/testdata/webkit/adoption02.dat | 31 -
- .../p/go.net/html/testdata/webkit/comments01.dat | 135 -
- .../p/go.net/html/testdata/webkit/doctype01.dat | 370 -
- .../p/go.net/html/testdata/webkit/entities01.dat | 603 -
- .../p/go.net/html/testdata/webkit/entities02.dat | 249 -
- .../go.net/html/testdata/webkit/html5test-com.dat | 246 -
- .../p/go.net/html/testdata/webkit/inbody01.dat | 43 -
- .../p/go.net/html/testdata/webkit/isindex.dat | 40 -
- .../pending-spec-changes-plain-text-unsafe.dat | Bin 115 -> 0 bytes
- .../html/testdata/webkit/pending-spec-changes.dat | 52 -
- .../html/testdata/webkit/plain-text-unsafe.dat | Bin 4166 -> 0 bytes
- .../p/go.net/html/testdata/webkit/scriptdata01.dat | 308 -
- .../html/testdata/webkit/scripted/adoption01.dat | 15 -
- .../html/testdata/webkit/scripted/webkit01.dat | 28 -
- .../p/go.net/html/testdata/webkit/tables01.dat | 212 -
- .../p/go.net/html/testdata/webkit/tests1.dat | 1952 ---
- .../p/go.net/html/testdata/webkit/tests10.dat | 799 -
- .../p/go.net/html/testdata/webkit/tests11.dat | 482 -
- .../p/go.net/html/testdata/webkit/tests12.dat | 62 -
- .../p/go.net/html/testdata/webkit/tests14.dat | 74 -
- .../p/go.net/html/testdata/webkit/tests15.dat | 208 -
- .../p/go.net/html/testdata/webkit/tests16.dat | 2299 ---
- .../p/go.net/html/testdata/webkit/tests17.dat | 153 -
- .../p/go.net/html/testdata/webkit/tests18.dat | 269 -
- .../p/go.net/html/testdata/webkit/tests19.dat | 1237 --
- .../p/go.net/html/testdata/webkit/tests2.dat | 763 -
- .../p/go.net/html/testdata/webkit/tests20.dat | 455 -
- .../p/go.net/html/testdata/webkit/tests21.dat | 221 -
- .../p/go.net/html/testdata/webkit/tests22.dat | 157 -
- .../p/go.net/html/testdata/webkit/tests23.dat | 155 -
- .../p/go.net/html/testdata/webkit/tests24.dat | 79 -
- .../p/go.net/html/testdata/webkit/tests25.dat | 219 -
- .../p/go.net/html/testdata/webkit/tests26.dat | 313 -
- .../p/go.net/html/testdata/webkit/tests3.dat | 305 -
- .../p/go.net/html/testdata/webkit/tests4.dat | 59 -
- .../p/go.net/html/testdata/webkit/tests5.dat | 191 -
- .../p/go.net/html/testdata/webkit/tests6.dat | 663 -
- .../p/go.net/html/testdata/webkit/tests7.dat | 390 -
- .../p/go.net/html/testdata/webkit/tests8.dat | 148 -
- .../p/go.net/html/testdata/webkit/tests9.dat | 457 -
- .../html/testdata/webkit/tests_innerHTML_1.dat | 741 -
- .../p/go.net/html/testdata/webkit/tricky01.dat | 261 -
- .../p/go.net/html/testdata/webkit/webkit01.dat | 610 -
- .../p/go.net/html/testdata/webkit/webkit02.dat | 159 -
- .../src/code.google.com/p/go.net/html/token.go | 1219 --
- .../code.google.com/p/go.net/html/token_test.go | 748 -
- .../code.google.com/p/go.net/websocket/client.go | 98 -
- .../p/go.net/websocket/exampledial_test.go | 31 -
- .../p/go.net/websocket/examplehandler_test.go | 26 -
- .../src/code.google.com/p/go.net/websocket/hybi.go | 564 -
- .../p/go.net/websocket/hybi_test.go | 590 -
- .../code.google.com/p/go.net/websocket/server.go | 114 -
- .../p/go.net/websocket/websocket.go | 411 -
- .../p/go.net/websocket/websocket_test.go | 341 -
.../compute/serviceaccount/serviceaccount.go | 172 -
.../p/goauth2/oauth/example/oauthreq.go | 100 -
.../oauth/jwt/example/example.client_secrets.json | 1 -
@@ -201,7 +105,7 @@ Subject: [PATCH] remove all third party software
.../elazarl/go-bindata-assetfs/assetfs.go | 141 -
.../github.com/elazarl/go-bindata-assetfs/doc.go | 13 -
.../src/github.com/emicklei/go-restful/.gitignore | 70 -
- .../src/github.com/emicklei/go-restful/CHANGES.md | 121 -
+ .../src/github.com/emicklei/go-restful/CHANGES.md | 127 -
.../src/github.com/emicklei/go-restful/LICENSE | 22 -
.../src/github.com/emicklei/go-restful/README.md | 70 -
.../src/github.com/emicklei/go-restful/Srcfile | 1 -
@@ -269,16 +173,18 @@ Subject: [PATCH] remove all third party software
.../github.com/emicklei/go-restful/route_test.go | 108 -
.../src/github.com/emicklei/go-restful/router.go | 18 -
.../emicklei/go-restful/service_error.go | 23 -
- .../emicklei/go-restful/swagger/CHANGES.md | 19 -
+ .../emicklei/go-restful/swagger/CHANGES.md | 27 -
.../emicklei/go-restful/swagger/README.md | 28 -
.../emicklei/go-restful/swagger/config.go | 25 -
- .../emicklei/go-restful/swagger/model_builder.go | 265 -
- .../go-restful/swagger/model_builder_test.go | 716 -
+ .../emicklei/go-restful/swagger/model_builder.go | 277 -
+ .../go-restful/swagger/model_builder_test.go | 729 -
+ .../emicklei/go-restful/swagger/param_sorter.go | 29 -
+ .../go-restful/swagger/param_sorter_test.go | 52 -
.../emicklei/go-restful/swagger/swagger.go | 184 -
- .../emicklei/go-restful/swagger/swagger_test.go | 115 -
- .../go-restful/swagger/swagger_webservice.go | 349 -
+ .../emicklei/go-restful/swagger/swagger_test.go | 116 -
+ .../go-restful/swagger/swagger_webservice.go | 353 -
.../emicklei/go-restful/swagger/utils_test.go | 70 -
- .../github.com/emicklei/go-restful/web_service.go | 184 -
+ .../github.com/emicklei/go-restful/web_service.go | 194 -
.../emicklei/go-restful/web_service_container.go | 39 -
.../emicklei/go-restful/web_service_test.go | 115 -
.../github.com/fsouza/go-dockerclient/.travis.yml | 13 -
@@ -521,6 +427,102 @@ Subject: [PATCH] remove all third party software
.../github.com/vaughan0/go-ini/ini_linux_test.go | 43 -
.../src/github.com/vaughan0/go-ini/ini_test.go | 89 -
.../src/github.com/vaughan0/go-ini/test.ini | 2 -
+ .../src/golang.org/x/net/context/context.go | 432 -
+ .../src/golang.org/x/net/context/context_test.go | 553 -
+ .../golang.org/x/net/context/withtimeout_test.go | 26 -
+ .../src/golang.org/x/net/html/atom/atom.go | 78 -
+ .../src/golang.org/x/net/html/atom/atom_test.go | 109 -
+ .../src/golang.org/x/net/html/atom/gen.go | 636 -
+ .../src/golang.org/x/net/html/atom/table.go | 694 -
+ .../src/golang.org/x/net/html/atom/table_test.go | 341 -
+ .../src/golang.org/x/net/html/charset/charset.go | 231 -
+ .../golang.org/x/net/html/charset/charset_test.go | 215 -
+ .../src/golang.org/x/net/html/charset/gen.go | 111 -
+ .../src/golang.org/x/net/html/charset/table.go | 235 -
+ .../x/net/html/charset/testdata/HTTP-charset.html | 48 -
+ .../html/charset/testdata/HTTP-vs-UTF-8-BOM.html | 48 -
+ .../charset/testdata/HTTP-vs-meta-charset.html | 49 -
+ .../charset/testdata/HTTP-vs-meta-content.html | 49 -
+ .../charset/testdata/No-encoding-declaration.html | 47 -
+ .../golang.org/x/net/html/charset/testdata/README | 1 -
+ .../x/net/html/charset/testdata/UTF-16BE-BOM.html | Bin 2670 -> 0 bytes
+ .../x/net/html/charset/testdata/UTF-16LE-BOM.html | Bin 2682 -> 0 bytes
+ .../testdata/UTF-8-BOM-vs-meta-charset.html | 49 -
+ .../testdata/UTF-8-BOM-vs-meta-content.html | 48 -
+ .../charset/testdata/meta-charset-attribute.html | 48 -
+ .../charset/testdata/meta-content-attribute.html | 48 -
+ .../_workspace/src/golang.org/x/net/html/const.go | 100 -
+ Godeps/_workspace/src/golang.org/x/net/html/doc.go | 106 -
+ .../src/golang.org/x/net/html/doctype.go | 156 -
+ .../_workspace/src/golang.org/x/net/html/entity.go | 2253 ---
+ .../src/golang.org/x/net/html/entity_test.go | 29 -
+ .../_workspace/src/golang.org/x/net/html/escape.go | 258 -
+ .../src/golang.org/x/net/html/escape_test.go | 97 -
+ .../src/golang.org/x/net/html/example_test.go | 40 -
+ .../src/golang.org/x/net/html/foreign.go | 226 -
+ .../_workspace/src/golang.org/x/net/html/node.go | 193 -
+ .../src/golang.org/x/net/html/node_test.go | 146 -
+ .../_workspace/src/golang.org/x/net/html/parse.go | 2092 ---
+ .../src/golang.org/x/net/html/parse_test.go | 388 -
+ .../_workspace/src/golang.org/x/net/html/render.go | 271 -
+ .../src/golang.org/x/net/html/render_test.go | 156 -
+ .../src/golang.org/x/net/html/testdata/go1.html | 2237 ---
+ .../golang.org/x/net/html/testdata/webkit/README | 28 -
+ .../x/net/html/testdata/webkit/adoption01.dat | 194 -
+ .../x/net/html/testdata/webkit/adoption02.dat | 31 -
+ .../x/net/html/testdata/webkit/comments01.dat | 135 -
+ .../x/net/html/testdata/webkit/doctype01.dat | 370 -
+ .../x/net/html/testdata/webkit/entities01.dat | 603 -
+ .../x/net/html/testdata/webkit/entities02.dat | 249 -
+ .../x/net/html/testdata/webkit/html5test-com.dat | 246 -
+ .../x/net/html/testdata/webkit/inbody01.dat | 43 -
+ .../x/net/html/testdata/webkit/isindex.dat | 40 -
+ .../pending-spec-changes-plain-text-unsafe.dat | Bin 115 -> 0 bytes
+ .../html/testdata/webkit/pending-spec-changes.dat | 52 -
+ .../net/html/testdata/webkit/plain-text-unsafe.dat | Bin 4166 -> 0 bytes
+ .../x/net/html/testdata/webkit/scriptdata01.dat | 308 -
+ .../html/testdata/webkit/scripted/adoption01.dat | 15 -
+ .../net/html/testdata/webkit/scripted/webkit01.dat | 28 -
+ .../x/net/html/testdata/webkit/tables01.dat | 212 -
+ .../x/net/html/testdata/webkit/tests1.dat | 1952 ---
+ .../x/net/html/testdata/webkit/tests10.dat | 799 -
+ .../x/net/html/testdata/webkit/tests11.dat | 482 -
+ .../x/net/html/testdata/webkit/tests12.dat | 62 -
+ .../x/net/html/testdata/webkit/tests14.dat | 74 -
+ .../x/net/html/testdata/webkit/tests15.dat | 208 -
+ .../x/net/html/testdata/webkit/tests16.dat | 2299 ---
+ .../x/net/html/testdata/webkit/tests17.dat | 153 -
+ .../x/net/html/testdata/webkit/tests18.dat | 269 -
+ .../x/net/html/testdata/webkit/tests19.dat | 1237 --
+ .../x/net/html/testdata/webkit/tests2.dat | 763 -
+ .../x/net/html/testdata/webkit/tests20.dat | 455 -
+ .../x/net/html/testdata/webkit/tests21.dat | 221 -
+ .../x/net/html/testdata/webkit/tests22.dat | 157 -
+ .../x/net/html/testdata/webkit/tests23.dat | 155 -
+ .../x/net/html/testdata/webkit/tests24.dat | 79 -
+ .../x/net/html/testdata/webkit/tests25.dat | 219 -
+ .../x/net/html/testdata/webkit/tests26.dat | 313 -
+ .../x/net/html/testdata/webkit/tests3.dat | 305 -
+ .../x/net/html/testdata/webkit/tests4.dat | 59 -
+ .../x/net/html/testdata/webkit/tests5.dat | 191 -
+ .../x/net/html/testdata/webkit/tests6.dat | 663 -
+ .../x/net/html/testdata/webkit/tests7.dat | 390 -
+ .../x/net/html/testdata/webkit/tests8.dat | 148 -
+ .../x/net/html/testdata/webkit/tests9.dat | 457 -
+ .../net/html/testdata/webkit/tests_innerHTML_1.dat | 741 -
+ .../x/net/html/testdata/webkit/tricky01.dat | 261 -
+ .../x/net/html/testdata/webkit/webkit01.dat | 610 -
+ .../x/net/html/testdata/webkit/webkit02.dat | 159 -
+ .../_workspace/src/golang.org/x/net/html/token.go | 1219 --
+ .../src/golang.org/x/net/html/token_test.go | 748 -
+ .../src/golang.org/x/net/websocket/client.go | 98 -
+ .../golang.org/x/net/websocket/exampledial_test.go | 31 -
+ .../x/net/websocket/examplehandler_test.go | 26 -
+ .../src/golang.org/x/net/websocket/hybi.go | 564 -
+ .../src/golang.org/x/net/websocket/hybi_test.go | 590 -
+ .../src/golang.org/x/net/websocket/server.go | 114 -
+ .../src/golang.org/x/net/websocket/websocket.go | 411 -
+ .../golang.org/x/net/websocket/websocket_test.go | 341 -
Godeps/_workspace/src/gopkg.in/v1/yaml/LICENSE | 185 -
.../src/gopkg.in/v1/yaml/LICENSE.libyaml | 31 -
Godeps/_workspace/src/gopkg.in/v1/yaml/README.md | 128 -
@@ -540,7 +542,7 @@ Subject: [PATCH] remove all third party software
Godeps/_workspace/src/gopkg.in/v1/yaml/yaml.go | 306 -
Godeps/_workspace/src/gopkg.in/v1/yaml/yamlh.go | 712 -
.../src/gopkg.in/v1/yaml/yamlprivateh.go | 173 -
- 536 files changed, 134419 deletions(-)
+ 538 files changed, 134578 deletions(-)
delete mode 100644 Godeps/Godeps.json
delete mode 100644 Godeps/Readme
delete mode 100644 Godeps/_workspace/.gitignore
@@ -584,102 +586,6 @@ Subject: [PATCH] remove all third party software
delete mode 100644 Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/uuid_test.go
delete mode 100644 Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/version1.go
delete mode 100644 Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/version4.go
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/context/context.go
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/context/context_test.go
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/context/withtimeout_test.go
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/atom/atom.go
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/atom/atom_test.go
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/atom/gen.go
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/atom/table.go
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/atom/table_test.go
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/charset/charset.go
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/charset/charset_test.go
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/charset/gen.go
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/charset/table.go
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/HTTP-charset.html
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/HTTP-vs-UTF-8-BOM.html
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/HTTP-vs-meta-charset.html
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/HTTP-vs-meta-content.html
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/No-encoding-declaration.html
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/README
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/UTF-16BE-BOM.html
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/UTF-16LE-BOM.html
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/UTF-8-BOM-vs-meta-charset.html
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/UTF-8-BOM-vs-meta-content.html
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/meta-charset-attribute.html
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/meta-content-attribute.html
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/const.go
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/doc.go
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/doctype.go
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/entity.go
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/entity_test.go
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/escape.go
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/escape_test.go
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/example_test.go
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/foreign.go
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/node.go
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/node_test.go
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/parse.go
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/parse_test.go
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/render.go
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/render_test.go
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/go1.html
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/README
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/adoption01.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/adoption02.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/comments01.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/doctype01.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/entities01.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/entities02.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/html5test-com.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/inbody01.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/isindex.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/pending-spec-changes-plain-text-unsafe.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/pending-spec-changes.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/plain-text-unsafe.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/scriptdata01.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/scripted/adoption01.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/scripted/webkit01.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tables01.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests1.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests10.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests11.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests12.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests14.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests15.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests16.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests17.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests18.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests19.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests2.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests20.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests21.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests22.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests23.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests24.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests25.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests26.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests3.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests4.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests5.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests6.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests7.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests8.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests9.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests_innerHTML_1.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tricky01.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/webkit01.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/webkit02.dat
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/token.go
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/html/token_test.go
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/websocket/client.go
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/websocket/exampledial_test.go
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/websocket/examplehandler_test.go
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/websocket/hybi.go
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/websocket/hybi_test.go
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/websocket/server.go
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/websocket/websocket.go
- delete mode 100644 Godeps/_workspace/src/code.google.com/p/go.net/websocket/websocket_test.go
delete mode 100644 Godeps/_workspace/src/code.google.com/p/goauth2/compute/serviceaccount/serviceaccount.go
delete mode 100644 Godeps/_workspace/src/code.google.com/p/goauth2/oauth/example/oauthreq.go
delete mode 100644 Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/example/example.client_secrets.json
@@ -811,6 +717,8 @@ Subject: [PATCH] remove all third party software
delete mode 100644 Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/config.go
delete mode 100644 Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/model_builder.go
delete mode 100644 Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/model_builder_test.go
+ delete mode 100644 Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/param_sorter.go
+ delete mode 100644 Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/param_sorter_test.go
delete mode 100644 Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/swagger.go
delete mode 100644 Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/swagger_test.go
delete mode 100644 Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/swagger_webservice.go
@@ -1058,6 +966,102 @@ Subject: [PATCH] remove all third party software
delete mode 100644 Godeps/_workspace/src/github.com/vaughan0/go-ini/ini_linux_test.go
delete mode 100644 Godeps/_workspace/src/github.com/vaughan0/go-ini/ini_test.go
delete mode 100644 Godeps/_workspace/src/github.com/vaughan0/go-ini/test.ini
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/context/context.go
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/context/context_test.go
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/context/withtimeout_test.go
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/atom/atom.go
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/atom/atom_test.go
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/atom/gen.go
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/atom/table.go
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/atom/table_test.go
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/charset/charset.go
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/charset/charset_test.go
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/charset/gen.go
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/charset/table.go
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/HTTP-charset.html
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/HTTP-vs-UTF-8-BOM.html
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/HTTP-vs-meta-charset.html
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/HTTP-vs-meta-content.html
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/No-encoding-declaration.html
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/README
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/UTF-16BE-BOM.html
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/UTF-16LE-BOM.html
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/UTF-8-BOM-vs-meta-charset.html
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/UTF-8-BOM-vs-meta-content.html
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/meta-charset-attribute.html
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/meta-content-attribute.html
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/const.go
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/doc.go
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/doctype.go
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/entity.go
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/entity_test.go
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/escape.go
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/escape_test.go
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/example_test.go
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/foreign.go
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/node.go
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/node_test.go
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/parse.go
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/parse_test.go
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/render.go
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/render_test.go
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/go1.html
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/README
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/adoption01.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/adoption02.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/comments01.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/doctype01.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/entities01.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/entities02.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/html5test-com.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/inbody01.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/isindex.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/pending-spec-changes-plain-text-unsafe.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/pending-spec-changes.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/plain-text-unsafe.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/scriptdata01.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/scripted/adoption01.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/scripted/webkit01.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tables01.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests1.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests10.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests11.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests12.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests14.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests15.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests16.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests17.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests18.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests19.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests2.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests20.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests21.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests22.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests23.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests24.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests25.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests26.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests3.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests4.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests5.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests6.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests7.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests8.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests9.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests_innerHTML_1.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tricky01.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/webkit01.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/webkit02.dat
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/token.go
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/token_test.go
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/websocket/client.go
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/websocket/exampledial_test.go
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/websocket/examplehandler_test.go
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/websocket/hybi.go
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/websocket/hybi_test.go
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/websocket/server.go
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/websocket/websocket.go
+ delete mode 100644 Godeps/_workspace/src/golang.org/x/net/websocket/websocket_test.go
delete mode 100644 Godeps/_workspace/src/gopkg.in/v1/yaml/LICENSE
delete mode 100644 Godeps/_workspace/src/gopkg.in/v1/yaml/LICENSE.libyaml
delete mode 100644 Godeps/_workspace/src/gopkg.in/v1/yaml/README.md
@@ -1080,7 +1084,7 @@ Subject: [PATCH] remove all third party software
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
deleted file mode 100644
-index 4c6c51a..0000000
+index 09dd3c8..0000000
--- a/Godeps/Godeps.json
+++ /dev/null
@@ -1,158 +0,0 @@
@@ -1101,21 +1105,6 @@ index 4c6c51a..0000000
- "Rev": "7dda39b2e7d5e265014674c5af696ba4186679e9"
- },
- {
-- "ImportPath": "code.google.com/p/go.net/context",
-- "Comment": "null-144",
-- "Rev": "ad01a6fcc8a19d3a4478c836895ffe883bd2ceab"
-- },
-- {
-- "ImportPath": "code.google.com/p/go.net/html",
-- "Comment": "null-144",
-- "Rev": "ad01a6fcc8a19d3a4478c836895ffe883bd2ceab"
-- },
-- {
-- "ImportPath": "code.google.com/p/go.net/websocket",
-- "Comment": "null-144",
-- "Rev": "ad01a6fcc8a19d3a4478c836895ffe883bd2ceab"
-- },
-- {
- "ImportPath": "code.google.com/p/goauth2/compute/serviceaccount",
- "Comment": "weekly-50",
- "Rev": "7fc9d958c83464bd7650240569bf93a102266e6a"
@@ -1151,8 +1140,8 @@ index 4c6c51a..0000000
- },
- {
- "ImportPath": "github.com/emicklei/go-restful",
-- "Comment": "v1.1.2-34-gcb26ade",
-- "Rev": "cb26adeb9644200cb4ec7b32be31e024696e8d00"
+- "Comment": "v1.1.2-38-gab99062",
+- "Rev": "ab990627e3546d3c6c8ab45c4d887a3d66b1b6ab"
- },
- {
- "ImportPath": "github.com/fsouza/go-dockerclient",
@@ -1237,6 +1226,21 @@ index 4c6c51a..0000000
- "Rev": "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1"
- },
- {
+- "ImportPath": "golang.org/x/net/context",
+- "Comment": "null-214",
+- "Rev": "c043f0dc72e4cdd23ae039470ea9d63e6680a1b2"
+- },
+- {
+- "ImportPath": "golang.org/x/net/html",
+- "Comment": "null-214",
+- "Rev": "c043f0dc72e4cdd23ae039470ea9d63e6680a1b2"
+- },
+- {
+- "ImportPath": "golang.org/x/net/websocket",
+- "Comment": "null-214",
+- "Rev": "c043f0dc72e4cdd23ae039470ea9d63e6680a1b2"
+- },
+- {
- "ImportPath": "gopkg.in/v1/yaml",
- "Rev": "1b9791953ba4027efaeb728c7355e542a203be5e"
- }
@@ -5866,36286 +5870,2246 @@ index b3d4a36..0000000
- uuid[8] = (uuid[8] & 0x3f) | 0x80 // Variant is 10
- return uuid
-}
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/context/context.go b/Godeps/_workspace/src/code.google.com/p/go.net/context/context.go
+diff --git a/Godeps/_workspace/src/code.google.com/p/goauth2/compute/serviceaccount/serviceaccount.go b/Godeps/_workspace/src/code.google.com/p/goauth2/compute/serviceaccount/serviceaccount.go
deleted file mode 100644
-index e3c5345..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/context/context.go
+index ed3e10c..0000000
+--- a/Godeps/_workspace/src/code.google.com/p/goauth2/compute/serviceaccount/serviceaccount.go
+++ /dev/null
-@@ -1,431 +0,0 @@
--// Copyright 2014 The Go Authors. All rights reserved.
+@@ -1,172 +0,0 @@
+-// Copyright 2013 The goauth2 Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
--// Package context defines the Context type, which carries deadlines,
--// cancelation signals, and other request-scoped values across API boundaries
--// and between processes.
--//
--// Incoming requests to a server should create a Context, and outgoing calls to
--// servers should accept a Context. The chain of function calls between must
--// propagate the Context, optionally replacing it with a modified copy created
--// using WithDeadline, WithTimeout, WithCancel, or WithValue.
--//
--// Programs that use Contexts should follow these rules to keep interfaces
--// consistent across packages and enable static analysis tools to check context
--// propagation:
--//
--// Do not store Contexts inside a struct type; instead, pass a Context
--// explicitly to each function that needs it. The Context should be the first
--// parameter, typically named ctx:
--//
--// func DoSomething(ctx context.Context, arg Arg) error {
--// // ... use ctx ...
--// }
+-// Package serviceaccount provides support for making OAuth2-authorized
+-// HTTP requests from Google Compute Engine instances using service accounts.
-//
--// Do not pass a nil Context, even if a function permits it. Pass context.TODO
--// if you are unsure about which Context to use.
+-// See: https://developers.google.com/compute/docs/authentication
-//
--// Use context Values only for request-scoped data that transits processes and
--// APIs, not for passing optional parameters to functions.
+-// Example usage:
-//
--// The same Context may be passed to functions running in different goroutines;
--// Contexts are safe for simultaneous use by multiple goroutines.
+-// client, err := serviceaccount.NewClient(&serviceaccount.Options{})
+-// if err != nil {
+-// c.Errorf("failed to create service account client: %q", err)
+-// return err
+-// }
+-// client.Post("https://www.googleapis.com/compute/...", ...)
+-// client.Post("https://www.googleapis.com/bigquery/...", ...)
-//
--// See http://blog.golang.org/context for example code for a server that uses
--// Contexts.
--package context
+-package serviceaccount
-
-import (
-- "errors"
-- "fmt"
+- "encoding/json"
+- "net/http"
+- "net/url"
+- "path"
- "sync"
- "time"
--)
-
--// A Context carries a deadline, a cancelation signal, and other values across
--// API boundaries.
--//
--// Context's methods may be called by multiple goroutines simultaneously.
--type Context interface {
-- // Deadline returns the time when work done on behalf of this context
-- // should be canceled. Deadline returns ok==false when no deadline is
-- // set. Successive calls to Deadline return the same results.
-- Deadline() (deadline time.Time, ok bool)
+- "code.google.com/p/goauth2/oauth"
+-)
-
-- // Done returns a channel that's closed when work done on behalf of this
-- // context should be canceled. Done may return nil if this context can
-- // never be canceled. Successive calls to Done return the same value.
-- //
-- // WithCancel arranges for Done to be closed when cancel is called;
-- // WithDeadline arranges for Done to be closed when the deadline
-- // expires; WithTimeout arranges for Done to be closed when the timeout
-- // elapses.
-- //
-- // Done is provided for use in select statements:
-- //
-- // // DoSomething calls DoSomethingSlow and returns as soon as
-- // // it returns or ctx.Done is closed.
-- // func DoSomething(ctx context.Context) (Result, error) {
-- // c := make(chan Result, 1)
-- // go func() { c <- DoSomethingSlow(ctx) }()
-- // select {
-- // case res := <-c:
-- // return res, nil
-- // case <-ctx.Done():
-- // return nil, ctx.Err()
-- // }
-- // }
-- //
-- // See http://blog.golang.org/pipelines for more examples of how to use
-- // a Done channel for cancelation.
-- Done() <-chan struct{}
+-const (
+- metadataServer = "metadata"
+- serviceAccountPath = "/computeMetadata/v1/instance/service-accounts"
+-)
-
-- // Err returns a non-nil error value after Done is closed. Err returns
-- // Canceled if the context was canceled or DeadlineExceeded if the
-- // context's deadline passed. No other values for Err are defined.
-- // After Done is closed, successive calls to Err return the same value.
-- Err() error
+-// Options configures a service account Client.
+-type Options struct {
+- // Underlying transport of service account Client.
+- // If nil, http.DefaultTransport is used.
+- Transport http.RoundTripper
-
-- // Value returns the value associated with this context for key, or nil
-- // if no value is associated with key. Successive calls to Value with
-- // the same key returns the same result.
-- //
-- // Use context values only for request-scoped data that transits
-- // processes and API boundaries, not for passing optional parameters to
-- // functions.
-- //
-- // A key identifies a specific value in a Context. Functions that wish
-- // to store values in Context typically allocate a key in a global
-- // variable then use that key as the argument to context.WithValue and
-- // Context.Value. A key can be any type that supports equality;
-- // packages should define keys as an unexported type to avoid
-- // collisions.
-- //
-- // Packages that define a Context key should provide type-safe accessors
-- // for the values stores using that key:
-- //
-- // // Package user defines a User type that's stored in Contexts.
-- // package user
-- //
-- // import "code.google.com/p/go.net/context"
-- //
-- // // User is the type of value stored in the Contexts.
-- // type User struct {...}
-- //
-- // // key is an unexported type for keys defined in this package.
-- // // This prevents collisions with keys defined in other packages.
-- // type key int
-- //
-- // // userKey is the key for user.User values in Contexts. It is
-- // // unexported; clients use user.NewContext and user.FromContext
-- // // instead of using this key directly.
-- // var userKey key = 0
-- //
-- // // NewContext returns a new Context that carries value u.
-- // func NewContext(ctx context.Context, u *User) context.Context {
-- // return context.WithValue(userKey, u)
-- // }
-- //
-- // // FromContext returns the User value stored in ctx, if any.
-- // func FromContext(ctx context.Context) (*User, bool) {
-- // u, ok := ctx.Value(userKey).(*User)
-- // return u, ok
-- // }
-- Value(key interface{}) interface{}
+- // Service account name.
+- // If empty, "default" is used.
+- Account string
-}
-
--// Canceled is the error returned by Context.Err when the context is canceled.
--var Canceled = errors.New("context canceled")
+-// NewClient returns an *http.Client authorized with the service account
+-// configured in the Google Compute Engine instance.
+-func NewClient(opt *Options) (*http.Client, error) {
+- tr := http.DefaultTransport
+- account := "default"
+- if opt != nil {
+- if opt.Transport != nil {
+- tr = opt.Transport
+- }
+- if opt.Account != "" {
+- account = opt.Account
+- }
+- }
+- t := &transport{
+- Transport: tr,
+- Account: account,
+- }
+- // Get the initial access token.
+- if _, err := fetchToken(t); err != nil {
+- return nil, err
+- }
+- return &http.Client{
+- Transport: t,
+- }, nil
+-}
-
--// DeadlineExceeded is the error returned by Context.Err when the context's
--// deadline passes.
--var DeadlineExceeded = errors.New("context deadline exceeded")
+-type tokenData struct {
+- AccessToken string `json:"access_token"`
+- ExpiresIn float64 `json:"expires_in"`
+- TokenType string `json:"token_type"`
+-}
-
--// An emptyCtx is never canceled, has no values, and has no deadline.
--type emptyCtx int
+-// transport is an oauth.Transport with a custom Refresh and RoundTrip implementation.
+-type transport struct {
+- Transport http.RoundTripper
+- Account string
-
--func (emptyCtx) Deadline() (deadline time.Time, ok bool) {
-- return
+- mu sync.Mutex
+- *oauth.Token
-}
-
--func (emptyCtx) Done() <-chan struct{} {
+-// Refresh renews the transport's AccessToken.
+-// t.mu sould be held when this is called.
+-func (t *transport) refresh() error {
+- // https://developers.google.com/compute/docs/metadata#transitioning
+- // v1 requires "Metadata-Flavor: Google" header.
+- tokenURL := &url.URL{
+- Scheme: "http",
+- Host: metadataServer,
+- Path: path.Join(serviceAccountPath, t.Account, "token"),
+- }
+- req, err := http.NewRequest("GET", tokenURL.String(), nil)
+- if err != nil {
+- return err
+- }
+- req.Header.Add("Metadata-Flavor", "Google")
+- resp, err := http.DefaultClient.Do(req)
+- if err != nil {
+- return err
+- }
+- defer resp.Body.Close()
+- d := json.NewDecoder(resp.Body)
+- var token tokenData
+- err = d.Decode(&token)
+- if err != nil {
+- return err
+- }
+- t.Token = &oauth.Token{
+- AccessToken: token.AccessToken,
+- Expiry: time.Now().Add(time.Duration(token.ExpiresIn) * time.Second),
+- }
- return nil
-}
-
--func (emptyCtx) Err() error {
-- return nil
+-// Refresh renews the transport's AccessToken.
+-func (t *transport) Refresh() error {
+- t.mu.Lock()
+- defer t.mu.Unlock()
+- return t.refresh()
-}
-
--func (emptyCtx) Value(key interface{}) interface{} {
-- return nil
+-// Fetch token from cache or generate a new one if cache miss or expired.
+-func fetchToken(t *transport) (*oauth.Token, error) {
+- // Get a new token using Refresh in case of a cache miss of if it has expired.
+- t.mu.Lock()
+- defer t.mu.Unlock()
+- if t.Token == nil || t.Expired() {
+- if err := t.refresh(); err != nil {
+- return nil, err
+- }
+- }
+- return t.Token, nil
-}
-
--func (n emptyCtx) String() string {
-- switch n {
-- case background:
-- return "context.Background"
-- case todo:
-- return "context.TODO"
+-// cloneRequest returns a clone of the provided *http.Request.
+-// The clone is a shallow copy of the struct and its Header map.
+-func cloneRequest(r *http.Request) *http.Request {
+- // shallow copy of the struct
+- r2 := new(http.Request)
+- *r2 = *r
+- // deep copy of the Header
+- r2.Header = make(http.Header)
+- for k, s := range r.Header {
+- r2.Header[k] = s
- }
-- return "unknown empty Context"
+- return r2
-}
-
--const (
-- background emptyCtx = 1
-- todo emptyCtx = 2
--)
+-// RoundTrip issues an authorized HTTP request and returns its response.
+-func (t *transport) RoundTrip(req *http.Request) (*http.Response, error) {
+- token, err := fetchToken(t)
+- if err != nil {
+- return nil, err
+- }
-
--// Background returns a non-nil, empty Context. It is never canceled, has no
--// values, and has no deadline. It is typically used by the main function,
--// initialization, and tests, and as the top-level Context for incoming
--// requests.
--func Background() Context {
-- return background
--}
+- // To set the Authorization header, we must make a copy of the Request
+- // so that we don't modify the Request we were given.
+- // This is required by the specification of http.RoundTripper.
+- newReq := cloneRequest(req)
+- newReq.Header.Set("Authorization", "Bearer "+token.AccessToken)
-
--// TODO returns a non-nil, empty Context. Code should use context.TODO when
--// it's unclear which Context to use or it's is not yet available (because the
--// surrounding function has not yet been extended to accept a Context
--// parameter). TODO is recognized by static analysis tools that determine
--// whether Contexts are propagated correctly in a program.
--func TODO() Context {
-- return todo
+- // Make the HTTP request.
+- return t.Transport.RoundTrip(newReq)
-}
+diff --git a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/example/oauthreq.go b/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/example/oauthreq.go
+deleted file mode 100644
+index f9651bd..0000000
+--- a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/example/oauthreq.go
++++ /dev/null
+@@ -1,100 +0,0 @@
+-// Copyright 2011 The goauth2 Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
--// A CancelFunc tells an operation to abandon its work.
--// A CancelFunc does not wait for the work to stop.
--// After the first call, subsequent calls to a CancelFunc do nothing.
--type CancelFunc func()
+-// This program makes a call to the specified API, authenticated with OAuth2.
+-// a list of example APIs can be found at https://code.google.com/oauthplayground/
+-package main
-
--// WithCancel returns a copy of parent with a new Done channel. The returned
--// context's Done channel is closed when the returned cancel function is called
--// or when the parent context's Done channel is closed, whichever happens first.
--func WithCancel(parent Context) (ctx Context, cancel CancelFunc) {
-- c := newCancelCtx(parent)
-- propagateCancel(parent, &c)
-- return &c, func() { c.cancel(true, Canceled) }
--}
+-import (
+- "flag"
+- "fmt"
+- "io"
+- "log"
+- "os"
-
--// newCancelCtx returns an initialized cancelCtx.
--func newCancelCtx(parent Context) cancelCtx {
-- return cancelCtx{
-- Context: parent,
-- done: make(chan struct{}),
-- }
--}
+- "code.google.com/p/goauth2/oauth"
+-)
-
--// propagateCancel arranges for child to be canceled when parent is.
--func propagateCancel(parent Context, child canceler) {
-- if parent.Done() == nil {
-- return // parent is never canceled
-- }
-- if p, ok := parentCancelCtx(parent); ok {
-- p.mu.Lock()
-- if p.err != nil {
-- // parent has already been canceled
-- child.cancel(false, p.err)
-- } else {
-- if p.children == nil {
-- p.children = make(map[canceler]bool)
-- }
-- p.children[child] = true
-- }
-- p.mu.Unlock()
-- } else {
-- go func() {
-- select {
-- case <-parent.Done():
-- child.cancel(false, parent.Err())
-- case <-child.Done():
-- }
-- }()
-- }
--}
+-var (
+- clientId = flag.String("id", "", "Client ID")
+- clientSecret = flag.String("secret", "", "Client Secret")
+- scope = flag.String("scope", "https://www.googleapis.com/auth/userinfo.profile", "OAuth scope")
+- redirectURL = flag.String("redirect_url", "oob", "Redirect URL")
+- authURL = flag.String("auth_url", "https://accounts.google.com/o/oauth2/auth", "Authentication URL")
+- tokenURL = flag.String("token_url", "https://accounts.google.com/o/oauth2/token", "Token URL")
+- requestURL = flag.String("request_url", "https://www.googleapis.com/oauth2/v1/userinfo", "API request")
+- code = flag.String("code", "", "Authorization Code")
+- cachefile = flag.String("cache", "cache.json", "Token cache file")
+-)
-
--// parentCancelCtx follows a chain of parent references until it finds a
--// *cancelCtx. This function understands how each of the concrete types in this
--// package represents its parent.
--func parentCancelCtx(parent Context) (*cancelCtx, bool) {
-- for {
-- switch c := parent.(type) {
-- case *cancelCtx:
-- return c, true
-- case *timerCtx:
-- return &c.cancelCtx, true
-- case *valueCtx:
-- parent = c.Context
-- default:
-- return nil, false
-- }
-- }
--}
+-const usageMsg = `
+-To obtain a request token you must specify both -id and -secret.
-
--// A canceler is a context type that can be canceled directly. The
--// implementations are *cancelCtx and *timerCtx.
--type canceler interface {
-- cancel(removeFromParent bool, err error)
-- Done() <-chan struct{}
--}
+-To obtain Client ID and Secret, see the "OAuth 2 Credentials" section under
+-the "API Access" tab on this page: https://code.google.com/apis/console/
-
--// A cancelCtx can be canceled. When canceled, it also cancels any children
--// that implement canceler.
--type cancelCtx struct {
-- Context
+-Once you have completed the OAuth flow, the credentials should be stored inside
+-the file specified by -cache and you may run without the -id and -secret flags.
+-`
-
-- done chan struct{} // closed by the first cancel call.
+-func main() {
+- flag.Parse()
-
-- mu sync.Mutex
-- children map[canceler]bool // set to nil by the first cancel call
-- err error // set to non-nil by the first cancel call
--}
+- // Set up a configuration.
+- config := &oauth.Config{
+- ClientId: *clientId,
+- ClientSecret: *clientSecret,
+- RedirectURL: *redirectURL,
+- Scope: *scope,
+- AuthURL: *authURL,
+- TokenURL: *tokenURL,
+- TokenCache: oauth.CacheFile(*cachefile),
+- }
-
--func (c *cancelCtx) Done() <-chan struct{} {
-- return c.done
--}
+- // Set up a Transport using the config.
+- transport := &oauth.Transport{Config: config}
-
--func (c *cancelCtx) Err() error {
-- c.mu.Lock()
-- defer c.mu.Unlock()
-- return c.err
--}
+- // Try to pull the token from the cache; if this fails, we need to get one.
+- token, err := config.TokenCache.Token()
+- if err != nil {
+- if *clientId == "" || *clientSecret == "" {
+- flag.Usage()
+- fmt.Fprint(os.Stderr, usageMsg)
+- os.Exit(2)
+- }
+- if *code == "" {
+- // Get an authorization code from the data provider.
+- // ("Please ask the user if I can access this resource.")
+- url := config.AuthCodeURL("")
+- fmt.Print("Visit this URL to get a code, then run again with -code=YOUR_CODE\n\n")
+- fmt.Println(url)
+- return
+- }
+- // Exchange the authorization code for an access token.
+- // ("Here's the code you gave the user, now give me a token!")
+- token, err = transport.Exchange(*code)
+- if err != nil {
+- log.Fatal("Exchange:", err)
+- }
+- // (The Exchange method will automatically cache the token.)
+- fmt.Printf("Token is cached in %v\n", config.TokenCache)
+- }
-
--func (c *cancelCtx) String() string {
-- return fmt.Sprintf("%v.WithCancel", c.Context)
--}
+- // Make the actual request using the cached token to authenticate.
+- // ("Here's the token, let me in!")
+- transport.Token = token
-
--// cancel closes c.done, cancels each of c's children, and, if
--// removeFromParent is true, removes c from its parent's children.
--func (c *cancelCtx) cancel(removeFromParent bool, err error) {
-- if err == nil {
-- panic("context: internal error: missing cancel error")
-- }
-- c.mu.Lock()
-- if c.err != nil {
-- c.mu.Unlock()
-- return // already canceled
-- }
-- c.err = err
-- close(c.done)
-- for child := range c.children {
-- // NOTE: acquiring the child's lock while holding parent's lock.
-- child.cancel(false, err)
+- // Make the request.
+- r, err := transport.Client().Get(*requestURL)
+- if err != nil {
+- log.Fatal("Get:", err)
- }
-- c.children = nil
-- c.mu.Unlock()
+- defer r.Body.Close()
-
-- if removeFromParent {
-- if p, ok := parentCancelCtx(c.Context); ok {
-- p.mu.Lock()
-- if p.children != nil {
-- delete(p.children, c)
-- }
-- p.mu.Unlock()
-- }
-- }
+- // Write the response to standard output.
+- io.Copy(os.Stdout, r.Body)
+-
+- // Send final carriage return, just to be neat.
+- fmt.Println()
-}
+diff --git a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/example/example.client_secrets.json b/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/example/example.client_secrets.json
+deleted file mode 100644
+index 2ea86f2..0000000
+--- a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/example/example.client_secrets.json
++++ /dev/null
+@@ -1 +0,0 @@
+-{"web":{"auth_uri":"https://accounts.google.com/o/oauth2/auth","token_uri":"https://accounts.google.com/o/oauth2/token","client_email":"XXXXXXXXXXXX at developer.gserviceaccount.com","client_x509_cert_url":"https://www.googleapis.com/robot/v1/metadata/x509/XXXXXXXXXXXX@developer.gserviceaccount.com","client_id":"XXXXXXXXXXXX.apps.googleusercontent.com","auth_provider_x509_cert_url":"https://www.googleapis.com/oauth2/v1/certs"}}
+diff --git a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/example/example.pem b/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/example/example.pem
+deleted file mode 100644
+index 8f78b92..0000000
+--- a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/example/example.pem
++++ /dev/null
+@@ -1,20 +0,0 @@
+-Bag Attributes
+- friendlyName: privatekey
+- localKeyID: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+-Key Attributes: <No Attributes>
+------BEGIN PRIVATE KEY-----
+-XXXXxyXXXXXXXxxyxxxX9y0XXYXXXXYXXxXyxxXxXxXXXyXXXXx4yx1xy1xyYxxY
+-1XxYy38YxXxxxyXxyyxx+xxxxyx1Y1xYx7yx2/Y1XyyXYYYxY5YXxX0xY/Y642yX
+-zYYxYXzXYxY0Y8y9YxyYXxxX40YyXxxXX4XXxx7XxXxxXyXxYYXxXyxX5XY0Yy2X
+-1YX0XXyy6YXyXx9XxXxyXX9XXYXxXxXXXXXXxYXYY3Y8Yy311XYYY81XyY14Xyyx
+-xXyx7xxXXXxxxxyyyX4YYYXyYyYXyxX4XYXYyxXYyx9xy23xXYyXyxYxXxx1XXXY
+-y98yX6yYxyyyX4Xyx1Xy/0yxxYxXxYYx2xx7yYXXXxYXXXxyXyyYYxx5XX2xxyxy
+-y6Yyyx0XX3YYYyx9YYXXXX7y0yxXXy+90XYz1y2xyx7yXxX+8X0xYxXXYxxyxYYy
+-YXx8Yy4yX0Xyxxx6yYX92yxy1YYYzyyyyxy55x/yyXXXYYXYXXzXXxYYxyXY8XXX
+-+y9+yXxX7XxxyYYxxXYxyY623xxXxYX59x5Y6yYyXYY4YxXXYXXXYxXYxXxXXx6x
+-YXX7XxXX2X0XY7YXyYy1XXxYXxXxYY1xXXxxxyy+07zXYxYxxXyyxxyxXx1XYy5X
+-5XYzyxYxXXYyX9XX7xX8xXxx+XXYyYXXXX5YY1x8Yxyx54Xy/1XXyyYXY5YxYyxY
+-XyyxXyX/YxxXXXxXXYXxyxx63xX/xxyYXXyYzx0XY+YxX5xyYyyxxxXXYX/94XXy
+-Xx63xYxXyXY3/XXxyyXX15XXXyz08XYY5YYXY/YXy/96x68XyyXXxYyXy4xYXx5x
+-7yxxyxxYxXxyx3y=
+------END PRIVATE KEY-----
+diff --git a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/example/main.go b/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/example/main.go
+deleted file mode 100644
+index 2256e9c..0000000
+--- a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/example/main.go
++++ /dev/null
+@@ -1,114 +0,0 @@
+-// Copyright 2011 The goauth2 Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
--// WithDeadline returns a copy of the parent context with the deadline adjusted
--// to be no later than d. If the parent's deadline is already earlier than d,
--// WithDeadline(parent, d) is semantically equivalent to parent. The returned
--// context's Done channel is closed when the deadline expires, when the returned
--// cancel function is called, or when the parent context's Done channel is
--// closed, whichever happens first.
--//
--// Canceling this context releases resources associated with the deadline
--// timer, so code should call cancel as soon as the operations running in this
--// Context complete.
--func WithDeadline(parent Context, deadline time.Time) (Context, CancelFunc) {
-- if cur, ok := parent.Deadline(); ok && cur.Before(deadline) {
-- // The current deadline is already sooner than the new one.
-- return WithCancel(parent)
+-// This program makes a read only call to the Google Cloud Storage API,
+-// authenticated with OAuth2. A list of example APIs can be found at
+-// https://code.google.com/oauthplayground/
+-package main
+-
+-import (
+- "encoding/json"
+- "flag"
+- "fmt"
+- "io/ioutil"
+- "log"
+- "net/http"
+- "strings"
+-
+- "code.google.com/p/goauth2/oauth/jwt"
+-)
+-
+-const scope = "https://www.googleapis.com/auth/devstorage.read_only"
+-
+-var (
+- secretsFile = flag.String("s", "", "JSON encoded secrets for the service account")
+- pemFile = flag.String("k", "", "private pem key file for the service account")
+-)
+-
+-const usageMsg = `
+-You must specify -k and -s.
+-
+-To obtain client secrets and pem, see the "OAuth 2 Credentials" section under
+-the "API Access" tab on this page: https://code.google.com/apis/console/
+-
+-Google Cloud Storage must also be turned on in the API console.
+-`
+-
+-func main() {
+- flag.Parse()
+-
+- if *secretsFile == "" || *pemFile == "" {
+- flag.Usage()
+- fmt.Println(usageMsg)
+- return
- }
-- c := &timerCtx{
-- cancelCtx: newCancelCtx(parent),
-- deadline: deadline,
+-
+- // Read the secret file bytes into the config.
+- secretBytes, err := ioutil.ReadFile(*secretsFile)
+- if err != nil {
+- log.Fatal("error reading secerets file:", err)
- }
-- propagateCancel(parent, c)
-- d := deadline.Sub(time.Now())
-- if d <= 0 {
-- c.cancel(true, DeadlineExceeded) // deadline has already passed
-- return c, func() { c.cancel(true, Canceled) }
+- var config struct {
+- Web struct {
+- ClientEmail string `json:"client_email"`
+- ClientID string `json:"client_id"`
+- TokenURI string `json:"token_uri"`
+- }
- }
-- c.mu.Lock()
-- defer c.mu.Unlock()
-- if c.err == nil {
-- c.timer = time.AfterFunc(d, func() {
-- c.cancel(true, DeadlineExceeded)
-- })
+- err = json.Unmarshal(secretBytes, &config)
+- if err != nil {
+- log.Fatal("error unmarshalling secerets:", err)
- }
-- return c, func() { c.cancel(true, Canceled) }
--}
-
--// A timerCtx carries a timer and a deadline. It embeds a cancelCtx to
--// implement Done and Err. It implements cancel by stopping its timer then
--// delegating to cancelCtx.cancel.
--type timerCtx struct {
-- cancelCtx
-- timer *time.Timer // Under cancelCtx.mu.
+- // Get the project ID from the client ID.
+- projectID := strings.SplitN(config.Web.ClientID, "-", 2)[0]
-
-- deadline time.Time
--}
+- // Read the pem file bytes for the private key.
+- keyBytes, err := ioutil.ReadFile(*pemFile)
+- if err != nil {
+- log.Fatal("error reading private key file:", err)
+- }
-
--func (c *timerCtx) Deadline() (deadline time.Time, ok bool) {
-- return c.deadline, true
--}
+- // Craft the ClaimSet and JWT token.
+- t := jwt.NewToken(config.Web.ClientEmail, scope, keyBytes)
+- t.ClaimSet.Aud = config.Web.TokenURI
-
--func (c *timerCtx) String() string {
-- return fmt.Sprintf("%v.WithDeadline(%s [%s])", c.cancelCtx.Context, c.deadline, c.deadline.Sub(time.Now()))
--}
+- // We need to provide a client.
+- c := &http.Client{}
-
--func (c *timerCtx) cancel(removeFromParent bool, err error) {
-- c.cancelCtx.cancel(removeFromParent, err)
-- c.mu.Lock()
-- if c.timer != nil {
-- c.timer.Stop()
-- c.timer = nil
+- // Get the access token.
+- o, err := t.Assert(c)
+- if err != nil {
+- log.Fatal("assertion error:", err)
- }
-- c.mu.Unlock()
--}
--
--// WithTimeout returns WithDeadline(parent, time.Now().Add(timeout)).
--//
--// Canceling this context releases resources associated with the deadline
--// timer, so code should call cancel as soon as the operations running in this
--// Context complete:
--//
--// func slowOperationWithTimeout(ctx context.Context) (Result, error) {
--// ctx, cancel := context.WithTimeout(ctx, 100*time.Millisecond)
--// defer cancel() // releases resources if slowOperation completes before timeout elapses
--// return slowOperation(ctx)
--// }
--func WithTimeout(parent Context, timeout time.Duration) (Context, CancelFunc) {
-- return WithDeadline(parent, time.Now().Add(timeout))
--}
-
--// WithValue returns a copy of parent in which the value associated with key is
--// val.
--//
--// Use context Values only for request-scoped data that transits processes and
--// APIs, not for passing optional parameters to functions.
--func WithValue(parent Context, key interface{}, val interface{}) Context {
-- return &valueCtx{parent, key, val}
--}
+- // Refresh token will be missing, but this access_token will be good
+- // for one hour.
+- fmt.Printf("access_token = %v\n", o.AccessToken)
+- fmt.Printf("refresh_token = %v\n", o.RefreshToken)
+- fmt.Printf("expires %v\n", o.Expiry)
-
--// A valueCtx carries a key-value pair. It implements Value for that key and
--// delegates all other calls to the embedded Context.
--type valueCtx struct {
-- Context
-- key, val interface{}
--}
+- // Form the request to list Google Cloud Storage buckets.
+- req, err := http.NewRequest("GET", "https://storage.googleapis.com/", nil)
+- if err != nil {
+- log.Fatal("http.NewRequest:", err)
+- }
+- req.Header.Set("Authorization", "OAuth "+o.AccessToken)
+- req.Header.Set("x-goog-api-version", "2")
+- req.Header.Set("x-goog-project-id", projectID)
-
--func (c *valueCtx) String() string {
-- return fmt.Sprintf("%v.WithValue(%#v, %#v)", c.Context, c.key, c.val)
--}
+- // Make the request.
+- r, err := c.Do(req)
+- if err != nil {
+- log.Fatal("API request error:", err)
+- }
+- defer r.Body.Close()
-
--func (c *valueCtx) Value(key interface{}) interface{} {
-- if c.key == key {
-- return c.val
+- // Write the response to standard output.
+- res, err := ioutil.ReadAll(r.Body)
+- if err != nil {
+- log.Fatal("error reading API request results:", err)
- }
-- return c.Context.Value(key)
+- fmt.Printf("\nRESULT:\n%s\n", res)
-}
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/context/context_test.go b/Godeps/_workspace/src/code.google.com/p/go.net/context/context_test.go
+diff --git a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/jwt.go b/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/jwt.go
deleted file mode 100644
-index c1a4de5..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/context/context_test.go
+index 61bf5ce..0000000
+--- a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/jwt.go
+++ /dev/null
-@@ -1,553 +0,0 @@
--// Copyright 2014 The Go Authors. All rights reserved.
+@@ -1,511 +0,0 @@
+-// Copyright 2012 The goauth2 Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
--package context
+-// The jwt package provides support for creating credentials for OAuth2 service
+-// account requests.
+-//
+-// For examples of the package usage please see jwt_test.go.
+-// Example usage (error handling omitted for brevity):
+-//
+-// // Craft the ClaimSet and JWT token.
+-// iss := "XXXXXXXXXXXX at developer.gserviceaccount.com"
+-// scope := "https://www.googleapis.com/auth/devstorage.read_only"
+-// t := jwt.NewToken(iss, scope, pemKeyBytes)
+-//
+-// // We need to provide a client.
+-// c := &http.Client{}
+-//
+-// // Get the access token.
+-// o, _ := t.Assert(c)
+-//
+-// // Form the request to the service.
+-// req, _ := http.NewRequest("GET", "https://storage.googleapis.com/", nil)
+-// req.Header.Set("Authorization", "OAuth "+o.AccessToken)
+-// req.Header.Set("x-goog-api-version", "2")
+-// req.Header.Set("x-goog-project-id", "XXXXXXXXXXXX")
+-//
+-// // Make the request.
+-// result, _ := c.Do(req)
+-//
+-// For info on OAuth2 service accounts please see the online documentation.
+-// https://developers.google.com/accounts/docs/OAuth2ServiceAccount
+-//
+-package jwt
-
-import (
+- "bytes"
+- "crypto"
+- "crypto/rand"
+- "crypto/rsa"
+- "crypto/sha256"
+- "crypto/x509"
+- "encoding/base64"
+- "encoding/json"
+- "encoding/pem"
+- "errors"
- "fmt"
-- "math/rand"
-- "runtime"
+- "net/http"
+- "net/url"
- "strings"
-- "sync"
-- "testing"
- "time"
+-
+- "code.google.com/p/goauth2/oauth"
-)
-
--// otherContext is a Context that's not one of the types defined in context.go.
--// This lets us test code paths that differ based on the underlying type of the
--// Context.
--type otherContext struct {
-- Context
--}
+-// These are the default/standard values for this to work for Google service accounts.
+-const (
+- stdAlgorithm = "RS256"
+- stdType = "JWT"
+- stdAssertionType = "http://oauth.net/grant_type/jwt/1.0/bearer"
+- stdGrantType = "urn:ietf:params:oauth:grant-type:jwt-bearer"
+- stdAud = "https://accounts.google.com/o/oauth2/token"
+-)
-
--func TestBackground(t *testing.T) {
-- c := Background()
-- if c == nil {
-- t.Fatalf("Background returned nil")
-- }
-- select {
-- case x := <-c.Done():
-- t.Errorf("<-c.Done() == %v want nothing (it should block)", x)
-- default:
-- }
-- if got, want := fmt.Sprint(c), "context.Background"; got != want {
-- t.Errorf("Background().String() = %q want %q", got, want)
-- }
+-var (
+- ErrInvalidKey = errors.New("Invalid Key")
+-)
+-
+-// base64Encode returns and Base64url encoded version of the input string with any
+-// trailing "=" stripped.
+-func base64Encode(b []byte) string {
+- return strings.TrimRight(base64.URLEncoding.EncodeToString(b), "=")
-}
-
--func TestTODO(t *testing.T) {
-- c := TODO()
-- if c == nil {
-- t.Fatalf("TODO returned nil")
-- }
-- select {
-- case x := <-c.Done():
-- t.Errorf("<-c.Done() == %v want nothing (it should block)", x)
-- default:
-- }
-- if got, want := fmt.Sprint(c), "context.TODO"; got != want {
-- t.Errorf("TODO().String() = %q want %q", got, want)
+-// base64Decode decodes the Base64url encoded string
+-func base64Decode(s string) ([]byte, error) {
+- // add back missing padding
+- switch len(s) % 4 {
+- case 2:
+- s += "=="
+- case 3:
+- s += "="
- }
+- return base64.URLEncoding.DecodeString(s)
-}
-
--func TestWithCancel(t *testing.T) {
-- c1, cancel := WithCancel(Background())
--
-- if got, want := fmt.Sprint(c1), "context.Background.WithCancel"; got != want {
-- t.Errorf("c1.String() = %q want %q", got, want)
-- }
+-// The JWT claim set contains information about the JWT including the
+-// permissions being requested (scopes), the target of the token, the issuer,
+-// the time the token was issued, and the lifetime of the token.
+-//
+-// Aud is usually https://accounts.google.com/o/oauth2/token
+-type ClaimSet struct {
+- Iss string `json:"iss"` // email address of the client_id of the application making the access token request
+- Scope string `json:"scope,omitempty"` // space-delimited list of the permissions the application requests
+- Aud string `json:"aud"` // descriptor of the intended target of the assertion (Optional).
+- Prn string `json:"prn,omitempty"` // email for which the application is requesting delegated access (Optional).
+- Exp int64 `json:"exp"`
+- Iat int64 `json:"iat"`
+- Typ string `json:"typ,omitempty"`
+- Sub string `json:"sub,omitempty"` // Add support for googleapi delegation support
-
-- o := otherContext{c1}
-- c2, _ := WithCancel(o)
-- contexts := []Context{c1, o, c2}
+- // See http://tools.ietf.org/html/draft-jones-json-web-token-10#section-4.3
+- // This array is marshalled using custom code (see (c *ClaimSet) encode()).
+- PrivateClaims map[string]interface{} `json:"-"`
-
-- for i, c := range contexts {
-- if d := c.Done(); d == nil {
-- t.Errorf("c[%d].Done() == %v want non-nil", i, d)
-- }
-- if e := c.Err(); e != nil {
-- t.Errorf("c[%d].Err() == %v want nil", i, e)
-- }
+- exp time.Time
+- iat time.Time
+-}
-
-- select {
-- case x := <-c.Done():
-- t.Errorf("<-c.Done() == %v want nothing (it should block)", x)
-- default:
-- }
-- }
+-// setTimes sets iat and exp to time.Now() and iat.Add(time.Hour) respectively.
+-//
+-// Note that these times have nothing to do with the expiration time for the
+-// access_token returned by the server. These have to do with the lifetime of
+-// the encoded JWT.
+-//
+-// A JWT can be re-used for up to one hour after it was encoded. The access
+-// token that is granted will also be good for one hour so there is little point
+-// in trying to use the JWT a second time.
+-func (c *ClaimSet) setTimes(t time.Time) {
+- c.iat = t
+- c.exp = c.iat.Add(time.Hour)
+-}
-
-- cancel()
-- time.Sleep(100 * time.Millisecond) // let cancelation propagate
+-var (
+- jsonStart = []byte{'{'}
+- jsonEnd = []byte{'}'}
+-)
-
-- for i, c := range contexts {
-- select {
-- case <-c.Done():
-- default:
-- t.Errorf("<-c[%d].Done() blocked, but shouldn't have", i)
-- }
-- if e := c.Err(); e != Canceled {
-- t.Errorf("c[%d].Err() == %v want %v", i, e, Canceled)
-- }
+-// encode returns the Base64url encoded form of the Signature.
+-func (c *ClaimSet) encode() string {
+- if c.exp.IsZero() || c.iat.IsZero() {
+- c.setTimes(time.Now())
- }
--}
+- if c.Aud == "" {
+- c.Aud = stdAud
+- }
+- c.Exp = c.exp.Unix()
+- c.Iat = c.iat.Unix()
-
--func TestParentFinishesChild(t *testing.T) {
-- // Context tree:
-- // parent -> cancelChild
-- // parent -> valueChild -> timerChild
-- parent, cancel := WithCancel(Background())
-- cancelChild, stop := WithCancel(parent)
-- defer stop()
-- valueChild := WithValue(parent, "key", "value")
-- timerChild, stop := WithTimeout(valueChild, 10000*time.Hour)
-- defer stop()
+- b, err := json.Marshal(c)
+- if err != nil {
+- panic(err)
+- }
-
-- select {
-- case x := <-parent.Done():
-- t.Errorf("<-parent.Done() == %v want nothing (it should block)", x)
-- case x := <-cancelChild.Done():
-- t.Errorf("<-cancelChild.Done() == %v want nothing (it should block)", x)
-- case x := <-timerChild.Done():
-- t.Errorf("<-timerChild.Done() == %v want nothing (it should block)", x)
-- case x := <-valueChild.Done():
-- t.Errorf("<-valueChild.Done() == %v want nothing (it should block)", x)
-- default:
+- if len(c.PrivateClaims) == 0 {
+- return base64Encode(b)
- }
-
-- // The parent's children should contain the two cancelable children.
-- pc := parent.(*cancelCtx)
-- cc := cancelChild.(*cancelCtx)
-- tc := timerChild.(*timerCtx)
-- pc.mu.Lock()
-- if len(pc.children) != 2 || !pc.children[cc] || !pc.children[tc] {
-- t.Errorf("bad linkage: pc.children = %v, want %v and %v",
-- pc.children, cc, tc)
+- // Marshal private claim set and then append it to b.
+- prv, err := json.Marshal(c.PrivateClaims)
+- if err != nil {
+- panic(fmt.Errorf("Invalid map of private claims %v", c.PrivateClaims))
- }
-- pc.mu.Unlock()
-
-- if p, ok := parentCancelCtx(cc.Context); !ok || p != pc {
-- t.Errorf("bad linkage: parentCancelCtx(cancelChild.Context) = %v, %v want %v, true", p, ok, pc)
+- // Concatenate public and private claim JSON objects.
+- if !bytes.HasSuffix(b, jsonEnd) {
+- panic(fmt.Errorf("Invalid JSON %s", b))
- }
-- if p, ok := parentCancelCtx(tc.Context); !ok || p != pc {
-- t.Errorf("bad linkage: parentCancelCtx(timerChild.Context) = %v, %v want %v, true", p, ok, pc)
+- if !bytes.HasPrefix(prv, jsonStart) {
+- panic(fmt.Errorf("Invalid JSON %s", prv))
- }
+- b[len(b)-1] = ',' // Replace closing curly brace with a comma.
+- b = append(b, prv[1:]...) // Append private claims.
-
-- cancel()
+- return base64Encode(b)
+-}
-
-- pc.mu.Lock()
-- if len(pc.children) != 0 {
-- t.Errorf("pc.cancel didn't clear pc.children = %v", pc.children)
+-// Header describes the algorithm and type of token being generated,
+-// and optionally a KeyID describing additional parameters for the
+-// signature.
+-type Header struct {
+- Algorithm string `json:"alg"`
+- Type string `json:"typ"`
+- KeyId string `json:"kid,omitempty"`
+-}
+-
+-func (h *Header) encode() string {
+- b, err := json.Marshal(h)
+- if err != nil {
+- panic(err)
- }
-- pc.mu.Unlock()
+- return base64Encode(b)
+-}
-
-- // parent and children should all be finished.
-- check := func(ctx Context, name string) {
-- select {
-- case <-ctx.Done():
-- default:
-- t.Errorf("<-%s.Done() blocked, but shouldn't have", name)
-- }
-- if e := ctx.Err(); e != Canceled {
-- t.Errorf("%s.Err() == %v want %v", name, e, Canceled)
-- }
-- }
-- check(parent, "parent")
-- check(cancelChild, "cancelChild")
-- check(valueChild, "valueChild")
-- check(timerChild, "timerChild")
+-// A JWT is composed of three parts: a header, a claim set, and a signature.
+-// The well formed and encoded JWT can then be exchanged for an access token.
+-//
+-// The Token is not a JWT, but is is encoded to produce a well formed JWT.
+-//
+-// When obtaining a key from the Google API console it will be downloaded in a
+-// PKCS12 encoding. To use this key you will need to convert it to a PEM file.
+-// This can be achieved with openssl.
+-//
+-// $ openssl pkcs12 -in <key.p12> -nocerts -passin pass:notasecret -nodes -out <key.pem>
+-//
+-// The contents of this file can then be used as the Key.
+-type Token struct {
+- ClaimSet *ClaimSet // claim set used to construct the JWT
+- Header *Header // header used to construct the JWT
+- Key []byte // PEM printable encoding of the private key
+- pKey *rsa.PrivateKey
-
-- // WithCancel should return a canceled context on a canceled parent.
-- precanceledChild := WithValue(parent, "key", "value")
-- select {
-- case <-precanceledChild.Done():
-- default:
-- t.Errorf("<-precanceledChild.Done() blocked, but shouldn't have")
+- header string
+- claim string
+- sig string
+-
+- useExternalSigner bool
+- signer Signer
+-}
+-
+-// NewToken returns a filled in *Token based on the standard header,
+-// and sets the Iat and Exp times based on when the call to Assert is
+-// made.
+-func NewToken(iss, scope string, key []byte) *Token {
+- c := &ClaimSet{
+- Iss: iss,
+- Scope: scope,
+- Aud: stdAud,
- }
-- if e := precanceledChild.Err(); e != Canceled {
-- t.Errorf("precanceledChild.Err() == %v want %v", e, Canceled)
+- h := &Header{
+- Algorithm: stdAlgorithm,
+- Type: stdType,
+- }
+- t := &Token{
+- ClaimSet: c,
+- Header: h,
+- Key: key,
- }
+- return t
-}
-
--func TestChildFinishesFirst(t *testing.T) {
-- cancelable, stop := WithCancel(Background())
-- defer stop()
-- for _, parent := range []Context{Background(), cancelable} {
-- child, cancel := WithCancel(parent)
+-// Signer is an interface that given a JWT token, returns the header &
+-// claim (serialized and urlEncoded to a byte slice), along with the
+-// signature and an error (if any occured). It could modify any data
+-// to sign (typically the KeyID).
+-//
+-// Example usage where a SHA256 hash of the original url-encoded token
+-// with an added KeyID and secret data is used as a signature:
+-//
+-// var privateData = "secret data added to hash, indexed by KeyID"
+-//
+-// type SigningService struct{}
+-//
+-// func (ss *SigningService) Sign(in *jwt.Token) (newTokenData, sig []byte, err error) {
+-// in.Header.KeyID = "signing service"
+-// newTokenData = in.EncodeWithoutSignature()
+-// dataToSign := fmt.Sprintf("%s.%s", newTokenData, privateData)
+-// h := sha256.New()
+-// _, err := h.Write([]byte(dataToSign))
+-// sig = h.Sum(nil)
+-// return
+-// }
+-type Signer interface {
+- Sign(in *Token) (tokenData, signature []byte, err error)
+-}
-
-- select {
-- case x := <-parent.Done():
-- t.Errorf("<-parent.Done() == %v want nothing (it should block)", x)
-- case x := <-child.Done():
-- t.Errorf("<-child.Done() == %v want nothing (it should block)", x)
-- default:
-- }
+-// NewSignerToken returns a *Token, using an external signer function
+-func NewSignerToken(iss, scope string, signer Signer) *Token {
+- t := NewToken(iss, scope, nil)
+- t.useExternalSigner = true
+- t.signer = signer
+- return t
+-}
-
-- cc := child.(*cancelCtx)
-- pc, pcok := parent.(*cancelCtx) // pcok == false when parent == Background()
-- if p, ok := parentCancelCtx(cc.Context); ok != pcok || (ok && pc != p) {
-- t.Errorf("bad linkage: parentCancelCtx(cc.Context) = %v, %v want %v, %v", p, ok, pc, pcok)
-- }
+-// Expired returns a boolean value letting us know if the token has expired.
+-func (t *Token) Expired() bool {
+- return t.ClaimSet.exp.Before(time.Now())
+-}
-
-- if pcok {
-- pc.mu.Lock()
-- if len(pc.children) != 1 || !pc.children[cc] {
-- t.Errorf("bad linkage: pc.children = %v, cc = %v", pc.children, cc)
-- }
-- pc.mu.Unlock()
-- }
+-// Encode constructs and signs a Token returning a JWT ready to use for
+-// requesting an access token.
+-func (t *Token) Encode() (string, error) {
+- var tok string
+- t.header = t.Header.encode()
+- t.claim = t.ClaimSet.encode()
+- err := t.sign()
+- if err != nil {
+- return tok, err
+- }
+- tok = fmt.Sprintf("%s.%s.%s", t.header, t.claim, t.sig)
+- return tok, nil
+-}
-
-- cancel()
+-// EncodeWithoutSignature returns the url-encoded value of the Token
+-// before signing has occured (typically for use by external signers).
+-func (t *Token) EncodeWithoutSignature() string {
+- t.header = t.Header.encode()
+- t.claim = t.ClaimSet.encode()
+- return fmt.Sprintf("%s.%s", t.header, t.claim)
+-}
-
-- if pcok {
-- pc.mu.Lock()
-- if len(pc.children) != 0 {
-- t.Errorf("child's cancel didn't remove self from pc.children = %v", pc.children)
-- }
-- pc.mu.Unlock()
+-// sign computes the signature for a Token. The details for this can be found
+-// in the OAuth2 Service Account documentation.
+-// https://developers.google.com/accounts/docs/OAuth2ServiceAccount#computingsignature
+-func (t *Token) sign() error {
+- if t.useExternalSigner {
+- fulldata, sig, err := t.signer.Sign(t)
+- if err != nil {
+- return err
- }
--
-- // child should be finished.
-- select {
-- case <-child.Done():
-- default:
-- t.Errorf("<-child.Done() blocked, but shouldn't have")
+- split := strings.Split(string(fulldata), ".")
+- if len(split) != 2 {
+- return errors.New("no token returned")
- }
-- if e := child.Err(); e != Canceled {
-- t.Errorf("child.Err() == %v want %v", e, Canceled)
+- t.header = split[0]
+- t.claim = split[1]
+- t.sig = base64Encode(sig)
+- return err
+- }
+- ss := fmt.Sprintf("%s.%s", t.header, t.claim)
+- if t.pKey == nil {
+- err := t.parsePrivateKey()
+- if err != nil {
+- return err
- }
+- }
+- h := sha256.New()
+- h.Write([]byte(ss))
+- b, err := rsa.SignPKCS1v15(rand.Reader, t.pKey, crypto.SHA256, h.Sum(nil))
+- t.sig = base64Encode(b)
+- return err
+-}
-
-- // parent should not be finished.
-- select {
-- case x := <-parent.Done():
-- t.Errorf("<-parent.Done() == %v want nothing (it should block)", x)
-- default:
-- }
-- if e := parent.Err(); e != nil {
-- t.Errorf("parent.Err() == %v want nil", e)
+-// parsePrivateKey converts the Token's Key ([]byte) into a parsed
+-// rsa.PrivateKey. If the key is not well formed this method will return an
+-// ErrInvalidKey error.
+-func (t *Token) parsePrivateKey() error {
+- block, _ := pem.Decode(t.Key)
+- if block == nil {
+- return ErrInvalidKey
+- }
+- parsedKey, err := x509.ParsePKCS8PrivateKey(block.Bytes)
+- if err != nil {
+- parsedKey, err = x509.ParsePKCS1PrivateKey(block.Bytes)
+- if err != nil {
+- return err
- }
- }
+- var ok bool
+- t.pKey, ok = parsedKey.(*rsa.PrivateKey)
+- if !ok {
+- return ErrInvalidKey
+- }
+- return nil
-}
-
--func testDeadline(c Context, wait time.Duration, t *testing.T) {
-- select {
-- case <-time.After(wait):
-- t.Fatalf("context should have timed out")
-- case <-c.Done():
+-// Assert obtains an *oauth.Token from the remote server by encoding and sending
+-// a JWT. The access_token will expire in one hour (3600 seconds) and cannot be
+-// refreshed (no refresh_token is returned with the response). Once this token
+-// expires call this method again to get a fresh one.
+-func (t *Token) Assert(c *http.Client) (*oauth.Token, error) {
+- var o *oauth.Token
+- t.ClaimSet.setTimes(time.Now())
+- u, v, err := t.buildRequest()
+- if err != nil {
+- return o, err
- }
-- if e := c.Err(); e != DeadlineExceeded {
-- t.Errorf("c.Err() == %v want %v", e, DeadlineExceeded)
+- resp, err := c.PostForm(u, v)
+- if err != nil {
+- return o, err
- }
+- o, err = handleResponse(resp)
+- return o, err
-}
-
--func TestDeadline(t *testing.T) {
-- c, _ := WithDeadline(Background(), time.Now().Add(100*time.Millisecond))
-- if got, prefix := fmt.Sprint(c), "context.Background.WithDeadline("; !strings.HasPrefix(got, prefix) {
-- t.Errorf("c.String() = %q want prefix %q", got, prefix)
+-// buildRequest sets up the URL values and the proper URL string for making our
+-// access_token request.
+-func (t *Token) buildRequest() (string, url.Values, error) {
+- v := url.Values{}
+- j, err := t.Encode()
+- if err != nil {
+- return t.ClaimSet.Aud, v, err
- }
-- testDeadline(c, 200*time.Millisecond, t)
--
-- c, _ = WithDeadline(Background(), time.Now().Add(100*time.Millisecond))
-- o := otherContext{c}
-- testDeadline(o, 200*time.Millisecond, t)
+- v.Set("grant_type", stdGrantType)
+- v.Set("assertion", j)
+- return t.ClaimSet.Aud, v, nil
+-}
-
-- c, _ = WithDeadline(Background(), time.Now().Add(100*time.Millisecond))
-- o = otherContext{c}
-- c, _ = WithDeadline(o, time.Now().Add(300*time.Millisecond))
-- testDeadline(c, 200*time.Millisecond, t)
+-// Used for decoding the response body.
+-type respBody struct {
+- IdToken string `json:"id_token"`
+- Access string `json:"access_token"`
+- Type string `json:"token_type"`
+- ExpiresIn time.Duration `json:"expires_in"`
-}
-
--func TestTimeout(t *testing.T) {
-- c, _ := WithTimeout(Background(), 100*time.Millisecond)
-- if got, prefix := fmt.Sprint(c), "context.Background.WithDeadline("; !strings.HasPrefix(got, prefix) {
-- t.Errorf("c.String() = %q want prefix %q", got, prefix)
+-// handleResponse returns a filled in *oauth.Token given the *http.Response from
+-// a *http.Request created by buildRequest.
+-func handleResponse(r *http.Response) (*oauth.Token, error) {
+- o := &oauth.Token{}
+- defer r.Body.Close()
+- if r.StatusCode != 200 {
+- return o, errors.New("invalid response: " + r.Status)
- }
-- testDeadline(c, 200*time.Millisecond, t)
+- b := &respBody{}
+- err := json.NewDecoder(r.Body).Decode(b)
+- if err != nil {
+- return o, err
+- }
+- o.AccessToken = b.Access
+- if b.IdToken != "" {
+- // decode returned id token to get expiry
+- o.AccessToken = b.IdToken
+- s := strings.Split(b.IdToken, ".")
+- if len(s) < 2 {
+- return nil, errors.New("invalid token received")
+- }
+- d, err := base64Decode(s[1])
+- if err != nil {
+- return o, err
+- }
+- c := &ClaimSet{}
+- err = json.NewDecoder(bytes.NewBuffer(d)).Decode(c)
+- if err != nil {
+- return o, err
+- }
+- o.Expiry = time.Unix(c.Exp, 0)
+- return o, nil
+- }
+- o.Expiry = time.Now().Add(b.ExpiresIn * time.Second)
+- return o, nil
+-}
-
-- c, _ = WithTimeout(Background(), 100*time.Millisecond)
-- o := otherContext{c}
-- testDeadline(o, 200*time.Millisecond, t)
+-// Transport implements http.RoundTripper. When configured with a valid
+-// JWT and OAuth tokens it can be used to make authenticated HTTP requests.
+-//
+-// t := &jwt.Transport{jwtToken, oauthToken}
+-// r, _, err := t.Client().Get("http://example.org/url/requiring/auth")
+-//
+-// It will automatically refresh the OAuth token if it can, updating in place.
+-type Transport struct {
+- JWTToken *Token
+- OAuthToken *oauth.Token
-
-- c, _ = WithTimeout(Background(), 100*time.Millisecond)
-- o = otherContext{c}
-- c, _ = WithTimeout(o, 300*time.Millisecond)
-- testDeadline(c, 200*time.Millisecond, t)
+- // Transport is the HTTP transport to use when making requests.
+- // It will default to http.DefaultTransport if nil.
+- Transport http.RoundTripper
-}
-
--func TestCanceledTimeout(t *testing.T) {
-- c, _ := WithTimeout(Background(), 200*time.Millisecond)
-- o := otherContext{c}
-- c, cancel := WithTimeout(o, 400*time.Millisecond)
-- cancel()
-- time.Sleep(100 * time.Millisecond) // let cancelation propagate
-- select {
-- case <-c.Done():
-- default:
-- t.Errorf("<-c.Done() blocked, but shouldn't have")
-- }
-- if e := c.Err(); e != Canceled {
-- t.Errorf("c.Err() == %v want %v", e, Canceled)
+-// Creates a new authenticated transport.
+-func NewTransport(token *Token) (*Transport, error) {
+- oa, err := token.Assert(new(http.Client))
+- if err != nil {
+- return nil, err
- }
+- return &Transport{
+- JWTToken: token,
+- OAuthToken: oa,
+- }, nil
-}
-
--type key1 int
--type key2 int
+-// Client returns an *http.Client that makes OAuth-authenticated requests.
+-func (t *Transport) Client() *http.Client {
+- return &http.Client{Transport: t}
+-}
-
--var k1 = key1(1)
--var k2 = key2(1) // same int as k1, different type
--var k3 = key2(3) // same type as k2, different int
+-// Fetches the internal transport.
+-func (t *Transport) transport() http.RoundTripper {
+- if t.Transport != nil {
+- return t.Transport
+- }
+- return http.DefaultTransport
+-}
-
--func TestValues(t *testing.T) {
-- check := func(c Context, nm, v1, v2, v3 string) {
-- if v, ok := c.Value(k1).(string); ok == (len(v1) == 0) || v != v1 {
-- t.Errorf(`%s.Value(k1).(string) = %q, %t want %q, %t`, nm, v, ok, v1, len(v1) != 0)
-- }
-- if v, ok := c.Value(k2).(string); ok == (len(v2) == 0) || v != v2 {
-- t.Errorf(`%s.Value(k2).(string) = %q, %t want %q, %t`, nm, v, ok, v2, len(v2) != 0)
-- }
-- if v, ok := c.Value(k3).(string); ok == (len(v3) == 0) || v != v3 {
-- t.Errorf(`%s.Value(k3).(string) = %q, %t want %q, %t`, nm, v, ok, v3, len(v3) != 0)
+-// RoundTrip executes a single HTTP transaction using the Transport's
+-// OAuthToken as authorization headers.
+-//
+-// This method will attempt to renew the token if it has expired and may return
+-// an error related to that token renewal before attempting the client request.
+-// If the token cannot be renewed a non-nil os.Error value will be returned.
+-// If the token is invalid callers should expect HTTP-level errors,
+-// as indicated by the Response's StatusCode.
+-func (t *Transport) RoundTrip(req *http.Request) (*http.Response, error) {
+- // Sanity check the two tokens
+- if t.JWTToken == nil {
+- return nil, fmt.Errorf("no JWT token supplied")
+- }
+- if t.OAuthToken == nil {
+- return nil, fmt.Errorf("no OAuth token supplied")
+- }
+- // Refresh the OAuth token if it has expired
+- if t.OAuthToken.Expired() {
+- if oa, err := t.JWTToken.Assert(new(http.Client)); err != nil {
+- return nil, err
+- } else {
+- t.OAuthToken = oa
- }
- }
+- // To set the Authorization header, we must make a copy of the Request
+- // so that we don't modify the Request we were given.
+- // This is required by the specification of http.RoundTripper.
+- req = cloneRequest(req)
+- req.Header.Set("Authorization", "Bearer "+t.OAuthToken.AccessToken)
-
-- c0 := Background()
-- check(c0, "c0", "", "", "")
--
-- c1 := WithValue(Background(), k1, "c1k1")
-- check(c1, "c1", "c1k1", "", "")
+- // Make the HTTP request.
+- return t.transport().RoundTrip(req)
+-}
-
-- if got, want := fmt.Sprint(c1), `context.Background.WithValue(1, "c1k1")`; got != want {
-- t.Errorf("c.String() = %q want %q", got, want)
+-// cloneRequest returns a clone of the provided *http.Request.
+-// The clone is a shallow copy of the struct and its Header map.
+-func cloneRequest(r *http.Request) *http.Request {
+- // shallow copy of the struct
+- r2 := new(http.Request)
+- *r2 = *r
+- // deep copy of the Header
+- r2.Header = make(http.Header)
+- for k, s := range r.Header {
+- r2.Header[k] = s
- }
+- return r2
+-}
+diff --git a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/jwt_test.go b/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/jwt_test.go
+deleted file mode 100644
+index 622843e..0000000
+--- a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/jwt_test.go
++++ /dev/null
+@@ -1,486 +0,0 @@
+-// Copyright 2012 The goauth2 Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
-- c2 := WithValue(c1, k2, "c2k2")
-- check(c2, "c2", "c1k1", "c2k2", "")
+-// For package documentation please see jwt.go.
+-//
+-package jwt
-
-- c3 := WithValue(c2, k3, "c3k3")
-- check(c3, "c2", "c1k1", "c2k2", "c3k3")
+-import (
+- "bytes"
+- "crypto"
+- "crypto/rand"
+- "crypto/rsa"
+- "crypto/sha256"
+- "crypto/x509"
+- "encoding/json"
+- "encoding/pem"
+- "io/ioutil"
+- "net/http"
+- "testing"
+- "time"
+-)
-
-- c4 := WithValue(c3, k1, nil)
-- check(c4, "c4", "", "c2k2", "c3k3")
+-const (
+- stdHeaderStr = `{"alg":"RS256","typ":"JWT"}`
+- iss = "761326798069-r5mljlln1rd4lrbhg75efgigp36m78j5 at developer.gserviceaccount.com"
+- scope = "https://www.googleapis.com/auth/prediction"
+- exp = 1328554385
+- iat = 1328550785 // exp + 1 hour
+-)
-
-- o0 := otherContext{Background()}
-- check(o0, "o0", "", "", "")
+-// Base64url encoded Header
+-const headerEnc = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9"
-
-- o1 := otherContext{WithValue(Background(), k1, "c1k1")}
-- check(o1, "o1", "c1k1", "", "")
+-// Base64url encoded ClaimSet
+-const claimSetEnc = "eyJpc3MiOiI3NjEzMjY3OTgwNjktcjVtbGpsbG4xcmQ0bHJiaGc3NWVmZ2lncDM2bTc4ajVAZGV2ZWxvcGVyLmdzZXJ2aWNlYWNjb3VudC5jb20iLCJzY29wZSI6Imh0dHBzOi8vd3d3Lmdvb2dsZWFwaXMuY29tL2F1dGgvcHJlZGljdGlvbiIsImF1ZCI6Imh0dHBzOi8vYWNjb3VudHMuZ29vZ2xlLmNvbS9vL29hdXRoMi90b2tlbiIsImV4cCI6MTMyODU1NDM4NSwiaWF0IjoxMzI4NTUwNzg1fQ"
-
-- o2 := WithValue(o1, k2, "o2k2")
-- check(o2, "o2", "c1k1", "o2k2", "")
+-// Base64url encoded Signature
+-const sigEnc = "olukbHreNiYrgiGCTEmY3eWGeTvYDSUHYoE84Jz3BRPBSaMdZMNOn_0CYK7UHPO7OdvUofjwft1dH59UxE9GWS02pjFti1uAQoImaqjLZoTXr8qiF6O_kDa9JNoykklWlRAIwGIZkDupCS-8cTAnM_ksSymiH1coKJrLDUX_BM0x2f4iMFQzhL5vT1ll-ZipJ0lNlxb5QsyXxDYcxtHYguF12-vpv3ItgT0STfcXoWzIGQoEbhwB9SBp9JYcQ8Ygz6pYDjm0rWX9LrchmTyDArCodpKLFtutNgcIFUP9fWxvwd1C2dNw5GjLcKr9a_SAERyoJ2WnCR1_j9N0wD2o0g"
-
-- o3 := otherContext{c4}
-- check(o3, "o3", "", "c2k2", "c3k3")
+-// Base64url encoded Token
+-const tokEnc = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiI3NjEzMjY3OTgwNjktcjVtbGpsbG4xcmQ0bHJiaGc3NWVmZ2lncDM2bTc4ajVAZGV2ZWxvcGVyLmdzZXJ2aWNlYWNjb3VudC5jb20iLCJzY29wZSI6Imh0dHBzOi8vd3d3Lmdvb2dsZWFwaXMuY29tL2F1dGgvcHJlZGljdGlvbiIsImF1ZCI6Imh0dHBzOi8vYWNjb3VudHMuZ29vZ2xlLmNvbS9vL29hdXRoMi90b2tlbiIsImV4cCI6MTMyODU1NDM4NSwiaWF0IjoxMzI4NTUwNzg1fQ.olukbHreNiYrgiGCTEmY3eWGeTvYDSUHYoE84Jz3BRPBSaMdZMNOn_0CYK7UHPO7OdvUofjwft1dH59UxE9GWS02pjFti1uAQoImaqjLZoTXr8qiF6O_kDa9JNoykklWlRAIwGIZkDupCS-8cTAnM_ksSymiH1coKJrLDUX_BM0x2f4iMFQzhL5vT1ll-ZipJ0lNlxb5QsyXxDYcxtHYguF12-vpv3ItgT0STfcXoWzIGQoEbhwB9SBp9JYcQ8Ygz6pYDjm0rWX9LrchmTyDArCodpKLFtutNgcIFUP9fWxvwd1C2dNw5GjLcKr9a_SAERyoJ2WnCR1_j9N0wD2o0g"
-
-- o4 := WithValue(o3, k3, nil)
-- check(o4, "o4", "", "c2k2", "")
--}
+-// Private key for testing
+-const privateKeyPem = `-----BEGIN RSA PRIVATE KEY-----
+-MIIEpAIBAAKCAQEA4ej0p7bQ7L/r4rVGUz9RN4VQWoej1Bg1mYWIDYslvKrk1gpj
+-7wZgkdmM7oVK2OfgrSj/FCTkInKPqaCR0gD7K80q+mLBrN3PUkDrJQZpvRZIff3/
+-xmVU1WeruQLFJjnFb2dqu0s/FY/2kWiJtBCakXvXEOb7zfbINuayL+MSsCGSdVYs
+-SliS5qQpgyDap+8b5fpXZVJkq92hrcNtbkg7hCYUJczt8n9hcCTJCfUpApvaFQ18
+-pe+zpyl4+WzkP66I28hniMQyUlA1hBiskT7qiouq0m8IOodhv2fagSZKjOTTU2xk
+-SBc//fy3ZpsL7WqgsZS7Q+0VRK8gKfqkxg5OYQIDAQABAoIBAQDGGHzQxGKX+ANk
+-nQi53v/c6632dJKYXVJC+PDAz4+bzU800Y+n/bOYsWf/kCp94XcG4Lgsdd0Gx+Zq
+-HD9CI1IcqqBRR2AFscsmmX6YzPLTuEKBGMW8twaYy3utlFxElMwoUEsrSWRcCA1y
+-nHSDzTt871c7nxCXHxuZ6Nm/XCL7Bg8uidRTSC1sQrQyKgTPhtQdYrPQ4WZ1A4J9
+-IisyDYmZodSNZe5P+LTJ6M1SCgH8KH9ZGIxv3diMwzNNpk3kxJc9yCnja4mjiGE2
+-YCNusSycU5IhZwVeCTlhQGcNeV/skfg64xkiJE34c2y2ttFbdwBTPixStGaF09nU
+-Z422D40BAoGBAPvVyRRsC3BF+qZdaSMFwI1yiXY7vQw5+JZh01tD28NuYdRFzjcJ
+-vzT2n8LFpj5ZfZFvSMLMVEFVMgQvWnN0O6xdXvGov6qlRUSGaH9u+TCPNnIldjMP
+-B8+xTwFMqI7uQr54wBB+Poq7dVRP+0oHb0NYAwUBXoEuvYo3c/nDoRcZAoGBAOWl
+-aLHjMv4CJbArzT8sPfic/8waSiLV9Ixs3Re5YREUTtnLq7LoymqB57UXJB3BNz/2
+-eCueuW71avlWlRtE/wXASj5jx6y5mIrlV4nZbVuyYff0QlcG+fgb6pcJQuO9DxMI
+-aqFGrWP3zye+LK87a6iR76dS9vRU+bHZpSVvGMKJAoGAFGt3TIKeQtJJyqeUWNSk
+-klORNdcOMymYMIlqG+JatXQD1rR6ThgqOt8sgRyJqFCVT++YFMOAqXOBBLnaObZZ
+-CFbh1fJ66BlSjoXff0W+SuOx5HuJJAa5+WtFHrPajwxeuRcNa8jwxUsB7n41wADu
+-UqWWSRedVBg4Ijbw3nWwYDECgYB0pLew4z4bVuvdt+HgnJA9n0EuYowVdadpTEJg
+-soBjNHV4msLzdNqbjrAqgz6M/n8Ztg8D2PNHMNDNJPVHjJwcR7duSTA6w2p/4k28
+-bvvk/45Ta3XmzlxZcZSOct3O31Cw0i2XDVc018IY5be8qendDYM08icNo7vQYkRH
+-504kQQKBgQDjx60zpz8ozvm1XAj0wVhi7GwXe+5lTxiLi9Fxq721WDxPMiHDW2XL
+-YXfFVy/9/GIMvEiGYdmarK1NW+VhWl1DC5xhDg0kvMfxplt4tynoq1uTsQTY31Mx
+-BeF5CT/JuNYk3bEBF0H/Q3VGO1/ggVS+YezdFbLWIRoMnLj6XCFEGg==
+------END RSA PRIVATE KEY-----`
-
--func TestAllocs(t *testing.T) {
-- bg := Background()
-- for _, test := range []struct {
-- desc string
-- f func()
-- limit float64
-- gccgoLimit float64
-- }{
-- {
-- desc: "Background()",
-- f: func() { Background() },
-- limit: 0,
-- gccgoLimit: 0,
-- },
-- {
-- desc: fmt.Sprintf("WithValue(bg, %v, nil)", k1),
-- f: func() {
-- c := WithValue(bg, k1, nil)
-- c.Value(k1)
-- },
-- limit: 1,
-- gccgoLimit: 3,
-- },
-- {
-- desc: "WithTimeout(bg, 15*time.Millisecond)",
-- f: func() {
-- c, _ := WithTimeout(bg, 15*time.Millisecond)
-- <-c.Done()
-- },
-- limit: 8,
-- gccgoLimit: 13,
-- },
-- {
-- desc: "WithCancel(bg)",
-- f: func() {
-- c, cancel := WithCancel(bg)
-- cancel()
-- <-c.Done()
-- },
-- limit: 5,
-- gccgoLimit: 8,
-- },
-- {
-- desc: "WithTimeout(bg, 100*time.Millisecond)",
-- f: func() {
-- c, cancel := WithTimeout(bg, 100*time.Millisecond)
-- cancel()
-- <-c.Done()
-- },
-- limit: 8,
-- gccgoLimit: 25,
-- },
-- } {
-- limit := test.limit
-- if runtime.Compiler == "gccgo" {
-- // gccgo does not yet do escape analysis.
-- // TOOD(iant): Remove this when gccgo does do escape analysis.
-- limit = test.gccgoLimit
-- }
-- if n := testing.AllocsPerRun(100, test.f); n > limit {
-- t.Errorf("%s allocs = %f want %d", test.desc, n, int(limit))
-- }
+-// Public key to go with the private key for testing
+-const publicKeyPem = `-----BEGIN CERTIFICATE-----
+-MIIDIzCCAgugAwIBAgIJAMfISuBQ5m+5MA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
+-BAMTCnVuaXQtdGVzdHMwHhcNMTExMjA2MTYyNjAyWhcNMjExMjAzMTYyNjAyWjAV
+-MRMwEQYDVQQDEwp1bml0LXRlc3RzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+-CgKCAQEA4ej0p7bQ7L/r4rVGUz9RN4VQWoej1Bg1mYWIDYslvKrk1gpj7wZgkdmM
+-7oVK2OfgrSj/FCTkInKPqaCR0gD7K80q+mLBrN3PUkDrJQZpvRZIff3/xmVU1Wer
+-uQLFJjnFb2dqu0s/FY/2kWiJtBCakXvXEOb7zfbINuayL+MSsCGSdVYsSliS5qQp
+-gyDap+8b5fpXZVJkq92hrcNtbkg7hCYUJczt8n9hcCTJCfUpApvaFQ18pe+zpyl4
+-+WzkP66I28hniMQyUlA1hBiskT7qiouq0m8IOodhv2fagSZKjOTTU2xkSBc//fy3
+-ZpsL7WqgsZS7Q+0VRK8gKfqkxg5OYQIDAQABo3YwdDAdBgNVHQ4EFgQU2RQ8yO+O
+-gN8oVW2SW7RLrfYd9jEwRQYDVR0jBD4wPIAU2RQ8yO+OgN8oVW2SW7RLrfYd9jGh
+-GaQXMBUxEzARBgNVBAMTCnVuaXQtdGVzdHOCCQDHyErgUOZvuTAMBgNVHRMEBTAD
+-AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBRv+M/6+FiVu7KXNjFI5pSN17OcW5QUtPr
+-odJMlWrJBtynn/TA1oJlYu3yV5clc/71Vr/AxuX5xGP+IXL32YDF9lTUJXG/uUGk
+-+JETpKmQviPbRsvzYhz4pf6ZIOZMc3/GIcNq92ECbseGO+yAgyWUVKMmZM0HqXC9
+-ovNslqe0M8C1sLm1zAR5z/h/litE7/8O2ietija3Q/qtl2TOXJdCA6sgjJX2WUql
+-ybrC55ct18NKf3qhpcEkGQvFU40rVYApJpi98DiZPYFdx1oBDp/f4uZ3ojpxRVFT
+-cDwcJLfNRCPUhormsY7fDS9xSyThiHsW9mjJYdcaKQkwYZ0F11yB
+------END CERTIFICATE-----`
+-
+-var (
+- privateKeyPemBytes = []byte(privateKeyPem)
+- publicKeyPemBytes = []byte(publicKeyPem)
+- stdHeader = &Header{Algorithm: stdAlgorithm, Type: stdType}
+-)
+-
+-// Testing the urlEncode function.
+-func TestUrlEncode(t *testing.T) {
+- enc := base64Encode([]byte(stdHeaderStr))
+- b := []byte(enc)
+- if b[len(b)-1] == 61 {
+- t.Error("TestUrlEncode: last chat == \"=\"")
+- }
+- if enc != headerEnc {
+- t.Error("TestUrlEncode: enc != headerEnc")
+- t.Errorf(" enc = %s", enc)
+- t.Errorf(" headerEnc = %s", headerEnc)
- }
-}
-
--func TestSimultaneousCancels(t *testing.T) {
-- root, cancel := WithCancel(Background())
-- m := map[Context]CancelFunc{root: cancel}
-- q := []Context{root}
-- // Create a tree of contexts.
-- for len(q) != 0 && len(m) < 100 {
-- parent := q[0]
-- q = q[1:]
-- for i := 0; i < 4; i++ {
-- ctx, cancel := WithCancel(parent)
-- m[ctx] = cancel
-- q = append(q, ctx)
-- }
+-// Test that the times are set properly.
+-func TestClaimSetSetTimes(t *testing.T) {
+- c := &ClaimSet{
+- Iss: iss,
+- Scope: scope,
- }
-- // Start all the cancels in a random order.
-- var wg sync.WaitGroup
-- wg.Add(len(m))
-- for _, cancel := range m {
-- go func(cancel CancelFunc) {
-- cancel()
-- wg.Done()
-- }(cancel)
+- iat := time.Unix(iat, 0)
+- c.setTimes(iat)
+- if c.exp.Unix() != exp {
+- t.Error("TestClaimSetSetTimes: c.exp != exp")
+- t.Errorf(" c.Exp = %d", c.exp.Unix())
+- t.Errorf(" exp = %d", exp)
- }
-- // Wait on all the contexts in a random order.
-- for ctx := range m {
-- select {
-- case <-ctx.Done():
-- case <-time.After(1 * time.Second):
-- buf := make([]byte, 10<<10)
-- n := runtime.Stack(buf, true)
-- t.Fatalf("timed out waiting for <-ctx.Done(); stacks:\n%s", buf[:n])
-- }
+-}
+-
+-// Given a well formed ClaimSet, test for proper encoding.
+-func TestClaimSetEncode(t *testing.T) {
+- c := &ClaimSet{
+- Iss: iss,
+- Scope: scope,
+- exp: time.Unix(exp, 0),
+- iat: time.Unix(iat, 0),
- }
-- // Wait for all the cancel functions to return.
-- done := make(chan struct{})
-- go func() {
-- wg.Wait()
-- close(done)
-- }()
-- select {
-- case <-done:
-- case <-time.After(1 * time.Second):
-- buf := make([]byte, 10<<10)
-- n := runtime.Stack(buf, true)
-- t.Fatalf("timed out waiting for cancel functions; stacks:\n%s", buf[:n])
+- enc := c.encode()
+- re, err := base64Decode(enc)
+- if err != nil {
+- t.Fatalf("error decoding encoded claim set: %v", err)
- }
--}
-
--func TestInterlockedCancels(t *testing.T) {
-- parent, cancelParent := WithCancel(Background())
-- child, cancelChild := WithCancel(parent)
-- go func() {
-- parent.Done()
-- cancelChild()
-- }()
-- cancelParent()
-- select {
-- case <-child.Done():
-- case <-time.After(1 * time.Second):
-- buf := make([]byte, 10<<10)
-- n := runtime.Stack(buf, true)
-- t.Fatalf("timed out waiting for child.Done(); stacks:\n%s", buf[:n])
+- wa, err := base64Decode(claimSetEnc)
+- if err != nil {
+- t.Fatalf("error decoding encoded expected claim set: %v", err)
- }
--}
-
--func TestLayersCancel(t *testing.T) {
-- testLayers(t, time.Now().UnixNano(), false)
+- if enc != claimSetEnc {
+- t.Error("TestClaimSetEncode: enc != claimSetEnc")
+- t.Errorf(" enc = %s", string(re))
+- t.Errorf(" claimSetEnc = %s", string(wa))
+- }
-}
-
--func TestLayersTimeout(t *testing.T) {
-- testLayers(t, time.Now().UnixNano(), true)
--}
+-// Test that claim sets with private claim names are encoded correctly.
+-func TestClaimSetWithPrivateNameEncode(t *testing.T) {
+- iatT := time.Unix(iat, 0)
+- expT := time.Unix(exp, 0)
-
--func testLayers(t *testing.T, seed int64, testTimeout bool) {
-- rand.Seed(seed)
-- errorf := func(format string, a ...interface{}) {
-- t.Errorf(fmt.Sprintf("seed=%d: %s", seed, format), a...)
-- }
-- const (
-- timeout = 200 * time.Millisecond
-- minLayers = 30
-- )
-- type value int
-- var (
-- vals []*value
-- cancels []CancelFunc
-- numTimers int
-- ctx = Background()
-- )
-- for i := 0; i < minLayers || numTimers == 0 || len(cancels) == 0 || len(vals) == 0; i++ {
-- switch rand.Intn(3) {
-- case 0:
-- v := new(value)
-- ctx = WithValue(ctx, v, v)
-- vals = append(vals, v)
-- case 1:
-- var cancel CancelFunc
-- ctx, cancel = WithCancel(ctx)
-- cancels = append(cancels, cancel)
-- case 2:
-- var cancel CancelFunc
-- ctx, cancel = WithTimeout(ctx, timeout)
-- cancels = append(cancels, cancel)
-- numTimers++
-- }
-- }
-- checkValues := func(when string) {
-- for _, key := range vals {
-- if val := ctx.Value(key).(*value); key != val {
-- errorf("%s: ctx.Value(%p) = %p want %p", when, key, val, key)
-- }
-- }
+- i, err := json.Marshal(iatT.Unix())
+- if err != nil {
+- t.Fatalf("error marshaling iatT value of %v: %v", iatT.Unix(), err)
- }
-- select {
-- case <-ctx.Done():
-- errorf("ctx should not be canceled yet")
-- default:
+- iatStr := string(i)
+- e, err := json.Marshal(expT.Unix())
+- if err != nil {
+- t.Fatalf("error marshaling expT value of %v: %v", expT.Unix(), err)
- }
-- if s, prefix := fmt.Sprint(ctx), "context.Background."; !strings.HasPrefix(s, prefix) {
-- t.Errorf("ctx.String() = %q want prefix %q", s, prefix)
+-
+- expStr := string(e)
+-
+- testCases := []struct {
+- desc string
+- input map[string]interface{}
+- want string
+- }{
+- // Test a simple int field.
+- {
+- "single simple field",
+- map[string]interface{}{"amount": 22},
+- `{` +
+- `"iss":"` + iss + `",` +
+- `"scope":"` + scope + `",` +
+- `"aud":"` + stdAud + `",` +
+- `"exp":` + expStr + `,` +
+- `"iat":` + iatStr + `,` +
+- `"amount":22` +
+- `}`,
+- },
+- {
+- "multiple simple fields",
+- map[string]interface{}{"tracking_code": "axZf", "amount": 22},
+- `{` +
+- `"iss":"` + iss + `",` +
+- `"scope":"` + scope + `",` +
+- `"aud":"` + stdAud + `",` +
+- `"exp":` + expStr + `,` +
+- `"iat":` + iatStr + `,` +
+- `"amount":22,` +
+- `"tracking_code":"axZf"` +
+- `}`,
+- },
+- {
+- "nested struct fields",
+- map[string]interface{}{
+- "tracking_code": "axZf",
+- "purchase": struct {
+- Description string `json:"desc"`
+- Quantity int32 `json:"q"`
+- Time int64 `json:"t"`
+- }{
+- "toaster",
+- 5,
+- iat,
+- },
+- },
+- `{` +
+- `"iss":"` + iss + `",` +
+- `"scope":"` + scope + `",` +
+- `"aud":"` + stdAud + `",` +
+- `"exp":` + expStr + `,` +
+- `"iat":` + iatStr + `,` +
+- `"purchase":{"desc":"toaster","q":5,"t":` + iatStr + `},` +
+- `"tracking_code":"axZf"` +
+- `}`,
+- },
- }
-- t.Log(ctx)
-- checkValues("before cancel")
-- if testTimeout {
-- select {
-- case <-ctx.Done():
-- case <-time.After(timeout + timeout/10):
-- errorf("ctx should have timed out")
+-
+- for _, testCase := range testCases {
+- c := &ClaimSet{
+- Iss: iss,
+- Scope: scope,
+- Aud: stdAud,
+- iat: iatT,
+- exp: expT,
+- PrivateClaims: testCase.input,
- }
-- checkValues("after timeout")
-- } else {
-- cancel := cancels[rand.Intn(len(cancels))]
-- cancel()
-- select {
-- case <-ctx.Done():
-- default:
-- errorf("ctx should be canceled")
+- cJSON, err := base64Decode(c.encode())
+- if err != nil {
+- t.Fatalf("error decoding claim set: %v", err)
+- }
+- if string(cJSON) != testCase.want {
+- t.Errorf("TestClaimSetWithPrivateNameEncode: enc != want in case %s", testCase.desc)
+- t.Errorf(" enc = %s", cJSON)
+- t.Errorf(" want = %s", testCase.want)
- }
-- checkValues("after cancel")
- }
-}
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/context/withtimeout_test.go b/Godeps/_workspace/src/code.google.com/p/go.net/context/withtimeout_test.go
-deleted file mode 100644
-index 0d00b3d..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/context/withtimeout_test.go
-+++ /dev/null
-@@ -1,26 +0,0 @@
--// Copyright 2014 The Go Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--package context_test
--
--import (
-- "fmt"
-- "time"
--
-- "code.google.com/p/go.net/context"
--)
-
--func ExampleWithTimeout() {
-- // Pass a context with a timeout to tell a blocking function that it
-- // should abandon its work after the timeout elapses.
-- ctx, _ := context.WithTimeout(context.Background(), 100*time.Millisecond)
-- select {
-- case <-time.After(200 * time.Millisecond):
-- fmt.Println("overslept")
-- case <-ctx.Done():
-- fmt.Println(ctx.Err()) // prints "context deadline exceeded"
+-// Test the NewToken constructor.
+-func TestNewToken(t *testing.T) {
+- tok := NewToken(iss, scope, privateKeyPemBytes)
+- if tok.ClaimSet.Iss != iss {
+- t.Error("TestNewToken: tok.ClaimSet.Iss != iss")
+- t.Errorf(" tok.ClaimSet.Iss = %s", tok.ClaimSet.Iss)
+- t.Errorf(" iss = %s", iss)
- }
-- // Output:
-- // context deadline exceeded
--}
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/atom/atom.go b/Godeps/_workspace/src/code.google.com/p/go.net/html/atom/atom.go
-deleted file mode 100644
-index 227404b..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/atom/atom.go
-+++ /dev/null
-@@ -1,78 +0,0 @@
--// Copyright 2012 The Go Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--// Package atom provides integer codes (also known as atoms) for a fixed set of
--// frequently occurring HTML strings: tag names and attribute keys such as "p"
--// and "id".
--//
--// Sharing an atom's name between all elements with the same tag can result in
--// fewer string allocations when tokenizing and parsing HTML. Integer
--// comparisons are also generally faster than string comparisons.
--//
--// The value of an atom's particular code is not guaranteed to stay the same
--// between versions of this package. Neither is any ordering guaranteed:
--// whether atom.H1 < atom.H2 may also change. The codes are not guaranteed to
--// be dense. The only guarantees are that e.g. looking up "div" will yield
--// atom.Div, calling atom.Div.String will return "div", and atom.Div != 0.
--package atom
--
--// Atom is an integer code for a string. The zero value maps to "".
--type Atom uint32
--
--// String returns the atom's name.
--func (a Atom) String() string {
-- start := uint32(a >> 8)
-- n := uint32(a & 0xff)
-- if start+n > uint32(len(atomText)) {
-- return ""
+- if tok.ClaimSet.Scope != scope {
+- t.Error("TestNewToken: tok.ClaimSet.Scope != scope")
+- t.Errorf(" tok.ClaimSet.Scope = %s", tok.ClaimSet.Scope)
+- t.Errorf(" scope = %s", scope)
+- }
+- if tok.ClaimSet.Aud != stdAud {
+- t.Error("TestNewToken: tok.ClaimSet.Aud != stdAud")
+- t.Errorf(" tok.ClaimSet.Aud = %s", tok.ClaimSet.Aud)
+- t.Errorf(" stdAud = %s", stdAud)
+- }
+- if !bytes.Equal(tok.Key, privateKeyPemBytes) {
+- t.Error("TestNewToken: tok.Key != privateKeyPemBytes")
+- t.Errorf(" tok.Key = %s", tok.Key)
+- t.Errorf(" privateKeyPemBytes = %s", privateKeyPemBytes)
- }
-- return atomText[start : start+n]
--}
--
--func (a Atom) string() string {
-- return atomText[a>>8 : a>>8+a&0xff]
-}
-
--// fnv computes the FNV hash with an arbitrary starting value h.
--func fnv(h uint32, s []byte) uint32 {
-- for i := range s {
-- h ^= uint32(s[i])
-- h *= 16777619
+-// Make sure the private key parsing functions work.
+-func TestParsePrivateKey(t *testing.T) {
+- tok := &Token{
+- Key: privateKeyPemBytes,
+- }
+- err := tok.parsePrivateKey()
+- if err != nil {
+- t.Errorf("TestParsePrivateKey:tok.parsePrivateKey: %v", err)
- }
-- return h
-}
-
--func match(s string, t []byte) bool {
-- for i, c := range t {
-- if s[i] != c {
-- return false
-- }
+-// Test that the token signature generated matches the golden standard.
+-func TestTokenSign(t *testing.T) {
+- tok := &Token{
+- Key: privateKeyPemBytes,
+- claim: claimSetEnc,
+- header: headerEnc,
+- }
+- err := tok.parsePrivateKey()
+- if err != nil {
+- t.Errorf("TestTokenSign:tok.parsePrivateKey: %v", err)
+- }
+- err = tok.sign()
+- if err != nil {
+- t.Errorf("TestTokenSign:tok.sign: %v", err)
+- }
+- if tok.sig != sigEnc {
+- t.Error("TestTokenSign: tok.sig != sigEnc")
+- t.Errorf(" tok.sig = %s", tok.sig)
+- t.Errorf(" sigEnc = %s", sigEnc)
- }
-- return true
-}
-
--// Lookup returns the atom whose name is s. It returns zero if there is no
--// such atom. The lookup is case sensitive.
--func Lookup(s []byte) Atom {
-- if len(s) == 0 || len(s) > maxAtomLen {
-- return 0
+-// Test that the token expiration function is working.
+-func TestTokenExpired(t *testing.T) {
+- c := &ClaimSet{}
+- tok := &Token{
+- ClaimSet: c,
- }
-- h := fnv(hash0, s)
-- if a := table[h&uint32(len(table)-1)]; int(a&0xff) == len(s) && match(a.string(), s) {
-- return a
+- now := time.Now()
+- c.setTimes(now)
+- if tok.Expired() != false {
+- t.Error("TestTokenExpired: tok.Expired != false")
- }
-- if a := table[(h>>16)&uint32(len(table)-1)]; int(a&0xff) == len(s) && match(a.string(), s) {
-- return a
+- // Set the times as if they were set 2 hours ago.
+- c.setTimes(now.Add(-2 * time.Hour))
+- if tok.Expired() != true {
+- t.Error("TestTokenExpired: tok.Expired != true")
- }
-- return 0
-}
-
--// String returns a string whose contents are equal to s. In that sense, it is
--// equivalent to string(s) but may be more efficient.
--func String(s []byte) string {
-- if a := Lookup(s); a != 0 {
-- return a.String()
+-// Given a well formed Token, test for proper encoding.
+-func TestTokenEncode(t *testing.T) {
+- c := &ClaimSet{
+- Iss: iss,
+- Scope: scope,
+- exp: time.Unix(exp, 0),
+- iat: time.Unix(iat, 0),
+- }
+- tok := &Token{
+- ClaimSet: c,
+- Header: stdHeader,
+- Key: privateKeyPemBytes,
+- }
+- enc, err := tok.Encode()
+- if err != nil {
+- t.Errorf("TestTokenEncode:tok.Assertion: %v", err)
+- }
+- if enc != tokEnc {
+- t.Error("TestTokenEncode: enc != tokEnc")
+- t.Errorf(" enc = %s", enc)
+- t.Errorf(" tokEnc = %s", tokEnc)
- }
-- return string(s)
-}
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/atom/atom_test.go b/Godeps/_workspace/src/code.google.com/p/go.net/html/atom/atom_test.go
-deleted file mode 100644
-index 6e33704..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/atom/atom_test.go
-+++ /dev/null
-@@ -1,109 +0,0 @@
--// Copyright 2012 The Go Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
-
--package atom
--
--import (
-- "sort"
-- "testing"
--)
--
--func TestKnown(t *testing.T) {
-- for _, s := range testAtomList {
-- if atom := Lookup([]byte(s)); atom.String() != s {
-- t.Errorf("Lookup(%q) = %#x (%q)", s, uint32(atom), atom.String())
-- }
+-// Given a well formed Token we should get back a well formed request.
+-func TestBuildRequest(t *testing.T) {
+- c := &ClaimSet{
+- Iss: iss,
+- Scope: scope,
+- exp: time.Unix(exp, 0),
+- iat: time.Unix(iat, 0),
+- }
+- tok := &Token{
+- ClaimSet: c,
+- Header: stdHeader,
+- Key: privateKeyPemBytes,
+- }
+- u, v, err := tok.buildRequest()
+- if err != nil {
+- t.Errorf("TestBuildRequest:BuildRequest: %v", err)
+- }
+- if u != c.Aud {
+- t.Error("TestBuildRequest: u != c.Aud")
+- t.Errorf(" u = %s", u)
+- t.Errorf(" c.Aud = %s", c.Aud)
+- }
+- if v.Get("grant_type") != stdGrantType {
+- t.Error("TestBuildRequest: grant_type != stdGrantType")
+- t.Errorf(" grant_type = %s", v.Get("grant_type"))
+- t.Errorf(" stdGrantType = %s", stdGrantType)
+- }
+- if v.Get("assertion") != tokEnc {
+- t.Error("TestBuildRequest: assertion != tokEnc")
+- t.Errorf(" assertion = %s", v.Get("assertion"))
+- t.Errorf(" tokEnc = %s", tokEnc)
- }
-}
-
--func TestHits(t *testing.T) {
-- for _, a := range table {
-- if a == 0 {
-- continue
-- }
-- got := Lookup([]byte(a.String()))
-- if got != a {
-- t.Errorf("Lookup(%q) = %#x, want %#x", a.String(), uint32(got), uint32(a))
-- }
+-// Given a well formed access request response we should get back a oauth.Token.
+-func TestHandleResponse(t *testing.T) {
+- rb := &respBody{
+- Access: "1/8xbJqaOZXSUZbHLl5EOtu1pxz3fmmetKx9W8CV4t79M",
+- Type: "Bearer",
+- ExpiresIn: 3600,
+- }
+- b, err := json.Marshal(rb)
+- if err != nil {
+- t.Errorf("TestHandleResponse:json.Marshal: %v", err)
+- }
+- r := &http.Response{
+- Status: "200 OK",
+- StatusCode: 200,
+- Body: ioutil.NopCloser(bytes.NewReader(b)),
+- }
+- o, err := handleResponse(r)
+- if err != nil {
+- t.Errorf("TestHandleResponse:handleResponse: %v", err)
+- }
+- if o.AccessToken != rb.Access {
+- t.Error("TestHandleResponse: o.AccessToken != rb.Access")
+- t.Errorf(" o.AccessToken = %s", o.AccessToken)
+- t.Errorf(" rb.Access = %s", rb.Access)
+- }
+- if o.Expired() {
+- t.Error("TestHandleResponse: o.Expired == true")
- }
-}
-
--func TestMisses(t *testing.T) {
-- testCases := []string{
-- "",
-- "\x00",
-- "\xff",
-- "A",
-- "DIV",
-- "Div",
-- "dIV",
-- "aa",
-- "a\x00",
-- "ab",
-- "abb",
-- "abbr0",
-- "abbr ",
-- " abbr",
-- " a",
-- "acceptcharset",
-- "acceptCharset",
-- "accept_charset",
-- "h0",
-- "h1h2",
-- "h7",
-- "onClick",
-- "λ",
-- // The following string has the same hash (0xa1d7fab7) as "onmouseover".
-- "\x00\x00\x00\x00\x00\x50\x18\xae\x38\xd0\xb7",
-- }
-- for _, tc := range testCases {
-- got := Lookup([]byte(tc))
-- if got != 0 {
-- t.Errorf("Lookup(%q): got %d, want 0", tc, got)
-- }
+-// passthrough signature for test
+-type FakeSigner struct{}
+-
+-func (f FakeSigner) Sign(tok *Token) ([]byte, []byte, error) {
+- block, _ := pem.Decode(privateKeyPemBytes)
+- pKey, _ := x509.ParsePKCS1PrivateKey(block.Bytes)
+- ss := headerEnc + "." + claimSetEnc
+- h := sha256.New()
+- h.Write([]byte(ss))
+- b, _ := rsa.SignPKCS1v15(rand.Reader, pKey, crypto.SHA256, h.Sum(nil))
+- return []byte(ss), b, nil
+-}
+-
+-// Given an external signer, get back a valid and signed JWT
+-func TestExternalSigner(t *testing.T) {
+- tok := NewSignerToken(iss, scope, FakeSigner{})
+- enc, _ := tok.Encode()
+- if enc != tokEnc {
+- t.Errorf("TestExternalSigner: enc != tokEnc")
+- t.Errorf(" enc = %s", enc)
+- t.Errorf(" tokEnc = %s", tokEnc)
- }
-}
-
--func TestForeignObject(t *testing.T) {
-- const (
-- afo = Foreignobject
-- afO = ForeignObject
-- sfo = "foreignobject"
-- sfO = "foreignObject"
-- )
-- if got := Lookup([]byte(sfo)); got != afo {
-- t.Errorf("Lookup(%q): got %#v, want %#v", sfo, got, afo)
+-func TestHandleResponseWithNewExpiry(t *testing.T) {
+- rb := &respBody{
+- IdToken: tokEnc,
- }
-- if got := Lookup([]byte(sfO)); got != afO {
-- t.Errorf("Lookup(%q): got %#v, want %#v", sfO, got, afO)
+- b, err := json.Marshal(rb)
+- if err != nil {
+- t.Errorf("TestHandleResponse:json.Marshal: %v", err)
- }
-- if got := afo.String(); got != sfo {
-- t.Errorf("Atom(%#v).String(): got %q, want %q", afo, got, sfo)
+- r := &http.Response{
+- Status: "200 OK",
+- StatusCode: 200,
+- Body: ioutil.NopCloser(bytes.NewReader(b)),
- }
-- if got := afO.String(); got != sfO {
-- t.Errorf("Atom(%#v).String(): got %q, want %q", afO, got, sfO)
+- o, err := handleResponse(r)
+- if err != nil {
+- t.Errorf("TestHandleResponse:handleResponse: %v", err)
+- }
+- if o.Expiry != time.Unix(exp, 0) {
+- t.Error("TestHandleResponse: o.Expiry != exp")
+- t.Errorf(" o.Expiry = %s", o.Expiry)
+- t.Errorf(" exp = %s", time.Unix(exp, 0))
- }
-}
-
--func BenchmarkLookup(b *testing.B) {
-- sortedTable := make([]string, 0, len(table))
-- for _, a := range table {
-- if a != 0 {
-- sortedTable = append(sortedTable, a.String())
-- }
-- }
-- sort.Strings(sortedTable)
+-// Placeholder for future Assert tests.
+-func TestAssert(t *testing.T) {
+- // Since this method makes a call to BuildRequest, an htttp.Client, and
+- // finally HandleResponse there is not much more to test. This is here
+- // as a placeholder if that changes.
+-}
-
-- x := make([][]byte, 1000)
-- for i := range x {
-- x[i] = []byte(sortedTable[i%len(sortedTable)])
+-// Benchmark for the end-to-end encoding of a well formed token.
+-func BenchmarkTokenEncode(b *testing.B) {
+- b.StopTimer()
+- c := &ClaimSet{
+- Iss: iss,
+- Scope: scope,
+- exp: time.Unix(exp, 0),
+- iat: time.Unix(iat, 0),
- }
--
-- b.ResetTimer()
+- tok := &Token{
+- ClaimSet: c,
+- Key: privateKeyPemBytes,
+- }
+- b.StartTimer()
- for i := 0; i < b.N; i++ {
-- for _, s := range x {
-- Lookup(s)
-- }
+- tok.Encode()
- }
-}
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/atom/gen.go b/Godeps/_workspace/src/code.google.com/p/go.net/html/atom/gen.go
+diff --git a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/oauth.go b/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/oauth.go
deleted file mode 100644
-index 9958a71..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/atom/gen.go
+index 79d603d..0000000
+--- a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/oauth.go
+++ /dev/null
-@@ -1,636 +0,0 @@
--// Copyright 2012 The Go Authors. All rights reserved.
+@@ -1,405 +0,0 @@
+-// Copyright 2011 The goauth2 Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
--// +build ignore
--
--package main
--
--// This program generates table.go and table_test.go.
--// Invoke as
+-// The oauth package provides support for making
+-// OAuth2-authenticated HTTP requests.
-//
--// go run gen.go |gofmt >table.go
--// go run gen.go -test |gofmt >table_test.go
+-// Example usage:
+-//
+-// // Specify your configuration. (typically as a global variable)
+-// var config = &oauth.Config{
+-// ClientId: YOUR_CLIENT_ID,
+-// ClientSecret: YOUR_CLIENT_SECRET,
+-// Scope: "https://www.googleapis.com/auth/buzz",
+-// AuthURL: "https://accounts.google.com/o/oauth2/auth",
+-// TokenURL: "https://accounts.google.com/o/oauth2/token",
+-// RedirectURL: "http://you.example.org/handler",
+-// }
+-//
+-// // A landing page redirects to the OAuth provider to get the auth code.
+-// func landing(w http.ResponseWriter, r *http.Request) {
+-// http.Redirect(w, r, config.AuthCodeURL("foo"), http.StatusFound)
+-// }
+-//
+-// // The user will be redirected back to this handler, that takes the
+-// // "code" query parameter and Exchanges it for an access token.
+-// func handler(w http.ResponseWriter, r *http.Request) {
+-// t := &oauth.Transport{Config: config}
+-// t.Exchange(r.FormValue("code"))
+-// // The Transport now has a valid Token. Create an *http.Client
+-// // with which we can make authenticated API requests.
+-// c := t.Client()
+-// c.Post(...)
+-// // ...
+-// // btw, r.FormValue("state") == "foo"
+-// }
+-//
+-package oauth
-
-import (
-- "flag"
+- "encoding/json"
+- "errors"
- "fmt"
-- "math/rand"
+- "io"
+- "io/ioutil"
+- "mime"
+- "net/http"
+- "net/url"
- "os"
-- "sort"
- "strings"
+- "time"
-)
-
--// identifier converts s to a Go exported identifier.
--// It converts "div" to "Div" and "accept-charset" to "AcceptCharset".
--func identifier(s string) string {
-- b := make([]byte, 0, len(s))
-- cap := true
-- for _, c := range s {
-- if c == '-' {
-- cap = true
-- continue
-- }
-- if cap && 'a' <= c && c <= 'z' {
-- c -= 'a' - 'A'
-- }
-- cap = false
-- b = append(b, byte(c))
-- }
-- return string(b)
+-type OAuthError struct {
+- prefix string
+- msg string
-}
-
--var test = flag.Bool("test", false, "generate table_test.go")
+-func (oe OAuthError) Error() string {
+- return "OAuthError: " + oe.prefix + ": " + oe.msg
+-}
-
--func main() {
-- flag.Parse()
+-// Cache specifies the methods that implement a Token cache.
+-type Cache interface {
+- Token() (*Token, error)
+- PutToken(*Token) error
+-}
-
-- var all []string
-- all = append(all, elements...)
-- all = append(all, attributes...)
-- all = append(all, eventHandlers...)
-- all = append(all, extra...)
-- sort.Strings(all)
+-// CacheFile implements Cache. Its value is the name of the file in which
+-// the Token is stored in JSON format.
+-type CacheFile string
-
-- if *test {
-- fmt.Printf("// generated by go run gen.go -test; DO NOT EDIT\n\n")
-- fmt.Printf("package atom\n\n")
-- fmt.Printf("var testAtomList = []string{\n")
-- for _, s := range all {
-- fmt.Printf("\t%q,\n", s)
-- }
-- fmt.Printf("}\n")
-- return
+-func (f CacheFile) Token() (*Token, error) {
+- file, err := os.Open(string(f))
+- if err != nil {
+- return nil, OAuthError{"CacheFile.Token", err.Error()}
- }
--
-- // uniq - lists have dups
-- // compute max len too
-- maxLen := 0
-- w := 0
-- for _, s := range all {
-- if w == 0 || all[w-1] != s {
-- if maxLen < len(s) {
-- maxLen = len(s)
-- }
-- all[w] = s
-- w++
-- }
+- defer file.Close()
+- tok := &Token{}
+- if err := json.NewDecoder(file).Decode(tok); err != nil {
+- return nil, OAuthError{"CacheFile.Token", err.Error()}
- }
-- all = all[:w]
+- return tok, nil
+-}
-
-- // Find hash that minimizes table size.
-- var best *table
-- for i := 0; i < 1000000; i++ {
-- if best != nil && 1<<(best.k-1) < len(all) {
-- break
-- }
-- h := rand.Uint32()
-- for k := uint(0); k <= 16; k++ {
-- if best != nil && k >= best.k {
-- break
-- }
-- var t table
-- if t.init(h, k, all) {
-- best = &t
-- break
-- }
-- }
+-func (f CacheFile) PutToken(tok *Token) error {
+- file, err := os.OpenFile(string(f), os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0600)
+- if err != nil {
+- return OAuthError{"CacheFile.PutToken", err.Error()}
- }
-- if best == nil {
-- fmt.Fprintf(os.Stderr, "failed to construct string table\n")
-- os.Exit(1)
+- if err := json.NewEncoder(file).Encode(tok); err != nil {
+- file.Close()
+- return OAuthError{"CacheFile.PutToken", err.Error()}
- }
--
-- // Lay out strings, using overlaps when possible.
-- layout := append([]string{}, all...)
--
-- // Remove strings that are substrings of other strings
-- for changed := true; changed; {
-- changed = false
-- for i, s := range layout {
-- if s == "" {
-- continue
-- }
-- for j, t := range layout {
-- if i != j && t != "" && strings.Contains(s, t) {
-- changed = true
-- layout[j] = ""
-- }
-- }
-- }
+- if err := file.Close(); err != nil {
+- return OAuthError{"CacheFile.PutToken", err.Error()}
- }
+- return nil
+-}
-
-- // Join strings where one suffix matches another prefix.
-- for {
-- // Find best i, j, k such that layout[i][len-k:] == layout[j][:k],
-- // maximizing overlap length k.
-- besti := -1
-- bestj := -1
-- bestk := 0
-- for i, s := range layout {
-- if s == "" {
-- continue
-- }
-- for j, t := range layout {
-- if i == j {
-- continue
-- }
-- for k := bestk + 1; k <= len(s) && k <= len(t); k++ {
-- if s[len(s)-k:] == t[:k] {
-- besti = i
-- bestj = j
-- bestk = k
-- }
-- }
-- }
-- }
-- if bestk > 0 {
-- layout[besti] += layout[bestj][bestk:]
-- layout[bestj] = ""
-- continue
-- }
-- break
-- }
+-// Config is the configuration of an OAuth consumer.
+-type Config struct {
+- // ClientId is the OAuth client identifier used when communicating with
+- // the configured OAuth provider.
+- ClientId string
-
-- text := strings.Join(layout, "")
+- // ClientSecret is the OAuth client secret used when communicating with
+- // the configured OAuth provider.
+- ClientSecret string
-
-- atom := map[string]uint32{}
-- for _, s := range all {
-- off := strings.Index(text, s)
-- if off < 0 {
-- panic("lost string " + s)
-- }
-- atom[s] = uint32(off<<8 | len(s))
-- }
+- // Scope identifies the level of access being requested. Multiple scope
+- // values should be provided as a space-delimited string.
+- Scope string
-
-- // Generate the Go code.
-- fmt.Printf("// generated by go run gen.go; DO NOT EDIT\n\n")
-- fmt.Printf("package atom\n\nconst (\n")
-- for _, s := range all {
-- fmt.Printf("\t%s Atom = %#x\n", identifier(s), atom[s])
-- }
-- fmt.Printf(")\n\n")
+- // AuthURL is the URL the user will be directed to in order to grant
+- // access.
+- AuthURL string
-
-- fmt.Printf("const hash0 = %#x\n\n", best.h0)
-- fmt.Printf("const maxAtomLen = %d\n\n", maxLen)
+- // TokenURL is the URL used to retrieve OAuth tokens.
+- TokenURL string
-
-- fmt.Printf("var table = [1<<%d]Atom{\n", best.k)
-- for i, s := range best.tab {
-- if s == "" {
-- continue
-- }
-- fmt.Printf("\t%#x: %#x, // %s\n", i, atom[s], s)
-- }
-- fmt.Printf("}\n")
-- datasize := (1 << best.k) * 4
+- // RedirectURL is the URL to which the user will be returned after
+- // granting (or denying) access.
+- RedirectURL string
-
-- fmt.Printf("const atomText =\n")
-- textsize := len(text)
-- for len(text) > 60 {
-- fmt.Printf("\t%q +\n", text[:60])
-- text = text[60:]
-- }
-- fmt.Printf("\t%q\n\n", text)
+- // TokenCache allows tokens to be cached for subsequent requests.
+- TokenCache Cache
-
-- fmt.Fprintf(os.Stderr, "%d atoms; %d string bytes + %d tables = %d total data\n", len(all), textsize, datasize, textsize+datasize)
--}
+- AccessType string // Optional, "online" (default) or "offline", no refresh token if "online"
-
--type byLen []string
+- // ApprovalPrompt indicates whether the user should be
+- // re-prompted for consent. If set to "auto" (default) the
+- // user will be prompted only if they haven't previously
+- // granted consent and the code can only be exchanged for an
+- // access token.
+- // If set to "force" the user will always be prompted, and the
+- // code can be exchanged for a refresh token.
+- ApprovalPrompt string
+-}
-
--func (x byLen) Less(i, j int) bool { return len(x[i]) > len(x[j]) }
--func (x byLen) Swap(i, j int) { x[i], x[j] = x[j], x[i] }
--func (x byLen) Len() int { return len(x) }
+-// Token contains an end-user's tokens.
+-// This is the data you must store to persist authentication.
+-type Token struct {
+- AccessToken string
+- RefreshToken string
+- Expiry time.Time // If zero the token has no (known) expiry time.
+- Extra map[string]string // May be nil.
+-}
-
--// fnv computes the FNV hash with an arbitrary starting value h.
--func fnv(h uint32, s string) uint32 {
-- for i := 0; i < len(s); i++ {
-- h ^= uint32(s[i])
-- h *= 16777619
+-func (t *Token) Expired() bool {
+- if t.Expiry.IsZero() {
+- return false
- }
-- return h
+- return t.Expiry.Before(time.Now())
-}
-
--// A table represents an attempt at constructing the lookup table.
--// The lookup table uses cuckoo hashing, meaning that each string
--// can be found in one of two positions.
--type table struct {
-- h0 uint32
-- k uint
-- mask uint32
-- tab []string
+-// Transport implements http.RoundTripper. When configured with a valid
+-// Config and Token it can be used to make authenticated HTTP requests.
+-//
+-// t := &oauth.Transport{config}
+-// t.Exchange(code)
+-// // t now contains a valid Token
+-// r, _, err := t.Client().Get("http://example.org/url/requiring/auth")
+-//
+-// It will automatically refresh the Token if it can,
+-// updating the supplied Token in place.
+-type Transport struct {
+- *Config
+- *Token
+-
+- // Transport is the HTTP transport to use when making requests.
+- // It will default to http.DefaultTransport if nil.
+- // (It should never be an oauth.Transport.)
+- Transport http.RoundTripper
-}
-
--// hash returns the two hashes for s.
--func (t *table) hash(s string) (h1, h2 uint32) {
-- h := fnv(t.h0, s)
-- h1 = h & t.mask
-- h2 = (h >> 16) & t.mask
-- return
+-// Client returns an *http.Client that makes OAuth-authenticated requests.
+-func (t *Transport) Client() *http.Client {
+- return &http.Client{Transport: t}
-}
-
--// init initializes the table with the given parameters.
--// h0 is the initial hash value,
--// k is the number of bits of hash value to use, and
--// x is the list of strings to store in the table.
--// init returns false if the table cannot be constructed.
--func (t *table) init(h0 uint32, k uint, x []string) bool {
-- t.h0 = h0
-- t.k = k
-- t.tab = make([]string, 1<<k)
-- t.mask = 1<<k - 1
-- for _, s := range x {
-- if !t.insert(s) {
-- return false
-- }
+-func (t *Transport) transport() http.RoundTripper {
+- if t.Transport != nil {
+- return t.Transport
- }
-- return true
+- return http.DefaultTransport
-}
-
--// insert inserts s in the table.
--func (t *table) insert(s string) bool {
-- h1, h2 := t.hash(s)
-- if t.tab[h1] == "" {
-- t.tab[h1] = s
-- return true
+-// AuthCodeURL returns a URL that the end-user should be redirected to,
+-// so that they may obtain an authorization code.
+-func (c *Config) AuthCodeURL(state string) string {
+- url_, err := url.Parse(c.AuthURL)
+- if err != nil {
+- panic("AuthURL malformed: " + err.Error())
- }
-- if t.tab[h2] == "" {
-- t.tab[h2] = s
-- return true
+- q := url.Values{
+- "response_type": {"code"},
+- "client_id": {c.ClientId},
+- "redirect_uri": {c.RedirectURL},
+- "scope": {c.Scope},
+- "state": {state},
+- "access_type": {c.AccessType},
+- "approval_prompt": {c.ApprovalPrompt},
+- }.Encode()
+- if url_.RawQuery == "" {
+- url_.RawQuery = q
+- } else {
+- url_.RawQuery += "&" + q
- }
-- if t.push(h1, 0) {
-- t.tab[h1] = s
-- return true
+- return url_.String()
+-}
+-
+-// Exchange takes a code and gets access Token from the remote server.
+-func (t *Transport) Exchange(code string) (*Token, error) {
+- if t.Config == nil {
+- return nil, OAuthError{"Exchange", "no Config supplied"}
- }
-- if t.push(h2, 0) {
-- t.tab[h2] = s
-- return true
+-
+- // If the transport or the cache already has a token, it is
+- // passed to `updateToken` to preserve existing refresh token.
+- tok := t.Token
+- if tok == nil && t.TokenCache != nil {
+- tok, _ = t.TokenCache.Token()
- }
-- return false
+- if tok == nil {
+- tok = new(Token)
+- }
+- err := t.updateToken(tok, url.Values{
+- "grant_type": {"authorization_code"},
+- "redirect_uri": {t.RedirectURL},
+- "scope": {t.Scope},
+- "code": {code},
+- })
+- if err != nil {
+- return nil, err
+- }
+- t.Token = tok
+- if t.TokenCache != nil {
+- return tok, t.TokenCache.PutToken(tok)
+- }
+- return tok, nil
-}
-
--// push attempts to push aside the entry in slot i.
--func (t *table) push(i uint32, depth int) bool {
-- if depth > len(t.tab) {
-- return false
+-// RoundTrip executes a single HTTP transaction using the Transport's
+-// Token as authorization headers.
+-//
+-// This method will attempt to renew the Token if it has expired and may return
+-// an error related to that Token renewal before attempting the client request.
+-// If the Token cannot be renewed a non-nil os.Error value will be returned.
+-// If the Token is invalid callers should expect HTTP-level errors,
+-// as indicated by the Response's StatusCode.
+-func (t *Transport) RoundTrip(req *http.Request) (*http.Response, error) {
+- if t.Token == nil {
+- if t.Config == nil {
+- return nil, OAuthError{"RoundTrip", "no Config supplied"}
+- }
+- if t.TokenCache == nil {
+- return nil, OAuthError{"RoundTrip", "no Token supplied"}
+- }
+- var err error
+- t.Token, err = t.TokenCache.Token()
+- if err != nil {
+- return nil, err
+- }
- }
-- s := t.tab[i]
-- h1, h2 := t.hash(s)
-- j := h1 + h2 - i
-- if t.tab[j] != "" && !t.push(j, depth+1) {
-- return false
+-
+- // Refresh the Token if it has expired.
+- if t.Expired() {
+- if err := t.Refresh(); err != nil {
+- return nil, err
+- }
- }
-- t.tab[j] = s
-- return true
--}
-
--// The lists of element names and attribute keys were taken from
--// http://www.whatwg.org/specs/web-apps/current-work/multipage/section-index.html
--// as of the "HTML Living Standard - Last Updated 30 May 2012" version.
+- // To set the Authorization header, we must make a copy of the Request
+- // so that we don't modify the Request we were given.
+- // This is required by the specification of http.RoundTripper.
+- req = cloneRequest(req)
+- req.Header.Set("Authorization", "Bearer "+t.AccessToken)
-
--var elements = []string{
-- "a",
-- "abbr",
-- "address",
-- "area",
-- "article",
-- "aside",
-- "audio",
-- "b",
-- "base",
-- "bdi",
-- "bdo",
-- "blockquote",
-- "body",
-- "br",
-- "button",
-- "canvas",
-- "caption",
-- "cite",
-- "code",
-- "col",
-- "colgroup",
-- "command",
-- "data",
-- "datalist",
-- "dd",
-- "del",
-- "details",
-- "dfn",
-- "dialog",
-- "div",
-- "dl",
-- "dt",
-- "em",
-- "embed",
-- "fieldset",
-- "figcaption",
-- "figure",
-- "footer",
-- "form",
-- "h1",
-- "h2",
-- "h3",
-- "h4",
-- "h5",
-- "h6",
-- "head",
-- "header",
-- "hgroup",
-- "hr",
-- "html",
-- "i",
-- "iframe",
-- "img",
-- "input",
-- "ins",
-- "kbd",
-- "keygen",
-- "label",
-- "legend",
-- "li",
-- "link",
-- "map",
-- "mark",
-- "menu",
-- "meta",
-- "meter",
-- "nav",
-- "noscript",
-- "object",
-- "ol",
-- "optgroup",
-- "option",
-- "output",
-- "p",
-- "param",
-- "pre",
-- "progress",
-- "q",
-- "rp",
-- "rt",
-- "ruby",
-- "s",
-- "samp",
-- "script",
-- "section",
-- "select",
-- "small",
-- "source",
-- "span",
-- "strong",
-- "style",
-- "sub",
-- "summary",
-- "sup",
-- "table",
-- "tbody",
-- "td",
-- "textarea",
-- "tfoot",
-- "th",
-- "thead",
-- "time",
-- "title",
-- "tr",
-- "track",
-- "u",
-- "ul",
-- "var",
-- "video",
-- "wbr",
+- // Make the HTTP request.
+- return t.transport().RoundTrip(req)
-}
-
--var attributes = []string{
-- "accept",
-- "accept-charset",
-- "accesskey",
-- "action",
-- "alt",
-- "async",
-- "autocomplete",
-- "autofocus",
-- "autoplay",
-- "border",
-- "challenge",
-- "charset",
-- "checked",
-- "cite",
-- "class",
-- "cols",
-- "colspan",
-- "command",
-- "content",
-- "contenteditable",
-- "contextmenu",
-- "controls",
-- "coords",
-- "crossorigin",
-- "data",
-- "datetime",
-- "default",
-- "defer",
-- "dir",
-- "dirname",
-- "disabled",
-- "download",
-- "draggable",
-- "dropzone",
-- "enctype",
-- "for",
-- "form",
-- "formaction",
-- "formenctype",
-- "formmethod",
-- "formnovalidate",
-- "formtarget",
-- "headers",
-- "height",
-- "hidden",
-- "high",
-- "href",
-- "hreflang",
-- "http-equiv",
-- "icon",
-- "id",
-- "inert",
-- "ismap",
-- "itemid",
-- "itemprop",
-- "itemref",
-- "itemscope",
-- "itemtype",
-- "keytype",
-- "kind",
-- "label",
-- "lang",
-- "list",
-- "loop",
-- "low",
-- "manifest",
-- "max",
-- "maxlength",
-- "media",
-- "mediagroup",
-- "method",
-- "min",
-- "multiple",
-- "muted",
-- "name",
-- "novalidate",
-- "open",
-- "optimum",
-- "pattern",
-- "ping",
-- "placeholder",
-- "poster",
-- "preload",
-- "radiogroup",
-- "readonly",
-- "rel",
-- "required",
-- "reversed",
-- "rows",
-- "rowspan",
-- "sandbox",
-- "spellcheck",
-- "scope",
-- "scoped",
-- "seamless",
-- "selected",
-- "shape",
-- "size",
-- "sizes",
-- "span",
-- "src",
-- "srcdoc",
-- "srclang",
-- "start",
-- "step",
-- "style",
-- "tabindex",
-- "target",
-- "title",
-- "translate",
-- "type",
-- "typemustmatch",
-- "usemap",
-- "value",
-- "width",
-- "wrap",
+-// cloneRequest returns a clone of the provided *http.Request.
+-// The clone is a shallow copy of the struct and its Header map.
+-func cloneRequest(r *http.Request) *http.Request {
+- // shallow copy of the struct
+- r2 := new(http.Request)
+- *r2 = *r
+- // deep copy of the Header
+- r2.Header = make(http.Header)
+- for k, s := range r.Header {
+- r2.Header[k] = s
+- }
+- return r2
-}
-
--var eventHandlers = []string{
-- "onabort",
-- "onafterprint",
-- "onbeforeprint",
-- "onbeforeunload",
-- "onblur",
-- "oncancel",
-- "oncanplay",
-- "oncanplaythrough",
-- "onchange",
-- "onclick",
-- "onclose",
-- "oncontextmenu",
-- "oncuechange",
-- "ondblclick",
-- "ondrag",
-- "ondragend",
-- "ondragenter",
-- "ondragleave",
-- "ondragover",
-- "ondragstart",
-- "ondrop",
-- "ondurationchange",
-- "onemptied",
-- "onended",
-- "onerror",
-- "onfocus",
-- "onhashchange",
-- "oninput",
-- "oninvalid",
-- "onkeydown",
-- "onkeypress",
-- "onkeyup",
-- "onload",
-- "onloadeddata",
-- "onloadedmetadata",
-- "onloadstart",
-- "onmessage",
-- "onmousedown",
-- "onmousemove",
-- "onmouseout",
-- "onmouseover",
-- "onmouseup",
-- "onmousewheel",
-- "onoffline",
-- "ononline",
-- "onpagehide",
-- "onpageshow",
-- "onpause",
-- "onplay",
-- "onplaying",
-- "onpopstate",
-- "onprogress",
-- "onratechange",
-- "onreset",
-- "onresize",
-- "onscroll",
-- "onseeked",
-- "onseeking",
-- "onselect",
-- "onshow",
-- "onstalled",
-- "onstorage",
-- "onsubmit",
-- "onsuspend",
-- "ontimeupdate",
-- "onunload",
-- "onvolumechange",
-- "onwaiting",
+-// Refresh renews the Transport's AccessToken using its RefreshToken.
+-func (t *Transport) Refresh() error {
+- if t.Token == nil {
+- return OAuthError{"Refresh", "no existing Token"}
+- }
+- if t.RefreshToken == "" {
+- return OAuthError{"Refresh", "Token expired; no Refresh Token"}
+- }
+- if t.Config == nil {
+- return OAuthError{"Refresh", "no Config supplied"}
+- }
+-
+- err := t.updateToken(t.Token, url.Values{
+- "grant_type": {"refresh_token"},
+- "refresh_token": {t.RefreshToken},
+- })
+- if err != nil {
+- return err
+- }
+- if t.TokenCache != nil {
+- return t.TokenCache.PutToken(t.Token)
+- }
+- return nil
-}
-
--// extra are ad-hoc values not covered by any of the lists above.
--var extra = []string{
-- "align",
-- "annotation",
-- "annotation-xml",
-- "applet",
-- "basefont",
-- "bgsound",
-- "big",
-- "blink",
-- "center",
-- "color",
-- "desc",
-- "face",
-- "font",
-- "foreignObject", // HTML is case-insensitive, but SVG-embedded-in-HTML is case-sensitive.
-- "foreignobject",
-- "frame",
-- "frameset",
-- "image",
-- "isindex",
-- "listing",
-- "malignmark",
-- "marquee",
-- "math",
-- "mglyph",
-- "mi",
-- "mn",
-- "mo",
-- "ms",
-- "mtext",
-- "nobr",
-- "noembed",
-- "noframes",
-- "plaintext",
-- "prompt",
-- "public",
-- "spacer",
-- "strike",
-- "svg",
-- "system",
-- "tt",
-- "xmp",
+-// AuthenticateClient gets an access Token using the client_credentials grant
+-// type.
+-func (t *Transport) AuthenticateClient() error {
+- if t.Config == nil {
+- return OAuthError{"Exchange", "no Config supplied"}
+- }
+- if t.Token == nil {
+- t.Token = &Token{}
+- }
+- return t.updateToken(t.Token, url.Values{"grant_type": {"client_credentials"}})
+-}
+-
+-func (t *Transport) updateToken(tok *Token, v url.Values) error {
+- v.Set("client_id", t.ClientId)
+- v.Set("client_secret", t.ClientSecret)
+- client := &http.Client{Transport: t.transport()}
+- req, err := http.NewRequest("POST", t.TokenURL, strings.NewReader(v.Encode()))
+- if err != nil {
+- return err
+- }
+- req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+- req.SetBasicAuth(t.ClientId, t.ClientSecret)
+- r, err := client.Do(req)
+- if err != nil {
+- return err
+- }
+- defer r.Body.Close()
+- if r.StatusCode != 200 {
+- return OAuthError{"updateToken", r.Status}
+- }
+- var b struct {
+- Access string `json:"access_token"`
+- Refresh string `json:"refresh_token"`
+- ExpiresIn time.Duration `json:"expires_in"`
+- Id string `json:"id_token"`
+- }
+-
+- body, err := ioutil.ReadAll(io.LimitReader(r.Body, 1<<20))
+- if err != nil {
+- return err
+- }
+-
+- content, _, _ := mime.ParseMediaType(r.Header.Get("Content-Type"))
+- switch content {
+- case "application/x-www-form-urlencoded", "text/plain":
+- vals, err := url.ParseQuery(string(body))
+- if err != nil {
+- return err
+- }
+-
+- b.Access = vals.Get("access_token")
+- b.Refresh = vals.Get("refresh_token")
+- b.ExpiresIn, _ = time.ParseDuration(vals.Get("expires_in") + "s")
+- b.Id = vals.Get("id_token")
+- default:
+- if err = json.Unmarshal(body, &b); err != nil {
+- return fmt.Errorf("got bad response from server: %q", body)
+- }
+- // The JSON parser treats the unitless ExpiresIn like 'ns' instead of 's' as above,
+- // so compensate here.
+- b.ExpiresIn *= time.Second
+- }
+- if b.Access == "" {
+- return errors.New("received empty access token from authorization server")
+- }
+- tok.AccessToken = b.Access
+- // Don't overwrite `RefreshToken` with an empty value
+- if len(b.Refresh) > 0 {
+- tok.RefreshToken = b.Refresh
+- }
+- if b.ExpiresIn == 0 {
+- tok.Expiry = time.Time{}
+- } else {
+- tok.Expiry = time.Now().Add(b.ExpiresIn)
+- }
+- if b.Id != "" {
+- if tok.Extra == nil {
+- tok.Extra = make(map[string]string)
+- }
+- tok.Extra["id_token"] = b.Id
+- }
+- return nil
-}
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/atom/table.go b/Godeps/_workspace/src/code.google.com/p/go.net/html/atom/table.go
+diff --git a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/oauth_test.go b/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/oauth_test.go
deleted file mode 100644
-index 20b8b8a..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/atom/table.go
+index b903c16..0000000
+--- a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/oauth_test.go
+++ /dev/null
-@@ -1,694 +0,0 @@
--// generated by go run gen.go; DO NOT EDIT
+@@ -1,214 +0,0 @@
+-// Copyright 2011 The goauth2 Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
--package atom
+-package oauth
-
--const (
-- A Atom = 0x1
-- Abbr Atom = 0x4
-- Accept Atom = 0x2106
-- AcceptCharset Atom = 0x210e
-- Accesskey Atom = 0x3309
-- Action Atom = 0x21b06
-- Address Atom = 0x5d507
-- Align Atom = 0x1105
-- Alt Atom = 0x4503
-- Annotation Atom = 0x18d0a
-- AnnotationXml Atom = 0x18d0e
-- Applet Atom = 0x2d106
-- Area Atom = 0x31804
-- Article Atom = 0x39907
-- Aside Atom = 0x4f05
-- Async Atom = 0x9305
-- Audio Atom = 0xaf05
-- Autocomplete Atom = 0xd50c
-- Autofocus Atom = 0xe109
-- Autoplay Atom = 0x10c08
-- B Atom = 0x101
-- Base Atom = 0x11404
-- Basefont Atom = 0x11408
-- Bdi Atom = 0x1a03
-- Bdo Atom = 0x12503
-- Bgsound Atom = 0x13807
-- Big Atom = 0x14403
-- Blink Atom = 0x14705
-- Blockquote Atom = 0x14c0a
-- Body Atom = 0x2f04
-- Border Atom = 0x15606
-- Br Atom = 0x202
-- Button Atom = 0x15c06
-- Canvas Atom = 0x4b06
-- Caption Atom = 0x1e007
-- Center Atom = 0x2df06
-- Challenge Atom = 0x23e09
-- Charset Atom = 0x2807
-- Checked Atom = 0x33f07
-- Cite Atom = 0x9704
-- Class Atom = 0x3d905
-- Code Atom = 0x16f04
-- Col Atom = 0x17603
-- Colgroup Atom = 0x17608
-- Color Atom = 0x18305
-- Cols Atom = 0x18804
-- Colspan Atom = 0x18807
-- Command Atom = 0x19b07
-- Content Atom = 0x42c07
-- Contenteditable Atom = 0x42c0f
-- Contextmenu Atom = 0x3480b
-- Controls Atom = 0x1ae08
-- Coords Atom = 0x1ba06
-- Crossorigin Atom = 0x1c40b
-- Data Atom = 0x44304
-- Datalist Atom = 0x44308
-- Datetime Atom = 0x25b08
-- Dd Atom = 0x28802
-- Default Atom = 0x5207
-- Defer Atom = 0x17105
-- Del Atom = 0x4d603
-- Desc Atom = 0x4804
-- Details Atom = 0x6507
-- Dfn Atom = 0x8303
-- Dialog Atom = 0x1b06
-- Dir Atom = 0x9d03
-- Dirname Atom = 0x9d07
-- Disabled Atom = 0x10008
-- Div Atom = 0x10703
-- Dl Atom = 0x13e02
-- Download Atom = 0x40908
-- Draggable Atom = 0x1a109
-- Dropzone Atom = 0x3a208
-- Dt Atom = 0x4e402
-- Em Atom = 0x7f02
-- Embed Atom = 0x7f05
-- Enctype Atom = 0x23007
-- Face Atom = 0x2dd04
-- Fieldset Atom = 0x1d508
-- Figcaption Atom = 0x1dd0a
-- Figure Atom = 0x1f106
-- Font Atom = 0x11804
-- Footer Atom = 0x5906
-- For Atom = 0x1fd03
-- ForeignObject Atom = 0x1fd0d
-- Foreignobject Atom = 0x20a0d
-- Form Atom = 0x21704
-- Formaction Atom = 0x2170a
-- Formenctype Atom = 0x22c0b
-- Formmethod Atom = 0x2470a
-- Formnovalidate Atom = 0x2510e
-- Formtarget Atom = 0x2660a
-- Frame Atom = 0x8705
-- Frameset Atom = 0x8708
-- H1 Atom = 0x13602
-- H2 Atom = 0x29602
-- H3 Atom = 0x2c502
-- H4 Atom = 0x30e02
-- H5 Atom = 0x4e602
-- H6 Atom = 0x27002
-- Head Atom = 0x2fa04
-- Header Atom = 0x2fa06
-- Headers Atom = 0x2fa07
-- Height Atom = 0x27206
-- Hgroup Atom = 0x27a06
-- Hidden Atom = 0x28606
-- High Atom = 0x29304
-- Hr Atom = 0x13102
-- Href Atom = 0x29804
-- Hreflang Atom = 0x29808
-- Html Atom = 0x27604
-- HttpEquiv Atom = 0x2a00a
-- I Atom = 0x601
-- Icon Atom = 0x42b04
-- Id Atom = 0x5102
-- Iframe Atom = 0x2b406
-- Image Atom = 0x2ba05
-- Img Atom = 0x2bf03
-- Inert Atom = 0x4c105
-- Input Atom = 0x3f605
-- Ins Atom = 0x1cd03
-- Isindex Atom = 0x2c707
-- Ismap Atom = 0x2ce05
-- Itemid Atom = 0x9806
-- Itemprop Atom = 0x57e08
-- Itemref Atom = 0x2d707
-- Itemscope Atom = 0x2e509
-- Itemtype Atom = 0x2ef08
-- Kbd Atom = 0x1903
-- Keygen Atom = 0x3906
-- Keytype Atom = 0x51207
-- Kind Atom = 0xfd04
-- Label Atom = 0xba05
-- Lang Atom = 0x29c04
-- Legend Atom = 0x1a806
-- Li Atom = 0x1202
-- Link Atom = 0x14804
-- List Atom = 0x44704
-- Listing Atom = 0x44707
-- Loop Atom = 0xbe04
-- Low Atom = 0x13f03
-- Malignmark Atom = 0x100a
-- Manifest Atom = 0x5b608
-- Map Atom = 0x2d003
-- Mark Atom = 0x1604
-- Marquee Atom = 0x5f207
-- Math Atom = 0x2f704
-- Max Atom = 0x30603
-- Maxlength Atom = 0x30609
-- Media Atom = 0xa205
-- Mediagroup Atom = 0xa20a
-- Menu Atom = 0x34f04
-- Meta Atom = 0x45604
-- Meter Atom = 0x26105
-- Method Atom = 0x24b06
-- Mglyph Atom = 0x2c006
-- Mi Atom = 0x9b02
-- Min Atom = 0x31003
-- Mn Atom = 0x25402
-- Mo Atom = 0x47a02
-- Ms Atom = 0x2e802
-- Mtext Atom = 0x31305
-- Multiple Atom = 0x32108
-- Muted Atom = 0x32905
-- Name Atom = 0xa004
-- Nav Atom = 0x3e03
-- Nobr Atom = 0x7404
-- Noembed Atom = 0x7d07
-- Noframes Atom = 0x8508
-- Noscript Atom = 0x28b08
-- Novalidate Atom = 0x2550a
-- Object Atom = 0x21106
-- Ol Atom = 0xcd02
-- Onabort Atom = 0x16007
-- Onafterprint Atom = 0x1e50c
-- Onbeforeprint Atom = 0x21f0d
-- Onbeforeunload Atom = 0x5c90e
-- Onblur Atom = 0x3e206
-- Oncancel Atom = 0xb308
-- Oncanplay Atom = 0x12709
-- Oncanplaythrough Atom = 0x12710
-- Onchange Atom = 0x3b808
-- Onclick Atom = 0x2ad07
-- Onclose Atom = 0x32e07
-- Oncontextmenu Atom = 0x3460d
-- Oncuechange Atom = 0x3530b
-- Ondblclick Atom = 0x35e0a
-- Ondrag Atom = 0x36806
-- Ondragend Atom = 0x36809
-- Ondragenter Atom = 0x3710b
-- Ondragleave Atom = 0x37c0b
-- Ondragover Atom = 0x3870a
-- Ondragstart Atom = 0x3910b
-- Ondrop Atom = 0x3a006
-- Ondurationchange Atom = 0x3b010
-- Onemptied Atom = 0x3a709
-- Onended Atom = 0x3c007
-- Onerror Atom = 0x3c707
-- Onfocus Atom = 0x3ce07
-- Onhashchange Atom = 0x3e80c
-- Oninput Atom = 0x3f407
-- Oninvalid Atom = 0x3fb09
-- Onkeydown Atom = 0x40409
-- Onkeypress Atom = 0x4110a
-- Onkeyup Atom = 0x42107
-- Onload Atom = 0x43b06
-- Onloadeddata Atom = 0x43b0c
-- Onloadedmetadata Atom = 0x44e10
-- Onloadstart Atom = 0x4640b
-- Onmessage Atom = 0x46f09
-- Onmousedown Atom = 0x4780b
-- Onmousemove Atom = 0x4830b
-- Onmouseout Atom = 0x48e0a
-- Onmouseover Atom = 0x49b0b
-- Onmouseup Atom = 0x4a609
-- Onmousewheel Atom = 0x4af0c
-- Onoffline Atom = 0x4bb09
-- Ononline Atom = 0x4c608
-- Onpagehide Atom = 0x4ce0a
-- Onpageshow Atom = 0x4d90a
-- Onpause Atom = 0x4e807
-- Onplay Atom = 0x4f206
-- Onplaying Atom = 0x4f209
-- Onpopstate Atom = 0x4fb0a
-- Onprogress Atom = 0x5050a
-- Onratechange Atom = 0x5190c
-- Onreset Atom = 0x52507
-- Onresize Atom = 0x52c08
-- Onscroll Atom = 0x53a08
-- Onseeked Atom = 0x54208
-- Onseeking Atom = 0x54a09
-- Onselect Atom = 0x55308
-- Onshow Atom = 0x55d06
-- Onstalled Atom = 0x56609
-- Onstorage Atom = 0x56f09
-- Onsubmit Atom = 0x57808
-- Onsuspend Atom = 0x58809
-- Ontimeupdate Atom = 0x1190c
-- Onunload Atom = 0x59108
-- Onvolumechange Atom = 0x5990e
-- Onwaiting Atom = 0x5a709
-- Open Atom = 0x58404
-- Optgroup Atom = 0xc008
-- Optimum Atom = 0x5b007
-- Option Atom = 0x5c506
-- Output Atom = 0x49506
-- P Atom = 0xc01
-- Param Atom = 0xc05
-- Pattern Atom = 0x6e07
-- Ping Atom = 0xab04
-- Placeholder Atom = 0xc70b
-- Plaintext Atom = 0xf109
-- Poster Atom = 0x17d06
-- Pre Atom = 0x27f03
-- Preload Atom = 0x27f07
-- Progress Atom = 0x50708
-- Prompt Atom = 0x5bf06
-- Public Atom = 0x42706
-- Q Atom = 0x15101
-- Radiogroup Atom = 0x30a
-- Readonly Atom = 0x31908
-- Rel Atom = 0x28003
-- Required Atom = 0x1f508
-- Reversed Atom = 0x5e08
-- Rows Atom = 0x7704
-- Rowspan Atom = 0x7707
-- Rp Atom = 0x1eb02
-- Rt Atom = 0x16502
-- Ruby Atom = 0xd104
-- S Atom = 0x2c01
-- Samp Atom = 0x6b04
-- Sandbox Atom = 0xe907
-- Scope Atom = 0x2e905
-- Scoped Atom = 0x2e906
-- Script Atom = 0x28d06
-- Seamless Atom = 0x33308
-- Section Atom = 0x3dd07
-- Select Atom = 0x55506
-- Selected Atom = 0x55508
-- Shape Atom = 0x1b505
-- Size Atom = 0x53004
-- Sizes Atom = 0x53005
-- Small Atom = 0x1bf05
-- Source Atom = 0x1cf06
-- Spacer Atom = 0x30006
-- Span Atom = 0x7a04
-- Spellcheck Atom = 0x33a0a
-- Src Atom = 0x3d403
-- Srcdoc Atom = 0x3d406
-- Srclang Atom = 0x41a07
-- Start Atom = 0x39705
-- Step Atom = 0x5bc04
-- Strike Atom = 0x50e06
-- Strong Atom = 0x53406
-- Style Atom = 0x5db05
-- Sub Atom = 0x57a03
-- Summary Atom = 0x5e007
-- Sup Atom = 0x5e703
-- Svg Atom = 0x5ea03
-- System Atom = 0x5ed06
-- Tabindex Atom = 0x45c08
-- Table Atom = 0x43605
-- Target Atom = 0x26a06
-- Tbody Atom = 0x2e05
-- Td Atom = 0x4702
-- Textarea Atom = 0x31408
-- Tfoot Atom = 0x5805
-- Th Atom = 0x13002
-- Thead Atom = 0x2f905
-- Time Atom = 0x11b04
-- Title Atom = 0x8e05
-- Tr Atom = 0xf902
-- Track Atom = 0xf905
-- Translate Atom = 0x16609
-- Tt Atom = 0x7002
-- Type Atom = 0x23304
-- Typemustmatch Atom = 0x2330d
-- U Atom = 0xb01
-- Ul Atom = 0x5602
-- Usemap Atom = 0x4ec06
-- Value Atom = 0x4005
-- Var Atom = 0x10903
-- Video Atom = 0x2a905
-- Wbr Atom = 0x14103
-- Width Atom = 0x4e205
-- Wrap Atom = 0x56204
-- Xmp Atom = 0xef03
+-import (
+- "io"
+- "io/ioutil"
+- "net/http"
+- "net/http/httptest"
+- "net/url"
+- "os"
+- "path/filepath"
+- "runtime"
+- "testing"
+- "time"
-)
-
--const hash0 = 0xc17da63e
--
--const maxAtomLen = 16
--
--var table = [1 << 9]Atom{
-- 0x1: 0x4830b, // onmousemove
-- 0x2: 0x5a709, // onwaiting
-- 0x4: 0x5bf06, // prompt
-- 0x7: 0x5b007, // optimum
-- 0x8: 0x1604, // mark
-- 0xa: 0x2d707, // itemref
-- 0xb: 0x4d90a, // onpageshow
-- 0xc: 0x55506, // select
-- 0xd: 0x1a109, // draggable
-- 0xe: 0x3e03, // nav
-- 0xf: 0x19b07, // command
-- 0x11: 0xb01, // u
-- 0x14: 0x2fa07, // headers
-- 0x15: 0x44308, // datalist
-- 0x17: 0x6b04, // samp
-- 0x1a: 0x40409, // onkeydown
-- 0x1b: 0x53a08, // onscroll
-- 0x1c: 0x17603, // col
-- 0x20: 0x57e08, // itemprop
-- 0x21: 0x2a00a, // http-equiv
-- 0x22: 0x5e703, // sup
-- 0x24: 0x1f508, // required
-- 0x2b: 0x27f07, // preload
-- 0x2c: 0x21f0d, // onbeforeprint
-- 0x2d: 0x3710b, // ondragenter
-- 0x2e: 0x4e402, // dt
-- 0x2f: 0x57808, // onsubmit
-- 0x30: 0x13102, // hr
-- 0x31: 0x3460d, // oncontextmenu
-- 0x33: 0x2ba05, // image
-- 0x34: 0x4e807, // onpause
-- 0x35: 0x27a06, // hgroup
-- 0x36: 0xab04, // ping
-- 0x37: 0x55308, // onselect
-- 0x3a: 0x10703, // div
-- 0x40: 0x9b02, // mi
-- 0x41: 0x33308, // seamless
-- 0x42: 0x2807, // charset
-- 0x43: 0x5102, // id
-- 0x44: 0x4fb0a, // onpopstate
-- 0x45: 0x4d603, // del
-- 0x46: 0x5f207, // marquee
-- 0x47: 0x3309, // accesskey
-- 0x49: 0x5906, // footer
-- 0x4a: 0x2d106, // applet
-- 0x4b: 0x2ce05, // ismap
-- 0x51: 0x34f04, // menu
-- 0x52: 0x2f04, // body
-- 0x55: 0x8708, // frameset
-- 0x56: 0x52507, // onreset
-- 0x57: 0x14705, // blink
-- 0x58: 0x8e05, // title
-- 0x59: 0x39907, // article
-- 0x5b: 0x13002, // th
-- 0x5d: 0x15101, // q
-- 0x5e: 0x58404, // open
-- 0x5f: 0x31804, // area
-- 0x61: 0x43b06, // onload
-- 0x62: 0x3f605, // input
-- 0x63: 0x11404, // base
-- 0x64: 0x18807, // colspan
-- 0x65: 0x51207, // keytype
-- 0x66: 0x13e02, // dl
-- 0x68: 0x1d508, // fieldset
-- 0x6a: 0x31003, // min
-- 0x6b: 0x10903, // var
-- 0x6f: 0x2fa06, // header
-- 0x70: 0x16502, // rt
-- 0x71: 0x17608, // colgroup
-- 0x72: 0x25402, // mn
-- 0x74: 0x16007, // onabort
-- 0x75: 0x3906, // keygen
-- 0x76: 0x4bb09, // onoffline
-- 0x77: 0x23e09, // challenge
-- 0x78: 0x2d003, // map
-- 0x7a: 0x30e02, // h4
-- 0x7b: 0x3c707, // onerror
-- 0x7c: 0x30609, // maxlength
-- 0x7d: 0x31305, // mtext
-- 0x7e: 0x5805, // tfoot
-- 0x7f: 0x11804, // font
-- 0x80: 0x100a, // malignmark
-- 0x81: 0x45604, // meta
-- 0x82: 0x9305, // async
-- 0x83: 0x2c502, // h3
-- 0x84: 0x28802, // dd
-- 0x85: 0x29804, // href
-- 0x86: 0xa20a, // mediagroup
-- 0x87: 0x1ba06, // coords
-- 0x88: 0x41a07, // srclang
-- 0x89: 0x35e0a, // ondblclick
-- 0x8a: 0x4005, // value
-- 0x8c: 0xb308, // oncancel
-- 0x8e: 0x33a0a, // spellcheck
-- 0x8f: 0x8705, // frame
-- 0x91: 0x14403, // big
-- 0x94: 0x21b06, // action
-- 0x95: 0x9d03, // dir
-- 0x97: 0x31908, // readonly
-- 0x99: 0x43605, // table
-- 0x9a: 0x5e007, // summary
-- 0x9b: 0x14103, // wbr
-- 0x9c: 0x30a, // radiogroup
-- 0x9d: 0xa004, // name
-- 0x9f: 0x5ed06, // system
-- 0xa1: 0x18305, // color
-- 0xa2: 0x4b06, // canvas
-- 0xa3: 0x27604, // html
-- 0xa5: 0x54a09, // onseeking
-- 0xac: 0x1b505, // shape
-- 0xad: 0x28003, // rel
-- 0xae: 0x12710, // oncanplaythrough
-- 0xaf: 0x3870a, // ondragover
-- 0xb1: 0x1fd0d, // foreignObject
-- 0xb3: 0x7704, // rows
-- 0xb6: 0x44707, // listing
-- 0xb7: 0x49506, // output
-- 0xb9: 0x3480b, // contextmenu
-- 0xbb: 0x13f03, // low
-- 0xbc: 0x1eb02, // rp
-- 0xbd: 0x58809, // onsuspend
-- 0xbe: 0x15c06, // button
-- 0xbf: 0x4804, // desc
-- 0xc1: 0x3dd07, // section
-- 0xc2: 0x5050a, // onprogress
-- 0xc3: 0x56f09, // onstorage
-- 0xc4: 0x2f704, // math
-- 0xc5: 0x4f206, // onplay
-- 0xc7: 0x5602, // ul
-- 0xc8: 0x6e07, // pattern
-- 0xc9: 0x4af0c, // onmousewheel
-- 0xca: 0x36809, // ondragend
-- 0xcb: 0xd104, // ruby
-- 0xcc: 0xc01, // p
-- 0xcd: 0x32e07, // onclose
-- 0xce: 0x26105, // meter
-- 0xcf: 0x13807, // bgsound
-- 0xd2: 0x27206, // height
-- 0xd4: 0x101, // b
-- 0xd5: 0x2ef08, // itemtype
-- 0xd8: 0x1e007, // caption
-- 0xd9: 0x10008, // disabled
-- 0xdc: 0x5ea03, // svg
-- 0xdd: 0x1bf05, // small
-- 0xde: 0x44304, // data
-- 0xe0: 0x4c608, // ononline
-- 0xe1: 0x2c006, // mglyph
-- 0xe3: 0x7f05, // embed
-- 0xe4: 0xf902, // tr
-- 0xe5: 0x4640b, // onloadstart
-- 0xe7: 0x3b010, // ondurationchange
-- 0xed: 0x12503, // bdo
-- 0xee: 0x4702, // td
-- 0xef: 0x4f05, // aside
-- 0xf0: 0x29602, // h2
-- 0xf1: 0x50708, // progress
-- 0xf2: 0x14c0a, // blockquote
-- 0xf4: 0xba05, // label
-- 0xf5: 0x601, // i
-- 0xf7: 0x7707, // rowspan
-- 0xfb: 0x4f209, // onplaying
-- 0xfd: 0x2bf03, // img
-- 0xfe: 0xc008, // optgroup
-- 0xff: 0x42c07, // content
-- 0x101: 0x5190c, // onratechange
-- 0x103: 0x3e80c, // onhashchange
-- 0x104: 0x6507, // details
-- 0x106: 0x40908, // download
-- 0x109: 0xe907, // sandbox
-- 0x10b: 0x42c0f, // contenteditable
-- 0x10d: 0x37c0b, // ondragleave
-- 0x10e: 0x2106, // accept
-- 0x10f: 0x55508, // selected
-- 0x112: 0x2170a, // formaction
-- 0x113: 0x2df06, // center
-- 0x115: 0x44e10, // onloadedmetadata
-- 0x116: 0x14804, // link
-- 0x117: 0x11b04, // time
-- 0x118: 0x1c40b, // crossorigin
-- 0x119: 0x3ce07, // onfocus
-- 0x11a: 0x56204, // wrap
-- 0x11b: 0x42b04, // icon
-- 0x11d: 0x2a905, // video
-- 0x11e: 0x3d905, // class
-- 0x121: 0x5990e, // onvolumechange
-- 0x122: 0x3e206, // onblur
-- 0x123: 0x2e509, // itemscope
-- 0x124: 0x5db05, // style
-- 0x127: 0x42706, // public
-- 0x129: 0x2510e, // formnovalidate
-- 0x12a: 0x55d06, // onshow
-- 0x12c: 0x16609, // translate
-- 0x12d: 0x9704, // cite
-- 0x12e: 0x2e802, // ms
-- 0x12f: 0x1190c, // ontimeupdate
-- 0x130: 0xfd04, // kind
-- 0x131: 0x2660a, // formtarget
-- 0x135: 0x3c007, // onended
-- 0x136: 0x28606, // hidden
-- 0x137: 0x2c01, // s
-- 0x139: 0x2470a, // formmethod
-- 0x13a: 0x44704, // list
-- 0x13c: 0x27002, // h6
-- 0x13d: 0xcd02, // ol
-- 0x13e: 0x3530b, // oncuechange
-- 0x13f: 0x20a0d, // foreignobject
-- 0x143: 0x5c90e, // onbeforeunload
-- 0x145: 0x3a709, // onemptied
-- 0x146: 0x17105, // defer
-- 0x147: 0xef03, // xmp
-- 0x148: 0xaf05, // audio
-- 0x149: 0x1903, // kbd
-- 0x14c: 0x46f09, // onmessage
-- 0x14d: 0x5c506, // option
-- 0x14e: 0x4503, // alt
-- 0x14f: 0x33f07, // checked
-- 0x150: 0x10c08, // autoplay
-- 0x152: 0x202, // br
-- 0x153: 0x2550a, // novalidate
-- 0x156: 0x7d07, // noembed
-- 0x159: 0x2ad07, // onclick
-- 0x15a: 0x4780b, // onmousedown
-- 0x15b: 0x3b808, // onchange
-- 0x15e: 0x3fb09, // oninvalid
-- 0x15f: 0x2e906, // scoped
-- 0x160: 0x1ae08, // controls
-- 0x161: 0x32905, // muted
-- 0x163: 0x4ec06, // usemap
-- 0x164: 0x1dd0a, // figcaption
-- 0x165: 0x36806, // ondrag
-- 0x166: 0x29304, // high
-- 0x168: 0x3d403, // src
-- 0x169: 0x17d06, // poster
-- 0x16b: 0x18d0e, // annotation-xml
-- 0x16c: 0x5bc04, // step
-- 0x16d: 0x4, // abbr
-- 0x16e: 0x1b06, // dialog
-- 0x170: 0x1202, // li
-- 0x172: 0x47a02, // mo
-- 0x175: 0x1fd03, // for
-- 0x176: 0x1cd03, // ins
-- 0x178: 0x53004, // size
-- 0x17a: 0x5207, // default
-- 0x17b: 0x1a03, // bdi
-- 0x17c: 0x4ce0a, // onpagehide
-- 0x17d: 0x9d07, // dirname
-- 0x17e: 0x23304, // type
-- 0x17f: 0x21704, // form
-- 0x180: 0x4c105, // inert
-- 0x181: 0x12709, // oncanplay
-- 0x182: 0x8303, // dfn
-- 0x183: 0x45c08, // tabindex
-- 0x186: 0x7f02, // em
-- 0x187: 0x29c04, // lang
-- 0x189: 0x3a208, // dropzone
-- 0x18a: 0x4110a, // onkeypress
-- 0x18b: 0x25b08, // datetime
-- 0x18c: 0x18804, // cols
-- 0x18d: 0x1, // a
-- 0x18e: 0x43b0c, // onloadeddata
-- 0x191: 0x15606, // border
-- 0x192: 0x2e05, // tbody
-- 0x193: 0x24b06, // method
-- 0x195: 0xbe04, // loop
-- 0x196: 0x2b406, // iframe
-- 0x198: 0x2fa04, // head
-- 0x19e: 0x5b608, // manifest
-- 0x19f: 0xe109, // autofocus
-- 0x1a0: 0x16f04, // code
-- 0x1a1: 0x53406, // strong
-- 0x1a2: 0x32108, // multiple
-- 0x1a3: 0xc05, // param
-- 0x1a6: 0x23007, // enctype
-- 0x1a7: 0x2dd04, // face
-- 0x1a8: 0xf109, // plaintext
-- 0x1a9: 0x13602, // h1
-- 0x1aa: 0x56609, // onstalled
-- 0x1ad: 0x28d06, // script
-- 0x1ae: 0x30006, // spacer
-- 0x1af: 0x52c08, // onresize
-- 0x1b0: 0x49b0b, // onmouseover
-- 0x1b1: 0x59108, // onunload
-- 0x1b2: 0x54208, // onseeked
-- 0x1b4: 0x2330d, // typemustmatch
-- 0x1b5: 0x1f106, // figure
-- 0x1b6: 0x48e0a, // onmouseout
-- 0x1b7: 0x27f03, // pre
-- 0x1b8: 0x4e205, // width
-- 0x1bb: 0x7404, // nobr
-- 0x1be: 0x7002, // tt
-- 0x1bf: 0x1105, // align
-- 0x1c0: 0x3f407, // oninput
-- 0x1c3: 0x42107, // onkeyup
-- 0x1c6: 0x1e50c, // onafterprint
-- 0x1c7: 0x210e, // accept-charset
-- 0x1c8: 0x9806, // itemid
-- 0x1cb: 0x50e06, // strike
-- 0x1cc: 0x57a03, // sub
-- 0x1cd: 0xf905, // track
-- 0x1ce: 0x39705, // start
-- 0x1d0: 0x11408, // basefont
-- 0x1d6: 0x1cf06, // source
-- 0x1d7: 0x1a806, // legend
-- 0x1d8: 0x2f905, // thead
-- 0x1da: 0x2e905, // scope
-- 0x1dd: 0x21106, // object
-- 0x1de: 0xa205, // media
-- 0x1df: 0x18d0a, // annotation
-- 0x1e0: 0x22c0b, // formenctype
-- 0x1e2: 0x28b08, // noscript
-- 0x1e4: 0x53005, // sizes
-- 0x1e5: 0xd50c, // autocomplete
-- 0x1e6: 0x7a04, // span
-- 0x1e7: 0x8508, // noframes
-- 0x1e8: 0x26a06, // target
-- 0x1e9: 0x3a006, // ondrop
-- 0x1ea: 0x3d406, // srcdoc
-- 0x1ec: 0x5e08, // reversed
-- 0x1f0: 0x2c707, // isindex
-- 0x1f3: 0x29808, // hreflang
-- 0x1f5: 0x4e602, // h5
-- 0x1f6: 0x5d507, // address
-- 0x1fa: 0x30603, // max
-- 0x1fb: 0xc70b, // placeholder
-- 0x1fc: 0x31408, // textarea
-- 0x1fe: 0x4a609, // onmouseup
-- 0x1ff: 0x3910b, // ondragstart
+-var requests = []struct {
+- path, query, auth string // request
+- contenttype, body string // response
+-}{
+- {
+- path: "/token",
+- query: "grant_type=authorization_code&code=c0d3&client_id=cl13nt1d&client_secret=s3cr3t",
+- contenttype: "application/json",
+- auth: "Basic Y2wxM250MWQ6czNjcjN0",
+- body: `
+- {
+- "access_token":"token1",
+- "refresh_token":"refreshtoken1",
+- "id_token":"idtoken1",
+- "expires_in":3600
+- }
+- `,
+- },
+- {path: "/secure", auth: "Bearer token1", body: "first payload"},
+- {
+- path: "/token",
+- query: "grant_type=refresh_token&refresh_token=refreshtoken1&client_id=cl13nt1d&client_secret=s3cr3t",
+- contenttype: "application/json",
+- auth: "Basic Y2wxM250MWQ6czNjcjN0",
+- body: `
+- {
+- "access_token":"token2",
+- "refresh_token":"refreshtoken2",
+- "id_token":"idtoken2",
+- "expires_in":3600
+- }
+- `,
+- },
+- {path: "/secure", auth: "Bearer token2", body: "second payload"},
+- {
+- path: "/token",
+- query: "grant_type=refresh_token&refresh_token=refreshtoken2&client_id=cl13nt1d&client_secret=s3cr3t",
+- contenttype: "application/x-www-form-urlencoded",
+- body: "access_token=token3&refresh_token=refreshtoken3&id_token=idtoken3&expires_in=3600",
+- auth: "Basic Y2wxM250MWQ6czNjcjN0",
+- },
+- {path: "/secure", auth: "Bearer token3", body: "third payload"},
+- {
+- path: "/token",
+- query: "grant_type=client_credentials&client_id=cl13nt1d&client_secret=s3cr3t",
+- contenttype: "application/json",
+- auth: "Basic Y2wxM250MWQ6czNjcjN0",
+- body: `
+- {
+- "access_token":"token4",
+- "expires_in":3600
+- }
+- `,
+- },
+- {path: "/secure", auth: "Bearer token4", body: "fourth payload"},
-}
-
--const atomText = "abbradiogrouparamalignmarkbdialogaccept-charsetbodyaccesskey" +
-- "genavaluealtdescanvasidefaultfootereversedetailsampatternobr" +
-- "owspanoembedfnoframesetitleasyncitemidirnamediagroupingaudio" +
-- "ncancelabelooptgrouplaceholderubyautocompleteautofocusandbox" +
-- "mplaintextrackindisabledivarautoplaybasefontimeupdatebdoncan" +
-- "playthrough1bgsoundlowbrbigblinkblockquoteborderbuttonabortr" +
-- "anslatecodefercolgroupostercolorcolspannotation-xmlcommandra" +
-- "ggablegendcontrolshapecoordsmallcrossoriginsourcefieldsetfig" +
-- "captionafterprintfigurequiredforeignObjectforeignobjectforma" +
-- "ctionbeforeprintformenctypemustmatchallengeformmethodformnov" +
-- "alidatetimeterformtargeth6heightmlhgroupreloadhiddenoscripth" +
-- "igh2hreflanghttp-equivideonclickiframeimageimglyph3isindexis" +
-- "mappletitemrefacenteritemscopeditemtypematheaderspacermaxlen" +
-- "gth4minmtextareadonlymultiplemutedoncloseamlesspellcheckedon" +
-- "contextmenuoncuechangeondblclickondragendondragenterondragle" +
-- "aveondragoverondragstarticleondropzonemptiedondurationchange" +
-- "onendedonerroronfocusrcdoclassectionbluronhashchangeoninputo" +
-- "ninvalidonkeydownloadonkeypressrclangonkeyupublicontentedita" +
-- "bleonloadeddatalistingonloadedmetadatabindexonloadstartonmes" +
-- "sageonmousedownonmousemoveonmouseoutputonmouseoveronmouseupo" +
-- "nmousewheelonofflinertononlineonpagehidelonpageshowidth5onpa" +
-- "usemaponplayingonpopstateonprogresstrikeytypeonratechangeonr" +
-- "esetonresizestrongonscrollonseekedonseekingonselectedonshowr" +
-- "aponstalledonstorageonsubmitempropenonsuspendonunloadonvolum" +
-- "echangeonwaitingoptimumanifestepromptoptionbeforeunloaddress" +
-- "tylesummarysupsvgsystemarquee"
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/atom/table_test.go b/Godeps/_workspace/src/code.google.com/p/go.net/html/atom/table_test.go
+-func TestOAuth(t *testing.T) {
+- // Set up test server.
+- n := 0
+- handler := func(w http.ResponseWriter, r *http.Request) {
+- if n >= len(requests) {
+- t.Errorf("too many requests: %d", n)
+- return
+- }
+- req := requests[n]
+- n++
+-
+- // Check request.
+- if g, w := r.URL.Path, req.path; g != w {
+- t.Errorf("request[%d] got path %s, want %s", n, g, w)
+- }
+- want, _ := url.ParseQuery(req.query)
+- for k := range want {
+- if g, w := r.FormValue(k), want.Get(k); g != w {
+- t.Errorf("query[%s] = %s, want %s", k, g, w)
+- }
+- }
+- if g, w := r.Header.Get("Authorization"), req.auth; w != "" && g != w {
+- t.Errorf("Authorization: %v, want %v", g, w)
+- }
+-
+- // Send response.
+- w.Header().Set("Content-Type", req.contenttype)
+- io.WriteString(w, req.body)
+- }
+- server := httptest.NewServer(http.HandlerFunc(handler))
+- defer server.Close()
+-
+- config := &Config{
+- ClientId: "cl13nt1d",
+- ClientSecret: "s3cr3t",
+- Scope: "https://example.net/scope",
+- AuthURL: server.URL + "/auth",
+- TokenURL: server.URL + "/token",
+- }
+-
+- // TODO(adg): test AuthCodeURL
+-
+- transport := &Transport{Config: config}
+- _, err := transport.Exchange("c0d3")
+- if err != nil {
+- t.Fatalf("Exchange: %v", err)
+- }
+- checkToken(t, transport.Token, "token1", "refreshtoken1", "idtoken1")
+-
+- c := transport.Client()
+- resp, err := c.Get(server.URL + "/secure")
+- if err != nil {
+- t.Fatalf("Get: %v", err)
+- }
+- checkBody(t, resp, "first payload")
+-
+- // test automatic refresh
+- transport.Expiry = time.Now().Add(-time.Hour)
+- resp, err = c.Get(server.URL + "/secure")
+- if err != nil {
+- t.Fatalf("Get: %v", err)
+- }
+- checkBody(t, resp, "second payload")
+- checkToken(t, transport.Token, "token2", "refreshtoken2", "idtoken2")
+-
+- // refresh one more time, but get URL-encoded token instead of JSON
+- transport.Expiry = time.Now().Add(-time.Hour)
+- resp, err = c.Get(server.URL + "/secure")
+- if err != nil {
+- t.Fatalf("Get: %v", err)
+- }
+- checkBody(t, resp, "third payload")
+- checkToken(t, transport.Token, "token3", "refreshtoken3", "idtoken3")
+-
+- transport.Token = &Token{}
+- err = transport.AuthenticateClient()
+- if err != nil {
+- t.Fatalf("AuthenticateClient: %v", err)
+- }
+- checkToken(t, transport.Token, "token4", "", "")
+- resp, err = c.Get(server.URL + "/secure")
+- if err != nil {
+- t.Fatalf("Get: %v", err)
+- }
+- checkBody(t, resp, "fourth payload")
+-}
+-
+-func checkToken(t *testing.T, tok *Token, access, refresh, id string) {
+- if g, w := tok.AccessToken, access; g != w {
+- t.Errorf("AccessToken = %q, want %q", g, w)
+- }
+- if g, w := tok.RefreshToken, refresh; g != w {
+- t.Errorf("RefreshToken = %q, want %q", g, w)
+- }
+- if g, w := tok.Extra["id_token"], id; g != w {
+- t.Errorf("Extra['id_token'] = %q, want %q", g, w)
+- }
+- exp := tok.Expiry.Sub(time.Now())
+- if (time.Hour-time.Second) > exp || exp > time.Hour {
+- t.Errorf("Expiry = %v, want ~1 hour", exp)
+- }
+-}
+-
+-func checkBody(t *testing.T, r *http.Response, body string) {
+- b, err := ioutil.ReadAll(r.Body)
+- if err != nil {
+- t.Errorf("reading reponse body: %v, want %q", err, body)
+- }
+- if g, w := string(b), body; g != w {
+- t.Errorf("request body mismatch: got %q, want %q", g, w)
+- }
+-}
+-
+-func TestCachePermissions(t *testing.T) {
+- if runtime.GOOS == "windows" {
+- // Windows doesn't support file mode bits.
+- return
+- }
+-
+- td, err := ioutil.TempDir("", "oauth-test")
+- if err != nil {
+- t.Fatalf("ioutil.TempDir: %v", err)
+- }
+- defer os.RemoveAll(td)
+- tempFile := filepath.Join(td, "cache-file")
+-
+- cf := CacheFile(tempFile)
+- if err := cf.PutToken(new(Token)); err != nil {
+- t.Fatalf("PutToken: %v", err)
+- }
+- fi, err := os.Stat(tempFile)
+- if err != nil {
+- t.Fatalf("os.Stat: %v", err)
+- }
+- if fi.Mode()&0077 != 0 {
+- t.Errorf("Created cache file has mode %#o, want non-accessible to group+other", fi.Mode())
+- }
+-}
+diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/AUTHORS b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/AUTHORS
deleted file mode 100644
-index db016a1..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/atom/table_test.go
+index f73b725..0000000
+--- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/AUTHORS
+++ /dev/null
-@@ -1,341 +0,0 @@
--// generated by go run gen.go -test; DO NOT EDIT
+@@ -1,10 +0,0 @@
+-# This is the official list of authors for copyright purposes.
+-# This file is distinct from the CONTRIBUTORS files.
+-# See the latter for an explanation.
-
--package atom
+-# Names should be added to this file as
+-# Name or Organization <email address>
+-# The email address is not required for organizations.
-
--var testAtomList = []string{
-- "a",
-- "abbr",
-- "accept",
-- "accept-charset",
-- "accesskey",
-- "action",
-- "address",
-- "align",
-- "alt",
-- "annotation",
-- "annotation-xml",
-- "applet",
-- "area",
-- "article",
-- "aside",
-- "async",
-- "audio",
-- "autocomplete",
-- "autofocus",
-- "autoplay",
-- "b",
-- "base",
-- "basefont",
-- "bdi",
-- "bdo",
-- "bgsound",
-- "big",
-- "blink",
-- "blockquote",
-- "body",
-- "border",
-- "br",
-- "button",
-- "canvas",
-- "caption",
-- "center",
-- "challenge",
-- "charset",
-- "checked",
-- "cite",
-- "cite",
-- "class",
-- "code",
-- "col",
-- "colgroup",
-- "color",
-- "cols",
-- "colspan",
-- "command",
-- "command",
-- "content",
-- "contenteditable",
-- "contextmenu",
-- "controls",
-- "coords",
-- "crossorigin",
-- "data",
-- "data",
-- "datalist",
-- "datetime",
-- "dd",
-- "default",
-- "defer",
-- "del",
-- "desc",
-- "details",
-- "dfn",
-- "dialog",
-- "dir",
-- "dirname",
-- "disabled",
-- "div",
-- "dl",
-- "download",
-- "draggable",
-- "dropzone",
-- "dt",
-- "em",
-- "embed",
-- "enctype",
-- "face",
-- "fieldset",
-- "figcaption",
-- "figure",
-- "font",
-- "footer",
-- "for",
-- "foreignObject",
-- "foreignobject",
-- "form",
-- "form",
-- "formaction",
-- "formenctype",
-- "formmethod",
-- "formnovalidate",
-- "formtarget",
-- "frame",
-- "frameset",
-- "h1",
-- "h2",
-- "h3",
-- "h4",
-- "h5",
-- "h6",
-- "head",
-- "header",
-- "headers",
-- "height",
-- "hgroup",
-- "hidden",
-- "high",
-- "hr",
-- "href",
-- "hreflang",
-- "html",
-- "http-equiv",
-- "i",
-- "icon",
-- "id",
-- "iframe",
-- "image",
-- "img",
-- "inert",
-- "input",
-- "ins",
-- "isindex",
-- "ismap",
-- "itemid",
-- "itemprop",
-- "itemref",
-- "itemscope",
-- "itemtype",
-- "kbd",
-- "keygen",
-- "keytype",
-- "kind",
-- "label",
-- "label",
-- "lang",
-- "legend",
-- "li",
-- "link",
-- "list",
-- "listing",
-- "loop",
-- "low",
-- "malignmark",
-- "manifest",
-- "map",
-- "mark",
-- "marquee",
-- "math",
-- "max",
-- "maxlength",
-- "media",
-- "mediagroup",
-- "menu",
-- "meta",
-- "meter",
-- "method",
-- "mglyph",
-- "mi",
-- "min",
-- "mn",
-- "mo",
-- "ms",
-- "mtext",
-- "multiple",
-- "muted",
-- "name",
-- "nav",
-- "nobr",
-- "noembed",
-- "noframes",
-- "noscript",
-- "novalidate",
-- "object",
-- "ol",
-- "onabort",
-- "onafterprint",
-- "onbeforeprint",
-- "onbeforeunload",
-- "onblur",
-- "oncancel",
-- "oncanplay",
-- "oncanplaythrough",
-- "onchange",
-- "onclick",
-- "onclose",
-- "oncontextmenu",
-- "oncuechange",
-- "ondblclick",
-- "ondrag",
-- "ondragend",
-- "ondragenter",
-- "ondragleave",
-- "ondragover",
-- "ondragstart",
-- "ondrop",
-- "ondurationchange",
-- "onemptied",
-- "onended",
-- "onerror",
-- "onfocus",
-- "onhashchange",
-- "oninput",
-- "oninvalid",
-- "onkeydown",
-- "onkeypress",
-- "onkeyup",
-- "onload",
-- "onloadeddata",
-- "onloadedmetadata",
-- "onloadstart",
-- "onmessage",
-- "onmousedown",
-- "onmousemove",
-- "onmouseout",
-- "onmouseover",
-- "onmouseup",
-- "onmousewheel",
-- "onoffline",
-- "ononline",
-- "onpagehide",
-- "onpageshow",
-- "onpause",
-- "onplay",
-- "onplaying",
-- "onpopstate",
-- "onprogress",
-- "onratechange",
-- "onreset",
-- "onresize",
-- "onscroll",
-- "onseeked",
-- "onseeking",
-- "onselect",
-- "onshow",
-- "onstalled",
-- "onstorage",
-- "onsubmit",
-- "onsuspend",
-- "ontimeupdate",
-- "onunload",
-- "onvolumechange",
-- "onwaiting",
-- "open",
-- "optgroup",
-- "optimum",
-- "option",
-- "output",
-- "p",
-- "param",
-- "pattern",
-- "ping",
-- "placeholder",
-- "plaintext",
-- "poster",
-- "pre",
-- "preload",
-- "progress",
-- "prompt",
-- "public",
-- "q",
-- "radiogroup",
-- "readonly",
-- "rel",
-- "required",
-- "reversed",
-- "rows",
-- "rowspan",
-- "rp",
-- "rt",
-- "ruby",
-- "s",
-- "samp",
-- "sandbox",
-- "scope",
-- "scoped",
-- "script",
-- "seamless",
-- "section",
-- "select",
-- "selected",
-- "shape",
-- "size",
-- "sizes",
-- "small",
-- "source",
-- "spacer",
-- "span",
-- "span",
-- "spellcheck",
-- "src",
-- "srcdoc",
-- "srclang",
-- "start",
-- "step",
-- "strike",
-- "strong",
-- "style",
-- "style",
-- "sub",
-- "summary",
-- "sup",
-- "svg",
-- "system",
-- "tabindex",
-- "table",
-- "target",
-- "tbody",
-- "td",
-- "textarea",
-- "tfoot",
-- "th",
-- "thead",
-- "time",
-- "title",
-- "title",
-- "tr",
-- "track",
-- "translate",
-- "tt",
-- "type",
-- "typemustmatch",
-- "u",
-- "ul",
-- "usemap",
-- "value",
-- "var",
-- "video",
-- "wbr",
-- "width",
-- "wrap",
-- "xmp",
--}
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/charset.go b/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/charset.go
+-# Please keep the list sorted.
+-Google Inc.
+diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/CONTRIBUTORS b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/CONTRIBUTORS
deleted file mode 100644
-index 39dc268..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/charset.go
+index 4af9298..0000000
+--- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/CONTRIBUTORS
+++ /dev/null
-@@ -1,227 +0,0 @@
--// Package charset provides common text encodings for HTML documents.
--//
--// The mapping from encoding labels to encodings is defined at
--// http://encoding.spec.whatwg.org.
--package charset
--
--import (
-- "bytes"
-- "io"
-- "mime"
-- "strings"
-- "unicode/utf8"
+@@ -1,46 +0,0 @@
+-# This is the official list of people who can contribute
+-# (and typically have contributed) code to the repository.
+-# The AUTHORS file lists the copyright holders; this file
+-# lists people. For example, Google employees are listed here
+-# but not in AUTHORS, because Google holds the copyright.
+-#
+-# The submission process automatically checks to make sure
+-# that people submitting code are listed in this file (by email address).
+-#
+-# Names should be added to this file only after verifying that
+-# the individual or the individual's organization has agreed to
+-# the appropriate Contributor License Agreement, found here:
+-#
+-# http://code.google.com/legal/individual-cla-v1.0.html
+-# http://code.google.com/legal/corporate-cla-v1.0.html
+-#
+-# The agreement for individuals can be filled out on the web.
+-#
+-# When adding J Random Contributor's name to this file,
+-# either J's name or J's organization's name should be
+-# added to the AUTHORS file, depending on whether the
+-# individual or corporate CLA was used.
-
-- "code.google.com/p/go.net/html"
-- "code.google.com/p/go.text/encoding"
-- "code.google.com/p/go.text/encoding/charmap"
-- "code.google.com/p/go.text/transform"
--)
+-# Names should be added to this file like so:
+-# Name <email address>
+-#
+-# An entry with two email addresses specifies that the
+-# first address should be used in the submit logs and
+-# that the second address should be recognized as the
+-# same person when interacting with Rietveld.
-
--// Lookup returns the encoding with the specified label, and its canonical
--// name. It returns nil and the empty string if label is not one of the
--// standard encodings for HTML. Matching is case-insensitive and ignores
--// leading and trailing whitespace.
--func Lookup(label string) (e encoding.Encoding, name string) {
-- label = strings.ToLower(strings.Trim(label, "\t\n\r\f "))
-- enc := encodings[label]
-- return enc.e, enc.name
--}
+-# Please keep the list sorted.
-
--// DetermineEncoding determines the encoding of an HTML document by examining
--// up to the first 1024 bytes of content and the declared Content-Type.
--//
--// See http://www.whatwg.org/specs/web-apps/current-work/multipage/parsing.html#determining-the-character-encoding
--func DetermineEncoding(content []byte, contentType string) (e encoding.Encoding, name string, certain bool) {
-- if len(content) > 1024 {
-- content = content[:1024]
-- }
+-Alain Vongsouvanhalainv <alainv at google.com>
+-Andrew Gerrand <adg at golang.org>
+-Brad Fitzpatrick <bradfitz at golang.org>
+-Francesc Campoy <campoy at golang.org>
+-Garrick Evans <garrick at google.com>
+-Glenn Lewis <gmlewis at google.com>
+-Ivan Krasin <krasin at golang.org>
+-Jason Hall <jasonhall at google.com>
+-Johan Euphrosine <proppy at google.com>
+-Kostik Shtoyk <kostik at google.com>
+-Nick Craig-Wood <nickcw at gmail.com>
+-Scott Van Woudenberg <scottvw at google.com>
+-Takashi Matsuo <tmatsuo at google.com>
+diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/LICENSE b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/LICENSE
+deleted file mode 100644
+index 263aa7a..0000000
+--- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/LICENSE
++++ /dev/null
+@@ -1,27 +0,0 @@
+-Copyright (c) 2011 Google Inc. All rights reserved.
-
-- for _, b := range boms {
-- if bytes.HasPrefix(content, b.bom) {
-- e, name = Lookup(b.enc)
-- return e, name, true
-- }
-- }
+-Redistribution and use in source and binary forms, with or without
+-modification, are permitted provided that the following conditions are
+-met:
-
-- if _, params, err := mime.ParseMediaType(contentType); err == nil {
-- if cs, ok := params["charset"]; ok {
-- if e, name = Lookup(cs); e != nil {
-- return e, name, true
-- }
-- }
-- }
+- * Redistributions of source code must retain the above copyright
+-notice, this list of conditions and the following disclaimer.
+- * Redistributions in binary form must reproduce the above
+-copyright notice, this list of conditions and the following disclaimer
+-in the documentation and/or other materials provided with the
+-distribution.
+- * Neither the name of Google Inc. nor the names of its
+-contributors may be used to endorse or promote products derived from
+-this software without specific prior written permission.
-
-- if len(content) > 0 {
-- e, name = prescan(content)
-- if e != nil {
-- return e, name, false
-- }
-- }
+-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/Makefile b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/Makefile
+deleted file mode 100644
+index 20ce8a5..0000000
+--- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/Makefile
++++ /dev/null
+@@ -1,9 +0,0 @@
+-all:
+- go install code.google.com/p/google-api-go-client/googleapi
+- go install code.google.com/p/google-api-go-client/google-api-go-generator
+- $(GOPATH)/bin/google-api-go-generator -cache=false -install -api=*
-
-- // Try to detect UTF-8.
-- // First eliminate any partial rune at the end.
-- for i := len(content) - 1; i >= 0 && i > len(content)-4; i-- {
-- b := content[i]
-- if b < 0x80 {
-- break
-- }
-- if utf8.RuneStart(b) {
-- content = content[:i]
-- break
-- }
-- }
-- hasHighBit := false
-- for _, c := range content {
-- if c >= 0x80 {
-- hasHighBit = true
-- break
-- }
-- }
-- if hasHighBit && utf8.Valid(content) {
-- return encoding.Nop, "utf-8", false
-- }
+-cached:
+- go install code.google.com/p/google-api-go-client/googleapi
+- go install code.google.com/p/google-api-go-client/google-api-go-generator
+- $(GOPATH)/bin/google-api-go-generator -cache=true -install -api=*
+diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/NOTES b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/NOTES
+deleted file mode 100644
+index 3b10889..0000000
+--- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/NOTES
++++ /dev/null
+@@ -1,13 +0,0 @@
+-Discovery Service:
+-http://code.google.com/apis/discovery/
+-http://code.google.com/apis/discovery/v1/reference.html
-
-- // TODO: change default depending on user's locale?
-- return charmap.Windows1252, "windows-1252", false
--}
+-The "type" key:
+-http://tools.ietf.org/html/draft-zyp-json-schema-03#section-5.1
-
--// NewReader returns an io.Reader that converts the content of r to UTF-8.
--// It calls DetermineEncoding to find out what r's encoding is.
--func NewReader(r io.Reader, contentType string) (io.Reader, error) {
-- preview := make([]byte, 1024)
-- n, err := io.ReadFull(r, preview)
-- switch {
-- case err == io.ErrUnexpectedEOF:
-- preview = preview[:n]
-- r = bytes.NewReader(preview)
-- case err != nil:
-- return nil, err
-- default:
-- r = io.MultiReader(bytes.NewReader(preview), r)
-- }
--
-- if e, _, _ := DetermineEncoding(preview, contentType); e != encoding.Nop {
-- r = transform.NewReader(r, e.NewDecoder())
-- }
-- return r, nil
--}
--
--func prescan(content []byte) (e encoding.Encoding, name string) {
-- z := html.NewTokenizer(bytes.NewReader(content))
-- for {
-- switch z.Next() {
-- case html.ErrorToken:
-- return nil, ""
--
-- case html.StartTagToken, html.SelfClosingTagToken:
-- tagName, hasAttr := z.TagName()
-- if !bytes.Equal(tagName, []byte("meta")) {
-- continue
-- }
-- attrList := make(map[string]bool)
-- gotPragma := false
--
-- const (
-- dontKnow = iota
-- doNeedPragma
-- doNotNeedPragma
-- )
-- needPragma := dontKnow
--
-- name = ""
-- e = nil
-- for hasAttr {
-- var key, val []byte
-- key, val, hasAttr = z.TagAttr()
-- ks := string(key)
-- if attrList[ks] {
-- continue
-- }
-- attrList[ks] = true
-- for i, c := range val {
-- if 'A' <= c && c <= 'Z' {
-- val[i] = c + 0x20
-- }
-- }
--
-- switch ks {
-- case "http-equiv":
-- if bytes.Equal(val, []byte("content-type")) {
-- gotPragma = true
-- }
--
-- case "content":
-- if e == nil {
-- name = fromMetaElement(string(val))
-- if name != "" {
-- e, name = Lookup(name)
-- if e != nil {
-- needPragma = doNeedPragma
-- }
-- }
-- }
--
-- case "charset":
-- e, name = Lookup(string(val))
-- needPragma = doNotNeedPragma
-- }
-- }
--
-- if needPragma == dontKnow || needPragma == doNeedPragma && !gotPragma {
-- continue
-- }
--
-- if strings.HasPrefix(name, "utf-16") {
-- name = "utf-8"
-- e = encoding.Nop
-- }
--
-- if e != nil {
-- return e, name
-- }
-- }
-- }
--}
--
--func fromMetaElement(s string) string {
-- for s != "" {
-- csLoc := strings.Index(s, "charset")
-- if csLoc == -1 {
-- return ""
-- }
-- s = s[csLoc+len("charset"):]
-- s = strings.TrimLeft(s, " \t\n\f\r")
-- if !strings.HasPrefix(s, "=") {
-- continue
-- }
-- s = s[1:]
-- s = strings.TrimLeft(s, " \t\n\f\r")
-- if s == "" {
-- return ""
-- }
-- if q := s[0]; q == '"' || q == '\'' {
-- s = s[1:]
-- closeQuote := strings.IndexRune(s, rune(q))
-- if closeQuote == -1 {
-- return ""
-- }
-- return s[:closeQuote]
-- }
--
-- end := strings.IndexAny(s, "; \t\n\f\r")
-- if end == -1 {
-- end = len(s)
-- }
-- return s[:end]
-- }
-- return ""
--}
+-The "format" key:
+-http://tools.ietf.org/html/draft-zyp-json-schema-03#section-5.23
+-http://code.google.com/apis/discovery/v1/reference.html#parameter-format-summary
-
--var boms = []struct {
-- bom []byte
-- enc string
--}{
-- {[]byte{0xfe, 0xff}, "utf-16be"},
-- {[]byte{0xff, 0xfe}, "utf-16le"},
-- {[]byte{0xef, 0xbb, 0xbf}, "utf-8"},
--}
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/charset_test.go b/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/charset_test.go
+-Google JSON format docs:
+-http://google-styleguide.googlecode.com/svn/trunk/jsoncstyleguide.xml
+diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/README b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/README
deleted file mode 100644
-index a656dd9..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/charset_test.go
+index 9aca57b..0000000
+--- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/README
+++ /dev/null
-@@ -1,200 +0,0 @@
--package charset
--
--import (
-- "bytes"
-- "io/ioutil"
-- "strings"
-- "testing"
--
-- "code.google.com/p/go.text/transform"
--)
--
--func transformString(t transform.Transformer, s string) (string, error) {
-- r := transform.NewReader(strings.NewReader(s), t)
-- b, err := ioutil.ReadAll(r)
-- return string(b), err
--}
--
--var testCases = []struct {
-- utf8, other, otherEncoding string
--}{
-- {"Résumé", "Résumé", "utf8"},
-- {"Résumé", "R\xe9sum\xe9", "latin1"},
-- {"これは漢字です。", "S0\x8c0o0\"oW[g0Y0\x020", "UTF-16LE"},
-- {"これは漢字です。", "0S0\x8c0oo\"[W0g0Y0\x02", "UTF-16BE"},
-- {"Hello, world", "Hello, world", "ASCII"},
-- {"Gdańsk", "Gda\xf1sk", "ISO-8859-2"},
-- {"Ââ Čč Đđ Ŋŋ Õõ Šš Žž Åå Ää", "\xc2\xe2 \xc8\xe8 \xa9\xb9 \xaf\xbf \xd5\xf5 \xaa\xba \xac\xbc \xc5\xe5 \xc4\xe4", "ISO-8859-10"},
-- {"สำหรับ", "\xca\xd3\xcb\xc3\u047a", "ISO-8859-11"},
-- {"latviešu", "latvie\xf0u", "ISO-8859-13"},
-- {"Seònaid", "Se\xf2naid", "ISO-8859-14"},
-- {"€1 is cheap", "\xa41 is cheap", "ISO-8859-15"},
-- {"românește", "rom\xe2ne\xbate", "ISO-8859-16"},
-- {"nutraĵo", "nutra\xbco", "ISO-8859-3"},
-- {"Kalâdlit", "Kal\xe2dlit", "ISO-8859-4"},
-- {"русский", "\xe0\xe3\xe1\xe1\xda\xd8\xd9", "ISO-8859-5"},
-- {"ελληνικά", "\xe5\xeb\xeb\xe7\xed\xe9\xea\xdc", "ISO-8859-7"},
-- {"Kağan", "Ka\xf0an", "ISO-8859-9"},
-- {"Résumé", "R\x8esum\x8e", "macintosh"},
-- {"Gdańsk", "Gda\xf1sk", "windows-1250"},
-- {"русский", "\xf0\xf3\xf1\xf1\xea\xe8\xe9", "windows-1251"},
-- {"Résumé", "R\xe9sum\xe9", "windows-1252"},
-- {"ελληνικά", "\xe5\xeb\xeb\xe7\xed\xe9\xea\xdc", "windows-1253"},
-- {"Kağan", "Ka\xf0an", "windows-1254"},
-- {"עִבְרִית", "\xf2\xc4\xe1\xc0\xf8\xc4\xe9\xfa", "windows-1255"},
-- {"العربية", "\xc7\xe1\xda\xd1\xc8\xed\xc9", "windows-1256"},
-- {"latviešu", "latvie\xf0u", "windows-1257"},
-- {"Việt", "Vi\xea\xf2t", "windows-1258"},
-- {"สำหรับ", "\xca\xd3\xcb\xc3\u047a", "windows-874"},
-- {"русский", "\xd2\xd5\xd3\xd3\xcb\xc9\xca", "KOI8-R"},
-- {"українська", "\xd5\xcb\xd2\xc1\xa7\xce\xd3\xd8\xcb\xc1", "KOI8-U"},
-- {"Hello 常用國字標準字體表", "Hello \xb1`\xa5\u03b0\xea\xa6r\xbc\u0437\u01e6r\xc5\xe9\xaa\xed", "big5"},
-- {"Hello 常用國字標準字體表", "Hello \xb3\xa3\xd3\xc3\x87\xf8\xd7\xd6\x98\xcb\x9c\xca\xd7\xd6\xf3\x77\xb1\xed", "gbk"},
-- {"Hello 常用國字標準字體表", "Hello \xb3\xa3\xd3\xc3\x87\xf8\xd7\xd6\x98\xcb\x9c\xca\xd7\xd6\xf3\x77\xb1\xed", "gb18030"},
-- {"עִבְרִית", "\x81\x30\xfb\x30\x81\x30\xf6\x34\x81\x30\xf9\x33\x81\x30\xf6\x30\x81\x30\xfb\x36\x81\x30\xf6\x34\x81\x30\xfa\x31\x81\x30\xfb\x38", "gb18030"},
-- {"㧯", "\x82\x31\x89\x38", "gb18030"},
-- {"これは漢字です。", "\x82\xb1\x82\xea\x82\xcd\x8a\xbf\x8e\x9a\x82\xc5\x82\xb7\x81B", "SJIS"},
-- {"Hello, 世界!", "Hello, \x90\xa2\x8aE!", "SJIS"},
-- {"ｲｳｴｵｶ", "\xb2\xb3\xb4\xb5\xb6", "SJIS"},
-- {"これは漢字です。", "\xa4\xb3\xa4\xec\xa4\u03f4\xc1\xbb\xfa\xa4\u01e4\xb9\xa1\xa3", "EUC-JP"},
-- {"Hello, 世界!", "Hello, \x1b$B@$3&\x1b(B!", "ISO-2022-JP"},
-- {"네이트 | 즐거움의 시작, 슈파스(Spaβ) NATE", "\xb3\xd7\xc0\xcc\xc6\xae | \xc1\xf1\xb0\xc5\xbf\xf2\xc0\xc7 \xbd\xc3\xc0\xdb, \xbd\xb4\xc6\xc4\xbd\xba(Spa\xa5\xe2) NATE", "EUC-KR"},
--}
--
--func TestDecode(t *testing.T) {
-- for _, tc := range testCases {
-- e, _ := Lookup(tc.otherEncoding)
-- if e == nil {
-- t.Errorf("%s: not found", tc.otherEncoding)
-- continue
-- }
-- s, err := transformString(e.NewDecoder(), tc.other)
-- if err != nil {
-- t.Errorf("%s: decode %q: %v", tc.otherEncoding, tc.other, err)
-- continue
-- }
-- if s != tc.utf8 {
-- t.Errorf("%s: got %q, want %q", tc.otherEncoding, s, tc.utf8)
-- }
-- }
--}
--
--func TestEncode(t *testing.T) {
-- for _, tc := range testCases {
-- e, _ := Lookup(tc.otherEncoding)
-- if e == nil {
-- t.Errorf("%s: not found", tc.otherEncoding)
-- continue
-- }
-- s, err := transformString(e.NewEncoder(), tc.utf8)
-- if err != nil {
-- t.Errorf("%s: encode %q: %s", tc.otherEncoding, tc.utf8, err)
-- continue
-- }
-- if s != tc.other {
-- t.Errorf("%s: got %q, want %q", tc.otherEncoding, s, tc.other)
-- }
-- }
--}
--
--// TestNames verifies that you can pass an encoding's name to Lookup and get
--// the same encoding back (except for "replacement").
--func TestNames(t *testing.T) {
-- for _, e := range encodings {
-- if e.name == "replacement" {
-- continue
-- }
-- _, got := Lookup(e.name)
-- if got != e.name {
-- t.Errorf("got %q, want %q", got, e.name)
-- continue
-- }
-- }
--}
--
--var sniffTestCases = []struct {
-- filename, declared, want string
--}{
-- {"HTTP-charset.html", "text/html; charset=iso-8859-15", "iso-8859-15"},
-- {"UTF-16LE-BOM.html", "", "utf-16le"},
-- {"UTF-16BE-BOM.html", "", "utf-16be"},
-- {"meta-content-attribute.html", "text/html", "iso-8859-15"},
-- {"meta-charset-attribute.html", "text/html", "iso-8859-15"},
-- {"No-encoding-declaration.html", "text/html", "utf-8"},
-- {"HTTP-vs-UTF-8-BOM.html", "text/html; charset=iso-8859-15", "utf-8"},
-- {"HTTP-vs-meta-content.html", "text/html; charset=iso-8859-15", "iso-8859-15"},
-- {"HTTP-vs-meta-charset.html", "text/html; charset=iso-8859-15", "iso-8859-15"},
-- {"UTF-8-BOM-vs-meta-content.html", "text/html", "utf-8"},
-- {"UTF-8-BOM-vs-meta-charset.html", "text/html", "utf-8"},
--}
--
--func TestSniff(t *testing.T) {
-- for _, tc := range sniffTestCases {
-- content, err := ioutil.ReadFile("testdata/" + tc.filename)
-- if err != nil {
-- t.Errorf("%s: error reading file: %v", tc.filename, err)
-- continue
-- }
--
-- _, name, _ := DetermineEncoding(content, tc.declared)
-- if name != tc.want {
-- t.Errorf("%s: got %q, want %q", tc.filename, name, tc.want)
-- continue
-- }
-- }
--}
--
--func TestReader(t *testing.T) {
-- for _, tc := range sniffTestCases {
-- content, err := ioutil.ReadFile("testdata/" + tc.filename)
-- if err != nil {
-- t.Errorf("%s: error reading file: %v", tc.filename, err)
-- continue
-- }
--
-- r, err := NewReader(bytes.NewReader(content), tc.declared)
-- if err != nil {
-- t.Errorf("%s: error creating reader: %v", tc.filename, err)
-- continue
-- }
--
-- got, err := ioutil.ReadAll(r)
-- if err != nil {
-- t.Errorf("%s: error reading from charset.NewReader: %v", tc.filename, err)
-- continue
-- }
--
-- e, _ := Lookup(tc.want)
-- want, err := ioutil.ReadAll(transform.NewReader(bytes.NewReader(content), e.NewDecoder()))
-- if err != nil {
-- t.Errorf("%s: error decoding with hard-coded charset name: %v", tc.filename, err)
-- continue
-- }
+@@ -1,10 +0,0 @@
+-Most of this project is auto-generated.
-
-- if !bytes.Equal(got, want) {
-- t.Errorf("%s: got %q, want %q", tc.filename, got, want)
-- continue
-- }
-- }
--}
+-The notable directories which are not auto-generated:
-
--var metaTestCases = []struct {
-- meta, want string
--}{
-- {"", ""},
-- {"text/html", ""},
-- {"text/html; charset utf-8", ""},
-- {"text/html; charset=latin-2", "latin-2"},
-- {"text/html; charset; charset = utf-8", "utf-8"},
-- {`charset="big5"`, "big5"},
-- {"charset='shift_jis'", "shift_jis"},
--}
+- google-api-go-generator/ -- the generator itself
+- google-api/ -- shared common code, used by auto-generated code
+- examples/ -- sample code
-
--func TestFromMeta(t *testing.T) {
-- for _, tc := range metaTestCases {
-- got := fromMetaElement(tc.meta)
-- if got != tc.want {
-- t.Errorf("%q: got %q, want %q", tc.meta, got, tc.want)
-- }
-- }
--}
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/gen.go b/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/gen.go
+-When changing the generator, re-compile all APIs and submit the
+-modified APIs in the same CL as the generator changes itself.
+diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/TODO b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/TODO
deleted file mode 100644
-index 25a9eb6..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/gen.go
+index af55f14..0000000
+--- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/TODO
+++ /dev/null
-@@ -1,107 +0,0 @@
--// +build ignore
--
--package main
--
--// Download http://encoding.spec.whatwg.org/encodings.json and use it to
--// generate table.go.
--
--import (
-- "encoding/json"
-- "fmt"
-- "log"
-- "net/http"
-- "strings"
--)
--
--type enc struct {
-- Name string
-- Labels []string
--}
--
--type group struct {
-- Encodings []enc
-- Heading string
--}
--
--const specURL = "http://encoding.spec.whatwg.org/encodings.json"
--
--func main() {
-- resp, err := http.Get(specURL)
-- if err != nil {
-- log.Fatalf("error fetching %s: %s", specURL, err)
-- }
-- if resp.StatusCode != 200 {
-- log.Fatalf("error fetching %s: HTTP status %s", specURL, resp.Status)
-- }
-- defer resp.Body.Close()
--
-- var groups []group
-- d := json.NewDecoder(resp.Body)
-- err = d.Decode(&groups)
-- if err != nil {
-- log.Fatalf("error reading encodings.json: %s", err)
-- }
--
-- fmt.Println("// generated by go run gen.go; DO NOT EDIT")
-- fmt.Println()
-- fmt.Println("package charset")
-- fmt.Println()
--
-- fmt.Println("import (")
-- fmt.Println(`"code.google.com/p/go.text/encoding"`)
-- for _, pkg := range []string{"charmap", "japanese", "korean", "simplifiedchinese", "traditionalchinese", "unicode"} {
-- fmt.Printf("\"code.google.com/p/go.text/encoding/%s\"\n", pkg)
-- }
-- fmt.Println(")")
-- fmt.Println()
--
-- fmt.Println("var encodings = map[string]struct{e encoding.Encoding; name string} {")
-- for _, g := range groups {
-- for _, e := range g.Encodings {
-- goName, ok := miscNames[e.Name]
-- if !ok {
-- for k, v := range prefixes {
-- if strings.HasPrefix(e.Name, k) {
-- goName = v + e.Name[len(k):]
-- break
-- }
-- }
-- if goName == "" {
-- log.Fatalf("unrecognized encoding name: %s", e.Name)
-- }
-- }
--
-- for _, label := range e.Labels {
-- fmt.Printf("%q: {%s, %q},\n", label, goName, e.Name)
-- }
-- }
-- }
-- fmt.Println("}")
--}
--
--var prefixes = map[string]string{
-- "iso-8859-": "charmap.ISO8859_",
-- "windows-": "charmap.Windows",
--}
--
--var miscNames = map[string]string{
-- "utf-8": "encoding.Nop",
-- "ibm866": "charmap.CodePage866",
-- "iso-8859-8-i": "charmap.ISO8859_8",
-- "koi8-r": "charmap.KOI8R",
-- "koi8-u": "charmap.KOI8U",
-- "macintosh": "charmap.Macintosh",
-- "x-mac-cyrillic": "charmap.MacintoshCyrillic",
-- "gbk": "simplifiedchinese.GBK",
-- "gb18030": "simplifiedchinese.GB18030",
-- "hz-gb-2312": "simplifiedchinese.HZGB2312",
-- "big5": "traditionalchinese.Big5",
-- "euc-jp": "japanese.EUCJP",
-- "iso-2022-jp": "japanese.ISO2022JP",
-- "shift_jis": "japanese.ShiftJIS",
-- "euc-kr": "korean.EUCKR",
-- "replacement": "encoding.Replacement",
-- "utf-16be": "unicode.UTF16(unicode.BigEndian, unicode.IgnoreBOM)",
-- "utf-16le": "unicode.UTF16(unicode.LittleEndian, unicode.IgnoreBOM)",
-- "x-user-defined": "charmap.XUserDefined",
--}
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/table.go b/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/table.go
+@@ -1,2 +0,0 @@
+-Moved to:
+-http://code.google.com/p/google-api-go-client/issues/
+diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/compute/v1/compute-api.json b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/compute/v1/compute-api.json
deleted file mode 100644
-index 66f8af1..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/table.go
-+++ /dev/null
-@@ -1,235 +0,0 @@
--// generated by go run gen.go; DO NOT EDIT
--
--package charset
--
--import (
-- "code.google.com/p/go.text/encoding"
-- "code.google.com/p/go.text/encoding/charmap"
-- "code.google.com/p/go.text/encoding/japanese"
-- "code.google.com/p/go.text/encoding/korean"
-- "code.google.com/p/go.text/encoding/simplifiedchinese"
-- "code.google.com/p/go.text/encoding/traditionalchinese"
-- "code.google.com/p/go.text/encoding/unicode"
--)
--
--var encodings = map[string]struct {
-- e encoding.Encoding
-- name string
--}{
-- "unicode-1-1-utf-8": {encoding.Nop, "utf-8"},
-- "utf-8": {encoding.Nop, "utf-8"},
-- "utf8": {encoding.Nop, "utf-8"},
-- "866": {charmap.CodePage866, "ibm866"},
-- "cp866": {charmap.CodePage866, "ibm866"},
-- "csibm866": {charmap.CodePage866, "ibm866"},
-- "ibm866": {charmap.CodePage866, "ibm866"},
-- "csisolatin2": {charmap.ISO8859_2, "iso-8859-2"},
-- "iso-8859-2": {charmap.ISO8859_2, "iso-8859-2"},
-- "iso-ir-101": {charmap.ISO8859_2, "iso-8859-2"},
-- "iso8859-2": {charmap.ISO8859_2, "iso-8859-2"},
-- "iso88592": {charmap.ISO8859_2, "iso-8859-2"},
-- "iso_8859-2": {charmap.ISO8859_2, "iso-8859-2"},
-- "iso_8859-2:1987": {charmap.ISO8859_2, "iso-8859-2"},
-- "l2": {charmap.ISO8859_2, "iso-8859-2"},
-- "latin2": {charmap.ISO8859_2, "iso-8859-2"},
-- "csisolatin3": {charmap.ISO8859_3, "iso-8859-3"},
-- "iso-8859-3": {charmap.ISO8859_3, "iso-8859-3"},
-- "iso-ir-109": {charmap.ISO8859_3, "iso-8859-3"},
-- "iso8859-3": {charmap.ISO8859_3, "iso-8859-3"},
-- "iso88593": {charmap.ISO8859_3, "iso-8859-3"},
-- "iso_8859-3": {charmap.ISO8859_3, "iso-8859-3"},
-- "iso_8859-3:1988": {charmap.ISO8859_3, "iso-8859-3"},
-- "l3": {charmap.ISO8859_3, "iso-8859-3"},
-- "latin3": {charmap.ISO8859_3, "iso-8859-3"},
-- "csisolatin4": {charmap.ISO8859_4, "iso-8859-4"},
-- "iso-8859-4": {charmap.ISO8859_4, "iso-8859-4"},
-- "iso-ir-110": {charmap.ISO8859_4, "iso-8859-4"},
-- "iso8859-4": {charmap.ISO8859_4, "iso-8859-4"},
-- "iso88594": {charmap.ISO8859_4, "iso-8859-4"},
-- "iso_8859-4": {charmap.ISO8859_4, "iso-8859-4"},
-- "iso_8859-4:1988": {charmap.ISO8859_4, "iso-8859-4"},
-- "l4": {charmap.ISO8859_4, "iso-8859-4"},
-- "latin4": {charmap.ISO8859_4, "iso-8859-4"},
-- "csisolatincyrillic": {charmap.ISO8859_5, "iso-8859-5"},
-- "cyrillic": {charmap.ISO8859_5, "iso-8859-5"},
-- "iso-8859-5": {charmap.ISO8859_5, "iso-8859-5"},
-- "iso-ir-144": {charmap.ISO8859_5, "iso-8859-5"},
-- "iso8859-5": {charmap.ISO8859_5, "iso-8859-5"},
-- "iso88595": {charmap.ISO8859_5, "iso-8859-5"},
-- "iso_8859-5": {charmap.ISO8859_5, "iso-8859-5"},
-- "iso_8859-5:1988": {charmap.ISO8859_5, "iso-8859-5"},
-- "arabic": {charmap.ISO8859_6, "iso-8859-6"},
-- "asmo-708": {charmap.ISO8859_6, "iso-8859-6"},
-- "csiso88596e": {charmap.ISO8859_6, "iso-8859-6"},
-- "csiso88596i": {charmap.ISO8859_6, "iso-8859-6"},
-- "csisolatinarabic": {charmap.ISO8859_6, "iso-8859-6"},
-- "ecma-114": {charmap.ISO8859_6, "iso-8859-6"},
-- "iso-8859-6": {charmap.ISO8859_6, "iso-8859-6"},
-- "iso-8859-6-e": {charmap.ISO8859_6, "iso-8859-6"},
-- "iso-8859-6-i": {charmap.ISO8859_6, "iso-8859-6"},
-- "iso-ir-127": {charmap.ISO8859_6, "iso-8859-6"},
-- "iso8859-6": {charmap.ISO8859_6, "iso-8859-6"},
-- "iso88596": {charmap.ISO8859_6, "iso-8859-6"},
-- "iso_8859-6": {charmap.ISO8859_6, "iso-8859-6"},
-- "iso_8859-6:1987": {charmap.ISO8859_6, "iso-8859-6"},
-- "csisolatingreek": {charmap.ISO8859_7, "iso-8859-7"},
-- "ecma-118": {charmap.ISO8859_7, "iso-8859-7"},
-- "elot_928": {charmap.ISO8859_7, "iso-8859-7"},
-- "greek": {charmap.ISO8859_7, "iso-8859-7"},
-- "greek8": {charmap.ISO8859_7, "iso-8859-7"},
-- "iso-8859-7": {charmap.ISO8859_7, "iso-8859-7"},
-- "iso-ir-126": {charmap.ISO8859_7, "iso-8859-7"},
-- "iso8859-7": {charmap.ISO8859_7, "iso-8859-7"},
-- "iso88597": {charmap.ISO8859_7, "iso-8859-7"},
-- "iso_8859-7": {charmap.ISO8859_7, "iso-8859-7"},
-- "iso_8859-7:1987": {charmap.ISO8859_7, "iso-8859-7"},
-- "sun_eu_greek": {charmap.ISO8859_7, "iso-8859-7"},
-- "csiso88598e": {charmap.ISO8859_8, "iso-8859-8"},
-- "csisolatinhebrew": {charmap.ISO8859_8, "iso-8859-8"},
-- "hebrew": {charmap.ISO8859_8, "iso-8859-8"},
-- "iso-8859-8": {charmap.ISO8859_8, "iso-8859-8"},
-- "iso-8859-8-e": {charmap.ISO8859_8, "iso-8859-8"},
-- "iso-ir-138": {charmap.ISO8859_8, "iso-8859-8"},
-- "iso8859-8": {charmap.ISO8859_8, "iso-8859-8"},
-- "iso88598": {charmap.ISO8859_8, "iso-8859-8"},
-- "iso_8859-8": {charmap.ISO8859_8, "iso-8859-8"},
-- "iso_8859-8:1988": {charmap.ISO8859_8, "iso-8859-8"},
-- "visual": {charmap.ISO8859_8, "iso-8859-8"},
-- "csiso88598i": {charmap.ISO8859_8, "iso-8859-8-i"},
-- "iso-8859-8-i": {charmap.ISO8859_8, "iso-8859-8-i"},
-- "logical": {charmap.ISO8859_8, "iso-8859-8-i"},
-- "csisolatin6": {charmap.ISO8859_10, "iso-8859-10"},
-- "iso-8859-10": {charmap.ISO8859_10, "iso-8859-10"},
-- "iso-ir-157": {charmap.ISO8859_10, "iso-8859-10"},
-- "iso8859-10": {charmap.ISO8859_10, "iso-8859-10"},
-- "iso885910": {charmap.ISO8859_10, "iso-8859-10"},
-- "l6": {charmap.ISO8859_10, "iso-8859-10"},
-- "latin6": {charmap.ISO8859_10, "iso-8859-10"},
-- "iso-8859-13": {charmap.ISO8859_13, "iso-8859-13"},
-- "iso8859-13": {charmap.ISO8859_13, "iso-8859-13"},
-- "iso885913": {charmap.ISO8859_13, "iso-8859-13"},
-- "iso-8859-14": {charmap.ISO8859_14, "iso-8859-14"},
-- "iso8859-14": {charmap.ISO8859_14, "iso-8859-14"},
-- "iso885914": {charmap.ISO8859_14, "iso-8859-14"},
-- "csisolatin9": {charmap.ISO8859_15, "iso-8859-15"},
-- "iso-8859-15": {charmap.ISO8859_15, "iso-8859-15"},
-- "iso8859-15": {charmap.ISO8859_15, "iso-8859-15"},
-- "iso885915": {charmap.ISO8859_15, "iso-8859-15"},
-- "iso_8859-15": {charmap.ISO8859_15, "iso-8859-15"},
-- "l9": {charmap.ISO8859_15, "iso-8859-15"},
-- "iso-8859-16": {charmap.ISO8859_16, "iso-8859-16"},
-- "cskoi8r": {charmap.KOI8R, "koi8-r"},
-- "koi": {charmap.KOI8R, "koi8-r"},
-- "koi8": {charmap.KOI8R, "koi8-r"},
-- "koi8-r": {charmap.KOI8R, "koi8-r"},
-- "koi8_r": {charmap.KOI8R, "koi8-r"},
-- "koi8-u": {charmap.KOI8U, "koi8-u"},
-- "csmacintosh": {charmap.Macintosh, "macintosh"},
-- "mac": {charmap.Macintosh, "macintosh"},
-- "macintosh": {charmap.Macintosh, "macintosh"},
-- "x-mac-roman": {charmap.Macintosh, "macintosh"},
-- "dos-874": {charmap.Windows874, "windows-874"},
-- "iso-8859-11": {charmap.Windows874, "windows-874"},
-- "iso8859-11": {charmap.Windows874, "windows-874"},
-- "iso885911": {charmap.Windows874, "windows-874"},
-- "tis-620": {charmap.Windows874, "windows-874"},
-- "windows-874": {charmap.Windows874, "windows-874"},
-- "cp1250": {charmap.Windows1250, "windows-1250"},
-- "windows-1250": {charmap.Windows1250, "windows-1250"},
-- "x-cp1250": {charmap.Windows1250, "windows-1250"},
-- "cp1251": {charmap.Windows1251, "windows-1251"},
-- "windows-1251": {charmap.Windows1251, "windows-1251"},
-- "x-cp1251": {charmap.Windows1251, "windows-1251"},
-- "ansi_x3.4-1968": {charmap.Windows1252, "windows-1252"},
-- "ascii": {charmap.Windows1252, "windows-1252"},
-- "cp1252": {charmap.Windows1252, "windows-1252"},
-- "cp819": {charmap.Windows1252, "windows-1252"},
-- "csisolatin1": {charmap.Windows1252, "windows-1252"},
-- "ibm819": {charmap.Windows1252, "windows-1252"},
-- "iso-8859-1": {charmap.Windows1252, "windows-1252"},
-- "iso-ir-100": {charmap.Windows1252, "windows-1252"},
-- "iso8859-1": {charmap.Windows1252, "windows-1252"},
-- "iso88591": {charmap.Windows1252, "windows-1252"},
-- "iso_8859-1": {charmap.Windows1252, "windows-1252"},
-- "iso_8859-1:1987": {charmap.Windows1252, "windows-1252"},
-- "l1": {charmap.Windows1252, "windows-1252"},
-- "latin1": {charmap.Windows1252, "windows-1252"},
-- "us-ascii": {charmap.Windows1252, "windows-1252"},
-- "windows-1252": {charmap.Windows1252, "windows-1252"},
-- "x-cp1252": {charmap.Windows1252, "windows-1252"},
-- "cp1253": {charmap.Windows1253, "windows-1253"},
-- "windows-1253": {charmap.Windows1253, "windows-1253"},
-- "x-cp1253": {charmap.Windows1253, "windows-1253"},
-- "cp1254": {charmap.Windows1254, "windows-1254"},
-- "csisolatin5": {charmap.Windows1254, "windows-1254"},
-- "iso-8859-9": {charmap.Windows1254, "windows-1254"},
-- "iso-ir-148": {charmap.Windows1254, "windows-1254"},
-- "iso8859-9": {charmap.Windows1254, "windows-1254"},
-- "iso88599": {charmap.Windows1254, "windows-1254"},
-- "iso_8859-9": {charmap.Windows1254, "windows-1254"},
-- "iso_8859-9:1989": {charmap.Windows1254, "windows-1254"},
-- "l5": {charmap.Windows1254, "windows-1254"},
-- "latin5": {charmap.Windows1254, "windows-1254"},
-- "windows-1254": {charmap.Windows1254, "windows-1254"},
-- "x-cp1254": {charmap.Windows1254, "windows-1254"},
-- "cp1255": {charmap.Windows1255, "windows-1255"},
-- "windows-1255": {charmap.Windows1255, "windows-1255"},
-- "x-cp1255": {charmap.Windows1255, "windows-1255"},
-- "cp1256": {charmap.Windows1256, "windows-1256"},
-- "windows-1256": {charmap.Windows1256, "windows-1256"},
-- "x-cp1256": {charmap.Windows1256, "windows-1256"},
-- "cp1257": {charmap.Windows1257, "windows-1257"},
-- "windows-1257": {charmap.Windows1257, "windows-1257"},
-- "x-cp1257": {charmap.Windows1257, "windows-1257"},
-- "cp1258": {charmap.Windows1258, "windows-1258"},
-- "windows-1258": {charmap.Windows1258, "windows-1258"},
-- "x-cp1258": {charmap.Windows1258, "windows-1258"},
-- "x-mac-cyrillic": {charmap.MacintoshCyrillic, "x-mac-cyrillic"},
-- "x-mac-ukrainian": {charmap.MacintoshCyrillic, "x-mac-cyrillic"},
-- "chinese": {simplifiedchinese.GBK, "gbk"},
-- "csgb2312": {simplifiedchinese.GBK, "gbk"},
-- "csiso58gb231280": {simplifiedchinese.GBK, "gbk"},
-- "gb2312": {simplifiedchinese.GBK, "gbk"},
-- "gb_2312": {simplifiedchinese.GBK, "gbk"},
-- "gb_2312-80": {simplifiedchinese.GBK, "gbk"},
-- "gbk": {simplifiedchinese.GBK, "gbk"},
-- "iso-ir-58": {simplifiedchinese.GBK, "gbk"},
-- "x-gbk": {simplifiedchinese.GBK, "gbk"},
-- "gb18030": {simplifiedchinese.GB18030, "gb18030"},
-- "hz-gb-2312": {simplifiedchinese.HZGB2312, "hz-gb-2312"},
-- "big5": {traditionalchinese.Big5, "big5"},
-- "big5-hkscs": {traditionalchinese.Big5, "big5"},
-- "cn-big5": {traditionalchinese.Big5, "big5"},
-- "csbig5": {traditionalchinese.Big5, "big5"},
-- "x-x-big5": {traditionalchinese.Big5, "big5"},
-- "cseucpkdfmtjapanese": {japanese.EUCJP, "euc-jp"},
-- "euc-jp": {japanese.EUCJP, "euc-jp"},
-- "x-euc-jp": {japanese.EUCJP, "euc-jp"},
-- "csiso2022jp": {japanese.ISO2022JP, "iso-2022-jp"},
-- "iso-2022-jp": {japanese.ISO2022JP, "iso-2022-jp"},
-- "csshiftjis": {japanese.ShiftJIS, "shift_jis"},
-- "ms_kanji": {japanese.ShiftJIS, "shift_jis"},
-- "shift-jis": {japanese.ShiftJIS, "shift_jis"},
-- "shift_jis": {japanese.ShiftJIS, "shift_jis"},
-- "sjis": {japanese.ShiftJIS, "shift_jis"},
-- "windows-31j": {japanese.ShiftJIS, "shift_jis"},
-- "x-sjis": {japanese.ShiftJIS, "shift_jis"},
-- "cseuckr": {korean.EUCKR, "euc-kr"},
-- "csksc56011987": {korean.EUCKR, "euc-kr"},
-- "euc-kr": {korean.EUCKR, "euc-kr"},
-- "iso-ir-149": {korean.EUCKR, "euc-kr"},
-- "korean": {korean.EUCKR, "euc-kr"},
-- "ks_c_5601-1987": {korean.EUCKR, "euc-kr"},
-- "ks_c_5601-1989": {korean.EUCKR, "euc-kr"},
-- "ksc5601": {korean.EUCKR, "euc-kr"},
-- "ksc_5601": {korean.EUCKR, "euc-kr"},
-- "windows-949": {korean.EUCKR, "euc-kr"},
-- "csiso2022kr": {encoding.Replacement, "replacement"},
-- "iso-2022-kr": {encoding.Replacement, "replacement"},
-- "iso-2022-cn": {encoding.Replacement, "replacement"},
-- "iso-2022-cn-ext": {encoding.Replacement, "replacement"},
-- "utf-16be": {unicode.UTF16(unicode.BigEndian, unicode.IgnoreBOM), "utf-16be"},
-- "utf-16": {unicode.UTF16(unicode.LittleEndian, unicode.IgnoreBOM), "utf-16le"},
-- "utf-16le": {unicode.UTF16(unicode.LittleEndian, unicode.IgnoreBOM), "utf-16le"},
-- "x-user-defined": {charmap.XUserDefined, "x-user-defined"},
--}
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/HTTP-charset.html b/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/HTTP-charset.html
-deleted file mode 100644
-index 9915fa0..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/HTTP-charset.html
-+++ /dev/null
-@@ -1,48 +0,0 @@
--<!DOCTYPE html>
--<html lang="en" >
--<head>
-- <title>HTTP charset</title>
--<link rel='author' title='Richard Ishida' href='mailto:ishida at w3.org'>
--<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
--<link rel="stylesheet" type="text/css" href="./generatedtests.css">
--<script src="http://w3c-test.org/resources/testharness.js"></script>
--<script src="http://w3c-test.org/resources/testharnessreport.js"></script>
--<meta name='flags' content='http'>
--<meta name="assert" content="The character encoding of a page can be set using the HTTP header charset declaration.">
--<style type='text/css'>
--.test div { width: 50px; }</style>
--<link rel="stylesheet" type="text/css" href="the-input-byte-stream/support/encodingtests-15.css">
--</head>
--<body>
--<p class='title'>HTTP charset</p>
--
--
--<div id='log'></div>
--
--
--<div class='test'><div id='box' class='ýäè'> </div></div>
--
--
--
--
--
--<div class='description'>
--<p class="assertion" title="Assertion">The character encoding of a page can be set using the HTTP header charset declaration.</p>
--<div class="notes"><p><p>The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector <code>.test div.ÜÀÚ</code>. This matches the sequence of bytes above when they are interpreted as ISO 8859-15. If the class name matches the selector then the test will pass.</p><p>The only character encoding declaration for this HTML file is in the HTTP header, which sets the encoding to ISO 8859-15.</p></p>
--</div>
--</div>
--<div class="nexttest"><div><a href="generate?test=the-input-byte-stream-003">Next test</a></div><div class="doctype">HTML5</div>
--<p class="jump">the-input-byte-stream-001<br /><a href="/International/tests/html5/the-input-byte-stream/results-basics#basics" target="_blank">Result summary & related tests</a><br /><a href="http://w3c-test.org/framework/details/i18n-html5/the-input-byte-stream-001" target="_blank">Detailed results for this test</a><br/> <a href="http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream" target="_blank">Link to spec</a></p>
--<div class='prereq'>Assumptions: <ul><li>The default encoding for the browser you are testing is not set to ISO 8859-15.</li>
-- <li>The test is read from a server that supports HTTP.</li></ul></div>
--</div>
--<script>
--test(function() {
--assert_equals(document.getElementById('box').offsetWidth, 100);
--}, " ");
--</script>
--
--</body>
--</html>
--
--
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/HTTP-vs-UTF-8-BOM.html b/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/HTTP-vs-UTF-8-BOM.html
-deleted file mode 100644
-index 26e5d8b..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/HTTP-vs-UTF-8-BOM.html
-+++ /dev/null
-@@ -1,48 +0,0 @@
--<!DOCTYPE html>
--<html lang="en" >
--<head>
-- <title>HTTP vs UTF-8 BOM</title>
--<link rel='author' title='Richard Ishida' href='mailto:ishida at w3.org'>
--<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
--<link rel="stylesheet" type="text/css" href="./generatedtests.css">
--<script src="http://w3c-test.org/resources/testharness.js"></script>
--<script src="http://w3c-test.org/resources/testharnessreport.js"></script>
--<meta name='flags' content='http'>
--<meta name="assert" content="A character encoding set in the HTTP header has lower precedence than the UTF-8 signature.">
--<style type='text/css'>
--.test div { width: 50px; }</style>
--<link rel="stylesheet" type="text/css" href="the-input-byte-stream/support/encodingtests-utf8.css">
--</head>
--<body>
--<p class='title'>HTTP vs UTF-8 BOM</p>
--
--
--<div id='log'></div>
--
--
--<div class='test'><div id='box' class='ýäè'> </div></div>
--
--
--
--
--
--<div class='description'>
--<p class="assertion" title="Assertion">A character encoding set in the HTTP header has lower precedence than the UTF-8 signature.</p>
--<div class="notes"><p><p>The HTTP header attempts to set the character encoding to ISO 8859-15. The page starts with a UTF-8 signature.</p><p>The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector <code>.test div.ýäè</code>. This matches the sequence of bytes above when they are interpreted as UTF-8. If the class name matches the selector then the test will pass.</p><p>If the test is unsuccessful, the characters  should appear at the top of the page. These represent the bytes that make up the UTF-8 signature when encountered in the ISO 8859-15 encoding.</p></p>
--</div>
--</div>
--<div class="nexttest"><div><a href="generate?test=the-input-byte-stream-022">Next test</a></div><div class="doctype">HTML5</div>
--<p class="jump">the-input-byte-stream-034<br /><a href="/International/tests/html5/the-input-byte-stream/results-basics#precedence" target="_blank">Result summary & related tests</a><br /><a href="http://w3c-test.org/framework/details/i18n-html5/the-input-byte-stream-034" target="_blank">Detailed results for this test</a><br/> <a href="http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream" target="_blank">Link to spec</a></p>
--<div class='prereq'>Assumptions: <ul><li>The default encoding for the browser you are testing is not set to ISO 8859-15.</li>
-- <li>The test is read from a server that supports HTTP.</li></ul></div>
--</div>
--<script>
--test(function() {
--assert_equals(document.getElementById('box').offsetWidth, 100);
--}, " ");
--</script>
--
--</body>
--</html>
--
--
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/HTTP-vs-meta-charset.html b/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/HTTP-vs-meta-charset.html
-deleted file mode 100644
-index 2f07e95..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/HTTP-vs-meta-charset.html
-+++ /dev/null
-@@ -1,49 +0,0 @@
--<!DOCTYPE html>
--<html lang="en" >
--<head>
-- <meta charset="iso-8859-1" > <title>HTTP vs meta charset</title>
--<link rel='author' title='Richard Ishida' href='mailto:ishida at w3.org'>
--<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
--<link rel="stylesheet" type="text/css" href="./generatedtests.css">
--<script src="http://w3c-test.org/resources/testharness.js"></script>
--<script src="http://w3c-test.org/resources/testharnessreport.js"></script>
--<meta name='flags' content='http'>
--<meta name="assert" content="The HTTP header has a higher precedence than an encoding declaration in a meta charset attribute.">
--<style type='text/css'>
--.test div { width: 50px; }.test div { width: 90px; }
--</style>
--<link rel="stylesheet" type="text/css" href="the-input-byte-stream/support/encodingtests-15.css">
--</head>
--<body>
--<p class='title'>HTTP vs meta charset</p>
--
--
--<div id='log'></div>
--
--
--<div class='test'><div id='box' class='ýäè'> </div></div>
--
--
--
--
--
--<div class='description'>
--<p class="assertion" title="Assertion">The HTTP header has a higher precedence than an encoding declaration in a meta charset attribute.</p>
--<div class="notes"><p><p>The HTTP header attempts to set the character encoding to ISO 8859-15. The page contains an encoding declaration in a meta charset attribute that attempts to set the character encoding to ISO 8859-1.</p><p>The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector <code>.test div.ÜÀÚ</code>. This matches the sequence of bytes above when they are interpreted as ISO 8859-15. If the class name matches the selector then the test will pass.</p></p>
--</div>
--</div>
--<div class="nexttest"><div><a href="generate?test=the-input-byte-stream-037">Next test</a></div><div class="doctype">HTML5</div>
--<p class="jump">the-input-byte-stream-018<br /><a href="/International/tests/html5/the-input-byte-stream/results-basics#precedence" target="_blank">Result summary & related tests</a><br /><a href="http://w3c-test.org/framework/details/i18n-html5/the-input-byte-stream-018" target="_blank">Detailed results for this test</a><br/> <a href="http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream" target="_blank">Link to spec</a></p>
--<div class='prereq'>Assumptions: <ul><li>The default encoding for the browser you are testing is not set to ISO 8859-15.</li>
-- <li>The test is read from a server that supports HTTP.</li></ul></div>
--</div>
--<script>
--test(function() {
--assert_equals(document.getElementById('box').offsetWidth, 100);
--}, " ");
--</script>
--
--</body>
--</html>
--
--
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/HTTP-vs-meta-content.html b/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/HTTP-vs-meta-content.html
-deleted file mode 100644
-index 6853cdd..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/HTTP-vs-meta-content.html
-+++ /dev/null
-@@ -1,49 +0,0 @@
--<!DOCTYPE html>
--<html lang="en" >
--<head>
-- <meta http-equiv="content-type" content="text/html;charset=iso-8859-1" > <title>HTTP vs meta content</title>
--<link rel='author' title='Richard Ishida' href='mailto:ishida at w3.org'>
--<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
--<link rel="stylesheet" type="text/css" href="./generatedtests.css">
--<script src="http://w3c-test.org/resources/testharness.js"></script>
--<script src="http://w3c-test.org/resources/testharnessreport.js"></script>
--<meta name='flags' content='http'>
--<meta name="assert" content="The HTTP header has a higher precedence than an encoding declaration in a meta content attribute.">
--<style type='text/css'>
--.test div { width: 50px; }.test div { width: 90px; }
--</style>
--<link rel="stylesheet" type="text/css" href="the-input-byte-stream/support/encodingtests-15.css">
--</head>
--<body>
--<p class='title'>HTTP vs meta content</p>
--
--
--<div id='log'></div>
--
--
--<div class='test'><div id='box' class='ýäè'> </div></div>
--
--
--
--
--
--<div class='description'>
--<p class="assertion" title="Assertion">The HTTP header has a higher precedence than an encoding declaration in a meta content attribute.</p>
--<div class="notes"><p><p>The HTTP header attempts to set the character encoding to ISO 8859-15. The page contains an encoding declaration in a meta content attribute that attempts to set the character encoding to ISO 8859-1.</p><p>The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector <code>.test div.ÜÀÚ</code>. This matches the sequence of bytes above when they are interpreted as ISO 8859-15. If the class name matches the selector then the test will pass.</p></p>
--</div>
--</div>
--<div class="nexttest"><div><a href="generate?test=the-input-byte-stream-018">Next test</a></div><div class="doctype">HTML5</div>
--<p class="jump">the-input-byte-stream-016<br /><a href="/International/tests/html5/the-input-byte-stream/results-basics#precedence" target="_blank">Result summary & related tests</a><br /><a href="http://w3c-test.org/framework/details/i18n-html5/the-input-byte-stream-016" target="_blank">Detailed results for this test</a><br/> <a href="http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream" target="_blank">Link to spec</a></p>
--<div class='prereq'>Assumptions: <ul><li>The default encoding for the browser you are testing is not set to ISO 8859-15.</li>
-- <li>The test is read from a server that supports HTTP.</li></ul></div>
--</div>
--<script>
--test(function() {
--assert_equals(document.getElementById('box').offsetWidth, 100);
--}, " ");
--</script>
--
--</body>
--</html>
--
--
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/No-encoding-declaration.html b/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/No-encoding-declaration.html
-deleted file mode 100644
-index 612e26c..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/No-encoding-declaration.html
-+++ /dev/null
-@@ -1,47 +0,0 @@
--<!DOCTYPE html>
--<html lang="en" >
--<head>
-- <title>No encoding declaration</title>
--<link rel='author' title='Richard Ishida' href='mailto:ishida at w3.org'>
--<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
--<link rel="stylesheet" type="text/css" href="./generatedtests.css">
--<script src="http://w3c-test.org/resources/testharness.js"></script>
--<script src="http://w3c-test.org/resources/testharnessreport.js"></script>
--<meta name='flags' content='http'>
--<meta name="assert" content="A page with no encoding information in HTTP, BOM, XML declaration or meta element will be treated as UTF-8.">
--<style type='text/css'>
--.test div { width: 50px; }</style>
--<link rel="stylesheet" type="text/css" href="the-input-byte-stream/support/encodingtests-utf8.css">
--</head>
--<body>
--<p class='title'>No encoding declaration</p>
--
--
--<div id='log'></div>
--
--
--<div class='test'><div id='box' class='ýäè'> </div></div>
--
--
--
--
--
--<div class='description'>
--<p class="assertion" title="Assertion">A page with no encoding information in HTTP, BOM, XML declaration or meta element will be treated as UTF-8.</p>
--<div class="notes"><p><p>The test on this page contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector <code>.test div.ýäè</code>. This matches the sequence of bytes above when they are interpreted as UTF-8. If the class name matches the selector then the test will pass.</p></p>
--</div>
--</div>
--<div class="nexttest"><div><a href="generate?test=the-input-byte-stream-034">Next test</a></div><div class="doctype">HTML5</div>
--<p class="jump">the-input-byte-stream-015<br /><a href="/International/tests/html5/the-input-byte-stream/results-basics#basics" target="_blank">Result summary & related tests</a><br /><a href="http://w3c-test.org/framework/details/i18n-html5/the-input-byte-stream-015" target="_blank">Detailed results for this test</a><br/> <a href="http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream" target="_blank">Link to spec</a></p>
--<div class='prereq'>Assumptions: <ul><li>The test is read from a server that supports HTTP.</li></ul></div>
--</div>
--<script>
--test(function() {
--assert_equals(document.getElementById('box').offsetWidth, 100);
--}, " ");
--</script>
--
--</body>
--</html>
--
--
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/README b/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/README
-deleted file mode 100644
-index a8e1fa4..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/README
-+++ /dev/null
-@@ -1 +0,0 @@
--These test cases come from http://www.w3.org/International/tests/html5/the-input-byte-stream/results-basics
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/UTF-16BE-BOM.html b/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/UTF-16BE-BOM.html
-deleted file mode 100644
-index 3abf7a9343c20518e57dfea58b374fb0f4fb58a1..0000000000000000000000000000000000000000
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 2670
-zcmcJR?QRoS5Qc}JAoU&=BQ-(7b^;2j8i*i3RV1JlO@;VXIsPurV!WHiDdLW}i`*CO
-z^UnC>tih=KsVr;H&Y7?C&O3AV(?534uG?e##U9y_y|!QNi4``n+D>d{2lky^LnFNx
-z?9HrarH$>rwQR_$g)Hk0*&STI*EYq|47~&U9sfUB+ji})9eR{QqCUra7oDsZ5obtB
-zdxP%<)-$4Q;rSHJiM>U(#ZI=;?n^BC?Dp6lu=~_1-lnX3u03&2BlmQIY>L+!Uq7<S
-znh)&E?pViTjIm26+mz45Gn;?mU1-%d$8(q8ng2R#e!F1tlD&lM9_z}^IdM&9OX8=U
-z8%PwVO_n7-g+SYm(XCxt at f1Qm>XoytKw^Q#oZSM?3*J?)&ojG&yzQRkC!M<M9xE_7
-zb;}_hR3kl=jSw#Vt-|I{q%Ck#9h-3za!uL)n~QLmd*yVN|H|tGZJ}Lo7NIwEW{jNQ
-zV@@K5_3@^fi08HMCj^^V*Hl9s7bDNfAUw%xiKL5{%KZf*9rq_B3%EJ8zj(gqf5v)%
-zbOLV*+p`@!Ep4CmhgBB}-xMo+eXUno4NY--$glQJ%^9|ktY at fB&Rr7SEd-RMIzBO=
-z at -E&3<2aeBADM{J>l5JE?ax;lp_NYEcdUht`ZswOviB~L5hmJ|pXI71nn20w;>vG!
-zQGB$EE9&wC``&J#_Ym~<oskhM*qPSKA~LzoN!pzH1>PgRu-Bd>1!pOp0||k`kr=VJ
-zfH6I6rmRaeHA7U-A^OTsT+|d2a^i(>DePzZ{)ibXoCBvJnuYrd-3kkN$u<La`*flh
-zDi+>y{qQK;=*Y;S87ro12aTgu^i*%f8zC3>a}9DIe4cfxOzsCw&(cqvP9{ud{N6f`
-z#TNDY(B6 at Gpr|uN+%&x^XZjBHdc at 2vsM(Tyc2=vshHQ5w+obmp>tuWT(t4BTUGAQw
-zxeI$UGSLUBg=WFbF;4f at 4=^P2AgY at CFn8A`bcC=_&~)fiDe)#cUARRBzJ^k|%X)69
-z+{Cb`wq}Rsg%B62CC_tK!AV(W{(MV?#mndR46CU#BUN<{8e?*oT+!pE5wF#O#TR#a
-z$9qRT)tpbw8zAI~QQJg2C3|6$I%(T(;`zOMy6SO+&;pG=c#2P|P-WZn$$DpWJlC3U
-z3*nvm<q%|^qPyLgA~&hNxH!U(CgUrj$Lv*i?ZToRve;kc at WJ`8#Z)Pn$q5nRA5|>z
-zwP{u~r$L?-m3uqp9I1+#3yE|3M$(s-BE<Joa8PqdUta}ZQ2KUivf!ALM1?f7$7oIM
-sZ)BUR)d7uk!p%4L`mByQto|PReD2~`cUQB{U7yke at NV7*jW5Z60Z{<B#sB~S
-
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/UTF-16LE-BOM.html b/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/UTF-16LE-BOM.html
-deleted file mode 100644
-index 76254c980c29954f1bbd96e145c79f64c43e3355..0000000000000000000000000000000000000000
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 2682
-zcmcJR?QRoS5Qc}JMdBV7Bat9sI{^h%O^8Y;RgubvAPDiRa{S#oi<{jL2gDuqE^=SM
-z^UnC>tih=LQ>`qYoiktOop<K!=TCcf-F~rW_RtRPjXk$VR at lU9JGPna+cmptdzbG8
-zdo$}<X=A%@EgQ0GA<KG0b_bX5wN3FfLvP<+;r~}_+qT`a-#y9!QJ>(wi%!;yh%+Rm
-z{e|xntY<{q!1F1Z6MKtngPm-p-4|H&+3m4AVE3_AyiHm6Tzlf4M(*ht*%YrezJ6kr
-zHGj4<yK5bfF~%;PY+XJR&uspUccE9?9M4^zGk-cOe!F1tg1v<E4(rO!IdM&93*x7p
-z8%PwVO_n7-g+SYm(5+os at h^mW)GKFOfy4<Gb9M_npYX1FeVy4|<ZbsPKk3w6_gI0!
-zsap>5pc?64*$Cm%-zseWMA`x;)v*~jA=i}szqts9xmQkS`M11|(H7bTXAycsXU53+
-zJ?120SRZeyiFjW7enPN`bxk$IaWV3o48oJF7D&2ysoY;6(s6%6vVfaYd&mC=erK!)
-zNGI^7upQgN)53OHe_VE<@J+G8*Y|p*)zB2Thdi}+YR<5QWHm!|a_*AoZXuv7)$xe|
-zm3Q$D7{|#}{m4X&UY!6(ZhyYi2(5JLzGE$H)W6BQklnjPMwn<<eiqA`XaXgx3wwFx
-z!u}~PtanA0H|+*`4?u6%85yyHooTHsB9rT!q|K?H;yvOEd+kY5aF)_JkPs*wi4l7z
-zFs6sily!-wW{B!JL|^%di<&}0PP`B<h5bg~A2MTwbKo>Yvv7Z*TVWwD*=E3QpH37*
-z#lqXJA0A~J9T_<^W5smspmDg2p6ac5Bjn<Ku0igDud_~-$^D?|S^A07$%M&_=dJTt
-zY*DWd?Qb#<6m_PEo2FOgOy8nj51F|IHCvF+)^fGekZmtz>+~LAoow%1TCdZ*$K8`O
-zw_$HaCi+0N&@7la#_7KL5r$+QL{)Pi=I&aDjt~|Knht#`CEi4*3%97i_fSfAS<fw%
-zn-~_=*6h%{5aL3$<o}#ia8j0;KmVn|;^h-=WmR6xNL8JK#+ckCSM<1P#A|h6v2v#$
-zaHn^?chpnO`P94t_OVibB~EP;@09$7PU at viyM@*V*V7k=p6Ga?P}?75Bwndfm2J{5
-zs~ytuoNMwC?x}AMK<F{Ln~iC5i;Ts|5q>lwUz0=3V0GCxY}z81UC-nP=CGt2OqYV$
-zoRCo+qM9YX*3FFORLC=<a&JeRBULkVB5_aOO8Vkbg!qmME@~d>E3B~S at +KROyk4r5
-yX7?DaslDfIebqXgC!KKp4IYy+W~X?ddE6o=`A+x#x0AK&6MF#W&AXxbRrv+SX}PNa
-
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/UTF-8-BOM-vs-meta-charset.html b/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/UTF-8-BOM-vs-meta-charset.html
-deleted file mode 100644
-index 83de433..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/UTF-8-BOM-vs-meta-charset.html
-+++ /dev/null
-@@ -1,49 +0,0 @@
--<!DOCTYPE html>
--<html lang="en" >
--<head>
-- <meta charset="iso-8859-15"> <title>UTF-8 BOM vs meta charset</title>
--<link rel='author' title='Richard Ishida' href='mailto:ishida at w3.org'>
--<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
--<link rel="stylesheet" type="text/css" href="./generatedtests.css">
--<script src="http://w3c-test.org/resources/testharness.js"></script>
--<script src="http://w3c-test.org/resources/testharnessreport.js"></script>
--<meta name='flags' content='http'>
--<meta name="assert" content="A page with a UTF-8 BOM will be recognized as UTF-8 even if the meta charset attribute declares a different encoding.">
--<style type='text/css'>
--.test div { width: 50px; }.test div { width: 90px; }
--</style>
--<link rel="stylesheet" type="text/css" href="the-input-byte-stream/support/encodingtests-utf8.css">
--</head>
--<body>
--<p class='title'>UTF-8 BOM vs meta charset</p>
--
--
--<div id='log'></div>
--
--
--<div class='test'><div id='box' class='ýäè'> </div></div>
--
--
--
--
--
--<div class='description'>
--<p class="assertion" title="Assertion">A page with a UTF-8 BOM will be recognized as UTF-8 even if the meta charset attribute declares a different encoding.</p>
--<div class="notes"><p><p>The page contains an encoding declaration in a meta charset attribute that attempts to set the character encoding to ISO 8859-15, but the file starts with a UTF-8 signature.</p><p>The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector <code>.test div.ýäè</code>. This matches the sequence of bytes above when they are interpreted as UTF-8. If the class name matches the selector then the test will pass.</p></p>
--</div>
--</div>
--<div class="nexttest"><div><a href="generate?test=the-input-byte-stream-024">Next test</a></div><div class="doctype">HTML5</div>
--<p class="jump">the-input-byte-stream-038<br /><a href="/International/tests/html5/the-input-byte-stream/results-basics#precedence" target="_blank">Result summary & related tests</a><br /><a href="http://w3c-test.org/framework/details/i18n-html5/the-input-byte-stream-038" target="_blank">Detailed results for this test</a><br/> <a href="http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream" target="_blank">Link to spec</a></p>
--<div class='prereq'>Assumptions: <ul><li>The default encoding for the browser you are testing is not set to ISO 8859-15.</li>
-- <li>The test is read from a server that supports HTTP.</li></ul></div>
--</div>
--<script>
--test(function() {
--assert_equals(document.getElementById('box').offsetWidth, 100);
--}, " ");
--</script>
--
--</body>
--</html>
--
--
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/UTF-8-BOM-vs-meta-content.html b/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/UTF-8-BOM-vs-meta-content.html
-deleted file mode 100644
-index 501aac2..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/UTF-8-BOM-vs-meta-content.html
-+++ /dev/null
-@@ -1,48 +0,0 @@
--<!DOCTYPE html>
--<html lang="en" >
--<head>
-- <meta http-equiv="content-type" content="text/html; charset=iso-8859-15"> <title>UTF-8 BOM vs meta content</title>
--<link rel='author' title='Richard Ishida' href='mailto:ishida at w3.org'>
--<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
--<link rel="stylesheet" type="text/css" href="./generatedtests.css">
--<script src="http://w3c-test.org/resources/testharness.js"></script>
--<script src="http://w3c-test.org/resources/testharnessreport.js"></script>
--<meta name='flags' content='http'>
--<meta name="assert" content="A page with a UTF-8 BOM will be recognized as UTF-8 even if the meta content attribute declares a different encoding.">
--<style type='text/css'>
--.test div { width: 50px; }</style>
--<link rel="stylesheet" type="text/css" href="the-input-byte-stream/support/encodingtests-utf8.css">
--</head>
--<body>
--<p class='title'>UTF-8 BOM vs meta content</p>
--
--
--<div id='log'></div>
--
--
--<div class='test'><div id='box' class='ýäè'> </div></div>
--
--
--
--
--
--<div class='description'>
--<p class="assertion" title="Assertion">A page with a UTF-8 BOM will be recognized as UTF-8 even if the meta content attribute declares a different encoding.</p>
--<div class="notes"><p><p>The page contains an encoding declaration in a meta content attribute that attempts to set the character encoding to ISO 8859-15, but the file starts with a UTF-8 signature.</p><p>The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector <code>.test div.ýäè</code>. This matches the sequence of bytes above when they are interpreted as UTF-8. If the class name matches the selector then the test will pass.</p></p>
--</div>
--</div>
--<div class="nexttest"><div><a href="generate?test=the-input-byte-stream-038">Next test</a></div><div class="doctype">HTML5</div>
--<p class="jump">the-input-byte-stream-037<br /><a href="/International/tests/html5/the-input-byte-stream/results-basics#precedence" target="_blank">Result summary & related tests</a><br /><a href="http://w3c-test.org/framework/details/i18n-html5/the-input-byte-stream-037" target="_blank">Detailed results for this test</a><br/> <a href="http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream" target="_blank">Link to spec</a></p>
--<div class='prereq'>Assumptions: <ul><li>The default encoding for the browser you are testing is not set to ISO 8859-15.</li>
-- <li>The test is read from a server that supports HTTP.</li></ul></div>
--</div>
--<script>
--test(function() {
--assert_equals(document.getElementById('box').offsetWidth, 100);
--}, " ");
--</script>
--
--</body>
--</html>
--
--
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/meta-charset-attribute.html b/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/meta-charset-attribute.html
-deleted file mode 100644
-index 2d7d25a..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/meta-charset-attribute.html
-+++ /dev/null
-@@ -1,48 +0,0 @@
--<!DOCTYPE html>
--<html lang="en" >
--<head>
-- <meta charset="iso-8859-15"> <title>meta charset attribute</title>
--<link rel='author' title='Richard Ishida' href='mailto:ishida at w3.org'>
--<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
--<link rel="stylesheet" type="text/css" href="./generatedtests.css">
--<script src="http://w3c-test.org/resources/testharness.js"></script>
--<script src="http://w3c-test.org/resources/testharnessreport.js"></script>
--<meta name='flags' content='http'>
--<meta name="assert" content="The character encoding of the page can be set by a meta element with charset attribute.">
--<style type='text/css'>
--.test div { width: 50px; }</style>
--<link rel="stylesheet" type="text/css" href="the-input-byte-stream/support/encodingtests-15.css">
--</head>
--<body>
--<p class='title'>meta charset attribute</p>
--
--
--<div id='log'></div>
--
--
--<div class='test'><div id='box' class='ýäè'> </div></div>
--
--
--
--
--
--<div class='description'>
--<p class="assertion" title="Assertion">The character encoding of the page can be set by a meta element with charset attribute.</p>
--<div class="notes"><p><p>The only character encoding declaration for this HTML file is in the charset attribute of the meta element, which declares the encoding to be ISO 8859-15.</p><p>The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector <code>.test div.ÜÀÚ</code>. This matches the sequence of bytes above when they are interpreted as ISO 8859-15. If the class name matches the selector then the test will pass.</p></p>
--</div>
--</div>
--<div class="nexttest"><div><a href="generate?test=the-input-byte-stream-015">Next test</a></div><div class="doctype">HTML5</div>
--<p class="jump">the-input-byte-stream-009<br /><a href="/International/tests/html5/the-input-byte-stream/results-basics#basics" target="_blank">Result summary & related tests</a><br /><a href="http://w3c-test.org/framework/details/i18n-html5/the-input-byte-stream-009" target="_blank">Detailed results for this test</a><br/> <a href="http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream" target="_blank">Link to spec</a></p>
--<div class='prereq'>Assumptions: <ul><li>The default encoding for the browser you are testing is not set to ISO 8859-15.</li>
-- <li>The test is read from a server that supports HTTP.</li></ul></div>
--</div>
--<script>
--test(function() {
--assert_equals(document.getElementById('box').offsetWidth, 100);
--}, " ");
--</script>
--
--</body>
--</html>
--
--
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/meta-content-attribute.html b/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/meta-content-attribute.html
-deleted file mode 100644
-index 1c3f228..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/meta-content-attribute.html
-+++ /dev/null
-@@ -1,48 +0,0 @@
--<!DOCTYPE html>
--<html lang="en" >
--<head>
-- <meta http-equiv="content-type" content="text/html; charset=iso-8859-15"> <title>meta content attribute</title>
--<link rel='author' title='Richard Ishida' href='mailto:ishida at w3.org'>
--<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
--<link rel="stylesheet" type="text/css" href="./generatedtests.css">
--<script src="http://w3c-test.org/resources/testharness.js"></script>
--<script src="http://w3c-test.org/resources/testharnessreport.js"></script>
--<meta name='flags' content='http'>
--<meta name="assert" content="The character encoding of the page can be set by a meta element with http-equiv and content attributes.">
--<style type='text/css'>
--.test div { width: 50px; }</style>
--<link rel="stylesheet" type="text/css" href="the-input-byte-stream/support/encodingtests-15.css">
--</head>
--<body>
--<p class='title'>meta content attribute</p>
--
--
--<div id='log'></div>
--
--
--<div class='test'><div id='box' class='ýäè'> </div></div>
--
--
--
--
--
--<div class='description'>
--<p class="assertion" title="Assertion">The character encoding of the page can be set by a meta element with http-equiv and content attributes.</p>
--<div class="notes"><p><p>The only character encoding declaration for this HTML file is in the content attribute of the meta element, which declares the encoding to be ISO 8859-15.</p><p>The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector <code>.test div.ÜÀÚ</code>. This matches the sequence of bytes above when they are interpreted as ISO 8859-15. If the class name matches the selector then the test will pass.</p></p>
--</div>
--</div>
--<div class="nexttest"><div><a href="generate?test=the-input-byte-stream-009">Next test</a></div><div class="doctype">HTML5</div>
--<p class="jump">the-input-byte-stream-007<br /><a href="/International/tests/html5/the-input-byte-stream/results-basics#basics" target="_blank">Result summary & related tests</a><br /><a href="http://w3c-test.org/framework/details/i18n-html5/the-input-byte-stream-007" target="_blank">Detailed results for this test</a><br/> <a href="http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream" target="_blank">Link to spec</a></p>
--<div class='prereq'>Assumptions: <ul><li>The default encoding for the browser you are testing is not set to ISO 8859-15.</li>
-- <li>The test is read from a server that supports HTTP.</li></ul></div>
--</div>
--<script>
--test(function() {
--assert_equals(document.getElementById('box').offsetWidth, 100);
--}, " ");
--</script>
--
--</body>
--</html>
--
--
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/const.go b/Godeps/_workspace/src/code.google.com/p/go.net/html/const.go
-deleted file mode 100644
-index d7cc8bb..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/const.go
-+++ /dev/null
-@@ -1,100 +0,0 @@
--// Copyright 2011 The Go Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--package html
--
--// Section 12.2.3.2 of the HTML5 specification says "The following elements
--// have varying levels of special parsing rules".
--// http://www.whatwg.org/specs/web-apps/current-work/multipage/parsing.html#the-stack-of-open-elements
--var isSpecialElementMap = map[string]bool{
-- "address": true,
-- "applet": true,
-- "area": true,
-- "article": true,
-- "aside": true,
-- "base": true,
-- "basefont": true,
-- "bgsound": true,
-- "blockquote": true,
-- "body": true,
-- "br": true,
-- "button": true,
-- "caption": true,
-- "center": true,
-- "col": true,
-- "colgroup": true,
-- "command": true,
-- "dd": true,
-- "details": true,
-- "dir": true,
-- "div": true,
-- "dl": true,
-- "dt": true,
-- "embed": true,
-- "fieldset": true,
-- "figcaption": true,
-- "figure": true,
-- "footer": true,
-- "form": true,
-- "frame": true,
-- "frameset": true,
-- "h1": true,
-- "h2": true,
-- "h3": true,
-- "h4": true,
-- "h5": true,
-- "h6": true,
-- "head": true,
-- "header": true,
-- "hgroup": true,
-- "hr": true,
-- "html": true,
-- "iframe": true,
-- "img": true,
-- "input": true,
-- "isindex": true,
-- "li": true,
-- "link": true,
-- "listing": true,
-- "marquee": true,
-- "menu": true,
-- "meta": true,
-- "nav": true,
-- "noembed": true,
-- "noframes": true,
-- "noscript": true,
-- "object": true,
-- "ol": true,
-- "p": true,
-- "param": true,
-- "plaintext": true,
-- "pre": true,
-- "script": true,
-- "section": true,
-- "select": true,
-- "style": true,
-- "summary": true,
-- "table": true,
-- "tbody": true,
-- "td": true,
-- "textarea": true,
-- "tfoot": true,
-- "th": true,
-- "thead": true,
-- "title": true,
-- "tr": true,
-- "ul": true,
-- "wbr": true,
-- "xmp": true,
--}
--
--func isSpecialElement(element *Node) bool {
-- switch element.Namespace {
-- case "", "html":
-- return isSpecialElementMap[element.Data]
-- case "svg":
-- return element.Data == "foreignObject"
-- }
-- return false
--}
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/doc.go b/Godeps/_workspace/src/code.google.com/p/go.net/html/doc.go
-deleted file mode 100644
-index fac0f54..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/doc.go
-+++ /dev/null
-@@ -1,106 +0,0 @@
--// Copyright 2010 The Go Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--/*
--Package html implements an HTML5-compliant tokenizer and parser.
--
--Tokenization is done by creating a Tokenizer for an io.Reader r. It is the
--caller's responsibility to ensure that r provides UTF-8 encoded HTML.
--
-- z := html.NewTokenizer(r)
--
--Given a Tokenizer z, the HTML is tokenized by repeatedly calling z.Next(),
--which parses the next token and returns its type, or an error:
--
-- for {
-- tt := z.Next()
-- if tt == html.ErrorToken {
-- // ...
-- return ...
-- }
-- // Process the current token.
-- }
--
--There are two APIs for retrieving the current token. The high-level API is to
--call Token; the low-level API is to call Text or TagName / TagAttr. Both APIs
--allow optionally calling Raw after Next but before Token, Text, TagName, or
--TagAttr. In EBNF notation, the valid call sequence per token is:
--
-- Next {Raw} [ Token | Text | TagName {TagAttr} ]
--
--Token returns an independent data structure that completely describes a token.
--Entities (such as "<") are unescaped, tag names and attribute keys are
--lower-cased, and attributes are collected into a []Attribute. For example:
--
-- for {
-- if z.Next() == html.ErrorToken {
-- // Returning io.EOF indicates success.
-- return z.Err()
-- }
-- emitToken(z.Token())
-- }
--
--The low-level API performs fewer allocations and copies, but the contents of
--the []byte values returned by Text, TagName and TagAttr may change on the next
--call to Next. For example, to extract an HTML page's anchor text:
--
-- depth := 0
-- for {
-- tt := z.Next()
-- switch tt {
-- case ErrorToken:
-- return z.Err()
-- case TextToken:
-- if depth > 0 {
-- // emitBytes should copy the []byte it receives,
-- // if it doesn't process it immediately.
-- emitBytes(z.Text())
-- }
-- case StartTagToken, EndTagToken:
-- tn, _ := z.TagName()
-- if len(tn) == 1 && tn[0] == 'a' {
-- if tt == StartTagToken {
-- depth++
-- } else {
-- depth--
-- }
-- }
-- }
-- }
--
--Parsing is done by calling Parse with an io.Reader, which returns the root of
--the parse tree (the document element) as a *Node. It is the caller's
--responsibility to ensure that the Reader provides UTF-8 encoded HTML. For
--example, to process each anchor node in depth-first order:
--
-- doc, err := html.Parse(r)
-- if err != nil {
-- // ...
-- }
-- var f func(*html.Node)
-- f = func(n *html.Node) {
-- if n.Type == html.ElementNode && n.Data == "a" {
-- // Do something with n...
-- }
-- for c := n.FirstChild; c != nil; c = c.NextSibling {
-- f(c)
-- }
-- }
-- f(doc)
--
--The relevant specifications include:
--http://www.whatwg.org/specs/web-apps/current-work/multipage/syntax.html and
--http://www.whatwg.org/specs/web-apps/current-work/multipage/tokenization.html
--*/
--package html
--
--// The tokenization algorithm implemented by this package is not a line-by-line
--// transliteration of the relatively verbose state-machine in the WHATWG
--// specification. A more direct approach is used instead, where the program
--// counter implies the state, such as whether it is tokenizing a tag or a text
--// node. Specification compliance is verified by checking expected and actual
--// outputs over a test suite rather than aiming for algorithmic fidelity.
--
--// TODO(nigeltao): Does a DOM API belong in this package or a separate one?
--// TODO(nigeltao): How does parsing interact with a JavaScript engine?
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/doctype.go b/Godeps/_workspace/src/code.google.com/p/go.net/html/doctype.go
-deleted file mode 100644
-index c484e5a..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/doctype.go
-+++ /dev/null
-@@ -1,156 +0,0 @@
--// Copyright 2011 The Go Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--package html
--
--import (
-- "strings"
--)
--
--// parseDoctype parses the data from a DoctypeToken into a name,
--// public identifier, and system identifier. It returns a Node whose Type
--// is DoctypeNode, whose Data is the name, and which has attributes
--// named "system" and "public" for the two identifiers if they were present.
--// quirks is whether the document should be parsed in "quirks mode".
--func parseDoctype(s string) (n *Node, quirks bool) {
-- n = &Node{Type: DoctypeNode}
--
-- // Find the name.
-- space := strings.IndexAny(s, whitespace)
-- if space == -1 {
-- space = len(s)
-- }
-- n.Data = s[:space]
-- // The comparison to "html" is case-sensitive.
-- if n.Data != "html" {
-- quirks = true
-- }
-- n.Data = strings.ToLower(n.Data)
-- s = strings.TrimLeft(s[space:], whitespace)
--
-- if len(s) < 6 {
-- // It can't start with "PUBLIC" or "SYSTEM".
-- // Ignore the rest of the string.
-- return n, quirks || s != ""
-- }
--
-- key := strings.ToLower(s[:6])
-- s = s[6:]
-- for key == "public" || key == "system" {
-- s = strings.TrimLeft(s, whitespace)
-- if s == "" {
-- break
-- }
-- quote := s[0]
-- if quote != '"' && quote != '\'' {
-- break
-- }
-- s = s[1:]
-- q := strings.IndexRune(s, rune(quote))
-- var id string
-- if q == -1 {
-- id = s
-- s = ""
-- } else {
-- id = s[:q]
-- s = s[q+1:]
-- }
-- n.Attr = append(n.Attr, Attribute{Key: key, Val: id})
-- if key == "public" {
-- key = "system"
-- } else {
-- key = ""
-- }
-- }
--
-- if key != "" || s != "" {
-- quirks = true
-- } else if len(n.Attr) > 0 {
-- if n.Attr[0].Key == "public" {
-- public := strings.ToLower(n.Attr[0].Val)
-- switch public {
-- case "-//w3o//dtd w3 html strict 3.0//en//", "-/w3d/dtd html 4.0 transitional/en", "html":
-- quirks = true
-- default:
-- for _, q := range quirkyIDs {
-- if strings.HasPrefix(public, q) {
-- quirks = true
-- break
-- }
-- }
-- }
-- // The following two public IDs only cause quirks mode if there is no system ID.
-- if len(n.Attr) == 1 && (strings.HasPrefix(public, "-//w3c//dtd html 4.01 frameset//") ||
-- strings.HasPrefix(public, "-//w3c//dtd html 4.01 transitional//")) {
-- quirks = true
-- }
-- }
-- if lastAttr := n.Attr[len(n.Attr)-1]; lastAttr.Key == "system" &&
-- strings.ToLower(lastAttr.Val) == "http://www.ibm.com/data/dtd/v11/ibmxhtml1-transitional.dtd" {
-- quirks = true
-- }
-- }
--
-- return n, quirks
--}
--
--// quirkyIDs is a list of public doctype identifiers that cause a document
--// to be interpreted in quirks mode. The identifiers should be in lower case.
--var quirkyIDs = []string{
-- "+//silmaril//dtd html pro v0r11 19970101//",
-- "-//advasoft ltd//dtd html 3.0 aswedit + extensions//",
-- "-//as//dtd html 3.0 aswedit + extensions//",
-- "-//ietf//dtd html 2.0 level 1//",
-- "-//ietf//dtd html 2.0 level 2//",
-- "-//ietf//dtd html 2.0 strict level 1//",
-- "-//ietf//dtd html 2.0 strict level 2//",
-- "-//ietf//dtd html 2.0 strict//",
-- "-//ietf//dtd html 2.0//",
-- "-//ietf//dtd html 2.1e//",
-- "-//ietf//dtd html 3.0//",
-- "-//ietf//dtd html 3.2 final//",
-- "-//ietf//dtd html 3.2//",
-- "-//ietf//dtd html 3//",
-- "-//ietf//dtd html level 0//",
-- "-//ietf//dtd html level 1//",
-- "-//ietf//dtd html level 2//",
-- "-//ietf//dtd html level 3//",
-- "-//ietf//dtd html strict level 0//",
-- "-//ietf//dtd html strict level 1//",
-- "-//ietf//dtd html strict level 2//",
-- "-//ietf//dtd html strict level 3//",
-- "-//ietf//dtd html strict//",
-- "-//ietf//dtd html//",
-- "-//metrius//dtd metrius presentational//",
-- "-//microsoft//dtd internet explorer 2.0 html strict//",
-- "-//microsoft//dtd internet explorer 2.0 html//",
-- "-//microsoft//dtd internet explorer 2.0 tables//",
-- "-//microsoft//dtd internet explorer 3.0 html strict//",
-- "-//microsoft//dtd internet explorer 3.0 html//",
-- "-//microsoft//dtd internet explorer 3.0 tables//",
-- "-//netscape comm. corp.//dtd html//",
-- "-//netscape comm. corp.//dtd strict html//",
-- "-//o'reilly and associates//dtd html 2.0//",
-- "-//o'reilly and associates//dtd html extended 1.0//",
-- "-//o'reilly and associates//dtd html extended relaxed 1.0//",
-- "-//softquad software//dtd hotmetal pro 6.0::19990601::extensions to html 4.0//",
-- "-//softquad//dtd hotmetal pro 4.0::19971010::extensions to html 4.0//",
-- "-//spyglass//dtd html 2.0 extended//",
-- "-//sq//dtd html 2.0 hotmetal + extensions//",
-- "-//sun microsystems corp.//dtd hotjava html//",
-- "-//sun microsystems corp.//dtd hotjava strict html//",
-- "-//w3c//dtd html 3 1995-03-24//",
-- "-//w3c//dtd html 3.2 draft//",
-- "-//w3c//dtd html 3.2 final//",
-- "-//w3c//dtd html 3.2//",
-- "-//w3c//dtd html 3.2s draft//",
-- "-//w3c//dtd html 4.0 frameset//",
-- "-//w3c//dtd html 4.0 transitional//",
-- "-//w3c//dtd html experimental 19960712//",
-- "-//w3c//dtd html experimental 970421//",
-- "-//w3c//dtd w3 html//",
-- "-//w3o//dtd w3 html 3.0//",
-- "-//webtechs//dtd mozilla html 2.0//",
-- "-//webtechs//dtd mozilla html//",
--}
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/entity.go b/Godeps/_workspace/src/code.google.com/p/go.net/html/entity.go
-deleted file mode 100644
-index af8a007..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/entity.go
-+++ /dev/null
-@@ -1,2253 +0,0 @@
--// Copyright 2010 The Go Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--package html
--
--// All entities that do not end with ';' are 6 or fewer bytes long.
--const longestEntityWithoutSemicolon = 6
--
--// entity is a map from HTML entity names to their values. The semicolon matters:
--// http://www.whatwg.org/specs/web-apps/current-work/multipage/named-character-references.html
--// lists both "amp" and "amp;" as two separate entries.
--//
--// Note that the HTML5 list is larger than the HTML4 list at
--// http://www.w3.org/TR/html4/sgml/entities.html
--var entity = map[string]rune{
-- "AElig;": '\U000000C6',
-- "AMP;": '\U00000026',
-- "Aacute;": '\U000000C1',
-- "Abreve;": '\U00000102',
-- "Acirc;": '\U000000C2',
-- "Acy;": '\U00000410',
-- "Afr;": '\U0001D504',
-- "Agrave;": '\U000000C0',
-- "Alpha;": '\U00000391',
-- "Amacr;": '\U00000100',
-- "And;": '\U00002A53',
-- "Aogon;": '\U00000104',
-- "Aopf;": '\U0001D538',
-- "ApplyFunction;": '\U00002061',
-- "Aring;": '\U000000C5',
-- "Ascr;": '\U0001D49C',
-- "Assign;": '\U00002254',
-- "Atilde;": '\U000000C3',
-- "Auml;": '\U000000C4',
-- "Backslash;": '\U00002216',
-- "Barv;": '\U00002AE7',
-- "Barwed;": '\U00002306',
-- "Bcy;": '\U00000411',
-- "Because;": '\U00002235',
-- "Bernoullis;": '\U0000212C',
-- "Beta;": '\U00000392',
-- "Bfr;": '\U0001D505',
-- "Bopf;": '\U0001D539',
-- "Breve;": '\U000002D8',
-- "Bscr;": '\U0000212C',
-- "Bumpeq;": '\U0000224E',
-- "CHcy;": '\U00000427',
-- "COPY;": '\U000000A9',
-- "Cacute;": '\U00000106',
-- "Cap;": '\U000022D2',
-- "CapitalDifferentialD;": '\U00002145',
-- "Cayleys;": '\U0000212D',
-- "Ccaron;": '\U0000010C',
-- "Ccedil;": '\U000000C7',
-- "Ccirc;": '\U00000108',
-- "Cconint;": '\U00002230',
-- "Cdot;": '\U0000010A',
-- "Cedilla;": '\U000000B8',
-- "CenterDot;": '\U000000B7',
-- "Cfr;": '\U0000212D',
-- "Chi;": '\U000003A7',
-- "CircleDot;": '\U00002299',
-- "CircleMinus;": '\U00002296',
-- "CirclePlus;": '\U00002295',
-- "CircleTimes;": '\U00002297',
-- "ClockwiseContourIntegral;": '\U00002232',
-- "CloseCurlyDoubleQuote;": '\U0000201D',
-- "CloseCurlyQuote;": '\U00002019',
-- "Colon;": '\U00002237',
-- "Colone;": '\U00002A74',
-- "Congruent;": '\U00002261',
-- "Conint;": '\U0000222F',
-- "ContourIntegral;": '\U0000222E',
-- "Copf;": '\U00002102',
-- "Coproduct;": '\U00002210',
-- "CounterClockwiseContourIntegral;": '\U00002233',
-- "Cross;": '\U00002A2F',
-- "Cscr;": '\U0001D49E',
-- "Cup;": '\U000022D3',
-- "CupCap;": '\U0000224D',
-- "DD;": '\U00002145',
-- "DDotrahd;": '\U00002911',
-- "DJcy;": '\U00000402',
-- "DScy;": '\U00000405',
-- "DZcy;": '\U0000040F',
-- "Dagger;": '\U00002021',
-- "Darr;": '\U000021A1',
-- "Dashv;": '\U00002AE4',
-- "Dcaron;": '\U0000010E',
-- "Dcy;": '\U00000414',
-- "Del;": '\U00002207',
-- "Delta;": '\U00000394',
-- "Dfr;": '\U0001D507',
-- "DiacriticalAcute;": '\U000000B4',
-- "DiacriticalDot;": '\U000002D9',
-- "DiacriticalDoubleAcute;": '\U000002DD',
-- "DiacriticalGrave;": '\U00000060',
-- "DiacriticalTilde;": '\U000002DC',
-- "Diamond;": '\U000022C4',
-- "DifferentialD;": '\U00002146',
-- "Dopf;": '\U0001D53B',
-- "Dot;": '\U000000A8',
-- "DotDot;": '\U000020DC',
-- "DotEqual;": '\U00002250',
-- "DoubleContourIntegral;": '\U0000222F',
-- "DoubleDot;": '\U000000A8',
-- "DoubleDownArrow;": '\U000021D3',
-- "DoubleLeftArrow;": '\U000021D0',
-- "DoubleLeftRightArrow;": '\U000021D4',
-- "DoubleLeftTee;": '\U00002AE4',
-- "DoubleLongLeftArrow;": '\U000027F8',
-- "DoubleLongLeftRightArrow;": '\U000027FA',
-- "DoubleLongRightArrow;": '\U000027F9',
-- "DoubleRightArrow;": '\U000021D2',
-- "DoubleRightTee;": '\U000022A8',
-- "DoubleUpArrow;": '\U000021D1',
-- "DoubleUpDownArrow;": '\U000021D5',
-- "DoubleVerticalBar;": '\U00002225',
-- "DownArrow;": '\U00002193',
-- "DownArrowBar;": '\U00002913',
-- "DownArrowUpArrow;": '\U000021F5',
-- "DownBreve;": '\U00000311',
-- "DownLeftRightVector;": '\U00002950',
-- "DownLeftTeeVector;": '\U0000295E',
-- "DownLeftVector;": '\U000021BD',
-- "DownLeftVectorBar;": '\U00002956',
-- "DownRightTeeVector;": '\U0000295F',
-- "DownRightVector;": '\U000021C1',
-- "DownRightVectorBar;": '\U00002957',
-- "DownTee;": '\U000022A4',
-- "DownTeeArrow;": '\U000021A7',
-- "Downarrow;": '\U000021D3',
-- "Dscr;": '\U0001D49F',
-- "Dstrok;": '\U00000110',
-- "ENG;": '\U0000014A',
-- "ETH;": '\U000000D0',
-- "Eacute;": '\U000000C9',
-- "Ecaron;": '\U0000011A',
-- "Ecirc;": '\U000000CA',
-- "Ecy;": '\U0000042D',
-- "Edot;": '\U00000116',
-- "Efr;": '\U0001D508',
-- "Egrave;": '\U000000C8',
-- "Element;": '\U00002208',
-- "Emacr;": '\U00000112',
-- "EmptySmallSquare;": '\U000025FB',
-- "EmptyVerySmallSquare;": '\U000025AB',
-- "Eogon;": '\U00000118',
-- "Eopf;": '\U0001D53C',
-- "Epsilon;": '\U00000395',
-- "Equal;": '\U00002A75',
-- "EqualTilde;": '\U00002242',
-- "Equilibrium;": '\U000021CC',
-- "Escr;": '\U00002130',
-- "Esim;": '\U00002A73',
-- "Eta;": '\U00000397',
-- "Euml;": '\U000000CB',
-- "Exists;": '\U00002203',
-- "ExponentialE;": '\U00002147',
-- "Fcy;": '\U00000424',
-- "Ffr;": '\U0001D509',
-- "FilledSmallSquare;": '\U000025FC',
-- "FilledVerySmallSquare;": '\U000025AA',
-- "Fopf;": '\U0001D53D',
-- "ForAll;": '\U00002200',
-- "Fouriertrf;": '\U00002131',
-- "Fscr;": '\U00002131',
-- "GJcy;": '\U00000403',
-- "GT;": '\U0000003E',
-- "Gamma;": '\U00000393',
-- "Gammad;": '\U000003DC',
-- "Gbreve;": '\U0000011E',
-- "Gcedil;": '\U00000122',
-- "Gcirc;": '\U0000011C',
-- "Gcy;": '\U00000413',
-- "Gdot;": '\U00000120',
-- "Gfr;": '\U0001D50A',
-- "Gg;": '\U000022D9',
-- "Gopf;": '\U0001D53E',
-- "GreaterEqual;": '\U00002265',
-- "GreaterEqualLess;": '\U000022DB',
-- "GreaterFullEqual;": '\U00002267',
-- "GreaterGreater;": '\U00002AA2',
-- "GreaterLess;": '\U00002277',
-- "GreaterSlantEqual;": '\U00002A7E',
-- "GreaterTilde;": '\U00002273',
-- "Gscr;": '\U0001D4A2',
-- "Gt;": '\U0000226B',
-- "HARDcy;": '\U0000042A',
-- "Hacek;": '\U000002C7',
-- "Hat;": '\U0000005E',
-- "Hcirc;": '\U00000124',
-- "Hfr;": '\U0000210C',
-- "HilbertSpace;": '\U0000210B',
-- "Hopf;": '\U0000210D',
-- "HorizontalLine;": '\U00002500',
-- "Hscr;": '\U0000210B',
-- "Hstrok;": '\U00000126',
-- "HumpDownHump;": '\U0000224E',
-- "HumpEqual;": '\U0000224F',
-- "IEcy;": '\U00000415',
-- "IJlig;": '\U00000132',
-- "IOcy;": '\U00000401',
-- "Iacute;": '\U000000CD',
-- "Icirc;": '\U000000CE',
-- "Icy;": '\U00000418',
-- "Idot;": '\U00000130',
-- "Ifr;": '\U00002111',
-- "Igrave;": '\U000000CC',
-- "Im;": '\U00002111',
-- "Imacr;": '\U0000012A',
-- "ImaginaryI;": '\U00002148',
-- "Implies;": '\U000021D2',
-- "Int;": '\U0000222C',
-- "Integral;": '\U0000222B',
-- "Intersection;": '\U000022C2',
-- "InvisibleComma;": '\U00002063',
-- "InvisibleTimes;": '\U00002062',
-- "Iogon;": '\U0000012E',
-- "Iopf;": '\U0001D540',
-- "Iota;": '\U00000399',
-- "Iscr;": '\U00002110',
-- "Itilde;": '\U00000128',
-- "Iukcy;": '\U00000406',
-- "Iuml;": '\U000000CF',
-- "Jcirc;": '\U00000134',
-- "Jcy;": '\U00000419',
-- "Jfr;": '\U0001D50D',
-- "Jopf;": '\U0001D541',
-- "Jscr;": '\U0001D4A5',
-- "Jsercy;": '\U00000408',
-- "Jukcy;": '\U00000404',
-- "KHcy;": '\U00000425',
-- "KJcy;": '\U0000040C',
-- "Kappa;": '\U0000039A',
-- "Kcedil;": '\U00000136',
-- "Kcy;": '\U0000041A',
-- "Kfr;": '\U0001D50E',
-- "Kopf;": '\U0001D542',
-- "Kscr;": '\U0001D4A6',
-- "LJcy;": '\U00000409',
-- "LT;": '\U0000003C',
-- "Lacute;": '\U00000139',
-- "Lambda;": '\U0000039B',
-- "Lang;": '\U000027EA',
-- "Laplacetrf;": '\U00002112',
-- "Larr;": '\U0000219E',
-- "Lcaron;": '\U0000013D',
-- "Lcedil;": '\U0000013B',
-- "Lcy;": '\U0000041B',
-- "LeftAngleBracket;": '\U000027E8',
-- "LeftArrow;": '\U00002190',
-- "LeftArrowBar;": '\U000021E4',
-- "LeftArrowRightArrow;": '\U000021C6',
-- "LeftCeiling;": '\U00002308',
-- "LeftDoubleBracket;": '\U000027E6',
-- "LeftDownTeeVector;": '\U00002961',
-- "LeftDownVector;": '\U000021C3',
-- "LeftDownVectorBar;": '\U00002959',
-- "LeftFloor;": '\U0000230A',
-- "LeftRightArrow;": '\U00002194',
-- "LeftRightVector;": '\U0000294E',
-- "LeftTee;": '\U000022A3',
-- "LeftTeeArrow;": '\U000021A4',
-- "LeftTeeVector;": '\U0000295A',
-- "LeftTriangle;": '\U000022B2',
-- "LeftTriangleBar;": '\U000029CF',
-- "LeftTriangleEqual;": '\U000022B4',
-- "LeftUpDownVector;": '\U00002951',
-- "LeftUpTeeVector;": '\U00002960',
-- "LeftUpVector;": '\U000021BF',
-- "LeftUpVectorBar;": '\U00002958',
-- "LeftVector;": '\U000021BC',
-- "LeftVectorBar;": '\U00002952',
-- "Leftarrow;": '\U000021D0',
-- "Leftrightarrow;": '\U000021D4',
-- "LessEqualGreater;": '\U000022DA',
-- "LessFullEqual;": '\U00002266',
-- "LessGreater;": '\U00002276',
-- "LessLess;": '\U00002AA1',
-- "LessSlantEqual;": '\U00002A7D',
-- "LessTilde;": '\U00002272',
-- "Lfr;": '\U0001D50F',
-- "Ll;": '\U000022D8',
-- "Lleftarrow;": '\U000021DA',
-- "Lmidot;": '\U0000013F',
-- "LongLeftArrow;": '\U000027F5',
-- "LongLeftRightArrow;": '\U000027F7',
-- "LongRightArrow;": '\U000027F6',
-- "Longleftarrow;": '\U000027F8',
-- "Longleftrightarrow;": '\U000027FA',
-- "Longrightarrow;": '\U000027F9',
-- "Lopf;": '\U0001D543',
-- "LowerLeftArrow;": '\U00002199',
-- "LowerRightArrow;": '\U00002198',
-- "Lscr;": '\U00002112',
-- "Lsh;": '\U000021B0',
-- "Lstrok;": '\U00000141',
-- "Lt;": '\U0000226A',
-- "Map;": '\U00002905',
-- "Mcy;": '\U0000041C',
-- "MediumSpace;": '\U0000205F',
-- "Mellintrf;": '\U00002133',
-- "Mfr;": '\U0001D510',
-- "MinusPlus;": '\U00002213',
-- "Mopf;": '\U0001D544',
-- "Mscr;": '\U00002133',
-- "Mu;": '\U0000039C',
-- "NJcy;": '\U0000040A',
-- "Nacute;": '\U00000143',
-- "Ncaron;": '\U00000147',
-- "Ncedil;": '\U00000145',
-- "Ncy;": '\U0000041D',
-- "NegativeMediumSpace;": '\U0000200B',
-- "NegativeThickSpace;": '\U0000200B',
-- "NegativeThinSpace;": '\U0000200B',
-- "NegativeVeryThinSpace;": '\U0000200B',
-- "NestedGreaterGreater;": '\U0000226B',
-- "NestedLessLess;": '\U0000226A',
-- "NewLine;": '\U0000000A',
-- "Nfr;": '\U0001D511',
-- "NoBreak;": '\U00002060',
-- "NonBreakingSpace;": '\U000000A0',
-- "Nopf;": '\U00002115',
-- "Not;": '\U00002AEC',
-- "NotCongruent;": '\U00002262',
-- "NotCupCap;": '\U0000226D',
-- "NotDoubleVerticalBar;": '\U00002226',
-- "NotElement;": '\U00002209',
-- "NotEqual;": '\U00002260',
-- "NotExists;": '\U00002204',
-- "NotGreater;": '\U0000226F',
-- "NotGreaterEqual;": '\U00002271',
-- "NotGreaterLess;": '\U00002279',
-- "NotGreaterTilde;": '\U00002275',
-- "NotLeftTriangle;": '\U000022EA',
-- "NotLeftTriangleEqual;": '\U000022EC',
-- "NotLess;": '\U0000226E',
-- "NotLessEqual;": '\U00002270',
-- "NotLessGreater;": '\U00002278',
-- "NotLessTilde;": '\U00002274',
-- "NotPrecedes;": '\U00002280',
-- "NotPrecedesSlantEqual;": '\U000022E0',
-- "NotReverseElement;": '\U0000220C',
-- "NotRightTriangle;": '\U000022EB',
-- "NotRightTriangleEqual;": '\U000022ED',
-- "NotSquareSubsetEqual;": '\U000022E2',
-- "NotSquareSupersetEqual;": '\U000022E3',
-- "NotSubsetEqual;": '\U00002288',
-- "NotSucceeds;": '\U00002281',
-- "NotSucceedsSlantEqual;": '\U000022E1',
-- "NotSupersetEqual;": '\U00002289',
-- "NotTilde;": '\U00002241',
-- "NotTildeEqual;": '\U00002244',
-- "NotTildeFullEqual;": '\U00002247',
-- "NotTildeTilde;": '\U00002249',
-- "NotVerticalBar;": '\U00002224',
-- "Nscr;": '\U0001D4A9',
-- "Ntilde;": '\U000000D1',
-- "Nu;": '\U0000039D',
-- "OElig;": '\U00000152',
-- "Oacute;": '\U000000D3',
-- "Ocirc;": '\U000000D4',
-- "Ocy;": '\U0000041E',
-- "Odblac;": '\U00000150',
-- "Ofr;": '\U0001D512',
-- "Ograve;": '\U000000D2',
-- "Omacr;": '\U0000014C',
-- "Omega;": '\U000003A9',
-- "Omicron;": '\U0000039F',
-- "Oopf;": '\U0001D546',
-- "OpenCurlyDoubleQuote;": '\U0000201C',
-- "OpenCurlyQuote;": '\U00002018',
-- "Or;": '\U00002A54',
-- "Oscr;": '\U0001D4AA',
-- "Oslash;": '\U000000D8',
-- "Otilde;": '\U000000D5',
-- "Otimes;": '\U00002A37',
-- "Ouml;": '\U000000D6',
-- "OverBar;": '\U0000203E',
-- "OverBrace;": '\U000023DE',
-- "OverBracket;": '\U000023B4',
-- "OverParenthesis;": '\U000023DC',
-- "PartialD;": '\U00002202',
-- "Pcy;": '\U0000041F',
-- "Pfr;": '\U0001D513',
-- "Phi;": '\U000003A6',
-- "Pi;": '\U000003A0',
-- "PlusMinus;": '\U000000B1',
-- "Poincareplane;": '\U0000210C',
-- "Popf;": '\U00002119',
-- "Pr;": '\U00002ABB',
-- "Precedes;": '\U0000227A',
-- "PrecedesEqual;": '\U00002AAF',
-- "PrecedesSlantEqual;": '\U0000227C',
-- "PrecedesTilde;": '\U0000227E',
-- "Prime;": '\U00002033',
-- "Product;": '\U0000220F',
-- "Proportion;": '\U00002237',
-- "Proportional;": '\U0000221D',
-- "Pscr;": '\U0001D4AB',
-- "Psi;": '\U000003A8',
-- "QUOT;": '\U00000022',
-- "Qfr;": '\U0001D514',
-- "Qopf;": '\U0000211A',
-- "Qscr;": '\U0001D4AC',
-- "RBarr;": '\U00002910',
-- "REG;": '\U000000AE',
-- "Racute;": '\U00000154',
-- "Rang;": '\U000027EB',
-- "Rarr;": '\U000021A0',
-- "Rarrtl;": '\U00002916',
-- "Rcaron;": '\U00000158',
-- "Rcedil;": '\U00000156',
-- "Rcy;": '\U00000420',
-- "Re;": '\U0000211C',
-- "ReverseElement;": '\U0000220B',
-- "ReverseEquilibrium;": '\U000021CB',
-- "ReverseUpEquilibrium;": '\U0000296F',
-- "Rfr;": '\U0000211C',
-- "Rho;": '\U000003A1',
-- "RightAngleBracket;": '\U000027E9',
-- "RightArrow;": '\U00002192',
-- "RightArrowBar;": '\U000021E5',
-- "RightArrowLeftArrow;": '\U000021C4',
-- "RightCeiling;": '\U00002309',
-- "RightDoubleBracket;": '\U000027E7',
-- "RightDownTeeVector;": '\U0000295D',
-- "RightDownVector;": '\U000021C2',
-- "RightDownVectorBar;": '\U00002955',
-- "RightFloor;": '\U0000230B',
-- "RightTee;": '\U000022A2',
-- "RightTeeArrow;": '\U000021A6',
-- "RightTeeVector;": '\U0000295B',
-- "RightTriangle;": '\U000022B3',
-- "RightTriangleBar;": '\U000029D0',
-- "RightTriangleEqual;": '\U000022B5',
-- "RightUpDownVector;": '\U0000294F',
-- "RightUpTeeVector;": '\U0000295C',
-- "RightUpVector;": '\U000021BE',
-- "RightUpVectorBar;": '\U00002954',
-- "RightVector;": '\U000021C0',
-- "RightVectorBar;": '\U00002953',
-- "Rightarrow;": '\U000021D2',
-- "Ropf;": '\U0000211D',
-- "RoundImplies;": '\U00002970',
-- "Rrightarrow;": '\U000021DB',
-- "Rscr;": '\U0000211B',
-- "Rsh;": '\U000021B1',
-- "RuleDelayed;": '\U000029F4',
-- "SHCHcy;": '\U00000429',
-- "SHcy;": '\U00000428',
-- "SOFTcy;": '\U0000042C',
-- "Sacute;": '\U0000015A',
-- "Sc;": '\U00002ABC',
-- "Scaron;": '\U00000160',
-- "Scedil;": '\U0000015E',
-- "Scirc;": '\U0000015C',
-- "Scy;": '\U00000421',
-- "Sfr;": '\U0001D516',
-- "ShortDownArrow;": '\U00002193',
-- "ShortLeftArrow;": '\U00002190',
-- "ShortRightArrow;": '\U00002192',
-- "ShortUpArrow;": '\U00002191',
-- "Sigma;": '\U000003A3',
-- "SmallCircle;": '\U00002218',
-- "Sopf;": '\U0001D54A',
-- "Sqrt;": '\U0000221A',
-- "Square;": '\U000025A1',
-- "SquareIntersection;": '\U00002293',
-- "SquareSubset;": '\U0000228F',
-- "SquareSubsetEqual;": '\U00002291',
-- "SquareSuperset;": '\U00002290',
-- "SquareSupersetEqual;": '\U00002292',
-- "SquareUnion;": '\U00002294',
-- "Sscr;": '\U0001D4AE',
-- "Star;": '\U000022C6',
-- "Sub;": '\U000022D0',
-- "Subset;": '\U000022D0',
-- "SubsetEqual;": '\U00002286',
-- "Succeeds;": '\U0000227B',
-- "SucceedsEqual;": '\U00002AB0',
-- "SucceedsSlantEqual;": '\U0000227D',
-- "SucceedsTilde;": '\U0000227F',
-- "SuchThat;": '\U0000220B',
-- "Sum;": '\U00002211',
-- "Sup;": '\U000022D1',
-- "Superset;": '\U00002283',
-- "SupersetEqual;": '\U00002287',
-- "Supset;": '\U000022D1',
-- "THORN;": '\U000000DE',
-- "TRADE;": '\U00002122',
-- "TSHcy;": '\U0000040B',
-- "TScy;": '\U00000426',
-- "Tab;": '\U00000009',
-- "Tau;": '\U000003A4',
-- "Tcaron;": '\U00000164',
-- "Tcedil;": '\U00000162',
-- "Tcy;": '\U00000422',
-- "Tfr;": '\U0001D517',
-- "Therefore;": '\U00002234',
-- "Theta;": '\U00000398',
-- "ThinSpace;": '\U00002009',
-- "Tilde;": '\U0000223C',
-- "TildeEqual;": '\U00002243',
-- "TildeFullEqual;": '\U00002245',
-- "TildeTilde;": '\U00002248',
-- "Topf;": '\U0001D54B',
-- "TripleDot;": '\U000020DB',
-- "Tscr;": '\U0001D4AF',
-- "Tstrok;": '\U00000166',
-- "Uacute;": '\U000000DA',
-- "Uarr;": '\U0000219F',
-- "Uarrocir;": '\U00002949',
-- "Ubrcy;": '\U0000040E',
-- "Ubreve;": '\U0000016C',
-- "Ucirc;": '\U000000DB',
-- "Ucy;": '\U00000423',
-- "Udblac;": '\U00000170',
-- "Ufr;": '\U0001D518',
-- "Ugrave;": '\U000000D9',
-- "Umacr;": '\U0000016A',
-- "UnderBar;": '\U0000005F',
-- "UnderBrace;": '\U000023DF',
-- "UnderBracket;": '\U000023B5',
-- "UnderParenthesis;": '\U000023DD',
-- "Union;": '\U000022C3',
-- "UnionPlus;": '\U0000228E',
-- "Uogon;": '\U00000172',
-- "Uopf;": '\U0001D54C',
-- "UpArrow;": '\U00002191',
-- "UpArrowBar;": '\U00002912',
-- "UpArrowDownArrow;": '\U000021C5',
-- "UpDownArrow;": '\U00002195',
-- "UpEquilibrium;": '\U0000296E',
-- "UpTee;": '\U000022A5',
-- "UpTeeArrow;": '\U000021A5',
-- "Uparrow;": '\U000021D1',
-- "Updownarrow;": '\U000021D5',
-- "UpperLeftArrow;": '\U00002196',
-- "UpperRightArrow;": '\U00002197',
-- "Upsi;": '\U000003D2',
-- "Upsilon;": '\U000003A5',
-- "Uring;": '\U0000016E',
-- "Uscr;": '\U0001D4B0',
-- "Utilde;": '\U00000168',
-- "Uuml;": '\U000000DC',
-- "VDash;": '\U000022AB',
-- "Vbar;": '\U00002AEB',
-- "Vcy;": '\U00000412',
-- "Vdash;": '\U000022A9',
-- "Vdashl;": '\U00002AE6',
-- "Vee;": '\U000022C1',
-- "Verbar;": '\U00002016',
-- "Vert;": '\U00002016',
-- "VerticalBar;": '\U00002223',
-- "VerticalLine;": '\U0000007C',
-- "VerticalSeparator;": '\U00002758',
-- "VerticalTilde;": '\U00002240',
-- "VeryThinSpace;": '\U0000200A',
-- "Vfr;": '\U0001D519',
-- "Vopf;": '\U0001D54D',
-- "Vscr;": '\U0001D4B1',
-- "Vvdash;": '\U000022AA',
-- "Wcirc;": '\U00000174',
-- "Wedge;": '\U000022C0',
-- "Wfr;": '\U0001D51A',
-- "Wopf;": '\U0001D54E',
-- "Wscr;": '\U0001D4B2',
-- "Xfr;": '\U0001D51B',
-- "Xi;": '\U0000039E',
-- "Xopf;": '\U0001D54F',
-- "Xscr;": '\U0001D4B3',
-- "YAcy;": '\U0000042F',
-- "YIcy;": '\U00000407',
-- "YUcy;": '\U0000042E',
-- "Yacute;": '\U000000DD',
-- "Ycirc;": '\U00000176',
-- "Ycy;": '\U0000042B',
-- "Yfr;": '\U0001D51C',
-- "Yopf;": '\U0001D550',
-- "Yscr;": '\U0001D4B4',
-- "Yuml;": '\U00000178',
-- "ZHcy;": '\U00000416',
-- "Zacute;": '\U00000179',
-- "Zcaron;": '\U0000017D',
-- "Zcy;": '\U00000417',
-- "Zdot;": '\U0000017B',
-- "ZeroWidthSpace;": '\U0000200B',
-- "Zeta;": '\U00000396',
-- "Zfr;": '\U00002128',
-- "Zopf;": '\U00002124',
-- "Zscr;": '\U0001D4B5',
-- "aacute;": '\U000000E1',
-- "abreve;": '\U00000103',
-- "ac;": '\U0000223E',
-- "acd;": '\U0000223F',
-- "acirc;": '\U000000E2',
-- "acute;": '\U000000B4',
-- "acy;": '\U00000430',
-- "aelig;": '\U000000E6',
-- "af;": '\U00002061',
-- "afr;": '\U0001D51E',
-- "agrave;": '\U000000E0',
-- "alefsym;": '\U00002135',
-- "aleph;": '\U00002135',
-- "alpha;": '\U000003B1',
-- "amacr;": '\U00000101',
-- "amalg;": '\U00002A3F',
-- "amp;": '\U00000026',
-- "and;": '\U00002227',
-- "andand;": '\U00002A55',
-- "andd;": '\U00002A5C',
-- "andslope;": '\U00002A58',
-- "andv;": '\U00002A5A',
-- "ang;": '\U00002220',
-- "ange;": '\U000029A4',
-- "angle;": '\U00002220',
-- "angmsd;": '\U00002221',
-- "angmsdaa;": '\U000029A8',
-- "angmsdab;": '\U000029A9',
-- "angmsdac;": '\U000029AA',
-- "angmsdad;": '\U000029AB',
-- "angmsdae;": '\U000029AC',
-- "angmsdaf;": '\U000029AD',
-- "angmsdag;": '\U000029AE',
-- "angmsdah;": '\U000029AF',
-- "angrt;": '\U0000221F',
-- "angrtvb;": '\U000022BE',
-- "angrtvbd;": '\U0000299D',
-- "angsph;": '\U00002222',
-- "angst;": '\U000000C5',
-- "angzarr;": '\U0000237C',
-- "aogon;": '\U00000105',
-- "aopf;": '\U0001D552',
-- "ap;": '\U00002248',
-- "apE;": '\U00002A70',
-- "apacir;": '\U00002A6F',
-- "ape;": '\U0000224A',
-- "apid;": '\U0000224B',
-- "apos;": '\U00000027',
-- "approx;": '\U00002248',
-- "approxeq;": '\U0000224A',
-- "aring;": '\U000000E5',
-- "ascr;": '\U0001D4B6',
-- "ast;": '\U0000002A',
-- "asymp;": '\U00002248',
-- "asympeq;": '\U0000224D',
-- "atilde;": '\U000000E3',
-- "auml;": '\U000000E4',
-- "awconint;": '\U00002233',
-- "awint;": '\U00002A11',
-- "bNot;": '\U00002AED',
-- "backcong;": '\U0000224C',
-- "backepsilon;": '\U000003F6',
-- "backprime;": '\U00002035',
-- "backsim;": '\U0000223D',
-- "backsimeq;": '\U000022CD',
-- "barvee;": '\U000022BD',
-- "barwed;": '\U00002305',
-- "barwedge;": '\U00002305',
-- "bbrk;": '\U000023B5',
-- "bbrktbrk;": '\U000023B6',
-- "bcong;": '\U0000224C',
-- "bcy;": '\U00000431',
-- "bdquo;": '\U0000201E',
-- "becaus;": '\U00002235',
-- "because;": '\U00002235',
-- "bemptyv;": '\U000029B0',
-- "bepsi;": '\U000003F6',
-- "bernou;": '\U0000212C',
-- "beta;": '\U000003B2',
-- "beth;": '\U00002136',
-- "between;": '\U0000226C',
-- "bfr;": '\U0001D51F',
-- "bigcap;": '\U000022C2',
-- "bigcirc;": '\U000025EF',
-- "bigcup;": '\U000022C3',
-- "bigodot;": '\U00002A00',
-- "bigoplus;": '\U00002A01',
-- "bigotimes;": '\U00002A02',
-- "bigsqcup;": '\U00002A06',
-- "bigstar;": '\U00002605',
-- "bigtriangledown;": '\U000025BD',
-- "bigtriangleup;": '\U000025B3',
-- "biguplus;": '\U00002A04',
-- "bigvee;": '\U000022C1',
-- "bigwedge;": '\U000022C0',
-- "bkarow;": '\U0000290D',
-- "blacklozenge;": '\U000029EB',
-- "blacksquare;": '\U000025AA',
-- "blacktriangle;": '\U000025B4',
-- "blacktriangledown;": '\U000025BE',
-- "blacktriangleleft;": '\U000025C2',
-- "blacktriangleright;": '\U000025B8',
-- "blank;": '\U00002423',
-- "blk12;": '\U00002592',
-- "blk14;": '\U00002591',
-- "blk34;": '\U00002593',
-- "block;": '\U00002588',
-- "bnot;": '\U00002310',
-- "bopf;": '\U0001D553',
-- "bot;": '\U000022A5',
-- "bottom;": '\U000022A5',
-- "bowtie;": '\U000022C8',
-- "boxDL;": '\U00002557',
-- "boxDR;": '\U00002554',
-- "boxDl;": '\U00002556',
-- "boxDr;": '\U00002553',
-- "boxH;": '\U00002550',
-- "boxHD;": '\U00002566',
-- "boxHU;": '\U00002569',
-- "boxHd;": '\U00002564',
-- "boxHu;": '\U00002567',
-- "boxUL;": '\U0000255D',
-- "boxUR;": '\U0000255A',
-- "boxUl;": '\U0000255C',
-- "boxUr;": '\U00002559',
-- "boxV;": '\U00002551',
-- "boxVH;": '\U0000256C',
-- "boxVL;": '\U00002563',
-- "boxVR;": '\U00002560',
-- "boxVh;": '\U0000256B',
-- "boxVl;": '\U00002562',
-- "boxVr;": '\U0000255F',
-- "boxbox;": '\U000029C9',
-- "boxdL;": '\U00002555',
-- "boxdR;": '\U00002552',
-- "boxdl;": '\U00002510',
-- "boxdr;": '\U0000250C',
-- "boxh;": '\U00002500',
-- "boxhD;": '\U00002565',
-- "boxhU;": '\U00002568',
-- "boxhd;": '\U0000252C',
-- "boxhu;": '\U00002534',
-- "boxminus;": '\U0000229F',
-- "boxplus;": '\U0000229E',
-- "boxtimes;": '\U000022A0',
-- "boxuL;": '\U0000255B',
-- "boxuR;": '\U00002558',
-- "boxul;": '\U00002518',
-- "boxur;": '\U00002514',
-- "boxv;": '\U00002502',
-- "boxvH;": '\U0000256A',
-- "boxvL;": '\U00002561',
-- "boxvR;": '\U0000255E',
-- "boxvh;": '\U0000253C',
-- "boxvl;": '\U00002524',
-- "boxvr;": '\U0000251C',
-- "bprime;": '\U00002035',
-- "breve;": '\U000002D8',
-- "brvbar;": '\U000000A6',
-- "bscr;": '\U0001D4B7',
-- "bsemi;": '\U0000204F',
-- "bsim;": '\U0000223D',
-- "bsime;": '\U000022CD',
-- "bsol;": '\U0000005C',
-- "bsolb;": '\U000029C5',
-- "bsolhsub;": '\U000027C8',
-- "bull;": '\U00002022',
-- "bullet;": '\U00002022',
-- "bump;": '\U0000224E',
-- "bumpE;": '\U00002AAE',
-- "bumpe;": '\U0000224F',
-- "bumpeq;": '\U0000224F',
-- "cacute;": '\U00000107',
-- "cap;": '\U00002229',
-- "capand;": '\U00002A44',
-- "capbrcup;": '\U00002A49',
-- "capcap;": '\U00002A4B',
-- "capcup;": '\U00002A47',
-- "capdot;": '\U00002A40',
-- "caret;": '\U00002041',
-- "caron;": '\U000002C7',
-- "ccaps;": '\U00002A4D',
-- "ccaron;": '\U0000010D',
-- "ccedil;": '\U000000E7',
-- "ccirc;": '\U00000109',
-- "ccups;": '\U00002A4C',
-- "ccupssm;": '\U00002A50',
-- "cdot;": '\U0000010B',
-- "cedil;": '\U000000B8',
-- "cemptyv;": '\U000029B2',
-- "cent;": '\U000000A2',
-- "centerdot;": '\U000000B7',
-- "cfr;": '\U0001D520',
-- "chcy;": '\U00000447',
-- "check;": '\U00002713',
-- "checkmark;": '\U00002713',
-- "chi;": '\U000003C7',
-- "cir;": '\U000025CB',
-- "cirE;": '\U000029C3',
-- "circ;": '\U000002C6',
-- "circeq;": '\U00002257',
-- "circlearrowleft;": '\U000021BA',
-- "circlearrowright;": '\U000021BB',
-- "circledR;": '\U000000AE',
-- "circledS;": '\U000024C8',
-- "circledast;": '\U0000229B',
-- "circledcirc;": '\U0000229A',
-- "circleddash;": '\U0000229D',
-- "cire;": '\U00002257',
-- "cirfnint;": '\U00002A10',
-- "cirmid;": '\U00002AEF',
-- "cirscir;": '\U000029C2',
-- "clubs;": '\U00002663',
-- "clubsuit;": '\U00002663',
-- "colon;": '\U0000003A',
-- "colone;": '\U00002254',
-- "coloneq;": '\U00002254',
-- "comma;": '\U0000002C',
-- "commat;": '\U00000040',
-- "comp;": '\U00002201',
-- "compfn;": '\U00002218',
-- "complement;": '\U00002201',
-- "complexes;": '\U00002102',
-- "cong;": '\U00002245',
-- "congdot;": '\U00002A6D',
-- "conint;": '\U0000222E',
-- "copf;": '\U0001D554',
-- "coprod;": '\U00002210',
-- "copy;": '\U000000A9',
-- "copysr;": '\U00002117',
-- "crarr;": '\U000021B5',
-- "cross;": '\U00002717',
-- "cscr;": '\U0001D4B8',
-- "csub;": '\U00002ACF',
-- "csube;": '\U00002AD1',
-- "csup;": '\U00002AD0',
-- "csupe;": '\U00002AD2',
-- "ctdot;": '\U000022EF',
-- "cudarrl;": '\U00002938',
-- "cudarrr;": '\U00002935',
-- "cuepr;": '\U000022DE',
-- "cuesc;": '\U000022DF',
-- "cularr;": '\U000021B6',
-- "cularrp;": '\U0000293D',
-- "cup;": '\U0000222A',
-- "cupbrcap;": '\U00002A48',
-- "cupcap;": '\U00002A46',
-- "cupcup;": '\U00002A4A',
-- "cupdot;": '\U0000228D',
-- "cupor;": '\U00002A45',
-- "curarr;": '\U000021B7',
-- "curarrm;": '\U0000293C',
-- "curlyeqprec;": '\U000022DE',
-- "curlyeqsucc;": '\U000022DF',
-- "curlyvee;": '\U000022CE',
-- "curlywedge;": '\U000022CF',
-- "curren;": '\U000000A4',
-- "curvearrowleft;": '\U000021B6',
-- "curvearrowright;": '\U000021B7',
-- "cuvee;": '\U000022CE',
-- "cuwed;": '\U000022CF',
-- "cwconint;": '\U00002232',
-- "cwint;": '\U00002231',
-- "cylcty;": '\U0000232D',
-- "dArr;": '\U000021D3',
-- "dHar;": '\U00002965',
-- "dagger;": '\U00002020',
-- "daleth;": '\U00002138',
-- "darr;": '\U00002193',
-- "dash;": '\U00002010',
-- "dashv;": '\U000022A3',
-- "dbkarow;": '\U0000290F',
-- "dblac;": '\U000002DD',
-- "dcaron;": '\U0000010F',
-- "dcy;": '\U00000434',
-- "dd;": '\U00002146',
-- "ddagger;": '\U00002021',
-- "ddarr;": '\U000021CA',
-- "ddotseq;": '\U00002A77',
-- "deg;": '\U000000B0',
-- "delta;": '\U000003B4',
-- "demptyv;": '\U000029B1',
-- "dfisht;": '\U0000297F',
-- "dfr;": '\U0001D521',
-- "dharl;": '\U000021C3',
-- "dharr;": '\U000021C2',
-- "diam;": '\U000022C4',
-- "diamond;": '\U000022C4',
-- "diamondsuit;": '\U00002666',
-- "diams;": '\U00002666',
-- "die;": '\U000000A8',
-- "digamma;": '\U000003DD',
-- "disin;": '\U000022F2',
-- "div;": '\U000000F7',
-- "divide;": '\U000000F7',
-- "divideontimes;": '\U000022C7',
-- "divonx;": '\U000022C7',
-- "djcy;": '\U00000452',
-- "dlcorn;": '\U0000231E',
-- "dlcrop;": '\U0000230D',
-- "dollar;": '\U00000024',
-- "dopf;": '\U0001D555',
-- "dot;": '\U000002D9',
-- "doteq;": '\U00002250',
-- "doteqdot;": '\U00002251',
-- "dotminus;": '\U00002238',
-- "dotplus;": '\U00002214',
-- "dotsquare;": '\U000022A1',
-- "doublebarwedge;": '\U00002306',
-- "downarrow;": '\U00002193',
-- "downdownarrows;": '\U000021CA',
-- "downharpoonleft;": '\U000021C3',
-- "downharpoonright;": '\U000021C2',
-- "drbkarow;": '\U00002910',
-- "drcorn;": '\U0000231F',
-- "drcrop;": '\U0000230C',
-- "dscr;": '\U0001D4B9',
-- "dscy;": '\U00000455',
-- "dsol;": '\U000029F6',
-- "dstrok;": '\U00000111',
-- "dtdot;": '\U000022F1',
-- "dtri;": '\U000025BF',
-- "dtrif;": '\U000025BE',
-- "duarr;": '\U000021F5',
-- "duhar;": '\U0000296F',
-- "dwangle;": '\U000029A6',
-- "dzcy;": '\U0000045F',
-- "dzigrarr;": '\U000027FF',
-- "eDDot;": '\U00002A77',
-- "eDot;": '\U00002251',
-- "eacute;": '\U000000E9',
-- "easter;": '\U00002A6E',
-- "ecaron;": '\U0000011B',
-- "ecir;": '\U00002256',
-- "ecirc;": '\U000000EA',
-- "ecolon;": '\U00002255',
-- "ecy;": '\U0000044D',
-- "edot;": '\U00000117',
-- "ee;": '\U00002147',
-- "efDot;": '\U00002252',
-- "efr;": '\U0001D522',
-- "eg;": '\U00002A9A',
-- "egrave;": '\U000000E8',
-- "egs;": '\U00002A96',
-- "egsdot;": '\U00002A98',
-- "el;": '\U00002A99',
-- "elinters;": '\U000023E7',
-- "ell;": '\U00002113',
-- "els;": '\U00002A95',
-- "elsdot;": '\U00002A97',
-- "emacr;": '\U00000113',
-- "empty;": '\U00002205',
-- "emptyset;": '\U00002205',
-- "emptyv;": '\U00002205',
-- "emsp;": '\U00002003',
-- "emsp13;": '\U00002004',
-- "emsp14;": '\U00002005',
-- "eng;": '\U0000014B',
-- "ensp;": '\U00002002',
-- "eogon;": '\U00000119',
-- "eopf;": '\U0001D556',
-- "epar;": '\U000022D5',
-- "eparsl;": '\U000029E3',
-- "eplus;": '\U00002A71',
-- "epsi;": '\U000003B5',
-- "epsilon;": '\U000003B5',
-- "epsiv;": '\U000003F5',
-- "eqcirc;": '\U00002256',
-- "eqcolon;": '\U00002255',
-- "eqsim;": '\U00002242',
-- "eqslantgtr;": '\U00002A96',
-- "eqslantless;": '\U00002A95',
-- "equals;": '\U0000003D',
-- "equest;": '\U0000225F',
-- "equiv;": '\U00002261',
-- "equivDD;": '\U00002A78',
-- "eqvparsl;": '\U000029E5',
-- "erDot;": '\U00002253',
-- "erarr;": '\U00002971',
-- "escr;": '\U0000212F',
-- "esdot;": '\U00002250',
-- "esim;": '\U00002242',
-- "eta;": '\U000003B7',
-- "eth;": '\U000000F0',
-- "euml;": '\U000000EB',
-- "euro;": '\U000020AC',
-- "excl;": '\U00000021',
-- "exist;": '\U00002203',
-- "expectation;": '\U00002130',
-- "exponentiale;": '\U00002147',
-- "fallingdotseq;": '\U00002252',
-- "fcy;": '\U00000444',
-- "female;": '\U00002640',
-- "ffilig;": '\U0000FB03',
-- "fflig;": '\U0000FB00',
-- "ffllig;": '\U0000FB04',
-- "ffr;": '\U0001D523',
-- "filig;": '\U0000FB01',
-- "flat;": '\U0000266D',
-- "fllig;": '\U0000FB02',
-- "fltns;": '\U000025B1',
-- "fnof;": '\U00000192',
-- "fopf;": '\U0001D557',
-- "forall;": '\U00002200',
-- "fork;": '\U000022D4',
-- "forkv;": '\U00002AD9',
-- "fpartint;": '\U00002A0D',
-- "frac12;": '\U000000BD',
-- "frac13;": '\U00002153',
-- "frac14;": '\U000000BC',
-- "frac15;": '\U00002155',
-- "frac16;": '\U00002159',
-- "frac18;": '\U0000215B',
-- "frac23;": '\U00002154',
-- "frac25;": '\U00002156',
-- "frac34;": '\U000000BE',
-- "frac35;": '\U00002157',
-- "frac38;": '\U0000215C',
-- "frac45;": '\U00002158',
-- "frac56;": '\U0000215A',
-- "frac58;": '\U0000215D',
-- "frac78;": '\U0000215E',
-- "frasl;": '\U00002044',
-- "frown;": '\U00002322',
-- "fscr;": '\U0001D4BB',
-- "gE;": '\U00002267',
-- "gEl;": '\U00002A8C',
-- "gacute;": '\U000001F5',
-- "gamma;": '\U000003B3',
-- "gammad;": '\U000003DD',
-- "gap;": '\U00002A86',
-- "gbreve;": '\U0000011F',
-- "gcirc;": '\U0000011D',
-- "gcy;": '\U00000433',
-- "gdot;": '\U00000121',
-- "ge;": '\U00002265',
-- "gel;": '\U000022DB',
-- "geq;": '\U00002265',
-- "geqq;": '\U00002267',
-- "geqslant;": '\U00002A7E',
-- "ges;": '\U00002A7E',
-- "gescc;": '\U00002AA9',
-- "gesdot;": '\U00002A80',
-- "gesdoto;": '\U00002A82',
-- "gesdotol;": '\U00002A84',
-- "gesles;": '\U00002A94',
-- "gfr;": '\U0001D524',
-- "gg;": '\U0000226B',
-- "ggg;": '\U000022D9',
-- "gimel;": '\U00002137',
-- "gjcy;": '\U00000453',
-- "gl;": '\U00002277',
-- "glE;": '\U00002A92',
-- "gla;": '\U00002AA5',
-- "glj;": '\U00002AA4',
-- "gnE;": '\U00002269',
-- "gnap;": '\U00002A8A',
-- "gnapprox;": '\U00002A8A',
-- "gne;": '\U00002A88',
-- "gneq;": '\U00002A88',
-- "gneqq;": '\U00002269',
-- "gnsim;": '\U000022E7',
-- "gopf;": '\U0001D558',
-- "grave;": '\U00000060',
-- "gscr;": '\U0000210A',
-- "gsim;": '\U00002273',
-- "gsime;": '\U00002A8E',
-- "gsiml;": '\U00002A90',
-- "gt;": '\U0000003E',
-- "gtcc;": '\U00002AA7',
-- "gtcir;": '\U00002A7A',
-- "gtdot;": '\U000022D7',
-- "gtlPar;": '\U00002995',
-- "gtquest;": '\U00002A7C',
-- "gtrapprox;": '\U00002A86',
-- "gtrarr;": '\U00002978',
-- "gtrdot;": '\U000022D7',
-- "gtreqless;": '\U000022DB',
-- "gtreqqless;": '\U00002A8C',
-- "gtrless;": '\U00002277',
-- "gtrsim;": '\U00002273',
-- "hArr;": '\U000021D4',
-- "hairsp;": '\U0000200A',
-- "half;": '\U000000BD',
-- "hamilt;": '\U0000210B',
-- "hardcy;": '\U0000044A',
-- "harr;": '\U00002194',
-- "harrcir;": '\U00002948',
-- "harrw;": '\U000021AD',
-- "hbar;": '\U0000210F',
-- "hcirc;": '\U00000125',
-- "hearts;": '\U00002665',
-- "heartsuit;": '\U00002665',
-- "hellip;": '\U00002026',
-- "hercon;": '\U000022B9',
-- "hfr;": '\U0001D525',
-- "hksearow;": '\U00002925',
-- "hkswarow;": '\U00002926',
-- "hoarr;": '\U000021FF',
-- "homtht;": '\U0000223B',
-- "hookleftarrow;": '\U000021A9',
-- "hookrightarrow;": '\U000021AA',
-- "hopf;": '\U0001D559',
-- "horbar;": '\U00002015',
-- "hscr;": '\U0001D4BD',
-- "hslash;": '\U0000210F',
-- "hstrok;": '\U00000127',
-- "hybull;": '\U00002043',
-- "hyphen;": '\U00002010',
-- "iacute;": '\U000000ED',
-- "ic;": '\U00002063',
-- "icirc;": '\U000000EE',
-- "icy;": '\U00000438',
-- "iecy;": '\U00000435',
-- "iexcl;": '\U000000A1',
-- "iff;": '\U000021D4',
-- "ifr;": '\U0001D526',
-- "igrave;": '\U000000EC',
-- "ii;": '\U00002148',
-- "iiiint;": '\U00002A0C',
-- "iiint;": '\U0000222D',
-- "iinfin;": '\U000029DC',
-- "iiota;": '\U00002129',
-- "ijlig;": '\U00000133',
-- "imacr;": '\U0000012B',
-- "image;": '\U00002111',
-- "imagline;": '\U00002110',
-- "imagpart;": '\U00002111',
-- "imath;": '\U00000131',
-- "imof;": '\U000022B7',
-- "imped;": '\U000001B5',
-- "in;": '\U00002208',
-- "incare;": '\U00002105',
-- "infin;": '\U0000221E',
-- "infintie;": '\U000029DD',
-- "inodot;": '\U00000131',
-- "int;": '\U0000222B',
-- "intcal;": '\U000022BA',
-- "integers;": '\U00002124',
-- "intercal;": '\U000022BA',
-- "intlarhk;": '\U00002A17',
-- "intprod;": '\U00002A3C',
-- "iocy;": '\U00000451',
-- "iogon;": '\U0000012F',
-- "iopf;": '\U0001D55A',
-- "iota;": '\U000003B9',
-- "iprod;": '\U00002A3C',
-- "iquest;": '\U000000BF',
-- "iscr;": '\U0001D4BE',
-- "isin;": '\U00002208',
-- "isinE;": '\U000022F9',
-- "isindot;": '\U000022F5',
-- "isins;": '\U000022F4',
-- "isinsv;": '\U000022F3',
-- "isinv;": '\U00002208',
-- "it;": '\U00002062',
-- "itilde;": '\U00000129',
-- "iukcy;": '\U00000456',
-- "iuml;": '\U000000EF',
-- "jcirc;": '\U00000135',
-- "jcy;": '\U00000439',
-- "jfr;": '\U0001D527',
-- "jmath;": '\U00000237',
-- "jopf;": '\U0001D55B',
-- "jscr;": '\U0001D4BF',
-- "jsercy;": '\U00000458',
-- "jukcy;": '\U00000454',
-- "kappa;": '\U000003BA',
-- "kappav;": '\U000003F0',
-- "kcedil;": '\U00000137',
-- "kcy;": '\U0000043A',
-- "kfr;": '\U0001D528',
-- "kgreen;": '\U00000138',
-- "khcy;": '\U00000445',
-- "kjcy;": '\U0000045C',
-- "kopf;": '\U0001D55C',
-- "kscr;": '\U0001D4C0',
-- "lAarr;": '\U000021DA',
-- "lArr;": '\U000021D0',
-- "lAtail;": '\U0000291B',
-- "lBarr;": '\U0000290E',
-- "lE;": '\U00002266',
-- "lEg;": '\U00002A8B',
-- "lHar;": '\U00002962',
-- "lacute;": '\U0000013A',
-- "laemptyv;": '\U000029B4',
-- "lagran;": '\U00002112',
-- "lambda;": '\U000003BB',
-- "lang;": '\U000027E8',
-- "langd;": '\U00002991',
-- "langle;": '\U000027E8',
-- "lap;": '\U00002A85',
-- "laquo;": '\U000000AB',
-- "larr;": '\U00002190',
-- "larrb;": '\U000021E4',
-- "larrbfs;": '\U0000291F',
-- "larrfs;": '\U0000291D',
-- "larrhk;": '\U000021A9',
-- "larrlp;": '\U000021AB',
-- "larrpl;": '\U00002939',
-- "larrsim;": '\U00002973',
-- "larrtl;": '\U000021A2',
-- "lat;": '\U00002AAB',
-- "latail;": '\U00002919',
-- "late;": '\U00002AAD',
-- "lbarr;": '\U0000290C',
-- "lbbrk;": '\U00002772',
-- "lbrace;": '\U0000007B',
-- "lbrack;": '\U0000005B',
-- "lbrke;": '\U0000298B',
-- "lbrksld;": '\U0000298F',
-- "lbrkslu;": '\U0000298D',
-- "lcaron;": '\U0000013E',
-- "lcedil;": '\U0000013C',
-- "lceil;": '\U00002308',
-- "lcub;": '\U0000007B',
-- "lcy;": '\U0000043B',
-- "ldca;": '\U00002936',
-- "ldquo;": '\U0000201C',
-- "ldquor;": '\U0000201E',
-- "ldrdhar;": '\U00002967',
-- "ldrushar;": '\U0000294B',
-- "ldsh;": '\U000021B2',
-- "le;": '\U00002264',
-- "leftarrow;": '\U00002190',
-- "leftarrowtail;": '\U000021A2',
-- "leftharpoondown;": '\U000021BD',
-- "leftharpoonup;": '\U000021BC',
-- "leftleftarrows;": '\U000021C7',
-- "leftrightarrow;": '\U00002194',
-- "leftrightarrows;": '\U000021C6',
-- "leftrightharpoons;": '\U000021CB',
-- "leftrightsquigarrow;": '\U000021AD',
-- "leftthreetimes;": '\U000022CB',
-- "leg;": '\U000022DA',
-- "leq;": '\U00002264',
-- "leqq;": '\U00002266',
-- "leqslant;": '\U00002A7D',
-- "les;": '\U00002A7D',
-- "lescc;": '\U00002AA8',
-- "lesdot;": '\U00002A7F',
-- "lesdoto;": '\U00002A81',
-- "lesdotor;": '\U00002A83',
-- "lesges;": '\U00002A93',
-- "lessapprox;": '\U00002A85',
-- "lessdot;": '\U000022D6',
-- "lesseqgtr;": '\U000022DA',
-- "lesseqqgtr;": '\U00002A8B',
-- "lessgtr;": '\U00002276',
-- "lesssim;": '\U00002272',
-- "lfisht;": '\U0000297C',
-- "lfloor;": '\U0000230A',
-- "lfr;": '\U0001D529',
-- "lg;": '\U00002276',
-- "lgE;": '\U00002A91',
-- "lhard;": '\U000021BD',
-- "lharu;": '\U000021BC',
-- "lharul;": '\U0000296A',
-- "lhblk;": '\U00002584',
-- "ljcy;": '\U00000459',
-- "ll;": '\U0000226A',
-- "llarr;": '\U000021C7',
-- "llcorner;": '\U0000231E',
-- "llhard;": '\U0000296B',
-- "lltri;": '\U000025FA',
-- "lmidot;": '\U00000140',
-- "lmoust;": '\U000023B0',
-- "lmoustache;": '\U000023B0',
-- "lnE;": '\U00002268',
-- "lnap;": '\U00002A89',
-- "lnapprox;": '\U00002A89',
-- "lne;": '\U00002A87',
-- "lneq;": '\U00002A87',
-- "lneqq;": '\U00002268',
-- "lnsim;": '\U000022E6',
-- "loang;": '\U000027EC',
-- "loarr;": '\U000021FD',
-- "lobrk;": '\U000027E6',
-- "longleftarrow;": '\U000027F5',
-- "longleftrightarrow;": '\U000027F7',
-- "longmapsto;": '\U000027FC',
-- "longrightarrow;": '\U000027F6',
-- "looparrowleft;": '\U000021AB',
-- "looparrowright;": '\U000021AC',
-- "lopar;": '\U00002985',
-- "lopf;": '\U0001D55D',
-- "loplus;": '\U00002A2D',
-- "lotimes;": '\U00002A34',
-- "lowast;": '\U00002217',
-- "lowbar;": '\U0000005F',
-- "loz;": '\U000025CA',
-- "lozenge;": '\U000025CA',
-- "lozf;": '\U000029EB',
-- "lpar;": '\U00000028',
-- "lparlt;": '\U00002993',
-- "lrarr;": '\U000021C6',
-- "lrcorner;": '\U0000231F',
-- "lrhar;": '\U000021CB',
-- "lrhard;": '\U0000296D',
-- "lrm;": '\U0000200E',
-- "lrtri;": '\U000022BF',
-- "lsaquo;": '\U00002039',
-- "lscr;": '\U0001D4C1',
-- "lsh;": '\U000021B0',
-- "lsim;": '\U00002272',
-- "lsime;": '\U00002A8D',
-- "lsimg;": '\U00002A8F',
-- "lsqb;": '\U0000005B',
-- "lsquo;": '\U00002018',
-- "lsquor;": '\U0000201A',
-- "lstrok;": '\U00000142',
-- "lt;": '\U0000003C',
-- "ltcc;": '\U00002AA6',
-- "ltcir;": '\U00002A79',
-- "ltdot;": '\U000022D6',
-- "lthree;": '\U000022CB',
-- "ltimes;": '\U000022C9',
-- "ltlarr;": '\U00002976',
-- "ltquest;": '\U00002A7B',
-- "ltrPar;": '\U00002996',
-- "ltri;": '\U000025C3',
-- "ltrie;": '\U000022B4',
-- "ltrif;": '\U000025C2',
-- "lurdshar;": '\U0000294A',
-- "luruhar;": '\U00002966',
-- "mDDot;": '\U0000223A',
-- "macr;": '\U000000AF',
-- "male;": '\U00002642',
-- "malt;": '\U00002720',
-- "maltese;": '\U00002720',
-- "map;": '\U000021A6',
-- "mapsto;": '\U000021A6',
-- "mapstodown;": '\U000021A7',
-- "mapstoleft;": '\U000021A4',
-- "mapstoup;": '\U000021A5',
-- "marker;": '\U000025AE',
-- "mcomma;": '\U00002A29',
-- "mcy;": '\U0000043C',
-- "mdash;": '\U00002014',
-- "measuredangle;": '\U00002221',
-- "mfr;": '\U0001D52A',
-- "mho;": '\U00002127',
-- "micro;": '\U000000B5',
-- "mid;": '\U00002223',
-- "midast;": '\U0000002A',
-- "midcir;": '\U00002AF0',
-- "middot;": '\U000000B7',
-- "minus;": '\U00002212',
-- "minusb;": '\U0000229F',
-- "minusd;": '\U00002238',
-- "minusdu;": '\U00002A2A',
-- "mlcp;": '\U00002ADB',
-- "mldr;": '\U00002026',
-- "mnplus;": '\U00002213',
-- "models;": '\U000022A7',
-- "mopf;": '\U0001D55E',
-- "mp;": '\U00002213',
-- "mscr;": '\U0001D4C2',
-- "mstpos;": '\U0000223E',
-- "mu;": '\U000003BC',
-- "multimap;": '\U000022B8',
-- "mumap;": '\U000022B8',
-- "nLeftarrow;": '\U000021CD',
-- "nLeftrightarrow;": '\U000021CE',
-- "nRightarrow;": '\U000021CF',
-- "nVDash;": '\U000022AF',
-- "nVdash;": '\U000022AE',
-- "nabla;": '\U00002207',
-- "nacute;": '\U00000144',
-- "nap;": '\U00002249',
-- "napos;": '\U00000149',
-- "napprox;": '\U00002249',
-- "natur;": '\U0000266E',
-- "natural;": '\U0000266E',
-- "naturals;": '\U00002115',
-- "nbsp;": '\U000000A0',
-- "ncap;": '\U00002A43',
-- "ncaron;": '\U00000148',
-- "ncedil;": '\U00000146',
-- "ncong;": '\U00002247',
-- "ncup;": '\U00002A42',
-- "ncy;": '\U0000043D',
-- "ndash;": '\U00002013',
-- "ne;": '\U00002260',
-- "neArr;": '\U000021D7',
-- "nearhk;": '\U00002924',
-- "nearr;": '\U00002197',
-- "nearrow;": '\U00002197',
-- "nequiv;": '\U00002262',
-- "nesear;": '\U00002928',
-- "nexist;": '\U00002204',
-- "nexists;": '\U00002204',
-- "nfr;": '\U0001D52B',
-- "nge;": '\U00002271',
-- "ngeq;": '\U00002271',
-- "ngsim;": '\U00002275',
-- "ngt;": '\U0000226F',
-- "ngtr;": '\U0000226F',
-- "nhArr;": '\U000021CE',
-- "nharr;": '\U000021AE',
-- "nhpar;": '\U00002AF2',
-- "ni;": '\U0000220B',
-- "nis;": '\U000022FC',
-- "nisd;": '\U000022FA',
-- "niv;": '\U0000220B',
-- "njcy;": '\U0000045A',
-- "nlArr;": '\U000021CD',
-- "nlarr;": '\U0000219A',
-- "nldr;": '\U00002025',
-- "nle;": '\U00002270',
-- "nleftarrow;": '\U0000219A',
-- "nleftrightarrow;": '\U000021AE',
-- "nleq;": '\U00002270',
-- "nless;": '\U0000226E',
-- "nlsim;": '\U00002274',
-- "nlt;": '\U0000226E',
-- "nltri;": '\U000022EA',
-- "nltrie;": '\U000022EC',
-- "nmid;": '\U00002224',
-- "nopf;": '\U0001D55F',
-- "not;": '\U000000AC',
-- "notin;": '\U00002209',
-- "notinva;": '\U00002209',
-- "notinvb;": '\U000022F7',
-- "notinvc;": '\U000022F6',
-- "notni;": '\U0000220C',
-- "notniva;": '\U0000220C',
-- "notnivb;": '\U000022FE',
-- "notnivc;": '\U000022FD',
-- "npar;": '\U00002226',
-- "nparallel;": '\U00002226',
-- "npolint;": '\U00002A14',
-- "npr;": '\U00002280',
-- "nprcue;": '\U000022E0',
-- "nprec;": '\U00002280',
-- "nrArr;": '\U000021CF',
-- "nrarr;": '\U0000219B',
-- "nrightarrow;": '\U0000219B',
-- "nrtri;": '\U000022EB',
-- "nrtrie;": '\U000022ED',
-- "nsc;": '\U00002281',
-- "nsccue;": '\U000022E1',
-- "nscr;": '\U0001D4C3',
-- "nshortmid;": '\U00002224',
-- "nshortparallel;": '\U00002226',
-- "nsim;": '\U00002241',
-- "nsime;": '\U00002244',
-- "nsimeq;": '\U00002244',
-- "nsmid;": '\U00002224',
-- "nspar;": '\U00002226',
-- "nsqsube;": '\U000022E2',
-- "nsqsupe;": '\U000022E3',
-- "nsub;": '\U00002284',
-- "nsube;": '\U00002288',
-- "nsubseteq;": '\U00002288',
-- "nsucc;": '\U00002281',
-- "nsup;": '\U00002285',
-- "nsupe;": '\U00002289',
-- "nsupseteq;": '\U00002289',
-- "ntgl;": '\U00002279',
-- "ntilde;": '\U000000F1',
-- "ntlg;": '\U00002278',
-- "ntriangleleft;": '\U000022EA',
-- "ntrianglelefteq;": '\U000022EC',
-- "ntriangleright;": '\U000022EB',
-- "ntrianglerighteq;": '\U000022ED',
-- "nu;": '\U000003BD',
-- "num;": '\U00000023',
-- "numero;": '\U00002116',
-- "numsp;": '\U00002007',
-- "nvDash;": '\U000022AD',
-- "nvHarr;": '\U00002904',
-- "nvdash;": '\U000022AC',
-- "nvinfin;": '\U000029DE',
-- "nvlArr;": '\U00002902',
-- "nvrArr;": '\U00002903',
-- "nwArr;": '\U000021D6',
-- "nwarhk;": '\U00002923',
-- "nwarr;": '\U00002196',
-- "nwarrow;": '\U00002196',
-- "nwnear;": '\U00002927',
-- "oS;": '\U000024C8',
-- "oacute;": '\U000000F3',
-- "oast;": '\U0000229B',
-- "ocir;": '\U0000229A',
-- "ocirc;": '\U000000F4',
-- "ocy;": '\U0000043E',
-- "odash;": '\U0000229D',
-- "odblac;": '\U00000151',
-- "odiv;": '\U00002A38',
-- "odot;": '\U00002299',
-- "odsold;": '\U000029BC',
-- "oelig;": '\U00000153',
-- "ofcir;": '\U000029BF',
-- "ofr;": '\U0001D52C',
-- "ogon;": '\U000002DB',
-- "ograve;": '\U000000F2',
-- "ogt;": '\U000029C1',
-- "ohbar;": '\U000029B5',
-- "ohm;": '\U000003A9',
-- "oint;": '\U0000222E',
-- "olarr;": '\U000021BA',
-- "olcir;": '\U000029BE',
-- "olcross;": '\U000029BB',
-- "oline;": '\U0000203E',
-- "olt;": '\U000029C0',
-- "omacr;": '\U0000014D',
-- "omega;": '\U000003C9',
-- "omicron;": '\U000003BF',
-- "omid;": '\U000029B6',
-- "ominus;": '\U00002296',
-- "oopf;": '\U0001D560',
-- "opar;": '\U000029B7',
-- "operp;": '\U000029B9',
-- "oplus;": '\U00002295',
-- "or;": '\U00002228',
-- "orarr;": '\U000021BB',
-- "ord;": '\U00002A5D',
-- "order;": '\U00002134',
-- "orderof;": '\U00002134',
-- "ordf;": '\U000000AA',
-- "ordm;": '\U000000BA',
-- "origof;": '\U000022B6',
-- "oror;": '\U00002A56',
-- "orslope;": '\U00002A57',
-- "orv;": '\U00002A5B',
-- "oscr;": '\U00002134',
-- "oslash;": '\U000000F8',
-- "osol;": '\U00002298',
-- "otilde;": '\U000000F5',
-- "otimes;": '\U00002297',
-- "otimesas;": '\U00002A36',
-- "ouml;": '\U000000F6',
-- "ovbar;": '\U0000233D',
-- "par;": '\U00002225',
-- "para;": '\U000000B6',
-- "parallel;": '\U00002225',
-- "parsim;": '\U00002AF3',
-- "parsl;": '\U00002AFD',
-- "part;": '\U00002202',
-- "pcy;": '\U0000043F',
-- "percnt;": '\U00000025',
-- "period;": '\U0000002E',
-- "permil;": '\U00002030',
-- "perp;": '\U000022A5',
-- "pertenk;": '\U00002031',
-- "pfr;": '\U0001D52D',
-- "phi;": '\U000003C6',
-- "phiv;": '\U000003D5',
-- "phmmat;": '\U00002133',
-- "phone;": '\U0000260E',
-- "pi;": '\U000003C0',
-- "pitchfork;": '\U000022D4',
-- "piv;": '\U000003D6',
-- "planck;": '\U0000210F',
-- "planckh;": '\U0000210E',
-- "plankv;": '\U0000210F',
-- "plus;": '\U0000002B',
-- "plusacir;": '\U00002A23',
-- "plusb;": '\U0000229E',
-- "pluscir;": '\U00002A22',
-- "plusdo;": '\U00002214',
-- "plusdu;": '\U00002A25',
-- "pluse;": '\U00002A72',
-- "plusmn;": '\U000000B1',
-- "plussim;": '\U00002A26',
-- "plustwo;": '\U00002A27',
-- "pm;": '\U000000B1',
-- "pointint;": '\U00002A15',
-- "popf;": '\U0001D561',
-- "pound;": '\U000000A3',
-- "pr;": '\U0000227A',
-- "prE;": '\U00002AB3',
-- "prap;": '\U00002AB7',
-- "prcue;": '\U0000227C',
-- "pre;": '\U00002AAF',
-- "prec;": '\U0000227A',
-- "precapprox;": '\U00002AB7',
-- "preccurlyeq;": '\U0000227C',
-- "preceq;": '\U00002AAF',
-- "precnapprox;": '\U00002AB9',
-- "precneqq;": '\U00002AB5',
-- "precnsim;": '\U000022E8',
-- "precsim;": '\U0000227E',
-- "prime;": '\U00002032',
-- "primes;": '\U00002119',
-- "prnE;": '\U00002AB5',
-- "prnap;": '\U00002AB9',
-- "prnsim;": '\U000022E8',
-- "prod;": '\U0000220F',
-- "profalar;": '\U0000232E',
-- "profline;": '\U00002312',
-- "profsurf;": '\U00002313',
-- "prop;": '\U0000221D',
-- "propto;": '\U0000221D',
-- "prsim;": '\U0000227E',
-- "prurel;": '\U000022B0',
-- "pscr;": '\U0001D4C5',
-- "psi;": '\U000003C8',
-- "puncsp;": '\U00002008',
-- "qfr;": '\U0001D52E',
-- "qint;": '\U00002A0C',
-- "qopf;": '\U0001D562',
-- "qprime;": '\U00002057',
-- "qscr;": '\U0001D4C6',
-- "quaternions;": '\U0000210D',
-- "quatint;": '\U00002A16',
-- "quest;": '\U0000003F',
-- "questeq;": '\U0000225F',
-- "quot;": '\U00000022',
-- "rAarr;": '\U000021DB',
-- "rArr;": '\U000021D2',
-- "rAtail;": '\U0000291C',
-- "rBarr;": '\U0000290F',
-- "rHar;": '\U00002964',
-- "racute;": '\U00000155',
-- "radic;": '\U0000221A',
-- "raemptyv;": '\U000029B3',
-- "rang;": '\U000027E9',
-- "rangd;": '\U00002992',
-- "range;": '\U000029A5',
-- "rangle;": '\U000027E9',
-- "raquo;": '\U000000BB',
-- "rarr;": '\U00002192',
-- "rarrap;": '\U00002975',
-- "rarrb;": '\U000021E5',
-- "rarrbfs;": '\U00002920',
-- "rarrc;": '\U00002933',
-- "rarrfs;": '\U0000291E',
-- "rarrhk;": '\U000021AA',
-- "rarrlp;": '\U000021AC',
-- "rarrpl;": '\U00002945',
-- "rarrsim;": '\U00002974',
-- "rarrtl;": '\U000021A3',
-- "rarrw;": '\U0000219D',
-- "ratail;": '\U0000291A',
-- "ratio;": '\U00002236',
-- "rationals;": '\U0000211A',
-- "rbarr;": '\U0000290D',
-- "rbbrk;": '\U00002773',
-- "rbrace;": '\U0000007D',
-- "rbrack;": '\U0000005D',
-- "rbrke;": '\U0000298C',
-- "rbrksld;": '\U0000298E',
-- "rbrkslu;": '\U00002990',
-- "rcaron;": '\U00000159',
-- "rcedil;": '\U00000157',
-- "rceil;": '\U00002309',
-- "rcub;": '\U0000007D',
-- "rcy;": '\U00000440',
-- "rdca;": '\U00002937',
-- "rdldhar;": '\U00002969',
-- "rdquo;": '\U0000201D',
-- "rdquor;": '\U0000201D',
-- "rdsh;": '\U000021B3',
-- "real;": '\U0000211C',
-- "realine;": '\U0000211B',
-- "realpart;": '\U0000211C',
-- "reals;": '\U0000211D',
-- "rect;": '\U000025AD',
-- "reg;": '\U000000AE',
-- "rfisht;": '\U0000297D',
-- "rfloor;": '\U0000230B',
-- "rfr;": '\U0001D52F',
-- "rhard;": '\U000021C1',
-- "rharu;": '\U000021C0',
-- "rharul;": '\U0000296C',
-- "rho;": '\U000003C1',
-- "rhov;": '\U000003F1',
-- "rightarrow;": '\U00002192',
-- "rightarrowtail;": '\U000021A3',
-- "rightharpoondown;": '\U000021C1',
-- "rightharpoonup;": '\U000021C0',
-- "rightleftarrows;": '\U000021C4',
-- "rightleftharpoons;": '\U000021CC',
-- "rightrightarrows;": '\U000021C9',
-- "rightsquigarrow;": '\U0000219D',
-- "rightthreetimes;": '\U000022CC',
-- "ring;": '\U000002DA',
-- "risingdotseq;": '\U00002253',
-- "rlarr;": '\U000021C4',
-- "rlhar;": '\U000021CC',
-- "rlm;": '\U0000200F',
-- "rmoust;": '\U000023B1',
-- "rmoustache;": '\U000023B1',
-- "rnmid;": '\U00002AEE',
-- "roang;": '\U000027ED',
-- "roarr;": '\U000021FE',
-- "robrk;": '\U000027E7',
-- "ropar;": '\U00002986',
-- "ropf;": '\U0001D563',
-- "roplus;": '\U00002A2E',
-- "rotimes;": '\U00002A35',
-- "rpar;": '\U00000029',
-- "rpargt;": '\U00002994',
-- "rppolint;": '\U00002A12',
-- "rrarr;": '\U000021C9',
-- "rsaquo;": '\U0000203A',
-- "rscr;": '\U0001D4C7',
-- "rsh;": '\U000021B1',
-- "rsqb;": '\U0000005D',
-- "rsquo;": '\U00002019',
-- "rsquor;": '\U00002019',
-- "rthree;": '\U000022CC',
-- "rtimes;": '\U000022CA',
-- "rtri;": '\U000025B9',
-- "rtrie;": '\U000022B5',
-- "rtrif;": '\U000025B8',
-- "rtriltri;": '\U000029CE',
-- "ruluhar;": '\U00002968',
-- "rx;": '\U0000211E',
-- "sacute;": '\U0000015B',
-- "sbquo;": '\U0000201A',
-- "sc;": '\U0000227B',
-- "scE;": '\U00002AB4',
-- "scap;": '\U00002AB8',
-- "scaron;": '\U00000161',
-- "sccue;": '\U0000227D',
-- "sce;": '\U00002AB0',
-- "scedil;": '\U0000015F',
-- "scirc;": '\U0000015D',
-- "scnE;": '\U00002AB6',
-- "scnap;": '\U00002ABA',
-- "scnsim;": '\U000022E9',
-- "scpolint;": '\U00002A13',
-- "scsim;": '\U0000227F',
-- "scy;": '\U00000441',
-- "sdot;": '\U000022C5',
-- "sdotb;": '\U000022A1',
-- "sdote;": '\U00002A66',
-- "seArr;": '\U000021D8',
-- "searhk;": '\U00002925',
-- "searr;": '\U00002198',
-- "searrow;": '\U00002198',
-- "sect;": '\U000000A7',
-- "semi;": '\U0000003B',
-- "seswar;": '\U00002929',
-- "setminus;": '\U00002216',
-- "setmn;": '\U00002216',
-- "sext;": '\U00002736',
-- "sfr;": '\U0001D530',
-- "sfrown;": '\U00002322',
-- "sharp;": '\U0000266F',
-- "shchcy;": '\U00000449',
-- "shcy;": '\U00000448',
-- "shortmid;": '\U00002223',
-- "shortparallel;": '\U00002225',
-- "shy;": '\U000000AD',
-- "sigma;": '\U000003C3',
-- "sigmaf;": '\U000003C2',
-- "sigmav;": '\U000003C2',
-- "sim;": '\U0000223C',
-- "simdot;": '\U00002A6A',
-- "sime;": '\U00002243',
-- "simeq;": '\U00002243',
-- "simg;": '\U00002A9E',
-- "simgE;": '\U00002AA0',
-- "siml;": '\U00002A9D',
-- "simlE;": '\U00002A9F',
-- "simne;": '\U00002246',
-- "simplus;": '\U00002A24',
-- "simrarr;": '\U00002972',
-- "slarr;": '\U00002190',
-- "smallsetminus;": '\U00002216',
-- "smashp;": '\U00002A33',
-- "smeparsl;": '\U000029E4',
-- "smid;": '\U00002223',
-- "smile;": '\U00002323',
-- "smt;": '\U00002AAA',
-- "smte;": '\U00002AAC',
-- "softcy;": '\U0000044C',
-- "sol;": '\U0000002F',
-- "solb;": '\U000029C4',
-- "solbar;": '\U0000233F',
-- "sopf;": '\U0001D564',
-- "spades;": '\U00002660',
-- "spadesuit;": '\U00002660',
-- "spar;": '\U00002225',
-- "sqcap;": '\U00002293',
-- "sqcup;": '\U00002294',
-- "sqsub;": '\U0000228F',
-- "sqsube;": '\U00002291',
-- "sqsubset;": '\U0000228F',
-- "sqsubseteq;": '\U00002291',
-- "sqsup;": '\U00002290',
-- "sqsupe;": '\U00002292',
-- "sqsupset;": '\U00002290',
-- "sqsupseteq;": '\U00002292',
-- "squ;": '\U000025A1',
-- "square;": '\U000025A1',
-- "squarf;": '\U000025AA',
-- "squf;": '\U000025AA',
-- "srarr;": '\U00002192',
-- "sscr;": '\U0001D4C8',
-- "ssetmn;": '\U00002216',
-- "ssmile;": '\U00002323',
-- "sstarf;": '\U000022C6',
-- "star;": '\U00002606',
-- "starf;": '\U00002605',
-- "straightepsilon;": '\U000003F5',
-- "straightphi;": '\U000003D5',
-- "strns;": '\U000000AF',
-- "sub;": '\U00002282',
-- "subE;": '\U00002AC5',
-- "subdot;": '\U00002ABD',
-- "sube;": '\U00002286',
-- "subedot;": '\U00002AC3',
-- "submult;": '\U00002AC1',
-- "subnE;": '\U00002ACB',
-- "subne;": '\U0000228A',
-- "subplus;": '\U00002ABF',
-- "subrarr;": '\U00002979',
-- "subset;": '\U00002282',
-- "subseteq;": '\U00002286',
-- "subseteqq;": '\U00002AC5',
-- "subsetneq;": '\U0000228A',
-- "subsetneqq;": '\U00002ACB',
-- "subsim;": '\U00002AC7',
-- "subsub;": '\U00002AD5',
-- "subsup;": '\U00002AD3',
-- "succ;": '\U0000227B',
-- "succapprox;": '\U00002AB8',
-- "succcurlyeq;": '\U0000227D',
-- "succeq;": '\U00002AB0',
-- "succnapprox;": '\U00002ABA',
-- "succneqq;": '\U00002AB6',
-- "succnsim;": '\U000022E9',
-- "succsim;": '\U0000227F',
-- "sum;": '\U00002211',
-- "sung;": '\U0000266A',
-- "sup;": '\U00002283',
-- "sup1;": '\U000000B9',
-- "sup2;": '\U000000B2',
-- "sup3;": '\U000000B3',
-- "supE;": '\U00002AC6',
-- "supdot;": '\U00002ABE',
-- "supdsub;": '\U00002AD8',
-- "supe;": '\U00002287',
-- "supedot;": '\U00002AC4',
-- "suphsol;": '\U000027C9',
-- "suphsub;": '\U00002AD7',
-- "suplarr;": '\U0000297B',
-- "supmult;": '\U00002AC2',
-- "supnE;": '\U00002ACC',
-- "supne;": '\U0000228B',
-- "supplus;": '\U00002AC0',
-- "supset;": '\U00002283',
-- "supseteq;": '\U00002287',
-- "supseteqq;": '\U00002AC6',
-- "supsetneq;": '\U0000228B',
-- "supsetneqq;": '\U00002ACC',
-- "supsim;": '\U00002AC8',
-- "supsub;": '\U00002AD4',
-- "supsup;": '\U00002AD6',
-- "swArr;": '\U000021D9',
-- "swarhk;": '\U00002926',
-- "swarr;": '\U00002199',
-- "swarrow;": '\U00002199',
-- "swnwar;": '\U0000292A',
-- "szlig;": '\U000000DF',
-- "target;": '\U00002316',
-- "tau;": '\U000003C4',
-- "tbrk;": '\U000023B4',
-- "tcaron;": '\U00000165',
-- "tcedil;": '\U00000163',
-- "tcy;": '\U00000442',
-- "tdot;": '\U000020DB',
-- "telrec;": '\U00002315',
-- "tfr;": '\U0001D531',
-- "there4;": '\U00002234',
-- "therefore;": '\U00002234',
-- "theta;": '\U000003B8',
-- "thetasym;": '\U000003D1',
-- "thetav;": '\U000003D1',
-- "thickapprox;": '\U00002248',
-- "thicksim;": '\U0000223C',
-- "thinsp;": '\U00002009',
-- "thkap;": '\U00002248',
-- "thksim;": '\U0000223C',
-- "thorn;": '\U000000FE',
-- "tilde;": '\U000002DC',
-- "times;": '\U000000D7',
-- "timesb;": '\U000022A0',
-- "timesbar;": '\U00002A31',
-- "timesd;": '\U00002A30',
-- "tint;": '\U0000222D',
-- "toea;": '\U00002928',
-- "top;": '\U000022A4',
-- "topbot;": '\U00002336',
-- "topcir;": '\U00002AF1',
-- "topf;": '\U0001D565',
-- "topfork;": '\U00002ADA',
-- "tosa;": '\U00002929',
-- "tprime;": '\U00002034',
-- "trade;": '\U00002122',
-- "triangle;": '\U000025B5',
-- "triangledown;": '\U000025BF',
-- "triangleleft;": '\U000025C3',
-- "trianglelefteq;": '\U000022B4',
-- "triangleq;": '\U0000225C',
-- "triangleright;": '\U000025B9',
-- "trianglerighteq;": '\U000022B5',
-- "tridot;": '\U000025EC',
-- "trie;": '\U0000225C',
-- "triminus;": '\U00002A3A',
-- "triplus;": '\U00002A39',
-- "trisb;": '\U000029CD',
-- "tritime;": '\U00002A3B',
-- "trpezium;": '\U000023E2',
-- "tscr;": '\U0001D4C9',
-- "tscy;": '\U00000446',
-- "tshcy;": '\U0000045B',
-- "tstrok;": '\U00000167',
-- "twixt;": '\U0000226C',
-- "twoheadleftarrow;": '\U0000219E',
-- "twoheadrightarrow;": '\U000021A0',
-- "uArr;": '\U000021D1',
-- "uHar;": '\U00002963',
-- "uacute;": '\U000000FA',
-- "uarr;": '\U00002191',
-- "ubrcy;": '\U0000045E',
-- "ubreve;": '\U0000016D',
-- "ucirc;": '\U000000FB',
-- "ucy;": '\U00000443',
-- "udarr;": '\U000021C5',
-- "udblac;": '\U00000171',
-- "udhar;": '\U0000296E',
-- "ufisht;": '\U0000297E',
-- "ufr;": '\U0001D532',
-- "ugrave;": '\U000000F9',
-- "uharl;": '\U000021BF',
-- "uharr;": '\U000021BE',
-- "uhblk;": '\U00002580',
-- "ulcorn;": '\U0000231C',
-- "ulcorner;": '\U0000231C',
-- "ulcrop;": '\U0000230F',
-- "ultri;": '\U000025F8',
-- "umacr;": '\U0000016B',
-- "uml;": '\U000000A8',
-- "uogon;": '\U00000173',
-- "uopf;": '\U0001D566',
-- "uparrow;": '\U00002191',
-- "updownarrow;": '\U00002195',
-- "upharpoonleft;": '\U000021BF',
-- "upharpoonright;": '\U000021BE',
-- "uplus;": '\U0000228E',
-- "upsi;": '\U000003C5',
-- "upsih;": '\U000003D2',
-- "upsilon;": '\U000003C5',
-- "upuparrows;": '\U000021C8',
-- "urcorn;": '\U0000231D',
-- "urcorner;": '\U0000231D',
-- "urcrop;": '\U0000230E',
-- "uring;": '\U0000016F',
-- "urtri;": '\U000025F9',
-- "uscr;": '\U0001D4CA',
-- "utdot;": '\U000022F0',
-- "utilde;": '\U00000169',
-- "utri;": '\U000025B5',
-- "utrif;": '\U000025B4',
-- "uuarr;": '\U000021C8',
-- "uuml;": '\U000000FC',
-- "uwangle;": '\U000029A7',
-- "vArr;": '\U000021D5',
-- "vBar;": '\U00002AE8',
-- "vBarv;": '\U00002AE9',
-- "vDash;": '\U000022A8',
-- "vangrt;": '\U0000299C',
-- "varepsilon;": '\U000003F5',
-- "varkappa;": '\U000003F0',
-- "varnothing;": '\U00002205',
-- "varphi;": '\U000003D5',
-- "varpi;": '\U000003D6',
-- "varpropto;": '\U0000221D',
-- "varr;": '\U00002195',
-- "varrho;": '\U000003F1',
-- "varsigma;": '\U000003C2',
-- "vartheta;": '\U000003D1',
-- "vartriangleleft;": '\U000022B2',
-- "vartriangleright;": '\U000022B3',
-- "vcy;": '\U00000432',
-- "vdash;": '\U000022A2',
-- "vee;": '\U00002228',
-- "veebar;": '\U000022BB',
-- "veeeq;": '\U0000225A',
-- "vellip;": '\U000022EE',
-- "verbar;": '\U0000007C',
-- "vert;": '\U0000007C',
-- "vfr;": '\U0001D533',
-- "vltri;": '\U000022B2',
-- "vopf;": '\U0001D567',
-- "vprop;": '\U0000221D',
-- "vrtri;": '\U000022B3',
-- "vscr;": '\U0001D4CB',
-- "vzigzag;": '\U0000299A',
-- "wcirc;": '\U00000175',
-- "wedbar;": '\U00002A5F',
-- "wedge;": '\U00002227',
-- "wedgeq;": '\U00002259',
-- "weierp;": '\U00002118',
-- "wfr;": '\U0001D534',
-- "wopf;": '\U0001D568',
-- "wp;": '\U00002118',
-- "wr;": '\U00002240',
-- "wreath;": '\U00002240',
-- "wscr;": '\U0001D4CC',
-- "xcap;": '\U000022C2',
-- "xcirc;": '\U000025EF',
-- "xcup;": '\U000022C3',
-- "xdtri;": '\U000025BD',
-- "xfr;": '\U0001D535',
-- "xhArr;": '\U000027FA',
-- "xharr;": '\U000027F7',
-- "xi;": '\U000003BE',
-- "xlArr;": '\U000027F8',
-- "xlarr;": '\U000027F5',
-- "xmap;": '\U000027FC',
-- "xnis;": '\U000022FB',
-- "xodot;": '\U00002A00',
-- "xopf;": '\U0001D569',
-- "xoplus;": '\U00002A01',
-- "xotime;": '\U00002A02',
-- "xrArr;": '\U000027F9',
-- "xrarr;": '\U000027F6',
-- "xscr;": '\U0001D4CD',
-- "xsqcup;": '\U00002A06',
-- "xuplus;": '\U00002A04',
-- "xutri;": '\U000025B3',
-- "xvee;": '\U000022C1',
-- "xwedge;": '\U000022C0',
-- "yacute;": '\U000000FD',
-- "yacy;": '\U0000044F',
-- "ycirc;": '\U00000177',
-- "ycy;": '\U0000044B',
-- "yen;": '\U000000A5',
-- "yfr;": '\U0001D536',
-- "yicy;": '\U00000457',
-- "yopf;": '\U0001D56A',
-- "yscr;": '\U0001D4CE',
-- "yucy;": '\U0000044E',
-- "yuml;": '\U000000FF',
-- "zacute;": '\U0000017A',
-- "zcaron;": '\U0000017E',
-- "zcy;": '\U00000437',
-- "zdot;": '\U0000017C',
-- "zeetrf;": '\U00002128',
-- "zeta;": '\U000003B6',
-- "zfr;": '\U0001D537',
-- "zhcy;": '\U00000436',
-- "zigrarr;": '\U000021DD',
-- "zopf;": '\U0001D56B',
-- "zscr;": '\U0001D4CF',
-- "zwj;": '\U0000200D',
-- "zwnj;": '\U0000200C',
-- "AElig": '\U000000C6',
-- "AMP": '\U00000026',
-- "Aacute": '\U000000C1',
-- "Acirc": '\U000000C2',
-- "Agrave": '\U000000C0',
-- "Aring": '\U000000C5',
-- "Atilde": '\U000000C3',
-- "Auml": '\U000000C4',
-- "COPY": '\U000000A9',
-- "Ccedil": '\U000000C7',
-- "ETH": '\U000000D0',
-- "Eacute": '\U000000C9',
-- "Ecirc": '\U000000CA',
-- "Egrave": '\U000000C8',
-- "Euml": '\U000000CB',
-- "GT": '\U0000003E',
-- "Iacute": '\U000000CD',
-- "Icirc": '\U000000CE',
-- "Igrave": '\U000000CC',
-- "Iuml": '\U000000CF',
-- "LT": '\U0000003C',
-- "Ntilde": '\U000000D1',
-- "Oacute": '\U000000D3',
-- "Ocirc": '\U000000D4',
-- "Ograve": '\U000000D2',
-- "Oslash": '\U000000D8',
-- "Otilde": '\U000000D5',
-- "Ouml": '\U000000D6',
-- "QUOT": '\U00000022',
-- "REG": '\U000000AE',
-- "THORN": '\U000000DE',
-- "Uacute": '\U000000DA',
-- "Ucirc": '\U000000DB',
-- "Ugrave": '\U000000D9',
-- "Uuml": '\U000000DC',
-- "Yacute": '\U000000DD',
-- "aacute": '\U000000E1',
-- "acirc": '\U000000E2',
-- "acute": '\U000000B4',
-- "aelig": '\U000000E6',
-- "agrave": '\U000000E0',
-- "amp": '\U00000026',
-- "aring": '\U000000E5',
-- "atilde": '\U000000E3',
-- "auml": '\U000000E4',
-- "brvbar": '\U000000A6',
-- "ccedil": '\U000000E7',
-- "cedil": '\U000000B8',
-- "cent": '\U000000A2',
-- "copy": '\U000000A9',
-- "curren": '\U000000A4',
-- "deg": '\U000000B0',
-- "divide": '\U000000F7',
-- "eacute": '\U000000E9',
-- "ecirc": '\U000000EA',
-- "egrave": '\U000000E8',
-- "eth": '\U000000F0',
-- "euml": '\U000000EB',
-- "frac12": '\U000000BD',
-- "frac14": '\U000000BC',
-- "frac34": '\U000000BE',
-- "gt": '\U0000003E',
-- "iacute": '\U000000ED',
-- "icirc": '\U000000EE',
-- "iexcl": '\U000000A1',
-- "igrave": '\U000000EC',
-- "iquest": '\U000000BF',
-- "iuml": '\U000000EF',
-- "laquo": '\U000000AB',
-- "lt": '\U0000003C',
-- "macr": '\U000000AF',
-- "micro": '\U000000B5',
-- "middot": '\U000000B7',
-- "nbsp": '\U000000A0',
-- "not": '\U000000AC',
-- "ntilde": '\U000000F1',
-- "oacute": '\U000000F3',
-- "ocirc": '\U000000F4',
-- "ograve": '\U000000F2',
-- "ordf": '\U000000AA',
-- "ordm": '\U000000BA',
-- "oslash": '\U000000F8',
-- "otilde": '\U000000F5',
-- "ouml": '\U000000F6',
-- "para": '\U000000B6',
-- "plusmn": '\U000000B1',
-- "pound": '\U000000A3',
-- "quot": '\U00000022',
-- "raquo": '\U000000BB',
-- "reg": '\U000000AE',
-- "sect": '\U000000A7',
-- "shy": '\U000000AD',
-- "sup1": '\U000000B9',
-- "sup2": '\U000000B2',
-- "sup3": '\U000000B3',
-- "szlig": '\U000000DF',
-- "thorn": '\U000000FE',
-- "times": '\U000000D7',
-- "uacute": '\U000000FA',
-- "ucirc": '\U000000FB',
-- "ugrave": '\U000000F9',
-- "uml": '\U000000A8',
-- "uuml": '\U000000FC',
-- "yacute": '\U000000FD',
-- "yen": '\U000000A5',
-- "yuml": '\U000000FF',
--}
--
--// HTML entities that are two unicode codepoints.
--var entity2 = map[string][2]rune{
-- // TODO(nigeltao): Handle replacements that are wider than their names.
-- // "nLt;": {'\u226A', '\u20D2'},
-- // "nGt;": {'\u226B', '\u20D2'},
-- "NotEqualTilde;": {'\u2242', '\u0338'},
-- "NotGreaterFullEqual;": {'\u2267', '\u0338'},
-- "NotGreaterGreater;": {'\u226B', '\u0338'},
-- "NotGreaterSlantEqual;": {'\u2A7E', '\u0338'},
-- "NotHumpDownHump;": {'\u224E', '\u0338'},
-- "NotHumpEqual;": {'\u224F', '\u0338'},
-- "NotLeftTriangleBar;": {'\u29CF', '\u0338'},
-- "NotLessLess;": {'\u226A', '\u0338'},
-- "NotLessSlantEqual;": {'\u2A7D', '\u0338'},
-- "NotNestedGreaterGreater;": {'\u2AA2', '\u0338'},
-- "NotNestedLessLess;": {'\u2AA1', '\u0338'},
-- "NotPrecedesEqual;": {'\u2AAF', '\u0338'},
-- "NotRightTriangleBar;": {'\u29D0', '\u0338'},
-- "NotSquareSubset;": {'\u228F', '\u0338'},
-- "NotSquareSuperset;": {'\u2290', '\u0338'},
-- "NotSubset;": {'\u2282', '\u20D2'},
-- "NotSucceedsEqual;": {'\u2AB0', '\u0338'},
-- "NotSucceedsTilde;": {'\u227F', '\u0338'},
-- "NotSuperset;": {'\u2283', '\u20D2'},
-- "ThickSpace;": {'\u205F', '\u200A'},
-- "acE;": {'\u223E', '\u0333'},
-- "bne;": {'\u003D', '\u20E5'},
-- "bnequiv;": {'\u2261', '\u20E5'},
-- "caps;": {'\u2229', '\uFE00'},
-- "cups;": {'\u222A', '\uFE00'},
-- "fjlig;": {'\u0066', '\u006A'},
-- "gesl;": {'\u22DB', '\uFE00'},
-- "gvertneqq;": {'\u2269', '\uFE00'},
-- "gvnE;": {'\u2269', '\uFE00'},
-- "lates;": {'\u2AAD', '\uFE00'},
-- "lesg;": {'\u22DA', '\uFE00'},
-- "lvertneqq;": {'\u2268', '\uFE00'},
-- "lvnE;": {'\u2268', '\uFE00'},
-- "nGg;": {'\u22D9', '\u0338'},
-- "nGtv;": {'\u226B', '\u0338'},
-- "nLl;": {'\u22D8', '\u0338'},
-- "nLtv;": {'\u226A', '\u0338'},
-- "nang;": {'\u2220', '\u20D2'},
-- "napE;": {'\u2A70', '\u0338'},
-- "napid;": {'\u224B', '\u0338'},
-- "nbump;": {'\u224E', '\u0338'},
-- "nbumpe;": {'\u224F', '\u0338'},
-- "ncongdot;": {'\u2A6D', '\u0338'},
-- "nedot;": {'\u2250', '\u0338'},
-- "nesim;": {'\u2242', '\u0338'},
-- "ngE;": {'\u2267', '\u0338'},
-- "ngeqq;": {'\u2267', '\u0338'},
-- "ngeqslant;": {'\u2A7E', '\u0338'},
-- "nges;": {'\u2A7E', '\u0338'},
-- "nlE;": {'\u2266', '\u0338'},
-- "nleqq;": {'\u2266', '\u0338'},
-- "nleqslant;": {'\u2A7D', '\u0338'},
-- "nles;": {'\u2A7D', '\u0338'},
-- "notinE;": {'\u22F9', '\u0338'},
-- "notindot;": {'\u22F5', '\u0338'},
-- "nparsl;": {'\u2AFD', '\u20E5'},
-- "npart;": {'\u2202', '\u0338'},
-- "npre;": {'\u2AAF', '\u0338'},
-- "npreceq;": {'\u2AAF', '\u0338'},
-- "nrarrc;": {'\u2933', '\u0338'},
-- "nrarrw;": {'\u219D', '\u0338'},
-- "nsce;": {'\u2AB0', '\u0338'},
-- "nsubE;": {'\u2AC5', '\u0338'},
-- "nsubset;": {'\u2282', '\u20D2'},
-- "nsubseteqq;": {'\u2AC5', '\u0338'},
-- "nsucceq;": {'\u2AB0', '\u0338'},
-- "nsupE;": {'\u2AC6', '\u0338'},
-- "nsupset;": {'\u2283', '\u20D2'},
-- "nsupseteqq;": {'\u2AC6', '\u0338'},
-- "nvap;": {'\u224D', '\u20D2'},
-- "nvge;": {'\u2265', '\u20D2'},
-- "nvgt;": {'\u003E', '\u20D2'},
-- "nvle;": {'\u2264', '\u20D2'},
-- "nvlt;": {'\u003C', '\u20D2'},
-- "nvltrie;": {'\u22B4', '\u20D2'},
-- "nvrtrie;": {'\u22B5', '\u20D2'},
-- "nvsim;": {'\u223C', '\u20D2'},
-- "race;": {'\u223D', '\u0331'},
-- "smtes;": {'\u2AAC', '\uFE00'},
-- "sqcaps;": {'\u2293', '\uFE00'},
-- "sqcups;": {'\u2294', '\uFE00'},
-- "varsubsetneq;": {'\u228A', '\uFE00'},
-- "varsubsetneqq;": {'\u2ACB', '\uFE00'},
-- "varsupsetneq;": {'\u228B', '\uFE00'},
-- "varsupsetneqq;": {'\u2ACC', '\uFE00'},
-- "vnsub;": {'\u2282', '\u20D2'},
-- "vnsup;": {'\u2283', '\u20D2'},
-- "vsubnE;": {'\u2ACB', '\uFE00'},
-- "vsubne;": {'\u228A', '\uFE00'},
-- "vsupnE;": {'\u2ACC', '\uFE00'},
-- "vsupne;": {'\u228B', '\uFE00'},
--}
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/entity_test.go b/Godeps/_workspace/src/code.google.com/p/go.net/html/entity_test.go
-deleted file mode 100644
-index b53f866..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/entity_test.go
-+++ /dev/null
-@@ -1,29 +0,0 @@
--// Copyright 2010 The Go Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--package html
--
--import (
-- "testing"
-- "unicode/utf8"
--)
--
--func TestEntityLength(t *testing.T) {
-- // We verify that the length of UTF-8 encoding of each value is <= 1 + len(key).
-- // The +1 comes from the leading "&". This property implies that the length of
-- // unescaped text is <= the length of escaped text.
-- for k, v := range entity {
-- if 1+len(k) < utf8.RuneLen(v) {
-- t.Error("escaped entity &" + k + " is shorter than its UTF-8 encoding " + string(v))
-- }
-- if len(k) > longestEntityWithoutSemicolon && k[len(k)-1] != ';' {
-- t.Errorf("entity name %s is %d characters, but longestEntityWithoutSemicolon=%d", k, len(k), longestEntityWithoutSemicolon)
-- }
-- }
-- for k, v := range entity2 {
-- if 1+len(k) < utf8.RuneLen(v[0])+utf8.RuneLen(v[1]) {
-- t.Error("escaped entity &" + k + " is shorter than its UTF-8 encoding " + string(v[0]) + string(v[1]))
-- }
-- }
--}
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/escape.go b/Godeps/_workspace/src/code.google.com/p/go.net/html/escape.go
-deleted file mode 100644
-index 75bddff..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/escape.go
-+++ /dev/null
-@@ -1,258 +0,0 @@
--// Copyright 2010 The Go Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--package html
--
--import (
-- "bytes"
-- "strings"
-- "unicode/utf8"
--)
--
--// These replacements permit compatibility with old numeric entities that
--// assumed Windows-1252 encoding.
--// http://www.whatwg.org/specs/web-apps/current-work/multipage/tokenization.html#consume-a-character-reference
--var replacementTable = [...]rune{
-- '\u20AC', // First entry is what 0x80 should be replaced with.
-- '\u0081',
-- '\u201A',
-- '\u0192',
-- '\u201E',
-- '\u2026',
-- '\u2020',
-- '\u2021',
-- '\u02C6',
-- '\u2030',
-- '\u0160',
-- '\u2039',
-- '\u0152',
-- '\u008D',
-- '\u017D',
-- '\u008F',
-- '\u0090',
-- '\u2018',
-- '\u2019',
-- '\u201C',
-- '\u201D',
-- '\u2022',
-- '\u2013',
-- '\u2014',
-- '\u02DC',
-- '\u2122',
-- '\u0161',
-- '\u203A',
-- '\u0153',
-- '\u009D',
-- '\u017E',
-- '\u0178', // Last entry is 0x9F.
-- // 0x00->'\uFFFD' is handled programmatically.
-- // 0x0D->'\u000D' is a no-op.
--}
--
--// unescapeEntity reads an entity like "<" from b[src:] and writes the
--// corresponding "<" to b[dst:], returning the incremented dst and src cursors.
--// Precondition: b[src] == '&' && dst <= src.
--// attribute should be true if parsing an attribute value.
--func unescapeEntity(b []byte, dst, src int, attribute bool) (dst1, src1 int) {
-- // http://www.whatwg.org/specs/web-apps/current-work/multipage/tokenization.html#consume-a-character-reference
--
-- // i starts at 1 because we already know that s[0] == '&'.
-- i, s := 1, b[src:]
--
-- if len(s) <= 1 {
-- b[dst] = b[src]
-- return dst + 1, src + 1
-- }
--
-- if s[i] == '#' {
-- if len(s) <= 3 { // We need to have at least "&#.".
-- b[dst] = b[src]
-- return dst + 1, src + 1
-- }
-- i++
-- c := s[i]
-- hex := false
-- if c == 'x' || c == 'X' {
-- hex = true
-- i++
-- }
--
-- x := '\x00'
-- for i < len(s) {
-- c = s[i]
-- i++
-- if hex {
-- if '0' <= c && c <= '9' {
-- x = 16*x + rune(c) - '0'
-- continue
-- } else if 'a' <= c && c <= 'f' {
-- x = 16*x + rune(c) - 'a' + 10
-- continue
-- } else if 'A' <= c && c <= 'F' {
-- x = 16*x + rune(c) - 'A' + 10
-- continue
-- }
-- } else if '0' <= c && c <= '9' {
-- x = 10*x + rune(c) - '0'
-- continue
-- }
-- if c != ';' {
-- i--
-- }
-- break
-- }
--
-- if i <= 3 { // No characters matched.
-- b[dst] = b[src]
-- return dst + 1, src + 1
-- }
--
-- if 0x80 <= x && x <= 0x9F {
-- // Replace characters from Windows-1252 with UTF-8 equivalents.
-- x = replacementTable[x-0x80]
-- } else if x == 0 || (0xD800 <= x && x <= 0xDFFF) || x > 0x10FFFF {
-- // Replace invalid characters with the replacement character.
-- x = '\uFFFD'
-- }
--
-- return dst + utf8.EncodeRune(b[dst:], x), src + i
-- }
--
-- // Consume the maximum number of characters possible, with the
-- // consumed characters matching one of the named references.
--
-- for i < len(s) {
-- c := s[i]
-- i++
-- // Lower-cased characters are more common in entities, so we check for them first.
-- if 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' || '0' <= c && c <= '9' {
-- continue
-- }
-- if c != ';' {
-- i--
-- }
-- break
-- }
--
-- entityName := string(s[1:i])
-- if entityName == "" {
-- // No-op.
-- } else if attribute && entityName[len(entityName)-1] != ';' && len(s) > i && s[i] == '=' {
-- // No-op.
-- } else if x := entity[entityName]; x != 0 {
-- return dst + utf8.EncodeRune(b[dst:], x), src + i
-- } else if x := entity2[entityName]; x[0] != 0 {
-- dst1 := dst + utf8.EncodeRune(b[dst:], x[0])
-- return dst1 + utf8.EncodeRune(b[dst1:], x[1]), src + i
-- } else if !attribute {
-- maxLen := len(entityName) - 1
-- if maxLen > longestEntityWithoutSemicolon {
-- maxLen = longestEntityWithoutSemicolon
-- }
-- for j := maxLen; j > 1; j-- {
-- if x := entity[entityName[:j]]; x != 0 {
-- return dst + utf8.EncodeRune(b[dst:], x), src + j + 1
-- }
-- }
-- }
--
-- dst1, src1 = dst+i, src+i
-- copy(b[dst:dst1], b[src:src1])
-- return dst1, src1
--}
--
--// unescape unescapes b's entities in-place, so that "a<b" becomes "a<b".
--// attribute should be true if parsing an attribute value.
--func unescape(b []byte, attribute bool) []byte {
-- for i, c := range b {
-- if c == '&' {
-- dst, src := unescapeEntity(b, i, i, attribute)
-- for src < len(b) {
-- c := b[src]
-- if c == '&' {
-- dst, src = unescapeEntity(b, dst, src, attribute)
-- } else {
-- b[dst] = c
-- dst, src = dst+1, src+1
-- }
-- }
-- return b[0:dst]
-- }
-- }
-- return b
--}
--
--// lower lower-cases the A-Z bytes in b in-place, so that "aBc" becomes "abc".
--func lower(b []byte) []byte {
-- for i, c := range b {
-- if 'A' <= c && c <= 'Z' {
-- b[i] = c + 'a' - 'A'
-- }
-- }
-- return b
--}
--
--const escapedChars = "&'<>\"\r"
--
--func escape(w writer, s string) error {
-- i := strings.IndexAny(s, escapedChars)
-- for i != -1 {
-- if _, err := w.WriteString(s[:i]); err != nil {
-- return err
-- }
-- var esc string
-- switch s[i] {
-- case '&':
-- esc = "&"
-- case '\'':
-- // "'" is shorter than "'" and apos was not in HTML until HTML5.
-- esc = "'"
-- case '<':
-- esc = "<"
-- case '>':
-- esc = ">"
-- case '"':
-- // """ is shorter than """.
-- esc = """
-- case '\r':
-- esc = " "
-- default:
-- panic("unrecognized escape character")
-- }
-- s = s[i+1:]
-- if _, err := w.WriteString(esc); err != nil {
-- return err
-- }
-- i = strings.IndexAny(s, escapedChars)
-- }
-- _, err := w.WriteString(s)
-- return err
--}
--
--// EscapeString escapes special characters like "<" to become "<". It
--// escapes only five such characters: <, >, &, ' and ".
--// UnescapeString(EscapeString(s)) == s always holds, but the converse isn't
--// always true.
--func EscapeString(s string) string {
-- if strings.IndexAny(s, escapedChars) == -1 {
-- return s
-- }
-- var buf bytes.Buffer
-- escape(&buf, s)
-- return buf.String()
--}
--
--// UnescapeString unescapes entities like "<" to become "<". It unescapes a
--// larger range of entities than EscapeString escapes. For example, "á"
--// unescapes to "á", as does "á" and "&xE1;".
--// UnescapeString(EscapeString(s)) == s always holds, but the converse isn't
--// always true.
--func UnescapeString(s string) string {
-- for _, c := range s {
-- if c == '&' {
-- return string(unescape([]byte(s), false))
-- }
-- }
-- return s
--}
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/escape_test.go b/Godeps/_workspace/src/code.google.com/p/go.net/html/escape_test.go
-deleted file mode 100644
-index b405d4b..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/escape_test.go
-+++ /dev/null
-@@ -1,97 +0,0 @@
--// Copyright 2013 The Go Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--package html
--
--import "testing"
--
--type unescapeTest struct {
-- // A short description of the test case.
-- desc string
-- // The HTML text.
-- html string
-- // The unescaped text.
-- unescaped string
--}
--
--var unescapeTests = []unescapeTest{
-- // Handle no entities.
-- {
-- "copy",
-- "A\ttext\nstring",
-- "A\ttext\nstring",
-- },
-- // Handle simple named entities.
-- {
-- "simple",
-- "& > <",
-- "& > <",
-- },
-- // Handle hitting the end of the string.
-- {
-- "stringEnd",
-- "& &",
-- "& &",
-- },
-- // Handle entities with two codepoints.
-- {
-- "multiCodepoint",
-- "text ⋛︀ blah",
-- "text \u22db\ufe00 blah",
-- },
-- // Handle decimal numeric entities.
-- {
-- "decimalEntity",
-- "Delta = Δ ",
-- "Delta = Δ ",
-- },
-- // Handle hexadecimal numeric entities.
-- {
-- "hexadecimalEntity",
-- "Lambda = λ = λ ",
-- "Lambda = λ = λ ",
-- },
-- // Handle numeric early termination.
-- {
-- "numericEnds",
-- "&# &#x €43 © = ©f = ©",
-- "&# &#x €43 © = ©f = ©",
-- },
-- // Handle numeric ISO-8859-1 entity replacements.
-- {
-- "numericReplacements",
-- "Footnote‡",
-- "Footnote‡",
-- },
--}
--
--func TestUnescape(t *testing.T) {
-- for _, tt := range unescapeTests {
-- unescaped := UnescapeString(tt.html)
-- if unescaped != tt.unescaped {
-- t.Errorf("TestUnescape %s: want %q, got %q", tt.desc, tt.unescaped, unescaped)
-- }
-- }
--}
--
--func TestUnescapeEscape(t *testing.T) {
-- ss := []string{
-- ``,
-- `abc def`,
-- `a & b`,
-- `a&b`,
-- `a & b`,
-- `"`,
-- `"`,
-- `"<&>"`,
-- `"<&>"`,
-- `3&5==1 && 0<1, "0<1", a+acute=á`,
-- `The special characters are: <, >, &, ' and "`,
-- }
-- for _, s := range ss {
-- if got := UnescapeString(EscapeString(s)); got != s {
-- t.Errorf("got %q want %q", got, s)
-- }
-- }
--}
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/example_test.go b/Godeps/_workspace/src/code.google.com/p/go.net/html/example_test.go
-deleted file mode 100644
-index 47341f0..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/example_test.go
-+++ /dev/null
-@@ -1,40 +0,0 @@
--// Copyright 2012 The Go Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--// This example demonstrates parsing HTML data and walking the resulting tree.
--package html_test
--
--import (
-- "fmt"
-- "log"
-- "strings"
--
-- "code.google.com/p/go.net/html"
--)
--
--func ExampleParse() {
-- s := `<p>Links:</p><ul><li><a href="foo">Foo</a><li><a href="/bar/baz">BarBaz</a></ul>`
-- doc, err := html.Parse(strings.NewReader(s))
-- if err != nil {
-- log.Fatal(err)
-- }
-- var f func(*html.Node)
-- f = func(n *html.Node) {
-- if n.Type == html.ElementNode && n.Data == "a" {
-- for _, a := range n.Attr {
-- if a.Key == "href" {
-- fmt.Println(a.Val)
-- break
-- }
-- }
-- }
-- for c := n.FirstChild; c != nil; c = c.NextSibling {
-- f(c)
-- }
-- }
-- f(doc)
-- // Output:
-- // foo
-- // /bar/baz
--}
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/foreign.go b/Godeps/_workspace/src/code.google.com/p/go.net/html/foreign.go
-deleted file mode 100644
-index d3b3844..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/foreign.go
-+++ /dev/null
-@@ -1,226 +0,0 @@
--// Copyright 2011 The Go Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--package html
--
--import (
-- "strings"
--)
--
--func adjustAttributeNames(aa []Attribute, nameMap map[string]string) {
-- for i := range aa {
-- if newName, ok := nameMap[aa[i].Key]; ok {
-- aa[i].Key = newName
-- }
-- }
--}
--
--func adjustForeignAttributes(aa []Attribute) {
-- for i, a := range aa {
-- if a.Key == "" || a.Key[0] != 'x' {
-- continue
-- }
-- switch a.Key {
-- case "xlink:actuate", "xlink:arcrole", "xlink:href", "xlink:role", "xlink:show",
-- "xlink:title", "xlink:type", "xml:base", "xml:lang", "xml:space", "xmlns:xlink":
-- j := strings.Index(a.Key, ":")
-- aa[i].Namespace = a.Key[:j]
-- aa[i].Key = a.Key[j+1:]
-- }
-- }
--}
--
--func htmlIntegrationPoint(n *Node) bool {
-- if n.Type != ElementNode {
-- return false
-- }
-- switch n.Namespace {
-- case "math":
-- if n.Data == "annotation-xml" {
-- for _, a := range n.Attr {
-- if a.Key == "encoding" {
-- val := strings.ToLower(a.Val)
-- if val == "text/html" || val == "application/xhtml+xml" {
-- return true
-- }
-- }
-- }
-- }
-- case "svg":
-- switch n.Data {
-- case "desc", "foreignObject", "title":
-- return true
-- }
-- }
-- return false
--}
--
--func mathMLTextIntegrationPoint(n *Node) bool {
-- if n.Namespace != "math" {
-- return false
-- }
-- switch n.Data {
-- case "mi", "mo", "mn", "ms", "mtext":
-- return true
-- }
-- return false
--}
--
--// Section 12.2.5.5.
--var breakout = map[string]bool{
-- "b": true,
-- "big": true,
-- "blockquote": true,
-- "body": true,
-- "br": true,
-- "center": true,
-- "code": true,
-- "dd": true,
-- "div": true,
-- "dl": true,
-- "dt": true,
-- "em": true,
-- "embed": true,
-- "h1": true,
-- "h2": true,
-- "h3": true,
-- "h4": true,
-- "h5": true,
-- "h6": true,
-- "head": true,
-- "hr": true,
-- "i": true,
-- "img": true,
-- "li": true,
-- "listing": true,
-- "menu": true,
-- "meta": true,
-- "nobr": true,
-- "ol": true,
-- "p": true,
-- "pre": true,
-- "ruby": true,
-- "s": true,
-- "small": true,
-- "span": true,
-- "strong": true,
-- "strike": true,
-- "sub": true,
-- "sup": true,
-- "table": true,
-- "tt": true,
-- "u": true,
-- "ul": true,
-- "var": true,
--}
--
--// Section 12.2.5.5.
--var svgTagNameAdjustments = map[string]string{
-- "altglyph": "altGlyph",
-- "altglyphdef": "altGlyphDef",
-- "altglyphitem": "altGlyphItem",
-- "animatecolor": "animateColor",
-- "animatemotion": "animateMotion",
-- "animatetransform": "animateTransform",
-- "clippath": "clipPath",
-- "feblend": "feBlend",
-- "fecolormatrix": "feColorMatrix",
-- "fecomponenttransfer": "feComponentTransfer",
-- "fecomposite": "feComposite",
-- "feconvolvematrix": "feConvolveMatrix",
-- "fediffuselighting": "feDiffuseLighting",
-- "fedisplacementmap": "feDisplacementMap",
-- "fedistantlight": "feDistantLight",
-- "feflood": "feFlood",
-- "fefunca": "feFuncA",
-- "fefuncb": "feFuncB",
-- "fefuncg": "feFuncG",
-- "fefuncr": "feFuncR",
-- "fegaussianblur": "feGaussianBlur",
-- "feimage": "feImage",
-- "femerge": "feMerge",
-- "femergenode": "feMergeNode",
-- "femorphology": "feMorphology",
-- "feoffset": "feOffset",
-- "fepointlight": "fePointLight",
-- "fespecularlighting": "feSpecularLighting",
-- "fespotlight": "feSpotLight",
-- "fetile": "feTile",
-- "feturbulence": "feTurbulence",
-- "foreignobject": "foreignObject",
-- "glyphref": "glyphRef",
-- "lineargradient": "linearGradient",
-- "radialgradient": "radialGradient",
-- "textpath": "textPath",
--}
--
--// Section 12.2.5.1
--var mathMLAttributeAdjustments = map[string]string{
-- "definitionurl": "definitionURL",
--}
--
--var svgAttributeAdjustments = map[string]string{
-- "attributename": "attributeName",
-- "attributetype": "attributeType",
-- "basefrequency": "baseFrequency",
-- "baseprofile": "baseProfile",
-- "calcmode": "calcMode",
-- "clippathunits": "clipPathUnits",
-- "contentscripttype": "contentScriptType",
-- "contentstyletype": "contentStyleType",
-- "diffuseconstant": "diffuseConstant",
-- "edgemode": "edgeMode",
-- "externalresourcesrequired": "externalResourcesRequired",
-- "filterres": "filterRes",
-- "filterunits": "filterUnits",
-- "glyphref": "glyphRef",
-- "gradienttransform": "gradientTransform",
-- "gradientunits": "gradientUnits",
-- "kernelmatrix": "kernelMatrix",
-- "kernelunitlength": "kernelUnitLength",
-- "keypoints": "keyPoints",
-- "keysplines": "keySplines",
-- "keytimes": "keyTimes",
-- "lengthadjust": "lengthAdjust",
-- "limitingconeangle": "limitingConeAngle",
-- "markerheight": "markerHeight",
-- "markerunits": "markerUnits",
-- "markerwidth": "markerWidth",
-- "maskcontentunits": "maskContentUnits",
-- "maskunits": "maskUnits",
-- "numoctaves": "numOctaves",
-- "pathlength": "pathLength",
-- "patterncontentunits": "patternContentUnits",
-- "patterntransform": "patternTransform",
-- "patternunits": "patternUnits",
-- "pointsatx": "pointsAtX",
-- "pointsaty": "pointsAtY",
-- "pointsatz": "pointsAtZ",
-- "preservealpha": "preserveAlpha",
-- "preserveaspectratio": "preserveAspectRatio",
-- "primitiveunits": "primitiveUnits",
-- "refx": "refX",
-- "refy": "refY",
-- "repeatcount": "repeatCount",
-- "repeatdur": "repeatDur",
-- "requiredextensions": "requiredExtensions",
-- "requiredfeatures": "requiredFeatures",
-- "specularconstant": "specularConstant",
-- "specularexponent": "specularExponent",
-- "spreadmethod": "spreadMethod",
-- "startoffset": "startOffset",
-- "stddeviation": "stdDeviation",
-- "stitchtiles": "stitchTiles",
-- "surfacescale": "surfaceScale",
-- "systemlanguage": "systemLanguage",
-- "tablevalues": "tableValues",
-- "targetx": "targetX",
-- "targety": "targetY",
-- "textlength": "textLength",
-- "viewbox": "viewBox",
-- "viewtarget": "viewTarget",
-- "xchannelselector": "xChannelSelector",
-- "ychannelselector": "yChannelSelector",
-- "zoomandpan": "zoomAndPan",
--}
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/node.go b/Godeps/_workspace/src/code.google.com/p/go.net/html/node.go
-deleted file mode 100644
-index e7b4e50..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/node.go
-+++ /dev/null
-@@ -1,193 +0,0 @@
--// Copyright 2011 The Go Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--package html
--
--import (
-- "code.google.com/p/go.net/html/atom"
--)
--
--// A NodeType is the type of a Node.
--type NodeType uint32
--
--const (
-- ErrorNode NodeType = iota
-- TextNode
-- DocumentNode
-- ElementNode
-- CommentNode
-- DoctypeNode
-- scopeMarkerNode
--)
--
--// Section 12.2.3.3 says "scope markers are inserted when entering applet
--// elements, buttons, object elements, marquees, table cells, and table
--// captions, and are used to prevent formatting from 'leaking'".
--var scopeMarker = Node{Type: scopeMarkerNode}
--
--// A Node consists of a NodeType and some Data (tag name for element nodes,
--// content for text) and are part of a tree of Nodes. Element nodes may also
--// have a Namespace and contain a slice of Attributes. Data is unescaped, so
--// that it looks like "a<b" rather than "a<b". For element nodes, DataAtom
--// is the atom for Data, or zero if Data is not a known tag name.
--//
--// An empty Namespace implies a "http://www.w3.org/1999/xhtml" namespace.
--// Similarly, "math" is short for "http://www.w3.org/1998/Math/MathML", and
--// "svg" is short for "http://www.w3.org/2000/svg".
--type Node struct {
-- Parent, FirstChild, LastChild, PrevSibling, NextSibling *Node
--
-- Type NodeType
-- DataAtom atom.Atom
-- Data string
-- Namespace string
-- Attr []Attribute
--}
--
--// InsertBefore inserts newChild as a child of n, immediately before oldChild
--// in the sequence of n's children. oldChild may be nil, in which case newChild
--// is appended to the end of n's children.
--//
--// It will panic if newChild already has a parent or siblings.
--func (n *Node) InsertBefore(newChild, oldChild *Node) {
-- if newChild.Parent != nil || newChild.PrevSibling != nil || newChild.NextSibling != nil {
-- panic("html: InsertBefore called for an attached child Node")
-- }
-- var prev, next *Node
-- if oldChild != nil {
-- prev, next = oldChild.PrevSibling, oldChild
-- } else {
-- prev = n.LastChild
-- }
-- if prev != nil {
-- prev.NextSibling = newChild
-- } else {
-- n.FirstChild = newChild
-- }
-- if next != nil {
-- next.PrevSibling = newChild
-- } else {
-- n.LastChild = newChild
-- }
-- newChild.Parent = n
-- newChild.PrevSibling = prev
-- newChild.NextSibling = next
--}
--
--// AppendChild adds a node c as a child of n.
--//
--// It will panic if c already has a parent or siblings.
--func (n *Node) AppendChild(c *Node) {
-- if c.Parent != nil || c.PrevSibling != nil || c.NextSibling != nil {
-- panic("html: AppendChild called for an attached child Node")
-- }
-- last := n.LastChild
-- if last != nil {
-- last.NextSibling = c
-- } else {
-- n.FirstChild = c
-- }
-- n.LastChild = c
-- c.Parent = n
-- c.PrevSibling = last
--}
--
--// RemoveChild removes a node c that is a child of n. Afterwards, c will have
--// no parent and no siblings.
--//
--// It will panic if c's parent is not n.
--func (n *Node) RemoveChild(c *Node) {
-- if c.Parent != n {
-- panic("html: RemoveChild called for a non-child Node")
-- }
-- if n.FirstChild == c {
-- n.FirstChild = c.NextSibling
-- }
-- if c.NextSibling != nil {
-- c.NextSibling.PrevSibling = c.PrevSibling
-- }
-- if n.LastChild == c {
-- n.LastChild = c.PrevSibling
-- }
-- if c.PrevSibling != nil {
-- c.PrevSibling.NextSibling = c.NextSibling
-- }
-- c.Parent = nil
-- c.PrevSibling = nil
-- c.NextSibling = nil
--}
--
--// reparentChildren reparents all of src's child nodes to dst.
--func reparentChildren(dst, src *Node) {
-- for {
-- child := src.FirstChild
-- if child == nil {
-- break
-- }
-- src.RemoveChild(child)
-- dst.AppendChild(child)
-- }
--}
--
--// clone returns a new node with the same type, data and attributes.
--// The clone has no parent, no siblings and no children.
--func (n *Node) clone() *Node {
-- m := &Node{
-- Type: n.Type,
-- DataAtom: n.DataAtom,
-- Data: n.Data,
-- Attr: make([]Attribute, len(n.Attr)),
-- }
-- copy(m.Attr, n.Attr)
-- return m
--}
--
--// nodeStack is a stack of nodes.
--type nodeStack []*Node
--
--// pop pops the stack. It will panic if s is empty.
--func (s *nodeStack) pop() *Node {
-- i := len(*s)
-- n := (*s)[i-1]
-- *s = (*s)[:i-1]
-- return n
--}
--
--// top returns the most recently pushed node, or nil if s is empty.
--func (s *nodeStack) top() *Node {
-- if i := len(*s); i > 0 {
-- return (*s)[i-1]
-- }
-- return nil
--}
--
--// index returns the index of the top-most occurrence of n in the stack, or -1
--// if n is not present.
--func (s *nodeStack) index(n *Node) int {
-- for i := len(*s) - 1; i >= 0; i-- {
-- if (*s)[i] == n {
-- return i
-- }
-- }
-- return -1
--}
--
--// insert inserts a node at the given index.
--func (s *nodeStack) insert(i int, n *Node) {
-- (*s) = append(*s, nil)
-- copy((*s)[i+1:], (*s)[i:])
-- (*s)[i] = n
--}
--
--// remove removes a node from the stack. It is a no-op if n is not present.
--func (s *nodeStack) remove(n *Node) {
-- i := s.index(n)
-- if i == -1 {
-- return
-- }
-- copy((*s)[i:], (*s)[i+1:])
-- j := len(*s) - 1
-- (*s)[j] = nil
-- *s = (*s)[:j]
--}
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/node_test.go b/Godeps/_workspace/src/code.google.com/p/go.net/html/node_test.go
-deleted file mode 100644
-index 471102f..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/node_test.go
-+++ /dev/null
-@@ -1,146 +0,0 @@
--// Copyright 2010 The Go Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--package html
--
--import (
-- "fmt"
--)
--
--// checkTreeConsistency checks that a node and its descendants are all
--// consistent in their parent/child/sibling relationships.
--func checkTreeConsistency(n *Node) error {
-- return checkTreeConsistency1(n, 0)
--}
--
--func checkTreeConsistency1(n *Node, depth int) error {
-- if depth == 1e4 {
-- return fmt.Errorf("html: tree looks like it contains a cycle")
-- }
-- if err := checkNodeConsistency(n); err != nil {
-- return err
-- }
-- for c := n.FirstChild; c != nil; c = c.NextSibling {
-- if err := checkTreeConsistency1(c, depth+1); err != nil {
-- return err
-- }
-- }
-- return nil
--}
--
--// checkNodeConsistency checks that a node's parent/child/sibling relationships
--// are consistent.
--func checkNodeConsistency(n *Node) error {
-- if n == nil {
-- return nil
-- }
--
-- nParent := 0
-- for p := n.Parent; p != nil; p = p.Parent {
-- nParent++
-- if nParent == 1e4 {
-- return fmt.Errorf("html: parent list looks like an infinite loop")
-- }
-- }
--
-- nForward := 0
-- for c := n.FirstChild; c != nil; c = c.NextSibling {
-- nForward++
-- if nForward == 1e6 {
-- return fmt.Errorf("html: forward list of children looks like an infinite loop")
-- }
-- if c.Parent != n {
-- return fmt.Errorf("html: inconsistent child/parent relationship")
-- }
-- }
--
-- nBackward := 0
-- for c := n.LastChild; c != nil; c = c.PrevSibling {
-- nBackward++
-- if nBackward == 1e6 {
-- return fmt.Errorf("html: backward list of children looks like an infinite loop")
-- }
-- if c.Parent != n {
-- return fmt.Errorf("html: inconsistent child/parent relationship")
-- }
-- }
--
-- if n.Parent != nil {
-- if n.Parent == n {
-- return fmt.Errorf("html: inconsistent parent relationship")
-- }
-- if n.Parent == n.FirstChild {
-- return fmt.Errorf("html: inconsistent parent/first relationship")
-- }
-- if n.Parent == n.LastChild {
-- return fmt.Errorf("html: inconsistent parent/last relationship")
-- }
-- if n.Parent == n.PrevSibling {
-- return fmt.Errorf("html: inconsistent parent/prev relationship")
-- }
-- if n.Parent == n.NextSibling {
-- return fmt.Errorf("html: inconsistent parent/next relationship")
-- }
--
-- parentHasNAsAChild := false
-- for c := n.Parent.FirstChild; c != nil; c = c.NextSibling {
-- if c == n {
-- parentHasNAsAChild = true
-- break
-- }
-- }
-- if !parentHasNAsAChild {
-- return fmt.Errorf("html: inconsistent parent/child relationship")
-- }
-- }
--
-- if n.PrevSibling != nil && n.PrevSibling.NextSibling != n {
-- return fmt.Errorf("html: inconsistent prev/next relationship")
-- }
-- if n.NextSibling != nil && n.NextSibling.PrevSibling != n {
-- return fmt.Errorf("html: inconsistent next/prev relationship")
-- }
--
-- if (n.FirstChild == nil) != (n.LastChild == nil) {
-- return fmt.Errorf("html: inconsistent first/last relationship")
-- }
-- if n.FirstChild != nil && n.FirstChild == n.LastChild {
-- // We have a sole child.
-- if n.FirstChild.PrevSibling != nil || n.FirstChild.NextSibling != nil {
-- return fmt.Errorf("html: inconsistent sole child's sibling relationship")
-- }
-- }
--
-- seen := map[*Node]bool{}
--
-- var last *Node
-- for c := n.FirstChild; c != nil; c = c.NextSibling {
-- if seen[c] {
-- return fmt.Errorf("html: inconsistent repeated child")
-- }
-- seen[c] = true
-- last = c
-- }
-- if last != n.LastChild {
-- return fmt.Errorf("html: inconsistent last relationship")
-- }
--
-- var first *Node
-- for c := n.LastChild; c != nil; c = c.PrevSibling {
-- if !seen[c] {
-- return fmt.Errorf("html: inconsistent missing child")
-- }
-- delete(seen, c)
-- first = c
-- }
-- if first != n.FirstChild {
-- return fmt.Errorf("html: inconsistent first relationship")
-- }
--
-- if len(seen) != 0 {
-- return fmt.Errorf("html: inconsistent forwards/backwards child list")
-- }
--
-- return nil
--}
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/parse.go b/Godeps/_workspace/src/code.google.com/p/go.net/html/parse.go
-deleted file mode 100644
-index 501c64a..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/parse.go
-+++ /dev/null
-@@ -1,2092 +0,0 @@
--// Copyright 2010 The Go Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--package html
--
--import (
-- "errors"
-- "fmt"
-- "io"
-- "strings"
--
-- a "code.google.com/p/go.net/html/atom"
--)
--
--// A parser implements the HTML5 parsing algorithm:
--// http://www.whatwg.org/specs/web-apps/current-work/multipage/tokenization.html#tree-construction
--type parser struct {
-- // tokenizer provides the tokens for the parser.
-- tokenizer *Tokenizer
-- // tok is the most recently read token.
-- tok Token
-- // Self-closing tags like <hr/> are treated as start tags, except that
-- // hasSelfClosingToken is set while they are being processed.
-- hasSelfClosingToken bool
-- // doc is the document root element.
-- doc *Node
-- // The stack of open elements (section 12.2.3.2) and active formatting
-- // elements (section 12.2.3.3).
-- oe, afe nodeStack
-- // Element pointers (section 12.2.3.4).
-- head, form *Node
-- // Other parsing state flags (section 12.2.3.5).
-- scripting, framesetOK bool
-- // im is the current insertion mode.
-- im insertionMode
-- // originalIM is the insertion mode to go back to after completing a text
-- // or inTableText insertion mode.
-- originalIM insertionMode
-- // fosterParenting is whether new elements should be inserted according to
-- // the foster parenting rules (section 12.2.5.3).
-- fosterParenting bool
-- // quirks is whether the parser is operating in "quirks mode."
-- quirks bool
-- // fragment is whether the parser is parsing an HTML fragment.
-- fragment bool
-- // context is the context element when parsing an HTML fragment
-- // (section 12.4).
-- context *Node
--}
--
--func (p *parser) top() *Node {
-- if n := p.oe.top(); n != nil {
-- return n
-- }
-- return p.doc
--}
--
--// Stop tags for use in popUntil. These come from section 12.2.3.2.
--var (
-- defaultScopeStopTags = map[string][]a.Atom{
-- "": {a.Applet, a.Caption, a.Html, a.Table, a.Td, a.Th, a.Marquee, a.Object},
-- "math": {a.AnnotationXml, a.Mi, a.Mn, a.Mo, a.Ms, a.Mtext},
-- "svg": {a.Desc, a.ForeignObject, a.Title},
-- }
--)
--
--type scope int
--
--const (
-- defaultScope scope = iota
-- listItemScope
-- buttonScope
-- tableScope
-- tableRowScope
-- tableBodyScope
-- selectScope
--)
--
--// popUntil pops the stack of open elements at the highest element whose tag
--// is in matchTags, provided there is no higher element in the scope's stop
--// tags (as defined in section 12.2.3.2). It returns whether or not there was
--// such an element. If there was not, popUntil leaves the stack unchanged.
--//
--// For example, the set of stop tags for table scope is: "html", "table". If
--// the stack was:
--// ["html", "body", "font", "table", "b", "i", "u"]
--// then popUntil(tableScope, "font") would return false, but
--// popUntil(tableScope, "i") would return true and the stack would become:
--// ["html", "body", "font", "table", "b"]
--//
--// If an element's tag is in both the stop tags and matchTags, then the stack
--// will be popped and the function returns true (provided, of course, there was
--// no higher element in the stack that was also in the stop tags). For example,
--// popUntil(tableScope, "table") returns true and leaves:
--// ["html", "body", "font"]
--func (p *parser) popUntil(s scope, matchTags ...a.Atom) bool {
-- if i := p.indexOfElementInScope(s, matchTags...); i != -1 {
-- p.oe = p.oe[:i]
-- return true
-- }
-- return false
--}
--
--// indexOfElementInScope returns the index in p.oe of the highest element whose
--// tag is in matchTags that is in scope. If no matching element is in scope, it
--// returns -1.
--func (p *parser) indexOfElementInScope(s scope, matchTags ...a.Atom) int {
-- for i := len(p.oe) - 1; i >= 0; i-- {
-- tagAtom := p.oe[i].DataAtom
-- if p.oe[i].Namespace == "" {
-- for _, t := range matchTags {
-- if t == tagAtom {
-- return i
-- }
-- }
-- switch s {
-- case defaultScope:
-- // No-op.
-- case listItemScope:
-- if tagAtom == a.Ol || tagAtom == a.Ul {
-- return -1
-- }
-- case buttonScope:
-- if tagAtom == a.Button {
-- return -1
-- }
-- case tableScope:
-- if tagAtom == a.Html || tagAtom == a.Table {
-- return -1
-- }
-- case selectScope:
-- if tagAtom != a.Optgroup && tagAtom != a.Option {
-- return -1
-- }
-- default:
-- panic("unreachable")
-- }
-- }
-- switch s {
-- case defaultScope, listItemScope, buttonScope:
-- for _, t := range defaultScopeStopTags[p.oe[i].Namespace] {
-- if t == tagAtom {
-- return -1
-- }
-- }
-- }
-- }
-- return -1
--}
--
--// elementInScope is like popUntil, except that it doesn't modify the stack of
--// open elements.
--func (p *parser) elementInScope(s scope, matchTags ...a.Atom) bool {
-- return p.indexOfElementInScope(s, matchTags...) != -1
--}
--
--// clearStackToContext pops elements off the stack of open elements until a
--// scope-defined element is found.
--func (p *parser) clearStackToContext(s scope) {
-- for i := len(p.oe) - 1; i >= 0; i-- {
-- tagAtom := p.oe[i].DataAtom
-- switch s {
-- case tableScope:
-- if tagAtom == a.Html || tagAtom == a.Table {
-- p.oe = p.oe[:i+1]
-- return
-- }
-- case tableRowScope:
-- if tagAtom == a.Html || tagAtom == a.Tr {
-- p.oe = p.oe[:i+1]
-- return
-- }
-- case tableBodyScope:
-- if tagAtom == a.Html || tagAtom == a.Tbody || tagAtom == a.Tfoot || tagAtom == a.Thead {
-- p.oe = p.oe[:i+1]
-- return
-- }
-- default:
-- panic("unreachable")
-- }
-- }
--}
--
--// generateImpliedEndTags pops nodes off the stack of open elements as long as
--// the top node has a tag name of dd, dt, li, option, optgroup, p, rp, or rt.
--// If exceptions are specified, nodes with that name will not be popped off.
--func (p *parser) generateImpliedEndTags(exceptions ...string) {
-- var i int
--loop:
-- for i = len(p.oe) - 1; i >= 0; i-- {
-- n := p.oe[i]
-- if n.Type == ElementNode {
-- switch n.DataAtom {
-- case a.Dd, a.Dt, a.Li, a.Option, a.Optgroup, a.P, a.Rp, a.Rt:
-- for _, except := range exceptions {
-- if n.Data == except {
-- break loop
-- }
-- }
-- continue
-- }
-- }
-- break
-- }
--
-- p.oe = p.oe[:i+1]
--}
--
--// addChild adds a child node n to the top element, and pushes n onto the stack
--// of open elements if it is an element node.
--func (p *parser) addChild(n *Node) {
-- if p.shouldFosterParent() {
-- p.fosterParent(n)
-- } else {
-- p.top().AppendChild(n)
-- }
--
-- if n.Type == ElementNode {
-- p.oe = append(p.oe, n)
-- }
--}
--
--// shouldFosterParent returns whether the next node to be added should be
--// foster parented.
--func (p *parser) shouldFosterParent() bool {
-- if p.fosterParenting {
-- switch p.top().DataAtom {
-- case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr:
-- return true
-- }
-- }
-- return false
--}
--
--// fosterParent adds a child node according to the foster parenting rules.
--// Section 12.2.5.3, "foster parenting".
--func (p *parser) fosterParent(n *Node) {
-- var table, parent, prev *Node
-- var i int
-- for i = len(p.oe) - 1; i >= 0; i-- {
-- if p.oe[i].DataAtom == a.Table {
-- table = p.oe[i]
-- break
-- }
-- }
--
-- if table == nil {
-- // The foster parent is the html element.
-- parent = p.oe[0]
-- } else {
-- parent = table.Parent
-- }
-- if parent == nil {
-- parent = p.oe[i-1]
-- }
--
-- if table != nil {
-- prev = table.PrevSibling
-- } else {
-- prev = parent.LastChild
-- }
-- if prev != nil && prev.Type == TextNode && n.Type == TextNode {
-- prev.Data += n.Data
-- return
-- }
--
-- parent.InsertBefore(n, table)
--}
--
--// addText adds text to the preceding node if it is a text node, or else it
--// calls addChild with a new text node.
--func (p *parser) addText(text string) {
-- if text == "" {
-- return
-- }
--
-- if p.shouldFosterParent() {
-- p.fosterParent(&Node{
-- Type: TextNode,
-- Data: text,
-- })
-- return
-- }
--
-- t := p.top()
-- if n := t.LastChild; n != nil && n.Type == TextNode {
-- n.Data += text
-- return
-- }
-- p.addChild(&Node{
-- Type: TextNode,
-- Data: text,
-- })
--}
--
--// addElement adds a child element based on the current token.
--func (p *parser) addElement() {
-- p.addChild(&Node{
-- Type: ElementNode,
-- DataAtom: p.tok.DataAtom,
-- Data: p.tok.Data,
-- Attr: p.tok.Attr,
-- })
--}
--
--// Section 12.2.3.3.
--func (p *parser) addFormattingElement() {
-- tagAtom, attr := p.tok.DataAtom, p.tok.Attr
-- p.addElement()
--
-- // Implement the Noah's Ark clause, but with three per family instead of two.
-- identicalElements := 0
--findIdenticalElements:
-- for i := len(p.afe) - 1; i >= 0; i-- {
-- n := p.afe[i]
-- if n.Type == scopeMarkerNode {
-- break
-- }
-- if n.Type != ElementNode {
-- continue
-- }
-- if n.Namespace != "" {
-- continue
-- }
-- if n.DataAtom != tagAtom {
-- continue
-- }
-- if len(n.Attr) != len(attr) {
-- continue
-- }
-- compareAttributes:
-- for _, t0 := range n.Attr {
-- for _, t1 := range attr {
-- if t0.Key == t1.Key && t0.Namespace == t1.Namespace && t0.Val == t1.Val {
-- // Found a match for this attribute, continue with the next attribute.
-- continue compareAttributes
-- }
-- }
-- // If we get here, there is no attribute that matches a.
-- // Therefore the element is not identical to the new one.
-- continue findIdenticalElements
-- }
--
-- identicalElements++
-- if identicalElements >= 3 {
-- p.afe.remove(n)
-- }
-- }
--
-- p.afe = append(p.afe, p.top())
--}
--
--// Section 12.2.3.3.
--func (p *parser) clearActiveFormattingElements() {
-- for {
-- n := p.afe.pop()
-- if len(p.afe) == 0 || n.Type == scopeMarkerNode {
-- return
-- }
-- }
--}
--
--// Section 12.2.3.3.
--func (p *parser) reconstructActiveFormattingElements() {
-- n := p.afe.top()
-- if n == nil {
-- return
-- }
-- if n.Type == scopeMarkerNode || p.oe.index(n) != -1 {
-- return
-- }
-- i := len(p.afe) - 1
-- for n.Type != scopeMarkerNode && p.oe.index(n) == -1 {
-- if i == 0 {
-- i = -1
-- break
-- }
-- i--
-- n = p.afe[i]
-- }
-- for {
-- i++
-- clone := p.afe[i].clone()
-- p.addChild(clone)
-- p.afe[i] = clone
-- if i == len(p.afe)-1 {
-- break
-- }
-- }
--}
--
--// Section 12.2.4.
--func (p *parser) acknowledgeSelfClosingTag() {
-- p.hasSelfClosingToken = false
--}
--
--// An insertion mode (section 12.2.3.1) is the state transition function from
--// a particular state in the HTML5 parser's state machine. It updates the
--// parser's fields depending on parser.tok (where ErrorToken means EOF).
--// It returns whether the token was consumed.
--type insertionMode func(*parser) bool
--
--// setOriginalIM sets the insertion mode to return to after completing a text or
--// inTableText insertion mode.
--// Section 12.2.3.1, "using the rules for".
--func (p *parser) setOriginalIM() {
-- if p.originalIM != nil {
-- panic("html: bad parser state: originalIM was set twice")
-- }
-- p.originalIM = p.im
--}
--
--// Section 12.2.3.1, "reset the insertion mode".
--func (p *parser) resetInsertionMode() {
-- for i := len(p.oe) - 1; i >= 0; i-- {
-- n := p.oe[i]
-- if i == 0 && p.context != nil {
-- n = p.context
-- }
--
-- switch n.DataAtom {
-- case a.Select:
-- p.im = inSelectIM
-- case a.Td, a.Th:
-- p.im = inCellIM
-- case a.Tr:
-- p.im = inRowIM
-- case a.Tbody, a.Thead, a.Tfoot:
-- p.im = inTableBodyIM
-- case a.Caption:
-- p.im = inCaptionIM
-- case a.Colgroup:
-- p.im = inColumnGroupIM
-- case a.Table:
-- p.im = inTableIM
-- case a.Head:
-- p.im = inBodyIM
-- case a.Body:
-- p.im = inBodyIM
-- case a.Frameset:
-- p.im = inFramesetIM
-- case a.Html:
-- p.im = beforeHeadIM
-- default:
-- continue
-- }
-- return
-- }
-- p.im = inBodyIM
--}
--
--const whitespace = " \t\r\n\f"
--
--// Section 12.2.5.4.1.
--func initialIM(p *parser) bool {
-- switch p.tok.Type {
-- case TextToken:
-- p.tok.Data = strings.TrimLeft(p.tok.Data, whitespace)
-- if len(p.tok.Data) == 0 {
-- // It was all whitespace, so ignore it.
-- return true
-- }
-- case CommentToken:
-- p.doc.AppendChild(&Node{
-- Type: CommentNode,
-- Data: p.tok.Data,
-- })
-- return true
-- case DoctypeToken:
-- n, quirks := parseDoctype(p.tok.Data)
-- p.doc.AppendChild(n)
-- p.quirks = quirks
-- p.im = beforeHTMLIM
-- return true
-- }
-- p.quirks = true
-- p.im = beforeHTMLIM
-- return false
--}
--
--// Section 12.2.5.4.2.
--func beforeHTMLIM(p *parser) bool {
-- switch p.tok.Type {
-- case DoctypeToken:
-- // Ignore the token.
-- return true
-- case TextToken:
-- p.tok.Data = strings.TrimLeft(p.tok.Data, whitespace)
-- if len(p.tok.Data) == 0 {
-- // It was all whitespace, so ignore it.
-- return true
-- }
-- case StartTagToken:
-- if p.tok.DataAtom == a.Html {
-- p.addElement()
-- p.im = beforeHeadIM
-- return true
-- }
-- case EndTagToken:
-- switch p.tok.DataAtom {
-- case a.Head, a.Body, a.Html, a.Br:
-- p.parseImpliedToken(StartTagToken, a.Html, a.Html.String())
-- return false
-- default:
-- // Ignore the token.
-- return true
-- }
-- case CommentToken:
-- p.doc.AppendChild(&Node{
-- Type: CommentNode,
-- Data: p.tok.Data,
-- })
-- return true
-- }
-- p.parseImpliedToken(StartTagToken, a.Html, a.Html.String())
-- return false
--}
--
--// Section 12.2.5.4.3.
--func beforeHeadIM(p *parser) bool {
-- switch p.tok.Type {
-- case TextToken:
-- p.tok.Data = strings.TrimLeft(p.tok.Data, whitespace)
-- if len(p.tok.Data) == 0 {
-- // It was all whitespace, so ignore it.
-- return true
-- }
-- case StartTagToken:
-- switch p.tok.DataAtom {
-- case a.Head:
-- p.addElement()
-- p.head = p.top()
-- p.im = inHeadIM
-- return true
-- case a.Html:
-- return inBodyIM(p)
-- }
-- case EndTagToken:
-- switch p.tok.DataAtom {
-- case a.Head, a.Body, a.Html, a.Br:
-- p.parseImpliedToken(StartTagToken, a.Head, a.Head.String())
-- return false
-- default:
-- // Ignore the token.
-- return true
-- }
-- case CommentToken:
-- p.addChild(&Node{
-- Type: CommentNode,
-- Data: p.tok.Data,
-- })
-- return true
-- case DoctypeToken:
-- // Ignore the token.
-- return true
-- }
--
-- p.parseImpliedToken(StartTagToken, a.Head, a.Head.String())
-- return false
--}
--
--// Section 12.2.5.4.4.
--func inHeadIM(p *parser) bool {
-- switch p.tok.Type {
-- case TextToken:
-- s := strings.TrimLeft(p.tok.Data, whitespace)
-- if len(s) < len(p.tok.Data) {
-- // Add the initial whitespace to the current node.
-- p.addText(p.tok.Data[:len(p.tok.Data)-len(s)])
-- if s == "" {
-- return true
-- }
-- p.tok.Data = s
-- }
-- case StartTagToken:
-- switch p.tok.DataAtom {
-- case a.Html:
-- return inBodyIM(p)
-- case a.Base, a.Basefont, a.Bgsound, a.Command, a.Link, a.Meta:
-- p.addElement()
-- p.oe.pop()
-- p.acknowledgeSelfClosingTag()
-- return true
-- case a.Script, a.Title, a.Noscript, a.Noframes, a.Style:
-- p.addElement()
-- p.setOriginalIM()
-- p.im = textIM
-- return true
-- case a.Head:
-- // Ignore the token.
-- return true
-- }
-- case EndTagToken:
-- switch p.tok.DataAtom {
-- case a.Head:
-- n := p.oe.pop()
-- if n.DataAtom != a.Head {
-- panic("html: bad parser state: <head> element not found, in the in-head insertion mode")
-- }
-- p.im = afterHeadIM
-- return true
-- case a.Body, a.Html, a.Br:
-- p.parseImpliedToken(EndTagToken, a.Head, a.Head.String())
-- return false
-- default:
-- // Ignore the token.
-- return true
-- }
-- case CommentToken:
-- p.addChild(&Node{
-- Type: CommentNode,
-- Data: p.tok.Data,
-- })
-- return true
-- case DoctypeToken:
-- // Ignore the token.
-- return true
-- }
--
-- p.parseImpliedToken(EndTagToken, a.Head, a.Head.String())
-- return false
--}
--
--// Section 12.2.5.4.6.
--func afterHeadIM(p *parser) bool {
-- switch p.tok.Type {
-- case TextToken:
-- s := strings.TrimLeft(p.tok.Data, whitespace)
-- if len(s) < len(p.tok.Data) {
-- // Add the initial whitespace to the current node.
-- p.addText(p.tok.Data[:len(p.tok.Data)-len(s)])
-- if s == "" {
-- return true
-- }
-- p.tok.Data = s
-- }
-- case StartTagToken:
-- switch p.tok.DataAtom {
-- case a.Html:
-- return inBodyIM(p)
-- case a.Body:
-- p.addElement()
-- p.framesetOK = false
-- p.im = inBodyIM
-- return true
-- case a.Frameset:
-- p.addElement()
-- p.im = inFramesetIM
-- return true
-- case a.Base, a.Basefont, a.Bgsound, a.Link, a.Meta, a.Noframes, a.Script, a.Style, a.Title:
-- p.oe = append(p.oe, p.head)
-- defer p.oe.remove(p.head)
-- return inHeadIM(p)
-- case a.Head:
-- // Ignore the token.
-- return true
-- }
-- case EndTagToken:
-- switch p.tok.DataAtom {
-- case a.Body, a.Html, a.Br:
-- // Drop down to creating an implied <body> tag.
-- default:
-- // Ignore the token.
-- return true
-- }
-- case CommentToken:
-- p.addChild(&Node{
-- Type: CommentNode,
-- Data: p.tok.Data,
-- })
-- return true
-- case DoctypeToken:
-- // Ignore the token.
-- return true
-- }
--
-- p.parseImpliedToken(StartTagToken, a.Body, a.Body.String())
-- p.framesetOK = true
-- return false
--}
--
--// copyAttributes copies attributes of src not found on dst to dst.
--func copyAttributes(dst *Node, src Token) {
-- if len(src.Attr) == 0 {
-- return
-- }
-- attr := map[string]string{}
-- for _, t := range dst.Attr {
-- attr[t.Key] = t.Val
-- }
-- for _, t := range src.Attr {
-- if _, ok := attr[t.Key]; !ok {
-- dst.Attr = append(dst.Attr, t)
-- attr[t.Key] = t.Val
-- }
-- }
--}
--
--// Section 12.2.5.4.7.
--func inBodyIM(p *parser) bool {
-- switch p.tok.Type {
-- case TextToken:
-- d := p.tok.Data
-- switch n := p.oe.top(); n.DataAtom {
-- case a.Pre, a.Listing:
-- if n.FirstChild == nil {
-- // Ignore a newline at the start of a <pre> block.
-- if d != "" && d[0] == '\r' {
-- d = d[1:]
-- }
-- if d != "" && d[0] == '\n' {
-- d = d[1:]
-- }
-- }
-- }
-- d = strings.Replace(d, "\x00", "", -1)
-- if d == "" {
-- return true
-- }
-- p.reconstructActiveFormattingElements()
-- p.addText(d)
-- if p.framesetOK && strings.TrimLeft(d, whitespace) != "" {
-- // There were non-whitespace characters inserted.
-- p.framesetOK = false
-- }
-- case StartTagToken:
-- switch p.tok.DataAtom {
-- case a.Html:
-- copyAttributes(p.oe[0], p.tok)
-- case a.Base, a.Basefont, a.Bgsound, a.Command, a.Link, a.Meta, a.Noframes, a.Script, a.Style, a.Title:
-- return inHeadIM(p)
-- case a.Body:
-- if len(p.oe) >= 2 {
-- body := p.oe[1]
-- if body.Type == ElementNode && body.DataAtom == a.Body {
-- p.framesetOK = false
-- copyAttributes(body, p.tok)
-- }
-- }
-- case a.Frameset:
-- if !p.framesetOK || len(p.oe) < 2 || p.oe[1].DataAtom != a.Body {
-- // Ignore the token.
-- return true
-- }
-- body := p.oe[1]
-- if body.Parent != nil {
-- body.Parent.RemoveChild(body)
-- }
-- p.oe = p.oe[:1]
-- p.addElement()
-- p.im = inFramesetIM
-- return true
-- case a.Address, a.Article, a.Aside, a.Blockquote, a.Center, a.Details, a.Dir, a.Div, a.Dl, a.Fieldset, a.Figcaption, a.Figure, a.Footer, a.Header, a.Hgroup, a.Menu, a.Nav, a.Ol, a.P, a.Section, a.Summary, a.Ul:
-- p.popUntil(buttonScope, a.P)
-- p.addElement()
-- case a.H1, a.H2, a.H3, a.H4, a.H5, a.H6:
-- p.popUntil(buttonScope, a.P)
-- switch n := p.top(); n.DataAtom {
-- case a.H1, a.H2, a.H3, a.H4, a.H5, a.H6:
-- p.oe.pop()
-- }
-- p.addElement()
-- case a.Pre, a.Listing:
-- p.popUntil(buttonScope, a.P)
-- p.addElement()
-- // The newline, if any, will be dealt with by the TextToken case.
-- p.framesetOK = false
-- case a.Form:
-- if p.form == nil {
-- p.popUntil(buttonScope, a.P)
-- p.addElement()
-- p.form = p.top()
-- }
-- case a.Li:
-- p.framesetOK = false
-- for i := len(p.oe) - 1; i >= 0; i-- {
-- node := p.oe[i]
-- switch node.DataAtom {
-- case a.Li:
-- p.oe = p.oe[:i]
-- case a.Address, a.Div, a.P:
-- continue
-- default:
-- if !isSpecialElement(node) {
-- continue
-- }
-- }
-- break
-- }
-- p.popUntil(buttonScope, a.P)
-- p.addElement()
-- case a.Dd, a.Dt:
-- p.framesetOK = false
-- for i := len(p.oe) - 1; i >= 0; i-- {
-- node := p.oe[i]
-- switch node.DataAtom {
-- case a.Dd, a.Dt:
-- p.oe = p.oe[:i]
-- case a.Address, a.Div, a.P:
-- continue
-- default:
-- if !isSpecialElement(node) {
-- continue
-- }
-- }
-- break
-- }
-- p.popUntil(buttonScope, a.P)
-- p.addElement()
-- case a.Plaintext:
-- p.popUntil(buttonScope, a.P)
-- p.addElement()
-- case a.Button:
-- p.popUntil(defaultScope, a.Button)
-- p.reconstructActiveFormattingElements()
-- p.addElement()
-- p.framesetOK = false
-- case a.A:
-- for i := len(p.afe) - 1; i >= 0 && p.afe[i].Type != scopeMarkerNode; i-- {
-- if n := p.afe[i]; n.Type == ElementNode && n.DataAtom == a.A {
-- p.inBodyEndTagFormatting(a.A)
-- p.oe.remove(n)
-- p.afe.remove(n)
-- break
-- }
-- }
-- p.reconstructActiveFormattingElements()
-- p.addFormattingElement()
-- case a.B, a.Big, a.Code, a.Em, a.Font, a.I, a.S, a.Small, a.Strike, a.Strong, a.Tt, a.U:
-- p.reconstructActiveFormattingElements()
-- p.addFormattingElement()
-- case a.Nobr:
-- p.reconstructActiveFormattingElements()
-- if p.elementInScope(defaultScope, a.Nobr) {
-- p.inBodyEndTagFormatting(a.Nobr)
-- p.reconstructActiveFormattingElements()
-- }
-- p.addFormattingElement()
-- case a.Applet, a.Marquee, a.Object:
-- p.reconstructActiveFormattingElements()
-- p.addElement()
-- p.afe = append(p.afe, &scopeMarker)
-- p.framesetOK = false
-- case a.Table:
-- if !p.quirks {
-- p.popUntil(buttonScope, a.P)
-- }
-- p.addElement()
-- p.framesetOK = false
-- p.im = inTableIM
-- return true
-- case a.Area, a.Br, a.Embed, a.Img, a.Input, a.Keygen, a.Wbr:
-- p.reconstructActiveFormattingElements()
-- p.addElement()
-- p.oe.pop()
-- p.acknowledgeSelfClosingTag()
-- if p.tok.DataAtom == a.Input {
-- for _, t := range p.tok.Attr {
-- if t.Key == "type" {
-- if strings.ToLower(t.Val) == "hidden" {
-- // Skip setting framesetOK = false
-- return true
-- }
-- }
-- }
-- }
-- p.framesetOK = false
-- case a.Param, a.Source, a.Track:
-- p.addElement()
-- p.oe.pop()
-- p.acknowledgeSelfClosingTag()
-- case a.Hr:
-- p.popUntil(buttonScope, a.P)
-- p.addElement()
-- p.oe.pop()
-- p.acknowledgeSelfClosingTag()
-- p.framesetOK = false
-- case a.Image:
-- p.tok.DataAtom = a.Img
-- p.tok.Data = a.Img.String()
-- return false
-- case a.Isindex:
-- if p.form != nil {
-- // Ignore the token.
-- return true
-- }
-- action := ""
-- prompt := "This is a searchable index. Enter search keywords: "
-- attr := []Attribute{{Key: "name", Val: "isindex"}}
-- for _, t := range p.tok.Attr {
-- switch t.Key {
-- case "action":
-- action = t.Val
-- case "name":
-- // Ignore the attribute.
-- case "prompt":
-- prompt = t.Val
-- default:
-- attr = append(attr, t)
-- }
-- }
-- p.acknowledgeSelfClosingTag()
-- p.popUntil(buttonScope, a.P)
-- p.parseImpliedToken(StartTagToken, a.Form, a.Form.String())
-- if action != "" {
-- p.form.Attr = []Attribute{{Key: "action", Val: action}}
-- }
-- p.parseImpliedToken(StartTagToken, a.Hr, a.Hr.String())
-- p.parseImpliedToken(StartTagToken, a.Label, a.Label.String())
-- p.addText(prompt)
-- p.addChild(&Node{
-- Type: ElementNode,
-- DataAtom: a.Input,
-- Data: a.Input.String(),
-- Attr: attr,
-- })
-- p.oe.pop()
-- p.parseImpliedToken(EndTagToken, a.Label, a.Label.String())
-- p.parseImpliedToken(StartTagToken, a.Hr, a.Hr.String())
-- p.parseImpliedToken(EndTagToken, a.Form, a.Form.String())
-- case a.Textarea:
-- p.addElement()
-- p.setOriginalIM()
-- p.framesetOK = false
-- p.im = textIM
-- case a.Xmp:
-- p.popUntil(buttonScope, a.P)
-- p.reconstructActiveFormattingElements()
-- p.framesetOK = false
-- p.addElement()
-- p.setOriginalIM()
-- p.im = textIM
-- case a.Iframe:
-- p.framesetOK = false
-- p.addElement()
-- p.setOriginalIM()
-- p.im = textIM
-- case a.Noembed, a.Noscript:
-- p.addElement()
-- p.setOriginalIM()
-- p.im = textIM
-- case a.Select:
-- p.reconstructActiveFormattingElements()
-- p.addElement()
-- p.framesetOK = false
-- p.im = inSelectIM
-- return true
-- case a.Optgroup, a.Option:
-- if p.top().DataAtom == a.Option {
-- p.oe.pop()
-- }
-- p.reconstructActiveFormattingElements()
-- p.addElement()
-- case a.Rp, a.Rt:
-- if p.elementInScope(defaultScope, a.Ruby) {
-- p.generateImpliedEndTags()
-- }
-- p.addElement()
-- case a.Math, a.Svg:
-- p.reconstructActiveFormattingElements()
-- if p.tok.DataAtom == a.Math {
-- adjustAttributeNames(p.tok.Attr, mathMLAttributeAdjustments)
-- } else {
-- adjustAttributeNames(p.tok.Attr, svgAttributeAdjustments)
-- }
-- adjustForeignAttributes(p.tok.Attr)
-- p.addElement()
-- p.top().Namespace = p.tok.Data
-- if p.hasSelfClosingToken {
-- p.oe.pop()
-- p.acknowledgeSelfClosingTag()
-- }
-- return true
-- case a.Caption, a.Col, a.Colgroup, a.Frame, a.Head, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr:
-- // Ignore the token.
-- default:
-- p.reconstructActiveFormattingElements()
-- p.addElement()
-- }
-- case EndTagToken:
-- switch p.tok.DataAtom {
-- case a.Body:
-- if p.elementInScope(defaultScope, a.Body) {
-- p.im = afterBodyIM
-- }
-- case a.Html:
-- if p.elementInScope(defaultScope, a.Body) {
-- p.parseImpliedToken(EndTagToken, a.Body, a.Body.String())
-- return false
-- }
-- return true
-- case a.Address, a.Article, a.Aside, a.Blockquote, a.Button, a.Center, a.Details, a.Dir, a.Div, a.Dl, a.Fieldset, a.Figcaption, a.Figure, a.Footer, a.Header, a.Hgroup, a.Listing, a.Menu, a.Nav, a.Ol, a.Pre, a.Section, a.Summary, a.Ul:
-- p.popUntil(defaultScope, p.tok.DataAtom)
-- case a.Form:
-- node := p.form
-- p.form = nil
-- i := p.indexOfElementInScope(defaultScope, a.Form)
-- if node == nil || i == -1 || p.oe[i] != node {
-- // Ignore the token.
-- return true
-- }
-- p.generateImpliedEndTags()
-- p.oe.remove(node)
-- case a.P:
-- if !p.elementInScope(buttonScope, a.P) {
-- p.parseImpliedToken(StartTagToken, a.P, a.P.String())
-- }
-- p.popUntil(buttonScope, a.P)
-- case a.Li:
-- p.popUntil(listItemScope, a.Li)
-- case a.Dd, a.Dt:
-- p.popUntil(defaultScope, p.tok.DataAtom)
-- case a.H1, a.H2, a.H3, a.H4, a.H5, a.H6:
-- p.popUntil(defaultScope, a.H1, a.H2, a.H3, a.H4, a.H5, a.H6)
-- case a.A, a.B, a.Big, a.Code, a.Em, a.Font, a.I, a.Nobr, a.S, a.Small, a.Strike, a.Strong, a.Tt, a.U:
-- p.inBodyEndTagFormatting(p.tok.DataAtom)
-- case a.Applet, a.Marquee, a.Object:
-- if p.popUntil(defaultScope, p.tok.DataAtom) {
-- p.clearActiveFormattingElements()
-- }
-- case a.Br:
-- p.tok.Type = StartTagToken
-- return false
-- default:
-- p.inBodyEndTagOther(p.tok.DataAtom)
-- }
-- case CommentToken:
-- p.addChild(&Node{
-- Type: CommentNode,
-- Data: p.tok.Data,
-- })
-- }
--
-- return true
--}
--
--func (p *parser) inBodyEndTagFormatting(tagAtom a.Atom) {
-- // This is the "adoption agency" algorithm, described at
-- // http://www.whatwg.org/specs/web-apps/current-work/multipage/tokenization.html#adoptionAgency
--
-- // TODO: this is a fairly literal line-by-line translation of that algorithm.
-- // Once the code successfully parses the comprehensive test suite, we should
-- // refactor this code to be more idiomatic.
--
-- // Steps 1-3. The outer loop.
-- for i := 0; i < 8; i++ {
-- // Step 4. Find the formatting element.
-- var formattingElement *Node
-- for j := len(p.afe) - 1; j >= 0; j-- {
-- if p.afe[j].Type == scopeMarkerNode {
-- break
-- }
-- if p.afe[j].DataAtom == tagAtom {
-- formattingElement = p.afe[j]
-- break
-- }
-- }
-- if formattingElement == nil {
-- p.inBodyEndTagOther(tagAtom)
-- return
-- }
-- feIndex := p.oe.index(formattingElement)
-- if feIndex == -1 {
-- p.afe.remove(formattingElement)
-- return
-- }
-- if !p.elementInScope(defaultScope, tagAtom) {
-- // Ignore the tag.
-- return
-- }
--
-- // Steps 5-6. Find the furthest block.
-- var furthestBlock *Node
-- for _, e := range p.oe[feIndex:] {
-- if isSpecialElement(e) {
-- furthestBlock = e
-- break
-- }
-- }
-- if furthestBlock == nil {
-- e := p.oe.pop()
-- for e != formattingElement {
-- e = p.oe.pop()
-- }
-- p.afe.remove(e)
-- return
-- }
--
-- // Steps 7-8. Find the common ancestor and bookmark node.
-- commonAncestor := p.oe[feIndex-1]
-- bookmark := p.afe.index(formattingElement)
--
-- // Step 9. The inner loop. Find the lastNode to reparent.
-- lastNode := furthestBlock
-- node := furthestBlock
-- x := p.oe.index(node)
-- // Steps 9.1-9.3.
-- for j := 0; j < 3; j++ {
-- // Step 9.4.
-- x--
-- node = p.oe[x]
-- // Step 9.5.
-- if p.afe.index(node) == -1 {
-- p.oe.remove(node)
-- continue
-- }
-- // Step 9.6.
-- if node == formattingElement {
-- break
-- }
-- // Step 9.7.
-- clone := node.clone()
-- p.afe[p.afe.index(node)] = clone
-- p.oe[p.oe.index(node)] = clone
-- node = clone
-- // Step 9.8.
-- if lastNode == furthestBlock {
-- bookmark = p.afe.index(node) + 1
-- }
-- // Step 9.9.
-- if lastNode.Parent != nil {
-- lastNode.Parent.RemoveChild(lastNode)
-- }
-- node.AppendChild(lastNode)
-- // Step 9.10.
-- lastNode = node
-- }
--
-- // Step 10. Reparent lastNode to the common ancestor,
-- // or for misnested table nodes, to the foster parent.
-- if lastNode.Parent != nil {
-- lastNode.Parent.RemoveChild(lastNode)
-- }
-- switch commonAncestor.DataAtom {
-- case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr:
-- p.fosterParent(lastNode)
-- default:
-- commonAncestor.AppendChild(lastNode)
-- }
--
-- // Steps 11-13. Reparent nodes from the furthest block's children
-- // to a clone of the formatting element.
-- clone := formattingElement.clone()
-- reparentChildren(clone, furthestBlock)
-- furthestBlock.AppendChild(clone)
--
-- // Step 14. Fix up the list of active formatting elements.
-- if oldLoc := p.afe.index(formattingElement); oldLoc != -1 && oldLoc < bookmark {
-- // Move the bookmark with the rest of the list.
-- bookmark--
-- }
-- p.afe.remove(formattingElement)
-- p.afe.insert(bookmark, clone)
--
-- // Step 15. Fix up the stack of open elements.
-- p.oe.remove(formattingElement)
-- p.oe.insert(p.oe.index(furthestBlock)+1, clone)
-- }
--}
--
--// inBodyEndTagOther performs the "any other end tag" algorithm for inBodyIM.
--func (p *parser) inBodyEndTagOther(tagAtom a.Atom) {
-- for i := len(p.oe) - 1; i >= 0; i-- {
-- if p.oe[i].DataAtom == tagAtom {
-- p.oe = p.oe[:i]
-- break
-- }
-- if isSpecialElement(p.oe[i]) {
-- break
-- }
-- }
--}
--
--// Section 12.2.5.4.8.
--func textIM(p *parser) bool {
-- switch p.tok.Type {
-- case ErrorToken:
-- p.oe.pop()
-- case TextToken:
-- d := p.tok.Data
-- if n := p.oe.top(); n.DataAtom == a.Textarea && n.FirstChild == nil {
-- // Ignore a newline at the start of a <textarea> block.
-- if d != "" && d[0] == '\r' {
-- d = d[1:]
-- }
-- if d != "" && d[0] == '\n' {
-- d = d[1:]
-- }
-- }
-- if d == "" {
-- return true
-- }
-- p.addText(d)
-- return true
-- case EndTagToken:
-- p.oe.pop()
-- }
-- p.im = p.originalIM
-- p.originalIM = nil
-- return p.tok.Type == EndTagToken
--}
--
--// Section 12.2.5.4.9.
--func inTableIM(p *parser) bool {
-- switch p.tok.Type {
-- case ErrorToken:
-- // Stop parsing.
-- return true
-- case TextToken:
-- p.tok.Data = strings.Replace(p.tok.Data, "\x00", "", -1)
-- switch p.oe.top().DataAtom {
-- case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr:
-- if strings.Trim(p.tok.Data, whitespace) == "" {
-- p.addText(p.tok.Data)
-- return true
-- }
-- }
-- case StartTagToken:
-- switch p.tok.DataAtom {
-- case a.Caption:
-- p.clearStackToContext(tableScope)
-- p.afe = append(p.afe, &scopeMarker)
-- p.addElement()
-- p.im = inCaptionIM
-- return true
-- case a.Colgroup:
-- p.clearStackToContext(tableScope)
-- p.addElement()
-- p.im = inColumnGroupIM
-- return true
-- case a.Col:
-- p.parseImpliedToken(StartTagToken, a.Colgroup, a.Colgroup.String())
-- return false
-- case a.Tbody, a.Tfoot, a.Thead:
-- p.clearStackToContext(tableScope)
-- p.addElement()
-- p.im = inTableBodyIM
-- return true
-- case a.Td, a.Th, a.Tr:
-- p.parseImpliedToken(StartTagToken, a.Tbody, a.Tbody.String())
-- return false
-- case a.Table:
-- if p.popUntil(tableScope, a.Table) {
-- p.resetInsertionMode()
-- return false
-- }
-- // Ignore the token.
-- return true
-- case a.Style, a.Script:
-- return inHeadIM(p)
-- case a.Input:
-- for _, t := range p.tok.Attr {
-- if t.Key == "type" && strings.ToLower(t.Val) == "hidden" {
-- p.addElement()
-- p.oe.pop()
-- return true
-- }
-- }
-- // Otherwise drop down to the default action.
-- case a.Form:
-- if p.form != nil {
-- // Ignore the token.
-- return true
-- }
-- p.addElement()
-- p.form = p.oe.pop()
-- case a.Select:
-- p.reconstructActiveFormattingElements()
-- switch p.top().DataAtom {
-- case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr:
-- p.fosterParenting = true
-- }
-- p.addElement()
-- p.fosterParenting = false
-- p.framesetOK = false
-- p.im = inSelectInTableIM
-- return true
-- }
-- case EndTagToken:
-- switch p.tok.DataAtom {
-- case a.Table:
-- if p.popUntil(tableScope, a.Table) {
-- p.resetInsertionMode()
-- return true
-- }
-- // Ignore the token.
-- return true
-- case a.Body, a.Caption, a.Col, a.Colgroup, a.Html, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr:
-- // Ignore the token.
-- return true
-- }
-- case CommentToken:
-- p.addChild(&Node{
-- Type: CommentNode,
-- Data: p.tok.Data,
-- })
-- return true
-- case DoctypeToken:
-- // Ignore the token.
-- return true
-- }
--
-- p.fosterParenting = true
-- defer func() { p.fosterParenting = false }()
--
-- return inBodyIM(p)
--}
--
--// Section 12.2.5.4.11.
--func inCaptionIM(p *parser) bool {
-- switch p.tok.Type {
-- case StartTagToken:
-- switch p.tok.DataAtom {
-- case a.Caption, a.Col, a.Colgroup, a.Tbody, a.Td, a.Tfoot, a.Thead, a.Tr:
-- if p.popUntil(tableScope, a.Caption) {
-- p.clearActiveFormattingElements()
-- p.im = inTableIM
-- return false
-- } else {
-- // Ignore the token.
-- return true
-- }
-- case a.Select:
-- p.reconstructActiveFormattingElements()
-- p.addElement()
-- p.framesetOK = false
-- p.im = inSelectInTableIM
-- return true
-- }
-- case EndTagToken:
-- switch p.tok.DataAtom {
-- case a.Caption:
-- if p.popUntil(tableScope, a.Caption) {
-- p.clearActiveFormattingElements()
-- p.im = inTableIM
-- }
-- return true
-- case a.Table:
-- if p.popUntil(tableScope, a.Caption) {
-- p.clearActiveFormattingElements()
-- p.im = inTableIM
-- return false
-- } else {
-- // Ignore the token.
-- return true
-- }
-- case a.Body, a.Col, a.Colgroup, a.Html, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr:
-- // Ignore the token.
-- return true
-- }
-- }
-- return inBodyIM(p)
--}
--
--// Section 12.2.5.4.12.
--func inColumnGroupIM(p *parser) bool {
-- switch p.tok.Type {
-- case TextToken:
-- s := strings.TrimLeft(p.tok.Data, whitespace)
-- if len(s) < len(p.tok.Data) {
-- // Add the initial whitespace to the current node.
-- p.addText(p.tok.Data[:len(p.tok.Data)-len(s)])
-- if s == "" {
-- return true
-- }
-- p.tok.Data = s
-- }
-- case CommentToken:
-- p.addChild(&Node{
-- Type: CommentNode,
-- Data: p.tok.Data,
-- })
-- return true
-- case DoctypeToken:
-- // Ignore the token.
-- return true
-- case StartTagToken:
-- switch p.tok.DataAtom {
-- case a.Html:
-- return inBodyIM(p)
-- case a.Col:
-- p.addElement()
-- p.oe.pop()
-- p.acknowledgeSelfClosingTag()
-- return true
-- }
-- case EndTagToken:
-- switch p.tok.DataAtom {
-- case a.Colgroup:
-- if p.oe.top().DataAtom != a.Html {
-- p.oe.pop()
-- p.im = inTableIM
-- }
-- return true
-- case a.Col:
-- // Ignore the token.
-- return true
-- }
-- }
-- if p.oe.top().DataAtom != a.Html {
-- p.oe.pop()
-- p.im = inTableIM
-- return false
-- }
-- return true
--}
--
--// Section 12.2.5.4.13.
--func inTableBodyIM(p *parser) bool {
-- switch p.tok.Type {
-- case StartTagToken:
-- switch p.tok.DataAtom {
-- case a.Tr:
-- p.clearStackToContext(tableBodyScope)
-- p.addElement()
-- p.im = inRowIM
-- return true
-- case a.Td, a.Th:
-- p.parseImpliedToken(StartTagToken, a.Tr, a.Tr.String())
-- return false
-- case a.Caption, a.Col, a.Colgroup, a.Tbody, a.Tfoot, a.Thead:
-- if p.popUntil(tableScope, a.Tbody, a.Thead, a.Tfoot) {
-- p.im = inTableIM
-- return false
-- }
-- // Ignore the token.
-- return true
-- }
-- case EndTagToken:
-- switch p.tok.DataAtom {
-- case a.Tbody, a.Tfoot, a.Thead:
-- if p.elementInScope(tableScope, p.tok.DataAtom) {
-- p.clearStackToContext(tableBodyScope)
-- p.oe.pop()
-- p.im = inTableIM
-- }
-- return true
-- case a.Table:
-- if p.popUntil(tableScope, a.Tbody, a.Thead, a.Tfoot) {
-- p.im = inTableIM
-- return false
-- }
-- // Ignore the token.
-- return true
-- case a.Body, a.Caption, a.Col, a.Colgroup, a.Html, a.Td, a.Th, a.Tr:
-- // Ignore the token.
-- return true
-- }
-- case CommentToken:
-- p.addChild(&Node{
-- Type: CommentNode,
-- Data: p.tok.Data,
-- })
-- return true
-- }
--
-- return inTableIM(p)
--}
--
--// Section 12.2.5.4.14.
--func inRowIM(p *parser) bool {
-- switch p.tok.Type {
-- case StartTagToken:
-- switch p.tok.DataAtom {
-- case a.Td, a.Th:
-- p.clearStackToContext(tableRowScope)
-- p.addElement()
-- p.afe = append(p.afe, &scopeMarker)
-- p.im = inCellIM
-- return true
-- case a.Caption, a.Col, a.Colgroup, a.Tbody, a.Tfoot, a.Thead, a.Tr:
-- if p.popUntil(tableScope, a.Tr) {
-- p.im = inTableBodyIM
-- return false
-- }
-- // Ignore the token.
-- return true
-- }
-- case EndTagToken:
-- switch p.tok.DataAtom {
-- case a.Tr:
-- if p.popUntil(tableScope, a.Tr) {
-- p.im = inTableBodyIM
-- return true
-- }
-- // Ignore the token.
-- return true
-- case a.Table:
-- if p.popUntil(tableScope, a.Tr) {
-- p.im = inTableBodyIM
-- return false
-- }
-- // Ignore the token.
-- return true
-- case a.Tbody, a.Tfoot, a.Thead:
-- if p.elementInScope(tableScope, p.tok.DataAtom) {
-- p.parseImpliedToken(EndTagToken, a.Tr, a.Tr.String())
-- return false
-- }
-- // Ignore the token.
-- return true
-- case a.Body, a.Caption, a.Col, a.Colgroup, a.Html, a.Td, a.Th:
-- // Ignore the token.
-- return true
-- }
-- }
--
-- return inTableIM(p)
--}
--
--// Section 12.2.5.4.15.
--func inCellIM(p *parser) bool {
-- switch p.tok.Type {
-- case StartTagToken:
-- switch p.tok.DataAtom {
-- case a.Caption, a.Col, a.Colgroup, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr:
-- if p.popUntil(tableScope, a.Td, a.Th) {
-- // Close the cell and reprocess.
-- p.clearActiveFormattingElements()
-- p.im = inRowIM
-- return false
-- }
-- // Ignore the token.
-- return true
-- case a.Select:
-- p.reconstructActiveFormattingElements()
-- p.addElement()
-- p.framesetOK = false
-- p.im = inSelectInTableIM
-- return true
-- }
-- case EndTagToken:
-- switch p.tok.DataAtom {
-- case a.Td, a.Th:
-- if !p.popUntil(tableScope, p.tok.DataAtom) {
-- // Ignore the token.
-- return true
-- }
-- p.clearActiveFormattingElements()
-- p.im = inRowIM
-- return true
-- case a.Body, a.Caption, a.Col, a.Colgroup, a.Html:
-- // Ignore the token.
-- return true
-- case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr:
-- if !p.elementInScope(tableScope, p.tok.DataAtom) {
-- // Ignore the token.
-- return true
-- }
-- // Close the cell and reprocess.
-- p.popUntil(tableScope, a.Td, a.Th)
-- p.clearActiveFormattingElements()
-- p.im = inRowIM
-- return false
-- }
-- }
-- return inBodyIM(p)
--}
--
--// Section 12.2.5.4.16.
--func inSelectIM(p *parser) bool {
-- switch p.tok.Type {
-- case ErrorToken:
-- // Stop parsing.
-- return true
-- case TextToken:
-- p.addText(strings.Replace(p.tok.Data, "\x00", "", -1))
-- case StartTagToken:
-- switch p.tok.DataAtom {
-- case a.Html:
-- return inBodyIM(p)
-- case a.Option:
-- if p.top().DataAtom == a.Option {
-- p.oe.pop()
-- }
-- p.addElement()
-- case a.Optgroup:
-- if p.top().DataAtom == a.Option {
-- p.oe.pop()
-- }
-- if p.top().DataAtom == a.Optgroup {
-- p.oe.pop()
-- }
-- p.addElement()
-- case a.Select:
-- p.tok.Type = EndTagToken
-- return false
-- case a.Input, a.Keygen, a.Textarea:
-- if p.elementInScope(selectScope, a.Select) {
-- p.parseImpliedToken(EndTagToken, a.Select, a.Select.String())
-- return false
-- }
-- // In order to properly ignore <textarea>, we need to change the tokenizer mode.
-- p.tokenizer.NextIsNotRawText()
-- // Ignore the token.
-- return true
-- case a.Script:
-- return inHeadIM(p)
-- }
-- case EndTagToken:
-- switch p.tok.DataAtom {
-- case a.Option:
-- if p.top().DataAtom == a.Option {
-- p.oe.pop()
-- }
-- case a.Optgroup:
-- i := len(p.oe) - 1
-- if p.oe[i].DataAtom == a.Option {
-- i--
-- }
-- if p.oe[i].DataAtom == a.Optgroup {
-- p.oe = p.oe[:i]
-- }
-- case a.Select:
-- if p.popUntil(selectScope, a.Select) {
-- p.resetInsertionMode()
-- }
-- }
-- case CommentToken:
-- p.addChild(&Node{
-- Type: CommentNode,
-- Data: p.tok.Data,
-- })
-- case DoctypeToken:
-- // Ignore the token.
-- return true
-- }
--
-- return true
--}
--
--// Section 12.2.5.4.17.
--func inSelectInTableIM(p *parser) bool {
-- switch p.tok.Type {
-- case StartTagToken, EndTagToken:
-- switch p.tok.DataAtom {
-- case a.Caption, a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr, a.Td, a.Th:
-- if p.tok.Type == StartTagToken || p.elementInScope(tableScope, p.tok.DataAtom) {
-- p.parseImpliedToken(EndTagToken, a.Select, a.Select.String())
-- return false
-- } else {
-- // Ignore the token.
-- return true
-- }
-- }
-- }
-- return inSelectIM(p)
--}
--
--// Section 12.2.5.4.18.
--func afterBodyIM(p *parser) bool {
-- switch p.tok.Type {
-- case ErrorToken:
-- // Stop parsing.
-- return true
-- case TextToken:
-- s := strings.TrimLeft(p.tok.Data, whitespace)
-- if len(s) == 0 {
-- // It was all whitespace.
-- return inBodyIM(p)
-- }
-- case StartTagToken:
-- if p.tok.DataAtom == a.Html {
-- return inBodyIM(p)
-- }
-- case EndTagToken:
-- if p.tok.DataAtom == a.Html {
-- if !p.fragment {
-- p.im = afterAfterBodyIM
-- }
-- return true
-- }
-- case CommentToken:
-- // The comment is attached to the <html> element.
-- if len(p.oe) < 1 || p.oe[0].DataAtom != a.Html {
-- panic("html: bad parser state: <html> element not found, in the after-body insertion mode")
-- }
-- p.oe[0].AppendChild(&Node{
-- Type: CommentNode,
-- Data: p.tok.Data,
-- })
-- return true
-- }
-- p.im = inBodyIM
-- return false
--}
--
--// Section 12.2.5.4.19.
--func inFramesetIM(p *parser) bool {
-- switch p.tok.Type {
-- case CommentToken:
-- p.addChild(&Node{
-- Type: CommentNode,
-- Data: p.tok.Data,
-- })
-- case TextToken:
-- // Ignore all text but whitespace.
-- s := strings.Map(func(c rune) rune {
-- switch c {
-- case ' ', '\t', '\n', '\f', '\r':
-- return c
-- }
-- return -1
-- }, p.tok.Data)
-- if s != "" {
-- p.addText(s)
-- }
-- case StartTagToken:
-- switch p.tok.DataAtom {
-- case a.Html:
-- return inBodyIM(p)
-- case a.Frameset:
-- p.addElement()
-- case a.Frame:
-- p.addElement()
-- p.oe.pop()
-- p.acknowledgeSelfClosingTag()
-- case a.Noframes:
-- return inHeadIM(p)
-- }
-- case EndTagToken:
-- switch p.tok.DataAtom {
-- case a.Frameset:
-- if p.oe.top().DataAtom != a.Html {
-- p.oe.pop()
-- if p.oe.top().DataAtom != a.Frameset {
-- p.im = afterFramesetIM
-- return true
-- }
-- }
-- }
-- default:
-- // Ignore the token.
-- }
-- return true
--}
--
--// Section 12.2.5.4.20.
--func afterFramesetIM(p *parser) bool {
-- switch p.tok.Type {
-- case CommentToken:
-- p.addChild(&Node{
-- Type: CommentNode,
-- Data: p.tok.Data,
-- })
-- case TextToken:
-- // Ignore all text but whitespace.
-- s := strings.Map(func(c rune) rune {
-- switch c {
-- case ' ', '\t', '\n', '\f', '\r':
-- return c
-- }
-- return -1
-- }, p.tok.Data)
-- if s != "" {
-- p.addText(s)
-- }
-- case StartTagToken:
-- switch p.tok.DataAtom {
-- case a.Html:
-- return inBodyIM(p)
-- case a.Noframes:
-- return inHeadIM(p)
-- }
-- case EndTagToken:
-- switch p.tok.DataAtom {
-- case a.Html:
-- p.im = afterAfterFramesetIM
-- return true
-- }
-- default:
-- // Ignore the token.
-- }
-- return true
--}
--
--// Section 12.2.5.4.21.
--func afterAfterBodyIM(p *parser) bool {
-- switch p.tok.Type {
-- case ErrorToken:
-- // Stop parsing.
-- return true
-- case TextToken:
-- s := strings.TrimLeft(p.tok.Data, whitespace)
-- if len(s) == 0 {
-- // It was all whitespace.
-- return inBodyIM(p)
-- }
-- case StartTagToken:
-- if p.tok.DataAtom == a.Html {
-- return inBodyIM(p)
-- }
-- case CommentToken:
-- p.doc.AppendChild(&Node{
-- Type: CommentNode,
-- Data: p.tok.Data,
-- })
-- return true
-- case DoctypeToken:
-- return inBodyIM(p)
-- }
-- p.im = inBodyIM
-- return false
--}
--
--// Section 12.2.5.4.22.
--func afterAfterFramesetIM(p *parser) bool {
-- switch p.tok.Type {
-- case CommentToken:
-- p.doc.AppendChild(&Node{
-- Type: CommentNode,
-- Data: p.tok.Data,
-- })
-- case TextToken:
-- // Ignore all text but whitespace.
-- s := strings.Map(func(c rune) rune {
-- switch c {
-- case ' ', '\t', '\n', '\f', '\r':
-- return c
-- }
-- return -1
-- }, p.tok.Data)
-- if s != "" {
-- p.tok.Data = s
-- return inBodyIM(p)
-- }
-- case StartTagToken:
-- switch p.tok.DataAtom {
-- case a.Html:
-- return inBodyIM(p)
-- case a.Noframes:
-- return inHeadIM(p)
-- }
-- case DoctypeToken:
-- return inBodyIM(p)
-- default:
-- // Ignore the token.
-- }
-- return true
--}
--
--const whitespaceOrNUL = whitespace + "\x00"
--
--// Section 12.2.5.5.
--func parseForeignContent(p *parser) bool {
-- switch p.tok.Type {
-- case TextToken:
-- if p.framesetOK {
-- p.framesetOK = strings.TrimLeft(p.tok.Data, whitespaceOrNUL) == ""
-- }
-- p.tok.Data = strings.Replace(p.tok.Data, "\x00", "\ufffd", -1)
-- p.addText(p.tok.Data)
-- case CommentToken:
-- p.addChild(&Node{
-- Type: CommentNode,
-- Data: p.tok.Data,
-- })
-- case StartTagToken:
-- b := breakout[p.tok.Data]
-- if p.tok.DataAtom == a.Font {
-- loop:
-- for _, attr := range p.tok.Attr {
-- switch attr.Key {
-- case "color", "face", "size":
-- b = true
-- break loop
-- }
-- }
-- }
-- if b {
-- for i := len(p.oe) - 1; i >= 0; i-- {
-- n := p.oe[i]
-- if n.Namespace == "" || htmlIntegrationPoint(n) || mathMLTextIntegrationPoint(n) {
-- p.oe = p.oe[:i+1]
-- break
-- }
-- }
-- return false
-- }
-- switch p.top().Namespace {
-- case "math":
-- adjustAttributeNames(p.tok.Attr, mathMLAttributeAdjustments)
-- case "svg":
-- // Adjust SVG tag names. The tokenizer lower-cases tag names, but
-- // SVG wants e.g. "foreignObject" with a capital second "O".
-- if x := svgTagNameAdjustments[p.tok.Data]; x != "" {
-- p.tok.DataAtom = a.Lookup([]byte(x))
-- p.tok.Data = x
-- }
-- adjustAttributeNames(p.tok.Attr, svgAttributeAdjustments)
-- default:
-- panic("html: bad parser state: unexpected namespace")
-- }
-- adjustForeignAttributes(p.tok.Attr)
-- namespace := p.top().Namespace
-- p.addElement()
-- p.top().Namespace = namespace
-- if namespace != "" {
-- // Don't let the tokenizer go into raw text mode in foreign content
-- // (e.g. in an SVG <title> tag).
-- p.tokenizer.NextIsNotRawText()
-- }
-- if p.hasSelfClosingToken {
-- p.oe.pop()
-- p.acknowledgeSelfClosingTag()
-- }
-- case EndTagToken:
-- for i := len(p.oe) - 1; i >= 0; i-- {
-- if p.oe[i].Namespace == "" {
-- return p.im(p)
-- }
-- if strings.EqualFold(p.oe[i].Data, p.tok.Data) {
-- p.oe = p.oe[:i]
-- break
-- }
-- }
-- return true
-- default:
-- // Ignore the token.
-- }
-- return true
--}
--
--// Section 12.2.5.
--func (p *parser) inForeignContent() bool {
-- if len(p.oe) == 0 {
-- return false
-- }
-- n := p.oe[len(p.oe)-1]
-- if n.Namespace == "" {
-- return false
-- }
-- if mathMLTextIntegrationPoint(n) {
-- if p.tok.Type == StartTagToken && p.tok.DataAtom != a.Mglyph && p.tok.DataAtom != a.Malignmark {
-- return false
-- }
-- if p.tok.Type == TextToken {
-- return false
-- }
-- }
-- if n.Namespace == "math" && n.DataAtom == a.AnnotationXml && p.tok.Type == StartTagToken && p.tok.DataAtom == a.Svg {
-- return false
-- }
-- if htmlIntegrationPoint(n) && (p.tok.Type == StartTagToken || p.tok.Type == TextToken) {
-- return false
-- }
-- if p.tok.Type == ErrorToken {
-- return false
-- }
-- return true
--}
--
--// parseImpliedToken parses a token as though it had appeared in the parser's
--// input.
--func (p *parser) parseImpliedToken(t TokenType, dataAtom a.Atom, data string) {
-- realToken, selfClosing := p.tok, p.hasSelfClosingToken
-- p.tok = Token{
-- Type: t,
-- DataAtom: dataAtom,
-- Data: data,
-- }
-- p.hasSelfClosingToken = false
-- p.parseCurrentToken()
-- p.tok, p.hasSelfClosingToken = realToken, selfClosing
--}
--
--// parseCurrentToken runs the current token through the parsing routines
--// until it is consumed.
--func (p *parser) parseCurrentToken() {
-- if p.tok.Type == SelfClosingTagToken {
-- p.hasSelfClosingToken = true
-- p.tok.Type = StartTagToken
-- }
--
-- consumed := false
-- for !consumed {
-- if p.inForeignContent() {
-- consumed = parseForeignContent(p)
-- } else {
-- consumed = p.im(p)
-- }
-- }
--
-- if p.hasSelfClosingToken {
-- // This is a parse error, but ignore it.
-- p.hasSelfClosingToken = false
-- }
--}
--
--func (p *parser) parse() error {
-- // Iterate until EOF. Any other error will cause an early return.
-- var err error
-- for err != io.EOF {
-- // CDATA sections are allowed only in foreign content.
-- n := p.oe.top()
-- p.tokenizer.AllowCDATA(n != nil && n.Namespace != "")
-- // Read and parse the next token.
-- p.tokenizer.Next()
-- p.tok = p.tokenizer.Token()
-- if p.tok.Type == ErrorToken {
-- err = p.tokenizer.Err()
-- if err != nil && err != io.EOF {
-- return err
-- }
-- }
-- p.parseCurrentToken()
-- }
-- return nil
--}
--
--// Parse returns the parse tree for the HTML from the given Reader.
--// The input is assumed to be UTF-8 encoded.
--func Parse(r io.Reader) (*Node, error) {
-- p := &parser{
-- tokenizer: NewTokenizer(r),
-- doc: &Node{
-- Type: DocumentNode,
-- },
-- scripting: true,
-- framesetOK: true,
-- im: initialIM,
-- }
-- err := p.parse()
-- if err != nil {
-- return nil, err
-- }
-- return p.doc, nil
--}
--
--// ParseFragment parses a fragment of HTML and returns the nodes that were
--// found. If the fragment is the InnerHTML for an existing element, pass that
--// element in context.
--func ParseFragment(r io.Reader, context *Node) ([]*Node, error) {
-- contextTag := ""
-- if context != nil {
-- if context.Type != ElementNode {
-- return nil, errors.New("html: ParseFragment of non-element Node")
-- }
-- // The next check isn't just context.DataAtom.String() == context.Data because
-- // it is valid to pass an element whose tag isn't a known atom. For example,
-- // DataAtom == 0 and Data = "tagfromthefuture" is perfectly consistent.
-- if context.DataAtom != a.Lookup([]byte(context.Data)) {
-- return nil, fmt.Errorf("html: inconsistent Node: DataAtom=%q, Data=%q", context.DataAtom, context.Data)
-- }
-- contextTag = context.DataAtom.String()
-- }
-- p := &parser{
-- tokenizer: NewTokenizerFragment(r, contextTag),
-- doc: &Node{
-- Type: DocumentNode,
-- },
-- scripting: true,
-- fragment: true,
-- context: context,
-- }
--
-- root := &Node{
-- Type: ElementNode,
-- DataAtom: a.Html,
-- Data: a.Html.String(),
-- }
-- p.doc.AppendChild(root)
-- p.oe = nodeStack{root}
-- p.resetInsertionMode()
--
-- for n := context; n != nil; n = n.Parent {
-- if n.Type == ElementNode && n.DataAtom == a.Form {
-- p.form = n
-- break
-- }
-- }
--
-- err := p.parse()
-- if err != nil {
-- return nil, err
-- }
--
-- parent := p.doc
-- if context != nil {
-- parent = root
-- }
--
-- var result []*Node
-- for c := parent.FirstChild; c != nil; {
-- next := c.NextSibling
-- parent.RemoveChild(c)
-- result = append(result, c)
-- c = next
-- }
-- return result, nil
--}
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/parse_test.go b/Godeps/_workspace/src/code.google.com/p/go.net/html/parse_test.go
-deleted file mode 100644
-index 253b04d..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/parse_test.go
-+++ /dev/null
-@@ -1,388 +0,0 @@
--// Copyright 2010 The Go Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--package html
--
--import (
-- "bufio"
-- "bytes"
-- "errors"
-- "fmt"
-- "io"
-- "io/ioutil"
-- "os"
-- "path/filepath"
-- "runtime"
-- "sort"
-- "strings"
-- "testing"
--
-- "code.google.com/p/go.net/html/atom"
--)
--
--// readParseTest reads a single test case from r.
--func readParseTest(r *bufio.Reader) (text, want, context string, err error) {
-- line, err := r.ReadSlice('\n')
-- if err != nil {
-- return "", "", "", err
-- }
-- var b []byte
--
-- // Read the HTML.
-- if string(line) != "#data\n" {
-- return "", "", "", fmt.Errorf(`got %q want "#data\n"`, line)
-- }
-- for {
-- line, err = r.ReadSlice('\n')
-- if err != nil {
-- return "", "", "", err
-- }
-- if line[0] == '#' {
-- break
-- }
-- b = append(b, line...)
-- }
-- text = strings.TrimSuffix(string(b), "\n")
-- b = b[:0]
--
-- // Skip the error list.
-- if string(line) != "#errors\n" {
-- return "", "", "", fmt.Errorf(`got %q want "#errors\n"`, line)
-- }
-- for {
-- line, err = r.ReadSlice('\n')
-- if err != nil {
-- return "", "", "", err
-- }
-- if line[0] == '#' {
-- break
-- }
-- }
--
-- if string(line) == "#document-fragment\n" {
-- line, err = r.ReadSlice('\n')
-- if err != nil {
-- return "", "", "", err
-- }
-- context = strings.TrimSpace(string(line))
-- line, err = r.ReadSlice('\n')
-- if err != nil {
-- return "", "", "", err
-- }
-- }
--
-- // Read the dump of what the parse tree should be.
-- if string(line) != "#document\n" {
-- return "", "", "", fmt.Errorf(`got %q want "#document\n"`, line)
-- }
-- inQuote := false
-- for {
-- line, err = r.ReadSlice('\n')
-- if err != nil && err != io.EOF {
-- return "", "", "", err
-- }
-- trimmed := bytes.Trim(line, "| \n")
-- if len(trimmed) > 0 {
-- if line[0] == '|' && trimmed[0] == '"' {
-- inQuote = true
-- }
-- if trimmed[len(trimmed)-1] == '"' && !(line[0] == '|' && len(trimmed) == 1) {
-- inQuote = false
-- }
-- }
-- if len(line) == 0 || len(line) == 1 && line[0] == '\n' && !inQuote {
-- break
-- }
-- b = append(b, line...)
-- }
-- return text, string(b), context, nil
--}
--
--func dumpIndent(w io.Writer, level int) {
-- io.WriteString(w, "| ")
-- for i := 0; i < level; i++ {
-- io.WriteString(w, " ")
-- }
--}
--
--type sortedAttributes []Attribute
--
--func (a sortedAttributes) Len() int {
-- return len(a)
--}
--
--func (a sortedAttributes) Less(i, j int) bool {
-- if a[i].Namespace != a[j].Namespace {
-- return a[i].Namespace < a[j].Namespace
-- }
-- return a[i].Key < a[j].Key
--}
--
--func (a sortedAttributes) Swap(i, j int) {
-- a[i], a[j] = a[j], a[i]
--}
--
--func dumpLevel(w io.Writer, n *Node, level int) error {
-- dumpIndent(w, level)
-- switch n.Type {
-- case ErrorNode:
-- return errors.New("unexpected ErrorNode")
-- case DocumentNode:
-- return errors.New("unexpected DocumentNode")
-- case ElementNode:
-- if n.Namespace != "" {
-- fmt.Fprintf(w, "<%s %s>", n.Namespace, n.Data)
-- } else {
-- fmt.Fprintf(w, "<%s>", n.Data)
-- }
-- attr := sortedAttributes(n.Attr)
-- sort.Sort(attr)
-- for _, a := range attr {
-- io.WriteString(w, "\n")
-- dumpIndent(w, level+1)
-- if a.Namespace != "" {
-- fmt.Fprintf(w, `%s %s="%s"`, a.Namespace, a.Key, a.Val)
-- } else {
-- fmt.Fprintf(w, `%s="%s"`, a.Key, a.Val)
-- }
-- }
-- case TextNode:
-- fmt.Fprintf(w, `"%s"`, n.Data)
-- case CommentNode:
-- fmt.Fprintf(w, "<!-- %s -->", n.Data)
-- case DoctypeNode:
-- fmt.Fprintf(w, "<!DOCTYPE %s", n.Data)
-- if n.Attr != nil {
-- var p, s string
-- for _, a := range n.Attr {
-- switch a.Key {
-- case "public":
-- p = a.Val
-- case "system":
-- s = a.Val
-- }
-- }
-- if p != "" || s != "" {
-- fmt.Fprintf(w, ` "%s"`, p)
-- fmt.Fprintf(w, ` "%s"`, s)
-- }
-- }
-- io.WriteString(w, ">")
-- case scopeMarkerNode:
-- return errors.New("unexpected scopeMarkerNode")
-- default:
-- return errors.New("unknown node type")
-- }
-- io.WriteString(w, "\n")
-- for c := n.FirstChild; c != nil; c = c.NextSibling {
-- if err := dumpLevel(w, c, level+1); err != nil {
-- return err
-- }
-- }
-- return nil
--}
--
--func dump(n *Node) (string, error) {
-- if n == nil || n.FirstChild == nil {
-- return "", nil
-- }
-- var b bytes.Buffer
-- for c := n.FirstChild; c != nil; c = c.NextSibling {
-- if err := dumpLevel(&b, c, 0); err != nil {
-- return "", err
-- }
-- }
-- return b.String(), nil
--}
--
--const testDataDir = "testdata/webkit/"
--
--func TestParser(t *testing.T) {
-- testFiles, err := filepath.Glob(testDataDir + "*.dat")
-- if err != nil {
-- t.Fatal(err)
-- }
-- for _, tf := range testFiles {
-- f, err := os.Open(tf)
-- if err != nil {
-- t.Fatal(err)
-- }
-- defer f.Close()
-- r := bufio.NewReader(f)
--
-- for i := 0; ; i++ {
-- text, want, context, err := readParseTest(r)
-- if err == io.EOF {
-- break
-- }
-- if err != nil {
-- t.Fatal(err)
-- }
--
-- err = testParseCase(text, want, context)
--
-- if err != nil {
-- t.Errorf("%s test #%d %q, %s", tf, i, text, err)
-- }
-- }
-- }
--}
--
--// testParseCase tests one test case from the test files. If the test does not
--// pass, it returns an error that explains the failure.
--// text is the HTML to be parsed, want is a dump of the correct parse tree,
--// and context is the name of the context node, if any.
--func testParseCase(text, want, context string) (err error) {
-- defer func() {
-- if x := recover(); x != nil {
-- switch e := x.(type) {
-- case error:
-- err = e
-- default:
-- err = fmt.Errorf("%v", e)
-- }
-- }
-- }()
--
-- var doc *Node
-- if context == "" {
-- doc, err = Parse(strings.NewReader(text))
-- if err != nil {
-- return err
-- }
-- } else {
-- contextNode := &Node{
-- Type: ElementNode,
-- DataAtom: atom.Lookup([]byte(context)),
-- Data: context,
-- }
-- nodes, err := ParseFragment(strings.NewReader(text), contextNode)
-- if err != nil {
-- return err
-- }
-- doc = &Node{
-- Type: DocumentNode,
-- }
-- for _, n := range nodes {
-- doc.AppendChild(n)
-- }
-- }
--
-- if err := checkTreeConsistency(doc); err != nil {
-- return err
-- }
--
-- got, err := dump(doc)
-- if err != nil {
-- return err
-- }
-- // Compare the parsed tree to the #document section.
-- if got != want {
-- return fmt.Errorf("got vs want:\n----\n%s----\n%s----", got, want)
-- }
--
-- if renderTestBlacklist[text] || context != "" {
-- return nil
-- }
--
-- // Check that rendering and re-parsing results in an identical tree.
-- pr, pw := io.Pipe()
-- go func() {
-- pw.CloseWithError(Render(pw, doc))
-- }()
-- doc1, err := Parse(pr)
-- if err != nil {
-- return err
-- }
-- got1, err := dump(doc1)
-- if err != nil {
-- return err
-- }
-- if got != got1 {
-- return fmt.Errorf("got vs got1:\n----\n%s----\n%s----", got, got1)
-- }
--
-- return nil
--}
--
--// Some test input result in parse trees are not 'well-formed' despite
--// following the HTML5 recovery algorithms. Rendering and re-parsing such a
--// tree will not result in an exact clone of that tree. We blacklist such
--// inputs from the render test.
--var renderTestBlacklist = map[string]bool{
-- // The second <a> will be reparented to the first <table>'s parent. This
-- // results in an <a> whose parent is an <a>, which is not 'well-formed'.
-- `<a><table><td><a><table></table><a></tr><a></table><b>X</b>C<a>Y`: true,
-- // The same thing with a <p>:
-- `<p><table></p>`: true,
-- // More cases of <a> being reparented:
-- `<a href="blah">aba<table><a href="foo">br<tr><td></td></tr>x</table>aoe`: true,
-- `<a><table><a></table><p><a><div><a>`: true,
-- `<a><table><td><a><table></table><a></tr><a></table><a>`: true,
-- // A similar reparenting situation involving <nobr>:
-- `<!DOCTYPE html><body><b><nobr>1<table><nobr></b><i><nobr>2<nobr></i>3`: true,
-- // A <plaintext> element is reparented, putting it before a table.
-- // A <plaintext> element can't have anything after it in HTML.
-- `<table><plaintext><td>`: true,
-- `<!doctype html><table><plaintext></plaintext>`: true,
-- `<!doctype html><table><tbody><plaintext></plaintext>`: true,
-- `<!doctype html><table><tbody><tr><plaintext></plaintext>`: true,
-- // A form inside a table inside a form doesn't work either.
-- `<!doctype html><form><table></form><form></table></form>`: true,
-- // A script that ends at EOF may escape its own closing tag when rendered.
-- `<!doctype html><script><!--<script `: true,
-- `<!doctype html><script><!--<script <`: true,
-- `<!doctype html><script><!--<script <a`: true,
-- `<!doctype html><script><!--<script </`: true,
-- `<!doctype html><script><!--<script </s`: true,
-- `<!doctype html><script><!--<script </script`: true,
-- `<!doctype html><script><!--<script </scripta`: true,
-- `<!doctype html><script><!--<script -`: true,
-- `<!doctype html><script><!--<script -a`: true,
-- `<!doctype html><script><!--<script -<`: true,
-- `<!doctype html><script><!--<script --`: true,
-- `<!doctype html><script><!--<script --a`: true,
-- `<!doctype html><script><!--<script --<`: true,
-- `<script><!--<script `: true,
-- `<script><!--<script <a`: true,
-- `<script><!--<script </script`: true,
-- `<script><!--<script </scripta`: true,
-- `<script><!--<script -`: true,
-- `<script><!--<script -a`: true,
-- `<script><!--<script --`: true,
-- `<script><!--<script --a`: true,
-- `<script><!--<script <`: true,
-- `<script><!--<script </`: true,
-- `<script><!--<script </s`: true,
-- // Reconstructing the active formatting elements results in a <plaintext>
-- // element that contains an <a> element.
-- `<!doctype html><p><a><plaintext>b`: true,
--}
--
--func TestNodeConsistency(t *testing.T) {
-- // inconsistentNode is a Node whose DataAtom and Data do not agree.
-- inconsistentNode := &Node{
-- Type: ElementNode,
-- DataAtom: atom.Frameset,
-- Data: "table",
-- }
-- _, err := ParseFragment(strings.NewReader("<p>hello</p>"), inconsistentNode)
-- if err == nil {
-- t.Errorf("got nil error, want non-nil")
-- }
--}
--
--func BenchmarkParser(b *testing.B) {
-- buf, err := ioutil.ReadFile("testdata/go1.html")
-- if err != nil {
-- b.Fatalf("could not read testdata/go1.html: %v", err)
-- }
-- b.SetBytes(int64(len(buf)))
-- runtime.GC()
-- b.ReportAllocs()
-- b.ResetTimer()
-- for i := 0; i < b.N; i++ {
-- Parse(bytes.NewBuffer(buf))
-- }
--}
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/render.go b/Godeps/_workspace/src/code.google.com/p/go.net/html/render.go
-deleted file mode 100644
-index 4a833b4..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/render.go
-+++ /dev/null
-@@ -1,271 +0,0 @@
--// Copyright 2011 The Go Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--package html
--
--import (
-- "bufio"
-- "errors"
-- "fmt"
-- "io"
-- "strings"
--)
--
--type writer interface {
-- io.Writer
-- WriteByte(c byte) error // in Go 1.1, use io.ByteWriter
-- WriteString(string) (int, error)
--}
--
--// Render renders the parse tree n to the given writer.
--//
--// Rendering is done on a 'best effort' basis: calling Parse on the output of
--// Render will always result in something similar to the original tree, but it
--// is not necessarily an exact clone unless the original tree was 'well-formed'.
--// 'Well-formed' is not easily specified; the HTML5 specification is
--// complicated.
--//
--// Calling Parse on arbitrary input typically results in a 'well-formed' parse
--// tree. However, it is possible for Parse to yield a 'badly-formed' parse tree.
--// For example, in a 'well-formed' parse tree, no <a> element is a child of
--// another <a> element: parsing "<a><a>" results in two sibling elements.
--// Similarly, in a 'well-formed' parse tree, no <a> element is a child of a
--// <table> element: parsing "<p><table><a>" results in a <p> with two sibling
--// children; the <a> is reparented to the <table>'s parent. However, calling
--// Parse on "<a><table><a>" does not return an error, but the result has an <a>
--// element with an <a> child, and is therefore not 'well-formed'.
--//
--// Programmatically constructed trees are typically also 'well-formed', but it
--// is possible to construct a tree that looks innocuous but, when rendered and
--// re-parsed, results in a different tree. A simple example is that a solitary
--// text node would become a tree containing <html>, <head> and <body> elements.
--// Another example is that the programmatic equivalent of "a<head>b</head>c"
--// becomes "<html><head><head/><body>abc</body></html>".
--func Render(w io.Writer, n *Node) error {
-- if x, ok := w.(writer); ok {
-- return render(x, n)
-- }
-- buf := bufio.NewWriter(w)
-- if err := render(buf, n); err != nil {
-- return err
-- }
-- return buf.Flush()
--}
--
--// plaintextAbort is returned from render1 when a <plaintext> element
--// has been rendered. No more end tags should be rendered after that.
--var plaintextAbort = errors.New("html: internal error (plaintext abort)")
--
--func render(w writer, n *Node) error {
-- err := render1(w, n)
-- if err == plaintextAbort {
-- err = nil
-- }
-- return err
--}
--
--func render1(w writer, n *Node) error {
-- // Render non-element nodes; these are the easy cases.
-- switch n.Type {
-- case ErrorNode:
-- return errors.New("html: cannot render an ErrorNode node")
-- case TextNode:
-- return escape(w, n.Data)
-- case DocumentNode:
-- for c := n.FirstChild; c != nil; c = c.NextSibling {
-- if err := render1(w, c); err != nil {
-- return err
-- }
-- }
-- return nil
-- case ElementNode:
-- // No-op.
-- case CommentNode:
-- if _, err := w.WriteString("<!--"); err != nil {
-- return err
-- }
-- if _, err := w.WriteString(n.Data); err != nil {
-- return err
-- }
-- if _, err := w.WriteString("-->"); err != nil {
-- return err
-- }
-- return nil
-- case DoctypeNode:
-- if _, err := w.WriteString("<!DOCTYPE "); err != nil {
-- return err
-- }
-- if _, err := w.WriteString(n.Data); err != nil {
-- return err
-- }
-- if n.Attr != nil {
-- var p, s string
-- for _, a := range n.Attr {
-- switch a.Key {
-- case "public":
-- p = a.Val
-- case "system":
-- s = a.Val
-- }
-- }
-- if p != "" {
-- if _, err := w.WriteString(" PUBLIC "); err != nil {
-- return err
-- }
-- if err := writeQuoted(w, p); err != nil {
-- return err
-- }
-- if s != "" {
-- if err := w.WriteByte(' '); err != nil {
-- return err
-- }
-- if err := writeQuoted(w, s); err != nil {
-- return err
-- }
-- }
-- } else if s != "" {
-- if _, err := w.WriteString(" SYSTEM "); err != nil {
-- return err
-- }
-- if err := writeQuoted(w, s); err != nil {
-- return err
-- }
-- }
-- }
-- return w.WriteByte('>')
-- default:
-- return errors.New("html: unknown node type")
-- }
--
-- // Render the <xxx> opening tag.
-- if err := w.WriteByte('<'); err != nil {
-- return err
-- }
-- if _, err := w.WriteString(n.Data); err != nil {
-- return err
-- }
-- for _, a := range n.Attr {
-- if err := w.WriteByte(' '); err != nil {
-- return err
-- }
-- if a.Namespace != "" {
-- if _, err := w.WriteString(a.Namespace); err != nil {
-- return err
-- }
-- if err := w.WriteByte(':'); err != nil {
-- return err
-- }
-- }
-- if _, err := w.WriteString(a.Key); err != nil {
-- return err
-- }
-- if _, err := w.WriteString(`="`); err != nil {
-- return err
-- }
-- if err := escape(w, a.Val); err != nil {
-- return err
-- }
-- if err := w.WriteByte('"'); err != nil {
-- return err
-- }
-- }
-- if voidElements[n.Data] {
-- if n.FirstChild != nil {
-- return fmt.Errorf("html: void element <%s> has child nodes", n.Data)
-- }
-- _, err := w.WriteString("/>")
-- return err
-- }
-- if err := w.WriteByte('>'); err != nil {
-- return err
-- }
--
-- // Add initial newline where there is danger of a newline beging ignored.
-- if c := n.FirstChild; c != nil && c.Type == TextNode && strings.HasPrefix(c.Data, "\n") {
-- switch n.Data {
-- case "pre", "listing", "textarea":
-- if err := w.WriteByte('\n'); err != nil {
-- return err
-- }
-- }
-- }
--
-- // Render any child nodes.
-- switch n.Data {
-- case "iframe", "noembed", "noframes", "noscript", "plaintext", "script", "style", "xmp":
-- for c := n.FirstChild; c != nil; c = c.NextSibling {
-- if c.Type == TextNode {
-- if _, err := w.WriteString(c.Data); err != nil {
-- return err
-- }
-- } else {
-- if err := render1(w, c); err != nil {
-- return err
-- }
-- }
-- }
-- if n.Data == "plaintext" {
-- // Don't render anything else. <plaintext> must be the
-- // last element in the file, with no closing tag.
-- return plaintextAbort
-- }
-- default:
-- for c := n.FirstChild; c != nil; c = c.NextSibling {
-- if err := render1(w, c); err != nil {
-- return err
-- }
-- }
-- }
--
-- // Render the </xxx> closing tag.
-- if _, err := w.WriteString("</"); err != nil {
-- return err
-- }
-- if _, err := w.WriteString(n.Data); err != nil {
-- return err
-- }
-- return w.WriteByte('>')
--}
--
--// writeQuoted writes s to w surrounded by quotes. Normally it will use double
--// quotes, but if s contains a double quote, it will use single quotes.
--// It is used for writing the identifiers in a doctype declaration.
--// In valid HTML, they can't contain both types of quotes.
--func writeQuoted(w writer, s string) error {
-- var q byte = '"'
-- if strings.Contains(s, `"`) {
-- q = '\''
-- }
-- if err := w.WriteByte(q); err != nil {
-- return err
-- }
-- if _, err := w.WriteString(s); err != nil {
-- return err
-- }
-- if err := w.WriteByte(q); err != nil {
-- return err
-- }
-- return nil
--}
--
--// Section 12.1.2, "Elements", gives this list of void elements. Void elements
--// are those that can't have any contents.
--var voidElements = map[string]bool{
-- "area": true,
-- "base": true,
-- "br": true,
-- "col": true,
-- "command": true,
-- "embed": true,
-- "hr": true,
-- "img": true,
-- "input": true,
-- "keygen": true,
-- "link": true,
-- "meta": true,
-- "param": true,
-- "source": true,
-- "track": true,
-- "wbr": true,
--}
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/render_test.go b/Godeps/_workspace/src/code.google.com/p/go.net/html/render_test.go
-deleted file mode 100644
-index 11da54b..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/render_test.go
-+++ /dev/null
-@@ -1,156 +0,0 @@
--// Copyright 2010 The Go Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--package html
--
--import (
-- "bytes"
-- "testing"
--)
--
--func TestRenderer(t *testing.T) {
-- nodes := [...]*Node{
-- 0: {
-- Type: ElementNode,
-- Data: "html",
-- },
-- 1: {
-- Type: ElementNode,
-- Data: "head",
-- },
-- 2: {
-- Type: ElementNode,
-- Data: "body",
-- },
-- 3: {
-- Type: TextNode,
-- Data: "0<1",
-- },
-- 4: {
-- Type: ElementNode,
-- Data: "p",
-- Attr: []Attribute{
-- {
-- Key: "id",
-- Val: "A",
-- },
-- {
-- Key: "foo",
-- Val: `abc"def`,
-- },
-- },
-- },
-- 5: {
-- Type: TextNode,
-- Data: "2",
-- },
-- 6: {
-- Type: ElementNode,
-- Data: "b",
-- Attr: []Attribute{
-- {
-- Key: "empty",
-- Val: "",
-- },
-- },
-- },
-- 7: {
-- Type: TextNode,
-- Data: "3",
-- },
-- 8: {
-- Type: ElementNode,
-- Data: "i",
-- Attr: []Attribute{
-- {
-- Key: "backslash",
-- Val: `\`,
-- },
-- },
-- },
-- 9: {
-- Type: TextNode,
-- Data: "&4",
-- },
-- 10: {
-- Type: TextNode,
-- Data: "5",
-- },
-- 11: {
-- Type: ElementNode,
-- Data: "blockquote",
-- },
-- 12: {
-- Type: ElementNode,
-- Data: "br",
-- },
-- 13: {
-- Type: TextNode,
-- Data: "6",
-- },
-- }
--
-- // Build a tree out of those nodes, based on a textual representation.
-- // Only the ".\t"s are significant. The trailing HTML-like text is
-- // just commentary. The "0:" prefixes are for easy cross-reference with
-- // the nodes array.
-- treeAsText := [...]string{
-- 0: `<html>`,
-- 1: `. <head>`,
-- 2: `. <body>`,
-- 3: `. . "0<1"`,
-- 4: `. . <p id="A" foo="abc"def">`,
-- 5: `. . . "2"`,
-- 6: `. . . <b empty="">`,
-- 7: `. . . . "3"`,
-- 8: `. . . <i backslash="\">`,
-- 9: `. . . . "&4"`,
-- 10: `. . "5"`,
-- 11: `. . <blockquote>`,
-- 12: `. . <br>`,
-- 13: `. . "6"`,
-- }
-- if len(nodes) != len(treeAsText) {
-- t.Fatal("len(nodes) != len(treeAsText)")
-- }
-- var stack [8]*Node
-- for i, line := range treeAsText {
-- level := 0
-- for line[0] == '.' {
-- // Strip a leading ".\t".
-- line = line[2:]
-- level++
-- }
-- n := nodes[i]
-- if level == 0 {
-- if stack[0] != nil {
-- t.Fatal("multiple root nodes")
-- }
-- stack[0] = n
-- } else {
-- stack[level-1].AppendChild(n)
-- stack[level] = n
-- for i := level + 1; i < len(stack); i++ {
-- stack[i] = nil
-- }
-- }
-- // At each stage of tree construction, we check all nodes for consistency.
-- for j, m := range nodes {
-- if err := checkNodeConsistency(m); err != nil {
-- t.Fatalf("i=%d, j=%d: %v", i, j, err)
-- }
-- }
-- }
--
-- want := `<html><head></head><body>0<1<p id="A" foo="abc"def">` +
-- `2<b empty="">3</b><i backslash="\">&4</i></p>` +
-- `5<blockquote></blockquote><br/>6</body></html>`
-- b := new(bytes.Buffer)
-- if err := Render(b, nodes[0]); err != nil {
-- t.Fatal(err)
-- }
-- if got := b.String(); got != want {
-- t.Errorf("got vs want:\n%s\n%s\n", got, want)
-- }
--}
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/go1.html b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/go1.html
-deleted file mode 100644
-index a782cc7..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/go1.html
-+++ /dev/null
-@@ -1,2237 +0,0 @@
--<!DOCTYPE html>
--<html>
--<head>
--<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
--
-- <title>Go 1 Release Notes - The Go Programming Language</title>
--
--<link type="text/css" rel="stylesheet" href="/doc/style.css">
--<script type="text/javascript" src="/doc/godocs.js"></script>
--
--<link rel="search" type="application/opensearchdescription+xml" title="godoc" href="/opensearch.xml" />
--
--<script type="text/javascript">
--var _gaq = _gaq || [];
--_gaq.push(["_setAccount", "UA-11222381-2"]);
--_gaq.push(["_trackPageview"]);
--</script>
--</head>
--<body>
--
--<div id="topbar"><div class="container wide">
--
--<form method="GET" action="/search">
--<div id="menu">
--<a href="/doc/">Documents</a>
--<a href="/ref/">References</a>
--<a href="/pkg/">Packages</a>
--<a href="/project/">The Project</a>
--<a href="/help/">Help</a>
--<input type="text" id="search" name="q" class="inactive" value="Search">
--</div>
--<div id="heading"><a href="/">The Go Programming Language</a></div>
--</form>
--
--</div></div>
--
--<div id="page" class="wide">
--
--
-- <div id="plusone"><g:plusone size="small" annotation="none"></g:plusone></div>
-- <h1>Go 1 Release Notes</h1>
--
--
--
--
--<div id="nav"></div>
--
--
--
--
--<h2 id="introduction">Introduction to Go 1</h2>
--
--<p>
--Go version 1, Go 1 for short, defines a language and a set of core libraries
--that provide a stable foundation for creating reliable products, projects, and
--publications.
--</p>
--
--<p>
--The driving motivation for Go 1 is stability for its users. People should be able to
--write Go programs and expect that they will continue to compile and run without
--change, on a time scale of years, including in production environments such as
--Google App Engine. Similarly, people should be able to write books about Go, be
--able to say which version of Go the book is describing, and have that version
--number still be meaningful much later.
--</p>
--
--<p>
--Code that compiles in Go 1 should, with few exceptions, continue to compile and
--run throughout the lifetime of that version, even as we issue updates and bug
--fixes such as Go version 1.1, 1.2, and so on. Other than critical fixes, changes
--made to the language and library for subsequent releases of Go 1 may
--add functionality but will not break existing Go 1 programs.
--<a href="go1compat.html">The Go 1 compatibility document</a>
--explains the compatibility guidelines in more detail.
--</p>
--
--<p>
--Go 1 is a representation of Go as it used today, not a wholesale rethinking of
--the language. We avoided designing new features and instead focused on cleaning
--up problems and inconsistencies and improving portability. There are a number
--changes to the Go language and packages that we had considered for some time and
--prototyped but not released primarily because they are significant and
--backwards-incompatible. Go 1 was an opportunity to get them out, which is
--helpful for the long term, but also means that Go 1 introduces incompatibilities
--for old programs. Fortunately, the <code>go</code> <code>fix</code> tool can
--automate much of the work needed to bring programs up to the Go 1 standard.
--</p>
--
--<p>
--This document outlines the major changes in Go 1 that will affect programmers
--updating existing code; its reference point is the prior release, r60 (tagged as
--r60.3). It also explains how to update code from r60 to run under Go 1.
--</p>
--
--<h2 id="language">Changes to the language</h2>
--
--<h3 id="append">Append</h3>
--
--<p>
--The <code>append</code> predeclared variadic function makes it easy to grow a slice
--by adding elements to the end.
--A common use is to add bytes to the end of a byte slice when generating output.
--However, <code>append</code> did not provide a way to append a string to a <code>[]byte</code>,
--which is another common case.
--</p>
--
--<pre><!--{{code "/doc/progs/go1.go" `/greeting := ..byte/` `/append.*hello/`}}
----> greeting := []byte{}
-- greeting = append(greeting, []byte("hello ")...)</pre>
--
--<p>
--By analogy with the similar property of <code>copy</code>, Go 1
--permits a string to be appended (byte-wise) directly to a byte
--slice, reducing the friction between strings and byte slices.
--The conversion is no longer necessary:
--</p>
--
--<pre><!--{{code "/doc/progs/go1.go" `/append.*world/`}}
----> greeting = append(greeting, "world"...)</pre>
--
--<p>
--<em>Updating</em>:
--This is a new feature, so existing code needs no changes.
--</p>
--
--<h3 id="close">Close</h3>
--
--<p>
--The <code>close</code> predeclared function provides a mechanism
--for a sender to signal that no more values will be sent.
--It is important to the implementation of <code>for</code> <code>range</code>
--loops over channels and is helpful in other situations.
--Partly by design and partly because of race conditions that can occur otherwise,
--it is intended for use only by the goroutine sending on the channel,
--not by the goroutine receiving data.
--However, before Go 1 there was no compile-time checking that <code>close</code>
--was being used correctly.
--</p>
--
--<p>
--To close this gap, at least in part, Go 1 disallows <code>close</code> on receive-only channels.
--Attempting to close such a channel is a compile-time error.
--</p>
--
--<pre>
-- var c chan int
-- var csend chan<- int = c
-- var crecv <-chan int = c
-- close(c) // legal
-- close(csend) // legal
-- close(crecv) // illegal
--</pre>
--
--<p>
--<em>Updating</em>:
--Existing code that attempts to close a receive-only channel was
--erroneous even before Go 1 and should be fixed. The compiler will
--now reject such code.
--</p>
--
--<h3 id="literals">Composite literals</h3>
--
--<p>
--In Go 1, a composite literal of array, slice, or map type can elide the
--type specification for the elements' initializers if they are of pointer type.
--All four of the initializations in this example are legal; the last one was illegal before Go 1.
--</p>
--
--<pre><!--{{code "/doc/progs/go1.go" `/type Date struct/` `/STOP/`}}
----> type Date struct {
-- month string
-- day int
-- }
-- <span class="comment">// Struct values, fully qualified; always legal.</span>
-- holiday1 := []Date{
-- Date{"Feb", 14},
-- Date{"Nov", 11},
-- Date{"Dec", 25},
-- }
-- <span class="comment">// Struct values, type name elided; always legal.</span>
-- holiday2 := []Date{
-- {"Feb", 14},
-- {"Nov", 11},
-- {"Dec", 25},
-- }
-- <span class="comment">// Pointers, fully qualified, always legal.</span>
-- holiday3 := []*Date{
-- &Date{"Feb", 14},
-- &Date{"Nov", 11},
-- &Date{"Dec", 25},
-- }
-- <span class="comment">// Pointers, type name elided; legal in Go 1.</span>
-- holiday4 := []*Date{
-- {"Feb", 14},
-- {"Nov", 11},
-- {"Dec", 25},
-- }</pre>
--
--<p>
--<em>Updating</em>:
--This change has no effect on existing code, but the command
--<code>gofmt</code> <code>-s</code> applied to existing source
--will, among other things, elide explicit element types wherever permitted.
--</p>
--
--
--<h3 id="init">Goroutines during init</h3>
--
--<p>
--The old language defined that <code>go</code> statements executed during initialization created goroutines but that they did not begin to run until initialization of the entire program was complete.
--This introduced clumsiness in many places and, in effect, limited the utility
--of the <code>init</code> construct:
--if it was possible for another package to use the library during initialization, the library
--was forced to avoid goroutines.
--This design was done for reasons of simplicity and safety but,
--as our confidence in the language grew, it seemed unnecessary.
--Running goroutines during initialization is no more complex or unsafe than running them during normal execution.
--</p>
--
--<p>
--In Go 1, code that uses goroutines can be called from
--<code>init</code> routines and global initialization expressions
--without introducing a deadlock.
--</p>
--
--<pre><!--{{code "/doc/progs/go1.go" `/PackageGlobal/` `/^}/`}}
---->var PackageGlobal int
--
--func init() {
-- c := make(chan int)
-- go initializationFunction(c)
-- PackageGlobal = <-c
--}</pre>
--
--<p>
--<em>Updating</em>:
--This is a new feature, so existing code needs no changes,
--although it's possible that code that depends on goroutines not starting before <code>main</code> will break.
--There was no such code in the standard repository.
--</p>
--
--<h3 id="rune">The rune type</h3>
--
--<p>
--The language spec allows the <code>int</code> type to be 32 or 64 bits wide, but current implementations set <code>int</code> to 32 bits even on 64-bit platforms.
--It would be preferable to have <code>int</code> be 64 bits on 64-bit platforms.
--(There are important consequences for indexing large slices.)
--However, this change would waste space when processing Unicode characters with
--the old language because the <code>int</code> type was also used to hold Unicode code points: each code point would waste an extra 32 bits of storage if <code>int</code> grew from 32 bits to 64.
--</p>
--
--<p>
--To make changing to 64-bit <code>int</code> feasible,
--Go 1 introduces a new basic type, <code>rune</code>, to represent
--individual Unicode code points.
--It is an alias for <code>int32</code>, analogous to <code>byte</code>
--as an alias for <code>uint8</code>.
--</p>
--
--<p>
--Character literals such as <code>'a'</code>, <code>'語'</code>, and <code>'\u0345'</code>
--now have default type <code>rune</code>,
--analogous to <code>1.0</code> having default type <code>float64</code>.
--A variable initialized to a character constant will therefore
--have type <code>rune</code> unless otherwise specified.
--</p>
--
--<p>
--Libraries have been updated to use <code>rune</code> rather than <code>int</code>
--when appropriate. For instance, the functions <code>unicode.ToLower</code> and
--relatives now take and return a <code>rune</code>.
--</p>
--
--<pre><!--{{code "/doc/progs/go1.go" `/STARTRUNE/` `/ENDRUNE/`}}
----> delta := 'δ' <span class="comment">// delta has type rune.</span>
-- var DELTA rune
-- DELTA = unicode.ToUpper(delta)
-- epsilon := unicode.ToLower(DELTA + 1)
-- if epsilon != 'δ'+1 {
-- log.Fatal("inconsistent casing for Greek")
-- }</pre>
--
--<p>
--<em>Updating</em>:
--Most source code will be unaffected by this because the type inference from
--<code>:=</code> initializers introduces the new type silently, and it propagates
--from there.
--Some code may get type errors that a trivial conversion will resolve.
--</p>
--
--<h3 id="error">The error type</h3>
--
--<p>
--Go 1 introduces a new built-in type, <code>error</code>, which has the following definition:
--</p>
--
--<pre>
-- type error interface {
-- Error() string
-- }
--</pre>
--
--<p>
--Since the consequences of this type are all in the package library,
--it is discussed <a href="#errors">below</a>.
--</p>
--
--<h3 id="delete">Deleting from maps</h3>
--
--<p>
--In the old language, to delete the entry with key <code>k</code> from map <code>m</code>, one wrote the statement,
--</p>
--
--<pre>
-- m[k] = value, false
--</pre>
--
--<p>
--This syntax was a peculiar special case, the only two-to-one assignment.
--It required passing a value (usually ignored) that is evaluated but discarded,
--plus a boolean that was nearly always the constant <code>false</code>.
--It did the job but was odd and a point of contention.
--</p>
--
--<p>
--In Go 1, that syntax has gone; instead there is a new built-in
--function, <code>delete</code>. The call
--</p>
--
--<pre><!--{{code "/doc/progs/go1.go" `/delete\(m, k\)/`}}
----> delete(m, k)</pre>
--
--<p>
--will delete the map entry retrieved by the expression <code>m[k]</code>.
--There is no return value. Deleting a non-existent entry is a no-op.
--</p>
--
--<p>
--<em>Updating</em>:
--Running <code>go</code> <code>fix</code> will convert expressions of the form <code>m[k] = value,
--false</code> into <code>delete(m, k)</code> when it is clear that
--the ignored value can be safely discarded from the program and
--<code>false</code> refers to the predefined boolean constant.
--The fix tool
--will flag other uses of the syntax for inspection by the programmer.
--</p>
--
--<h3 id="iteration">Iterating in maps</h3>
--
--<p>
--The old language specification did not define the order of iteration for maps,
--and in practice it differed across hardware platforms.
--This caused tests that iterated over maps to be fragile and non-portable, with the
--unpleasant property that a test might always pass on one machine but break on another.
--</p>
--
--<p>
--In Go 1, the order in which elements are visited when iterating
--over a map using a <code>for</code> <code>range</code> statement
--is defined to be unpredictable, even if the same loop is run multiple
--times with the same map.
--Code should not assume that the elements are visited in any particular order.
--</p>
--
--<p>
--This change means that code that depends on iteration order is very likely to break early and be fixed long before it becomes a problem.
--Just as important, it allows the map implementation to ensure better map balancing even when programs are using range loops to select an element from a map.
--</p>
--
--<pre><!--{{code "/doc/progs/go1.go" `/Sunday/` `/^ }/`}}
----> m := map[string]int{"Sunday": 0, "Monday": 1}
-- for name, value := range m {
-- <span class="comment">// This loop should not assume Sunday will be visited first.</span>
-- f(name, value)
-- }</pre>
--
--<p>
--<em>Updating</em>:
--This is one change where tools cannot help. Most existing code
--will be unaffected, but some programs may break or misbehave; we
--recommend manual checking of all range statements over maps to
--verify they do not depend on iteration order. There were a few such
--examples in the standard repository; they have been fixed.
--Note that it was already incorrect to depend on the iteration order, which
--was unspecified. This change codifies the unpredictability.
--</p>
--
--<h3 id="multiple_assignment">Multiple assignment</h3>
--
--<p>
--The language specification has long guaranteed that in assignments
--the right-hand-side expressions are all evaluated before any left-hand-side expressions are assigned.
--To guarantee predictable behavior,
--Go 1 refines the specification further.
--</p>
--
--<p>
--If the left-hand side of the assignment
--statement contains expressions that require evaluation, such as
--function calls or array indexing operations, these will all be done
--using the usual left-to-right rule before any variables are assigned
--their value. Once everything is evaluated, the actual assignments
--proceed in left-to-right order.
--</p>
--
--<p>
--These examples illustrate the behavior.
--</p>
--
--<pre><!--{{code "/doc/progs/go1.go" `/sa :=/` `/then sc.0. = 2/`}}
----> sa := []int{1, 2, 3}
-- i := 0
-- i, sa[i] = 1, 2 <span class="comment">// sets i = 1, sa[0] = 2</span>
--
-- sb := []int{1, 2, 3}
-- j := 0
-- sb[j], j = 2, 1 <span class="comment">// sets sb[0] = 2, j = 1</span>
--
-- sc := []int{1, 2, 3}
-- sc[0], sc[0] = 1, 2 <span class="comment">// sets sc[0] = 1, then sc[0] = 2 (so sc[0] = 2 at end)</span></pre>
--
--<p>
--<em>Updating</em>:
--This is one change where tools cannot help, but breakage is unlikely.
--No code in the standard repository was broken by this change, and code
--that depended on the previous unspecified behavior was already incorrect.
--</p>
--
--<h3 id="shadowing">Returns and shadowed variables</h3>
--
--<p>
--A common mistake is to use <code>return</code> (without arguments) after an assignment to a variable that has the same name as a result variable but is not the same variable.
--This situation is called <em>shadowing</em>: the result variable has been shadowed by another variable with the same name declared in an inner scope.
--</p>
--
--<p>
--In functions with named return values,
--the Go 1 compilers disallow return statements without arguments if any of the named return values is shadowed at the point of the return statement.
--(It isn't part of the specification, because this is one area we are still exploring;
--the situation is analogous to the compilers rejecting functions that do not end with an explicit return statement.)
--</p>
--
--<p>
--This function implicitly returns a shadowed return value and will be rejected by the compiler:
--</p>
--
--<pre>
-- func Bug() (i, j, k int) {
-- for i = 0; i < 5; i++ {
-- for j := 0; j < 5; j++ { // Redeclares j.
-- k += i*j
-- if k > 100 {
-- return // Rejected: j is shadowed here.
-- }
-- }
-- }
-- return // OK: j is not shadowed here.
-- }
--</pre>
--
--<p>
--<em>Updating</em>:
--Code that shadows return values in this way will be rejected by the compiler and will need to be fixed by hand.
--The few cases that arose in the standard repository were mostly bugs.
--</p>
--
--<h3 id="unexported">Copying structs with unexported fields</h3>
--
--<p>
--The old language did not allow a package to make a copy of a struct value containing unexported fields belonging to a different package.
--There was, however, a required exception for a method receiver;
--also, the implementations of <code>copy</code> and <code>append</code> have never honored the restriction.
--</p>
--
--<p>
--Go 1 will allow packages to copy struct values containing unexported fields from other packages.
--Besides resolving the inconsistency,
--this change admits a new kind of API: a package can return an opaque value without resorting to a pointer or interface.
--The new implementations of <code>time.Time</code> and
--<code>reflect.Value</code> are examples of types taking advantage of this new property.
--</p>
--
--<p>
--As an example, if package <code>p</code> includes the definitions,
--</p>
--
--<pre>
-- type Struct struct {
-- Public int
-- secret int
-- }
-- func NewStruct(a int) Struct { // Note: not a pointer.
-- return Struct{a, f(a)}
-- }
-- func (s Struct) String() string {
-- return fmt.Sprintf("{%d (secret %d)}", s.Public, s.secret)
-- }
--</pre>
--
--<p>
--a package that imports <code>p</code> can assign and copy values of type
--<code>p.Struct</code> at will.
--Behind the scenes the unexported fields will be assigned and copied just
--as if they were exported,
--but the client code will never be aware of them. The code
--</p>
--
--<pre>
-- import "p"
--
-- myStruct := p.NewStruct(23)
-- copyOfMyStruct := myStruct
-- fmt.Println(myStruct, copyOfMyStruct)
--</pre>
--
--<p>
--will show that the secret field of the struct has been copied to the new value.
--</p>
--
--<p>
--<em>Updating</em>:
--This is a new feature, so existing code needs no changes.
--</p>
--
--<h3 id="equality">Equality</h3>
--
--<p>
--Before Go 1, the language did not define equality on struct and array values.
--This meant,
--among other things, that structs and arrays could not be used as map keys.
--On the other hand, Go did define equality on function and map values.
--Function equality was problematic in the presence of closures
--(when are two closures equal?)
--while map equality compared pointers, not the maps' content, which was usually
--not what the user would want.
--</p>
--
--<p>
--Go 1 addressed these issues.
--First, structs and arrays can be compared for equality and inequality
--(<code>==</code> and <code>!=</code>),
--and therefore be used as map keys,
--provided they are composed from elements for which equality is also defined,
--using element-wise comparison.
--</p>
--
--<pre><!--{{code "/doc/progs/go1.go" `/type Day struct/` `/Printf/`}}
----> type Day struct {
-- long string
-- short string
-- }
-- Christmas := Day{"Christmas", "XMas"}
-- Thanksgiving := Day{"Thanksgiving", "Turkey"}
-- holiday := map[Day]bool{
-- Christmas: true,
-- Thanksgiving: true,
-- }
-- fmt.Printf("Christmas is a holiday: %t\n", holiday[Christmas])</pre>
--
--<p>
--Second, Go 1 removes the definition of equality for function values,
--except for comparison with <code>nil</code>.
--Finally, map equality is gone too, also except for comparison with <code>nil</code>.
--</p>
--
--<p>
--Note that equality is still undefined for slices, for which the
--calculation is in general infeasible. Also note that the ordered
--comparison operators (<code><</code> <code><=</code>
--<code>></code> <code>>=</code>) are still undefined for
--structs and arrays.
--
--<p>
--<em>Updating</em>:
--Struct and array equality is a new feature, so existing code needs no changes.
--Existing code that depends on function or map equality will be
--rejected by the compiler and will need to be fixed by hand.
--Few programs will be affected, but the fix may require some
--redesign.
--</p>
--
--<h2 id="packages">The package hierarchy</h2>
--
--<p>
--Go 1 addresses many deficiencies in the old standard library and
--cleans up a number of packages, making them more internally consistent
--and portable.
--</p>
--
--<p>
--This section describes how the packages have been rearranged in Go 1.
--Some have moved, some have been renamed, some have been deleted.
--New packages are described in later sections.
--</p>
--
--<h3 id="hierarchy">The package hierarchy</h3>
--
--<p>
--Go 1 has a rearranged package hierarchy that groups related items
--into subdirectories. For instance, <code>utf8</code> and
--<code>utf16</code> now occupy subdirectories of <code>unicode</code>.
--Also, <a href="#subrepo">some packages</a> have moved into
--subrepositories of
--<a href="http://code.google.com/p/go"><code>code.google.com/p/go</code></a>
--while <a href="#deleted">others</a> have been deleted outright.
--</p>
--
--<table class="codetable" frame="border" summary="Moved packages">
--<colgroup align="left" width="60%"></colgroup>
--<colgroup align="left" width="40%"></colgroup>
--<tr>
--<th align="left">Old path</th>
--<th align="left">New path</th>
--</tr>
--<tr>
--<td colspan="2"><hr></td>
--</tr>
--<tr><td>asn1</td> <td>encoding/asn1</td></tr>
--<tr><td>csv</td> <td>encoding/csv</td></tr>
--<tr><td>gob</td> <td>encoding/gob</td></tr>
--<tr><td>json</td> <td>encoding/json</td></tr>
--<tr><td>xml</td> <td>encoding/xml</td></tr>
--<tr>
--<td colspan="2"><hr></td>
--</tr>
--<tr><td>exp/template/html</td> <td>html/template</td></tr>
--<tr>
--<td colspan="2"><hr></td>
--</tr>
--<tr><td>big</td> <td>math/big</td></tr>
--<tr><td>cmath</td> <td>math/cmplx</td></tr>
--<tr><td>rand</td> <td>math/rand</td></tr>
--<tr>
--<td colspan="2"><hr></td>
--</tr>
--<tr><td>http</td> <td>net/http</td></tr>
--<tr><td>http/cgi</td> <td>net/http/cgi</td></tr>
--<tr><td>http/fcgi</td> <td>net/http/fcgi</td></tr>
--<tr><td>http/httptest</td> <td>net/http/httptest</td></tr>
--<tr><td>http/pprof</td> <td>net/http/pprof</td></tr>
--<tr><td>mail</td> <td>net/mail</td></tr>
--<tr><td>rpc</td> <td>net/rpc</td></tr>
--<tr><td>rpc/jsonrpc</td> <td>net/rpc/jsonrpc</td></tr>
--<tr><td>smtp</td> <td>net/smtp</td></tr>
--<tr><td>url</td> <td>net/url</td></tr>
--<tr>
--<td colspan="2"><hr></td>
--</tr>
--<tr><td>exec</td> <td>os/exec</td></tr>
--<tr>
--<td colspan="2"><hr></td>
--</tr>
--<tr><td>scanner</td> <td>text/scanner</td></tr>
--<tr><td>tabwriter</td> <td>text/tabwriter</td></tr>
--<tr><td>template</td> <td>text/template</td></tr>
--<tr><td>template/parse</td> <td>text/template/parse</td></tr>
--<tr>
--<td colspan="2"><hr></td>
--</tr>
--<tr><td>utf8</td> <td>unicode/utf8</td></tr>
--<tr><td>utf16</td> <td>unicode/utf16</td></tr>
--</table>
--
--<p>
--Note that the package names for the old <code>cmath</code> and
--<code>exp/template/html</code> packages have changed to <code>cmplx</code>
--and <code>template</code>.
--</p>
--
--<p>
--<em>Updating</em>:
--Running <code>go</code> <code>fix</code> will update all imports and package renames for packages that
--remain inside the standard repository. Programs that import packages
--that are no longer in the standard repository will need to be edited
--by hand.
--</p>
--
--<h3 id="exp">The package tree exp</h3>
--
--<p>
--Because they are not standardized, the packages under the <code>exp</code> directory will not be available in the
--standard Go 1 release distributions, although they will be available in source code form
--in <a href="http://code.google.com/p/go/">the repository</a> for
--developers who wish to use them.
--</p>
--
--<p>
--Several packages have moved under <code>exp</code> at the time of Go 1's release:
--</p>
--
--<ul>
--<li><code>ebnf</code></li>
--<li><code>html</code><sup>†</sup></li>
--<li><code>go/types</code></li>
--</ul>
--
--<p>
--(<sup>†</sup>The <code>EscapeString</code> and <code>UnescapeString</code> types remain
--in package <code>html</code>.)
--</p>
--
--<p>
--All these packages are available under the same names, with the prefix <code>exp/</code>: <code>exp/ebnf</code> etc.
--</p>
--
--<p>
--Also, the <code>utf8.String</code> type has been moved to its own package, <code>exp/utf8string</code>.
--</p>
--
--<p>
--Finally, the <code>gotype</code> command now resides in <code>exp/gotype</code>, while
--<code>ebnflint</code> is now in <code>exp/ebnflint</code>.
--If they are installed, they now reside in <code>$GOROOT/bin/tool</code>.
--</p>
--
--<p>
--<em>Updating</em>:
--Code that uses packages in <code>exp</code> will need to be updated by hand,
--or else compiled from an installation that has <code>exp</code> available.
--The <code>go</code> <code>fix</code> tool or the compiler will complain about such uses.
--</p>
--
--<h3 id="old">The package tree old</h3>
--
--<p>
--Because they are deprecated, the packages under the <code>old</code> directory will not be available in the
--standard Go 1 release distributions, although they will be available in source code form for
--developers who wish to use them.
--</p>
--
--<p>
--The packages in their new locations are:
--</p>
--
--<ul>
--<li><code>old/netchan</code></li>
--<li><code>old/regexp</code></li>
--<li><code>old/template</code></li>
--</ul>
--
--<p>
--<em>Updating</em>:
--Code that uses packages now in <code>old</code> will need to be updated by hand,
--or else compiled from an installation that has <code>old</code> available.
--The <code>go</code> <code>fix</code> tool will warn about such uses.
--</p>
--
--<h3 id="deleted">Deleted packages</h3>
--
--<p>
--Go 1 deletes several packages outright:
--</p>
--
--<ul>
--<li><code>container/vector</code></li>
--<li><code>exp/datafmt</code></li>
--<li><code>go/typechecker</code></li>
--<li><code>try</code></li>
--</ul>
--
--<p>
--and also the command <code>gotry</code>.
--</p>
--
--<p>
--<em>Updating</em>:
--Code that uses <code>container/vector</code> should be updated to use
--slices directly. See
--<a href="http://code.google.com/p/go-wiki/wiki/SliceTricks">the Go
--Language Community Wiki</a> for some suggestions.
--Code that uses the other packages (there should be almost zero) will need to be rethought.
--</p>
--
--<h3 id="subrepo">Packages moving to subrepositories</h3>
--
--<p>
--Go 1 has moved a number of packages into other repositories, usually sub-repositories of
--<a href="http://code.google.com/p/go/">the main Go repository</a>.
--This table lists the old and new import paths:
--
--<table class="codetable" frame="border" summary="Sub-repositories">
--<colgroup align="left" width="40%"></colgroup>
--<colgroup align="left" width="60%"></colgroup>
--<tr>
--<th align="left">Old</th>
--<th align="left">New</th>
--</tr>
--<tr>
--<td colspan="2"><hr></td>
--</tr>
--<tr><td>crypto/bcrypt</td> <td>code.google.com/p/go.crypto/bcrypt</tr>
--<tr><td>crypto/blowfish</td> <td>code.google.com/p/go.crypto/blowfish</tr>
--<tr><td>crypto/cast5</td> <td>code.google.com/p/go.crypto/cast5</tr>
--<tr><td>crypto/md4</td> <td>code.google.com/p/go.crypto/md4</tr>
--<tr><td>crypto/ocsp</td> <td>code.google.com/p/go.crypto/ocsp</tr>
--<tr><td>crypto/openpgp</td> <td>code.google.com/p/go.crypto/openpgp</tr>
--<tr><td>crypto/openpgp/armor</td> <td>code.google.com/p/go.crypto/openpgp/armor</tr>
--<tr><td>crypto/openpgp/elgamal</td> <td>code.google.com/p/go.crypto/openpgp/elgamal</tr>
--<tr><td>crypto/openpgp/errors</td> <td>code.google.com/p/go.crypto/openpgp/errors</tr>
--<tr><td>crypto/openpgp/packet</td> <td>code.google.com/p/go.crypto/openpgp/packet</tr>
--<tr><td>crypto/openpgp/s2k</td> <td>code.google.com/p/go.crypto/openpgp/s2k</tr>
--<tr><td>crypto/ripemd160</td> <td>code.google.com/p/go.crypto/ripemd160</tr>
--<tr><td>crypto/twofish</td> <td>code.google.com/p/go.crypto/twofish</tr>
--<tr><td>crypto/xtea</td> <td>code.google.com/p/go.crypto/xtea</tr>
--<tr><td>exp/ssh</td> <td>code.google.com/p/go.crypto/ssh</tr>
--<tr>
--<td colspan="2"><hr></td>
--</tr>
--<tr><td>image/bmp</td> <td>code.google.com/p/go.image/bmp</tr>
--<tr><td>image/tiff</td> <td>code.google.com/p/go.image/tiff</tr>
--<tr>
--<td colspan="2"><hr></td>
--</tr>
--<tr><td>net/dict</td> <td>code.google.com/p/go.net/dict</tr>
--<tr><td>net/websocket</td> <td>code.google.com/p/go.net/websocket</tr>
--<tr><td>exp/spdy</td> <td>code.google.com/p/go.net/spdy</tr>
--<tr>
--<td colspan="2"><hr></td>
--</tr>
--<tr><td>encoding/git85</td> <td>code.google.com/p/go.codereview/git85</tr>
--<tr><td>patch</td> <td>code.google.com/p/go.codereview/patch</tr>
--<tr>
--<td colspan="2"><hr></td>
--</tr>
--<tr><td>exp/wingui</td> <td>code.google.com/p/gowingui</tr>
--</table>
--
--<p>
--<em>Updating</em>:
--Running <code>go</code> <code>fix</code> will update imports of these packages to use the new import paths.
--Installations that depend on these packages will need to install them using
--a <code>go get</code> command.
--</p>
--
--<h2 id="major">Major changes to the library</h2>
--
--<p>
--This section describes significant changes to the core libraries, the ones that
--affect the most programs.
--</p>
--
--<h3 id="errors">The error type and errors package</h3>
--
--<p>
--The placement of <code>os.Error</code> in package <code>os</code> is mostly historical: errors first came up when implementing package <code>os</code>, and they seemed system-related at the time.
--Since then it has become clear that errors are more fundamental than the operating system. For example, it would be nice to use <code>Errors</code> in packages that <code>os</code> depends on, like <code>syscall</code>.
--Also, having <code>Error</code> in <code>os</code> introduces many dependencies on <code>os</code> that would otherwise not exist.
--</p>
--
--<p>
--Go 1 solves these problems by introducing a built-in <code>error</code> interface type and a separate <code>errors</code> package (analogous to <code>bytes</code> and <code>strings</code>) that contains utility functions.
--It replaces <code>os.NewError</code> with
--<a href="/pkg/errors/#New"><code>errors.New</code></a>,
--giving errors a more central place in the environment.
--</p>
--
--<p>
--So the widely-used <code>String</code> method does not cause accidental satisfaction
--of the <code>error</code> interface, the <code>error</code> interface uses instead
--the name <code>Error</code> for that method:
--</p>
--
--<pre>
-- type error interface {
-- Error() string
-- }
--</pre>
--
--<p>
--The <code>fmt</code> library automatically invokes <code>Error</code>, as it already
--does for <code>String</code>, for easy printing of error values.
--</p>
--
--<pre><!--{{code "/doc/progs/go1.go" `/START ERROR EXAMPLE/` `/END ERROR EXAMPLE/`}}
---->type SyntaxError struct {
-- File string
-- Line int
-- Message string
--}
--
--func (se *SyntaxError) Error() string {
-- return fmt.Sprintf("%s:%d: %s", se.File, se.Line, se.Message)
--}</pre>
--
--<p>
--All standard packages have been updated to use the new interface; the old <code>os.Error</code> is gone.
--</p>
--
--<p>
--A new package, <a href="/pkg/errors/"><code>errors</code></a>, contains the function
--</p>
--
--<pre>
--func New(text string) error
--</pre>
--
--<p>
--to turn a string into an error. It replaces the old <code>os.NewError</code>.
--</p>
--
--<pre><!--{{code "/doc/progs/go1.go" `/ErrSyntax/`}}
----> var ErrSyntax = errors.New("syntax error")</pre>
--
--<p>
--<em>Updating</em>:
--Running <code>go</code> <code>fix</code> will update almost all code affected by the change.
--Code that defines error types with a <code>String</code> method will need to be updated
--by hand to rename the methods to <code>Error</code>.
--</p>
--
--<h3 id="errno">System call errors</h3>
--
--<p>
--The old <code>syscall</code> package, which predated <code>os.Error</code>
--(and just about everything else),
--returned errors as <code>int</code> values.
--In turn, the <code>os</code> package forwarded many of these errors, such
--as <code>EINVAL</code>, but using a different set of errors on each platform.
--This behavior was unpleasant and unportable.
--</p>
--
--<p>
--In Go 1, the
--<a href="/pkg/syscall/"><code>syscall</code></a>
--package instead returns an <code>error</code> for system call errors.
--On Unix, the implementation is done by a
--<a href="/pkg/syscall/#Errno"><code>syscall.Errno</code></a> type
--that satisfies <code>error</code> and replaces the old <code>os.Errno</code>.
--</p>
--
--<p>
--The changes affecting <code>os.EINVAL</code> and relatives are
--described <a href="#os">elsewhere</a>.
--
--<p>
--<em>Updating</em>:
--Running <code>go</code> <code>fix</code> will update almost all code affected by the change.
--Regardless, most code should use the <code>os</code> package
--rather than <code>syscall</code> and so will be unaffected.
--</p>
--
--<h3 id="time">Time</h3>
--
--<p>
--Time is always a challenge to support well in a programming language.
--The old Go <code>time</code> package had <code>int64</code> units, no
--real type safety,
--and no distinction between absolute times and durations.
--</p>
--
--<p>
--One of the most sweeping changes in the Go 1 library is therefore a
--complete redesign of the
--<a href="/pkg/time/"><code>time</code></a> package.
--Instead of an integer number of nanoseconds as an <code>int64</code>,
--and a separate <code>*time.Time</code> type to deal with human
--units such as hours and years,
--there are now two fundamental types:
--<a href="/pkg/time/#Time"><code>time.Time</code></a>
--(a value, so the <code>*</code> is gone), which represents a moment in time;
--and <a href="/pkg/time/#Duration"><code>time.Duration</code></a>,
--which represents an interval.
--Both have nanosecond resolution.
--A <code>Time</code> can represent any time into the ancient
--past and remote future, while a <code>Duration</code> can
--span plus or minus only about 290 years.
--There are methods on these types, plus a number of helpful
--predefined constant durations such as <code>time.Second</code>.
--</p>
--
--<p>
--Among the new methods are things like
--<a href="/pkg/time/#Time.Add"><code>Time.Add</code></a>,
--which adds a <code>Duration</code> to a <code>Time</code>, and
--<a href="/pkg/time/#Time.Sub"><code>Time.Sub</code></a>,
--which subtracts two <code>Times</code> to yield a <code>Duration</code>.
--</p>
--
--<p>
--The most important semantic change is that the Unix epoch (Jan 1, 1970) is now
--relevant only for those functions and methods that mention Unix:
--<a href="/pkg/time/#Unix"><code>time.Unix</code></a>
--and the <a href="/pkg/time/#Time.Unix"><code>Unix</code></a>
--and <a href="/pkg/time/#Time.UnixNano"><code>UnixNano</code></a> methods
--of the <code>Time</code> type.
--In particular,
--<a href="/pkg/time/#Now"><code>time.Now</code></a>
--returns a <code>time.Time</code> value rather than, in the old
--API, an integer nanosecond count since the Unix epoch.
--</p>
--
--<pre><!--{{code "/doc/progs/go1.go" `/sleepUntil/` `/^}/`}}
----><span class="comment">// sleepUntil sleeps until the specified time. It returns immediately if it's too late.</span>
--func sleepUntil(wakeup time.Time) {
-- now := time.Now() <span class="comment">// A Time.</span>
-- if !wakeup.After(now) {
-- return
-- }
-- delta := wakeup.Sub(now) <span class="comment">// A Duration.</span>
-- fmt.Printf("Sleeping for %.3fs\n", delta.Seconds())
-- time.Sleep(delta)
--}</pre>
--
--<p>
--The new types, methods, and constants have been propagated through
--all the standard packages that use time, such as <code>os</code> and
--its representation of file time stamps.
--</p>
--
--<p>
--<em>Updating</em>:
--The <code>go</code> <code>fix</code> tool will update many uses of the old <code>time</code> package to use the new
--types and methods, although it does not replace values such as <code>1e9</code>
--representing nanoseconds per second.
--Also, because of type changes in some of the values that arise,
--some of the expressions rewritten by the fix tool may require
--further hand editing; in such cases the rewrite will include
--the correct function or method for the old functionality, but
--may have the wrong type or require further analysis.
--</p>
--
--<h2 id="minor">Minor changes to the library</h2>
--
--<p>
--This section describes smaller changes, such as those to less commonly
--used packages or that affect
--few programs beyond the need to run <code>go</code> <code>fix</code>.
--This category includes packages that are new in Go 1.
--Collectively they improve portability, regularize behavior, and
--make the interfaces more modern and Go-like.
--</p>
--
--<h3 id="archive_zip">The archive/zip package</h3>
--
--<p>
--In Go 1, <a href="/pkg/archive/zip/#Writer"><code>*zip.Writer</code></a> no
--longer has a <code>Write</code> method. Its presence was a mistake.
--</p>
--
--<p>
--<em>Updating</em>:
--What little code is affected will be caught by the compiler and must be updated by hand.
--</p>
--
--<h3 id="bufio">The bufio package</h3>
--
--<p>
--In Go 1, <a href="/pkg/bufio/#NewReaderSize"><code>bufio.NewReaderSize</code></a>
--and
--<a href="/pkg/bufio/#NewWriterSize"><code>bufio.NewWriterSize</code></a>
--functions no longer return an error for invalid sizes.
--If the argument size is too small or invalid, it is adjusted.
--</p>
--
--<p>
--<em>Updating</em>:
--Running <code>go</code> <code>fix</code> will update calls that assign the error to _.
--Calls that aren't fixed will be caught by the compiler and must be updated by hand.
--</p>
--
--<h3 id="compress">The compress/flate, compress/gzip and compress/zlib packages</h3>
--
--<p>
--In Go 1, the <code>NewWriterXxx</code> functions in
--<a href="/pkg/compress/flate"><code>compress/flate</code></a>,
--<a href="/pkg/compress/gzip"><code>compress/gzip</code></a> and
--<a href="/pkg/compress/zlib"><code>compress/zlib</code></a>
--all return <code>(*Writer, error)</code> if they take a compression level,
--and <code>*Writer</code> otherwise. Package <code>gzip</code>'s
--<code>Compressor</code> and <code>Decompressor</code> types have been renamed
--to <code>Writer</code> and <code>Reader</code>. Package <code>flate</code>'s
--<code>WrongValueError</code> type has been removed.
--</p>
--
--<p>
--<em>Updating</em>
--Running <code>go</code> <code>fix</code> will update old names and calls that assign the error to _.
--Calls that aren't fixed will be caught by the compiler and must be updated by hand.
--</p>
--
--<h3 id="crypto_aes_des">The crypto/aes and crypto/des packages</h3>
--
--<p>
--In Go 1, the <code>Reset</code> method has been removed. Go does not guarantee
--that memory is not copied and therefore this method was misleading.
--</p>
--
--<p>
--The cipher-specific types <code>*aes.Cipher</code>, <code>*des.Cipher</code>,
--and <code>*des.TripleDESCipher</code> have been removed in favor of
--<code>cipher.Block</code>.
--</p>
--
--<p>
--<em>Updating</em>:
--Remove the calls to Reset. Replace uses of the specific cipher types with
--cipher.Block.
--</p>
--
--<h3 id="crypto_elliptic">The crypto/elliptic package</h3>
--
--<p>
--In Go 1, <a href="/pkg/crypto/elliptic/#Curve"><code>elliptic.Curve</code></a>
--has been made an interface to permit alternative implementations. The curve
--parameters have been moved to the
--<a href="/pkg/crypto/elliptic/#CurveParams"><code>elliptic.CurveParams</code></a>
--structure.
--</p>
--
--<p>
--<em>Updating</em>:
--Existing users of <code>*elliptic.Curve</code> will need to change to
--simply <code>elliptic.Curve</code>. Calls to <code>Marshal</code>,
--<code>Unmarshal</code> and <code>GenerateKey</code> are now functions
--in <code>crypto/elliptic</code> that take an <code>elliptic.Curve</code>
--as their first argument.
--</p>
--
--<h3 id="crypto_hmac">The crypto/hmac package</h3>
--
--<p>
--In Go 1, the hash-specific functions, such as <code>hmac.NewMD5</code>, have
--been removed from <code>crypto/hmac</code>. Instead, <code>hmac.New</code> takes
--a function that returns a <code>hash.Hash</code>, such as <code>md5.New</code>.
--</p>
--
--<p>
--<em>Updating</em>:
--Running <code>go</code> <code>fix</code> will perform the needed changes.
--</p>
--
--<h3 id="crypto_x509">The crypto/x509 package</h3>
--
--<p>
--In Go 1, the
--<a href="/pkg/crypto/x509/#CreateCertificate"><code>CreateCertificate</code></a>
--and
--<a href="/pkg/crypto/x509/#CreateCRL"><code>CreateCRL</code></a>
--functions in <code>crypto/x509</code> have been altered to take an
--<code>interface{}</code> where they previously took a <code>*rsa.PublicKey</code>
--or <code>*rsa.PrivateKey</code>. This will allow other public key algorithms
--to be implemented in the future.
--</p>
--
--<p>
--<em>Updating</em>:
--No changes will be needed.
--</p>
--
--<h3 id="encoding_binary">The encoding/binary package</h3>
--
--<p>
--In Go 1, the <code>binary.TotalSize</code> function has been replaced by
--<a href="/pkg/encoding/binary/#Size"><code>Size</code></a>,
--which takes an <code>interface{}</code> argument rather than
--a <code>reflect.Value</code>.
--</p>
--
--<p>
--<em>Updating</em>:
--What little code is affected will be caught by the compiler and must be updated by hand.
--</p>
--
--<h3 id="encoding_xml">The encoding/xml package</h3>
--
--<p>
--In Go 1, the <a href="/pkg/encoding/xml/"><code>xml</code></a> package
--has been brought closer in design to the other marshaling packages such
--as <a href="/pkg/encoding/gob/"><code>encoding/gob</code></a>.
--</p>
--
--<p>
--The old <code>Parser</code> type is renamed
--<a href="/pkg/encoding/xml/#Decoder"><code>Decoder</code></a> and has a new
--<a href="/pkg/encoding/xml/#Decoder.Decode"><code>Decode</code></a> method. An
--<a href="/pkg/encoding/xml/#Encoder"><code>Encoder</code></a> type was also introduced.
--</p>
--
--<p>
--The functions <a href="/pkg/encoding/xml/#Marshal"><code>Marshal</code></a>
--and <a href="/pkg/encoding/xml/#Unmarshal"><code>Unmarshal</code></a>
--work with <code>[]byte</code> values now. To work with streams,
--use the new <a href="/pkg/encoding/xml/#Encoder"><code>Encoder</code></a>
--and <a href="/pkg/encoding/xml/#Decoder"><code>Decoder</code></a> types.
--</p>
--
--<p>
--When marshaling or unmarshaling values, the format of supported flags in
--field tags has changed to be closer to the
--<a href="/pkg/encoding/json"><code>json</code></a> package
--(<code>`xml:"name,flag"`</code>). The matching done between field tags, field
--names, and the XML attribute and element names is now case-sensitive.
--The <code>XMLName</code> field tag, if present, must also match the name
--of the XML element being marshaled.
--</p>
--
--<p>
--<em>Updating</em>:
--Running <code>go</code> <code>fix</code> will update most uses of the package except for some calls to
--<code>Unmarshal</code>. Special care must be taken with field tags,
--since the fix tool will not update them and if not fixed by hand they will
--misbehave silently in some cases. For example, the old
--<code>"attr"</code> is now written <code>",attr"</code> while plain
--<code>"attr"</code> remains valid but with a different meaning.
--</p>
--
--<h3 id="expvar">The expvar package</h3>
--
--<p>
--In Go 1, the <code>RemoveAll</code> function has been removed.
--The <code>Iter</code> function and Iter method on <code>*Map</code> have
--been replaced by
--<a href="/pkg/expvar/#Do"><code>Do</code></a>
--and
--<a href="/pkg/expvar/#Map.Do"><code>(*Map).Do</code></a>.
--</p>
--
--<p>
--<em>Updating</em>:
--Most code using <code>expvar</code> will not need changing. The rare code that used
--<code>Iter</code> can be updated to pass a closure to <code>Do</code> to achieve the same effect.
--</p>
--
--<h3 id="flag">The flag package</h3>
--
--<p>
--In Go 1, the interface <a href="/pkg/flag/#Value"><code>flag.Value</code></a> has changed slightly.
--The <code>Set</code> method now returns an <code>error</code> instead of
--a <code>bool</code> to indicate success or failure.
--</p>
--
--<p>
--There is also a new kind of flag, <code>Duration</code>, to support argument
--values specifying time intervals.
--Values for such flags must be given units, just as <code>time.Duration</code>
--formats them: <code>10s</code>, <code>1h30m</code>, etc.
--</p>
--
--<pre><!--{{code "/doc/progs/go1.go" `/timeout/`}}
---->var timeout = flag.Duration("timeout", 30*time.Second, "how long to wait for completion")</pre>
--
--<p>
--<em>Updating</em>:
--Programs that implement their own flags will need minor manual fixes to update their
--<code>Set</code> methods.
--The <code>Duration</code> flag is new and affects no existing code.
--</p>
--
--
--<h3 id="go">The go/* packages</h3>
--
--<p>
--Several packages under <code>go</code> have slightly revised APIs.
--</p>
--
--<p>
--A concrete <code>Mode</code> type was introduced for configuration mode flags
--in the packages
--<a href="/pkg/go/scanner/"><code>go/scanner</code></a>,
--<a href="/pkg/go/parser/"><code>go/parser</code></a>,
--<a href="/pkg/go/printer/"><code>go/printer</code></a>, and
--<a href="/pkg/go/doc/"><code>go/doc</code></a>.
--</p>
--
--<p>
--The modes <code>AllowIllegalChars</code> and <code>InsertSemis</code> have been removed
--from the <a href="/pkg/go/scanner/"><code>go/scanner</code></a> package. They were mostly
--useful for scanning text other then Go source files. Instead, the
--<a href="/pkg/text/scanner/"><code>text/scanner</code></a> package should be used
--for that purpose.
--</p>
--
--<p>
--The <a href="/pkg/go/scanner/#ErrorHandler"><code>ErrorHandler</code></a> provided
--to the scanner's <a href="/pkg/go/scanner/#Scanner.Init"><code>Init</code></a> method is
--now simply a function rather than an interface. The <code>ErrorVector</code> type has
--been removed in favor of the (existing) <a href="/pkg/go/scanner/#ErrorList"><code>ErrorList</code></a>
--type, and the <code>ErrorVector</code> methods have been migrated. Instead of embedding
--an <code>ErrorVector</code> in a client of the scanner, now a client should maintain
--an <code>ErrorList</code>.
--</p>
--
--<p>
--The set of parse functions provided by the <a href="/pkg/go/parser/"><code>go/parser</code></a>
--package has been reduced to the primary parse function
--<a href="/pkg/go/parser/#ParseFile"><code>ParseFile</code></a>, and a couple of
--convenience functions <a href="/pkg/go/parser/#ParseDir"><code>ParseDir</code></a>
--and <a href="/pkg/go/parser/#ParseExpr"><code>ParseExpr</code></a>.
--</p>
--
--<p>
--The <a href="/pkg/go/printer/"><code>go/printer</code></a> package supports an additional
--configuration mode <a href="/pkg/go/printer/#Mode"><code>SourcePos</code></a>;
--if set, the printer will emit <code>//line</code> comments such that the generated
--output contains the original source code position information. The new type
--<a href="/pkg/go/printer/#CommentedNode"><code>CommentedNode</code></a> can be
--used to provide comments associated with an arbitrary
--<a href="/pkg/go/ast/#Node"><code>ast.Node</code></a> (until now only
--<a href="/pkg/go/ast/#File"><code>ast.File</code></a> carried comment information).
--</p>
--
--<p>
--The type names of the <a href="/pkg/go/doc/"><code>go/doc</code></a> package have been
--streamlined by removing the <code>Doc</code> suffix: <code>PackageDoc</code>
--is now <code>Package</code>, <code>ValueDoc</code> is <code>Value</code>, etc.
--Also, all types now consistently have a <code>Name</code> field (or <code>Names</code>,
--in the case of type <code>Value</code>) and <code>Type.Factories</code> has become
--<code>Type.Funcs</code>.
--Instead of calling <code>doc.NewPackageDoc(pkg, importpath)</code>,
--documentation for a package is created with:
--</p>
--
--<pre>
-- doc.New(pkg, importpath, mode)
--</pre>
--
--<p>
--where the new <code>mode</code> parameter specifies the operation mode:
--if set to <a href="/pkg/go/doc/#AllDecls"><code>AllDecls</code></a>, all declarations
--(not just exported ones) are considered.
--The function <code>NewFileDoc</code> was removed, and the function
--<code>CommentText</code> has become the method
--<a href="/pkg/go/ast/#Text"><code>Text</code></a> of
--<a href="/pkg/go/ast/#CommentGroup"><code>ast.CommentGroup</code></a>.
--</p>
--
--<p>
--In package <a href="/pkg/go/token/"><code>go/token</code></a>, the
--<a href="/pkg/go/token/#FileSet"><code>token.FileSet</code></a> method <code>Files</code>
--(which originally returned a channel of <code>*token.File</code>s) has been replaced
--with the iterator <a href="/pkg/go/token/#FileSet.Iterate"><code>Iterate</code></a> that
--accepts a function argument instead.
--</p>
--
--<p>
--In package <a href="/pkg/go/build/"><code>go/build</code></a>, the API
--has been nearly completely replaced.
--The package still computes Go package information
--but it does not run the build: the <code>Cmd</code> and <code>Script</code>
--types are gone.
--(To build code, use the new
--<a href="/cmd/go/"><code>go</code></a> command instead.)
--The <code>DirInfo</code> type is now named
--<a href="/pkg/go/build/#Package"><code>Package</code></a>.
--<code>FindTree</code> and <code>ScanDir</code> are replaced by
--<a href="/pkg/go/build/#Import"><code>Import</code></a>
--and
--<a href="/pkg/go/build/#ImportDir"><code>ImportDir</code></a>.
--</p>
--
--<p>
--<em>Updating</em>:
--Code that uses packages in <code>go</code> will have to be updated by hand; the
--compiler will reject incorrect uses. Templates used in conjunction with any of the
--<code>go/doc</code> types may need manual fixes; the renamed fields will lead
--to run-time errors.
--</p>
--
--<h3 id="hash">The hash package</h3>
--
--<p>
--In Go 1, the definition of <a href="/pkg/hash/#Hash"><code>hash.Hash</code></a> includes
--a new method, <code>BlockSize</code>. This new method is used primarily in the
--cryptographic libraries.
--</p>
--
--<p>
--The <code>Sum</code> method of the
--<a href="/pkg/hash/#Hash"><code>hash.Hash</code></a> interface now takes a
--<code>[]byte</code> argument, to which the hash value will be appended.
--The previous behavior can be recreated by adding a <code>nil</code> argument to the call.
--</p>
--
--<p>
--<em>Updating</em>:
--Existing implementations of <code>hash.Hash</code> will need to add a
--<code>BlockSize</code> method. Hashes that process the input one byte at
--a time can implement <code>BlockSize</code> to return 1.
--Running <code>go</code> <code>fix</code> will update calls to the <code>Sum</code> methods of the various
--implementations of <code>hash.Hash</code>.
--</p>
--
--<p>
--<em>Updating</em>:
--Since the package's functionality is new, no updating is necessary.
--</p>
--
--<h3 id="http">The http package</h3>
--
--<p>
--In Go 1 the <a href="/pkg/net/http/"><code>http</code></a> package is refactored,
--putting some of the utilities into a
--<a href="/pkg/net/http/httputil/"><code>httputil</code></a> subdirectory.
--These pieces are only rarely needed by HTTP clients.
--The affected items are:
--</p>
--
--<ul>
--<li>ClientConn</li>
--<li>DumpRequest</li>
--<li>DumpRequestOut</li>
--<li>DumpResponse</li>
--<li>NewChunkedReader</li>
--<li>NewChunkedWriter</li>
--<li>NewClientConn</li>
--<li>NewProxyClientConn</li>
--<li>NewServerConn</li>
--<li>NewSingleHostReverseProxy</li>
--<li>ReverseProxy</li>
--<li>ServerConn</li>
--</ul>
--
--<p>
--The <code>Request.RawURL</code> field has been removed; it was a
--historical artifact.
--</p>
--
--<p>
--The <code>Handle</code> and <code>HandleFunc</code>
--functions, and the similarly-named methods of <code>ServeMux</code>,
--now panic if an attempt is made to register the same pattern twice.
--</p>
--
--<p>
--<em>Updating</em>:
--Running <code>go</code> <code>fix</code> will update the few programs that are affected except for
--uses of <code>RawURL</code>, which must be fixed by hand.
--</p>
--
--<h3 id="image">The image package</h3>
--
--<p>
--The <a href="/pkg/image/"><code>image</code></a> package has had a number of
--minor changes, rearrangements and renamings.
--</p>
--
--<p>
--Most of the color handling code has been moved into its own package,
--<a href="/pkg/image/color/"><code>image/color</code></a>.
--For the elements that moved, a symmetry arises; for instance,
--each pixel of an
--<a href="/pkg/image/#RGBA"><code>image.RGBA</code></a>
--is a
--<a href="/pkg/image/color/#RGBA"><code>color.RGBA</code></a>.
--</p>
--
--<p>
--The old <code>image/ycbcr</code> package has been folded, with some
--renamings, into the
--<a href="/pkg/image/"><code>image</code></a>
--and
--<a href="/pkg/image/color/"><code>image/color</code></a>
--packages.
--</p>
--
--<p>
--The old <code>image.ColorImage</code> type is still in the <code>image</code>
--package but has been renamed
--<a href="/pkg/image/#Uniform"><code>image.Uniform</code></a>,
--while <code>image.Tiled</code> has been removed.
--</p>
--
--<p>
--This table lists the renamings.
--</p>
--
--<table class="codetable" frame="border" summary="image renames">
--<colgroup align="left" width="50%"></colgroup>
--<colgroup align="left" width="50%"></colgroup>
--<tr>
--<th align="left">Old</th>
--<th align="left">New</th>
--</tr>
--<tr>
--<td colspan="2"><hr></td>
--</tr>
--<tr><td>image.Color</td> <td>color.Color</td></tr>
--<tr><td>image.ColorModel</td> <td>color.Model</td></tr>
--<tr><td>image.ColorModelFunc</td> <td>color.ModelFunc</td></tr>
--<tr><td>image.PalettedColorModel</td> <td>color.Palette</td></tr>
--<tr>
--<td colspan="2"><hr></td>
--</tr>
--<tr><td>image.RGBAColor</td> <td>color.RGBA</td></tr>
--<tr><td>image.RGBA64Color</td> <td>color.RGBA64</td></tr>
--<tr><td>image.NRGBAColor</td> <td>color.NRGBA</td></tr>
--<tr><td>image.NRGBA64Color</td> <td>color.NRGBA64</td></tr>
--<tr><td>image.AlphaColor</td> <td>color.Alpha</td></tr>
--<tr><td>image.Alpha16Color</td> <td>color.Alpha16</td></tr>
--<tr><td>image.GrayColor</td> <td>color.Gray</td></tr>
--<tr><td>image.Gray16Color</td> <td>color.Gray16</td></tr>
--<tr>
--<td colspan="2"><hr></td>
--</tr>
--<tr><td>image.RGBAColorModel</td> <td>color.RGBAModel</td></tr>
--<tr><td>image.RGBA64ColorModel</td> <td>color.RGBA64Model</td></tr>
--<tr><td>image.NRGBAColorModel</td> <td>color.NRGBAModel</td></tr>
--<tr><td>image.NRGBA64ColorModel</td> <td>color.NRGBA64Model</td></tr>
--<tr><td>image.AlphaColorModel</td> <td>color.AlphaModel</td></tr>
--<tr><td>image.Alpha16ColorModel</td> <td>color.Alpha16Model</td></tr>
--<tr><td>image.GrayColorModel</td> <td>color.GrayModel</td></tr>
--<tr><td>image.Gray16ColorModel</td> <td>color.Gray16Model</td></tr>
--<tr>
--<td colspan="2"><hr></td>
--</tr>
--<tr><td>ycbcr.RGBToYCbCr</td> <td>color.RGBToYCbCr</td></tr>
--<tr><td>ycbcr.YCbCrToRGB</td> <td>color.YCbCrToRGB</td></tr>
--<tr><td>ycbcr.YCbCrColorModel</td> <td>color.YCbCrModel</td></tr>
--<tr><td>ycbcr.YCbCrColor</td> <td>color.YCbCr</td></tr>
--<tr><td>ycbcr.YCbCr</td> <td>image.YCbCr</td></tr>
--<tr>
--<td colspan="2"><hr></td>
--</tr>
--<tr><td>ycbcr.SubsampleRatio444</td> <td>image.YCbCrSubsampleRatio444</td></tr>
--<tr><td>ycbcr.SubsampleRatio422</td> <td>image.YCbCrSubsampleRatio422</td></tr>
--<tr><td>ycbcr.SubsampleRatio420</td> <td>image.YCbCrSubsampleRatio420</td></tr>
--<tr>
--<td colspan="2"><hr></td>
--</tr>
--<tr><td>image.ColorImage</td> <td>image.Uniform</td></tr>
--</table>
--
--<p>
--The image package's <code>New</code> functions
--(<a href="/pkg/image/#NewRGBA"><code>NewRGBA</code></a>,
--<a href="/pkg/image/#NewRGBA64"><code>NewRGBA64</code></a>, etc.)
--take an <a href="/pkg/image/#Rectangle"><code>image.Rectangle</code></a> as an argument
--instead of four integers.
--</p>
--
--<p>
--Finally, there are new predefined <code>color.Color</code> variables
--<a href="/pkg/image/color/#Black"><code>color.Black</code></a>,
--<a href="/pkg/image/color/#White"><code>color.White</code></a>,
--<a href="/pkg/image/color/#Opaque"><code>color.Opaque</code></a>
--and
--<a href="/pkg/image/color/#Transparent"><code>color.Transparent</code></a>.
--</p>
--
--<p>
--<em>Updating</em>:
--Running <code>go</code> <code>fix</code> will update almost all code affected by the change.
--</p>
--
--<h3 id="log_syslog">The log/syslog package</h3>
--
--<p>
--In Go 1, the <a href="/pkg/log/syslog/#NewLogger"><code>syslog.NewLogger</code></a>
--function returns an error as well as a <code>log.Logger</code>.
--</p>
--
--<p>
--<em>Updating</em>:
--What little code is affected will be caught by the compiler and must be updated by hand.
--</p>
--
--<h3 id="mime">The mime package</h3>
--
--<p>
--In Go 1, the <a href="/pkg/mime/#FormatMediaType"><code>FormatMediaType</code></a> function
--of the <code>mime</code> package has been simplified to make it
--consistent with
--<a href="/pkg/mime/#ParseMediaType"><code>ParseMediaType</code></a>.
--It now takes <code>"text/html"</code> rather than <code>"text"</code> and <code>"html"</code>.
--</p>
--
--<p>
--<em>Updating</em>:
--What little code is affected will be caught by the compiler and must be updated by hand.
--</p>
--
--<h3 id="net">The net package</h3>
--
--<p>
--In Go 1, the various <code>SetTimeout</code>,
--<code>SetReadTimeout</code>, and <code>SetWriteTimeout</code> methods
--have been replaced with
--<a href="/pkg/net/#IPConn.SetDeadline"><code>SetDeadline</code></a>,
--<a href="/pkg/net/#IPConn.SetReadDeadline"><code>SetReadDeadline</code></a>, and
--<a href="/pkg/net/#IPConn.SetWriteDeadline"><code>SetWriteDeadline</code></a>,
--respectively. Rather than taking a timeout value in nanoseconds that
--apply to any activity on the connection, the new methods set an
--absolute deadline (as a <code>time.Time</code> value) after which
--reads and writes will time out and no longer block.
--</p>
--
--<p>
--There are also new functions
--<a href="/pkg/net/#DialTimeout"><code>net.DialTimeout</code></a>
--to simplify timing out dialing a network address and
--<a href="/pkg/net/#ListenMulticastUDP"><code>net.ListenMulticastUDP</code></a>
--to allow multicast UDP to listen concurrently across multiple listeners.
--The <code>net.ListenMulticastUDP</code> function replaces the old
--<code>JoinGroup</code> and <code>LeaveGroup</code> methods.
--</p>
--
--<p>
--<em>Updating</em>:
--Code that uses the old methods will fail to compile and must be updated by hand.
--The semantic change makes it difficult for the fix tool to update automatically.
--</p>
--
--<h3 id="os">The os package</h3>
--
--<p>
--The <code>Time</code> function has been removed; callers should use
--the <a href="/pkg/time/#Time"><code>Time</code></a> type from the
--<code>time</code> package.
--</p>
--
--<p>
--The <code>Exec</code> function has been removed; callers should use
--<code>Exec</code> from the <code>syscall</code> package, where available.
--</p>
--
--<p>
--The <code>ShellExpand</code> function has been renamed to <a
--href="/pkg/os/#ExpandEnv"><code>ExpandEnv</code></a>.
--</p>
--
--<p>
--The <a href="/pkg/os/#NewFile"><code>NewFile</code></a> function
--now takes a <code>uintptr</code> fd, instead of an <code>int</code>.
--The <a href="/pkg/os/#File.Fd"><code>Fd</code></a> method on files now
--also returns a <code>uintptr</code>.
--</p>
--
--<p>
--There are no longer error constants such as <code>EINVAL</code>
--in the <code>os</code> package, since the set of values varied with
--the underlying operating system. There are new portable functions like
--<a href="/pkg/os/#IsPermission"><code>IsPermission</code></a>
--to test common error properties, plus a few new error values
--with more Go-like names, such as
--<a href="/pkg/os/#ErrPermission"><code>ErrPermission</code></a>
--and
--<a href="/pkg/os/#ErrNoEnv"><code>ErrNoEnv</code></a>.
--</p>
--
--<p>
--The <code>Getenverror</code> function has been removed. To distinguish
--between a non-existent environment variable and an empty string,
--use <a href="/pkg/os/#Environ"><code>os.Environ</code></a> or
--<a href="/pkg/syscall/#Getenv"><code>syscall.Getenv</code></a>.
--</p>
--
--
--<p>
--The <a href="/pkg/os/#Process.Wait"><code>Process.Wait</code></a> method has
--dropped its option argument and the associated constants are gone
--from the package.
--Also, the function <code>Wait</code> is gone; only the method of
--the <code>Process</code> type persists.
--</p>
--
--<p>
--The <code>Waitmsg</code> type returned by
--<a href="/pkg/os/#Process.Wait"><code>Process.Wait</code></a>
--has been replaced with a more portable
--<a href="/pkg/os/#ProcessState"><code>ProcessState</code></a>
--type with accessor methods to recover information about the
--process.
--Because of changes to <code>Wait</code>, the <code>ProcessState</code>
--value always describes an exited process.
--Portability concerns simplified the interface in other ways, but the values returned by the
--<a href="/pkg/os/#ProcessState.Sys"><code>ProcessState.Sys</code></a> and
--<a href="/pkg/os/#ProcessState.SysUsage"><code>ProcessState.SysUsage</code></a>
--methods can be type-asserted to underlying system-specific data structures such as
--<a href="/pkg/syscall/#WaitStatus"><code>syscall.WaitStatus</code></a> and
--<a href="/pkg/syscall/#Rusage"><code>syscall.Rusage</code></a> on Unix.
--</p>
--
--<p>
--<em>Updating</em>:
--Running <code>go</code> <code>fix</code> will drop a zero argument to <code>Process.Wait</code>.
--All other changes will be caught by the compiler and must be updated by hand.
--</p>
--
--<h4 id="os_fileinfo">The os.FileInfo type</h4>
--
--<p>
--Go 1 redefines the <a href="/pkg/os/#FileInfo"><code>os.FileInfo</code></a> type,
--changing it from a struct to an interface:
--</p>
--
--<pre>
-- type FileInfo interface {
-- Name() string // base name of the file
-- Size() int64 // length in bytes
-- Mode() FileMode // file mode bits
-- ModTime() time.Time // modification time
-- IsDir() bool // abbreviation for Mode().IsDir()
-- Sys() interface{} // underlying data source (can return nil)
-- }
--</pre>
--
--<p>
--The file mode information has been moved into a subtype called
--<a href="/pkg/os/#FileMode"><code>os.FileMode</code></a>,
--a simple integer type with <code>IsDir</code>, <code>Perm</code>, and <code>String</code>
--methods.
--</p>
--
--<p>
--The system-specific details of file modes and properties such as (on Unix)
--i-number have been removed from <code>FileInfo</code> altogether.
--Instead, each operating system's <code>os</code> package provides an
--implementation of the <code>FileInfo</code> interface, which
--has a <code>Sys</code> method that returns the
--system-specific representation of file metadata.
--For instance, to discover the i-number of a file on a Unix system, unpack
--the <code>FileInfo</code> like this:
--</p>
--
--<pre>
-- fi, err := os.Stat("hello.go")
-- if err != nil {
-- log.Fatal(err)
-- }
-- // Check that it's a Unix file.
-- unixStat, ok := fi.Sys().(*syscall.Stat_t)
-- if !ok {
-- log.Fatal("hello.go: not a Unix file")
-- }
-- fmt.Printf("file i-number: %d\n", unixStat.Ino)
--</pre>
--
--<p>
--Assuming (which is unwise) that <code>"hello.go"</code> is a Unix file,
--the i-number expression could be contracted to
--</p>
--
--<pre>
-- fi.Sys().(*syscall.Stat_t).Ino
--</pre>
--
--<p>
--The vast majority of uses of <code>FileInfo</code> need only the methods
--of the standard interface.
--</p>
--
--<p>
--The <code>os</code> package no longer contains wrappers for the POSIX errors
--such as <code>ENOENT</code>.
--For the few programs that need to verify particular error conditions, there are
--now the boolean functions
--<a href="/pkg/os/#IsExist"><code>IsExist</code></a>,
--<a href="/pkg/os/#IsNotExist"><code>IsNotExist</code></a>
--and
--<a href="/pkg/os/#IsPermission"><code>IsPermission</code></a>.
--</p>
--
--<pre><!--{{code "/doc/progs/go1.go" `/os\.Open/` `/}/`}}
----> f, err := os.OpenFile(name, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0600)
-- if os.IsExist(err) {
-- log.Printf("%s already exists", name)
-- }</pre>
--
--<p>
--<em>Updating</em>:
--Running <code>go</code> <code>fix</code> will update code that uses the old equivalent of the current <code>os.FileInfo</code>
--and <code>os.FileMode</code> API.
--Code that needs system-specific file details will need to be updated by hand.
--Code that uses the old POSIX error values from the <code>os</code> package
--will fail to compile and will also need to be updated by hand.
--</p>
--
--<h3 id="os_signal">The os/signal package</h3>
--
--<p>
--The <code>os/signal</code> package in Go 1 replaces the
--<code>Incoming</code> function, which returned a channel
--that received all incoming signals,
--with the selective <code>Notify</code> function, which asks
--for delivery of specific signals on an existing channel.
--</p>
--
--<p>
--<em>Updating</em>:
--Code must be updated by hand.
--A literal translation of
--</p>
--<pre>
--c := signal.Incoming()
--</pre>
--<p>
--is
--</p>
--<pre>
--c := make(chan os.Signal)
--signal.Notify(c) // ask for all signals
--</pre>
--<p>
--but most code should list the specific signals it wants to handle instead:
--</p>
--<pre>
--c := make(chan os.Signal)
--signal.Notify(c, syscall.SIGHUP, syscall.SIGQUIT)
--</pre>
--
--<h3 id="path_filepath">The path/filepath package</h3>
--
--<p>
--In Go 1, the <a href="/pkg/path/filepath/#Walk"><code>Walk</code></a> function of the
--<code>path/filepath</code> package
--has been changed to take a function value of type
--<a href="/pkg/path/filepath/#WalkFunc"><code>WalkFunc</code></a>
--instead of a <code>Visitor</code> interface value.
--<code>WalkFunc</code> unifies the handling of both files and directories.
--</p>
--
--<pre>
-- type WalkFunc func(path string, info os.FileInfo, err error) error
--</pre>
--
--<p>
--The <code>WalkFunc</code> function will be called even for files or directories that could not be opened;
--in such cases the error argument will describe the failure.
--If a directory's contents are to be skipped,
--the function should return the value <a href="/pkg/path/filepath/#variables"><code>filepath.SkipDir</code></a>
--</p>
--
--<pre><!--{{code "/doc/progs/go1.go" `/STARTWALK/` `/ENDWALK/`}}
----> markFn := func(path string, info os.FileInfo, err error) error {
-- if path == "pictures" { <span class="comment">// Will skip walking of directory pictures and its contents.</span>
-- return filepath.SkipDir
-- }
-- if err != nil {
-- return err
-- }
-- log.Println(path)
-- return nil
-- }
-- err := filepath.Walk(".", markFn)
-- if err != nil {
-- log.Fatal(err)
-- }</pre>
--
--<p>
--<em>Updating</em>:
--The change simplifies most code but has subtle consequences, so affected programs
--will need to be updated by hand.
--The compiler will catch code using the old interface.
--</p>
--
--<h3 id="regexp">The regexp package</h3>
--
--<p>
--The <a href="/pkg/regexp/"><code>regexp</code></a> package has been rewritten.
--It has the same interface but the specification of the regular expressions
--it supports has changed from the old "egrep" form to that of
--<a href="http://code.google.com/p/re2/">RE2</a>.
--</p>
--
--<p>
--<em>Updating</em>:
--Code that uses the package should have its regular expressions checked by hand.
--</p>
--
--<h3 id="runtime">The runtime package</h3>
--
--<p>
--In Go 1, much of the API exported by package
--<code>runtime</code> has been removed in favor of
--functionality provided by other packages.
--Code using the <code>runtime.Type</code> interface
--or its specific concrete type implementations should
--now use package <a href="/pkg/reflect/"><code>reflect</code></a>.
--Code using <code>runtime.Semacquire</code> or <code>runtime.Semrelease</code>
--should use channels or the abstractions in package <a href="/pkg/sync/"><code>sync</code></a>.
--The <code>runtime.Alloc</code>, <code>runtime.Free</code>,
--and <code>runtime.Lookup</code> functions, an unsafe API created for
--debugging the memory allocator, have no replacement.
--</p>
--
--<p>
--Before, <code>runtime.MemStats</code> was a global variable holding
--statistics about memory allocation, and calls to <code>runtime.UpdateMemStats</code>
--ensured that it was up to date.
--In Go 1, <code>runtime.MemStats</code> is a struct type, and code should use
--<a href="/pkg/runtime/#ReadMemStats"><code>runtime.ReadMemStats</code></a>
--to obtain the current statistics.
--</p>
--
--<p>
--The package adds a new function,
--<a href="/pkg/runtime/#NumCPU"><code>runtime.NumCPU</code></a>, that returns the number of CPUs available
--for parallel execution, as reported by the operating system kernel.
--Its value can inform the setting of <code>GOMAXPROCS</code>.
--The <code>runtime.Cgocalls</code> and <code>runtime.Goroutines</code> functions
--have been renamed to <code>runtime.NumCgoCall</code> and <code>runtime.NumGoroutine</code>.
--</p>
--
--<p>
--<em>Updating</em>:
--Running <code>go</code> <code>fix</code> will update code for the function renamings.
--Other code will need to be updated by hand.
--</p>
--
--<h3 id="strconv">The strconv package</h3>
--
--<p>
--In Go 1, the
--<a href="/pkg/strconv/"><code>strconv</code></a>
--package has been significantly reworked to make it more Go-like and less C-like,
--although <code>Atoi</code> lives on (it's similar to
--<code>int(ParseInt(x, 10, 0))</code>, as does
--<code>Itoa(x)</code> (<code>FormatInt(int64(x), 10)</code>).
--There are also new variants of some of the functions that append to byte slices rather than
--return strings, to allow control over allocation.
--</p>
--
--<p>
--This table summarizes the renamings; see the
--<a href="/pkg/strconv/">package documentation</a>
--for full details.
--</p>
--
--<table class="codetable" frame="border" summary="strconv renames">
--<colgroup align="left" width="50%"></colgroup>
--<colgroup align="left" width="50%"></colgroup>
--<tr>
--<th align="left">Old call</th>
--<th align="left">New call</th>
--</tr>
--<tr>
--<td colspan="2"><hr></td>
--</tr>
--<tr><td>Atob(x)</td> <td>ParseBool(x)</td></tr>
--<tr>
--<td colspan="2"><hr></td>
--</tr>
--<tr><td>Atof32(x)</td> <td>ParseFloat(x, 32)§</td></tr>
--<tr><td>Atof64(x)</td> <td>ParseFloat(x, 64)</td></tr>
--<tr><td>AtofN(x, n)</td> <td>ParseFloat(x, n)</td></tr>
--<tr>
--<td colspan="2"><hr></td>
--</tr>
--<tr><td>Atoi(x)</td> <td>Atoi(x)</td></tr>
--<tr><td>Atoi(x)</td> <td>ParseInt(x, 10, 0)§</td></tr>
--<tr><td>Atoi64(x)</td> <td>ParseInt(x, 10, 64)</td></tr>
--<tr>
--<td colspan="2"><hr></td>
--</tr>
--<tr><td>Atoui(x)</td> <td>ParseUint(x, 10, 0)§</td></tr>
--<tr><td>Atoui64(x)</td> <td>ParseUint(x, 10, 64)</td></tr>
--<tr>
--<td colspan="2"><hr></td>
--</tr>
--<tr><td>Btoi64(x, b)</td> <td>ParseInt(x, b, 64)</td></tr>
--<tr><td>Btoui64(x, b)</td> <td>ParseUint(x, b, 64)</td></tr>
--<tr>
--<td colspan="2"><hr></td>
--</tr>
--<tr><td>Btoa(x)</td> <td>FormatBool(x)</td></tr>
--<tr>
--<td colspan="2"><hr></td>
--</tr>
--<tr><td>Ftoa32(x, f, p)</td> <td>FormatFloat(float64(x), f, p, 32)</td></tr>
--<tr><td>Ftoa64(x, f, p)</td> <td>FormatFloat(x, f, p, 64)</td></tr>
--<tr><td>FtoaN(x, f, p, n)</td> <td>FormatFloat(x, f, p, n)</td></tr>
--<tr>
--<td colspan="2"><hr></td>
--</tr>
--<tr><td>Itoa(x)</td> <td>Itoa(x)</td></tr>
--<tr><td>Itoa(x)</td> <td>FormatInt(int64(x), 10)</td></tr>
--<tr><td>Itoa64(x)</td> <td>FormatInt(x, 10)</td></tr>
--<tr>
--<td colspan="2"><hr></td>
--</tr>
--<tr><td>Itob(x, b)</td> <td>FormatInt(int64(x), b)</td></tr>
--<tr><td>Itob64(x, b)</td> <td>FormatInt(x, b)</td></tr>
--<tr>
--<td colspan="2"><hr></td>
--</tr>
--<tr><td>Uitoa(x)</td> <td>FormatUint(uint64(x), 10)</td></tr>
--<tr><td>Uitoa64(x)</td> <td>FormatUint(x, 10)</td></tr>
--<tr>
--<td colspan="2"><hr></td>
--</tr>
--<tr><td>Uitob(x, b)</td> <td>FormatUint(uint64(x), b)</td></tr>
--<tr><td>Uitob64(x, b)</td> <td>FormatUint(x, b)</td></tr>
--</table>
--
--<p>
--<em>Updating</em>:
--Running <code>go</code> <code>fix</code> will update almost all code affected by the change.
--<br>
--§ <code>Atoi</code> persists but <code>Atoui</code> and <code>Atof32</code> do not, so
--they may require
--a cast that must be added by hand; the <code>go</code> <code>fix</code> tool will warn about it.
--</p>
--
--
--<h3 id="templates">The template packages</h3>
--
--<p>
--The <code>template</code> and <code>exp/template/html</code> packages have moved to
--<a href="/pkg/text/template/"><code>text/template</code></a> and
--<a href="/pkg/html/template/"><code>html/template</code></a>.
--More significant, the interface to these packages has been simplified.
--The template language is the same, but the concept of "template set" is gone
--and the functions and methods of the packages have changed accordingly,
--often by elimination.
--</p>
--
--<p>
--Instead of sets, a <code>Template</code> object
--may contain multiple named template definitions,
--in effect constructing
--name spaces for template invocation.
--A template can invoke any other template associated with it, but only those
--templates associated with it.
--The simplest way to associate templates is to parse them together, something
--made easier with the new structure of the packages.
--</p>
--
--<p>
--<em>Updating</em>:
--The imports will be updated by fix tool.
--Single-template uses will be otherwise be largely unaffected.
--Code that uses multiple templates in concert will need to be updated by hand.
--The <a href="/pkg/text/template/#examples">examples</a> in
--the documentation for <code>text/template</code> can provide guidance.
--</p>
--
--<h3 id="testing">The testing package</h3>
--
--<p>
--The testing package has a type, <code>B</code>, passed as an argument to benchmark functions.
--In Go 1, <code>B</code> has new methods, analogous to those of <code>T</code>, enabling
--logging and failure reporting.
--</p>
--
--<pre><!--{{code "/doc/progs/go1.go" `/func.*Benchmark/` `/^}/`}}
---->func BenchmarkSprintf(b *testing.B) {
-- <span class="comment">// Verify correctness before running benchmark.</span>
-- b.StopTimer()
-- got := fmt.Sprintf("%x", 23)
-- const expect = "17"
-- if expect != got {
-- b.Fatalf("expected %q; got %q", expect, got)
-- }
-- b.StartTimer()
-- for i := 0; i < b.N; i++ {
-- fmt.Sprintf("%x", 23)
-- }
--}</pre>
--
--<p>
--<em>Updating</em>:
--Existing code is unaffected, although benchmarks that use <code>println</code>
--or <code>panic</code> should be updated to use the new methods.
--</p>
--
--<h3 id="testing_script">The testing/script package</h3>
--
--<p>
--The testing/script package has been deleted. It was a dreg.
--</p>
--
--<p>
--<em>Updating</em>:
--No code is likely to be affected.
--</p>
--
--<h3 id="unsafe">The unsafe package</h3>
--
--<p>
--In Go 1, the functions
--<code>unsafe.Typeof</code>, <code>unsafe.Reflect</code>,
--<code>unsafe.Unreflect</code>, <code>unsafe.New</code>, and
--<code>unsafe.NewArray</code> have been removed;
--they duplicated safer functionality provided by
--package <a href="/pkg/reflect/"><code>reflect</code></a>.
--</p>
--
--<p>
--<em>Updating</em>:
--Code using these functions must be rewritten to use
--package <a href="/pkg/reflect/"><code>reflect</code></a>.
--The changes to <a href="http://code.google.com/p/go/source/detail?r=2646dc956207">encoding/gob</a> and the <a href="http://code.google.com/p/goprotobuf/source/detail?r=5340ad310031">protocol buffer library</a>
--may be helpful as examples.
--</p>
--
--<h3 id="url">The url package</h3>
--
--<p>
--In Go 1 several fields from the <a href="/pkg/net/url/#URL"><code>url.URL</code></a> type
--were removed or replaced.
--</p>
--
--<p>
--The <a href="/pkg/net/url/#URL.String"><code>String</code></a> method now
--predictably rebuilds an encoded URL string using all of <code>URL</code>'s
--fields as necessary. The resulting string will also no longer have
--passwords escaped.
--</p>
--
--<p>
--The <code>Raw</code> field has been removed. In most cases the <code>String</code>
--method may be used in its place.
--</p>
--
--<p>
--The old <code>RawUserinfo</code> field is replaced by the <code>User</code>
--field, of type <a href="/pkg/net/url/#Userinfo"><code>*net.Userinfo</code></a>.
--Values of this type may be created using the new <a href="/pkg/net/url/#User"><code>net.User</code></a>
--and <a href="/pkg/net/url/#UserPassword"><code>net.UserPassword</code></a>
--functions. The <code>EscapeUserinfo</code> and <code>UnescapeUserinfo</code>
--functions are also gone.
--</p>
--
--<p>
--The <code>RawAuthority</code> field has been removed. The same information is
--available in the <code>Host</code> and <code>User</code> fields.
--</p>
--
--<p>
--The <code>RawPath</code> field and the <code>EncodedPath</code> method have
--been removed. The path information in rooted URLs (with a slash following the
--schema) is now available only in decoded form in the <code>Path</code> field.
--Occasionally, the encoded data may be required to obtain information that
--was lost in the decoding process. These cases must be handled by accessing
--the data the URL was built from.
--</p>
--
--<p>
--URLs with non-rooted paths, such as <code>"mailto:dev at golang.org?subject=Hi"</code>,
--are also handled differently. The <code>OpaquePath</code> boolean field has been
--removed and a new <code>Opaque</code> string field introduced to hold the encoded
--path for such URLs. In Go 1, the cited URL parses as:
--</p>
--
--<pre>
-- URL{
-- Scheme: "mailto",
-- Opaque: "dev at golang.org",
-- RawQuery: "subject=Hi",
-- }
--</pre>
--
--<p>
--A new <a href="/pkg/net/url/#URL.RequestURI"><code>RequestURI</code></a> method was
--added to <code>URL</code>.
--</p>
--
--<p>
--The <code>ParseWithReference</code> function has been renamed to <code>ParseWithFragment</code>.
--</p>
--
--<p>
--<em>Updating</em>:
--Code that uses the old fields will fail to compile and must be updated by hand.
--The semantic changes make it difficult for the fix tool to update automatically.
--</p>
--
--<h2 id="cmd_go">The go command</h2>
--
--<p>
--Go 1 introduces the <a href="/cmd/go/">go command</a>, a tool for fetching,
--building, and installing Go packages and commands. The <code>go</code> command
--does away with makefiles, instead using Go source code to find dependencies and
--determine build conditions. Most existing Go programs will no longer require
--makefiles to be built.
--</p>
--
--<p>
--See <a href="/doc/code.html">How to Write Go Code</a> for a primer on the
--<code>go</code> command and the <a href="/cmd/go/">go command documentation</a>
--for the full details.
--</p>
--
--<p>
--<em>Updating</em>:
--Projects that depend on the Go project's old makefile-based build
--infrastructure (<code>Make.pkg</code>, <code>Make.cmd</code>, and so on) should
--switch to using the <code>go</code> command for building Go code and, if
--necessary, rewrite their makefiles to perform any auxiliary build tasks.
--</p>
--
--<h2 id="cmd_cgo">The cgo command</h2>
--
--<p>
--In Go 1, the <a href="/cmd/cgo">cgo command</a>
--uses a different <code>_cgo_export.h</code>
--file, which is generated for packages containing <code>//export</code> lines.
--The <code>_cgo_export.h</code> file now begins with the C preamble comment,
--so that exported function definitions can use types defined there.
--This has the effect of compiling the preamble multiple times, so a
--package using <code>//export</code> must not put function definitions
--or variable initializations in the C preamble.
--</p>
--
--<h2 id="releases">Packaged releases</h2>
--
--<p>
--One of the most significant changes associated with Go 1 is the availability
--of prepackaged, downloadable distributions.
--They are available for many combinations of architecture and operating system
--(including Windows) and the list will grow.
--Installation details are described on the
--<a href="/doc/install">Getting Started</a> page, while
--the distributions themselves are listed on the
--<a href="http://code.google.com/p/go/downloads/list">downloads page</a>.
--
--
--</div>
--
--<div id="footer">
--Build version go1.0.1.<br>
--Except as <a href="http://code.google.com/policies.html#restrictions">noted</a>,
--the content of this page is licensed under the
--Creative Commons Attribution 3.0 License,
--and code is licensed under a <a href="/LICENSE">BSD license</a>.<br>
--<a href="/doc/tos.html">Terms of Service</a> |
--<a href="http://www.google.com/intl/en/privacy/privacy-policy.html">Privacy Policy</a>
--</div>
--
--<script type="text/javascript">
--(function() {
-- var ga = document.createElement("script"); ga.type = "text/javascript"; ga.async = true;
-- ga.src = ("https:" == document.location.protocol ? "https://ssl" : "http://www") + ".google-analytics.com/ga.js";
-- var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(ga, s);
--})();
--</script>
--</body>
--<script type="text/javascript">
-- (function() {
-- var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
-- po.src = 'https://apis.google.com/js/plusone.js';
-- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
-- })();
--</script>
--</html>
--
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/README b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/README
-deleted file mode 100644
-index 9b4c2d8..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/README
-+++ /dev/null
-@@ -1,28 +0,0 @@
--The *.dat files in this directory are copied from The WebKit Open Source
--Project, specifically $WEBKITROOT/LayoutTests/html5lib/resources.
--WebKit is licensed under a BSD style license.
--http://webkit.org/coding/bsd-license.html says:
--
--Copyright (C) 2009 Apple Inc. All rights reserved.
--
--Redistribution and use in source and binary forms, with or without
--modification, are permitted provided that the following conditions are met:
--
--1. Redistributions of source code must retain the above copyright notice,
--this list of conditions and the following disclaimer.
--
--2. Redistributions in binary form must reproduce the above copyright notice,
--this list of conditions and the following disclaimer in the documentation
--and/or other materials provided with the distribution.
--
--THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS "AS IS" AND ANY
--EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
--WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
--DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
--DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
--(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
--LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
--ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
--(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
--SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/adoption01.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/adoption01.dat
-deleted file mode 100644
-index 787e1b0..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/adoption01.dat
-+++ /dev/null
-@@ -1,194 +0,0 @@
--#data
--<a><p></a></p>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <a>
--| <p>
--| <a>
--
--#data
--<a>1<p>2</a>3</p>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <a>
--| "1"
--| <p>
--| <a>
--| "2"
--| "3"
--
--#data
--<a>1<button>2</a>3</button>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <a>
--| "1"
--| <button>
--| <a>
--| "2"
--| "3"
--
--#data
--<a>1<b>2</a>3</b>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <a>
--| "1"
--| <b>
--| "2"
--| <b>
--| "3"
--
--#data
--<a>1<div>2<div>3</a>4</div>5</div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <a>
--| "1"
--| <div>
--| <a>
--| "2"
--| <div>
--| <a>
--| "3"
--| "4"
--| "5"
--
--#data
--<table><a>1<p>2</a>3</p>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <a>
--| "1"
--| <p>
--| <a>
--| "2"
--| "3"
--| <table>
--
--#data
--<b><b><a><p></a>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <b>
--| <b>
--| <a>
--| <p>
--| <a>
--
--#data
--<b><a><b><p></a>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <b>
--| <a>
--| <b>
--| <b>
--| <p>
--| <a>
--
--#data
--<a><b><b><p></a>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <a>
--| <b>
--| <b>
--| <b>
--| <b>
--| <p>
--| <a>
--
--#data
--<p>1<s id="A">2<b id="B">3</p>4</s>5</b>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <p>
--| "1"
--| <s>
--| id="A"
--| "2"
--| <b>
--| id="B"
--| "3"
--| <s>
--| id="A"
--| <b>
--| id="B"
--| "4"
--| <b>
--| id="B"
--| "5"
--
--#data
--<table><a>1<td>2</td>3</table>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <a>
--| "1"
--| <a>
--| "3"
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| "2"
--
--#data
--<table>A<td>B</td>C</table>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "AC"
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| "B"
--
--#data
--<a><svg><tr><input></a>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <a>
--| <svg svg>
--| <svg tr>
--| <svg input>
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/adoption02.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/adoption02.dat
-deleted file mode 100644
-index d18151b..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/adoption02.dat
-+++ /dev/null
-@@ -1,31 +0,0 @@
--#data
--<b>1<i>2<p>3</b>4
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <b>
--| "1"
--| <i>
--| "2"
--| <i>
--| <p>
--| <b>
--| "3"
--| "4"
--
--#data
--<a><div><style></style><address><a>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <a>
--| <div>
--| <a>
--| <style>
--| <address>
--| <a>
--| <a>
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/comments01.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/comments01.dat
-deleted file mode 100644
-index 44f1876..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/comments01.dat
-+++ /dev/null
-@@ -1,135 +0,0 @@
--#data
--FOO<!-- BAR -->BAZ
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO"
--| <!-- BAR -->
--| "BAZ"
--
--#data
--FOO<!-- BAR --!>BAZ
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO"
--| <!-- BAR -->
--| "BAZ"
--
--#data
--FOO<!-- BAR -- >BAZ
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO"
--| <!-- BAR -- >BAZ -->
--
--#data
--FOO<!-- BAR -- <QUX> -- MUX -->BAZ
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO"
--| <!-- BAR -- <QUX> -- MUX -->
--| "BAZ"
--
--#data
--FOO<!-- BAR -- <QUX> -- MUX --!>BAZ
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO"
--| <!-- BAR -- <QUX> -- MUX -->
--| "BAZ"
--
--#data
--FOO<!-- BAR -- <QUX> -- MUX -- >BAZ
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO"
--| <!-- BAR -- <QUX> -- MUX -- >BAZ -->
--
--#data
--FOO<!---->BAZ
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO"
--| <!-- -->
--| "BAZ"
--
--#data
--FOO<!--->BAZ
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO"
--| <!-- -->
--| "BAZ"
--
--#data
--FOO<!-->BAZ
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO"
--| <!-- -->
--| "BAZ"
--
--#data
--<?xml version="1.0">Hi
--#errors
--#document
--| <!-- ?xml version="1.0" -->
--| <html>
--| <head>
--| <body>
--| "Hi"
--
--#data
--<?xml version="1.0">
--#errors
--#document
--| <!-- ?xml version="1.0" -->
--| <html>
--| <head>
--| <body>
--
--#data
--<?xml version
--#errors
--#document
--| <!-- ?xml version -->
--| <html>
--| <head>
--| <body>
--
--#data
--FOO<!----->BAZ
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO"
--| <!-- - -->
--| "BAZ"
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/doctype01.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/doctype01.dat
-deleted file mode 100644
-index ae45732..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/doctype01.dat
-+++ /dev/null
-@@ -1,370 +0,0 @@
--#data
--<!DOCTYPE html>Hello
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| "Hello"
--
--#data
--<!dOctYpE HtMl>Hello
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| "Hello"
--
--#data
--<!DOCTYPEhtml>Hello
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| "Hello"
--
--#data
--<!DOCTYPE>Hello
--#errors
--#document
--| <!DOCTYPE >
--| <html>
--| <head>
--| <body>
--| "Hello"
--
--#data
--<!DOCTYPE >Hello
--#errors
--#document
--| <!DOCTYPE >
--| <html>
--| <head>
--| <body>
--| "Hello"
--
--#data
--<!DOCTYPE potato>Hello
--#errors
--#document
--| <!DOCTYPE potato>
--| <html>
--| <head>
--| <body>
--| "Hello"
--
--#data
--<!DOCTYPE potato >Hello
--#errors
--#document
--| <!DOCTYPE potato>
--| <html>
--| <head>
--| <body>
--| "Hello"
--
--#data
--<!DOCTYPE potato taco>Hello
--#errors
--#document
--| <!DOCTYPE potato>
--| <html>
--| <head>
--| <body>
--| "Hello"
--
--#data
--<!DOCTYPE potato taco "ddd>Hello
--#errors
--#document
--| <!DOCTYPE potato>
--| <html>
--| <head>
--| <body>
--| "Hello"
--
--#data
--<!DOCTYPE potato sYstEM>Hello
--#errors
--#document
--| <!DOCTYPE potato>
--| <html>
--| <head>
--| <body>
--| "Hello"
--
--#data
--<!DOCTYPE potato sYstEM >Hello
--#errors
--#document
--| <!DOCTYPE potato>
--| <html>
--| <head>
--| <body>
--| "Hello"
--
--#data
--<!DOCTYPE potato sYstEM ggg>Hello
--#errors
--#document
--| <!DOCTYPE potato>
--| <html>
--| <head>
--| <body>
--| "Hello"
--
--#data
--<!DOCTYPE potato SYSTEM taco >Hello
--#errors
--#document
--| <!DOCTYPE potato>
--| <html>
--| <head>
--| <body>
--| "Hello"
--
--#data
--<!DOCTYPE potato SYSTEM 'taco"'>Hello
--#errors
--#document
--| <!DOCTYPE potato "" "taco"">
--| <html>
--| <head>
--| <body>
--| "Hello"
--
--#data
--<!DOCTYPE potato SYSTEM "taco">Hello
--#errors
--#document
--| <!DOCTYPE potato "" "taco">
--| <html>
--| <head>
--| <body>
--| "Hello"
--
--#data
--<!DOCTYPE potato SYSTEM "tai'co">Hello
--#errors
--#document
--| <!DOCTYPE potato "" "tai'co">
--| <html>
--| <head>
--| <body>
--| "Hello"
--
--#data
--<!DOCTYPE potato SYSTEMtaco "ddd">Hello
--#errors
--#document
--| <!DOCTYPE potato>
--| <html>
--| <head>
--| <body>
--| "Hello"
--
--#data
--<!DOCTYPE potato grass SYSTEM taco>Hello
--#errors
--#document
--| <!DOCTYPE potato>
--| <html>
--| <head>
--| <body>
--| "Hello"
--
--#data
--<!DOCTYPE potato pUbLIc>Hello
--#errors
--#document
--| <!DOCTYPE potato>
--| <html>
--| <head>
--| <body>
--| "Hello"
--
--#data
--<!DOCTYPE potato pUbLIc >Hello
--#errors
--#document
--| <!DOCTYPE potato>
--| <html>
--| <head>
--| <body>
--| "Hello"
--
--#data
--<!DOCTYPE potato pUbLIcgoof>Hello
--#errors
--#document
--| <!DOCTYPE potato>
--| <html>
--| <head>
--| <body>
--| "Hello"
--
--#data
--<!DOCTYPE potato PUBLIC goof>Hello
--#errors
--#document
--| <!DOCTYPE potato>
--| <html>
--| <head>
--| <body>
--| "Hello"
--
--#data
--<!DOCTYPE potato PUBLIC "go'of">Hello
--#errors
--#document
--| <!DOCTYPE potato "go'of" "">
--| <html>
--| <head>
--| <body>
--| "Hello"
--
--#data
--<!DOCTYPE potato PUBLIC 'go'of'>Hello
--#errors
--#document
--| <!DOCTYPE potato "go" "">
--| <html>
--| <head>
--| <body>
--| "Hello"
--
--#data
--<!DOCTYPE potato PUBLIC 'go:hh of' >Hello
--#errors
--#document
--| <!DOCTYPE potato "go:hh of" "">
--| <html>
--| <head>
--| <body>
--| "Hello"
--
--#data
--<!DOCTYPE potato PUBLIC "W3C-//dfdf" SYSTEM ggg>Hello
--#errors
--#document
--| <!DOCTYPE potato "W3C-//dfdf" "">
--| <html>
--| <head>
--| <body>
--| "Hello"
--
--#data
--<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-- "http://www.w3.org/TR/html4/strict.dtd">Hello
--#errors
--#document
--| <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
--| <html>
--| <head>
--| <body>
--| "Hello"
--
--#data
--<!DOCTYPE ...>Hello
--#errors
--#document
--| <!DOCTYPE ...>
--| <html>
--| <head>
--| <body>
--| "Hello"
--
--#data
--<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
--"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
--#errors
--#document
--| <!DOCTYPE html "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
--| <html>
--| <head>
--| <body>
--
--#data
--<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
--"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
--#errors
--#document
--| <!DOCTYPE html "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
--| <html>
--| <head>
--| <body>
--
--#data
--<!DOCTYPE root-element [SYSTEM OR PUBLIC FPI] "uri" [
--<!-- internal declarations -->
--]>
--#errors
--#document
--| <!DOCTYPE root-element>
--| <html>
--| <head>
--| <body>
--| "]>"
--
--#data
--<!DOCTYPE html PUBLIC
-- "-//WAPFORUM//DTD XHTML Mobile 1.0//EN"
-- "http://www.wapforum.org/DTD/xhtml-mobile10.dtd">
--#errors
--#document
--| <!DOCTYPE html "-//WAPFORUM//DTD XHTML Mobile 1.0//EN" "http://www.wapforum.org/DTD/xhtml-mobile10.dtd">
--| <html>
--| <head>
--| <body>
--
--#data
--<!DOCTYPE HTML SYSTEM "http://www.w3.org/DTD/HTML4-strict.dtd"><body><b>Mine!</b></body>
--#errors
--#document
--| <!DOCTYPE html "" "http://www.w3.org/DTD/HTML4-strict.dtd">
--| <html>
--| <head>
--| <body>
--| <b>
--| "Mine!"
--
--#data
--<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN""http://www.w3.org/TR/html4/strict.dtd">
--#errors
--#document
--| <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
--| <html>
--| <head>
--| <body>
--
--#data
--<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"'http://www.w3.org/TR/html4/strict.dtd'>
--#errors
--#document
--| <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
--| <html>
--| <head>
--| <body>
--
--#data
--<!DOCTYPE HTML PUBLIC"-//W3C//DTD HTML 4.01//EN"'http://www.w3.org/TR/html4/strict.dtd'>
--#errors
--#document
--| <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
--| <html>
--| <head>
--| <body>
--
--#data
--<!DOCTYPE HTML PUBLIC'-//W3C//DTD HTML 4.01//EN''http://www.w3.org/TR/html4/strict.dtd'>
--#errors
--#document
--| <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
--| <html>
--| <head>
--| <body>
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/entities01.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/entities01.dat
-deleted file mode 100644
-index c8073b7..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/entities01.dat
-+++ /dev/null
-@@ -1,603 +0,0 @@
--#data
--FOO>BAR
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO>BAR"
--
--#data
--FOO>BAR
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO>BAR"
--
--#data
--FOO> BAR
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO> BAR"
--
--#data
--FOO>;;BAR
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO>;;BAR"
--
--#data
--I'm ¬it; I tell you
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "I'm ¬it; I tell you"
--
--#data
--I'm ∉ I tell you
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "I'm ∉ I tell you"
--
--#data
--FOO& BAR
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO& BAR"
--
--#data
--FOO&<BAR>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO&"
--| <bar>
--
--#data
--FOO&&&>BAR
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO&&&>BAR"
--
--#data
--FOO)BAR
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO)BAR"
--
--#data
--FOOABAR
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOOABAR"
--
--#data
--FOOABAR
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOOABAR"
--
--#data
--FOO&#BAR
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO&#BAR"
--
--#data
--FOO&#ZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO&#ZOO"
--
--#data
--FOOºR
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOOºR"
--
--#data
--FOO&#xZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO&#xZOO"
--
--#data
--FOO&#XZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO&#XZOO"
--
--#data
--FOO)BAR
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO)BAR"
--
--#data
--FOO䆺R
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO䆺R"
--
--#data
--FOOAZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOOAZOO"
--
--#data
--FOO�ZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO�ZOO"
--
--#data
--FOOxZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOOxZOO"
--
--#data
--FOOyZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOOyZOO"
--
--#data
--FOO€ZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO€ZOO"
--
--#data
--FOOZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOOZOO"
--
--#data
--FOO‚ZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO‚ZOO"
--
--#data
--FOOƒZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOOƒZOO"
--
--#data
--FOO„ZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO„ZOO"
--
--#data
--FOO…ZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO…ZOO"
--
--#data
--FOO†ZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO†ZOO"
--
--#data
--FOO‡ZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO‡ZOO"
--
--#data
--FOOˆZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOOˆZOO"
--
--#data
--FOO‰ZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO‰ZOO"
--
--#data
--FOOŠZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOOŠZOO"
--
--#data
--FOO‹ZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO‹ZOO"
--
--#data
--FOOŒZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOOŒZOO"
--
--#data
--FOOZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOOZOO"
--
--#data
--FOOŽZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOOŽZOO"
--
--#data
--FOOZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOOZOO"
--
--#data
--FOOZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOOZOO"
--
--#data
--FOO‘ZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO‘ZOO"
--
--#data
--FOO’ZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO’ZOO"
--
--#data
--FOO“ZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO“ZOO"
--
--#data
--FOO”ZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO”ZOO"
--
--#data
--FOO•ZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO•ZOO"
--
--#data
--FOO–ZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO–ZOO"
--
--#data
--FOO—ZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO—ZOO"
--
--#data
--FOO˜ZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO˜ZOO"
--
--#data
--FOO™ZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO™ZOO"
--
--#data
--FOOšZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOOšZOO"
--
--#data
--FOO›ZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO›ZOO"
--
--#data
--FOOœZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOOœZOO"
--
--#data
--FOOZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOOZOO"
--
--#data
--FOOžZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOOžZOO"
--
--#data
--FOOŸZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOOŸZOO"
--
--#data
--FOO ZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO ZOO"
--
--#data
--FOO퟿ZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOOZOO"
--
--#data
--FOO�ZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO�ZOO"
--
--#data
--FOO�ZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO�ZOO"
--
--#data
--FOO�ZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO�ZOO"
--
--#data
--FOO�ZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO�ZOO"
--
--#data
--FOOZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOOZOO"
--
--#data
--FOOZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOOZOO"
--
--#data
--FOO􈟔ZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOOZOO"
--
--#data
--FOOZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOOZOO"
--
--#data
--FOO�ZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO�ZOO"
--
--#data
--FOO�ZOO
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO�ZOO"
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/entities02.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/entities02.dat
-deleted file mode 100644
-index e2fb42a..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/entities02.dat
-+++ /dev/null
-@@ -1,249 +0,0 @@
--#data
--<div bar="ZZ>YY"></div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| bar="ZZ>YY"
--
--#data
--<div bar="ZZ&"></div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| bar="ZZ&"
--
--#data
--<div bar='ZZ&'></div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| bar="ZZ&"
--
--#data
--<div bar=ZZ&></div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| bar="ZZ&"
--
--#data
--<div bar="ZZ>=YY"></div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| bar="ZZ>=YY"
--
--#data
--<div bar="ZZ>0YY"></div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| bar="ZZ>0YY"
--
--#data
--<div bar="ZZ>9YY"></div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| bar="ZZ>9YY"
--
--#data
--<div bar="ZZ>aYY"></div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| bar="ZZ>aYY"
--
--#data
--<div bar="ZZ>ZYY"></div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| bar="ZZ>ZYY"
--
--#data
--<div bar="ZZ> YY"></div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| bar="ZZ> YY"
--
--#data
--<div bar="ZZ>"></div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| bar="ZZ>"
--
--#data
--<div bar='ZZ>'></div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| bar="ZZ>"
--
--#data
--<div bar=ZZ>></div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| bar="ZZ>"
--
--#data
--<div bar="ZZ£_id=23"></div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| bar="ZZ£_id=23"
--
--#data
--<div bar="ZZ&prod_id=23"></div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| bar="ZZ&prod_id=23"
--
--#data
--<div bar="ZZ£_id=23"></div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| bar="ZZ£_id=23"
--
--#data
--<div bar="ZZ∏_id=23"></div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| bar="ZZ∏_id=23"
--
--#data
--<div bar="ZZ£=23"></div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| bar="ZZ£=23"
--
--#data
--<div bar="ZZ&prod=23"></div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| bar="ZZ&prod=23"
--
--#data
--<div>ZZ£_id=23</div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| "ZZ£_id=23"
--
--#data
--<div>ZZ&prod_id=23</div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| "ZZ&prod_id=23"
--
--#data
--<div>ZZ£_id=23</div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| "ZZ£_id=23"
--
--#data
--<div>ZZ∏_id=23</div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| "ZZ∏_id=23"
--
--#data
--<div>ZZ£=23</div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| "ZZ£=23"
--
--#data
--<div>ZZ&prod=23</div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| "ZZ&prod=23"
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/html5test-com.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/html5test-com.dat
-deleted file mode 100644
-index d7cb71d..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/html5test-com.dat
-+++ /dev/null
-@@ -1,246 +0,0 @@
--#data
--<div<div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div<div>
--
--#data
--<div foo<bar=''>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| foo<bar=""
--
--#data
--<div foo=`bar`>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| foo="`bar`"
--
--#data
--<div \"foo=''>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| \"foo=""
--
--#data
--<a href='\nbar'></a>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <a>
--| href="\nbar"
--
--#data
--<!DOCTYPE html>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--
--#data
--⟨⟩
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "⟨⟩"
--
--#data
--'
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "'"
--
--#data
--ⅈ
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "ⅈ"
--
--#data
--𝕂
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "𝕂"
--
--#data
--∉
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "∉"
--
--#data
--<?import namespace="foo" implementation="#bar">
--#errors
--#document
--| <!-- ?import namespace="foo" implementation="#bar" -->
--| <html>
--| <head>
--| <body>
--
--#data
--<!--foo--bar-->
--#errors
--#document
--| <!-- foo--bar -->
--| <html>
--| <head>
--| <body>
--
--#data
--<![CDATA[x]]>
--#errors
--#document
--| <!-- [CDATA[x]] -->
--| <html>
--| <head>
--| <body>
--
--#data
--<textarea><!--</textarea>--></textarea>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <textarea>
--| "<!--"
--| "-->"
--
--#data
--<textarea><!--</textarea>-->
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <textarea>
--| "<!--"
--| "-->"
--
--#data
--<style><!--</style>--></style>
--#errors
--#document
--| <html>
--| <head>
--| <style>
--| "<!--"
--| <body>
--| "-->"
--
--#data
--<style><!--</style>-->
--#errors
--#document
--| <html>
--| <head>
--| <style>
--| "<!--"
--| <body>
--| "-->"
--
--#data
--<ul><li>A </li> <li>B</li></ul>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <ul>
--| <li>
--| "A "
--| " "
--| <li>
--| "B"
--
--#data
--<table><form><input type=hidden><input></form><div></div></table>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <input>
--| <div>
--| <table>
--| <form>
--| <input>
--| type="hidden"
--
--#data
--<i>A<b>B<p></i>C</b>D
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <i>
--| "A"
--| <b>
--| "B"
--| <b>
--| <p>
--| <b>
--| <i>
--| "C"
--| "D"
--
--#data
--<div></div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--
--#data
--<svg></svg>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <svg svg>
--
--#data
--<math></math>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <math math>
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/inbody01.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/inbody01.dat
-deleted file mode 100644
-index 3f2bd37..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/inbody01.dat
-+++ /dev/null
-@@ -1,43 +0,0 @@
--#data
--<button>1</foo>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <button>
--| "1"
--
--#data
--<foo>1<p>2</foo>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <foo>
--| "1"
--| <p>
--| "2"
--
--#data
--<dd>1</foo>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <dd>
--| "1"
--
--#data
--<foo>1<dd>2</foo>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <foo>
--| "1"
--| <dd>
--| "2"
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/isindex.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/isindex.dat
-deleted file mode 100644
-index 88325ff..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/isindex.dat
-+++ /dev/null
-@@ -1,40 +0,0 @@
--#data
--<isindex>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <form>
--| <hr>
--| <label>
--| "This is a searchable index. Enter search keywords: "
--| <input>
--| name="isindex"
--| <hr>
--
--#data
--<isindex name="A" action="B" prompt="C" foo="D">
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <form>
--| action="B"
--| <hr>
--| <label>
--| "C"
--| <input>
--| foo="D"
--| name="isindex"
--| <hr>
--
--#data
--<form><isindex>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <form>
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/pending-spec-changes-plain-text-unsafe.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/pending-spec-changes-plain-text-unsafe.dat
-deleted file mode 100644
-index a5ebb1eb285116af391137bc94beac0c8a6834b4..0000000000000000000000000000000000000000
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 115
-zcmXZUQ3`+{41i&ucZ#9c5brYEqF^T2f`Sg8m2W@)!xxy0Am++fibh!_xp`HU=1fj=
-l5Tv!*b_iUjqsV4(V_d9g>VZ9lc;ttC7t#O7YxuDS4-Zl&BR>ED
-
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/pending-spec-changes.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/pending-spec-changes.dat
-deleted file mode 100644
-index 5a92084..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/pending-spec-changes.dat
-+++ /dev/null
-@@ -1,52 +0,0 @@
--#data
--<input type="hidden"><frameset>
--#errors
--21: Start tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
--31: “frameset” start tag seen.
--31: End of file seen and there were open elements.
--#document
--| <html>
--| <head>
--| <frameset>
--
--#data
--<!DOCTYPE html><table><caption><svg>foo</table>bar
--#errors
--47: End tag “table” did not match the name of the current open element (“svg”).
--47: “table” closed but “caption” was still open.
--47: End tag “table” seen, but there were open elements.
--36: Unclosed element “svg”.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| <caption>
--| <svg svg>
--| "foo"
--| "bar"
--
--#data
--<table><tr><td><svg><desc><td></desc><circle>
--#errors
--7: Start tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
--30: A table cell was implicitly closed, but there were open elements.
--26: Unclosed element “desc”.
--20: Unclosed element “svg”.
--37: Stray end tag “desc”.
--45: End of file seen and there were open elements.
--45: Unclosed element “circle”.
--7: Unclosed element “table”.
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| <svg svg>
--| <svg desc>
--| <td>
--| <circle>
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/plain-text-unsafe.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/plain-text-unsafe.dat
-deleted file mode 100644
-index 04cc11fb9d458ea32dca02e2f3bf39221196ab8e..0000000000000000000000000000000000000000
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 4166
-zcmds4&1%~~5Y}1XcNojiOL5|Zdr6iB6Q@@dnjYGa!^&DaD*8j(rYZE*N*}4O(Ai!6
-zt?Ym#%MQd~yz+X#nfd0M+40P0g4rKk_ucGyu~@9HzqzhG<5`wuxjplf&5wx3!u}29
-zQA8od1>ll1zgT*S|4T0c9E6$RdB?_+5>}tF$TnjU&$*!FvRd{rQXeva!GcpkGm9M!
-zZBWBlo0XH%V%aC7h2%Ws8$qo;*=zDp0+b3F08~mq!5(ow4OtKi{*2LVgD~WoB_9R=
-z%96mMsPR;h$nTtgfB$G~Tu5~MsAZ5p?I at Yv->g at 6t9!$ThX*>G;HMo(<c>}#7Rl5a
-zZg4uE1I7jOIW4nFO4J6iM;kDRJYY at HxlJ-2>|)pZu4LM<KOUh3ErDsMA{%qAZOUw$
-zscvR?JZJVK)-qamv2krWRmhr-vcp#rkm+dl=W)$LH~WnyKCXT2=DO^$@Rb}6$4 at S`
-zDy!WdH|zeTS5P`WCOgJYv%MecK8>qS(UCIoh@(L9F*ZXarNczOPxy50-rRltbPH<s
-zA!)|x#GcqI^c|On6=j}5m2?=K6mlgf$6nP%Y{F?5Ca>+lsqMcUzhGX-DG?dIeM%yw
-zq)6Z5tV+moc?F- at Px$g4N7 at AhG2|lSEV{6lAFkjw_958<_GvD+SlP=VmQ!lVHXJsI
-znhY+?3E0d<$JA<%tK<^VtQR#nU at +CT{-PMJ<%52yKtV-o{8a81dy0d-O}vj9)n^7k
-zT4d@%G%wJ%%qhlePD%yYMMpP?=tpcJ%YZV=t3+x1nKCnh=v}&mgl&nSNPf^%ki)ze
-l`$yqfayHMBo}R^L^DOS^S$;Op@}8cl(m$8f+I>c;?LSw^)ujLc
-
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/scriptdata01.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/scriptdata01.dat
-deleted file mode 100644
-index 76b67f4..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/scriptdata01.dat
-+++ /dev/null
-@@ -1,308 +0,0 @@
--#data
--FOO<script>'Hello'</script>BAR
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO"
--| <script>
--| "'Hello'"
--| "BAR"
--
--#data
--FOO<script></script>BAR
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO"
--| <script>
--| "BAR"
--
--#data
--FOO<script></script >BAR
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO"
--| <script>
--| "BAR"
--
--#data
--FOO<script></script/>BAR
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO"
--| <script>
--| "BAR"
--
--#data
--FOO<script></script/ >BAR
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO"
--| <script>
--| "BAR"
--
--#data
--FOO<script type="text/plain"></scriptx>BAR
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO"
--| <script>
--| type="text/plain"
--| "</scriptx>BAR"
--
--#data
--FOO<script></script foo=">" dd>BAR
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO"
--| <script>
--| "BAR"
--
--#data
--FOO<script>'<'</script>BAR
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO"
--| <script>
--| "'<'"
--| "BAR"
--
--#data
--FOO<script>'<!'</script>BAR
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO"
--| <script>
--| "'<!'"
--| "BAR"
--
--#data
--FOO<script>'<!-'</script>BAR
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO"
--| <script>
--| "'<!-'"
--| "BAR"
--
--#data
--FOO<script>'<!--'</script>BAR
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO"
--| <script>
--| "'<!--'"
--| "BAR"
--
--#data
--FOO<script>'<!---'</script>BAR
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO"
--| <script>
--| "'<!---'"
--| "BAR"
--
--#data
--FOO<script>'<!-->'</script>BAR
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO"
--| <script>
--| "'<!-->'"
--| "BAR"
--
--#data
--FOO<script>'<!-->'</script>BAR
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO"
--| <script>
--| "'<!-->'"
--| "BAR"
--
--#data
--FOO<script>'<!-- potato'</script>BAR
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO"
--| <script>
--| "'<!-- potato'"
--| "BAR"
--
--#data
--FOO<script>'<!-- <sCrIpt'</script>BAR
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO"
--| <script>
--| "'<!-- <sCrIpt'"
--| "BAR"
--
--#data
--FOO<script type="text/plain">'<!-- <sCrIpt>'</script>BAR
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO"
--| <script>
--| type="text/plain"
--| "'<!-- <sCrIpt>'</script>BAR"
--
--#data
--FOO<script type="text/plain">'<!-- <sCrIpt> -'</script>BAR
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO"
--| <script>
--| type="text/plain"
--| "'<!-- <sCrIpt> -'</script>BAR"
--
--#data
--FOO<script type="text/plain">'<!-- <sCrIpt> --'</script>BAR
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO"
--| <script>
--| type="text/plain"
--| "'<!-- <sCrIpt> --'</script>BAR"
--
--#data
--FOO<script>'<!-- <sCrIpt> -->'</script>BAR
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO"
--| <script>
--| "'<!-- <sCrIpt> -->'"
--| "BAR"
--
--#data
--FOO<script type="text/plain">'<!-- <sCrIpt> --!>'</script>BAR
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO"
--| <script>
--| type="text/plain"
--| "'<!-- <sCrIpt> --!>'</script>BAR"
--
--#data
--FOO<script type="text/plain">'<!-- <sCrIpt> -- >'</script>BAR
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO"
--| <script>
--| type="text/plain"
--| "'<!-- <sCrIpt> -- >'</script>BAR"
--
--#data
--FOO<script type="text/plain">'<!-- <sCrIpt '</script>BAR
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO"
--| <script>
--| type="text/plain"
--| "'<!-- <sCrIpt '</script>BAR"
--
--#data
--FOO<script type="text/plain">'<!-- <sCrIpt/'</script>BAR
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO"
--| <script>
--| type="text/plain"
--| "'<!-- <sCrIpt/'</script>BAR"
--
--#data
--FOO<script type="text/plain">'<!-- <sCrIpt\'</script>BAR
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO"
--| <script>
--| type="text/plain"
--| "'<!-- <sCrIpt\'"
--| "BAR"
--
--#data
--FOO<script type="text/plain">'<!-- <sCrIpt/'</script>BAR</script>QUX
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "FOO"
--| <script>
--| type="text/plain"
--| "'<!-- <sCrIpt/'</script>BAR"
--| "QUX"
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/scripted/adoption01.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/scripted/adoption01.dat
-deleted file mode 100644
-index 4e08d0e..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/scripted/adoption01.dat
-+++ /dev/null
-@@ -1,15 +0,0 @@
--#data
--<p><b id="A"><script>document.getElementById("A").id = "B"</script></p>TEXT</b>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <p>
--| <b>
--| id="B"
--| <script>
--| "document.getElementById("A").id = "B""
--| <b>
--| id="A"
--| "TEXT"
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/scripted/webkit01.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/scripted/webkit01.dat
-deleted file mode 100644
-index ef4a41c..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/scripted/webkit01.dat
-+++ /dev/null
-@@ -1,28 +0,0 @@
--#data
--1<script>document.write("2")</script>3
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "1"
--| <script>
--| "document.write("2")"
--| "23"
--
--#data
--1<script>document.write("<script>document.write('2')</scr"+ "ipt><script>document.write('3')</scr" + "ipt>")</script>4
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "1"
--| <script>
--| "document.write("<script>document.write('2')</scr"+ "ipt><script>document.write('3')</scr" + "ipt>")"
--| <script>
--| "document.write('2')"
--| "2"
--| <script>
--| "document.write('3')"
--| "34"
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tables01.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tables01.dat
-deleted file mode 100644
-index c4b47e4..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tables01.dat
-+++ /dev/null
-@@ -1,212 +0,0 @@
--#data
--<table><th>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| <th>
--
--#data
--<table><td>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--
--#data
--<table><col foo='bar'>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--| <colgroup>
--| <col>
--| foo="bar"
--
--#data
--<table><colgroup></html>foo
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "foo"
--| <table>
--| <colgroup>
--
--#data
--<table></table><p>foo
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--| <p>
--| "foo"
--
--#data
--<table></body></caption></col></colgroup></html></tbody></td></tfoot></th></thead></tr><td>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--
--#data
--<table><select><option>3</select></table>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <select>
--| <option>
--| "3"
--| <table>
--
--#data
--<table><select><table></table></select></table>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <select>
--| <table>
--| <table>
--
--#data
--<table><select></table>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <select>
--| <table>
--
--#data
--<table><select><option>A<tr><td>B</td></tr></table>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <select>
--| <option>
--| "A"
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| "B"
--
--#data
--<table><td></body></caption></col></colgroup></html>foo
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| "foo"
--
--#data
--<table><td>A</table>B
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| "A"
--| "B"
--
--#data
--<table><tr><caption>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| <caption>
--
--#data
--<table><tr></body></caption></col></colgroup></html></td></th><td>foo
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| "foo"
--
--#data
--<table><td><tr>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| <tr>
--
--#data
--<table><td><button><td>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| <button>
--| <td>
--
--#data
--<table><tr><td><svg><desc><td>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| <svg svg>
--| <svg desc>
--| <td>
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests1.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests1.dat
-deleted file mode 100644
-index cbf8bdd..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests1.dat
-+++ /dev/null
-@@ -1,1952 +0,0 @@
--#data
--Test
--#errors
--Line: 1 Col: 4 Unexpected non-space characters. Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--| "Test"
--
--#data
--<p>One<p>Two
--#errors
--Line: 1 Col: 3 Unexpected start tag (p). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--| <p>
--| "One"
--| <p>
--| "Two"
--
--#data
--Line1<br>Line2<br>Line3<br>Line4
--#errors
--Line: 1 Col: 5 Unexpected non-space characters. Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--| "Line1"
--| <br>
--| "Line2"
--| <br>
--| "Line3"
--| <br>
--| "Line4"
--
--#data
--<html>
--#errors
--Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--
--#data
--<head>
--#errors
--Line: 1 Col: 6 Unexpected start tag (head). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--
--#data
--<body>
--#errors
--Line: 1 Col: 6 Unexpected start tag (body). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--
--#data
--<html><head>
--#errors
--Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--
--#data
--<html><head></head>
--#errors
--Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--
--#data
--<html><head></head><body>
--#errors
--Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--
--#data
--<html><head></head><body></body>
--#errors
--Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--
--#data
--<html><head><body></body></html>
--#errors
--Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--
--#data
--<html><head></body></html>
--#errors
--Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
--Line: 1 Col: 19 Unexpected end tag (body).
--Line: 1 Col: 26 Unexpected end tag (html).
--#document
--| <html>
--| <head>
--| <body>
--
--#data
--<html><head><body></html>
--#errors
--Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--
--#data
--<html><body></html>
--#errors
--Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--
--#data
--<body></html>
--#errors
--Line: 1 Col: 6 Unexpected start tag (body). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--
--#data
--<head></html>
--#errors
--Line: 1 Col: 6 Unexpected start tag (head). Expected DOCTYPE.
--Line: 1 Col: 13 Unexpected end tag (html). Ignored.
--#document
--| <html>
--| <head>
--| <body>
--
--#data
--</head>
--#errors
--Line: 1 Col: 7 Unexpected end tag (head). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--
--#data
--</body>
--#errors
--Line: 1 Col: 7 Unexpected end tag (body). Expected DOCTYPE.
--Line: 1 Col: 7 Unexpected end tag (body) after the (implied) root element.
--#document
--| <html>
--| <head>
--| <body>
--
--#data
--</html>
--#errors
--Line: 1 Col: 7 Unexpected end tag (html). Expected DOCTYPE.
--Line: 1 Col: 7 Unexpected end tag (html) after the (implied) root element.
--#document
--| <html>
--| <head>
--| <body>
--
--#data
--<b><table><td><i></table>
--#errors
--Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
--Line: 1 Col: 14 Unexpected table cell start tag (td) in the table body phase.
--Line: 1 Col: 25 Got table cell end tag (td) while required end tags are missing.
--Line: 1 Col: 25 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <b>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| <i>
--
--#data
--<b><table><td></b><i></table>X
--#errors
--Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
--Line: 1 Col: 14 Unexpected table cell start tag (td) in the table body phase.
--Line: 1 Col: 18 End tag (b) violates step 1, paragraph 1 of the adoption agency algorithm.
--Line: 1 Col: 29 Got table cell end tag (td) while required end tags are missing.
--Line: 1 Col: 30 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <b>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| <i>
--| "X"
--
--#data
--<h1>Hello<h2>World
--#errors
--4: Start tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
--13: Heading cannot be a child of another heading.
--18: End of file seen and there were open elements.
--#document
--| <html>
--| <head>
--| <body>
--| <h1>
--| "Hello"
--| <h2>
--| "World"
--
--#data
--<a><p>X<a>Y</a>Z</p></a>
--#errors
--Line: 1 Col: 3 Unexpected start tag (a). Expected DOCTYPE.
--Line: 1 Col: 10 Unexpected start tag (a) implies end tag (a).
--Line: 1 Col: 10 End tag (a) violates step 1, paragraph 3 of the adoption agency algorithm.
--Line: 1 Col: 24 End tag (a) violates step 1, paragraph 1 of the adoption agency algorithm.
--#document
--| <html>
--| <head>
--| <body>
--| <a>
--| <p>
--| <a>
--| "X"
--| <a>
--| "Y"
--| "Z"
--
--#data
--<b><button>foo</b>bar
--#errors
--Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
--Line: 1 Col: 15 End tag (b) violates step 1, paragraph 1 of the adoption agency algorithm.
--#document
--| <html>
--| <head>
--| <body>
--| <b>
--| <button>
--| <b>
--| "foo"
--| "bar"
--
--#data
--<!DOCTYPE html><span><button>foo</span>bar
--#errors
--39: End tag “span” seen but there were unclosed elements.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <span>
--| <button>
--| "foobar"
--
--#data
--<p><b><div><marquee></p></b></div>X
--#errors
--Line: 1 Col: 3 Unexpected start tag (p). Expected DOCTYPE.
--Line: 1 Col: 11 Unexpected end tag (p). Ignored.
--Line: 1 Col: 24 Unexpected end tag (p). Ignored.
--Line: 1 Col: 28 End tag (b) violates step 1, paragraph 1 of the adoption agency algorithm.
--Line: 1 Col: 34 End tag (div) seen too early. Expected other end tag.
--Line: 1 Col: 35 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <p>
--| <b>
--| <div>
--| <b>
--| <marquee>
--| <p>
--| "X"
--
--#data
--<script><div></script></div><title><p></title><p><p>
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 28 Unexpected end tag (div). Ignored.
--#document
--| <html>
--| <head>
--| <script>
--| "<div>"
--| <title>
--| "<p>"
--| <body>
--| <p>
--| <p>
--
--#data
--<!--><div>--<!-->
--#errors
--Line: 1 Col: 5 Incorrect comment.
--Line: 1 Col: 10 Unexpected start tag (div). Expected DOCTYPE.
--Line: 1 Col: 17 Incorrect comment.
--Line: 1 Col: 17 Expected closing tag. Unexpected end of file.
--#document
--| <!-- -->
--| <html>
--| <head>
--| <body>
--| <div>
--| "--"
--| <!-- -->
--
--#data
--<p><hr></p>
--#errors
--Line: 1 Col: 3 Unexpected start tag (p). Expected DOCTYPE.
--Line: 1 Col: 11 Unexpected end tag (p). Ignored.
--#document
--| <html>
--| <head>
--| <body>
--| <p>
--| <hr>
--| <p>
--
--#data
--<select><b><option><select><option></b></select>X
--#errors
--Line: 1 Col: 8 Unexpected start tag (select). Expected DOCTYPE.
--Line: 1 Col: 11 Unexpected start tag token (b) in the select phase. Ignored.
--Line: 1 Col: 27 Unexpected select start tag in the select phase treated as select end tag.
--Line: 1 Col: 39 End tag (b) violates step 1, paragraph 1 of the adoption agency algorithm.
--Line: 1 Col: 48 Unexpected end tag (select). Ignored.
--Line: 1 Col: 49 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <select>
--| <option>
--| <option>
--| "X"
--
--#data
--<a><table><td><a><table></table><a></tr><a></table><b>X</b>C<a>Y
--#errors
--Line: 1 Col: 3 Unexpected start tag (a). Expected DOCTYPE.
--Line: 1 Col: 14 Unexpected table cell start tag (td) in the table body phase.
--Line: 1 Col: 35 Unexpected start tag (a) implies end tag (a).
--Line: 1 Col: 40 Got table cell end tag (td) while required end tags are missing.
--Line: 1 Col: 43 Unexpected start tag (a) in table context caused voodoo mode.
--Line: 1 Col: 43 Unexpected start tag (a) implies end tag (a).
--Line: 1 Col: 43 End tag (a) violates step 1, paragraph 1 of the adoption agency algorithm.
--Line: 1 Col: 51 Unexpected implied end tag (a) in the table phase.
--Line: 1 Col: 63 Unexpected start tag (a) implies end tag (a).
--Line: 1 Col: 64 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <a>
--| <a>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| <a>
--| <table>
--| <a>
--| <a>
--| <b>
--| "X"
--| "C"
--| <a>
--| "Y"
--
--#data
--<a X>0<b>1<a Y>2
--#errors
--Line: 1 Col: 5 Unexpected start tag (a). Expected DOCTYPE.
--Line: 1 Col: 15 Unexpected start tag (a) implies end tag (a).
--Line: 1 Col: 15 End tag (a) violates step 1, paragraph 3 of the adoption agency algorithm.
--Line: 1 Col: 16 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <a>
--| x=""
--| "0"
--| <b>
--| "1"
--| <b>
--| <a>
--| y=""
--| "2"
--
--#data
--<!-----><font><div>hello<table>excite!<b>me!<th><i>please!</tr><!--X-->
--#errors
--Line: 1 Col: 7 Unexpected '-' after '--' found in comment.
--Line: 1 Col: 14 Unexpected start tag (font). Expected DOCTYPE.
--Line: 1 Col: 38 Unexpected non-space characters in table context caused voodoo mode.
--Line: 1 Col: 41 Unexpected start tag (b) in table context caused voodoo mode.
--Line: 1 Col: 48 Unexpected implied end tag (b) in the table phase.
--Line: 1 Col: 48 Unexpected table cell start tag (th) in the table body phase.
--Line: 1 Col: 63 Got table cell end tag (th) while required end tags are missing.
--Line: 1 Col: 71 Unexpected end of file. Expected table content.
--#document
--| <!-- - -->
--| <html>
--| <head>
--| <body>
--| <font>
--| <div>
--| "helloexcite!"
--| <b>
--| "me!"
--| <table>
--| <tbody>
--| <tr>
--| <th>
--| <i>
--| "please!"
--| <!-- X -->
--
--#data
--<!DOCTYPE html><li>hello<li>world<ul>how<li>do</ul>you</body><!--do-->
--#errors
--Line: 1 Col: 61 Unexpected end tag (li). Missing end tag (body).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <li>
--| "hello"
--| <li>
--| "world"
--| <ul>
--| "how"
--| <li>
--| "do"
--| "you"
--| <!-- do -->
--
--#data
--<!DOCTYPE html>A<option>B<optgroup>C<select>D</option>E
--#errors
--Line: 1 Col: 54 Unexpected end tag (option) in the select phase. Ignored.
--Line: 1 Col: 55 Expected closing tag. Unexpected end of file.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| "A"
--| <option>
--| "B"
--| <optgroup>
--| "C"
--| <select>
--| "DE"
--
--#data
--<
--#errors
--Line: 1 Col: 1 Expected tag name. Got something else instead
--Line: 1 Col: 1 Unexpected non-space characters. Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--| "<"
--
--#data
--<#
--#errors
--Line: 1 Col: 1 Expected tag name. Got something else instead
--Line: 1 Col: 1 Unexpected non-space characters. Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--| "<#"
--
--#data
--</
--#errors
--Line: 1 Col: 2 Expected closing tag. Unexpected end of file.
--Line: 1 Col: 2 Unexpected non-space characters. Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--| "</"
--
--#data
--</#
--#errors
--Line: 1 Col: 2 Expected closing tag. Unexpected character '#' found.
--Line: 1 Col: 3 Unexpected End of file. Expected DOCTYPE.
--#document
--| <!-- # -->
--| <html>
--| <head>
--| <body>
--
--#data
--<?
--#errors
--Line: 1 Col: 1 Expected tag name. Got '?' instead. (HTML doesn't support processing instructions.)
--Line: 1 Col: 2 Unexpected End of file. Expected DOCTYPE.
--#document
--| <!-- ? -->
--| <html>
--| <head>
--| <body>
--
--#data
--<?#
--#errors
--Line: 1 Col: 1 Expected tag name. Got '?' instead. (HTML doesn't support processing instructions.)
--Line: 1 Col: 3 Unexpected End of file. Expected DOCTYPE.
--#document
--| <!-- ?# -->
--| <html>
--| <head>
--| <body>
--
--#data
--<!
--#errors
--Line: 1 Col: 2 Expected '--' or 'DOCTYPE'. Not found.
--Line: 1 Col: 2 Unexpected End of file. Expected DOCTYPE.
--#document
--| <!-- -->
--| <html>
--| <head>
--| <body>
--
--#data
--<!#
--#errors
--Line: 1 Col: 3 Expected '--' or 'DOCTYPE'. Not found.
--Line: 1 Col: 3 Unexpected End of file. Expected DOCTYPE.
--#document
--| <!-- # -->
--| <html>
--| <head>
--| <body>
--
--#data
--<?COMMENT?>
--#errors
--Line: 1 Col: 1 Expected tag name. Got '?' instead. (HTML doesn't support processing instructions.)
--Line: 1 Col: 11 Unexpected End of file. Expected DOCTYPE.
--#document
--| <!-- ?COMMENT? -->
--| <html>
--| <head>
--| <body>
--
--#data
--<!COMMENT>
--#errors
--Line: 1 Col: 2 Expected '--' or 'DOCTYPE'. Not found.
--Line: 1 Col: 10 Unexpected End of file. Expected DOCTYPE.
--#document
--| <!-- COMMENT -->
--| <html>
--| <head>
--| <body>
--
--#data
--</ COMMENT >
--#errors
--Line: 1 Col: 2 Expected closing tag. Unexpected character ' ' found.
--Line: 1 Col: 12 Unexpected End of file. Expected DOCTYPE.
--#document
--| <!-- COMMENT -->
--| <html>
--| <head>
--| <body>
--
--#data
--<?COM--MENT?>
--#errors
--Line: 1 Col: 1 Expected tag name. Got '?' instead. (HTML doesn't support processing instructions.)
--Line: 1 Col: 13 Unexpected End of file. Expected DOCTYPE.
--#document
--| <!-- ?COM--MENT? -->
--| <html>
--| <head>
--| <body>
--
--#data
--<!COM--MENT>
--#errors
--Line: 1 Col: 2 Expected '--' or 'DOCTYPE'. Not found.
--Line: 1 Col: 12 Unexpected End of file. Expected DOCTYPE.
--#document
--| <!-- COM--MENT -->
--| <html>
--| <head>
--| <body>
--
--#data
--</ COM--MENT >
--#errors
--Line: 1 Col: 2 Expected closing tag. Unexpected character ' ' found.
--Line: 1 Col: 14 Unexpected End of file. Expected DOCTYPE.
--#document
--| <!-- COM--MENT -->
--| <html>
--| <head>
--| <body>
--
--#data
--<!DOCTYPE html><style> EOF
--#errors
--Line: 1 Col: 26 Unexpected end of file. Expected end tag (style).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <style>
--| " EOF"
--| <body>
--
--#data
--<!DOCTYPE html><script> <!-- </script> --> </script> EOF
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| " <!-- "
--| " "
--| <body>
--| "--> EOF"
--
--#data
--<b><p></b>TEST
--#errors
--Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
--Line: 1 Col: 10 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
--#document
--| <html>
--| <head>
--| <body>
--| <b>
--| <p>
--| <b>
--| "TEST"
--
--#data
--<p id=a><b><p id=b></b>TEST
--#errors
--Line: 1 Col: 8 Unexpected start tag (p). Expected DOCTYPE.
--Line: 1 Col: 19 Unexpected end tag (p). Ignored.
--Line: 1 Col: 23 End tag (b) violates step 1, paragraph 2 of the adoption agency algorithm.
--#document
--| <html>
--| <head>
--| <body>
--| <p>
--| id="a"
--| <b>
--| <p>
--| id="b"
--| "TEST"
--
--#data
--<b id=a><p><b id=b></p></b>TEST
--#errors
--Line: 1 Col: 8 Unexpected start tag (b). Expected DOCTYPE.
--Line: 1 Col: 23 Unexpected end tag (p). Ignored.
--Line: 1 Col: 27 End tag (b) violates step 1, paragraph 2 of the adoption agency algorithm.
--Line: 1 Col: 31 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <b>
--| id="a"
--| <p>
--| <b>
--| id="b"
--| "TEST"
--
--#data
--<!DOCTYPE html><title>U-test</title><body><div><p>Test<u></p></div></body>
--#errors
--Line: 1 Col: 61 Unexpected end tag (p). Ignored.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <title>
--| "U-test"
--| <body>
--| <div>
--| <p>
--| "Test"
--| <u>
--
--#data
--<!DOCTYPE html><font><table></font></table></font>
--#errors
--Line: 1 Col: 35 Unexpected end tag (font) in table context caused voodoo mode.
--Line: 1 Col: 35 End tag (font) violates step 1, paragraph 1 of the adoption agency algorithm.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <font>
--| <table>
--
--#data
--<font><p>hello<b>cruel</font>world
--#errors
--Line: 1 Col: 6 Unexpected start tag (font). Expected DOCTYPE.
--Line: 1 Col: 29 End tag (font) violates step 1, paragraph 3 of the adoption agency algorithm.
--Line: 1 Col: 29 End tag (font) violates step 1, paragraph 3 of the adoption agency algorithm.
--Line: 1 Col: 34 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <font>
--| <p>
--| <font>
--| "hello"
--| <b>
--| "cruel"
--| <b>
--| "world"
--
--#data
--<b>Test</i>Test
--#errors
--Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
--Line: 1 Col: 11 End tag (i) violates step 1, paragraph 1 of the adoption agency algorithm.
--Line: 1 Col: 15 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <b>
--| "TestTest"
--
--#data
--<b>A<cite>B<div>C
--#errors
--Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
--Line: 1 Col: 17 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <b>
--| "A"
--| <cite>
--| "B"
--| <div>
--| "C"
--
--#data
--<b>A<cite>B<div>C</cite>D
--#errors
--Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
--Line: 1 Col: 24 Unexpected end tag (cite). Ignored.
--Line: 1 Col: 25 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <b>
--| "A"
--| <cite>
--| "B"
--| <div>
--| "CD"
--
--#data
--<b>A<cite>B<div>C</b>D
--#errors
--Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
--Line: 1 Col: 21 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
--Line: 1 Col: 22 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <b>
--| "A"
--| <cite>
--| "B"
--| <div>
--| <b>
--| "C"
--| "D"
--
--#data
--
--#errors
--Line: 1 Col: 0 Unexpected End of file. Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--
--#data
--<DIV>
--#errors
--Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
--Line: 1 Col: 5 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--
--#data
--<DIV> abc
--#errors
--Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
--Line: 1 Col: 9 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| " abc"
--
--#data
--<DIV> abc <B>
--#errors
--Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
--Line: 1 Col: 13 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| " abc "
--| <b>
--
--#data
--<DIV> abc <B> def
--#errors
--Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
--Line: 1 Col: 17 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| " abc "
--| <b>
--| " def"
--
--#data
--<DIV> abc <B> def <I>
--#errors
--Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
--Line: 1 Col: 21 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| " abc "
--| <b>
--| " def "
--| <i>
--
--#data
--<DIV> abc <B> def <I> ghi
--#errors
--Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
--Line: 1 Col: 25 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| " abc "
--| <b>
--| " def "
--| <i>
--| " ghi"
--
--#data
--<DIV> abc <B> def <I> ghi <P>
--#errors
--Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
--Line: 1 Col: 29 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| " abc "
--| <b>
--| " def "
--| <i>
--| " ghi "
--| <p>
--
--#data
--<DIV> abc <B> def <I> ghi <P> jkl
--#errors
--Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
--Line: 1 Col: 33 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| " abc "
--| <b>
--| " def "
--| <i>
--| " ghi "
--| <p>
--| " jkl"
--
--#data
--<DIV> abc <B> def <I> ghi <P> jkl </B>
--#errors
--Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
--Line: 1 Col: 38 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
--Line: 1 Col: 38 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| " abc "
--| <b>
--| " def "
--| <i>
--| " ghi "
--| <i>
--| <p>
--| <b>
--| " jkl "
--
--#data
--<DIV> abc <B> def <I> ghi <P> jkl </B> mno
--#errors
--Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
--Line: 1 Col: 38 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
--Line: 1 Col: 42 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| " abc "
--| <b>
--| " def "
--| <i>
--| " ghi "
--| <i>
--| <p>
--| <b>
--| " jkl "
--| " mno"
--
--#data
--<DIV> abc <B> def <I> ghi <P> jkl </B> mno </I>
--#errors
--Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
--Line: 1 Col: 38 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
--Line: 1 Col: 47 End tag (i) violates step 1, paragraph 3 of the adoption agency algorithm.
--Line: 1 Col: 47 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| " abc "
--| <b>
--| " def "
--| <i>
--| " ghi "
--| <i>
--| <p>
--| <i>
--| <b>
--| " jkl "
--| " mno "
--
--#data
--<DIV> abc <B> def <I> ghi <P> jkl </B> mno </I> pqr
--#errors
--Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
--Line: 1 Col: 38 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
--Line: 1 Col: 47 End tag (i) violates step 1, paragraph 3 of the adoption agency algorithm.
--Line: 1 Col: 51 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| " abc "
--| <b>
--| " def "
--| <i>
--| " ghi "
--| <i>
--| <p>
--| <i>
--| <b>
--| " jkl "
--| " mno "
--| " pqr"
--
--#data
--<DIV> abc <B> def <I> ghi <P> jkl </B> mno </I> pqr </P>
--#errors
--Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
--Line: 1 Col: 38 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
--Line: 1 Col: 47 End tag (i) violates step 1, paragraph 3 of the adoption agency algorithm.
--Line: 1 Col: 56 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| " abc "
--| <b>
--| " def "
--| <i>
--| " ghi "
--| <i>
--| <p>
--| <i>
--| <b>
--| " jkl "
--| " mno "
--| " pqr "
--
--#data
--<DIV> abc <B> def <I> ghi <P> jkl </B> mno </I> pqr </P> stu
--#errors
--Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
--Line: 1 Col: 38 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
--Line: 1 Col: 47 End tag (i) violates step 1, paragraph 3 of the adoption agency algorithm.
--Line: 1 Col: 60 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| " abc "
--| <b>
--| " def "
--| <i>
--| " ghi "
--| <i>
--| <p>
--| <i>
--| <b>
--| " jkl "
--| " mno "
--| " pqr "
--| " stu"
--
--#data
--<test attribute-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------->
--#errors
--Line: 1 Col: 1040 Unexpected start tag (test). Expected DOCTYPE.
--Line: 1 Col: 1040 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <test>
--| attribute-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-----------------------------------------------------=""
--
--#data
--<a href="blah">aba<table><a href="foo">br<tr><td></td></tr>x</table>aoe
--#errors
--Line: 1 Col: 15 Unexpected start tag (a). Expected DOCTYPE.
--Line: 1 Col: 39 Unexpected start tag (a) in table context caused voodoo mode.
--Line: 1 Col: 39 Unexpected start tag (a) implies end tag (a).
--Line: 1 Col: 39 End tag (a) violates step 1, paragraph 1 of the adoption agency algorithm.
--Line: 1 Col: 45 Unexpected implied end tag (a) in the table phase.
--Line: 1 Col: 68 Unexpected implied end tag (a) in the table phase.
--Line: 1 Col: 71 Expected closing tag. Unexpected end of file.
--
--#document
--| <html>
--| <head>
--| <body>
--| <a>
--| href="blah"
--| "aba"
--| <a>
--| href="foo"
--| "br"
--| <a>
--| href="foo"
--| "x"
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| <a>
--| href="foo"
--| "aoe"
--
--#data
--<a href="blah">aba<table><tr><td><a href="foo">br</td></tr>x</table>aoe
--#errors
--Line: 1 Col: 15 Unexpected start tag (a). Expected DOCTYPE.
--Line: 1 Col: 54 Got table cell end tag (td) while required end tags are missing.
--Line: 1 Col: 60 Unexpected non-space characters in table context caused voodoo mode.
--Line: 1 Col: 71 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <a>
--| href="blah"
--| "abax"
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| <a>
--| href="foo"
--| "br"
--| "aoe"
--
--#data
--<table><a href="blah">aba<tr><td><a href="foo">br</td></tr>x</table>aoe
--#errors
--Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
--Line: 1 Col: 22 Unexpected start tag (a) in table context caused voodoo mode.
--Line: 1 Col: 29 Unexpected implied end tag (a) in the table phase.
--Line: 1 Col: 54 Got table cell end tag (td) while required end tags are missing.
--Line: 1 Col: 68 Unexpected implied end tag (a) in the table phase.
--Line: 1 Col: 71 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <a>
--| href="blah"
--| "aba"
--| <a>
--| href="blah"
--| "x"
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| <a>
--| href="foo"
--| "br"
--| <a>
--| href="blah"
--| "aoe"
--
--#data
--<a href=a>aa<marquee>aa<a href=b>bb</marquee>aa
--#errors
--Line: 1 Col: 10 Unexpected start tag (a). Expected DOCTYPE.
--Line: 1 Col: 45 End tag (marquee) seen too early. Expected other end tag.
--Line: 1 Col: 47 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <a>
--| href="a"
--| "aa"
--| <marquee>
--| "aa"
--| <a>
--| href="b"
--| "bb"
--| "aa"
--
--#data
--<wbr><strike><code></strike><code><strike></code>
--#errors
--Line: 1 Col: 5 Unexpected start tag (wbr). Expected DOCTYPE.
--Line: 1 Col: 28 End tag (strike) violates step 1, paragraph 3 of the adoption agency algorithm.
--Line: 1 Col: 49 Unexpected end tag (code). Ignored.
--#document
--| <html>
--| <head>
--| <body>
--| <wbr>
--| <strike>
--| <code>
--| <code>
--| <code>
--| <strike>
--
--#data
--<!DOCTYPE html><spacer>foo
--#errors
--26: End of file seen and there were open elements.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <spacer>
--| "foo"
--
--#data
--<title><meta></title><link><title><meta></title>
--#errors
--Line: 1 Col: 7 Unexpected start tag (title). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <title>
--| "<meta>"
--| <link>
--| <title>
--| "<meta>"
--| <body>
--
--#data
--<style><!--</style><meta><script>--><link></script>
--#errors
--Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
--Line: 1 Col: 51 Unexpected end of file. Expected end tag (style).
--#document
--| <html>
--| <head>
--| <style>
--| "<!--"
--| <meta>
--| <script>
--| "--><link>"
--| <body>
--
--#data
--<head><meta></head><link>
--#errors
--Line: 1 Col: 6 Unexpected start tag (head). Expected DOCTYPE.
--Line: 1 Col: 25 Unexpected start tag (link) that can be in head. Moved.
--#document
--| <html>
--| <head>
--| <meta>
--| <link>
--| <body>
--
--#data
--<table><tr><tr><td><td><span><th><span>X</table>
--#errors
--Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
--Line: 1 Col: 33 Got table cell end tag (td) while required end tags are missing.
--Line: 1 Col: 48 Got table cell end tag (th) while required end tags are missing.
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| <tr>
--| <td>
--| <td>
--| <span>
--| <th>
--| <span>
--| "X"
--
--#data
--<body><body><base><link><meta><title><p></title><body><p></body>
--#errors
--Line: 1 Col: 6 Unexpected start tag (body). Expected DOCTYPE.
--Line: 1 Col: 12 Unexpected start tag (body).
--Line: 1 Col: 54 Unexpected start tag (body).
--Line: 1 Col: 64 Unexpected end tag (p). Missing end tag (body).
--#document
--| <html>
--| <head>
--| <body>
--| <base>
--| <link>
--| <meta>
--| <title>
--| "<p>"
--| <p>
--
--#data
--<textarea><p></textarea>
--#errors
--Line: 1 Col: 10 Unexpected start tag (textarea). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--| <textarea>
--| "<p>"
--
--#data
--<p><image></p>
--#errors
--Line: 1 Col: 3 Unexpected start tag (p). Expected DOCTYPE.
--Line: 1 Col: 10 Unexpected start tag (image). Treated as img.
--#document
--| <html>
--| <head>
--| <body>
--| <p>
--| <img>
--
--#data
--<a><table><a></table><p><a><div><a>
--#errors
--Line: 1 Col: 3 Unexpected start tag (a). Expected DOCTYPE.
--Line: 1 Col: 13 Unexpected start tag (a) in table context caused voodoo mode.
--Line: 1 Col: 13 Unexpected start tag (a) implies end tag (a).
--Line: 1 Col: 13 End tag (a) violates step 1, paragraph 1 of the adoption agency algorithm.
--Line: 1 Col: 21 Unexpected end tag (table). Expected end tag (a).
--Line: 1 Col: 27 Unexpected start tag (a) implies end tag (a).
--Line: 1 Col: 27 End tag (a) violates step 1, paragraph 2 of the adoption agency algorithm.
--Line: 1 Col: 32 Unexpected end tag (p). Ignored.
--Line: 1 Col: 35 Unexpected start tag (a) implies end tag (a).
--Line: 1 Col: 35 End tag (a) violates step 1, paragraph 2 of the adoption agency algorithm.
--Line: 1 Col: 35 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <a>
--| <a>
--| <table>
--| <p>
--| <a>
--| <div>
--| <a>
--
--#data
--<head></p><meta><p>
--#errors
--Line: 1 Col: 6 Unexpected start tag (head). Expected DOCTYPE.
--Line: 1 Col: 10 Unexpected end tag (p). Ignored.
--#document
--| <html>
--| <head>
--| <meta>
--| <body>
--| <p>
--
--#data
--<head></html><meta><p>
--#errors
--Line: 1 Col: 6 Unexpected start tag (head). Expected DOCTYPE.
--Line: 1 Col: 19 Unexpected start tag (meta).
--#document
--| <html>
--| <head>
--| <body>
--| <meta>
--| <p>
--
--#data
--<b><table><td><i></table>
--#errors
--Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
--Line: 1 Col: 14 Unexpected table cell start tag (td) in the table body phase.
--Line: 1 Col: 25 Got table cell end tag (td) while required end tags are missing.
--Line: 1 Col: 25 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <b>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| <i>
--
--#data
--<b><table><td></b><i></table>
--#errors
--Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
--Line: 1 Col: 14 Unexpected table cell start tag (td) in the table body phase.
--Line: 1 Col: 18 End tag (b) violates step 1, paragraph 1 of the adoption agency algorithm.
--Line: 1 Col: 29 Got table cell end tag (td) while required end tags are missing.
--Line: 1 Col: 29 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <b>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| <i>
--
--#data
--<h1><h2>
--#errors
--4: Start tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
--8: Heading cannot be a child of another heading.
--8: End of file seen and there were open elements.
--#document
--| <html>
--| <head>
--| <body>
--| <h1>
--| <h2>
--
--#data
--<a><p><a></a></p></a>
--#errors
--Line: 1 Col: 3 Unexpected start tag (a). Expected DOCTYPE.
--Line: 1 Col: 9 Unexpected start tag (a) implies end tag (a).
--Line: 1 Col: 9 End tag (a) violates step 1, paragraph 3 of the adoption agency algorithm.
--Line: 1 Col: 21 End tag (a) violates step 1, paragraph 1 of the adoption agency algorithm.
--#document
--| <html>
--| <head>
--| <body>
--| <a>
--| <p>
--| <a>
--| <a>
--
--#data
--<b><button></b></button></b>
--#errors
--Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
--Line: 1 Col: 15 End tag (b) violates step 1, paragraph 1 of the adoption agency algorithm.
--#document
--| <html>
--| <head>
--| <body>
--| <b>
--| <button>
--| <b>
--
--#data
--<p><b><div><marquee></p></b></div>
--#errors
--Line: 1 Col: 3 Unexpected start tag (p). Expected DOCTYPE.
--Line: 1 Col: 11 Unexpected end tag (p). Ignored.
--Line: 1 Col: 24 Unexpected end tag (p). Ignored.
--Line: 1 Col: 28 End tag (b) violates step 1, paragraph 1 of the adoption agency algorithm.
--Line: 1 Col: 34 End tag (div) seen too early. Expected other end tag.
--Line: 1 Col: 34 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <p>
--| <b>
--| <div>
--| <b>
--| <marquee>
--| <p>
--
--#data
--<script></script></div><title></title><p><p>
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 23 Unexpected end tag (div). Ignored.
--#document
--| <html>
--| <head>
--| <script>
--| <title>
--| <body>
--| <p>
--| <p>
--
--#data
--<p><hr></p>
--#errors
--Line: 1 Col: 3 Unexpected start tag (p). Expected DOCTYPE.
--Line: 1 Col: 11 Unexpected end tag (p). Ignored.
--#document
--| <html>
--| <head>
--| <body>
--| <p>
--| <hr>
--| <p>
--
--#data
--<select><b><option><select><option></b></select>
--#errors
--Line: 1 Col: 8 Unexpected start tag (select). Expected DOCTYPE.
--Line: 1 Col: 11 Unexpected start tag token (b) in the select phase. Ignored.
--Line: 1 Col: 27 Unexpected select start tag in the select phase treated as select end tag.
--Line: 1 Col: 39 End tag (b) violates step 1, paragraph 1 of the adoption agency algorithm.
--Line: 1 Col: 48 Unexpected end tag (select). Ignored.
--Line: 1 Col: 48 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <select>
--| <option>
--| <option>
--
--#data
--<html><head><title></title><body></body></html>
--#errors
--Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <title>
--| <body>
--
--#data
--<a><table><td><a><table></table><a></tr><a></table><a>
--#errors
--Line: 1 Col: 3 Unexpected start tag (a). Expected DOCTYPE.
--Line: 1 Col: 14 Unexpected table cell start tag (td) in the table body phase.
--Line: 1 Col: 35 Unexpected start tag (a) implies end tag (a).
--Line: 1 Col: 40 Got table cell end tag (td) while required end tags are missing.
--Line: 1 Col: 43 Unexpected start tag (a) in table context caused voodoo mode.
--Line: 1 Col: 43 Unexpected start tag (a) implies end tag (a).
--Line: 1 Col: 43 End tag (a) violates step 1, paragraph 1 of the adoption agency algorithm.
--Line: 1 Col: 51 Unexpected implied end tag (a) in the table phase.
--Line: 1 Col: 54 Unexpected start tag (a) implies end tag (a).
--Line: 1 Col: 54 End tag (a) violates step 1, paragraph 2 of the adoption agency algorithm.
--Line: 1 Col: 54 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <a>
--| <a>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| <a>
--| <table>
--| <a>
--| <a>
--
--#data
--<ul><li></li><div><li></div><li><li><div><li><address><li><b><em></b><li></ul>
--#errors
--Line: 1 Col: 4 Unexpected start tag (ul). Expected DOCTYPE.
--Line: 1 Col: 45 Missing end tag (div, li).
--Line: 1 Col: 58 Missing end tag (address, li).
--Line: 1 Col: 69 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
--#document
--| <html>
--| <head>
--| <body>
--| <ul>
--| <li>
--| <div>
--| <li>
--| <li>
--| <li>
--| <div>
--| <li>
--| <address>
--| <li>
--| <b>
--| <em>
--| <li>
--
--#data
--<ul><li><ul></li><li>a</li></ul></li></ul>
--#errors
--XXX: fix me
--#document
--| <html>
--| <head>
--| <body>
--| <ul>
--| <li>
--| <ul>
--| <li>
--| "a"
--
--#data
--<frameset><frame><frameset><frame></frameset><noframes></noframes></frameset>
--#errors
--Line: 1 Col: 10 Unexpected start tag (frameset). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <frameset>
--| <frame>
--| <frameset>
--| <frame>
--| <noframes>
--
--#data
--<h1><table><td><h3></table><h3></h1>
--#errors
--4: Start tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
--15: “td” start tag in table body.
--27: Unclosed elements.
--31: Heading cannot be a child of another heading.
--36: End tag “h1” seen but there were unclosed elements.
--#document
--| <html>
--| <head>
--| <body>
--| <h1>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| <h3>
--| <h3>
--
--#data
--<table><colgroup><col><colgroup><col><col><col><colgroup><col><col><thead><tr><td></table>
--#errors
--Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--| <colgroup>
--| <col>
--| <colgroup>
--| <col>
--| <col>
--| <col>
--| <colgroup>
--| <col>
--| <col>
--| <thead>
--| <tr>
--| <td>
--
--#data
--<table><col><tbody><col><tr><col><td><col></table><col>
--#errors
--Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
--Line: 1 Col: 37 Unexpected table cell start tag (td) in the table body phase.
--Line: 1 Col: 55 Unexpected start tag col. Ignored.
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--| <colgroup>
--| <col>
--| <tbody>
--| <colgroup>
--| <col>
--| <tbody>
--| <tr>
--| <colgroup>
--| <col>
--| <tbody>
--| <tr>
--| <td>
--| <colgroup>
--| <col>
--
--#data
--<table><colgroup><tbody><colgroup><tr><colgroup><td><colgroup></table><colgroup>
--#errors
--Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
--Line: 1 Col: 52 Unexpected table cell start tag (td) in the table body phase.
--Line: 1 Col: 80 Unexpected start tag colgroup. Ignored.
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--| <colgroup>
--| <tbody>
--| <colgroup>
--| <tbody>
--| <tr>
--| <colgroup>
--| <tbody>
--| <tr>
--| <td>
--| <colgroup>
--
--#data
--</strong></b></em></i></u></strike></s></blink></tt></pre></big></small></font></select></h1></h2></h3></h4></h5></h6></body></br></a></img></title></span></style></script></table></th></td></tr></frame></area></link></param></hr></input></col></base></meta></basefont></bgsound></embed></spacer></p></dd></dt></caption></colgroup></tbody></tfoot></thead></address></blockquote></center></dir></div></dl></fieldset></listing></menu></ol></ul></li></nobr></wbr></form></button></marquee></object></html></frameset></head></iframe></image></isindex></noembed></noframes></noscript></optgroup></option></plaintext></textarea>
--#errors
--Line: 1 Col: 9 Unexpected end tag (strong). Expected DOCTYPE.
--Line: 1 Col: 9 Unexpected end tag (strong) after the (implied) root element.
--Line: 1 Col: 13 Unexpected end tag (b) after the (implied) root element.
--Line: 1 Col: 18 Unexpected end tag (em) after the (implied) root element.
--Line: 1 Col: 22 Unexpected end tag (i) after the (implied) root element.
--Line: 1 Col: 26 Unexpected end tag (u) after the (implied) root element.
--Line: 1 Col: 35 Unexpected end tag (strike) after the (implied) root element.
--Line: 1 Col: 39 Unexpected end tag (s) after the (implied) root element.
--Line: 1 Col: 47 Unexpected end tag (blink) after the (implied) root element.
--Line: 1 Col: 52 Unexpected end tag (tt) after the (implied) root element.
--Line: 1 Col: 58 Unexpected end tag (pre) after the (implied) root element.
--Line: 1 Col: 64 Unexpected end tag (big) after the (implied) root element.
--Line: 1 Col: 72 Unexpected end tag (small) after the (implied) root element.
--Line: 1 Col: 79 Unexpected end tag (font) after the (implied) root element.
--Line: 1 Col: 88 Unexpected end tag (select) after the (implied) root element.
--Line: 1 Col: 93 Unexpected end tag (h1) after the (implied) root element.
--Line: 1 Col: 98 Unexpected end tag (h2) after the (implied) root element.
--Line: 1 Col: 103 Unexpected end tag (h3) after the (implied) root element.
--Line: 1 Col: 108 Unexpected end tag (h4) after the (implied) root element.
--Line: 1 Col: 113 Unexpected end tag (h5) after the (implied) root element.
--Line: 1 Col: 118 Unexpected end tag (h6) after the (implied) root element.
--Line: 1 Col: 125 Unexpected end tag (body) after the (implied) root element.
--Line: 1 Col: 130 Unexpected end tag (br). Treated as br element.
--Line: 1 Col: 134 End tag (a) violates step 1, paragraph 1 of the adoption agency algorithm.
--Line: 1 Col: 140 This element (img) has no end tag.
--Line: 1 Col: 148 Unexpected end tag (title). Ignored.
--Line: 1 Col: 155 Unexpected end tag (span). Ignored.
--Line: 1 Col: 163 Unexpected end tag (style). Ignored.
--Line: 1 Col: 172 Unexpected end tag (script). Ignored.
--Line: 1 Col: 180 Unexpected end tag (table). Ignored.
--Line: 1 Col: 185 Unexpected end tag (th). Ignored.
--Line: 1 Col: 190 Unexpected end tag (td). Ignored.
--Line: 1 Col: 195 Unexpected end tag (tr). Ignored.
--Line: 1 Col: 203 This element (frame) has no end tag.
--Line: 1 Col: 210 This element (area) has no end tag.
--Line: 1 Col: 217 Unexpected end tag (link). Ignored.
--Line: 1 Col: 225 This element (param) has no end tag.
--Line: 1 Col: 230 This element (hr) has no end tag.
--Line: 1 Col: 238 This element (input) has no end tag.
--Line: 1 Col: 244 Unexpected end tag (col). Ignored.
--Line: 1 Col: 251 Unexpected end tag (base). Ignored.
--Line: 1 Col: 258 Unexpected end tag (meta). Ignored.
--Line: 1 Col: 269 This element (basefont) has no end tag.
--Line: 1 Col: 279 This element (bgsound) has no end tag.
--Line: 1 Col: 287 This element (embed) has no end tag.
--Line: 1 Col: 296 This element (spacer) has no end tag.
--Line: 1 Col: 300 Unexpected end tag (p). Ignored.
--Line: 1 Col: 305 End tag (dd) seen too early. Expected other end tag.
--Line: 1 Col: 310 End tag (dt) seen too early. Expected other end tag.
--Line: 1 Col: 320 Unexpected end tag (caption). Ignored.
--Line: 1 Col: 331 Unexpected end tag (colgroup). Ignored.
--Line: 1 Col: 339 Unexpected end tag (tbody). Ignored.
--Line: 1 Col: 347 Unexpected end tag (tfoot). Ignored.
--Line: 1 Col: 355 Unexpected end tag (thead). Ignored.
--Line: 1 Col: 365 End tag (address) seen too early. Expected other end tag.
--Line: 1 Col: 378 End tag (blockquote) seen too early. Expected other end tag.
--Line: 1 Col: 387 End tag (center) seen too early. Expected other end tag.
--Line: 1 Col: 393 Unexpected end tag (dir). Ignored.
--Line: 1 Col: 399 End tag (div) seen too early. Expected other end tag.
--Line: 1 Col: 404 End tag (dl) seen too early. Expected other end tag.
--Line: 1 Col: 415 End tag (fieldset) seen too early. Expected other end tag.
--Line: 1 Col: 425 End tag (listing) seen too early. Expected other end tag.
--Line: 1 Col: 432 End tag (menu) seen too early. Expected other end tag.
--Line: 1 Col: 437 End tag (ol) seen too early. Expected other end tag.
--Line: 1 Col: 442 End tag (ul) seen too early. Expected other end tag.
--Line: 1 Col: 447 End tag (li) seen too early. Expected other end tag.
--Line: 1 Col: 454 End tag (nobr) violates step 1, paragraph 1 of the adoption agency algorithm.
--Line: 1 Col: 460 This element (wbr) has no end tag.
--Line: 1 Col: 476 End tag (button) seen too early. Expected other end tag.
--Line: 1 Col: 486 End tag (marquee) seen too early. Expected other end tag.
--Line: 1 Col: 495 End tag (object) seen too early. Expected other end tag.
--Line: 1 Col: 513 Unexpected end tag (html). Ignored.
--Line: 1 Col: 513 Unexpected end tag (frameset). Ignored.
--Line: 1 Col: 520 Unexpected end tag (head). Ignored.
--Line: 1 Col: 529 Unexpected end tag (iframe). Ignored.
--Line: 1 Col: 537 This element (image) has no end tag.
--Line: 1 Col: 547 This element (isindex) has no end tag.
--Line: 1 Col: 557 Unexpected end tag (noembed). Ignored.
--Line: 1 Col: 568 Unexpected end tag (noframes). Ignored.
--Line: 1 Col: 579 Unexpected end tag (noscript). Ignored.
--Line: 1 Col: 590 Unexpected end tag (optgroup). Ignored.
--Line: 1 Col: 599 Unexpected end tag (option). Ignored.
--Line: 1 Col: 611 Unexpected end tag (plaintext). Ignored.
--Line: 1 Col: 622 Unexpected end tag (textarea). Ignored.
--#document
--| <html>
--| <head>
--| <body>
--| <br>
--| <p>
--
--#data
--<table><tr></strong></b></em></i></u></strike></s></blink></tt></pre></big></small></font></select></h1></h2></h3></h4></h5></h6></body></br></a></img></title></span></style></script></table></th></td></tr></frame></area></link></param></hr></input></col></base></meta></basefont></bgsound></embed></spacer></p></dd></dt></caption></colgroup></tbody></tfoot></thead></address></blockquote></center></dir></div></dl></fieldset></listing></menu></ol></ul></li></nobr></wbr></form></button></marquee></object></html></frameset></head></iframe></image></isindex></noembed></noframes></noscript></optgroup></option></plaintext></textarea>
--#errors
--Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
--Line: 1 Col: 20 Unexpected end tag (strong) in table context caused voodoo mode.
--Line: 1 Col: 20 End tag (strong) violates step 1, paragraph 1 of the adoption agency algorithm.
--Line: 1 Col: 24 Unexpected end tag (b) in table context caused voodoo mode.
--Line: 1 Col: 24 End tag (b) violates step 1, paragraph 1 of the adoption agency algorithm.
--Line: 1 Col: 29 Unexpected end tag (em) in table context caused voodoo mode.
--Line: 1 Col: 29 End tag (em) violates step 1, paragraph 1 of the adoption agency algorithm.
--Line: 1 Col: 33 Unexpected end tag (i) in table context caused voodoo mode.
--Line: 1 Col: 33 End tag (i) violates step 1, paragraph 1 of the adoption agency algorithm.
--Line: 1 Col: 37 Unexpected end tag (u) in table context caused voodoo mode.
--Line: 1 Col: 37 End tag (u) violates step 1, paragraph 1 of the adoption agency algorithm.
--Line: 1 Col: 46 Unexpected end tag (strike) in table context caused voodoo mode.
--Line: 1 Col: 46 End tag (strike) violates step 1, paragraph 1 of the adoption agency algorithm.
--Line: 1 Col: 50 Unexpected end tag (s) in table context caused voodoo mode.
--Line: 1 Col: 50 End tag (s) violates step 1, paragraph 1 of the adoption agency algorithm.
--Line: 1 Col: 58 Unexpected end tag (blink) in table context caused voodoo mode.
--Line: 1 Col: 58 Unexpected end tag (blink). Ignored.
--Line: 1 Col: 63 Unexpected end tag (tt) in table context caused voodoo mode.
--Line: 1 Col: 63 End tag (tt) violates step 1, paragraph 1 of the adoption agency algorithm.
--Line: 1 Col: 69 Unexpected end tag (pre) in table context caused voodoo mode.
--Line: 1 Col: 69 End tag (pre) seen too early. Expected other end tag.
--Line: 1 Col: 75 Unexpected end tag (big) in table context caused voodoo mode.
--Line: 1 Col: 75 End tag (big) violates step 1, paragraph 1 of the adoption agency algorithm.
--Line: 1 Col: 83 Unexpected end tag (small) in table context caused voodoo mode.
--Line: 1 Col: 83 End tag (small) violates step 1, paragraph 1 of the adoption agency algorithm.
--Line: 1 Col: 90 Unexpected end tag (font) in table context caused voodoo mode.
--Line: 1 Col: 90 End tag (font) violates step 1, paragraph 1 of the adoption agency algorithm.
--Line: 1 Col: 99 Unexpected end tag (select) in table context caused voodoo mode.
--Line: 1 Col: 99 Unexpected end tag (select). Ignored.
--Line: 1 Col: 104 Unexpected end tag (h1) in table context caused voodoo mode.
--Line: 1 Col: 104 End tag (h1) seen too early. Expected other end tag.
--Line: 1 Col: 109 Unexpected end tag (h2) in table context caused voodoo mode.
--Line: 1 Col: 109 End tag (h2) seen too early. Expected other end tag.
--Line: 1 Col: 114 Unexpected end tag (h3) in table context caused voodoo mode.
--Line: 1 Col: 114 End tag (h3) seen too early. Expected other end tag.
--Line: 1 Col: 119 Unexpected end tag (h4) in table context caused voodoo mode.
--Line: 1 Col: 119 End tag (h4) seen too early. Expected other end tag.
--Line: 1 Col: 124 Unexpected end tag (h5) in table context caused voodoo mode.
--Line: 1 Col: 124 End tag (h5) seen too early. Expected other end tag.
--Line: 1 Col: 129 Unexpected end tag (h6) in table context caused voodoo mode.
--Line: 1 Col: 129 End tag (h6) seen too early. Expected other end tag.
--Line: 1 Col: 136 Unexpected end tag (body) in the table row phase. Ignored.
--Line: 1 Col: 141 Unexpected end tag (br) in table context caused voodoo mode.
--Line: 1 Col: 141 Unexpected end tag (br). Treated as br element.
--Line: 1 Col: 145 Unexpected end tag (a) in table context caused voodoo mode.
--Line: 1 Col: 145 End tag (a) violates step 1, paragraph 1 of the adoption agency algorithm.
--Line: 1 Col: 151 Unexpected end tag (img) in table context caused voodoo mode.
--Line: 1 Col: 151 This element (img) has no end tag.
--Line: 1 Col: 159 Unexpected end tag (title) in table context caused voodoo mode.
--Line: 1 Col: 159 Unexpected end tag (title). Ignored.
--Line: 1 Col: 166 Unexpected end tag (span) in table context caused voodoo mode.
--Line: 1 Col: 166 Unexpected end tag (span). Ignored.
--Line: 1 Col: 174 Unexpected end tag (style) in table context caused voodoo mode.
--Line: 1 Col: 174 Unexpected end tag (style). Ignored.
--Line: 1 Col: 183 Unexpected end tag (script) in table context caused voodoo mode.
--Line: 1 Col: 183 Unexpected end tag (script). Ignored.
--Line: 1 Col: 196 Unexpected end tag (th). Ignored.
--Line: 1 Col: 201 Unexpected end tag (td). Ignored.
--Line: 1 Col: 206 Unexpected end tag (tr). Ignored.
--Line: 1 Col: 214 This element (frame) has no end tag.
--Line: 1 Col: 221 This element (area) has no end tag.
--Line: 1 Col: 228 Unexpected end tag (link). Ignored.
--Line: 1 Col: 236 This element (param) has no end tag.
--Line: 1 Col: 241 This element (hr) has no end tag.
--Line: 1 Col: 249 This element (input) has no end tag.
--Line: 1 Col: 255 Unexpected end tag (col). Ignored.
--Line: 1 Col: 262 Unexpected end tag (base). Ignored.
--Line: 1 Col: 269 Unexpected end tag (meta). Ignored.
--Line: 1 Col: 280 This element (basefont) has no end tag.
--Line: 1 Col: 290 This element (bgsound) has no end tag.
--Line: 1 Col: 298 This element (embed) has no end tag.
--Line: 1 Col: 307 This element (spacer) has no end tag.
--Line: 1 Col: 311 Unexpected end tag (p). Ignored.
--Line: 1 Col: 316 End tag (dd) seen too early. Expected other end tag.
--Line: 1 Col: 321 End tag (dt) seen too early. Expected other end tag.
--Line: 1 Col: 331 Unexpected end tag (caption). Ignored.
--Line: 1 Col: 342 Unexpected end tag (colgroup). Ignored.
--Line: 1 Col: 350 Unexpected end tag (tbody). Ignored.
--Line: 1 Col: 358 Unexpected end tag (tfoot). Ignored.
--Line: 1 Col: 366 Unexpected end tag (thead). Ignored.
--Line: 1 Col: 376 End tag (address) seen too early. Expected other end tag.
--Line: 1 Col: 389 End tag (blockquote) seen too early. Expected other end tag.
--Line: 1 Col: 398 End tag (center) seen too early. Expected other end tag.
--Line: 1 Col: 404 Unexpected end tag (dir). Ignored.
--Line: 1 Col: 410 End tag (div) seen too early. Expected other end tag.
--Line: 1 Col: 415 End tag (dl) seen too early. Expected other end tag.
--Line: 1 Col: 426 End tag (fieldset) seen too early. Expected other end tag.
--Line: 1 Col: 436 End tag (listing) seen too early. Expected other end tag.
--Line: 1 Col: 443 End tag (menu) seen too early. Expected other end tag.
--Line: 1 Col: 448 End tag (ol) seen too early. Expected other end tag.
--Line: 1 Col: 453 End tag (ul) seen too early. Expected other end tag.
--Line: 1 Col: 458 End tag (li) seen too early. Expected other end tag.
--Line: 1 Col: 465 End tag (nobr) violates step 1, paragraph 1 of the adoption agency algorithm.
--Line: 1 Col: 471 This element (wbr) has no end tag.
--Line: 1 Col: 487 End tag (button) seen too early. Expected other end tag.
--Line: 1 Col: 497 End tag (marquee) seen too early. Expected other end tag.
--Line: 1 Col: 506 End tag (object) seen too early. Expected other end tag.
--Line: 1 Col: 524 Unexpected end tag (html). Ignored.
--Line: 1 Col: 524 Unexpected end tag (frameset). Ignored.
--Line: 1 Col: 531 Unexpected end tag (head). Ignored.
--Line: 1 Col: 540 Unexpected end tag (iframe). Ignored.
--Line: 1 Col: 548 This element (image) has no end tag.
--Line: 1 Col: 558 This element (isindex) has no end tag.
--Line: 1 Col: 568 Unexpected end tag (noembed). Ignored.
--Line: 1 Col: 579 Unexpected end tag (noframes). Ignored.
--Line: 1 Col: 590 Unexpected end tag (noscript). Ignored.
--Line: 1 Col: 601 Unexpected end tag (optgroup). Ignored.
--Line: 1 Col: 610 Unexpected end tag (option). Ignored.
--Line: 1 Col: 622 Unexpected end tag (plaintext). Ignored.
--Line: 1 Col: 633 Unexpected end tag (textarea). Ignored.
--#document
--| <html>
--| <head>
--| <body>
--| <br>
--| <table>
--| <tbody>
--| <tr>
--| <p>
--
--#data
--<frameset>
--#errors
--Line: 1 Col: 10 Unexpected start tag (frameset). Expected DOCTYPE.
--Line: 1 Col: 10 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <frameset>
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests10.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests10.dat
-deleted file mode 100644
-index 4f8df86..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests10.dat
-+++ /dev/null
-@@ -1,799 +0,0 @@
--#data
--<!DOCTYPE html><svg></svg>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <svg svg>
--
--#data
--<!DOCTYPE html><svg></svg><![CDATA[a]]>
--#errors
--29: Bogus comment
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| <!-- [CDATA[a]] -->
--
--#data
--<!DOCTYPE html><body><svg></svg>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <svg svg>
--
--#data
--<!DOCTYPE html><body><select><svg></svg></select>
--#errors
--35: Stray “svg” start tag.
--42: Stray end tag “svg”
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <select>
--
--#data
--<!DOCTYPE html><body><select><option><svg></svg></option></select>
--#errors
--43: Stray “svg” start tag.
--50: Stray end tag “svg”
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <select>
--| <option>
--
--#data
--<!DOCTYPE html><body><table><svg></svg></table>
--#errors
--34: Start tag “svg” seen in “table”.
--41: Stray end tag “svg”.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| <table>
--
--#data
--<!DOCTYPE html><body><table><svg><g>foo</g></svg></table>
--#errors
--34: Start tag “svg” seen in “table”.
--46: Stray end tag “g”.
--53: Stray end tag “svg”.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| <svg g>
--| "foo"
--| <table>
--
--#data
--<!DOCTYPE html><body><table><svg><g>foo</g><g>bar</g></svg></table>
--#errors
--34: Start tag “svg” seen in “table”.
--46: Stray end tag “g”.
--58: Stray end tag “g”.
--65: Stray end tag “svg”.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| <svg g>
--| "foo"
--| <svg g>
--| "bar"
--| <table>
--
--#data
--<!DOCTYPE html><body><table><tbody><svg><g>foo</g><g>bar</g></svg></tbody></table>
--#errors
--41: Start tag “svg” seen in “table”.
--53: Stray end tag “g”.
--65: Stray end tag “g”.
--72: Stray end tag “svg”.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| <svg g>
--| "foo"
--| <svg g>
--| "bar"
--| <table>
--| <tbody>
--
--#data
--<!DOCTYPE html><body><table><tbody><tr><svg><g>foo</g><g>bar</g></svg></tr></tbody></table>
--#errors
--45: Start tag “svg” seen in “table”.
--57: Stray end tag “g”.
--69: Stray end tag “g”.
--76: Stray end tag “svg”.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| <svg g>
--| "foo"
--| <svg g>
--| "bar"
--| <table>
--| <tbody>
--| <tr>
--
--#data
--<!DOCTYPE html><body><table><tbody><tr><td><svg><g>foo</g><g>bar</g></svg></td></tr></tbody></table>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| <svg svg>
--| <svg g>
--| "foo"
--| <svg g>
--| "bar"
--
--#data
--<!DOCTYPE html><body><table><tbody><tr><td><svg><g>foo</g><g>bar</g></svg><p>baz</td></tr></tbody></table>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| <svg svg>
--| <svg g>
--| "foo"
--| <svg g>
--| "bar"
--| <p>
--| "baz"
--
--#data
--<!DOCTYPE html><body><table><caption><svg><g>foo</g><g>bar</g></svg><p>baz</caption></table>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| <caption>
--| <svg svg>
--| <svg g>
--| "foo"
--| <svg g>
--| "bar"
--| <p>
--| "baz"
--
--#data
--<!DOCTYPE html><body><table><caption><svg><g>foo</g><g>bar</g><p>baz</table><p>quux
--#errors
--70: HTML start tag “p” in a foreign namespace context.
--81: “table” closed but “caption” was still open.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| <caption>
--| <svg svg>
--| <svg g>
--| "foo"
--| <svg g>
--| "bar"
--| <p>
--| "baz"
--| <p>
--| "quux"
--
--#data
--<!DOCTYPE html><body><table><caption><svg><g>foo</g><g>bar</g>baz</table><p>quux
--#errors
--78: “table” closed but “caption” was still open.
--78: Unclosed elements on stack.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| <caption>
--| <svg svg>
--| <svg g>
--| "foo"
--| <svg g>
--| "bar"
--| "baz"
--| <p>
--| "quux"
--
--#data
--<!DOCTYPE html><body><table><colgroup><svg><g>foo</g><g>bar</g><p>baz</table><p>quux
--#errors
--44: Start tag “svg” seen in “table”.
--56: Stray end tag “g”.
--68: Stray end tag “g”.
--71: HTML start tag “p” in a foreign namespace context.
--71: Start tag “p” seen in “table”.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| <svg g>
--| "foo"
--| <svg g>
--| "bar"
--| <p>
--| "baz"
--| <table>
--| <colgroup>
--| <p>
--| "quux"
--
--#data
--<!DOCTYPE html><body><table><tr><td><select><svg><g>foo</g><g>bar</g><p>baz</table><p>quux
--#errors
--50: Stray “svg” start tag.
--54: Stray “g” start tag.
--62: Stray end tag “g”
--66: Stray “g” start tag.
--74: Stray end tag “g”
--77: Stray “p” start tag.
--88: “table” end tag with “select” open.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| <select>
--| "foobarbaz"
--| <p>
--| "quux"
--
--#data
--<!DOCTYPE html><body><table><select><svg><g>foo</g><g>bar</g><p>baz</table><p>quux
--#errors
--36: Start tag “select” seen in “table”.
--42: Stray “svg” start tag.
--46: Stray “g” start tag.
--54: Stray end tag “g”
--58: Stray “g” start tag.
--66: Stray end tag “g”
--69: Stray “p” start tag.
--80: “table” end tag with “select” open.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <select>
--| "foobarbaz"
--| <table>
--| <p>
--| "quux"
--
--#data
--<!DOCTYPE html><body></body></html><svg><g>foo</g><g>bar</g><p>baz
--#errors
--41: Stray “svg” start tag.
--68: HTML start tag “p” in a foreign namespace context.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| <svg g>
--| "foo"
--| <svg g>
--| "bar"
--| <p>
--| "baz"
--
--#data
--<!DOCTYPE html><body></body><svg><g>foo</g><g>bar</g><p>baz
--#errors
--34: Stray “svg” start tag.
--61: HTML start tag “p” in a foreign namespace context.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| <svg g>
--| "foo"
--| <svg g>
--| "bar"
--| <p>
--| "baz"
--
--#data
--<!DOCTYPE html><frameset><svg><g></g><g></g><p><span>
--#errors
--31: Stray “svg” start tag.
--35: Stray “g” start tag.
--40: Stray end tag “g”
--44: Stray “g” start tag.
--49: Stray end tag “g”
--52: Stray “p” start tag.
--58: Stray “span” start tag.
--58: End of file seen and there were open elements.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <frameset>
--
--#data
--<!DOCTYPE html><frameset></frameset><svg><g></g><g></g><p><span>
--#errors
--42: Stray “svg” start tag.
--46: Stray “g” start tag.
--51: Stray end tag “g”
--55: Stray “g” start tag.
--60: Stray end tag “g”
--63: Stray “p” start tag.
--69: Stray “span” start tag.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <frameset>
--
--#data
--<!DOCTYPE html><body xlink:href=foo><svg xlink:href=foo></svg>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| xlink:href="foo"
--| <svg svg>
--| xlink href="foo"
--
--#data
--<!DOCTYPE html><body xlink:href=foo xml:lang=en><svg><g xml:lang=en xlink:href=foo></g></svg>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| xlink:href="foo"
--| xml:lang="en"
--| <svg svg>
--| <svg g>
--| xlink href="foo"
--| xml lang="en"
--
--#data
--<!DOCTYPE html><body xlink:href=foo xml:lang=en><svg><g xml:lang=en xlink:href=foo /></svg>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| xlink:href="foo"
--| xml:lang="en"
--| <svg svg>
--| <svg g>
--| xlink href="foo"
--| xml lang="en"
--
--#data
--<!DOCTYPE html><body xlink:href=foo xml:lang=en><svg><g xml:lang=en xlink:href=foo />bar</svg>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| xlink:href="foo"
--| xml:lang="en"
--| <svg svg>
--| <svg g>
--| xlink href="foo"
--| xml lang="en"
--| "bar"
--
--#data
--<svg></path>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <svg svg>
--
--#data
--<div><svg></div>a
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| <svg svg>
--| "a"
--
--#data
--<div><svg><path></div>a
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| <svg svg>
--| <svg path>
--| "a"
--
--#data
--<div><svg><path></svg><path>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| <svg svg>
--| <svg path>
--| <path>
--
--#data
--<div><svg><path><foreignObject><math></div>a
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| <svg svg>
--| <svg path>
--| <svg foreignObject>
--| <math math>
--| "a"
--
--#data
--<div><svg><path><foreignObject><p></div>a
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| <svg svg>
--| <svg path>
--| <svg foreignObject>
--| <p>
--| "a"
--
--#data
--<!DOCTYPE html><svg><desc><div><svg><ul>a
--#errors
--40: HTML start tag “ul” in a foreign namespace context.
--41: End of file in a foreign namespace context.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| <svg desc>
--| <div>
--| <svg svg>
--| <ul>
--| "a"
--
--#data
--<!DOCTYPE html><svg><desc><svg><ul>a
--#errors
--35: HTML start tag “ul” in a foreign namespace context.
--36: End of file in a foreign namespace context.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| <svg desc>
--| <svg svg>
--| <ul>
--| "a"
--
--#data
--<!DOCTYPE html><p><svg><desc><p>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <svg svg>
--| <svg desc>
--| <p>
--
--#data
--<!DOCTYPE html><p><svg><title><p>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <svg svg>
--| <svg title>
--| <p>
--
--#data
--<div><svg><path><foreignObject><p></foreignObject><p>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| <svg svg>
--| <svg path>
--| <svg foreignObject>
--| <p>
--| <p>
--
--#data
--<math><mi><div><object><div><span></span></div></object></div></mi><mi>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <math math>
--| <math mi>
--| <div>
--| <object>
--| <div>
--| <span>
--| <math mi>
--
--#data
--<math><mi><svg><foreignObject><div><div></div></div></foreignObject></svg></mi><mi>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <math math>
--| <math mi>
--| <svg svg>
--| <svg foreignObject>
--| <div>
--| <div>
--| <math mi>
--
--#data
--<svg><script></script><path>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| <svg script>
--| <svg path>
--
--#data
--<table><svg></svg><tr>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| <table>
--| <tbody>
--| <tr>
--
--#data
--<math><mi><mglyph>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <math math>
--| <math mi>
--| <math mglyph>
--
--#data
--<math><mi><malignmark>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <math math>
--| <math mi>
--| <math malignmark>
--
--#data
--<math><mo><mglyph>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <math math>
--| <math mo>
--| <math mglyph>
--
--#data
--<math><mo><malignmark>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <math math>
--| <math mo>
--| <math malignmark>
--
--#data
--<math><mn><mglyph>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <math math>
--| <math mn>
--| <math mglyph>
--
--#data
--<math><mn><malignmark>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <math math>
--| <math mn>
--| <math malignmark>
--
--#data
--<math><ms><mglyph>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <math math>
--| <math ms>
--| <math mglyph>
--
--#data
--<math><ms><malignmark>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <math math>
--| <math ms>
--| <math malignmark>
--
--#data
--<math><mtext><mglyph>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <math math>
--| <math mtext>
--| <math mglyph>
--
--#data
--<math><mtext><malignmark>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <math math>
--| <math mtext>
--| <math malignmark>
--
--#data
--<math><annotation-xml><svg></svg></annotation-xml><mi>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <math math>
--| <math annotation-xml>
--| <svg svg>
--| <math mi>
--
--#data
--<math><annotation-xml><svg><foreignObject><div><math><mi></mi></math><span></span></div></foreignObject><path></path></svg></annotation-xml><mi>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <math math>
--| <math annotation-xml>
--| <svg svg>
--| <svg foreignObject>
--| <div>
--| <math math>
--| <math mi>
--| <span>
--| <svg path>
--| <math mi>
--
--#data
--<math><annotation-xml><svg><foreignObject><math><mi><svg></svg></mi><mo></mo></math><span></span></foreignObject><path></path></svg></annotation-xml><mi>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <math math>
--| <math annotation-xml>
--| <svg svg>
--| <svg foreignObject>
--| <math math>
--| <math mi>
--| <svg svg>
--| <math mo>
--| <span>
--| <svg path>
--| <math mi>
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests11.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests11.dat
-deleted file mode 100644
-index 638cde4..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests11.dat
-+++ /dev/null
-@@ -1,482 +0,0 @@
--#data
--<!DOCTYPE html><body><svg attributeName='' attributeType='' baseFrequency='' baseProfile='' calcMode='' clipPathUnits='' contentScriptType='' contentStyleType='' diffuseConstant='' edgeMode='' externalResourcesRequired='' filterRes='' filterUnits='' glyphRef='' gradientTransform='' gradientUnits='' kernelMatrix='' kernelUnitLength='' keyPoints='' keySplines='' keyTimes='' lengthAdjust='' limitingConeAngle='' markerHeight='' markerUnits='' markerWidth='' maskContentUnits='' maskUnits='' numOctaves='' pathLength='' patternContentUnits='' patternTransform='' patternUnits='' pointsAtX='' pointsAtY='' pointsAtZ='' preserveAlpha='' preserveAspectRatio='' primitiveUnits='' refX='' refY='' repeatCount='' repeatDur='' requiredExtensions='' requiredFeatures='' specularConstant='' specularExponent='' spreadMethod='' startOffset='' stdDeviation='' stitchTiles='' surfaceScale='' systemLanguage='' tableValues='' targetX='' targetY='' textLength='' viewBox='' viewTarget='' xChannelSelecto
r='' yChannelSelector='' zoomAndPan=''></svg>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| attributeName=""
--| attributeType=""
--| baseFrequency=""
--| baseProfile=""
--| calcMode=""
--| clipPathUnits=""
--| contentScriptType=""
--| contentStyleType=""
--| diffuseConstant=""
--| edgeMode=""
--| externalResourcesRequired=""
--| filterRes=""
--| filterUnits=""
--| glyphRef=""
--| gradientTransform=""
--| gradientUnits=""
--| kernelMatrix=""
--| kernelUnitLength=""
--| keyPoints=""
--| keySplines=""
--| keyTimes=""
--| lengthAdjust=""
--| limitingConeAngle=""
--| markerHeight=""
--| markerUnits=""
--| markerWidth=""
--| maskContentUnits=""
--| maskUnits=""
--| numOctaves=""
--| pathLength=""
--| patternContentUnits=""
--| patternTransform=""
--| patternUnits=""
--| pointsAtX=""
--| pointsAtY=""
--| pointsAtZ=""
--| preserveAlpha=""
--| preserveAspectRatio=""
--| primitiveUnits=""
--| refX=""
--| refY=""
--| repeatCount=""
--| repeatDur=""
--| requiredExtensions=""
--| requiredFeatures=""
--| specularConstant=""
--| specularExponent=""
--| spreadMethod=""
--| startOffset=""
--| stdDeviation=""
--| stitchTiles=""
--| surfaceScale=""
--| systemLanguage=""
--| tableValues=""
--| targetX=""
--| targetY=""
--| textLength=""
--| viewBox=""
--| viewTarget=""
--| xChannelSelector=""
--| yChannelSelector=""
--| zoomAndPan=""
--
--#data
--<!DOCTYPE html><BODY><SVG ATTRIBUTENAME='' ATTRIBUTETYPE='' BASEFREQUENCY='' BASEPROFILE='' CALCMODE='' CLIPPATHUNITS='' CONTENTSCRIPTTYPE='' CONTENTSTYLETYPE='' DIFFUSECONSTANT='' EDGEMODE='' EXTERNALRESOURCESREQUIRED='' FILTERRES='' FILTERUNITS='' GLYPHREF='' GRADIENTTRANSFORM='' GRADIENTUNITS='' KERNELMATRIX='' KERNELUNITLENGTH='' KEYPOINTS='' KEYSPLINES='' KEYTIMES='' LENGTHADJUST='' LIMITINGCONEANGLE='' MARKERHEIGHT='' MARKERUNITS='' MARKERWIDTH='' MASKCONTENTUNITS='' MASKUNITS='' NUMOCTAVES='' PATHLENGTH='' PATTERNCONTENTUNITS='' PATTERNTRANSFORM='' PATTERNUNITS='' POINTSATX='' POINTSATY='' POINTSATZ='' PRESERVEALPHA='' PRESERVEASPECTRATIO='' PRIMITIVEUNITS='' REFX='' REFY='' REPEATCOUNT='' REPEATDUR='' REQUIREDEXTENSIONS='' REQUIREDFEATURES='' SPECULARCONSTANT='' SPECULAREXPONENT='' SPREADMETHOD='' STARTOFFSET='' STDDEVIATION='' STITCHTILES='' SURFACESCALE='' SYSTEMLANGUAGE='' TABLEVALUES='' TARGETX='' TARGETY='' TEXTLENGTH='' VIEWBOX='' VIEWTARGET='' XCHANNELSELECTO
R='' YCHANNELSELECTOR='' ZOOMANDPAN=''></SVG>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| attributeName=""
--| attributeType=""
--| baseFrequency=""
--| baseProfile=""
--| calcMode=""
--| clipPathUnits=""
--| contentScriptType=""
--| contentStyleType=""
--| diffuseConstant=""
--| edgeMode=""
--| externalResourcesRequired=""
--| filterRes=""
--| filterUnits=""
--| glyphRef=""
--| gradientTransform=""
--| gradientUnits=""
--| kernelMatrix=""
--| kernelUnitLength=""
--| keyPoints=""
--| keySplines=""
--| keyTimes=""
--| lengthAdjust=""
--| limitingConeAngle=""
--| markerHeight=""
--| markerUnits=""
--| markerWidth=""
--| maskContentUnits=""
--| maskUnits=""
--| numOctaves=""
--| pathLength=""
--| patternContentUnits=""
--| patternTransform=""
--| patternUnits=""
--| pointsAtX=""
--| pointsAtY=""
--| pointsAtZ=""
--| preserveAlpha=""
--| preserveAspectRatio=""
--| primitiveUnits=""
--| refX=""
--| refY=""
--| repeatCount=""
--| repeatDur=""
--| requiredExtensions=""
--| requiredFeatures=""
--| specularConstant=""
--| specularExponent=""
--| spreadMethod=""
--| startOffset=""
--| stdDeviation=""
--| stitchTiles=""
--| surfaceScale=""
--| systemLanguage=""
--| tableValues=""
--| targetX=""
--| targetY=""
--| textLength=""
--| viewBox=""
--| viewTarget=""
--| xChannelSelector=""
--| yChannelSelector=""
--| zoomAndPan=""
--
--#data
--<!DOCTYPE html><body><svg attributename='' attributetype='' basefrequency='' baseprofile='' calcmode='' clippathunits='' contentscripttype='' contentstyletype='' diffuseconstant='' edgemode='' externalresourcesrequired='' filterres='' filterunits='' glyphref='' gradienttransform='' gradientunits='' kernelmatrix='' kernelunitlength='' keypoints='' keysplines='' keytimes='' lengthadjust='' limitingconeangle='' markerheight='' markerunits='' markerwidth='' maskcontentunits='' maskunits='' numoctaves='' pathlength='' patterncontentunits='' patterntransform='' patternunits='' pointsatx='' pointsaty='' pointsatz='' preservealpha='' preserveaspectratio='' primitiveunits='' refx='' refy='' repeatcount='' repeatdur='' requiredextensions='' requiredfeatures='' specularconstant='' specularexponent='' spreadmethod='' startoffset='' stddeviation='' stitchtiles='' surfacescale='' systemlanguage='' tablevalues='' targetx='' targety='' textlength='' viewbox='' viewtarget='' xchannelselecto
r='' ychannelselector='' zoomandpan=''></svg>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| attributeName=""
--| attributeType=""
--| baseFrequency=""
--| baseProfile=""
--| calcMode=""
--| clipPathUnits=""
--| contentScriptType=""
--| contentStyleType=""
--| diffuseConstant=""
--| edgeMode=""
--| externalResourcesRequired=""
--| filterRes=""
--| filterUnits=""
--| glyphRef=""
--| gradientTransform=""
--| gradientUnits=""
--| kernelMatrix=""
--| kernelUnitLength=""
--| keyPoints=""
--| keySplines=""
--| keyTimes=""
--| lengthAdjust=""
--| limitingConeAngle=""
--| markerHeight=""
--| markerUnits=""
--| markerWidth=""
--| maskContentUnits=""
--| maskUnits=""
--| numOctaves=""
--| pathLength=""
--| patternContentUnits=""
--| patternTransform=""
--| patternUnits=""
--| pointsAtX=""
--| pointsAtY=""
--| pointsAtZ=""
--| preserveAlpha=""
--| preserveAspectRatio=""
--| primitiveUnits=""
--| refX=""
--| refY=""
--| repeatCount=""
--| repeatDur=""
--| requiredExtensions=""
--| requiredFeatures=""
--| specularConstant=""
--| specularExponent=""
--| spreadMethod=""
--| startOffset=""
--| stdDeviation=""
--| stitchTiles=""
--| surfaceScale=""
--| systemLanguage=""
--| tableValues=""
--| targetX=""
--| targetY=""
--| textLength=""
--| viewBox=""
--| viewTarget=""
--| xChannelSelector=""
--| yChannelSelector=""
--| zoomAndPan=""
--
--#data
--<!DOCTYPE html><body><math attributeName='' attributeType='' baseFrequency='' baseProfile='' calcMode='' clipPathUnits='' contentScriptType='' contentStyleType='' diffuseConstant='' edgeMode='' externalResourcesRequired='' filterRes='' filterUnits='' glyphRef='' gradientTransform='' gradientUnits='' kernelMatrix='' kernelUnitLength='' keyPoints='' keySplines='' keyTimes='' lengthAdjust='' limitingConeAngle='' markerHeight='' markerUnits='' markerWidth='' maskContentUnits='' maskUnits='' numOctaves='' pathLength='' patternContentUnits='' patternTransform='' patternUnits='' pointsAtX='' pointsAtY='' pointsAtZ='' preserveAlpha='' preserveAspectRatio='' primitiveUnits='' refX='' refY='' repeatCount='' repeatDur='' requiredExtensions='' requiredFeatures='' specularConstant='' specularExponent='' spreadMethod='' startOffset='' stdDeviation='' stitchTiles='' surfaceScale='' systemLanguage='' tableValues='' targetX='' targetY='' textLength='' viewBox='' viewTarget='' xChannelSelect
or='' yChannelSelector='' zoomAndPan=''></math>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <math math>
--| attributename=""
--| attributetype=""
--| basefrequency=""
--| baseprofile=""
--| calcmode=""
--| clippathunits=""
--| contentscripttype=""
--| contentstyletype=""
--| diffuseconstant=""
--| edgemode=""
--| externalresourcesrequired=""
--| filterres=""
--| filterunits=""
--| glyphref=""
--| gradienttransform=""
--| gradientunits=""
--| kernelmatrix=""
--| kernelunitlength=""
--| keypoints=""
--| keysplines=""
--| keytimes=""
--| lengthadjust=""
--| limitingconeangle=""
--| markerheight=""
--| markerunits=""
--| markerwidth=""
--| maskcontentunits=""
--| maskunits=""
--| numoctaves=""
--| pathlength=""
--| patterncontentunits=""
--| patterntransform=""
--| patternunits=""
--| pointsatx=""
--| pointsaty=""
--| pointsatz=""
--| preservealpha=""
--| preserveaspectratio=""
--| primitiveunits=""
--| refx=""
--| refy=""
--| repeatcount=""
--| repeatdur=""
--| requiredextensions=""
--| requiredfeatures=""
--| specularconstant=""
--| specularexponent=""
--| spreadmethod=""
--| startoffset=""
--| stddeviation=""
--| stitchtiles=""
--| surfacescale=""
--| systemlanguage=""
--| tablevalues=""
--| targetx=""
--| targety=""
--| textlength=""
--| viewbox=""
--| viewtarget=""
--| xchannelselector=""
--| ychannelselector=""
--| zoomandpan=""
--
--#data
--<!DOCTYPE html><body><svg><altGlyph /><altGlyphDef /><altGlyphItem /><animateColor /><animateMotion /><animateTransform /><clipPath /><feBlend /><feColorMatrix /><feComponentTransfer /><feComposite /><feConvolveMatrix /><feDiffuseLighting /><feDisplacementMap /><feDistantLight /><feFlood /><feFuncA /><feFuncB /><feFuncG /><feFuncR /><feGaussianBlur /><feImage /><feMerge /><feMergeNode /><feMorphology /><feOffset /><fePointLight /><feSpecularLighting /><feSpotLight /><feTile /><feTurbulence /><foreignObject /><glyphRef /><linearGradient /><radialGradient /><textPath /></svg>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| <svg altGlyph>
--| <svg altGlyphDef>
--| <svg altGlyphItem>
--| <svg animateColor>
--| <svg animateMotion>
--| <svg animateTransform>
--| <svg clipPath>
--| <svg feBlend>
--| <svg feColorMatrix>
--| <svg feComponentTransfer>
--| <svg feComposite>
--| <svg feConvolveMatrix>
--| <svg feDiffuseLighting>
--| <svg feDisplacementMap>
--| <svg feDistantLight>
--| <svg feFlood>
--| <svg feFuncA>
--| <svg feFuncB>
--| <svg feFuncG>
--| <svg feFuncR>
--| <svg feGaussianBlur>
--| <svg feImage>
--| <svg feMerge>
--| <svg feMergeNode>
--| <svg feMorphology>
--| <svg feOffset>
--| <svg fePointLight>
--| <svg feSpecularLighting>
--| <svg feSpotLight>
--| <svg feTile>
--| <svg feTurbulence>
--| <svg foreignObject>
--| <svg glyphRef>
--| <svg linearGradient>
--| <svg radialGradient>
--| <svg textPath>
--
--#data
--<!DOCTYPE html><body><svg><altglyph /><altglyphdef /><altglyphitem /><animatecolor /><animatemotion /><animatetransform /><clippath /><feblend /><fecolormatrix /><fecomponenttransfer /><fecomposite /><feconvolvematrix /><fediffuselighting /><fedisplacementmap /><fedistantlight /><feflood /><fefunca /><fefuncb /><fefuncg /><fefuncr /><fegaussianblur /><feimage /><femerge /><femergenode /><femorphology /><feoffset /><fepointlight /><fespecularlighting /><fespotlight /><fetile /><feturbulence /><foreignobject /><glyphref /><lineargradient /><radialgradient /><textpath /></svg>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| <svg altGlyph>
--| <svg altGlyphDef>
--| <svg altGlyphItem>
--| <svg animateColor>
--| <svg animateMotion>
--| <svg animateTransform>
--| <svg clipPath>
--| <svg feBlend>
--| <svg feColorMatrix>
--| <svg feComponentTransfer>
--| <svg feComposite>
--| <svg feConvolveMatrix>
--| <svg feDiffuseLighting>
--| <svg feDisplacementMap>
--| <svg feDistantLight>
--| <svg feFlood>
--| <svg feFuncA>
--| <svg feFuncB>
--| <svg feFuncG>
--| <svg feFuncR>
--| <svg feGaussianBlur>
--| <svg feImage>
--| <svg feMerge>
--| <svg feMergeNode>
--| <svg feMorphology>
--| <svg feOffset>
--| <svg fePointLight>
--| <svg feSpecularLighting>
--| <svg feSpotLight>
--| <svg feTile>
--| <svg feTurbulence>
--| <svg foreignObject>
--| <svg glyphRef>
--| <svg linearGradient>
--| <svg radialGradient>
--| <svg textPath>
--
--#data
--<!DOCTYPE html><BODY><SVG><ALTGLYPH /><ALTGLYPHDEF /><ALTGLYPHITEM /><ANIMATECOLOR /><ANIMATEMOTION /><ANIMATETRANSFORM /><CLIPPATH /><FEBLEND /><FECOLORMATRIX /><FECOMPONENTTRANSFER /><FECOMPOSITE /><FECONVOLVEMATRIX /><FEDIFFUSELIGHTING /><FEDISPLACEMENTMAP /><FEDISTANTLIGHT /><FEFLOOD /><FEFUNCA /><FEFUNCB /><FEFUNCG /><FEFUNCR /><FEGAUSSIANBLUR /><FEIMAGE /><FEMERGE /><FEMERGENODE /><FEMORPHOLOGY /><FEOFFSET /><FEPOINTLIGHT /><FESPECULARLIGHTING /><FESPOTLIGHT /><FETILE /><FETURBULENCE /><FOREIGNOBJECT /><GLYPHREF /><LINEARGRADIENT /><RADIALGRADIENT /><TEXTPATH /></SVG>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| <svg altGlyph>
--| <svg altGlyphDef>
--| <svg altGlyphItem>
--| <svg animateColor>
--| <svg animateMotion>
--| <svg animateTransform>
--| <svg clipPath>
--| <svg feBlend>
--| <svg feColorMatrix>
--| <svg feComponentTransfer>
--| <svg feComposite>
--| <svg feConvolveMatrix>
--| <svg feDiffuseLighting>
--| <svg feDisplacementMap>
--| <svg feDistantLight>
--| <svg feFlood>
--| <svg feFuncA>
--| <svg feFuncB>
--| <svg feFuncG>
--| <svg feFuncR>
--| <svg feGaussianBlur>
--| <svg feImage>
--| <svg feMerge>
--| <svg feMergeNode>
--| <svg feMorphology>
--| <svg feOffset>
--| <svg fePointLight>
--| <svg feSpecularLighting>
--| <svg feSpotLight>
--| <svg feTile>
--| <svg feTurbulence>
--| <svg foreignObject>
--| <svg glyphRef>
--| <svg linearGradient>
--| <svg radialGradient>
--| <svg textPath>
--
--#data
--<!DOCTYPE html><body><math><altGlyph /><altGlyphDef /><altGlyphItem /><animateColor /><animateMotion /><animateTransform /><clipPath /><feBlend /><feColorMatrix /><feComponentTransfer /><feComposite /><feConvolveMatrix /><feDiffuseLighting /><feDisplacementMap /><feDistantLight /><feFlood /><feFuncA /><feFuncB /><feFuncG /><feFuncR /><feGaussianBlur /><feImage /><feMerge /><feMergeNode /><feMorphology /><feOffset /><fePointLight /><feSpecularLighting /><feSpotLight /><feTile /><feTurbulence /><foreignObject /><glyphRef /><linearGradient /><radialGradient /><textPath /></math>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <math math>
--| <math altglyph>
--| <math altglyphdef>
--| <math altglyphitem>
--| <math animatecolor>
--| <math animatemotion>
--| <math animatetransform>
--| <math clippath>
--| <math feblend>
--| <math fecolormatrix>
--| <math fecomponenttransfer>
--| <math fecomposite>
--| <math feconvolvematrix>
--| <math fediffuselighting>
--| <math fedisplacementmap>
--| <math fedistantlight>
--| <math feflood>
--| <math fefunca>
--| <math fefuncb>
--| <math fefuncg>
--| <math fefuncr>
--| <math fegaussianblur>
--| <math feimage>
--| <math femerge>
--| <math femergenode>
--| <math femorphology>
--| <math feoffset>
--| <math fepointlight>
--| <math fespecularlighting>
--| <math fespotlight>
--| <math fetile>
--| <math feturbulence>
--| <math foreignobject>
--| <math glyphref>
--| <math lineargradient>
--| <math radialgradient>
--| <math textpath>
--
--#data
--<!DOCTYPE html><body><svg><solidColor /></svg>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| <svg solidcolor>
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests12.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests12.dat
-deleted file mode 100644
-index 63107d2..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests12.dat
-+++ /dev/null
-@@ -1,62 +0,0 @@
--#data
--<!DOCTYPE html><body><p>foo<math><mtext><i>baz</i></mtext><annotation-xml><svg><desc><b>eggs</b></desc><g><foreignObject><P>spam<TABLE><tr><td><img></td></table></foreignObject></g><g>quux</g></svg></annotation-xml></math>bar
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| "foo"
--| <math math>
--| <math mtext>
--| <i>
--| "baz"
--| <math annotation-xml>
--| <svg svg>
--| <svg desc>
--| <b>
--| "eggs"
--| <svg g>
--| <svg foreignObject>
--| <p>
--| "spam"
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| <img>
--| <svg g>
--| "quux"
--| "bar"
--
--#data
--<!DOCTYPE html><body>foo<math><mtext><i>baz</i></mtext><annotation-xml><svg><desc><b>eggs</b></desc><g><foreignObject><P>spam<TABLE><tr><td><img></td></table></foreignObject></g><g>quux</g></svg></annotation-xml></math>bar
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| "foo"
--| <math math>
--| <math mtext>
--| <i>
--| "baz"
--| <math annotation-xml>
--| <svg svg>
--| <svg desc>
--| <b>
--| "eggs"
--| <svg g>
--| <svg foreignObject>
--| <p>
--| "spam"
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| <img>
--| <svg g>
--| "quux"
--| "bar"
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests14.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests14.dat
-deleted file mode 100644
-index b8713f8..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests14.dat
-+++ /dev/null
-@@ -1,74 +0,0 @@
--#data
--<!DOCTYPE html><html><body><xyz:abc></xyz:abc>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <xyz:abc>
--
--#data
--<!DOCTYPE html><html><body><xyz:abc></xyz:abc><span></span>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <xyz:abc>
--| <span>
--
--#data
--<!DOCTYPE html><html><html abc:def=gh><xyz:abc></xyz:abc>
--#errors
--15: Unexpected start tag html
--#document
--| <!DOCTYPE html>
--| <html>
--| abc:def="gh"
--| <head>
--| <body>
--| <xyz:abc>
--
--#data
--<!DOCTYPE html><html xml:lang=bar><html xml:lang=foo>
--#errors
--15: Unexpected start tag html
--#document
--| <!DOCTYPE html>
--| <html>
--| xml:lang="bar"
--| <head>
--| <body>
--
--#data
--<!DOCTYPE html><html 123=456>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| 123="456"
--| <head>
--| <body>
--
--#data
--<!DOCTYPE html><html 123=456><html 789=012>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| 123="456"
--| 789="012"
--| <head>
--| <body>
--
--#data
--<!DOCTYPE html><html><body 789=012>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| 789="012"
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests15.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests15.dat
-deleted file mode 100644
-index 6ce1c0d..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests15.dat
-+++ /dev/null
-@@ -1,208 +0,0 @@
--#data
--<!DOCTYPE html><p><b><i><u></p> <p>X
--#errors
--Line: 1 Col: 31 Unexpected end tag (p). Ignored.
--Line: 1 Col: 36 Expected closing tag. Unexpected end of file.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <b>
--| <i>
--| <u>
--| <b>
--| <i>
--| <u>
--| " "
--| <p>
--| "X"
--
--#data
--<p><b><i><u></p>
--<p>X
--#errors
--Line: 1 Col: 3 Unexpected start tag (p). Expected DOCTYPE.
--Line: 1 Col: 16 Unexpected end tag (p). Ignored.
--Line: 2 Col: 4 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <p>
--| <b>
--| <i>
--| <u>
--| <b>
--| <i>
--| <u>
--| "
--"
--| <p>
--| "X"
--
--#data
--<!doctype html></html> <head>
--#errors
--Line: 1 Col: 22 Unexpected end tag (html) after the (implied) root element.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| " "
--
--#data
--<!doctype html></body><meta>
--#errors
--Line: 1 Col: 22 Unexpected end tag (body) after the (implied) root element.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <meta>
--
--#data
--<html></html><!-- foo -->
--#errors
--Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
--Line: 1 Col: 13 Unexpected end tag (html) after the (implied) root element.
--#document
--| <html>
--| <head>
--| <body>
--| <!-- foo -->
--
--#data
--<!doctype html></body><title>X</title>
--#errors
--Line: 1 Col: 22 Unexpected end tag (body) after the (implied) root element.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <title>
--| "X"
--
--#data
--<!doctype html><table> X<meta></table>
--#errors
--Line: 1 Col: 24 Unexpected non-space characters in table context caused voodoo mode.
--Line: 1 Col: 30 Unexpected start tag (meta) in table context caused voodoo mode.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| " X"
--| <meta>
--| <table>
--
--#data
--<!doctype html><table> x</table>
--#errors
--Line: 1 Col: 24 Unexpected non-space characters in table context caused voodoo mode.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| " x"
--| <table>
--
--#data
--<!doctype html><table> x </table>
--#errors
--Line: 1 Col: 25 Unexpected non-space characters in table context caused voodoo mode.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| " x "
--| <table>
--
--#data
--<!doctype html><table><tr> x</table>
--#errors
--Line: 1 Col: 28 Unexpected non-space characters in table context caused voodoo mode.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| " x"
--| <table>
--| <tbody>
--| <tr>
--
--#data
--<!doctype html><table>X<style> <tr>x </style> </table>
--#errors
--Line: 1 Col: 23 Unexpected non-space characters in table context caused voodoo mode.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| "X"
--| <table>
--| <style>
--| " <tr>x "
--| " "
--
--#data
--<!doctype html><div><table><a>foo</a> <tr><td>bar</td> </tr></table></div>
--#errors
--Line: 1 Col: 30 Unexpected start tag (a) in table context caused voodoo mode.
--Line: 1 Col: 37 Unexpected end tag (a) in table context caused voodoo mode.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <div>
--| <a>
--| "foo"
--| <table>
--| " "
--| <tbody>
--| <tr>
--| <td>
--| "bar"
--| " "
--
--#data
--<frame></frame></frame><frameset><frame><frameset><frame></frameset><noframes></frameset><noframes>
--#errors
--6: Start tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
--13: Stray start tag “frame”.
--21: Stray end tag “frame”.
--29: Stray end tag “frame”.
--39: “frameset” start tag after “body” already open.
--105: End of file seen inside an [R]CDATA element.
--105: End of file seen and there were open elements.
--XXX: These errors are wrong, please fix me!
--#document
--| <html>
--| <head>
--| <frameset>
--| <frame>
--| <frameset>
--| <frame>
--| <noframes>
--| "</frameset><noframes>"
--
--#data
--<!DOCTYPE html><object></html>
--#errors
--1: Expected closing tag. Unexpected end of file
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <object>
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests16.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests16.dat
-deleted file mode 100644
-index c8ef66f..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests16.dat
-+++ /dev/null
-@@ -1,2299 +0,0 @@
--#data
--<!doctype html><script>
--#errors
--Line: 1 Col: 23 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| <body>
--
--#data
--<!doctype html><script>a
--#errors
--Line: 1 Col: 24 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "a"
--| <body>
--
--#data
--<!doctype html><script><
--#errors
--Line: 1 Col: 24 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<"
--| <body>
--
--#data
--<!doctype html><script></
--#errors
--Line: 1 Col: 25 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "</"
--| <body>
--
--#data
--<!doctype html><script></S
--#errors
--Line: 1 Col: 26 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "</S"
--| <body>
--
--#data
--<!doctype html><script></SC
--#errors
--Line: 1 Col: 27 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "</SC"
--| <body>
--
--#data
--<!doctype html><script></SCR
--#errors
--Line: 1 Col: 28 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "</SCR"
--| <body>
--
--#data
--<!doctype html><script></SCRI
--#errors
--Line: 1 Col: 29 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "</SCRI"
--| <body>
--
--#data
--<!doctype html><script></SCRIP
--#errors
--Line: 1 Col: 30 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "</SCRIP"
--| <body>
--
--#data
--<!doctype html><script></SCRIPT
--#errors
--Line: 1 Col: 31 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "</SCRIPT"
--| <body>
--
--#data
--<!doctype html><script></SCRIPT
--#errors
--Line: 1 Col: 32 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| <body>
--
--#data
--<!doctype html><script></s
--#errors
--Line: 1 Col: 26 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "</s"
--| <body>
--
--#data
--<!doctype html><script></sc
--#errors
--Line: 1 Col: 27 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "</sc"
--| <body>
--
--#data
--<!doctype html><script></scr
--#errors
--Line: 1 Col: 28 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "</scr"
--| <body>
--
--#data
--<!doctype html><script></scri
--#errors
--Line: 1 Col: 29 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "</scri"
--| <body>
--
--#data
--<!doctype html><script></scrip
--#errors
--Line: 1 Col: 30 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "</scrip"
--| <body>
--
--#data
--<!doctype html><script></script
--#errors
--Line: 1 Col: 31 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "</script"
--| <body>
--
--#data
--<!doctype html><script></script
--#errors
--Line: 1 Col: 32 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| <body>
--
--#data
--<!doctype html><script><!
--#errors
--Line: 1 Col: 25 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!"
--| <body>
--
--#data
--<!doctype html><script><!a
--#errors
--Line: 1 Col: 26 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!a"
--| <body>
--
--#data
--<!doctype html><script><!-
--#errors
--Line: 1 Col: 26 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!-"
--| <body>
--
--#data
--<!doctype html><script><!-a
--#errors
--Line: 1 Col: 27 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!-a"
--| <body>
--
--#data
--<!doctype html><script><!--
--#errors
--Line: 1 Col: 27 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--"
--| <body>
--
--#data
--<!doctype html><script><!--a
--#errors
--Line: 1 Col: 28 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--a"
--| <body>
--
--#data
--<!doctype html><script><!--<
--#errors
--Line: 1 Col: 28 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<"
--| <body>
--
--#data
--<!doctype html><script><!--<a
--#errors
--Line: 1 Col: 29 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<a"
--| <body>
--
--#data
--<!doctype html><script><!--</
--#errors
--Line: 1 Col: 27 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--</"
--| <body>
--
--#data
--<!doctype html><script><!--</script
--#errors
--Line: 1 Col: 35 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--</script"
--| <body>
--
--#data
--<!doctype html><script><!--</script
--#errors
--Line: 1 Col: 36 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--"
--| <body>
--
--#data
--<!doctype html><script><!--<s
--#errors
--Line: 1 Col: 29 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<s"
--| <body>
--
--#data
--<!doctype html><script><!--<script
--#errors
--Line: 1 Col: 34 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script"
--| <body>
--
--#data
--<!doctype html><script><!--<script
--#errors
--Line: 1 Col: 35 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script "
--| <body>
--
--#data
--<!doctype html><script><!--<script <
--#errors
--Line: 1 Col: 36 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script <"
--| <body>
--
--#data
--<!doctype html><script><!--<script <a
--#errors
--Line: 1 Col: 37 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script <a"
--| <body>
--
--#data
--<!doctype html><script><!--<script </
--#errors
--Line: 1 Col: 37 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script </"
--| <body>
--
--#data
--<!doctype html><script><!--<script </s
--#errors
--Line: 1 Col: 38 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script </s"
--| <body>
--
--#data
--<!doctype html><script><!--<script </script
--#errors
--Line: 1 Col: 43 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script </script"
--| <body>
--
--#data
--<!doctype html><script><!--<script </scripta
--#errors
--Line: 1 Col: 44 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script </scripta"
--| <body>
--
--#data
--<!doctype html><script><!--<script </script
--#errors
--Line: 1 Col: 44 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script </script "
--| <body>
--
--#data
--<!doctype html><script><!--<script </script>
--#errors
--Line: 1 Col: 44 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script </script>"
--| <body>
--
--#data
--<!doctype html><script><!--<script </script/
--#errors
--Line: 1 Col: 44 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script </script/"
--| <body>
--
--#data
--<!doctype html><script><!--<script </script <
--#errors
--Line: 1 Col: 45 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script </script <"
--| <body>
--
--#data
--<!doctype html><script><!--<script </script <a
--#errors
--Line: 1 Col: 46 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script </script <a"
--| <body>
--
--#data
--<!doctype html><script><!--<script </script </
--#errors
--Line: 1 Col: 46 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script </script </"
--| <body>
--
--#data
--<!doctype html><script><!--<script </script </script
--#errors
--Line: 1 Col: 52 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script </script </script"
--| <body>
--
--#data
--<!doctype html><script><!--<script </script </script
--#errors
--Line: 1 Col: 53 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script </script "
--| <body>
--
--#data
--<!doctype html><script><!--<script </script </script/
--#errors
--Line: 1 Col: 53 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script </script "
--| <body>
--
--#data
--<!doctype html><script><!--<script </script </script>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script </script "
--| <body>
--
--#data
--<!doctype html><script><!--<script -
--#errors
--Line: 1 Col: 36 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script -"
--| <body>
--
--#data
--<!doctype html><script><!--<script -a
--#errors
--Line: 1 Col: 37 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script -a"
--| <body>
--
--#data
--<!doctype html><script><!--<script -<
--#errors
--Line: 1 Col: 37 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script -<"
--| <body>
--
--#data
--<!doctype html><script><!--<script --
--#errors
--Line: 1 Col: 37 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script --"
--| <body>
--
--#data
--<!doctype html><script><!--<script --a
--#errors
--Line: 1 Col: 38 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script --a"
--| <body>
--
--#data
--<!doctype html><script><!--<script --<
--#errors
--Line: 1 Col: 38 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script --<"
--| <body>
--
--#data
--<!doctype html><script><!--<script -->
--#errors
--Line: 1 Col: 38 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script -->"
--| <body>
--
--#data
--<!doctype html><script><!--<script --><
--#errors
--Line: 1 Col: 39 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script --><"
--| <body>
--
--#data
--<!doctype html><script><!--<script --></
--#errors
--Line: 1 Col: 40 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script --></"
--| <body>
--
--#data
--<!doctype html><script><!--<script --></script
--#errors
--Line: 1 Col: 46 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script --></script"
--| <body>
--
--#data
--<!doctype html><script><!--<script --></script
--#errors
--Line: 1 Col: 47 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script -->"
--| <body>
--
--#data
--<!doctype html><script><!--<script --></script/
--#errors
--Line: 1 Col: 47 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script -->"
--| <body>
--
--#data
--<!doctype html><script><!--<script --></script>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script -->"
--| <body>
--
--#data
--<!doctype html><script><!--<script><\/script>--></script>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script><\/script>-->"
--| <body>
--
--#data
--<!doctype html><script><!--<script></scr'+'ipt>--></script>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script></scr'+'ipt>-->"
--| <body>
--
--#data
--<!doctype html><script><!--<script></script><script></script></script>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script></script><script></script>"
--| <body>
--
--#data
--<!doctype html><script><!--<script></script><script></script>--><!--</script>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script></script><script></script>--><!--"
--| <body>
--
--#data
--<!doctype html><script><!--<script></script><script></script>-- ></script>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script></script><script></script>-- >"
--| <body>
--
--#data
--<!doctype html><script><!--<script></script><script></script>- -></script>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script></script><script></script>- ->"
--| <body>
--
--#data
--<!doctype html><script><!--<script></script><script></script>- - ></script>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script></script><script></script>- - >"
--| <body>
--
--#data
--<!doctype html><script><!--<script></script><script></script>-></script>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script></script><script></script>->"
--| <body>
--
--#data
--<!doctype html><script><!--<script>--!></script>X
--#errors
--Line: 1 Col: 49 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script>--!></script>X"
--| <body>
--
--#data
--<!doctype html><script><!--<scr'+'ipt></script>--></script>
--#errors
--Line: 1 Col: 59 Unexpected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<scr'+'ipt>"
--| <body>
--| "-->"
--
--#data
--<!doctype html><script><!--<script></scr'+'ipt></script>X
--#errors
--Line: 1 Col: 57 Unexpected end of file. Expected end tag (script).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "<!--<script></scr'+'ipt></script>X"
--| <body>
--
--#data
--<!doctype html><style><!--<style></style>--></style>
--#errors
--Line: 1 Col: 52 Unexpected end tag (style).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <style>
--| "<!--<style>"
--| <body>
--| "-->"
--
--#data
--<!doctype html><style><!--</style>X
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <style>
--| "<!--"
--| <body>
--| "X"
--
--#data
--<!doctype html><style><!--...</style>...--></style>
--#errors
--Line: 1 Col: 51 Unexpected end tag (style).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <style>
--| "<!--..."
--| <body>
--| "...-->"
--
--#data
--<!doctype html><style><!--<br><html xmlns:v="urn:schemas-microsoft-com:vml"><!--[if !mso]><style></style>X
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <style>
--| "<!--<br><html xmlns:v="urn:schemas-microsoft-com:vml"><!--[if !mso]><style>"
--| <body>
--| "X"
--
--#data
--<!doctype html><style><!--...<style><!--...--!></style>--></style>
--#errors
--Line: 1 Col: 66 Unexpected end tag (style).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <style>
--| "<!--...<style><!--...--!>"
--| <body>
--| "-->"
--
--#data
--<!doctype html><style><!--...</style><!-- --><style>@import ...</style>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <style>
--| "<!--..."
--| <!-- -->
--| <style>
--| "@import ..."
--| <body>
--
--#data
--<!doctype html><style>...<style><!--...</style><!-- --></style>
--#errors
--Line: 1 Col: 63 Unexpected end tag (style).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <style>
--| "...<style><!--..."
--| <!-- -->
--| <body>
--
--#data
--<!doctype html><style>...<!--[if IE]><style>...</style>X
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <style>
--| "...<!--[if IE]><style>..."
--| <body>
--| "X"
--
--#data
--<!doctype html><title><!--<title></title>--></title>
--#errors
--Line: 1 Col: 52 Unexpected end tag (title).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <title>
--| "<!--<title>"
--| <body>
--| "-->"
--
--#data
--<!doctype html><title></title></title>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <title>
--| "</title>"
--| <body>
--
--#data
--<!doctype html><title>foo/title><link></head><body>X
--#errors
--Line: 1 Col: 52 Unexpected end of file. Expected end tag (title).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <title>
--| "foo/title><link></head><body>X"
--| <body>
--
--#data
--<!doctype html><noscript><!--<noscript></noscript>--></noscript>
--#errors
--Line: 1 Col: 64 Unexpected end tag (noscript).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <noscript>
--| "<!--<noscript>"
--| <body>
--| "-->"
--
--#data
--<!doctype html><noscript><!--</noscript>X<noscript>--></noscript>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <noscript>
--| "<!--"
--| <body>
--| "X"
--| <noscript>
--| "-->"
--
--#data
--<!doctype html><noscript><iframe></noscript>X
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <noscript>
--| "<iframe>"
--| <body>
--| "X"
--
--#data
--<!doctype html><noframes><!--<noframes></noframes>--></noframes>
--#errors
--Line: 1 Col: 64 Unexpected end tag (noframes).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <noframes>
--| "<!--<noframes>"
--| <body>
--| "-->"
--
--#data
--<!doctype html><noframes><body><script><!--...</script></body></noframes></html>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <noframes>
--| "<body><script><!--...</script></body>"
--| <body>
--
--#data
--<!doctype html><textarea><!--<textarea></textarea>--></textarea>
--#errors
--Line: 1 Col: 64 Unexpected end tag (textarea).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <textarea>
--| "<!--<textarea>"
--| "-->"
--
--#data
--<!doctype html><textarea></textarea></textarea>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <textarea>
--| "</textarea>"
--
--#data
--<!doctype html><textarea><</textarea>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <textarea>
--| "<"
--
--#data
--<!doctype html><textarea>a<b</textarea>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <textarea>
--| "a<b"
--
--#data
--<!doctype html><iframe><!--<iframe></iframe>--></iframe>
--#errors
--Line: 1 Col: 56 Unexpected end tag (iframe).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <iframe>
--| "<!--<iframe>"
--| "-->"
--
--#data
--<!doctype html><iframe>...<!--X->...<!--/X->...</iframe>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <iframe>
--| "...<!--X->...<!--/X->..."
--
--#data
--<!doctype html><xmp><!--<xmp></xmp>--></xmp>
--#errors
--Line: 1 Col: 44 Unexpected end tag (xmp).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <xmp>
--| "<!--<xmp>"
--| "-->"
--
--#data
--<!doctype html><noembed><!--<noembed></noembed>--></noembed>
--#errors
--Line: 1 Col: 60 Unexpected end tag (noembed).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <noembed>
--| "<!--<noembed>"
--| "-->"
--
--#data
--<script>
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 8 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| <body>
--
--#data
--<script>a
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 9 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "a"
--| <body>
--
--#data
--<script><
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 9 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<"
--| <body>
--
--#data
--<script></
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 10 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "</"
--| <body>
--
--#data
--<script></S
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 11 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "</S"
--| <body>
--
--#data
--<script></SC
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 12 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "</SC"
--| <body>
--
--#data
--<script></SCR
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 13 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "</SCR"
--| <body>
--
--#data
--<script></SCRI
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 14 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "</SCRI"
--| <body>
--
--#data
--<script></SCRIP
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 15 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "</SCRIP"
--| <body>
--
--#data
--<script></SCRIPT
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 16 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "</SCRIPT"
--| <body>
--
--#data
--<script></SCRIPT
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 17 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| <body>
--
--#data
--<script></s
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 11 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "</s"
--| <body>
--
--#data
--<script></sc
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 12 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "</sc"
--| <body>
--
--#data
--<script></scr
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 13 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "</scr"
--| <body>
--
--#data
--<script></scri
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 14 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "</scri"
--| <body>
--
--#data
--<script></scrip
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 15 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "</scrip"
--| <body>
--
--#data
--<script></script
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 16 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "</script"
--| <body>
--
--#data
--<script></script
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 17 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| <body>
--
--#data
--<script><!
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 10 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!"
--| <body>
--
--#data
--<script><!a
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 11 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!a"
--| <body>
--
--#data
--<script><!-
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 11 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!-"
--| <body>
--
--#data
--<script><!-a
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 12 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!-a"
--| <body>
--
--#data
--<script><!--
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 12 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--"
--| <body>
--
--#data
--<script><!--a
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 13 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--a"
--| <body>
--
--#data
--<script><!--<
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 13 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<"
--| <body>
--
--#data
--<script><!--<a
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 14 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<a"
--| <body>
--
--#data
--<script><!--</
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 14 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--</"
--| <body>
--
--#data
--<script><!--</script
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 20 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--</script"
--| <body>
--
--#data
--<script><!--</script
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 21 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--"
--| <body>
--
--#data
--<script><!--<s
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 14 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<s"
--| <body>
--
--#data
--<script><!--<script
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 19 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script"
--| <body>
--
--#data
--<script><!--<script
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 20 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script "
--| <body>
--
--#data
--<script><!--<script <
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 21 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script <"
--| <body>
--
--#data
--<script><!--<script <a
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 22 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script <a"
--| <body>
--
--#data
--<script><!--<script </
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 22 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script </"
--| <body>
--
--#data
--<script><!--<script </s
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 23 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script </s"
--| <body>
--
--#data
--<script><!--<script </script
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 28 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script </script"
--| <body>
--
--#data
--<script><!--<script </scripta
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 29 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script </scripta"
--| <body>
--
--#data
--<script><!--<script </script
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 29 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script </script "
--| <body>
--
--#data
--<script><!--<script </script>
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 29 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script </script>"
--| <body>
--
--#data
--<script><!--<script </script/
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 29 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script </script/"
--| <body>
--
--#data
--<script><!--<script </script <
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 30 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script </script <"
--| <body>
--
--#data
--<script><!--<script </script <a
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 31 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script </script <a"
--| <body>
--
--#data
--<script><!--<script </script </
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 31 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script </script </"
--| <body>
--
--#data
--<script><!--<script </script </script
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 38 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script </script </script"
--| <body>
--
--#data
--<script><!--<script </script </script
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 38 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script </script "
--| <body>
--
--#data
--<script><!--<script </script </script/
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 38 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script </script "
--| <body>
--
--#data
--<script><!--<script </script </script>
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script </script "
--| <body>
--
--#data
--<script><!--<script -
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 21 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script -"
--| <body>
--
--#data
--<script><!--<script -a
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 22 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script -a"
--| <body>
--
--#data
--<script><!--<script --
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 22 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script --"
--| <body>
--
--#data
--<script><!--<script --a
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 23 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script --a"
--| <body>
--
--#data
--<script><!--<script -->
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 23 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script -->"
--| <body>
--
--#data
--<script><!--<script --><
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 24 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script --><"
--| <body>
--
--#data
--<script><!--<script --></
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 25 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script --></"
--| <body>
--
--#data
--<script><!--<script --></script
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 31 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script --></script"
--| <body>
--
--#data
--<script><!--<script --></script
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 32 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script -->"
--| <body>
--
--#data
--<script><!--<script --></script/
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 32 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script -->"
--| <body>
--
--#data
--<script><!--<script --></script>
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script -->"
--| <body>
--
--#data
--<script><!--<script><\/script>--></script>
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script><\/script>-->"
--| <body>
--
--#data
--<script><!--<script></scr'+'ipt>--></script>
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script></scr'+'ipt>-->"
--| <body>
--
--#data
--<script><!--<script></script><script></script></script>
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script></script><script></script>"
--| <body>
--
--#data
--<script><!--<script></script><script></script>--><!--</script>
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script></script><script></script>--><!--"
--| <body>
--
--#data
--<script><!--<script></script><script></script>-- ></script>
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script></script><script></script>-- >"
--| <body>
--
--#data
--<script><!--<script></script><script></script>- -></script>
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script></script><script></script>- ->"
--| <body>
--
--#data
--<script><!--<script></script><script></script>- - ></script>
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script></script><script></script>- - >"
--| <body>
--
--#data
--<script><!--<script></script><script></script>-></script>
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script></script><script></script>->"
--| <body>
--
--#data
--<script><!--<script>--!></script>X
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 34 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script>--!></script>X"
--| <body>
--
--#data
--<script><!--<scr'+'ipt></script>--></script>
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 44 Unexpected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<scr'+'ipt>"
--| <body>
--| "-->"
--
--#data
--<script><!--<script></scr'+'ipt></script>X
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 42 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "<!--<script></scr'+'ipt></script>X"
--| <body>
--
--#data
--<style><!--<style></style>--></style>
--#errors
--Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
--Line: 1 Col: 37 Unexpected end tag (style).
--#document
--| <html>
--| <head>
--| <style>
--| "<!--<style>"
--| <body>
--| "-->"
--
--#data
--<style><!--</style>X
--#errors
--Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <style>
--| "<!--"
--| <body>
--| "X"
--
--#data
--<style><!--...</style>...--></style>
--#errors
--Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
--Line: 1 Col: 36 Unexpected end tag (style).
--#document
--| <html>
--| <head>
--| <style>
--| "<!--..."
--| <body>
--| "...-->"
--
--#data
--<style><!--<br><html xmlns:v="urn:schemas-microsoft-com:vml"><!--[if !mso]><style></style>X
--#errors
--Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <style>
--| "<!--<br><html xmlns:v="urn:schemas-microsoft-com:vml"><!--[if !mso]><style>"
--| <body>
--| "X"
--
--#data
--<style><!--...<style><!--...--!></style>--></style>
--#errors
--Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
--Line: 1 Col: 51 Unexpected end tag (style).
--#document
--| <html>
--| <head>
--| <style>
--| "<!--...<style><!--...--!>"
--| <body>
--| "-->"
--
--#data
--<style><!--...</style><!-- --><style>@import ...</style>
--#errors
--Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <style>
--| "<!--..."
--| <!-- -->
--| <style>
--| "@import ..."
--| <body>
--
--#data
--<style>...<style><!--...</style><!-- --></style>
--#errors
--Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
--Line: 1 Col: 48 Unexpected end tag (style).
--#document
--| <html>
--| <head>
--| <style>
--| "...<style><!--..."
--| <!-- -->
--| <body>
--
--#data
--<style>...<!--[if IE]><style>...</style>X
--#errors
--Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <style>
--| "...<!--[if IE]><style>..."
--| <body>
--| "X"
--
--#data
--<title><!--<title></title>--></title>
--#errors
--Line: 1 Col: 7 Unexpected start tag (title). Expected DOCTYPE.
--Line: 1 Col: 37 Unexpected end tag (title).
--#document
--| <html>
--| <head>
--| <title>
--| "<!--<title>"
--| <body>
--| "-->"
--
--#data
--<title></title></title>
--#errors
--Line: 1 Col: 7 Unexpected start tag (title). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <title>
--| "</title>"
--| <body>
--
--#data
--<title>foo/title><link></head><body>X
--#errors
--Line: 1 Col: 7 Unexpected start tag (title). Expected DOCTYPE.
--Line: 1 Col: 37 Unexpected end of file. Expected end tag (title).
--#document
--| <html>
--| <head>
--| <title>
--| "foo/title><link></head><body>X"
--| <body>
--
--#data
--<noscript><!--<noscript></noscript>--></noscript>
--#errors
--Line: 1 Col: 10 Unexpected start tag (noscript). Expected DOCTYPE.
--Line: 1 Col: 49 Unexpected end tag (noscript).
--#document
--| <html>
--| <head>
--| <noscript>
--| "<!--<noscript>"
--| <body>
--| "-->"
--
--#data
--<noscript><!--</noscript>X<noscript>--></noscript>
--#errors
--Line: 1 Col: 10 Unexpected start tag (noscript). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <noscript>
--| "<!--"
--| <body>
--| "X"
--| <noscript>
--| "-->"
--
--#data
--<noscript><iframe></noscript>X
--#errors
--Line: 1 Col: 10 Unexpected start tag (noscript). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <noscript>
--| "<iframe>"
--| <body>
--| "X"
--
--#data
--<noframes><!--<noframes></noframes>--></noframes>
--#errors
--Line: 1 Col: 10 Unexpected start tag (noframes). Expected DOCTYPE.
--Line: 1 Col: 49 Unexpected end tag (noframes).
--#document
--| <html>
--| <head>
--| <noframes>
--| "<!--<noframes>"
--| <body>
--| "-->"
--
--#data
--<noframes><body><script><!--...</script></body></noframes></html>
--#errors
--Line: 1 Col: 10 Unexpected start tag (noframes). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <noframes>
--| "<body><script><!--...</script></body>"
--| <body>
--
--#data
--<textarea><!--<textarea></textarea>--></textarea>
--#errors
--Line: 1 Col: 10 Unexpected start tag (textarea). Expected DOCTYPE.
--Line: 1 Col: 49 Unexpected end tag (textarea).
--#document
--| <html>
--| <head>
--| <body>
--| <textarea>
--| "<!--<textarea>"
--| "-->"
--
--#data
--<textarea></textarea></textarea>
--#errors
--Line: 1 Col: 10 Unexpected start tag (textarea). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--| <textarea>
--| "</textarea>"
--
--#data
--<iframe><!--<iframe></iframe>--></iframe>
--#errors
--Line: 1 Col: 8 Unexpected start tag (iframe). Expected DOCTYPE.
--Line: 1 Col: 41 Unexpected end tag (iframe).
--#document
--| <html>
--| <head>
--| <body>
--| <iframe>
--| "<!--<iframe>"
--| "-->"
--
--#data
--<iframe>...<!--X->...<!--/X->...</iframe>
--#errors
--Line: 1 Col: 8 Unexpected start tag (iframe). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--| <iframe>
--| "...<!--X->...<!--/X->..."
--
--#data
--<xmp><!--<xmp></xmp>--></xmp>
--#errors
--Line: 1 Col: 5 Unexpected start tag (xmp). Expected DOCTYPE.
--Line: 1 Col: 29 Unexpected end tag (xmp).
--#document
--| <html>
--| <head>
--| <body>
--| <xmp>
--| "<!--<xmp>"
--| "-->"
--
--#data
--<noembed><!--<noembed></noembed>--></noembed>
--#errors
--Line: 1 Col: 9 Unexpected start tag (noembed). Expected DOCTYPE.
--Line: 1 Col: 45 Unexpected end tag (noembed).
--#document
--| <html>
--| <head>
--| <body>
--| <noembed>
--| "<!--<noembed>"
--| "-->"
--
--#data
--<!doctype html><table>
--
--#errors
--Line 2 Col 0 Unexpected end of file. Expected table content.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| "
--"
--
--#data
--<!doctype html><table><td><span><font></span><span>
--#errors
--Line 1 Col 26 Unexpected table cell start tag (td) in the table body phase.
--Line 1 Col 45 Unexpected end tag (span).
--Line 1 Col 51 Expected closing tag. Unexpected end of file.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| <span>
--| <font>
--| <font>
--| <span>
--
--#data
--<!doctype html><form><table></form><form></table></form>
--#errors
--35: Stray end tag “form”.
--41: Start tag “form” seen in “table”.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <form>
--| <table>
--| <form>
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests17.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests17.dat
-deleted file mode 100644
-index 7b555f8..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests17.dat
-+++ /dev/null
-@@ -1,153 +0,0 @@
--#data
--<!doctype html><table><tbody><select><tr>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <select>
--| <table>
--| <tbody>
--| <tr>
--
--#data
--<!doctype html><table><tr><select><td>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <select>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--
--#data
--<!doctype html><table><tr><td><select><td>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| <select>
--| <td>
--
--#data
--<!doctype html><table><tr><th><select><td>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| <th>
--| <select>
--| <td>
--
--#data
--<!doctype html><table><caption><select><tr>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| <caption>
--| <select>
--| <tbody>
--| <tr>
--
--#data
--<!doctype html><select><tr>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <select>
--
--#data
--<!doctype html><select><td>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <select>
--
--#data
--<!doctype html><select><th>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <select>
--
--#data
--<!doctype html><select><tbody>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <select>
--
--#data
--<!doctype html><select><thead>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <select>
--
--#data
--<!doctype html><select><tfoot>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <select>
--
--#data
--<!doctype html><select><caption>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <select>
--
--#data
--<!doctype html><table><tr></table>a
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| "a"
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests18.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests18.dat
-deleted file mode 100644
-index 680e1f0..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests18.dat
-+++ /dev/null
-@@ -1,269 +0,0 @@
--#data
--<!doctype html><plaintext></plaintext>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <plaintext>
--| "</plaintext>"
--
--#data
--<!doctype html><table><plaintext></plaintext>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <plaintext>
--| "</plaintext>"
--| <table>
--
--#data
--<!doctype html><table><tbody><plaintext></plaintext>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <plaintext>
--| "</plaintext>"
--| <table>
--| <tbody>
--
--#data
--<!doctype html><table><tbody><tr><plaintext></plaintext>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <plaintext>
--| "</plaintext>"
--| <table>
--| <tbody>
--| <tr>
--
--#data
--<!doctype html><table><tbody><tr><plaintext></plaintext>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <plaintext>
--| "</plaintext>"
--| <table>
--| <tbody>
--| <tr>
--
--#data
--<!doctype html><table><td><plaintext></plaintext>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| <plaintext>
--| "</plaintext>"
--
--#data
--<!doctype html><table><caption><plaintext></plaintext>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| <caption>
--| <plaintext>
--| "</plaintext>"
--
--#data
--<!doctype html><table><tr><style></script></style>abc
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| "abc"
--| <table>
--| <tbody>
--| <tr>
--| <style>
--| "</script>"
--
--#data
--<!doctype html><table><tr><script></style></script>abc
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| "abc"
--| <table>
--| <tbody>
--| <tr>
--| <script>
--| "</style>"
--
--#data
--<!doctype html><table><caption><style></script></style>abc
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| <caption>
--| <style>
--| "</script>"
--| "abc"
--
--#data
--<!doctype html><table><td><style></script></style>abc
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| <style>
--| "</script>"
--| "abc"
--
--#data
--<!doctype html><select><script></style></script>abc
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <select>
--| <script>
--| "</style>"
--| "abc"
--
--#data
--<!doctype html><table><select><script></style></script>abc
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <select>
--| <script>
--| "</style>"
--| "abc"
--| <table>
--
--#data
--<!doctype html><table><tr><select><script></style></script>abc
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <select>
--| <script>
--| "</style>"
--| "abc"
--| <table>
--| <tbody>
--| <tr>
--
--#data
--<!doctype html><frameset></frameset><noframes>abc
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <frameset>
--| <noframes>
--| "abc"
--
--#data
--<!doctype html><frameset></frameset><noframes>abc</noframes><!--abc-->
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <frameset>
--| <noframes>
--| "abc"
--| <!-- abc -->
--
--#data
--<!doctype html><frameset></frameset></html><noframes>abc
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <frameset>
--| <noframes>
--| "abc"
--
--#data
--<!doctype html><frameset></frameset></html><noframes>abc</noframes><!--abc-->
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <frameset>
--| <noframes>
--| "abc"
--| <!-- abc -->
--
--#data
--<!doctype html><table><tr></tbody><tfoot>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| <tfoot>
--
--#data
--<!doctype html><table><td><svg></svg>abc<td>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| <svg svg>
--| "abc"
--| <td>
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests19.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests19.dat
-deleted file mode 100644
-index 0d62f5a..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests19.dat
-+++ /dev/null
-@@ -1,1237 +0,0 @@
--#data
--<!doctype html><math><mn DefinitionUrl="foo">
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <math math>
--| <math mn>
--| definitionURL="foo"
--
--#data
--<!doctype html><html></p><!--foo-->
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <!-- foo -->
--| <head>
--| <body>
--
--#data
--<!doctype html><head></head></p><!--foo-->
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <!-- foo -->
--| <body>
--
--#data
--<!doctype html><body><p><pre>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <pre>
--
--#data
--<!doctype html><body><p><listing>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <listing>
--
--#data
--<!doctype html><p><plaintext>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <plaintext>
--
--#data
--<!doctype html><p><h1>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <h1>
--
--#data
--<!doctype html><form><isindex>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <form>
--
--#data
--<!doctype html><isindex action="POST">
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <form>
--| action="POST"
--| <hr>
--| <label>
--| "This is a searchable index. Enter search keywords: "
--| <input>
--| name="isindex"
--| <hr>
--
--#data
--<!doctype html><isindex prompt="this is isindex">
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <form>
--| <hr>
--| <label>
--| "this is isindex"
--| <input>
--| name="isindex"
--| <hr>
--
--#data
--<!doctype html><isindex type="hidden">
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <form>
--| <hr>
--| <label>
--| "This is a searchable index. Enter search keywords: "
--| <input>
--| name="isindex"
--| type="hidden"
--| <hr>
--
--#data
--<!doctype html><isindex name="foo">
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <form>
--| <hr>
--| <label>
--| "This is a searchable index. Enter search keywords: "
--| <input>
--| name="isindex"
--| <hr>
--
--#data
--<!doctype html><ruby><p><rp>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <ruby>
--| <p>
--| <rp>
--
--#data
--<!doctype html><ruby><div><span><rp>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <ruby>
--| <div>
--| <span>
--| <rp>
--
--#data
--<!doctype html><ruby><div><p><rp>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <ruby>
--| <div>
--| <p>
--| <rp>
--
--#data
--<!doctype html><ruby><p><rt>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <ruby>
--| <p>
--| <rt>
--
--#data
--<!doctype html><ruby><div><span><rt>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <ruby>
--| <div>
--| <span>
--| <rt>
--
--#data
--<!doctype html><ruby><div><p><rt>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <ruby>
--| <div>
--| <p>
--| <rt>
--
--#data
--<!doctype html><math/><foo>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <math math>
--| <foo>
--
--#data
--<!doctype html><svg/><foo>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| <foo>
--
--#data
--<!doctype html><div></body><!--foo-->
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <div>
--| <!-- foo -->
--
--#data
--<!doctype html><h1><div><h3><span></h1>foo
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <h1>
--| <div>
--| <h3>
--| <span>
--| "foo"
--
--#data
--<!doctype html><p></h3>foo
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| "foo"
--
--#data
--<!doctype html><h3><li>abc</h2>foo
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <h3>
--| <li>
--| "abc"
--| "foo"
--
--#data
--<!doctype html><table>abc<!--foo-->
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| "abc"
--| <table>
--| <!-- foo -->
--
--#data
--<!doctype html><table> <!--foo-->
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| " "
--| <!-- foo -->
--
--#data
--<!doctype html><table> b <!--foo-->
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| " b "
--| <table>
--| <!-- foo -->
--
--#data
--<!doctype html><select><option><option>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <select>
--| <option>
--| <option>
--
--#data
--<!doctype html><select><option></optgroup>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <select>
--| <option>
--
--#data
--<!doctype html><select><option></optgroup>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <select>
--| <option>
--
--#data
--<!doctype html><p><math><mi><p><h1>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <math math>
--| <math mi>
--| <p>
--| <h1>
--
--#data
--<!doctype html><p><math><mo><p><h1>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <math math>
--| <math mo>
--| <p>
--| <h1>
--
--#data
--<!doctype html><p><math><mn><p><h1>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <math math>
--| <math mn>
--| <p>
--| <h1>
--
--#data
--<!doctype html><p><math><ms><p><h1>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <math math>
--| <math ms>
--| <p>
--| <h1>
--
--#data
--<!doctype html><p><math><mtext><p><h1>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <math math>
--| <math mtext>
--| <p>
--| <h1>
--
--#data
--<!doctype html><frameset></noframes>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <frameset>
--
--#data
--<!doctype html><html c=d><body></html><html a=b>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| a="b"
--| c="d"
--| <head>
--| <body>
--
--#data
--<!doctype html><html c=d><frameset></frameset></html><html a=b>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| a="b"
--| c="d"
--| <head>
--| <frameset>
--
--#data
--<!doctype html><html><frameset></frameset></html><!--foo-->
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <frameset>
--| <!-- foo -->
--
--#data
--<!doctype html><html><frameset></frameset></html>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <frameset>
--| " "
--
--#data
--<!doctype html><html><frameset></frameset></html>abc
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <frameset>
--
--#data
--<!doctype html><html><frameset></frameset></html><p>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <frameset>
--
--#data
--<!doctype html><html><frameset></frameset></html></p>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <frameset>
--
--#data
--<html><frameset></frameset></html><!doctype html>
--#errors
--#document
--| <html>
--| <head>
--| <frameset>
--
--#data
--<!doctype html><body><frameset>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--
--#data
--<!doctype html><p><frameset><frame>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <frameset>
--| <frame>
--
--#data
--<!doctype html><p>a<frameset>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| "a"
--
--#data
--<!doctype html><p> <frameset><frame>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <frameset>
--| <frame>
--
--#data
--<!doctype html><pre><frameset>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <pre>
--
--#data
--<!doctype html><listing><frameset>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <listing>
--
--#data
--<!doctype html><li><frameset>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <li>
--
--#data
--<!doctype html><dd><frameset>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <dd>
--
--#data
--<!doctype html><dt><frameset>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <dt>
--
--#data
--<!doctype html><button><frameset>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <button>
--
--#data
--<!doctype html><applet><frameset>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <applet>
--
--#data
--<!doctype html><marquee><frameset>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <marquee>
--
--#data
--<!doctype html><object><frameset>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <object>
--
--#data
--<!doctype html><table><frameset>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--
--#data
--<!doctype html><area><frameset>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <area>
--
--#data
--<!doctype html><basefont><frameset>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <basefont>
--| <frameset>
--
--#data
--<!doctype html><bgsound><frameset>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <bgsound>
--| <frameset>
--
--#data
--<!doctype html><br><frameset>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <br>
--
--#data
--<!doctype html><embed><frameset>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <embed>
--
--#data
--<!doctype html><img><frameset>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <img>
--
--#data
--<!doctype html><input><frameset>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <input>
--
--#data
--<!doctype html><keygen><frameset>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <keygen>
--
--#data
--<!doctype html><wbr><frameset>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <wbr>
--
--#data
--<!doctype html><hr><frameset>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <hr>
--
--#data
--<!doctype html><textarea></textarea><frameset>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <textarea>
--
--#data
--<!doctype html><xmp></xmp><frameset>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <xmp>
--
--#data
--<!doctype html><iframe></iframe><frameset>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <iframe>
--
--#data
--<!doctype html><select></select><frameset>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <select>
--
--#data
--<!doctype html><svg></svg><frameset><frame>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <frameset>
--| <frame>
--
--#data
--<!doctype html><math></math><frameset><frame>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <frameset>
--| <frame>
--
--#data
--<!doctype html><svg><foreignObject><div> <frameset><frame>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <frameset>
--| <frame>
--
--#data
--<!doctype html><svg>a</svg><frameset><frame>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| "a"
--
--#data
--<!doctype html><svg> </svg><frameset><frame>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <frameset>
--| <frame>
--
--#data
--<html>aaa<frameset></frameset>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "aaa"
--
--#data
--<html> a <frameset></frameset>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "a "
--
--#data
--<!doctype html><div><frameset>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <frameset>
--
--#data
--<!doctype html><div><body><frameset>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <div>
--
--#data
--<!doctype html><p><math></p>a
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <math math>
--| "a"
--
--#data
--<!doctype html><p><math><mn><span></p>a
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <math math>
--| <math mn>
--| <span>
--| <p>
--| "a"
--
--#data
--<!doctype html><math></html>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <math math>
--
--#data
--<!doctype html><meta charset="ascii">
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <meta>
--| charset="ascii"
--| <body>
--
--#data
--<!doctype html><meta http-equiv="content-type" content="text/html;charset=ascii">
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <meta>
--| content="text/html;charset=ascii"
--| http-equiv="content-type"
--| <body>
--
--#data
--<!doctype html><head><!--aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa--><meta charset="utf8">
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <!-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -->
--| <meta>
--| charset="utf8"
--| <body>
--
--#data
--<!doctype html><html a=b><head></head><html c=d>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| a="b"
--| c="d"
--| <head>
--| <body>
--
--#data
--<!doctype html><image/>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <img>
--
--#data
--<!doctype html>a<i>b<table>c<b>d</i>e</b>f
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| "a"
--| <i>
--| "bc"
--| <b>
--| "de"
--| "f"
--| <table>
--
--#data
--<!doctype html><table><i>a<b>b<div>c<a>d</i>e</b>f
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <i>
--| "a"
--| <b>
--| "b"
--| <b>
--| <div>
--| <b>
--| <i>
--| "c"
--| <a>
--| "d"
--| <a>
--| "e"
--| <a>
--| "f"
--| <table>
--
--#data
--<!doctype html><i>a<b>b<div>c<a>d</i>e</b>f
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <i>
--| "a"
--| <b>
--| "b"
--| <b>
--| <div>
--| <b>
--| <i>
--| "c"
--| <a>
--| "d"
--| <a>
--| "e"
--| <a>
--| "f"
--
--#data
--<!doctype html><table><i>a<b>b<div>c</i>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <i>
--| "a"
--| <b>
--| "b"
--| <b>
--| <div>
--| <i>
--| "c"
--| <table>
--
--#data
--<!doctype html><table><i>a<b>b<div>c<a>d</i>e</b>f
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <i>
--| "a"
--| <b>
--| "b"
--| <b>
--| <div>
--| <b>
--| <i>
--| "c"
--| <a>
--| "d"
--| <a>
--| "e"
--| <a>
--| "f"
--| <table>
--
--#data
--<!doctype html><table><i>a<div>b<tr>c<b>d</i>e
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <i>
--| "a"
--| <div>
--| "b"
--| <i>
--| "c"
--| <b>
--| "d"
--| <b>
--| "e"
--| <table>
--| <tbody>
--| <tr>
--
--#data
--<!doctype html><table><td><table><i>a<div>b<b>c</i>d
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| <i>
--| "a"
--| <div>
--| <i>
--| "b"
--| <b>
--| "c"
--| <b>
--| "d"
--| <table>
--
--#data
--<!doctype html><body><bgsound>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <bgsound>
--
--#data
--<!doctype html><body><basefont>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <basefont>
--
--#data
--<!doctype html><a><b></a><basefont>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <a>
--| <b>
--| <basefont>
--
--#data
--<!doctype html><a><b></a><bgsound>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <a>
--| <b>
--| <bgsound>
--
--#data
--<!doctype html><figcaption><article></figcaption>a
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <figcaption>
--| <article>
--| "a"
--
--#data
--<!doctype html><summary><article></summary>a
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <summary>
--| <article>
--| "a"
--
--#data
--<!doctype html><p><a><plaintext>b
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <a>
--| <plaintext>
--| <a>
--| "b"
--
--#data
--<!DOCTYPE html><div>a<a></div>b<p>c</p>d
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <div>
--| "a"
--| <a>
--| <a>
--| "b"
--| <p>
--| "c"
--| "d"
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests2.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests2.dat
-deleted file mode 100644
-index 60d8592..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests2.dat
-+++ /dev/null
-@@ -1,763 +0,0 @@
--#data
--<!DOCTYPE html>Test
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| "Test"
--
--#data
--<textarea>test</div>test
--#errors
--Line: 1 Col: 10 Unexpected start tag (textarea). Expected DOCTYPE.
--Line: 1 Col: 24 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <textarea>
--| "test</div>test"
--
--#data
--<table><td>
--#errors
--Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
--Line: 1 Col: 11 Unexpected table cell start tag (td) in the table body phase.
--Line: 1 Col: 11 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--
--#data
--<table><td>test</tbody></table>
--#errors
--Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
--Line: 1 Col: 11 Unexpected table cell start tag (td) in the table body phase.
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| "test"
--
--#data
--<frame>test
--#errors
--Line: 1 Col: 7 Unexpected start tag (frame). Expected DOCTYPE.
--Line: 1 Col: 7 Unexpected start tag frame. Ignored.
--#document
--| <html>
--| <head>
--| <body>
--| "test"
--
--#data
--<!DOCTYPE html><frameset>test
--#errors
--Line: 1 Col: 29 Unepxected characters in the frameset phase. Characters ignored.
--Line: 1 Col: 29 Expected closing tag. Unexpected end of file.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <frameset>
--
--#data
--<!DOCTYPE html><frameset><!DOCTYPE html>
--#errors
--Line: 1 Col: 40 Unexpected DOCTYPE. Ignored.
--Line: 1 Col: 40 Expected closing tag. Unexpected end of file.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <frameset>
--
--#data
--<!DOCTYPE html><font><p><b>test</font>
--#errors
--Line: 1 Col: 38 End tag (font) violates step 1, paragraph 3 of the adoption agency algorithm.
--Line: 1 Col: 38 End tag (font) violates step 1, paragraph 3 of the adoption agency algorithm.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <font>
--| <p>
--| <font>
--| <b>
--| "test"
--
--#data
--<!DOCTYPE html><dt><div><dd>
--#errors
--Line: 1 Col: 28 Missing end tag (div, dt).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <dt>
--| <div>
--| <dd>
--
--#data
--<script></x
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--Line: 1 Col: 11 Unexpected end of file. Expected end tag (script).
--#document
--| <html>
--| <head>
--| <script>
--| "</x"
--| <body>
--
--#data
--<table><plaintext><td>
--#errors
--Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
--Line: 1 Col: 18 Unexpected start tag (plaintext) in table context caused voodoo mode.
--Line: 1 Col: 22 Unexpected end of file. Expected table content.
--#document
--| <html>
--| <head>
--| <body>
--| <plaintext>
--| "<td>"
--| <table>
--
--#data
--<plaintext></plaintext>
--#errors
--Line: 1 Col: 11 Unexpected start tag (plaintext). Expected DOCTYPE.
--Line: 1 Col: 23 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <plaintext>
--| "</plaintext>"
--
--#data
--<!DOCTYPE html><table><tr>TEST
--#errors
--Line: 1 Col: 30 Unexpected non-space characters in table context caused voodoo mode.
--Line: 1 Col: 30 Unexpected end of file. Expected table content.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| "TEST"
--| <table>
--| <tbody>
--| <tr>
--
--#data
--<!DOCTYPE html><body t1=1><body t2=2><body t3=3 t4=4>
--#errors
--Line: 1 Col: 37 Unexpected start tag (body).
--Line: 1 Col: 53 Unexpected start tag (body).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| t1="1"
--| t2="2"
--| t3="3"
--| t4="4"
--
--#data
--</b test
--#errors
--Line: 1 Col: 8 Unexpected end of file in attribute name.
--Line: 1 Col: 8 End tag contains unexpected attributes.
--Line: 1 Col: 8 Unexpected end tag (b). Expected DOCTYPE.
--Line: 1 Col: 8 Unexpected end tag (b) after the (implied) root element.
--#document
--| <html>
--| <head>
--| <body>
--
--#data
--<!DOCTYPE html></b test<b &=&>X
--#errors
--Line: 1 Col: 32 Named entity didn't end with ';'.
--Line: 1 Col: 33 End tag contains unexpected attributes.
--Line: 1 Col: 33 Unexpected end tag (b) after the (implied) root element.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| "X"
--
--#data
--<!doctypehtml><scrIPt type=text/x-foobar;baz>X</SCRipt
--#errors
--Line: 1 Col: 9 No space after literal string 'DOCTYPE'.
--Line: 1 Col: 54 Unexpected end of file in the tag name.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| type="text/x-foobar;baz"
--| "X</SCRipt"
--| <body>
--
--#data
--&
--#errors
--Line: 1 Col: 1 Unexpected non-space characters. Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--| "&"
--
--#data
--&#
--#errors
--Line: 1 Col: 1 Numeric entity expected. Got end of file instead.
--Line: 1 Col: 1 Unexpected non-space characters. Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--| "&#"
--
--#data
--&#X
--#errors
--Line: 1 Col: 3 Numeric entity expected but none found.
--Line: 1 Col: 3 Unexpected non-space characters. Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--| "&#X"
--
--#data
--&#x
--#errors
--Line: 1 Col: 3 Numeric entity expected but none found.
--Line: 1 Col: 3 Unexpected non-space characters. Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--| "&#x"
--
--#data
---
--#errors
--Line: 1 Col: 4 Numeric entity didn't end with ';'.
--Line: 1 Col: 4 Unexpected non-space characters. Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--| "-"
--
--#data
--&x-test
--#errors
--Line: 1 Col: 1 Named entity expected. Got none.
--Line: 1 Col: 1 Unexpected non-space characters. Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--| "&x-test"
--
--#data
--<!doctypehtml><p><li>
--#errors
--Line: 1 Col: 9 No space after literal string 'DOCTYPE'.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <li>
--
--#data
--<!doctypehtml><p><dt>
--#errors
--Line: 1 Col: 9 No space after literal string 'DOCTYPE'.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <dt>
--
--#data
--<!doctypehtml><p><dd>
--#errors
--Line: 1 Col: 9 No space after literal string 'DOCTYPE'.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <dd>
--
--#data
--<!doctypehtml><p><form>
--#errors
--Line: 1 Col: 9 No space after literal string 'DOCTYPE'.
--Line: 1 Col: 23 Expected closing tag. Unexpected end of file.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <form>
--
--#data
--<!DOCTYPE html><p></P>X
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| "X"
--
--#data
--&
--#errors
--Line: 1 Col: 4 Named entity didn't end with ';'.
--Line: 1 Col: 4 Unexpected non-space characters. Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--| "&"
--
--#data
--&AMp;
--#errors
--Line: 1 Col: 1 Named entity expected. Got none.
--Line: 1 Col: 1 Unexpected non-space characters. Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--| "&AMp;"
--
--#data
--<!DOCTYPE html><html><head></head><body><thisISasillyTESTelementNameToMakeSureCrazyTagNamesArePARSEDcorrectLY>
--#errors
--Line: 1 Col: 110 Expected closing tag. Unexpected end of file.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <thisisasillytestelementnametomakesurecrazytagnamesareparsedcorrectly>
--
--#data
--<!DOCTYPE html>X</body>X
--#errors
--Line: 1 Col: 24 Unexpected non-space characters in the after body phase.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| "XX"
--
--#data
--<!DOCTYPE html><!-- X
--#errors
--Line: 1 Col: 21 Unexpected end of file in comment.
--#document
--| <!DOCTYPE html>
--| <!-- X -->
--| <html>
--| <head>
--| <body>
--
--#data
--<!DOCTYPE html><table><caption>test TEST</caption><td>test
--#errors
--Line: 1 Col: 54 Unexpected table cell start tag (td) in the table body phase.
--Line: 1 Col: 58 Expected closing tag. Unexpected end of file.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| <caption>
--| "test TEST"
--| <tbody>
--| <tr>
--| <td>
--| "test"
--
--#data
--<!DOCTYPE html><select><option><optgroup>
--#errors
--Line: 1 Col: 41 Expected closing tag. Unexpected end of file.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <select>
--| <option>
--| <optgroup>
--
--#data
--<!DOCTYPE html><select><optgroup><option></optgroup><option><select><option>
--#errors
--Line: 1 Col: 68 Unexpected select start tag in the select phase treated as select end tag.
--Line: 1 Col: 76 Expected closing tag. Unexpected end of file.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <select>
--| <optgroup>
--| <option>
--| <option>
--| <option>
--
--#data
--<!DOCTYPE html><select><optgroup><option><optgroup>
--#errors
--Line: 1 Col: 51 Expected closing tag. Unexpected end of file.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <select>
--| <optgroup>
--| <option>
--| <optgroup>
--
--#data
--<!DOCTYPE html><datalist><option>foo</datalist>bar
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <datalist>
--| <option>
--| "foo"
--| "bar"
--
--#data
--<!DOCTYPE html><font><input><input></font>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <font>
--| <input>
--| <input>
--
--#data
--<!DOCTYPE html><!-- XXX - XXX -->
--#errors
--#document
--| <!DOCTYPE html>
--| <!-- XXX - XXX -->
--| <html>
--| <head>
--| <body>
--
--#data
--<!DOCTYPE html><!-- XXX - XXX
--#errors
--Line: 1 Col: 29 Unexpected end of file in comment (-)
--#document
--| <!DOCTYPE html>
--| <!-- XXX - XXX -->
--| <html>
--| <head>
--| <body>
--
--#data
--<!DOCTYPE html><!-- XXX - XXX - XXX -->
--#errors
--#document
--| <!DOCTYPE html>
--| <!-- XXX - XXX - XXX -->
--| <html>
--| <head>
--| <body>
--
--#data
--<isindex test=x name=x>
--#errors
--Line: 1 Col: 23 Unexpected start tag (isindex). Expected DOCTYPE.
--Line: 1 Col: 23 Unexpected start tag isindex. Don't use it!
--#document
--| <html>
--| <head>
--| <body>
--| <form>
--| <hr>
--| <label>
--| "This is a searchable index. Enter search keywords: "
--| <input>
--| name="isindex"
--| test="x"
--| <hr>
--
--#data
--test
--test
--#errors
--Line: 2 Col: 4 Unexpected non-space characters. Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--| "test
--test"
--
--#data
--<!DOCTYPE html><body><title>test</body></title>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <title>
--| "test</body>"
--
--#data
--<!DOCTYPE html><body><title>X</title><meta name=z><link rel=foo><style>
--x { content:"</style" } </style>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <title>
--| "X"
--| <meta>
--| name="z"
--| <link>
--| rel="foo"
--| <style>
--| "
--x { content:"</style" } "
--
--#data
--<!DOCTYPE html><select><optgroup></optgroup></select>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <select>
--| <optgroup>
--
--#data
--
--
--#errors
--Line: 2 Col: 1 Unexpected End of file. Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--
--#data
--<!DOCTYPE html> <html>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--
--#data
--<!DOCTYPE html><script>
--</script> <title>x</title> </head>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <script>
--| "
--"
--| " "
--| <title>
--| "x"
--| " "
--| <body>
--
--#data
--<!DOCTYPE html><html><body><html id=x>
--#errors
--Line: 1 Col: 38 html needs to be the first start tag.
--#document
--| <!DOCTYPE html>
--| <html>
--| id="x"
--| <head>
--| <body>
--
--#data
--<!DOCTYPE html>X</body><html id="x">
--#errors
--Line: 1 Col: 36 Unexpected start tag token (html) in the after body phase.
--Line: 1 Col: 36 html needs to be the first start tag.
--#document
--| <!DOCTYPE html>
--| <html>
--| id="x"
--| <head>
--| <body>
--| "X"
--
--#data
--<!DOCTYPE html><head><html id=x>
--#errors
--Line: 1 Col: 32 html needs to be the first start tag.
--#document
--| <!DOCTYPE html>
--| <html>
--| id="x"
--| <head>
--| <body>
--
--#data
--<!DOCTYPE html>X</html>X
--#errors
--Line: 1 Col: 24 Unexpected non-space characters in the after body phase.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| "XX"
--
--#data
--<!DOCTYPE html>X</html>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| "X "
--
--#data
--<!DOCTYPE html>X</html><p>X
--#errors
--Line: 1 Col: 26 Unexpected start tag (p).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| "X"
--| <p>
--| "X"
--
--#data
--<!DOCTYPE html>X<p/x/y/z>
--#errors
--Line: 1 Col: 19 Expected a > after the /.
--Line: 1 Col: 21 Solidus (/) incorrectly placed in tag.
--Line: 1 Col: 23 Solidus (/) incorrectly placed in tag.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| "X"
--| <p>
--| x=""
--| y=""
--| z=""
--
--#data
--<!DOCTYPE html><!--x--
--#errors
--Line: 1 Col: 22 Unexpected end of file in comment (--).
--#document
--| <!DOCTYPE html>
--| <!-- x -->
--| <html>
--| <head>
--| <body>
--
--#data
--<!DOCTYPE html><table><tr><td></p></table>
--#errors
--Line: 1 Col: 34 Unexpected end tag (p). Ignored.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| <p>
--
--#data
--<!DOCTYPE <!DOCTYPE HTML>><!--<!--x-->-->
--#errors
--Line: 1 Col: 20 Expected space or '>'. Got ''
--Line: 1 Col: 25 Erroneous DOCTYPE.
--Line: 1 Col: 35 Unexpected character in comment found.
--#document
--| <!DOCTYPE <!doctype>
--| <html>
--| <head>
--| <body>
--| ">"
--| <!-- <!--x -->
--| "-->"
--
--#data
--<!doctype html><div><form></form><div></div></div>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <div>
--| <form>
--| <div>
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests20.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests20.dat
-deleted file mode 100644
-index 6bd8256..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests20.dat
-+++ /dev/null
-@@ -1,455 +0,0 @@
--#data
--<!doctype html><p><button><button>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <button>
--| <button>
--
--#data
--<!doctype html><p><button><address>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <button>
--| <address>
--
--#data
--<!doctype html><p><button><blockquote>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <button>
--| <blockquote>
--
--#data
--<!doctype html><p><button><menu>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <button>
--| <menu>
--
--#data
--<!doctype html><p><button><p>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <button>
--| <p>
--
--#data
--<!doctype html><p><button><ul>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <button>
--| <ul>
--
--#data
--<!doctype html><p><button><h1>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <button>
--| <h1>
--
--#data
--<!doctype html><p><button><h6>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <button>
--| <h6>
--
--#data
--<!doctype html><p><button><listing>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <button>
--| <listing>
--
--#data
--<!doctype html><p><button><pre>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <button>
--| <pre>
--
--#data
--<!doctype html><p><button><form>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <button>
--| <form>
--
--#data
--<!doctype html><p><button><li>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <button>
--| <li>
--
--#data
--<!doctype html><p><button><dd>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <button>
--| <dd>
--
--#data
--<!doctype html><p><button><dt>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <button>
--| <dt>
--
--#data
--<!doctype html><p><button><plaintext>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <button>
--| <plaintext>
--
--#data
--<!doctype html><p><button><table>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <button>
--| <table>
--
--#data
--<!doctype html><p><button><hr>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <button>
--| <hr>
--
--#data
--<!doctype html><p><button><xmp>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <button>
--| <xmp>
--
--#data
--<!doctype html><p><button></p>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <button>
--| <p>
--
--#data
--<!doctype html><address><button></address>a
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <address>
--| <button>
--| "a"
--
--#data
--<!doctype html><address><button></address>a
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <address>
--| <button>
--| "a"
--
--#data
--<p><table></p>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <p>
--| <p>
--| <table>
--
--#data
--<!doctype html><svg>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <svg svg>
--
--#data
--<!doctype html><p><figcaption>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <figcaption>
--
--#data
--<!doctype html><p><summary>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <summary>
--
--#data
--<!doctype html><form><table><form>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <form>
--| <table>
--
--#data
--<!doctype html><table><form><form>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| <form>
--
--#data
--<!doctype html><table><form></table><form>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| <form>
--
--#data
--<!doctype html><svg><foreignObject><p>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| <svg foreignObject>
--| <p>
--
--#data
--<!doctype html><svg><title>abc
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| <svg title>
--| "abc"
--
--#data
--<option><span><option>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <option>
--| <span>
--| <option>
--
--#data
--<option><option>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <option>
--| <option>
--
--#data
--<math><annotation-xml><div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <math math>
--| <math annotation-xml>
--| <div>
--
--#data
--<math><annotation-xml encoding="application/svg+xml"><div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <math math>
--| <math annotation-xml>
--| encoding="application/svg+xml"
--| <div>
--
--#data
--<math><annotation-xml encoding="application/xhtml+xml"><div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <math math>
--| <math annotation-xml>
--| encoding="application/xhtml+xml"
--| <div>
--
--#data
--<math><annotation-xml encoding="aPPlication/xhtmL+xMl"><div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <math math>
--| <math annotation-xml>
--| encoding="aPPlication/xhtmL+xMl"
--| <div>
--
--#data
--<math><annotation-xml encoding="text/html"><div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <math math>
--| <math annotation-xml>
--| encoding="text/html"
--| <div>
--
--#data
--<math><annotation-xml encoding="Text/htmL"><div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <math math>
--| <math annotation-xml>
--| encoding="Text/htmL"
--| <div>
--
--#data
--<math><annotation-xml encoding=" text/html "><div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <math math>
--| <math annotation-xml>
--| encoding=" text/html "
--| <div>
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests21.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests21.dat
-deleted file mode 100644
-index 1260ec0..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests21.dat
-+++ /dev/null
-@@ -1,221 +0,0 @@
--#data
--<svg><![CDATA[foo]]>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| "foo"
--
--#data
--<math><![CDATA[foo]]>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <math math>
--| "foo"
--
--#data
--<div><![CDATA[foo]]>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| <!-- [CDATA[foo]] -->
--
--#data
--<svg><![CDATA[foo
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| "foo"
--
--#data
--<svg><![CDATA[foo
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| "foo"
--
--#data
--<svg><![CDATA[
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <svg svg>
--
--#data
--<svg><![CDATA[]]>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <svg svg>
--
--#data
--<svg><![CDATA[]] >]]>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| "]] >"
--
--#data
--<svg><![CDATA[]] >]]>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| "]] >"
--
--#data
--<svg><![CDATA[]]
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| "]]"
--
--#data
--<svg><![CDATA[]
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| "]"
--
--#data
--<svg><![CDATA[]>a
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| "]>a"
--
--#data
--<svg><foreignObject><div><![CDATA[foo]]>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| <svg foreignObject>
--| <div>
--| <!-- [CDATA[foo]] -->
--
--#data
--<svg><![CDATA[<svg>]]>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| "<svg>"
--
--#data
--<svg><![CDATA[</svg>a]]>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| "</svg>a"
--
--#data
--<svg><![CDATA[<svg>a
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| "<svg>a"
--
--#data
--<svg><![CDATA[</svg>a
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| "</svg>a"
--
--#data
--<svg><![CDATA[<svg>]]><path>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| "<svg>"
--| <svg path>
--
--#data
--<svg><![CDATA[<svg>]]></path>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| "<svg>"
--
--#data
--<svg><![CDATA[<svg>]]><!--path-->
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| "<svg>"
--| <!-- path -->
--
--#data
--<svg><![CDATA[<svg>]]>path
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| "<svg>path"
--
--#data
--<svg><![CDATA[<!--svg-->]]>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| "<!--svg-->"
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests22.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests22.dat
-deleted file mode 100644
-index aab27b2..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests22.dat
-+++ /dev/null
-@@ -1,157 +0,0 @@
--#data
--<a><b><big><em><strong><div>X</a>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <a>
--| <b>
--| <big>
--| <em>
--| <strong>
--| <big>
--| <em>
--| <strong>
--| <div>
--| <a>
--| "X"
--
--#data
--<a><b><div id=1><div id=2><div id=3><div id=4><div id=5><div id=6><div id=7><div id=8>A</a>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <a>
--| <b>
--| <b>
--| <div>
--| id="1"
--| <a>
--| <div>
--| id="2"
--| <a>
--| <div>
--| id="3"
--| <a>
--| <div>
--| id="4"
--| <a>
--| <div>
--| id="5"
--| <a>
--| <div>
--| id="6"
--| <a>
--| <div>
--| id="7"
--| <a>
--| <div>
--| id="8"
--| <a>
--| "A"
--
--#data
--<a><b><div id=1><div id=2><div id=3><div id=4><div id=5><div id=6><div id=7><div id=8><div id=9>A</a>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <a>
--| <b>
--| <b>
--| <div>
--| id="1"
--| <a>
--| <div>
--| id="2"
--| <a>
--| <div>
--| id="3"
--| <a>
--| <div>
--| id="4"
--| <a>
--| <div>
--| id="5"
--| <a>
--| <div>
--| id="6"
--| <a>
--| <div>
--| id="7"
--| <a>
--| <div>
--| id="8"
--| <a>
--| <div>
--| id="9"
--| "A"
--
--#data
--<a><b><div id=1><div id=2><div id=3><div id=4><div id=5><div id=6><div id=7><div id=8><div id=9><div id=10>A</a>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <a>
--| <b>
--| <b>
--| <div>
--| id="1"
--| <a>
--| <div>
--| id="2"
--| <a>
--| <div>
--| id="3"
--| <a>
--| <div>
--| id="4"
--| <a>
--| <div>
--| id="5"
--| <a>
--| <div>
--| id="6"
--| <a>
--| <div>
--| id="7"
--| <a>
--| <div>
--| id="8"
--| <a>
--| <div>
--| id="9"
--| <div>
--| id="10"
--| "A"
--
--#data
--<cite><b><cite><i><cite><i><cite><i><div>X</b>TEST
--#errors
--Line: 1 Col: 6 Unexpected start tag (cite). Expected DOCTYPE.
--Line: 1 Col: 46 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
--Line: 1 Col: 50 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <cite>
--| <b>
--| <cite>
--| <i>
--| <cite>
--| <i>
--| <cite>
--| <i>
--| <i>
--| <i>
--| <div>
--| <b>
--| "X"
--| "TEST"
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests23.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests23.dat
-deleted file mode 100644
-index 34d2a73..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests23.dat
-+++ /dev/null
-@@ -1,155 +0,0 @@
--#data
--<p><font size=4><font color=red><font size=4><font size=4><font size=4><font size=4><font size=4><font color=red><p>X
--#errors
--3: Start tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
--116: Unclosed elements.
--117: End of file seen and there were open elements.
--#document
--| <html>
--| <head>
--| <body>
--| <p>
--| <font>
--| size="4"
--| <font>
--| color="red"
--| <font>
--| size="4"
--| <font>
--| size="4"
--| <font>
--| size="4"
--| <font>
--| size="4"
--| <font>
--| size="4"
--| <font>
--| color="red"
--| <p>
--| <font>
--| color="red"
--| <font>
--| size="4"
--| <font>
--| size="4"
--| <font>
--| size="4"
--| <font>
--| color="red"
--| "X"
--
--#data
--<p><font size=4><font size=4><font size=4><font size=4><p>X
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <p>
--| <font>
--| size="4"
--| <font>
--| size="4"
--| <font>
--| size="4"
--| <font>
--| size="4"
--| <p>
--| <font>
--| size="4"
--| <font>
--| size="4"
--| <font>
--| size="4"
--| "X"
--
--#data
--<p><font size=4><font size=4><font size=4><font size="5"><font size=4><p>X
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <p>
--| <font>
--| size="4"
--| <font>
--| size="4"
--| <font>
--| size="4"
--| <font>
--| size="5"
--| <font>
--| size="4"
--| <p>
--| <font>
--| size="4"
--| <font>
--| size="4"
--| <font>
--| size="5"
--| <font>
--| size="4"
--| "X"
--
--#data
--<p><font size=4 id=a><font size=4 id=b><font size=4><font size=4><p>X
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <p>
--| <font>
--| id="a"
--| size="4"
--| <font>
--| id="b"
--| size="4"
--| <font>
--| size="4"
--| <font>
--| size="4"
--| <p>
--| <font>
--| id="a"
--| size="4"
--| <font>
--| id="b"
--| size="4"
--| <font>
--| size="4"
--| <font>
--| size="4"
--| "X"
--
--#data
--<p><b id=a><b id=a><b id=a><b><object><b id=a><b id=a>X</object><p>Y
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <p>
--| <b>
--| id="a"
--| <b>
--| id="a"
--| <b>
--| id="a"
--| <b>
--| <object>
--| <b>
--| id="a"
--| <b>
--| id="a"
--| "X"
--| <p>
--| <b>
--| id="a"
--| <b>
--| id="a"
--| <b>
--| id="a"
--| <b>
--| "Y"
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests24.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests24.dat
-deleted file mode 100644
-index f6dc7eb..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests24.dat
-+++ /dev/null
-@@ -1,79 +0,0 @@
--#data
--<!DOCTYPE html>≂̸
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| "≂̸"
--
--#data
--<!DOCTYPE html>≂̸A
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| "≂̸A"
--
--#data
--<!DOCTYPE html>  
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| " "
--
--#data
--<!DOCTYPE html>  A
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| " A"
--
--#data
--<!DOCTYPE html>⊂⃒
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| "⊂⃒"
--
--#data
--<!DOCTYPE html>⊂⃒A
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| "⊂⃒A"
--
--#data
--<!DOCTYPE html>𝔾
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| "𝔾"
--
--#data
--<!DOCTYPE html>𝔾A
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| "𝔾A"
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests25.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests25.dat
-deleted file mode 100644
-index 00de729..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests25.dat
-+++ /dev/null
-@@ -1,219 +0,0 @@
--#data
--<!DOCTYPE html><body><foo>A
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <foo>
--| "A"
--
--#data
--<!DOCTYPE html><body><area>A
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <area>
--| "A"
--
--#data
--<!DOCTYPE html><body><base>A
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <base>
--| "A"
--
--#data
--<!DOCTYPE html><body><basefont>A
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <basefont>
--| "A"
--
--#data
--<!DOCTYPE html><body><bgsound>A
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <bgsound>
--| "A"
--
--#data
--<!DOCTYPE html><body><br>A
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <br>
--| "A"
--
--#data
--<!DOCTYPE html><body><col>A
--#errors
--26: Stray start tag “col”.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| "A"
--
--#data
--<!DOCTYPE html><body><command>A
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <command>
--| "A"
--
--#data
--<!DOCTYPE html><body><embed>A
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <embed>
--| "A"
--
--#data
--<!DOCTYPE html><body><frame>A
--#errors
--26: Stray start tag “frame”.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| "A"
--
--#data
--<!DOCTYPE html><body><hr>A
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <hr>
--| "A"
--
--#data
--<!DOCTYPE html><body><img>A
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <img>
--| "A"
--
--#data
--<!DOCTYPE html><body><input>A
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <input>
--| "A"
--
--#data
--<!DOCTYPE html><body><keygen>A
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <keygen>
--| "A"
--
--#data
--<!DOCTYPE html><body><link>A
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <link>
--| "A"
--
--#data
--<!DOCTYPE html><body><meta>A
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <meta>
--| "A"
--
--#data
--<!DOCTYPE html><body><param>A
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <param>
--| "A"
--
--#data
--<!DOCTYPE html><body><source>A
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <source>
--| "A"
--
--#data
--<!DOCTYPE html><body><track>A
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <track>
--| "A"
--
--#data
--<!DOCTYPE html><body><wbr>A
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <wbr>
--| "A"
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests26.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests26.dat
-deleted file mode 100644
-index fae11ff..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests26.dat
-+++ /dev/null
-@@ -1,313 +0,0 @@
--#data
--<!DOCTYPE html><body><a href='#1'><nobr>1<nobr></a><br><a href='#2'><nobr>2<nobr></a><br><a href='#3'><nobr>3<nobr></a>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <a>
--| href="#1"
--| <nobr>
--| "1"
--| <nobr>
--| <nobr>
--| <br>
--| <a>
--| href="#2"
--| <a>
--| href="#2"
--| <nobr>
--| "2"
--| <nobr>
--| <nobr>
--| <br>
--| <a>
--| href="#3"
--| <a>
--| href="#3"
--| <nobr>
--| "3"
--| <nobr>
--
--#data
--<!DOCTYPE html><body><b><nobr>1<nobr></b><i><nobr>2<nobr></i>3
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <b>
--| <nobr>
--| "1"
--| <nobr>
--| <nobr>
--| <i>
--| <i>
--| <nobr>
--| "2"
--| <nobr>
--| <nobr>
--| "3"
--
--#data
--<!DOCTYPE html><body><b><nobr>1<table><nobr></b><i><nobr>2<nobr></i>3
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <b>
--| <nobr>
--| "1"
--| <nobr>
--| <i>
--| <i>
--| <nobr>
--| "2"
--| <nobr>
--| <nobr>
--| "3"
--| <table>
--
--#data
--<!DOCTYPE html><body><b><nobr>1<table><tr><td><nobr></b><i><nobr>2<nobr></i>3
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <b>
--| <nobr>
--| "1"
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| <nobr>
--| <i>
--| <i>
--| <nobr>
--| "2"
--| <nobr>
--| <nobr>
--| "3"
--
--#data
--<!DOCTYPE html><body><b><nobr>1<div><nobr></b><i><nobr>2<nobr></i>3
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <b>
--| <nobr>
--| "1"
--| <div>
--| <b>
--| <nobr>
--| <nobr>
--| <nobr>
--| <i>
--| <i>
--| <nobr>
--| "2"
--| <nobr>
--| <nobr>
--| "3"
--
--#data
--<!DOCTYPE html><body><b><nobr>1<nobr></b><div><i><nobr>2<nobr></i>3
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <b>
--| <nobr>
--| "1"
--| <nobr>
--| <div>
--| <nobr>
--| <i>
--| <i>
--| <nobr>
--| "2"
--| <nobr>
--| <nobr>
--| "3"
--
--#data
--<!DOCTYPE html><body><b><nobr>1<nobr><ins></b><i><nobr>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <b>
--| <nobr>
--| "1"
--| <nobr>
--| <ins>
--| <nobr>
--| <i>
--| <i>
--| <nobr>
--
--#data
--<!DOCTYPE html><body><b><nobr>1<ins><nobr></b><i>2
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <b>
--| <nobr>
--| "1"
--| <ins>
--| <nobr>
--| <nobr>
--| <i>
--| "2"
--
--#data
--<!DOCTYPE html><body><b>1<nobr></b><i><nobr>2</i>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <b>
--| "1"
--| <nobr>
--| <nobr>
--| <i>
--| <i>
--| <nobr>
--| "2"
--
--#data
--<p><code x</code></p>
--
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <p>
--| <code>
--| code=""
--| x<=""
--| <code>
--| code=""
--| x<=""
--| "
--"
--
--#data
--<!DOCTYPE html><svg><foreignObject><p><i></p>a
--#errors
--45: End tag “p” seen, but there were open elements.
--41: Unclosed element “i”.
--46: End of file seen and there were open elements.
--35: Unclosed element “foreignObject”.
--20: Unclosed element “svg”.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| <svg foreignObject>
--| <p>
--| <i>
--| <i>
--| "a"
--
--#data
--<!DOCTYPE html><table><tr><td><svg><foreignObject><p><i></p>a
--#errors
--56: End tag “p” seen, but there were open elements.
--52: Unclosed element “i”.
--57: End of file seen and there were open elements.
--46: Unclosed element “foreignObject”.
--31: Unclosed element “svg”.
--22: Unclosed element “table”.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| <svg svg>
--| <svg foreignObject>
--| <p>
--| <i>
--| <i>
--| "a"
--
--#data
--<!DOCTYPE html><math><mtext><p><i></p>a
--#errors
--38: End tag “p” seen, but there were open elements.
--34: Unclosed element “i”.
--39: End of file in a foreign namespace context.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <math math>
--| <math mtext>
--| <p>
--| <i>
--| <i>
--| "a"
--
--#data
--<!DOCTYPE html><table><tr><td><math><mtext><p><i></p>a
--#errors
--53: End tag “p” seen, but there were open elements.
--49: Unclosed element “i”.
--54: End of file in a foreign namespace context.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| <math math>
--| <math mtext>
--| <p>
--| <i>
--| <i>
--| "a"
--
--#data
--<!DOCTYPE html><body><div><!/div>a
--#errors
--29: Bogus comment.
--34: End of file seen and there were open elements.
--26: Unclosed element “div”.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <div>
--| <!-- /div -->
--| "a"
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests3.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests3.dat
-deleted file mode 100644
-index 38dc501..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests3.dat
-+++ /dev/null
-@@ -1,305 +0,0 @@
--#data
--<head></head><style></style>
--#errors
--Line: 1 Col: 6 Unexpected start tag (head). Expected DOCTYPE.
--Line: 1 Col: 20 Unexpected start tag (style) that can be in head. Moved.
--#document
--| <html>
--| <head>
--| <style>
--| <body>
--
--#data
--<head></head><script></script>
--#errors
--Line: 1 Col: 6 Unexpected start tag (head). Expected DOCTYPE.
--Line: 1 Col: 21 Unexpected start tag (script) that can be in head. Moved.
--#document
--| <html>
--| <head>
--| <script>
--| <body>
--
--#data
--<head></head><!-- --><style></style><!-- --><script></script>
--#errors
--Line: 1 Col: 6 Unexpected start tag (head). Expected DOCTYPE.
--Line: 1 Col: 28 Unexpected start tag (style) that can be in head. Moved.
--#document
--| <html>
--| <head>
--| <style>
--| <script>
--| <!-- -->
--| <!-- -->
--| <body>
--
--#data
--<head></head><!-- -->x<style></style><!-- --><script></script>
--#errors
--Line: 1 Col: 6 Unexpected start tag (head). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <!-- -->
--| <body>
--| "x"
--| <style>
--| <!-- -->
--| <script>
--
--#data
--<!DOCTYPE html><html><head></head><body><pre>
--</pre></body></html>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <pre>
--
--#data
--<!DOCTYPE html><html><head></head><body><pre>
--foo</pre></body></html>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <pre>
--| "foo"
--
--#data
--<!DOCTYPE html><html><head></head><body><pre>
--
--foo</pre></body></html>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <pre>
--| "
--foo"
--
--#data
--<!DOCTYPE html><html><head></head><body><pre>
--foo
--</pre></body></html>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <pre>
--| "foo
--"
--
--#data
--<!DOCTYPE html><html><head></head><body><pre>x</pre><span>
--</span></body></html>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <pre>
--| "x"
--| <span>
--| "
--"
--
--#data
--<!DOCTYPE html><html><head></head><body><pre>x
--y</pre></body></html>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <pre>
--| "x
--y"
--
--#data
--<!DOCTYPE html><html><head></head><body><pre>x<div>
--y</pre></body></html>
--#errors
--Line: 2 Col: 7 End tag (pre) seen too early. Expected other end tag.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <pre>
--| "x"
--| <div>
--| "
--y"
--
--#data
--<!DOCTYPE html><pre>

A</pre>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <pre>
--| "
--A"
--
--#data
--<!DOCTYPE html><HTML><META><HEAD></HEAD></HTML>
--#errors
--Line: 1 Col: 33 Unexpected start tag head in existing head. Ignored.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <meta>
--| <body>
--
--#data
--<!DOCTYPE html><HTML><HEAD><head></HEAD></HTML>
--#errors
--Line: 1 Col: 33 Unexpected start tag head in existing head. Ignored.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--
--#data
--<textarea>foo<span>bar</span><i>baz
--#errors
--Line: 1 Col: 10 Unexpected start tag (textarea). Expected DOCTYPE.
--Line: 1 Col: 35 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <textarea>
--| "foo<span>bar</span><i>baz"
--
--#data
--<title>foo<span>bar</em><i>baz
--#errors
--Line: 1 Col: 7 Unexpected start tag (title). Expected DOCTYPE.
--Line: 1 Col: 30 Unexpected end of file. Expected end tag (title).
--#document
--| <html>
--| <head>
--| <title>
--| "foo<span>bar</em><i>baz"
--| <body>
--
--#data
--<!DOCTYPE html><textarea>
--</textarea>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <textarea>
--
--#data
--<!DOCTYPE html><textarea>
--foo</textarea>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <textarea>
--| "foo"
--
--#data
--<!DOCTYPE html><textarea>
--
--foo</textarea>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <textarea>
--| "
--foo"
--
--#data
--<!DOCTYPE html><html><head></head><body><ul><li><div><p><li></ul></body></html>
--#errors
--Line: 1 Col: 60 Missing end tag (div, li).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <ul>
--| <li>
--| <div>
--| <p>
--| <li>
--
--#data
--<!doctype html><nobr><nobr><nobr>
--#errors
--Line: 1 Col: 27 Unexpected start tag (nobr) implies end tag (nobr).
--Line: 1 Col: 33 Unexpected start tag (nobr) implies end tag (nobr).
--Line: 1 Col: 33 Expected closing tag. Unexpected end of file.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <nobr>
--| <nobr>
--| <nobr>
--
--#data
--<!doctype html><nobr><nobr></nobr><nobr>
--#errors
--Line: 1 Col: 27 Unexpected start tag (nobr) implies end tag (nobr).
--Line: 1 Col: 40 Expected closing tag. Unexpected end of file.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <nobr>
--| <nobr>
--| <nobr>
--
--#data
--<!doctype html><html><body><p><table></table></body></html>
--#errors
--Not known
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <table>
--
--#data
--<p><table></table>
--#errors
--Not known
--#document
--| <html>
--| <head>
--| <body>
--| <p>
--| <table>
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests4.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests4.dat
-deleted file mode 100644
-index 3c50632..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests4.dat
-+++ /dev/null
-@@ -1,59 +0,0 @@
--#data
--direct div content
--#errors
--#document-fragment
--div
--#document
--| "direct div content"
--
--#data
--direct textarea content
--#errors
--#document-fragment
--textarea
--#document
--| "direct textarea content"
--
--#data
--textarea content with <em>pseudo</em> <foo>markup
--#errors
--#document-fragment
--textarea
--#document
--| "textarea content with <em>pseudo</em> <foo>markup"
--
--#data
--this is CDATA inside a <style> element
--#errors
--#document-fragment
--style
--#document
--| "this is CDATA inside a <style> element"
--
--#data
--</plaintext>
--#errors
--#document-fragment
--plaintext
--#document
--| "</plaintext>"
--
--#data
--setting html's innerHTML
--#errors
--Line: 1 Col: 24 Unexpected EOF in inner html mode.
--#document-fragment
--html
--#document
--| <head>
--| <body>
--| "setting html's innerHTML"
--
--#data
--<title>setting head's innerHTML</title>
--#errors
--#document-fragment
--head
--#document
--| <title>
--| "setting head's innerHTML"
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests5.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests5.dat
-deleted file mode 100644
-index d7b5128..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests5.dat
-+++ /dev/null
-@@ -1,191 +0,0 @@
--#data
--<style> <!-- </style>x
--#errors
--Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
--Line: 1 Col: 22 Unexpected end of file. Expected end tag (style).
--#document
--| <html>
--| <head>
--| <style>
--| " <!-- "
--| <body>
--| "x"
--
--#data
--<style> <!-- </style> --> </style>x
--#errors
--Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <style>
--| " <!-- "
--| " "
--| <body>
--| "--> x"
--
--#data
--<style> <!--> </style>x
--#errors
--Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <style>
--| " <!--> "
--| <body>
--| "x"
--
--#data
--<style> <!---> </style>x
--#errors
--Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <style>
--| " <!---> "
--| <body>
--| "x"
--
--#data
--<iframe> <!---> </iframe>x
--#errors
--Line: 1 Col: 8 Unexpected start tag (iframe). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--| <iframe>
--| " <!---> "
--| "x"
--
--#data
--<iframe> <!--- </iframe>->x</iframe> --> </iframe>x
--#errors
--Line: 1 Col: 8 Unexpected start tag (iframe). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--| <iframe>
--| " <!--- "
--| "->x --> x"
--
--#data
--<script> <!-- </script> --> </script>x
--#errors
--Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <script>
--| " <!-- "
--| " "
--| <body>
--| "--> x"
--
--#data
--<title> <!-- </title> --> </title>x
--#errors
--Line: 1 Col: 7 Unexpected start tag (title). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <title>
--| " <!-- "
--| " "
--| <body>
--| "--> x"
--
--#data
--<textarea> <!--- </textarea>->x</textarea> --> </textarea>x
--#errors
--Line: 1 Col: 10 Unexpected start tag (textarea). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--| <textarea>
--| " <!--- "
--| "->x --> x"
--
--#data
--<style> <!</-- </style>x
--#errors
--Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <style>
--| " <!</-- "
--| <body>
--| "x"
--
--#data
--<p><xmp></xmp>
--#errors
--XXX: Unknown
--#document
--| <html>
--| <head>
--| <body>
--| <p>
--| <xmp>
--
--#data
--<xmp> <!-- > --> </xmp>
--#errors
--Line: 1 Col: 5 Unexpected start tag (xmp). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--| <xmp>
--| " <!-- > --> "
--
--#data
--<title>&</title>
--#errors
--Line: 1 Col: 7 Unexpected start tag (title). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <title>
--| "&"
--| <body>
--
--#data
--<title><!--&--></title>
--#errors
--Line: 1 Col: 7 Unexpected start tag (title). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <title>
--| "<!--&-->"
--| <body>
--
--#data
--<title><!--</title>
--#errors
--Line: 1 Col: 7 Unexpected start tag (title). Expected DOCTYPE.
--Line: 1 Col: 19 Unexpected end of file. Expected end tag (title).
--#document
--| <html>
--| <head>
--| <title>
--| "<!--"
--| <body>
--
--#data
--<noscript><!--</noscript>--></noscript>
--#errors
--Line: 1 Col: 10 Unexpected start tag (noscript). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <noscript>
--| "<!--"
--| <body>
--| "-->"
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests6.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests6.dat
-deleted file mode 100644
-index f28ece4..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests6.dat
-+++ /dev/null
-@@ -1,663 +0,0 @@
--#data
--<!doctype html></head> <head>
--#errors
--Line: 1 Col: 29 Unexpected start tag head. Ignored.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| " "
--| <body>
--
--#data
--<!doctype html><form><div></form><div>
--#errors
--33: End tag "form" seen but there were unclosed elements.
--38: End of file seen and there were open elements.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <form>
--| <div>
--| <div>
--
--#data
--<!doctype html><title>&</title>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <title>
--| "&"
--| <body>
--
--#data
--<!doctype html><title><!--&--></title>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <title>
--| "<!--&-->"
--| <body>
--
--#data
--<!doctype>
--#errors
--Line: 1 Col: 9 No space after literal string 'DOCTYPE'.
--Line: 1 Col: 10 Unexpected > character. Expected DOCTYPE name.
--Line: 1 Col: 10 Erroneous DOCTYPE.
--#document
--| <!DOCTYPE >
--| <html>
--| <head>
--| <body>
--
--#data
--<!---x
--#errors
--Line: 1 Col: 6 Unexpected end of file in comment.
--Line: 1 Col: 6 Unexpected End of file. Expected DOCTYPE.
--#document
--| <!-- -x -->
--| <html>
--| <head>
--| <body>
--
--#data
--<body>
--<div>
--#errors
--Line: 1 Col: 6 Unexpected start tag (body).
--Line: 2 Col: 5 Expected closing tag. Unexpected end of file.
--#document-fragment
--div
--#document
--| "
--"
--| <div>
--
--#data
--<frameset></frameset>
--foo
--#errors
--Line: 1 Col: 10 Unexpected start tag (frameset). Expected DOCTYPE.
--Line: 2 Col: 3 Unexpected non-space characters in the after frameset phase. Ignored.
--#document
--| <html>
--| <head>
--| <frameset>
--| "
--"
--
--#data
--<frameset></frameset>
--<noframes>
--#errors
--Line: 1 Col: 10 Unexpected start tag (frameset). Expected DOCTYPE.
--Line: 2 Col: 10 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <frameset>
--| "
--"
--| <noframes>
--
--#data
--<frameset></frameset>
--<div>
--#errors
--Line: 1 Col: 10 Unexpected start tag (frameset). Expected DOCTYPE.
--Line: 2 Col: 5 Unexpected start tag (div) in the after frameset phase. Ignored.
--#document
--| <html>
--| <head>
--| <frameset>
--| "
--"
--
--#data
--<frameset></frameset>
--</html>
--#errors
--Line: 1 Col: 10 Unexpected start tag (frameset). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <frameset>
--| "
--"
--
--#data
--<frameset></frameset>
--</div>
--#errors
--Line: 1 Col: 10 Unexpected start tag (frameset). Expected DOCTYPE.
--Line: 2 Col: 6 Unexpected end tag (div) in the after frameset phase. Ignored.
--#document
--| <html>
--| <head>
--| <frameset>
--| "
--"
--
--#data
--<form><form>
--#errors
--Line: 1 Col: 6 Unexpected start tag (form). Expected DOCTYPE.
--Line: 1 Col: 12 Unexpected start tag (form).
--Line: 1 Col: 12 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <form>
--
--#data
--<button><button>
--#errors
--Line: 1 Col: 8 Unexpected start tag (button). Expected DOCTYPE.
--Line: 1 Col: 16 Unexpected start tag (button) implies end tag (button).
--Line: 1 Col: 16 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <button>
--| <button>
--
--#data
--<table><tr><td></th>
--#errors
--Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
--Line: 1 Col: 20 Unexpected end tag (th). Ignored.
--Line: 1 Col: 20 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--
--#data
--<table><caption><td>
--#errors
--Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
--Line: 1 Col: 20 Unexpected end tag (td). Ignored.
--Line: 1 Col: 20 Unexpected table cell start tag (td) in the table body phase.
--Line: 1 Col: 20 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--| <caption>
--| <tbody>
--| <tr>
--| <td>
--
--#data
--<table><caption><div>
--#errors
--Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
--Line: 1 Col: 21 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--| <caption>
--| <div>
--
--#data
--</caption><div>
--#errors
--Line: 1 Col: 10 Unexpected end tag (caption). Ignored.
--Line: 1 Col: 15 Expected closing tag. Unexpected end of file.
--#document-fragment
--caption
--#document
--| <div>
--
--#data
--<table><caption><div></caption>
--#errors
--Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
--Line: 1 Col: 31 Unexpected end tag (caption). Missing end tag (div).
--Line: 1 Col: 31 Unexpected end of file. Expected table content.
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--| <caption>
--| <div>
--
--#data
--<table><caption></table>
--#errors
--Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
--Line: 1 Col: 24 Unexpected end table tag in caption. Generates implied end caption.
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--| <caption>
--
--#data
--</table><div>
--#errors
--Line: 1 Col: 8 Unexpected end table tag in caption. Generates implied end caption.
--Line: 1 Col: 8 Unexpected end tag (caption). Ignored.
--Line: 1 Col: 13 Expected closing tag. Unexpected end of file.
--#document-fragment
--caption
--#document
--| <div>
--
--#data
--<table><caption></body></col></colgroup></html></tbody></td></tfoot></th></thead></tr>
--#errors
--Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
--Line: 1 Col: 23 Unexpected end tag (body). Ignored.
--Line: 1 Col: 29 Unexpected end tag (col). Ignored.
--Line: 1 Col: 40 Unexpected end tag (colgroup). Ignored.
--Line: 1 Col: 47 Unexpected end tag (html). Ignored.
--Line: 1 Col: 55 Unexpected end tag (tbody). Ignored.
--Line: 1 Col: 60 Unexpected end tag (td). Ignored.
--Line: 1 Col: 68 Unexpected end tag (tfoot). Ignored.
--Line: 1 Col: 73 Unexpected end tag (th). Ignored.
--Line: 1 Col: 81 Unexpected end tag (thead). Ignored.
--Line: 1 Col: 86 Unexpected end tag (tr). Ignored.
--Line: 1 Col: 86 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--| <caption>
--
--#data
--<table><caption><div></div>
--#errors
--Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
--Line: 1 Col: 27 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--| <caption>
--| <div>
--
--#data
--<table><tr><td></body></caption></col></colgroup></html>
--#errors
--Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
--Line: 1 Col: 22 Unexpected end tag (body). Ignored.
--Line: 1 Col: 32 Unexpected end tag (caption). Ignored.
--Line: 1 Col: 38 Unexpected end tag (col). Ignored.
--Line: 1 Col: 49 Unexpected end tag (colgroup). Ignored.
--Line: 1 Col: 56 Unexpected end tag (html). Ignored.
--Line: 1 Col: 56 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--
--#data
--</table></tbody></tfoot></thead></tr><div>
--#errors
--Line: 1 Col: 8 Unexpected end tag (table). Ignored.
--Line: 1 Col: 16 Unexpected end tag (tbody). Ignored.
--Line: 1 Col: 24 Unexpected end tag (tfoot). Ignored.
--Line: 1 Col: 32 Unexpected end tag (thead). Ignored.
--Line: 1 Col: 37 Unexpected end tag (tr). Ignored.
--Line: 1 Col: 42 Expected closing tag. Unexpected end of file.
--#document-fragment
--td
--#document
--| <div>
--
--#data
--<table><colgroup>foo
--#errors
--Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
--Line: 1 Col: 20 Unexpected non-space characters in table context caused voodoo mode.
--Line: 1 Col: 20 Unexpected end of file. Expected table content.
--#document
--| <html>
--| <head>
--| <body>
--| "foo"
--| <table>
--| <colgroup>
--
--#data
--foo<col>
--#errors
--Line: 1 Col: 3 Unexpected end tag (colgroup). Ignored.
--#document-fragment
--colgroup
--#document
--| <col>
--
--#data
--<table><colgroup></col>
--#errors
--Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
--Line: 1 Col: 23 This element (col) has no end tag.
--Line: 1 Col: 23 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--| <colgroup>
--
--#data
--<frameset><div>
--#errors
--Line: 1 Col: 10 Unexpected start tag (frameset). Expected DOCTYPE.
--Line: 1 Col: 15 Unexpected start tag token (div) in the frameset phase. Ignored.
--Line: 1 Col: 15 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <frameset>
--
--#data
--</frameset><frame>
--#errors
--Line: 1 Col: 11 Unexpected end tag token (frameset) in the frameset phase (innerHTML).
--#document-fragment
--frameset
--#document
--| <frame>
--
--#data
--<frameset></div>
--#errors
--Line: 1 Col: 10 Unexpected start tag (frameset). Expected DOCTYPE.
--Line: 1 Col: 16 Unexpected end tag token (div) in the frameset phase. Ignored.
--Line: 1 Col: 16 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <frameset>
--
--#data
--</body><div>
--#errors
--Line: 1 Col: 7 Unexpected end tag (body). Ignored.
--Line: 1 Col: 12 Expected closing tag. Unexpected end of file.
--#document-fragment
--body
--#document
--| <div>
--
--#data
--<table><tr><div>
--#errors
--Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
--Line: 1 Col: 16 Unexpected start tag (div) in table context caused voodoo mode.
--Line: 1 Col: 16 Unexpected end of file. Expected table content.
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| <table>
--| <tbody>
--| <tr>
--
--#data
--</tr><td>
--#errors
--Line: 1 Col: 5 Unexpected end tag (tr). Ignored.
--#document-fragment
--tr
--#document
--| <td>
--
--#data
--</tbody></tfoot></thead><td>
--#errors
--Line: 1 Col: 8 Unexpected end tag (tbody). Ignored.
--Line: 1 Col: 16 Unexpected end tag (tfoot). Ignored.
--Line: 1 Col: 24 Unexpected end tag (thead). Ignored.
--#document-fragment
--tr
--#document
--| <td>
--
--#data
--<table><tr><div><td>
--#errors
--Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
--Line: 1 Col: 16 Unexpected start tag (div) in table context caused voodoo mode.
--Line: 1 Col: 20 Unexpected implied end tag (div) in the table row phase.
--Line: 1 Col: 20 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--
--#data
--<caption><col><colgroup><tbody><tfoot><thead><tr>
--#errors
--Line: 1 Col: 9 Unexpected start tag (caption).
--Line: 1 Col: 14 Unexpected start tag (col).
--Line: 1 Col: 24 Unexpected start tag (colgroup).
--Line: 1 Col: 31 Unexpected start tag (tbody).
--Line: 1 Col: 38 Unexpected start tag (tfoot).
--Line: 1 Col: 45 Unexpected start tag (thead).
--Line: 1 Col: 49 Unexpected end of file. Expected table content.
--#document-fragment
--tbody
--#document
--| <tr>
--
--#data
--<table><tbody></thead>
--#errors
--Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
--Line: 1 Col: 22 Unexpected end tag (thead) in the table body phase. Ignored.
--Line: 1 Col: 22 Unexpected end of file. Expected table content.
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--
--#data
--</table><tr>
--#errors
--Line: 1 Col: 8 Unexpected end tag (table). Ignored.
--Line: 1 Col: 12 Unexpected end of file. Expected table content.
--#document-fragment
--tbody
--#document
--| <tr>
--
--#data
--<table><tbody></body></caption></col></colgroup></html></td></th></tr>
--#errors
--Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
--Line: 1 Col: 21 Unexpected end tag (body) in the table body phase. Ignored.
--Line: 1 Col: 31 Unexpected end tag (caption) in the table body phase. Ignored.
--Line: 1 Col: 37 Unexpected end tag (col) in the table body phase. Ignored.
--Line: 1 Col: 48 Unexpected end tag (colgroup) in the table body phase. Ignored.
--Line: 1 Col: 55 Unexpected end tag (html) in the table body phase. Ignored.
--Line: 1 Col: 60 Unexpected end tag (td) in the table body phase. Ignored.
--Line: 1 Col: 65 Unexpected end tag (th) in the table body phase. Ignored.
--Line: 1 Col: 70 Unexpected end tag (tr) in the table body phase. Ignored.
--Line: 1 Col: 70 Unexpected end of file. Expected table content.
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--
--#data
--<table><tbody></div>
--#errors
--Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
--Line: 1 Col: 20 Unexpected end tag (div) in table context caused voodoo mode.
--Line: 1 Col: 20 End tag (div) seen too early. Expected other end tag.
--Line: 1 Col: 20 Unexpected end of file. Expected table content.
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--
--#data
--<table><table>
--#errors
--Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
--Line: 1 Col: 14 Unexpected start tag (table) implies end tag (table).
--Line: 1 Col: 14 Unexpected end of file. Expected table content.
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--| <table>
--
--#data
--<table></body></caption></col></colgroup></html></tbody></td></tfoot></th></thead></tr>
--#errors
--Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
--Line: 1 Col: 14 Unexpected end tag (body). Ignored.
--Line: 1 Col: 24 Unexpected end tag (caption). Ignored.
--Line: 1 Col: 30 Unexpected end tag (col). Ignored.
--Line: 1 Col: 41 Unexpected end tag (colgroup). Ignored.
--Line: 1 Col: 48 Unexpected end tag (html). Ignored.
--Line: 1 Col: 56 Unexpected end tag (tbody). Ignored.
--Line: 1 Col: 61 Unexpected end tag (td). Ignored.
--Line: 1 Col: 69 Unexpected end tag (tfoot). Ignored.
--Line: 1 Col: 74 Unexpected end tag (th). Ignored.
--Line: 1 Col: 82 Unexpected end tag (thead). Ignored.
--Line: 1 Col: 87 Unexpected end tag (tr). Ignored.
--Line: 1 Col: 87 Unexpected end of file. Expected table content.
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--
--#data
--</table><tr>
--#errors
--Line: 1 Col: 8 Unexpected end tag (table). Ignored.
--Line: 1 Col: 12 Unexpected end of file. Expected table content.
--#document-fragment
--table
--#document
--| <tbody>
--| <tr>
--
--#data
--<body></body></html>
--#errors
--Line: 1 Col: 20 Unexpected html end tag in inner html mode.
--Line: 1 Col: 20 Unexpected EOF in inner html mode.
--#document-fragment
--html
--#document
--| <head>
--| <body>
--
--#data
--<html><frameset></frameset></html>
--#errors
--Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <frameset>
--| " "
--
--#data
--<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"><html></html>
--#errors
--Line: 1 Col: 50 Erroneous DOCTYPE.
--Line: 1 Col: 63 Unexpected end tag (html) after the (implied) root element.
--#document
--| <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "">
--| <html>
--| <head>
--| <body>
--
--#data
--<param><frameset></frameset>
--#errors
--Line: 1 Col: 7 Unexpected start tag (param). Expected DOCTYPE.
--Line: 1 Col: 17 Unexpected start tag (frameset).
--#document
--| <html>
--| <head>
--| <frameset>
--
--#data
--<source><frameset></frameset>
--#errors
--Line: 1 Col: 7 Unexpected start tag (source). Expected DOCTYPE.
--Line: 1 Col: 17 Unexpected start tag (frameset).
--#document
--| <html>
--| <head>
--| <frameset>
--
--#data
--<track><frameset></frameset>
--#errors
--Line: 1 Col: 7 Unexpected start tag (track). Expected DOCTYPE.
--Line: 1 Col: 17 Unexpected start tag (frameset).
--#document
--| <html>
--| <head>
--| <frameset>
--
--#data
--</html><frameset></frameset>
--#errors
--7: End tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
--17: Stray “frameset” start tag.
--17: “frameset” start tag seen.
--#document
--| <html>
--| <head>
--| <frameset>
--
--#data
--</body><frameset></frameset>
--#errors
--7: End tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
--17: Stray “frameset” start tag.
--17: “frameset” start tag seen.
--#document
--| <html>
--| <head>
--| <frameset>
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests7.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests7.dat
-deleted file mode 100644
-index f5193c6..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests7.dat
-+++ /dev/null
-@@ -1,390 +0,0 @@
--#data
--<!doctype html><body><title>X</title>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <title>
--| "X"
--
--#data
--<!doctype html><table><title>X</title></table>
--#errors
--Line: 1 Col: 29 Unexpected start tag (title) in table context caused voodoo mode.
--Line: 1 Col: 38 Unexpected end tag (title) in table context caused voodoo mode.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <title>
--| "X"
--| <table>
--
--#data
--<!doctype html><head></head><title>X</title>
--#errors
--Line: 1 Col: 35 Unexpected start tag (title) that can be in head. Moved.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <title>
--| "X"
--| <body>
--
--#data
--<!doctype html></head><title>X</title>
--#errors
--Line: 1 Col: 29 Unexpected start tag (title) that can be in head. Moved.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <title>
--| "X"
--| <body>
--
--#data
--<!doctype html><table><meta></table>
--#errors
--Line: 1 Col: 28 Unexpected start tag (meta) in table context caused voodoo mode.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <meta>
--| <table>
--
--#data
--<!doctype html><table>X<tr><td><table> <meta></table></table>
--#errors
--Line: 1 Col: 23 Unexpected non-space characters in table context caused voodoo mode.
--Line: 1 Col: 45 Unexpected start tag (meta) in table context caused voodoo mode.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| "X"
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| <meta>
--| <table>
--| " "
--
--#data
--<!doctype html><html> <head>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--
--#data
--<!doctype html> <head>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--
--#data
--<!doctype html><table><style> <tr>x </style> </table>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| <style>
--| " <tr>x "
--| " "
--
--#data
--<!doctype html><table><TBODY><script> <tr>x </script> </table>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <script>
--| " <tr>x "
--| " "
--
--#data
--<!doctype html><p><applet><p>X</p></applet>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <p>
--| <applet>
--| <p>
--| "X"
--
--#data
--<!doctype html><listing>
--X</listing>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <listing>
--| "X"
--
--#data
--<!doctype html><select><input>X
--#errors
--Line: 1 Col: 30 Unexpected input start tag in the select phase.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <select>
--| <input>
--| "X"
--
--#data
--<!doctype html><select><select>X
--#errors
--Line: 1 Col: 31 Unexpected select start tag in the select phase treated as select end tag.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <select>
--| "X"
--
--#data
--<!doctype html><table><input type=hidDEN></table>
--#errors
--Line: 1 Col: 41 Unexpected input with type hidden in table context.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| <input>
--| type="hidDEN"
--
--#data
--<!doctype html><table>X<input type=hidDEN></table>
--#errors
--Line: 1 Col: 23 Unexpected non-space characters in table context caused voodoo mode.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| "X"
--| <table>
--| <input>
--| type="hidDEN"
--
--#data
--<!doctype html><table> <input type=hidDEN></table>
--#errors
--Line: 1 Col: 43 Unexpected input with type hidden in table context.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| " "
--| <input>
--| type="hidDEN"
--
--#data
--<!doctype html><table> <input type='hidDEN'></table>
--#errors
--Line: 1 Col: 45 Unexpected input with type hidden in table context.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| " "
--| <input>
--| type="hidDEN"
--
--#data
--<!doctype html><table><input type=" hidden"><input type=hidDEN></table>
--#errors
--Line: 1 Col: 44 Unexpected start tag (input) in table context caused voodoo mode.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <input>
--| type=" hidden"
--| <table>
--| <input>
--| type="hidDEN"
--
--#data
--<!doctype html><table><select>X<tr>
--#errors
--Line: 1 Col: 30 Unexpected start tag (select) in table context caused voodoo mode.
--Line: 1 Col: 35 Unexpected table element start tag (trs) in the select in table phase.
--Line: 1 Col: 35 Unexpected end of file. Expected table content.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <select>
--| "X"
--| <table>
--| <tbody>
--| <tr>
--
--#data
--<!doctype html><select>X</select>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <select>
--| "X"
--
--#data
--<!DOCTYPE hTmL><html></html>
--#errors
--Line: 1 Col: 28 Unexpected end tag (html) after the (implied) root element.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--
--#data
--<!DOCTYPE HTML><html></html>
--#errors
--Line: 1 Col: 28 Unexpected end tag (html) after the (implied) root element.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--
--#data
--<body>X</body></body>
--#errors
--Line: 1 Col: 21 Unexpected end tag token (body) in the after body phase.
--Line: 1 Col: 21 Unexpected EOF in inner html mode.
--#document-fragment
--html
--#document
--| <head>
--| <body>
--| "X"
--
--#data
--<div><p>a</x> b
--#errors
--Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
--Line: 1 Col: 13 Unexpected end tag (x). Ignored.
--Line: 1 Col: 15 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| <p>
--| "a b"
--
--#data
--<table><tr><td><code></code> </table>
--#errors
--Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| <code>
--| " "
--
--#data
--<table><b><tr><td>aaa</td></tr>bbb</table>ccc
--#errors
--XXX: Fix me
--#document
--| <html>
--| <head>
--| <body>
--| <b>
--| <b>
--| "bbb"
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| "aaa"
--| <b>
--| "ccc"
--
--#data
--A<table><tr> B</tr> B</table>
--#errors
--XXX: Fix me
--#document
--| <html>
--| <head>
--| <body>
--| "A B B"
--| <table>
--| <tbody>
--| <tr>
--
--#data
--A<table><tr> B</tr> </em>C</table>
--#errors
--XXX: Fix me
--#document
--| <html>
--| <head>
--| <body>
--| "A BC"
--| <table>
--| <tbody>
--| <tr>
--| " "
--
--#data
--<select><keygen>
--#errors
--Not known
--#document
--| <html>
--| <head>
--| <body>
--| <select>
--| <keygen>
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests8.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests8.dat
-deleted file mode 100644
-index 90e6c91..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests8.dat
-+++ /dev/null
-@@ -1,148 +0,0 @@
--#data
--<div>
--<div></div>
--</span>x
--#errors
--Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
--Line: 3 Col: 7 Unexpected end tag (span). Ignored.
--Line: 3 Col: 8 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| "
--"
--| <div>
--| "
--x"
--
--#data
--<div>x<div></div>
--</span>x
--#errors
--Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
--Line: 2 Col: 7 Unexpected end tag (span). Ignored.
--Line: 2 Col: 8 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| "x"
--| <div>
--| "
--x"
--
--#data
--<div>x<div></div>x</span>x
--#errors
--Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
--Line: 1 Col: 25 Unexpected end tag (span). Ignored.
--Line: 1 Col: 26 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| "x"
--| <div>
--| "xx"
--
--#data
--<div>x<div></div>y</span>z
--#errors
--Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
--Line: 1 Col: 25 Unexpected end tag (span). Ignored.
--Line: 1 Col: 26 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| "x"
--| <div>
--| "yz"
--
--#data
--<table><div>x<div></div>x</span>x
--#errors
--Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
--Line: 1 Col: 12 Unexpected start tag (div) in table context caused voodoo mode.
--Line: 1 Col: 18 Unexpected start tag (div) in table context caused voodoo mode.
--Line: 1 Col: 24 Unexpected end tag (div) in table context caused voodoo mode.
--Line: 1 Col: 32 Unexpected end tag (span) in table context caused voodoo mode.
--Line: 1 Col: 32 Unexpected end tag (span). Ignored.
--Line: 1 Col: 33 Unexpected end of file. Expected table content.
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| "x"
--| <div>
--| "xx"
--| <table>
--
--#data
--x<table>x
--#errors
--Line: 1 Col: 1 Unexpected non-space characters. Expected DOCTYPE.
--Line: 1 Col: 9 Unexpected non-space characters in table context caused voodoo mode.
--Line: 1 Col: 9 Unexpected end of file. Expected table content.
--#document
--| <html>
--| <head>
--| <body>
--| "xx"
--| <table>
--
--#data
--x<table><table>x
--#errors
--Line: 1 Col: 1 Unexpected non-space characters. Expected DOCTYPE.
--Line: 1 Col: 15 Unexpected start tag (table) implies end tag (table).
--Line: 1 Col: 16 Unexpected non-space characters in table context caused voodoo mode.
--Line: 1 Col: 16 Unexpected end of file. Expected table content.
--#document
--| <html>
--| <head>
--| <body>
--| "x"
--| <table>
--| "x"
--| <table>
--
--#data
--<b>a<div></div><div></b>y
--#errors
--Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
--Line: 1 Col: 24 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
--Line: 1 Col: 25 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <b>
--| "a"
--| <div>
--| <div>
--| <b>
--| "y"
--
--#data
--<a><div><p></a>
--#errors
--Line: 1 Col: 3 Unexpected start tag (a). Expected DOCTYPE.
--Line: 1 Col: 15 End tag (a) violates step 1, paragraph 3 of the adoption agency algorithm.
--Line: 1 Col: 15 End tag (a) violates step 1, paragraph 3 of the adoption agency algorithm.
--Line: 1 Col: 15 Expected closing tag. Unexpected end of file.
--#document
--| <html>
--| <head>
--| <body>
--| <a>
--| <div>
--| <a>
--| <p>
--| <a>
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests9.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests9.dat
-deleted file mode 100644
-index 554e27a..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests9.dat
-+++ /dev/null
-@@ -1,457 +0,0 @@
--#data
--<!DOCTYPE html><math></math>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <math math>
--
--#data
--<!DOCTYPE html><body><math></math>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <math math>
--
--#data
--<!DOCTYPE html><math><mi>
--#errors
--25: End of file in a foreign namespace context.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <math math>
--| <math mi>
--
--#data
--<!DOCTYPE html><math><annotation-xml><svg><u>
--#errors
--45: HTML start tag “u” in a foreign namespace context.
--45: End of file seen and there were open elements.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <math math>
--| <math annotation-xml>
--| <svg svg>
--| <u>
--
--#data
--<!DOCTYPE html><body><select><math></math></select>
--#errors
--Line: 1 Col: 35 Unexpected start tag token (math) in the select phase. Ignored.
--Line: 1 Col: 42 Unexpected end tag (math) in the select phase. Ignored.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <select>
--
--#data
--<!DOCTYPE html><body><select><option><math></math></option></select>
--#errors
--Line: 1 Col: 43 Unexpected start tag token (math) in the select phase. Ignored.
--Line: 1 Col: 50 Unexpected end tag (math) in the select phase. Ignored.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <select>
--| <option>
--
--#data
--<!DOCTYPE html><body><table><math></math></table>
--#errors
--Line: 1 Col: 34 Unexpected start tag (math) in table context caused voodoo mode.
--Line: 1 Col: 41 Unexpected end tag (math) in table context caused voodoo mode.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <math math>
--| <table>
--
--#data
--<!DOCTYPE html><body><table><math><mi>foo</mi></math></table>
--#errors
--Line: 1 Col: 34 Unexpected start tag (math) in table context caused voodoo mode.
--Line: 1 Col: 46 Unexpected end tag (mi) in table context caused voodoo mode.
--Line: 1 Col: 53 Unexpected end tag (math) in table context caused voodoo mode.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <math math>
--| <math mi>
--| "foo"
--| <table>
--
--#data
--<!DOCTYPE html><body><table><math><mi>foo</mi><mi>bar</mi></math></table>
--#errors
--Line: 1 Col: 34 Unexpected start tag (math) in table context caused voodoo mode.
--Line: 1 Col: 46 Unexpected end tag (mi) in table context caused voodoo mode.
--Line: 1 Col: 58 Unexpected end tag (mi) in table context caused voodoo mode.
--Line: 1 Col: 65 Unexpected end tag (math) in table context caused voodoo mode.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <math math>
--| <math mi>
--| "foo"
--| <math mi>
--| "bar"
--| <table>
--
--#data
--<!DOCTYPE html><body><table><tbody><math><mi>foo</mi><mi>bar</mi></math></tbody></table>
--#errors
--Line: 1 Col: 41 Unexpected start tag (math) in table context caused voodoo mode.
--Line: 1 Col: 53 Unexpected end tag (mi) in table context caused voodoo mode.
--Line: 1 Col: 65 Unexpected end tag (mi) in table context caused voodoo mode.
--Line: 1 Col: 72 Unexpected end tag (math) in table context caused voodoo mode.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <math math>
--| <math mi>
--| "foo"
--| <math mi>
--| "bar"
--| <table>
--| <tbody>
--
--#data
--<!DOCTYPE html><body><table><tbody><tr><math><mi>foo</mi><mi>bar</mi></math></tr></tbody></table>
--#errors
--Line: 1 Col: 45 Unexpected start tag (math) in table context caused voodoo mode.
--Line: 1 Col: 57 Unexpected end tag (mi) in table context caused voodoo mode.
--Line: 1 Col: 69 Unexpected end tag (mi) in table context caused voodoo mode.
--Line: 1 Col: 76 Unexpected end tag (math) in table context caused voodoo mode.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <math math>
--| <math mi>
--| "foo"
--| <math mi>
--| "bar"
--| <table>
--| <tbody>
--| <tr>
--
--#data
--<!DOCTYPE html><body><table><tbody><tr><td><math><mi>foo</mi><mi>bar</mi></math></td></tr></tbody></table>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| <math math>
--| <math mi>
--| "foo"
--| <math mi>
--| "bar"
--
--#data
--<!DOCTYPE html><body><table><tbody><tr><td><math><mi>foo</mi><mi>bar</mi></math><p>baz</td></tr></tbody></table>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| <math math>
--| <math mi>
--| "foo"
--| <math mi>
--| "bar"
--| <p>
--| "baz"
--
--#data
--<!DOCTYPE html><body><table><caption><math><mi>foo</mi><mi>bar</mi></math><p>baz</caption></table>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| <caption>
--| <math math>
--| <math mi>
--| "foo"
--| <math mi>
--| "bar"
--| <p>
--| "baz"
--
--#data
--<!DOCTYPE html><body><table><caption><math><mi>foo</mi><mi>bar</mi><p>baz</table><p>quux
--#errors
--Line: 1 Col: 70 HTML start tag "p" in a foreign namespace context.
--Line: 1 Col: 81 Unexpected end table tag in caption. Generates implied end caption.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| <caption>
--| <math math>
--| <math mi>
--| "foo"
--| <math mi>
--| "bar"
--| <p>
--| "baz"
--| <p>
--| "quux"
--
--#data
--<!DOCTYPE html><body><table><caption><math><mi>foo</mi><mi>bar</mi>baz</table><p>quux
--#errors
--Line: 1 Col: 78 Unexpected end table tag in caption. Generates implied end caption.
--Line: 1 Col: 78 Unexpected end tag (caption). Missing end tag (math).
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| <caption>
--| <math math>
--| <math mi>
--| "foo"
--| <math mi>
--| "bar"
--| "baz"
--| <p>
--| "quux"
--
--#data
--<!DOCTYPE html><body><table><colgroup><math><mi>foo</mi><mi>bar</mi><p>baz</table><p>quux
--#errors
--Line: 1 Col: 44 Unexpected start tag (math) in table context caused voodoo mode.
--Line: 1 Col: 56 Unexpected end tag (mi) in table context caused voodoo mode.
--Line: 1 Col: 68 Unexpected end tag (mi) in table context caused voodoo mode.
--Line: 1 Col: 71 HTML start tag "p" in a foreign namespace context.
--Line: 1 Col: 71 Unexpected start tag (p) in table context caused voodoo mode.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <math math>
--| <math mi>
--| "foo"
--| <math mi>
--| "bar"
--| <p>
--| "baz"
--| <table>
--| <colgroup>
--| <p>
--| "quux"
--
--#data
--<!DOCTYPE html><body><table><tr><td><select><math><mi>foo</mi><mi>bar</mi><p>baz</table><p>quux
--#errors
--Line: 1 Col: 50 Unexpected start tag token (math) in the select phase. Ignored.
--Line: 1 Col: 54 Unexpected start tag token (mi) in the select phase. Ignored.
--Line: 1 Col: 62 Unexpected end tag (mi) in the select phase. Ignored.
--Line: 1 Col: 66 Unexpected start tag token (mi) in the select phase. Ignored.
--Line: 1 Col: 74 Unexpected end tag (mi) in the select phase. Ignored.
--Line: 1 Col: 77 Unexpected start tag token (p) in the select phase. Ignored.
--Line: 1 Col: 88 Unexpected table element end tag (tables) in the select in table phase.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| <select>
--| "foobarbaz"
--| <p>
--| "quux"
--
--#data
--<!DOCTYPE html><body><table><select><math><mi>foo</mi><mi>bar</mi><p>baz</table><p>quux
--#errors
--Line: 1 Col: 36 Unexpected start tag (select) in table context caused voodoo mode.
--Line: 1 Col: 42 Unexpected start tag token (math) in the select phase. Ignored.
--Line: 1 Col: 46 Unexpected start tag token (mi) in the select phase. Ignored.
--Line: 1 Col: 54 Unexpected end tag (mi) in the select phase. Ignored.
--Line: 1 Col: 58 Unexpected start tag token (mi) in the select phase. Ignored.
--Line: 1 Col: 66 Unexpected end tag (mi) in the select phase. Ignored.
--Line: 1 Col: 69 Unexpected start tag token (p) in the select phase. Ignored.
--Line: 1 Col: 80 Unexpected table element end tag (tables) in the select in table phase.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <select>
--| "foobarbaz"
--| <table>
--| <p>
--| "quux"
--
--#data
--<!DOCTYPE html><body></body></html><math><mi>foo</mi><mi>bar</mi><p>baz
--#errors
--Line: 1 Col: 41 Unexpected start tag (math).
--Line: 1 Col: 68 HTML start tag "p" in a foreign namespace context.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <math math>
--| <math mi>
--| "foo"
--| <math mi>
--| "bar"
--| <p>
--| "baz"
--
--#data
--<!DOCTYPE html><body></body><math><mi>foo</mi><mi>bar</mi><p>baz
--#errors
--Line: 1 Col: 34 Unexpected start tag token (math) in the after body phase.
--Line: 1 Col: 61 HTML start tag "p" in a foreign namespace context.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <math math>
--| <math mi>
--| "foo"
--| <math mi>
--| "bar"
--| <p>
--| "baz"
--
--#data
--<!DOCTYPE html><frameset><math><mi></mi><mi></mi><p><span>
--#errors
--Line: 1 Col: 31 Unexpected start tag token (math) in the frameset phase. Ignored.
--Line: 1 Col: 35 Unexpected start tag token (mi) in the frameset phase. Ignored.
--Line: 1 Col: 40 Unexpected end tag token (mi) in the frameset phase. Ignored.
--Line: 1 Col: 44 Unexpected start tag token (mi) in the frameset phase. Ignored.
--Line: 1 Col: 49 Unexpected end tag token (mi) in the frameset phase. Ignored.
--Line: 1 Col: 52 Unexpected start tag token (p) in the frameset phase. Ignored.
--Line: 1 Col: 58 Unexpected start tag token (span) in the frameset phase. Ignored.
--Line: 1 Col: 58 Expected closing tag. Unexpected end of file.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <frameset>
--
--#data
--<!DOCTYPE html><frameset></frameset><math><mi></mi><mi></mi><p><span>
--#errors
--Line: 1 Col: 42 Unexpected start tag (math) in the after frameset phase. Ignored.
--Line: 1 Col: 46 Unexpected start tag (mi) in the after frameset phase. Ignored.
--Line: 1 Col: 51 Unexpected end tag (mi) in the after frameset phase. Ignored.
--Line: 1 Col: 55 Unexpected start tag (mi) in the after frameset phase. Ignored.
--Line: 1 Col: 60 Unexpected end tag (mi) in the after frameset phase. Ignored.
--Line: 1 Col: 63 Unexpected start tag (p) in the after frameset phase. Ignored.
--Line: 1 Col: 69 Unexpected start tag (span) in the after frameset phase. Ignored.
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <frameset>
--
--#data
--<!DOCTYPE html><body xlink:href=foo><math xlink:href=foo></math>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| xlink:href="foo"
--| <math math>
--| xlink href="foo"
--
--#data
--<!DOCTYPE html><body xlink:href=foo xml:lang=en><math><mi xml:lang=en xlink:href=foo></mi></math>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| xlink:href="foo"
--| xml:lang="en"
--| <math math>
--| <math mi>
--| xlink href="foo"
--| xml lang="en"
--
--#data
--<!DOCTYPE html><body xlink:href=foo xml:lang=en><math><mi xml:lang=en xlink:href=foo /></math>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| xlink:href="foo"
--| xml:lang="en"
--| <math math>
--| <math mi>
--| xlink href="foo"
--| xml lang="en"
--
--#data
--<!DOCTYPE html><body xlink:href=foo xml:lang=en><math><mi xml:lang=en xlink:href=foo />bar</math>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| xlink:href="foo"
--| xml:lang="en"
--| <math math>
--| <math mi>
--| xlink href="foo"
--| xml lang="en"
--| "bar"
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests_innerHTML_1.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests_innerHTML_1.dat
-deleted file mode 100644
-index 6c78661..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests_innerHTML_1.dat
-+++ /dev/null
-@@ -1,741 +0,0 @@
--#data
--<body><span>
--#errors
--#document-fragment
--body
--#document
--| <span>
--
--#data
--<span><body>
--#errors
--#document-fragment
--body
--#document
--| <span>
--
--#data
--<span><body>
--#errors
--#document-fragment
--div
--#document
--| <span>
--
--#data
--<body><span>
--#errors
--#document-fragment
--html
--#document
--| <head>
--| <body>
--| <span>
--
--#data
--<frameset><span>
--#errors
--#document-fragment
--body
--#document
--| <span>
--
--#data
--<span><frameset>
--#errors
--#document-fragment
--body
--#document
--| <span>
--
--#data
--<span><frameset>
--#errors
--#document-fragment
--div
--#document
--| <span>
--
--#data
--<frameset><span>
--#errors
--#document-fragment
--html
--#document
--| <head>
--| <frameset>
--
--#data
--<table><tr>
--#errors
--#document-fragment
--table
--#document
--| <tbody>
--| <tr>
--
--#data
--</table><tr>
--#errors
--#document-fragment
--table
--#document
--| <tbody>
--| <tr>
--
--#data
--<a>
--#errors
--#document-fragment
--table
--#document
--| <a>
--
--#data
--<a>
--#errors
--#document-fragment
--table
--#document
--| <a>
--
--#data
--<a><caption>a
--#errors
--#document-fragment
--table
--#document
--| <a>
--| <caption>
--| "a"
--
--#data
--<a><colgroup><col>
--#errors
--#document-fragment
--table
--#document
--| <a>
--| <colgroup>
--| <col>
--
--#data
--<a><tbody><tr>
--#errors
--#document-fragment
--table
--#document
--| <a>
--| <tbody>
--| <tr>
--
--#data
--<a><tfoot><tr>
--#errors
--#document-fragment
--table
--#document
--| <a>
--| <tfoot>
--| <tr>
--
--#data
--<a><thead><tr>
--#errors
--#document-fragment
--table
--#document
--| <a>
--| <thead>
--| <tr>
--
--#data
--<a><tr>
--#errors
--#document-fragment
--table
--#document
--| <a>
--| <tbody>
--| <tr>
--
--#data
--<a><th>
--#errors
--#document-fragment
--table
--#document
--| <a>
--| <tbody>
--| <tr>
--| <th>
--
--#data
--<a><td>
--#errors
--#document-fragment
--table
--#document
--| <a>
--| <tbody>
--| <tr>
--| <td>
--
--#data
--<table></table><tbody>
--#errors
--#document-fragment
--caption
--#document
--| <table>
--
--#data
--</table><span>
--#errors
--#document-fragment
--caption
--#document
--| <span>
--
--#data
--<span></table>
--#errors
--#document-fragment
--caption
--#document
--| <span>
--
--#data
--</caption><span>
--#errors
--#document-fragment
--caption
--#document
--| <span>
--
--#data
--<span></caption><span>
--#errors
--#document-fragment
--caption
--#document
--| <span>
--| <span>
--
--#data
--<span><caption><span>
--#errors
--#document-fragment
--caption
--#document
--| <span>
--| <span>
--
--#data
--<span><col><span>
--#errors
--#document-fragment
--caption
--#document
--| <span>
--| <span>
--
--#data
--<span><colgroup><span>
--#errors
--#document-fragment
--caption
--#document
--| <span>
--| <span>
--
--#data
--<span><html><span>
--#errors
--#document-fragment
--caption
--#document
--| <span>
--| <span>
--
--#data
--<span><tbody><span>
--#errors
--#document-fragment
--caption
--#document
--| <span>
--| <span>
--
--#data
--<span><td><span>
--#errors
--#document-fragment
--caption
--#document
--| <span>
--| <span>
--
--#data
--<span><tfoot><span>
--#errors
--#document-fragment
--caption
--#document
--| <span>
--| <span>
--
--#data
--<span><thead><span>
--#errors
--#document-fragment
--caption
--#document
--| <span>
--| <span>
--
--#data
--<span><th><span>
--#errors
--#document-fragment
--caption
--#document
--| <span>
--| <span>
--
--#data
--<span><tr><span>
--#errors
--#document-fragment
--caption
--#document
--| <span>
--| <span>
--
--#data
--<span></table><span>
--#errors
--#document-fragment
--caption
--#document
--| <span>
--| <span>
--
--#data
--</colgroup><col>
--#errors
--#document-fragment
--colgroup
--#document
--| <col>
--
--#data
--<a><col>
--#errors
--#document-fragment
--colgroup
--#document
--| <col>
--
--#data
--<caption><a>
--#errors
--#document-fragment
--tbody
--#document
--| <a>
--
--#data
--<col><a>
--#errors
--#document-fragment
--tbody
--#document
--| <a>
--
--#data
--<colgroup><a>
--#errors
--#document-fragment
--tbody
--#document
--| <a>
--
--#data
--<tbody><a>
--#errors
--#document-fragment
--tbody
--#document
--| <a>
--
--#data
--<tfoot><a>
--#errors
--#document-fragment
--tbody
--#document
--| <a>
--
--#data
--<thead><a>
--#errors
--#document-fragment
--tbody
--#document
--| <a>
--
--#data
--</table><a>
--#errors
--#document-fragment
--tbody
--#document
--| <a>
--
--#data
--<a><tr>
--#errors
--#document-fragment
--tbody
--#document
--| <a>
--| <tr>
--
--#data
--<a><td>
--#errors
--#document-fragment
--tbody
--#document
--| <a>
--| <tr>
--| <td>
--
--#data
--<a><td>
--#errors
--#document-fragment
--tbody
--#document
--| <a>
--| <tr>
--| <td>
--
--#data
--<a><td>
--#errors
--#document-fragment
--tbody
--#document
--| <a>
--| <tr>
--| <td>
--
--#data
--<td><table><tbody><a><tr>
--#errors
--#document-fragment
--tbody
--#document
--| <tr>
--| <td>
--| <a>
--| <table>
--| <tbody>
--| <tr>
--
--#data
--</tr><td>
--#errors
--#document-fragment
--tr
--#document
--| <td>
--
--#data
--<td><table><a><tr></tr><tr>
--#errors
--#document-fragment
--tr
--#document
--| <td>
--| <a>
--| <table>
--| <tbody>
--| <tr>
--| <tr>
--
--#data
--<caption><td>
--#errors
--#document-fragment
--tr
--#document
--| <td>
--
--#data
--<col><td>
--#errors
--#document-fragment
--tr
--#document
--| <td>
--
--#data
--<colgroup><td>
--#errors
--#document-fragment
--tr
--#document
--| <td>
--
--#data
--<tbody><td>
--#errors
--#document-fragment
--tr
--#document
--| <td>
--
--#data
--<tfoot><td>
--#errors
--#document-fragment
--tr
--#document
--| <td>
--
--#data
--<thead><td>
--#errors
--#document-fragment
--tr
--#document
--| <td>
--
--#data
--<tr><td>
--#errors
--#document-fragment
--tr
--#document
--| <td>
--
--#data
--</table><td>
--#errors
--#document-fragment
--tr
--#document
--| <td>
--
--#data
--<td><table></table><td>
--#errors
--#document-fragment
--tr
--#document
--| <td>
--| <table>
--| <td>
--
--#data
--<td><table></table><td>
--#errors
--#document-fragment
--tr
--#document
--| <td>
--| <table>
--| <td>
--
--#data
--<caption><a>
--#errors
--#document-fragment
--td
--#document
--| <a>
--
--#data
--<col><a>
--#errors
--#document-fragment
--td
--#document
--| <a>
--
--#data
--<colgroup><a>
--#errors
--#document-fragment
--td
--#document
--| <a>
--
--#data
--<tbody><a>
--#errors
--#document-fragment
--td
--#document
--| <a>
--
--#data
--<tfoot><a>
--#errors
--#document-fragment
--td
--#document
--| <a>
--
--#data
--<th><a>
--#errors
--#document-fragment
--td
--#document
--| <a>
--
--#data
--<thead><a>
--#errors
--#document-fragment
--td
--#document
--| <a>
--
--#data
--<tr><a>
--#errors
--#document-fragment
--td
--#document
--| <a>
--
--#data
--</table><a>
--#errors
--#document-fragment
--td
--#document
--| <a>
--
--#data
--</tbody><a>
--#errors
--#document-fragment
--td
--#document
--| <a>
--
--#data
--</td><a>
--#errors
--#document-fragment
--td
--#document
--| <a>
--
--#data
--</tfoot><a>
--#errors
--#document-fragment
--td
--#document
--| <a>
--
--#data
--</thead><a>
--#errors
--#document-fragment
--td
--#document
--| <a>
--
--#data
--</th><a>
--#errors
--#document-fragment
--td
--#document
--| <a>
--
--#data
--</tr><a>
--#errors
--#document-fragment
--td
--#document
--| <a>
--
--#data
--<table><td><td>
--#errors
--#document-fragment
--td
--#document
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| <td>
--
--#data
--</select><option>
--#errors
--#document-fragment
--select
--#document
--| <option>
--
--#data
--<input><option>
--#errors
--#document-fragment
--select
--#document
--| <option>
--
--#data
--<keygen><option>
--#errors
--#document-fragment
--select
--#document
--| <option>
--
--#data
--<textarea><option>
--#errors
--#document-fragment
--select
--#document
--| <option>
--
--#data
--</html><!--abc-->
--#errors
--#document-fragment
--html
--#document
--| <head>
--| <body>
--| <!-- abc -->
--
--#data
--</frameset><frame>
--#errors
--#document-fragment
--frameset
--#document
--| <frame>
--
--#data
--#errors
--#document-fragment
--html
--#document
--| <head>
--| <body>
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tricky01.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tricky01.dat
-deleted file mode 100644
-index 0841992..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tricky01.dat
-+++ /dev/null
-@@ -1,261 +0,0 @@
--#data
--<b><p>Bold </b> Not bold</p>
--Also not bold.
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <b>
--| <p>
--| <b>
--| "Bold "
--| " Not bold"
--| "
--Also not bold."
--
--#data
--<html>
--<font color=red><i>Italic and Red<p>Italic and Red </font> Just italic.</p> Italic only.</i> Plain
--<p>I should not be red. <font color=red>Red. <i>Italic and red.</p>
--<p>Italic and red. </i> Red.</font> I should not be red.</p>
--<b>Bold <i>Bold and italic</b> Only Italic </i> Plain
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <font>
--| color="red"
--| <i>
--| "Italic and Red"
--| <i>
--| <p>
--| <font>
--| color="red"
--| "Italic and Red "
--| " Just italic."
--| " Italic only."
--| " Plain
--"
--| <p>
--| "I should not be red. "
--| <font>
--| color="red"
--| "Red. "
--| <i>
--| "Italic and red."
--| <font>
--| color="red"
--| <i>
--| "
--"
--| <p>
--| <font>
--| color="red"
--| <i>
--| "Italic and red. "
--| " Red."
--| " I should not be red."
--| "
--"
--| <b>
--| "Bold "
--| <i>
--| "Bold and italic"
--| <i>
--| " Only Italic "
--| " Plain"
--
--#data
--<html><body>
--<p><font size="7">First paragraph.</p>
--<p>Second paragraph.</p></font>
--<b><p><i>Bold and Italic</b> Italic</p>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "
--"
--| <p>
--| <font>
--| size="7"
--| "First paragraph."
--| <font>
--| size="7"
--| "
--"
--| <p>
--| "Second paragraph."
--| "
--"
--| <b>
--| <p>
--| <b>
--| <i>
--| "Bold and Italic"
--| <i>
--| " Italic"
--
--#data
--<html>
--<dl>
--<dt><b>Boo
--<dd>Goo?
--</dl>
--</html>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <dl>
--| "
--"
--| <dt>
--| <b>
--| "Boo
--"
--| <dd>
--| <b>
--| "Goo?
--"
--| <b>
--| "
--"
--
--#data
--<html><body>
--<label><a><div>Hello<div>World</div></a></label>
--</body></html>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "
--"
--| <label>
--| <a>
--| <div>
--| <a>
--| "Hello"
--| <div>
--| "World"
--| "
--"
--
--#data
--<table><center> <font>a</center> <img> <tr><td> </td> </tr> </table>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <center>
--| " "
--| <font>
--| "a"
--| <font>
--| <img>
--| " "
--| <table>
--| " "
--| <tbody>
--| <tr>
--| <td>
--| " "
--| " "
--| " "
--
--#data
--<table><tr><p><a><p>You should see this text.
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <p>
--| <a>
--| <p>
--| <a>
--| "You should see this text."
--| <table>
--| <tbody>
--| <tr>
--
--#data
--<TABLE>
--<TR>
--<CENTER><CENTER><TD></TD></TR><TR>
--<FONT>
--<TABLE><tr></tr></TABLE>
--</P>
--<a></font><font></a>
--This page contains an insanely badly-nested tag sequence.
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <center>
--| <center>
--| <font>
--| "
--"
--| <table>
--| "
--"
--| <tbody>
--| <tr>
--| "
--"
--| <td>
--| <tr>
--| "
--"
--| <table>
--| <tbody>
--| <tr>
--| <font>
--| "
--"
--| <p>
--| "
--"
--| <a>
--| <a>
--| <font>
--| <font>
--| "
--This page contains an insanely badly-nested tag sequence."
--
--#data
--<html>
--<body>
--<b><nobr><div>This text is in a div inside a nobr</nobr>More text that should not be in the nobr, i.e., the
--nobr should have closed the div inside it implicitly. </b><pre>A pre tag outside everything else.</pre>
--</body>
--</html>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "
--"
--| <b>
--| <nobr>
--| <div>
--| <b>
--| <nobr>
--| "This text is in a div inside a nobr"
--| "More text that should not be in the nobr, i.e., the
--nobr should have closed the div inside it implicitly. "
--| <pre>
--| "A pre tag outside everything else."
--| "
--
--"
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/webkit01.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/webkit01.dat
-deleted file mode 100644
-index 9d425e9..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/webkit01.dat
-+++ /dev/null
-@@ -1,610 +0,0 @@
--#data
--Test
--#errors
--Line: 1 Col: 4 Unexpected non-space characters. Expected DOCTYPE.
--#document
--| <html>
--| <head>
--| <body>
--| "Test"
--
--#data
--<div></div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--
--#data
--<div>Test</div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| "Test"
--
--#data
--<di
--#errors
--#document
--| <html>
--| <head>
--| <body>
--
--#data
--<div>Hello</div>
--<script>
--console.log("PASS");
--</script>
--<div>Bye</div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| "Hello"
--| "
--"
--| <script>
--| "
--console.log("PASS");
--"
--| "
--"
--| <div>
--| "Bye"
--
--#data
--<div foo="bar">Hello</div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| foo="bar"
--| "Hello"
--
--#data
--<div>Hello</div>
--<script>
--console.log("FOO<span>BAR</span>BAZ");
--</script>
--<div>Bye</div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| "Hello"
--| "
--"
--| <script>
--| "
--console.log("FOO<span>BAR</span>BAZ");
--"
--| "
--"
--| <div>
--| "Bye"
--
--#data
--<foo bar="baz"></foo><potato quack="duck"></potato>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <foo>
--| bar="baz"
--| <potato>
--| quack="duck"
--
--#data
--<foo bar="baz"><potato quack="duck"></potato></foo>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <foo>
--| bar="baz"
--| <potato>
--| quack="duck"
--
--#data
--<foo></foo bar="baz"><potato></potato quack="duck">
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <foo>
--| <potato>
--
--#data
--</ tttt>
--#errors
--#document
--| <!-- tttt -->
--| <html>
--| <head>
--| <body>
--
--#data
--<div FOO ><img><img></div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| foo=""
--| <img>
--| <img>
--
--#data
--<p>Test</p<p>Test2</p>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <p>
--| "TestTest2"
--
--#data
--<rdar://problem/6869687>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <rdar:>
--| 6869687=""
--| problem=""
--
--#data
--<A>test< /A>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <a>
--| "test< /A>"
--
--#data
--<
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "<"
--
--#data
--<body foo='bar'><body foo='baz' yo='mama'>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| foo="bar"
--| yo="mama"
--
--#data
--<body></br foo="bar"></body>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <br>
--
--#data
--<bdy><br foo="bar"></body>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <bdy>
--| <br>
--| foo="bar"
--
--#data
--<body></body></br foo="bar">
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <br>
--
--#data
--<bdy></body><br foo="bar">
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <bdy>
--| <br>
--| foo="bar"
--
--#data
--<html><body></body></html><!-- Hi there -->
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <!-- Hi there -->
--
--#data
--<html><body></body></html>x<!-- Hi there -->
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "x"
--| <!-- Hi there -->
--
--#data
--<html><body></body></html>x<!-- Hi there --></html><!-- Again -->
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "x"
--| <!-- Hi there -->
--| <!-- Again -->
--
--#data
--<html><body></body></html>x<!-- Hi there --></body></html><!-- Again -->
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "x"
--| <!-- Hi there -->
--| <!-- Again -->
--
--#data
--<html><body><ruby><div><rp>xx</rp></div></ruby></body></html>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <ruby>
--| <div>
--| <rp>
--| "xx"
--
--#data
--<html><body><ruby><div><rt>xx</rt></div></ruby></body></html>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <ruby>
--| <div>
--| <rt>
--| "xx"
--
--#data
--<html><frameset><!--1--><noframes>A</noframes><!--2--></frameset><!--3--><noframes>B</noframes><!--4--></html><!--5--><noframes>C</noframes><!--6-->
--#errors
--#document
--| <html>
--| <head>
--| <frameset>
--| <!-- 1 -->
--| <noframes>
--| "A"
--| <!-- 2 -->
--| <!-- 3 -->
--| <noframes>
--| "B"
--| <!-- 4 -->
--| <noframes>
--| "C"
--| <!-- 5 -->
--| <!-- 6 -->
--
--#data
--<select><option>A<select><option>B<select><option>C<select><option>D<select><option>E<select><option>F<select><option>G<select>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <select>
--| <option>
--| "A"
--| <option>
--| "B"
--| <select>
--| <option>
--| "C"
--| <option>
--| "D"
--| <select>
--| <option>
--| "E"
--| <option>
--| "F"
--| <select>
--| <option>
--| "G"
--
--#data
--<dd><dd><dt><dt><dd><li><li>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <dd>
--| <dd>
--| <dt>
--| <dt>
--| <dd>
--| <li>
--| <li>
--
--#data
--<div><b></div><div><nobr>a<nobr>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| <b>
--| <div>
--| <b>
--| <nobr>
--| "a"
--| <nobr>
--
--#data
--<head></head>
--<body></body>
--#errors
--#document
--| <html>
--| <head>
--| "
--"
--| <body>
--
--#data
--<head></head> <style></style>ddd
--#errors
--#document
--| <html>
--| <head>
--| <style>
--| " "
--| <body>
--| "ddd"
--
--#data
--<kbd><table></kbd><col><select><tr>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <kbd>
--| <select>
--| <table>
--| <colgroup>
--| <col>
--| <tbody>
--| <tr>
--
--#data
--<kbd><table></kbd><col><select><tr></table><div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <kbd>
--| <select>
--| <table>
--| <colgroup>
--| <col>
--| <tbody>
--| <tr>
--| <div>
--
--#data
--<a><li><style></style><title></title></a>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <a>
--| <li>
--| <a>
--| <style>
--| <title>
--
--#data
--<font></p><p><meta><title></title></font>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <font>
--| <p>
--| <p>
--| <font>
--| <meta>
--| <title>
--
--#data
--<a><center><title></title><a>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <a>
--| <center>
--| <a>
--| <title>
--| <a>
--
--#data
--<svg><title><div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| <svg title>
--| <div>
--
--#data
--<svg><title><rect><div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| <svg title>
--| <rect>
--| <div>
--
--#data
--<svg><title><svg><div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| <svg title>
--| <svg svg>
--| <div>
--
--#data
--<img <="" FAIL>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <img>
--| <=""
--| fail=""
--
--#data
--<ul><li><div id='foo'/>A</li><li>B<div>C</div></li></ul>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <ul>
--| <li>
--| <div>
--| id="foo"
--| "A"
--| <li>
--| "B"
--| <div>
--| "C"
--
--#data
--<svg><em><desc></em>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| <em>
--| <desc>
--
--#data
--<table><tr><td><svg><desc><td></desc><circle>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| <svg svg>
--| <svg desc>
--| <td>
--| <circle>
--
--#data
--<svg><tfoot></mi><td>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <svg svg>
--| <svg tfoot>
--| <svg td>
--
--#data
--<math><mrow><mrow><mn>1</mn></mrow><mi>a</mi></mrow></math>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <math math>
--| <math mrow>
--| <math mrow>
--| <math mn>
--| "1"
--| <math mi>
--| "a"
--
--#data
--<!doctype html><input type="hidden"><frameset>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <frameset>
--
--#data
--<!doctype html><input type="button"><frameset>
--#errors
--#document
--| <!DOCTYPE html>
--| <html>
--| <head>
--| <body>
--| <input>
--| type="button"
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/webkit02.dat b/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/webkit02.dat
-deleted file mode 100644
-index 905783d..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/webkit02.dat
-+++ /dev/null
-@@ -1,159 +0,0 @@
--#data
--<foo bar=qux/>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <foo>
--| bar="qux/"
--
--#data
--<p id="status"><noscript><strong>A</strong></noscript><span>B</span></p>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <p>
--| id="status"
--| <noscript>
--| "<strong>A</strong>"
--| <span>
--| "B"
--
--#data
--<div><sarcasm><div></div></sarcasm></div>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <div>
--| <sarcasm>
--| <div>
--
--#data
--<html><body><img src="" border="0" alt="><div>A</div></body></html>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--
--#data
--<table><td></tbody>A
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| "A"
--| <table>
--| <tbody>
--| <tr>
--| <td>
--
--#data
--<table><td></thead>A
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| "A"
--
--#data
--<table><td></tfoot>A
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--| <tbody>
--| <tr>
--| <td>
--| "A"
--
--#data
--<table><thead><td></tbody>A
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <table>
--| <thead>
--| <tr>
--| <td>
--| "A"
--
--#data
--<legend>test</legend>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <legend>
--| "test"
--
--#data
--<table><input>
--#errors
--#document
--| <html>
--| <head>
--| <body>
--| <input>
--| <table>
--
--#data
--<b><em><dcell><postfield><postfield><postfield><postfield><missing_glyph><missing_glyph><missing_glyph><missing_glyph><hkern><aside></b></em>
--#errors
--#document-fragment
--div
--#document
--| <b>
--| <em>
--| <dcell>
--| <postfield>
--| <postfield>
--| <postfield>
--| <postfield>
--| <missing_glyph>
--| <missing_glyph>
--| <missing_glyph>
--| <missing_glyph>
--| <hkern>
--| <aside>
--| <em>
--| <b>
--
--#data
--<isindex action="x">
--#errors
--#document-fragment
--table
--#document
--| <form>
--| action="x"
--| <hr>
--| <label>
--| "This is a searchable index. Enter search keywords: "
--| <input>
--| name="isindex"
--| <hr>
--
--#data
--<option><XH<optgroup></optgroup>
--#errors
--#document-fragment
--select
--#document
--| <option>
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/token.go b/Godeps/_workspace/src/code.google.com/p/go.net/html/token.go
-deleted file mode 100644
-index a226099..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/token.go
-+++ /dev/null
-@@ -1,1219 +0,0 @@
--// Copyright 2010 The Go Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--package html
--
--import (
-- "bytes"
-- "errors"
-- "io"
-- "strconv"
-- "strings"
--
-- "code.google.com/p/go.net/html/atom"
--)
--
--// A TokenType is the type of a Token.
--type TokenType uint32
--
--const (
-- // ErrorToken means that an error occurred during tokenization.
-- ErrorToken TokenType = iota
-- // TextToken means a text node.
-- TextToken
-- // A StartTagToken looks like <a>.
-- StartTagToken
-- // An EndTagToken looks like </a>.
-- EndTagToken
-- // A SelfClosingTagToken tag looks like <br/>.
-- SelfClosingTagToken
-- // A CommentToken looks like <!--x-->.
-- CommentToken
-- // A DoctypeToken looks like <!DOCTYPE x>
-- DoctypeToken
--)
--
--// ErrBufferExceeded means that the buffering limit was exceeded.
--var ErrBufferExceeded = errors.New("max buffer exceeded")
--
--// String returns a string representation of the TokenType.
--func (t TokenType) String() string {
-- switch t {
-- case ErrorToken:
-- return "Error"
-- case TextToken:
-- return "Text"
-- case StartTagToken:
-- return "StartTag"
-- case EndTagToken:
-- return "EndTag"
-- case SelfClosingTagToken:
-- return "SelfClosingTag"
-- case CommentToken:
-- return "Comment"
-- case DoctypeToken:
-- return "Doctype"
-- }
-- return "Invalid(" + strconv.Itoa(int(t)) + ")"
--}
--
--// An Attribute is an attribute namespace-key-value triple. Namespace is
--// non-empty for foreign attributes like xlink, Key is alphabetic (and hence
--// does not contain escapable characters like '&', '<' or '>'), and Val is
--// unescaped (it looks like "a<b" rather than "a<b").
--//
--// Namespace is only used by the parser, not the tokenizer.
--type Attribute struct {
-- Namespace, Key, Val string
--}
--
--// A Token consists of a TokenType and some Data (tag name for start and end
--// tags, content for text, comments and doctypes). A tag Token may also contain
--// a slice of Attributes. Data is unescaped for all Tokens (it looks like "a<b"
--// rather than "a<b"). For tag Tokens, DataAtom is the atom for Data, or
--// zero if Data is not a known tag name.
--type Token struct {
-- Type TokenType
-- DataAtom atom.Atom
-- Data string
-- Attr []Attribute
--}
--
--// tagString returns a string representation of a tag Token's Data and Attr.
--func (t Token) tagString() string {
-- if len(t.Attr) == 0 {
-- return t.Data
-- }
-- buf := bytes.NewBufferString(t.Data)
-- for _, a := range t.Attr {
-- buf.WriteByte(' ')
-- buf.WriteString(a.Key)
-- buf.WriteString(`="`)
-- escape(buf, a.Val)
-- buf.WriteByte('"')
-- }
-- return buf.String()
--}
--
--// String returns a string representation of the Token.
--func (t Token) String() string {
-- switch t.Type {
-- case ErrorToken:
-- return ""
-- case TextToken:
-- return EscapeString(t.Data)
-- case StartTagToken:
-- return "<" + t.tagString() + ">"
-- case EndTagToken:
-- return "</" + t.tagString() + ">"
-- case SelfClosingTagToken:
-- return "<" + t.tagString() + "/>"
-- case CommentToken:
-- return "<!--" + t.Data + "-->"
-- case DoctypeToken:
-- return "<!DOCTYPE " + t.Data + ">"
-- }
-- return "Invalid(" + strconv.Itoa(int(t.Type)) + ")"
--}
--
--// span is a range of bytes in a Tokenizer's buffer. The start is inclusive,
--// the end is exclusive.
--type span struct {
-- start, end int
--}
--
--// A Tokenizer returns a stream of HTML Tokens.
--type Tokenizer struct {
-- // r is the source of the HTML text.
-- r io.Reader
-- // tt is the TokenType of the current token.
-- tt TokenType
-- // err is the first error encountered during tokenization. It is possible
-- // for tt != Error && err != nil to hold: this means that Next returned a
-- // valid token but the subsequent Next call will return an error token.
-- // For example, if the HTML text input was just "plain", then the first
-- // Next call would set z.err to io.EOF but return a TextToken, and all
-- // subsequent Next calls would return an ErrorToken.
-- // err is never reset. Once it becomes non-nil, it stays non-nil.
-- err error
-- // readErr is the error returned by the io.Reader r. It is separate from
-- // err because it is valid for an io.Reader to return (n int, err1 error)
-- // such that n > 0 && err1 != nil, and callers should always process the
-- // n > 0 bytes before considering the error err1.
-- readErr error
-- // buf[raw.start:raw.end] holds the raw bytes of the current token.
-- // buf[raw.end:] is buffered input that will yield future tokens.
-- raw span
-- buf []byte
-- // maxBuf limits the data buffered in buf. A value of 0 means unlimited.
-- maxBuf int
-- // buf[data.start:data.end] holds the raw bytes of the current token's data:
-- // a text token's text, a tag token's tag name, etc.
-- data span
-- // pendingAttr is the attribute key and value currently being tokenized.
-- // When complete, pendingAttr is pushed onto attr. nAttrReturned is
-- // incremented on each call to TagAttr.
-- pendingAttr [2]span
-- attr [][2]span
-- nAttrReturned int
-- // rawTag is the "script" in "</script>" that closes the next token. If
-- // non-empty, the subsequent call to Next will return a raw or RCDATA text
-- // token: one that treats "<p>" as text instead of an element.
-- // rawTag's contents are lower-cased.
-- rawTag string
-- // textIsRaw is whether the current text token's data is not escaped.
-- textIsRaw bool
-- // convertNUL is whether NUL bytes in the current token's data should
-- // be converted into \ufffd replacement characters.
-- convertNUL bool
-- // allowCDATA is whether CDATA sections are allowed in the current context.
-- allowCDATA bool
--}
--
--// AllowCDATA sets whether or not the tokenizer recognizes <![CDATA[foo]]> as
--// the text "foo". The default value is false, which means to recognize it as
--// a bogus comment "<!-- [CDATA[foo]] -->" instead.
--//
--// Strictly speaking, an HTML5 compliant tokenizer should allow CDATA if and
--// only if tokenizing foreign content, such as MathML and SVG. However,
--// tracking foreign-contentness is difficult to do purely in the tokenizer,
--// as opposed to the parser, due to HTML integration points: an <svg> element
--// can contain a <foreignObject> that is foreign-to-SVG but not foreign-to-
--// HTML. For strict compliance with the HTML5 tokenization algorithm, it is the
--// responsibility of the user of a tokenizer to call AllowCDATA as appropriate.
--// In practice, if using the tokenizer without caring whether MathML or SVG
--// CDATA is text or comments, such as tokenizing HTML to find all the anchor
--// text, it is acceptable to ignore this responsibility.
--func (z *Tokenizer) AllowCDATA(allowCDATA bool) {
-- z.allowCDATA = allowCDATA
--}
--
--// NextIsNotRawText instructs the tokenizer that the next token should not be
--// considered as 'raw text'. Some elements, such as script and title elements,
--// normally require the next token after the opening tag to be 'raw text' that
--// has no child elements. For example, tokenizing "<title>a<b>c</b>d</title>"
--// yields a start tag token for "<title>", a text token for "a<b>c</b>d", and
--// an end tag token for "</title>". There are no distinct start tag or end tag
--// tokens for the "<b>" and "</b>".
--//
--// This tokenizer implementation will generally look for raw text at the right
--// times. Strictly speaking, an HTML5 compliant tokenizer should not look for
--// raw text if in foreign content: <title> generally needs raw text, but a
--// <title> inside an <svg> does not. Another example is that a <textarea>
--// generally needs raw text, but a <textarea> is not allowed as an immediate
--// child of a <select>; in normal parsing, a <textarea> implies </select>, but
--// one cannot close the implicit element when parsing a <select>'s InnerHTML.
--// Similarly to AllowCDATA, tracking the correct moment to override raw-text-
--// ness is difficult to do purely in the tokenizer, as opposed to the parser.
--// For strict compliance with the HTML5 tokenization algorithm, it is the
--// responsibility of the user of a tokenizer to call NextIsNotRawText as
--// appropriate. In practice, like AllowCDATA, it is acceptable to ignore this
--// responsibility for basic usage.
--//
--// Note that this 'raw text' concept is different from the one offered by the
--// Tokenizer.Raw method.
--func (z *Tokenizer) NextIsNotRawText() {
-- z.rawTag = ""
--}
--
--// Err returns the error associated with the most recent ErrorToken token.
--// This is typically io.EOF, meaning the end of tokenization.
--func (z *Tokenizer) Err() error {
-- if z.tt != ErrorToken {
-- return nil
-- }
-- return z.err
--}
--
--// readByte returns the next byte from the input stream, doing a buffered read
--// from z.r into z.buf if necessary. z.buf[z.raw.start:z.raw.end] remains a contiguous byte
--// slice that holds all the bytes read so far for the current token.
--// It sets z.err if the underlying reader returns an error.
--// Pre-condition: z.err == nil.
--func (z *Tokenizer) readByte() byte {
-- if z.raw.end >= len(z.buf) {
-- // Our buffer is exhausted and we have to read from z.r. Check if the
-- // previous read resulted in an error.
-- if z.readErr != nil {
-- z.err = z.readErr
-- return 0
-- }
-- // We copy z.buf[z.raw.start:z.raw.end] to the beginning of z.buf. If the length
-- // z.raw.end - z.raw.start is more than half the capacity of z.buf, then we
-- // allocate a new buffer before the copy.
-- c := cap(z.buf)
-- d := z.raw.end - z.raw.start
-- var buf1 []byte
-- if 2*d > c {
-- buf1 = make([]byte, d, 2*c)
-- } else {
-- buf1 = z.buf[:d]
-- }
-- copy(buf1, z.buf[z.raw.start:z.raw.end])
-- if x := z.raw.start; x != 0 {
-- // Adjust the data/attr spans to refer to the same contents after the copy.
-- z.data.start -= x
-- z.data.end -= x
-- z.pendingAttr[0].start -= x
-- z.pendingAttr[0].end -= x
-- z.pendingAttr[1].start -= x
-- z.pendingAttr[1].end -= x
-- for i := range z.attr {
-- z.attr[i][0].start -= x
-- z.attr[i][0].end -= x
-- z.attr[i][1].start -= x
-- z.attr[i][1].end -= x
-- }
-- }
-- z.raw.start, z.raw.end, z.buf = 0, d, buf1[:d]
-- // Now that we have copied the live bytes to the start of the buffer,
-- // we read from z.r into the remainder.
-- var n int
-- n, z.readErr = readAtLeastOneByte(z.r, buf1[d:cap(buf1)])
-- if n == 0 {
-- z.err = z.readErr
-- return 0
-- }
-- z.buf = buf1[:d+n]
-- }
-- x := z.buf[z.raw.end]
-- z.raw.end++
-- if z.maxBuf > 0 && z.raw.end-z.raw.start >= z.maxBuf {
-- z.err = ErrBufferExceeded
-- return 0
-- }
-- return x
--}
--
--// Buffered returns a slice containing data buffered but not yet tokenized.
--func (z *Tokenizer) Buffered() []byte {
-- return z.buf[z.raw.end:]
--}
--
--// readAtLeastOneByte wraps an io.Reader so that reading cannot return (0, nil).
--// It returns io.ErrNoProgress if the underlying r.Read method returns (0, nil)
--// too many times in succession.
--func readAtLeastOneByte(r io.Reader, b []byte) (int, error) {
-- for i := 0; i < 100; i++ {
-- n, err := r.Read(b)
-- if n != 0 || err != nil {
-- return n, err
-- }
-- }
-- return 0, io.ErrNoProgress
--}
--
--// skipWhiteSpace skips past any white space.
--func (z *Tokenizer) skipWhiteSpace() {
-- if z.err != nil {
-- return
-- }
-- for {
-- c := z.readByte()
-- if z.err != nil {
-- return
-- }
-- switch c {
-- case ' ', '\n', '\r', '\t', '\f':
-- // No-op.
-- default:
-- z.raw.end--
-- return
-- }
-- }
--}
--
--// readRawOrRCDATA reads until the next "</foo>", where "foo" is z.rawTag and
--// is typically something like "script" or "textarea".
--func (z *Tokenizer) readRawOrRCDATA() {
-- if z.rawTag == "script" {
-- z.readScript()
-- z.textIsRaw = true
-- z.rawTag = ""
-- return
-- }
--loop:
-- for {
-- c := z.readByte()
-- if z.err != nil {
-- break loop
-- }
-- if c != '<' {
-- continue loop
-- }
-- c = z.readByte()
-- if z.err != nil {
-- break loop
-- }
-- if c != '/' {
-- continue loop
-- }
-- if z.readRawEndTag() || z.err != nil {
-- break loop
-- }
-- }
-- z.data.end = z.raw.end
-- // A textarea's or title's RCDATA can contain escaped entities.
-- z.textIsRaw = z.rawTag != "textarea" && z.rawTag != "title"
-- z.rawTag = ""
--}
--
--// readRawEndTag attempts to read a tag like "</foo>", where "foo" is z.rawTag.
--// If it succeeds, it backs up the input position to reconsume the tag and
--// returns true. Otherwise it returns false. The opening "</" has already been
--// consumed.
--func (z *Tokenizer) readRawEndTag() bool {
-- for i := 0; i < len(z.rawTag); i++ {
-- c := z.readByte()
-- if z.err != nil {
-- return false
-- }
-- if c != z.rawTag[i] && c != z.rawTag[i]-('a'-'A') {
-- z.raw.end--
-- return false
-- }
-- }
-- c := z.readByte()
-- if z.err != nil {
-- return false
-- }
-- switch c {
-- case ' ', '\n', '\r', '\t', '\f', '/', '>':
-- // The 3 is 2 for the leading "</" plus 1 for the trailing character c.
-- z.raw.end -= 3 + len(z.rawTag)
-- return true
-- }
-- z.raw.end--
-- return false
--}
--
--// readScript reads until the next </script> tag, following the byzantine
--// rules for escaping/hiding the closing tag.
--func (z *Tokenizer) readScript() {
-- defer func() {
-- z.data.end = z.raw.end
-- }()
-- var c byte
--
--scriptData:
-- c = z.readByte()
-- if z.err != nil {
-- return
-- }
-- if c == '<' {
-- goto scriptDataLessThanSign
-- }
-- goto scriptData
--
--scriptDataLessThanSign:
-- c = z.readByte()
-- if z.err != nil {
-- return
-- }
-- switch c {
-- case '/':
-- goto scriptDataEndTagOpen
-- case '!':
-- goto scriptDataEscapeStart
-- }
-- z.raw.end--
-- goto scriptData
--
--scriptDataEndTagOpen:
-- if z.readRawEndTag() || z.err != nil {
-- return
-- }
-- goto scriptData
--
--scriptDataEscapeStart:
-- c = z.readByte()
-- if z.err != nil {
-- return
-- }
-- if c == '-' {
-- goto scriptDataEscapeStartDash
-- }
-- z.raw.end--
-- goto scriptData
--
--scriptDataEscapeStartDash:
-- c = z.readByte()
-- if z.err != nil {
-- return
-- }
-- if c == '-' {
-- goto scriptDataEscapedDashDash
-- }
-- z.raw.end--
-- goto scriptData
--
--scriptDataEscaped:
-- c = z.readByte()
-- if z.err != nil {
-- return
-- }
-- switch c {
-- case '-':
-- goto scriptDataEscapedDash
-- case '<':
-- goto scriptDataEscapedLessThanSign
-- }
-- goto scriptDataEscaped
--
--scriptDataEscapedDash:
-- c = z.readByte()
-- if z.err != nil {
-- return
-- }
-- switch c {
-- case '-':
-- goto scriptDataEscapedDashDash
-- case '<':
-- goto scriptDataEscapedLessThanSign
-- }
-- goto scriptDataEscaped
--
--scriptDataEscapedDashDash:
-- c = z.readByte()
-- if z.err != nil {
-- return
-- }
-- switch c {
-- case '-':
-- goto scriptDataEscapedDashDash
-- case '<':
-- goto scriptDataEscapedLessThanSign
-- case '>':
-- goto scriptData
-- }
-- goto scriptDataEscaped
--
--scriptDataEscapedLessThanSign:
-- c = z.readByte()
-- if z.err != nil {
-- return
-- }
-- if c == '/' {
-- goto scriptDataEscapedEndTagOpen
-- }
-- if 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' {
-- goto scriptDataDoubleEscapeStart
-- }
-- z.raw.end--
-- goto scriptData
--
--scriptDataEscapedEndTagOpen:
-- if z.readRawEndTag() || z.err != nil {
-- return
-- }
-- goto scriptDataEscaped
--
--scriptDataDoubleEscapeStart:
-- z.raw.end--
-- for i := 0; i < len("script"); i++ {
-- c = z.readByte()
-- if z.err != nil {
-- return
-- }
-- if c != "script"[i] && c != "SCRIPT"[i] {
-- z.raw.end--
-- goto scriptDataEscaped
-- }
-- }
-- c = z.readByte()
-- if z.err != nil {
-- return
-- }
-- switch c {
-- case ' ', '\n', '\r', '\t', '\f', '/', '>':
-- goto scriptDataDoubleEscaped
-- }
-- z.raw.end--
-- goto scriptDataEscaped
--
--scriptDataDoubleEscaped:
-- c = z.readByte()
-- if z.err != nil {
-- return
-- }
-- switch c {
-- case '-':
-- goto scriptDataDoubleEscapedDash
-- case '<':
-- goto scriptDataDoubleEscapedLessThanSign
-- }
-- goto scriptDataDoubleEscaped
--
--scriptDataDoubleEscapedDash:
-- c = z.readByte()
-- if z.err != nil {
-- return
-- }
-- switch c {
-- case '-':
-- goto scriptDataDoubleEscapedDashDash
-- case '<':
-- goto scriptDataDoubleEscapedLessThanSign
-- }
-- goto scriptDataDoubleEscaped
--
--scriptDataDoubleEscapedDashDash:
-- c = z.readByte()
-- if z.err != nil {
-- return
-- }
-- switch c {
-- case '-':
-- goto scriptDataDoubleEscapedDashDash
-- case '<':
-- goto scriptDataDoubleEscapedLessThanSign
-- case '>':
-- goto scriptData
-- }
-- goto scriptDataDoubleEscaped
--
--scriptDataDoubleEscapedLessThanSign:
-- c = z.readByte()
-- if z.err != nil {
-- return
-- }
-- if c == '/' {
-- goto scriptDataDoubleEscapeEnd
-- }
-- z.raw.end--
-- goto scriptDataDoubleEscaped
--
--scriptDataDoubleEscapeEnd:
-- if z.readRawEndTag() {
-- z.raw.end += len("</script>")
-- goto scriptDataEscaped
-- }
-- if z.err != nil {
-- return
-- }
-- goto scriptDataDoubleEscaped
--}
--
--// readComment reads the next comment token starting with "<!--". The opening
--// "<!--" has already been consumed.
--func (z *Tokenizer) readComment() {
-- z.data.start = z.raw.end
-- defer func() {
-- if z.data.end < z.data.start {
-- // It's a comment with no data, like <!-->.
-- z.data.end = z.data.start
-- }
-- }()
-- for dashCount := 2; ; {
-- c := z.readByte()
-- if z.err != nil {
-- // Ignore up to two dashes at EOF.
-- if dashCount > 2 {
-- dashCount = 2
-- }
-- z.data.end = z.raw.end - dashCount
-- return
-- }
-- switch c {
-- case '-':
-- dashCount++
-- continue
-- case '>':
-- if dashCount >= 2 {
-- z.data.end = z.raw.end - len("-->")
-- return
-- }
-- case '!':
-- if dashCount >= 2 {
-- c = z.readByte()
-- if z.err != nil {
-- z.data.end = z.raw.end
-- return
-- }
-- if c == '>' {
-- z.data.end = z.raw.end - len("--!>")
-- return
-- }
-- }
-- }
-- dashCount = 0
-- }
--}
--
--// readUntilCloseAngle reads until the next ">".
--func (z *Tokenizer) readUntilCloseAngle() {
-- z.data.start = z.raw.end
-- for {
-- c := z.readByte()
-- if z.err != nil {
-- z.data.end = z.raw.end
-- return
-- }
-- if c == '>' {
-- z.data.end = z.raw.end - len(">")
-- return
-- }
-- }
--}
--
--// readMarkupDeclaration reads the next token starting with "<!". It might be
--// a "<!--comment-->", a "<!DOCTYPE foo>", a "<![CDATA[section]]>" or
--// "<!a bogus comment". The opening "<!" has already been consumed.
--func (z *Tokenizer) readMarkupDeclaration() TokenType {
-- z.data.start = z.raw.end
-- var c [2]byte
-- for i := 0; i < 2; i++ {
-- c[i] = z.readByte()
-- if z.err != nil {
-- z.data.end = z.raw.end
-- return CommentToken
-- }
-- }
-- if c[0] == '-' && c[1] == '-' {
-- z.readComment()
-- return CommentToken
-- }
-- z.raw.end -= 2
-- if z.readDoctype() {
-- return DoctypeToken
-- }
-- if z.allowCDATA && z.readCDATA() {
-- z.convertNUL = true
-- return TextToken
-- }
-- // It's a bogus comment.
-- z.readUntilCloseAngle()
-- return CommentToken
--}
--
--// readDoctype attempts to read a doctype declaration and returns true if
--// successful. The opening "<!" has already been consumed.
--func (z *Tokenizer) readDoctype() bool {
-- const s = "DOCTYPE"
-- for i := 0; i < len(s); i++ {
-- c := z.readByte()
-- if z.err != nil {
-- z.data.end = z.raw.end
-- return false
-- }
-- if c != s[i] && c != s[i]+('a'-'A') {
-- // Back up to read the fragment of "DOCTYPE" again.
-- z.raw.end = z.data.start
-- return false
-- }
-- }
-- if z.skipWhiteSpace(); z.err != nil {
-- z.data.start = z.raw.end
-- z.data.end = z.raw.end
-- return true
-- }
-- z.readUntilCloseAngle()
-- return true
--}
--
--// readCDATA attempts to read a CDATA section and returns true if
--// successful. The opening "<!" has already been consumed.
--func (z *Tokenizer) readCDATA() bool {
-- const s = "[CDATA["
-- for i := 0; i < len(s); i++ {
-- c := z.readByte()
-- if z.err != nil {
-- z.data.end = z.raw.end
-- return false
-- }
-- if c != s[i] {
-- // Back up to read the fragment of "[CDATA[" again.
-- z.raw.end = z.data.start
-- return false
-- }
-- }
-- z.data.start = z.raw.end
-- brackets := 0
-- for {
-- c := z.readByte()
-- if z.err != nil {
-- z.data.end = z.raw.end
-- return true
-- }
-- switch c {
-- case ']':
-- brackets++
-- case '>':
-- if brackets >= 2 {
-- z.data.end = z.raw.end - len("]]>")
-- return true
-- }
-- brackets = 0
-- default:
-- brackets = 0
-- }
-- }
--}
--
--// startTagIn returns whether the start tag in z.buf[z.data.start:z.data.end]
--// case-insensitively matches any element of ss.
--func (z *Tokenizer) startTagIn(ss ...string) bool {
--loop:
-- for _, s := range ss {
-- if z.data.end-z.data.start != len(s) {
-- continue loop
-- }
-- for i := 0; i < len(s); i++ {
-- c := z.buf[z.data.start+i]
-- if 'A' <= c && c <= 'Z' {
-- c += 'a' - 'A'
-- }
-- if c != s[i] {
-- continue loop
-- }
-- }
-- return true
-- }
-- return false
--}
--
--// readStartTag reads the next start tag token. The opening "<a" has already
--// been consumed, where 'a' means anything in [A-Za-z].
--func (z *Tokenizer) readStartTag() TokenType {
-- z.readTag(true)
-- if z.err != nil {
-- return ErrorToken
-- }
-- // Several tags flag the tokenizer's next token as raw.
-- c, raw := z.buf[z.data.start], false
-- if 'A' <= c && c <= 'Z' {
-- c += 'a' - 'A'
-- }
-- switch c {
-- case 'i':
-- raw = z.startTagIn("iframe")
-- case 'n':
-- raw = z.startTagIn("noembed", "noframes", "noscript")
-- case 'p':
-- raw = z.startTagIn("plaintext")
-- case 's':
-- raw = z.startTagIn("script", "style")
-- case 't':
-- raw = z.startTagIn("textarea", "title")
-- case 'x':
-- raw = z.startTagIn("xmp")
-- }
-- if raw {
-- z.rawTag = strings.ToLower(string(z.buf[z.data.start:z.data.end]))
-- }
-- // Look for a self-closing token like "<br/>".
-- if z.err == nil && z.buf[z.raw.end-2] == '/' {
-- return SelfClosingTagToken
-- }
-- return StartTagToken
--}
--
--// readTag reads the next tag token and its attributes. If saveAttr, those
--// attributes are saved in z.attr, otherwise z.attr is set to an empty slice.
--// The opening "<a" or "</a" has already been consumed, where 'a' means anything
--// in [A-Za-z].
--func (z *Tokenizer) readTag(saveAttr bool) {
-- z.attr = z.attr[:0]
-- z.nAttrReturned = 0
-- // Read the tag name and attribute key/value pairs.
-- z.readTagName()
-- if z.skipWhiteSpace(); z.err != nil {
-- return
-- }
-- for {
-- c := z.readByte()
-- if z.err != nil || c == '>' {
-- break
-- }
-- z.raw.end--
-- z.readTagAttrKey()
-- z.readTagAttrVal()
-- // Save pendingAttr if saveAttr and that attribute has a non-empty key.
-- if saveAttr && z.pendingAttr[0].start != z.pendingAttr[0].end {
-- z.attr = append(z.attr, z.pendingAttr)
-- }
-- if z.skipWhiteSpace(); z.err != nil {
-- break
-- }
-- }
--}
--
--// readTagName sets z.data to the "div" in "<div k=v>". The reader (z.raw.end)
--// is positioned such that the first byte of the tag name (the "d" in "<div")
--// has already been consumed.
--func (z *Tokenizer) readTagName() {
-- z.data.start = z.raw.end - 1
-- for {
-- c := z.readByte()
-- if z.err != nil {
-- z.data.end = z.raw.end
-- return
-- }
-- switch c {
-- case ' ', '\n', '\r', '\t', '\f':
-- z.data.end = z.raw.end - 1
-- return
-- case '/', '>':
-- z.raw.end--
-- z.data.end = z.raw.end
-- return
-- }
-- }
--}
--
--// readTagAttrKey sets z.pendingAttr[0] to the "k" in "<div k=v>".
--// Precondition: z.err == nil.
--func (z *Tokenizer) readTagAttrKey() {
-- z.pendingAttr[0].start = z.raw.end
-- for {
-- c := z.readByte()
-- if z.err != nil {
-- z.pendingAttr[0].end = z.raw.end
-- return
-- }
-- switch c {
-- case ' ', '\n', '\r', '\t', '\f', '/':
-- z.pendingAttr[0].end = z.raw.end - 1
-- return
-- case '=', '>':
-- z.raw.end--
-- z.pendingAttr[0].end = z.raw.end
-- return
-- }
-- }
--}
--
--// readTagAttrVal sets z.pendingAttr[1] to the "v" in "<div k=v>".
--func (z *Tokenizer) readTagAttrVal() {
-- z.pendingAttr[1].start = z.raw.end
-- z.pendingAttr[1].end = z.raw.end
-- if z.skipWhiteSpace(); z.err != nil {
-- return
-- }
-- c := z.readByte()
-- if z.err != nil {
-- return
-- }
-- if c != '=' {
-- z.raw.end--
-- return
-- }
-- if z.skipWhiteSpace(); z.err != nil {
-- return
-- }
-- quote := z.readByte()
-- if z.err != nil {
-- return
-- }
-- switch quote {
-- case '>':
-- z.raw.end--
-- return
--
-- case '\'', '"':
-- z.pendingAttr[1].start = z.raw.end
-- for {
-- c := z.readByte()
-- if z.err != nil {
-- z.pendingAttr[1].end = z.raw.end
-- return
-- }
-- if c == quote {
-- z.pendingAttr[1].end = z.raw.end - 1
-- return
-- }
-- }
--
-- default:
-- z.pendingAttr[1].start = z.raw.end - 1
-- for {
-- c := z.readByte()
-- if z.err != nil {
-- z.pendingAttr[1].end = z.raw.end
-- return
-- }
-- switch c {
-- case ' ', '\n', '\r', '\t', '\f':
-- z.pendingAttr[1].end = z.raw.end - 1
-- return
-- case '>':
-- z.raw.end--
-- z.pendingAttr[1].end = z.raw.end
-- return
-- }
-- }
-- }
--}
--
--// Next scans the next token and returns its type.
--func (z *Tokenizer) Next() TokenType {
-- z.raw.start = z.raw.end
-- z.data.start = z.raw.end
-- z.data.end = z.raw.end
-- if z.err != nil {
-- z.tt = ErrorToken
-- return z.tt
-- }
-- if z.rawTag != "" {
-- if z.rawTag == "plaintext" {
-- // Read everything up to EOF.
-- for z.err == nil {
-- z.readByte()
-- }
-- z.data.end = z.raw.end
-- z.textIsRaw = true
-- } else {
-- z.readRawOrRCDATA()
-- }
-- if z.data.end > z.data.start {
-- z.tt = TextToken
-- z.convertNUL = true
-- return z.tt
-- }
-- }
-- z.textIsRaw = false
-- z.convertNUL = false
--
--loop:
-- for {
-- c := z.readByte()
-- if z.err != nil {
-- break loop
-- }
-- if c != '<' {
-- continue loop
-- }
--
-- // Check if the '<' we have just read is part of a tag, comment
-- // or doctype. If not, it's part of the accumulated text token.
-- c = z.readByte()
-- if z.err != nil {
-- break loop
-- }
-- var tokenType TokenType
-- switch {
-- case 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z':
-- tokenType = StartTagToken
-- case c == '/':
-- tokenType = EndTagToken
-- case c == '!' || c == '?':
-- // We use CommentToken to mean any of "<!--actual comments-->",
-- // "<!DOCTYPE declarations>" and "<?xml processing instructions?>".
-- tokenType = CommentToken
-- default:
-- // Reconsume the current character.
-- z.raw.end--
-- continue
-- }
--
-- // We have a non-text token, but we might have accumulated some text
-- // before that. If so, we return the text first, and return the non-
-- // text token on the subsequent call to Next.
-- if x := z.raw.end - len("<a"); z.raw.start < x {
-- z.raw.end = x
-- z.data.end = x
-- z.tt = TextToken
-- return z.tt
-- }
-- switch tokenType {
-- case StartTagToken:
-- z.tt = z.readStartTag()
-- return z.tt
-- case EndTagToken:
-- c = z.readByte()
-- if z.err != nil {
-- break loop
-- }
-- if c == '>' {
-- // "</>" does not generate a token at all. Generate an empty comment
-- // to allow passthrough clients to pick up the data using Raw.
-- // Reset the tokenizer state and start again.
-- z.tt = CommentToken
-- return z.tt
-- }
-- if 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' {
-- z.readTag(false)
-- if z.err != nil {
-- z.tt = ErrorToken
-- } else {
-- z.tt = EndTagToken
-- }
-- return z.tt
-- }
-- z.raw.end--
-- z.readUntilCloseAngle()
-- z.tt = CommentToken
-- return z.tt
-- case CommentToken:
-- if c == '!' {
-- z.tt = z.readMarkupDeclaration()
-- return z.tt
-- }
-- z.raw.end--
-- z.readUntilCloseAngle()
-- z.tt = CommentToken
-- return z.tt
-- }
-- }
-- if z.raw.start < z.raw.end {
-- z.data.end = z.raw.end
-- z.tt = TextToken
-- return z.tt
-- }
-- z.tt = ErrorToken
-- return z.tt
--}
--
--// Raw returns the unmodified text of the current token. Calling Next, Token,
--// Text, TagName or TagAttr may change the contents of the returned slice.
--func (z *Tokenizer) Raw() []byte {
-- return z.buf[z.raw.start:z.raw.end]
--}
--
--// convertNewlines converts "\r" and "\r\n" in s to "\n".
--// The conversion happens in place, but the resulting slice may be shorter.
--func convertNewlines(s []byte) []byte {
-- for i, c := range s {
-- if c != '\r' {
-- continue
-- }
--
-- src := i + 1
-- if src >= len(s) || s[src] != '\n' {
-- s[i] = '\n'
-- continue
-- }
--
-- dst := i
-- for src < len(s) {
-- if s[src] == '\r' {
-- if src+1 < len(s) && s[src+1] == '\n' {
-- src++
-- }
-- s[dst] = '\n'
-- } else {
-- s[dst] = s[src]
-- }
-- src++
-- dst++
-- }
-- return s[:dst]
-- }
-- return s
--}
--
--var (
-- nul = []byte("\x00")
-- replacement = []byte("\ufffd")
--)
--
--// Text returns the unescaped text of a text, comment or doctype token. The
--// contents of the returned slice may change on the next call to Next.
--func (z *Tokenizer) Text() []byte {
-- switch z.tt {
-- case TextToken, CommentToken, DoctypeToken:
-- s := z.buf[z.data.start:z.data.end]
-- z.data.start = z.raw.end
-- z.data.end = z.raw.end
-- s = convertNewlines(s)
-- if (z.convertNUL || z.tt == CommentToken) && bytes.Contains(s, nul) {
-- s = bytes.Replace(s, nul, replacement, -1)
-- }
-- if !z.textIsRaw {
-- s = unescape(s, false)
-- }
-- return s
-- }
-- return nil
--}
--
--// TagName returns the lower-cased name of a tag token (the `img` out of
--// `<IMG SRC="foo">`) and whether the tag has attributes.
--// The contents of the returned slice may change on the next call to Next.
--func (z *Tokenizer) TagName() (name []byte, hasAttr bool) {
-- if z.data.start < z.data.end {
-- switch z.tt {
-- case StartTagToken, EndTagToken, SelfClosingTagToken:
-- s := z.buf[z.data.start:z.data.end]
-- z.data.start = z.raw.end
-- z.data.end = z.raw.end
-- return lower(s), z.nAttrReturned < len(z.attr)
-- }
-- }
-- return nil, false
--}
--
--// TagAttr returns the lower-cased key and unescaped value of the next unparsed
--// attribute for the current tag token and whether there are more attributes.
--// The contents of the returned slices may change on the next call to Next.
--func (z *Tokenizer) TagAttr() (key, val []byte, moreAttr bool) {
-- if z.nAttrReturned < len(z.attr) {
-- switch z.tt {
-- case StartTagToken, SelfClosingTagToken:
-- x := z.attr[z.nAttrReturned]
-- z.nAttrReturned++
-- key = z.buf[x[0].start:x[0].end]
-- val = z.buf[x[1].start:x[1].end]
-- return lower(key), unescape(convertNewlines(val), true), z.nAttrReturned < len(z.attr)
-- }
-- }
-- return nil, nil, false
--}
--
--// Token returns the next Token. The result's Data and Attr values remain valid
--// after subsequent Next calls.
--func (z *Tokenizer) Token() Token {
-- t := Token{Type: z.tt}
-- switch z.tt {
-- case TextToken, CommentToken, DoctypeToken:
-- t.Data = string(z.Text())
-- case StartTagToken, SelfClosingTagToken, EndTagToken:
-- name, moreAttr := z.TagName()
-- for moreAttr {
-- var key, val []byte
-- key, val, moreAttr = z.TagAttr()
-- t.Attr = append(t.Attr, Attribute{"", atom.String(key), string(val)})
-- }
-- if a := atom.Lookup(name); a != 0 {
-- t.DataAtom, t.Data = a, a.String()
-- } else {
-- t.DataAtom, t.Data = 0, string(name)
-- }
-- }
-- return t
--}
--
--// SetMaxBuf sets a limit on the amount of data buffered during tokenization.
--// A value of 0 means unlimited.
--func (z *Tokenizer) SetMaxBuf(n int) {
-- z.maxBuf = n
--}
--
--// NewTokenizer returns a new HTML Tokenizer for the given Reader.
--// The input is assumed to be UTF-8 encoded.
--func NewTokenizer(r io.Reader) *Tokenizer {
-- return NewTokenizerFragment(r, "")
--}
--
--// NewTokenizerFragment returns a new HTML Tokenizer for the given Reader, for
--// tokenizing an existing element's InnerHTML fragment. contextTag is that
--// element's tag, such as "div" or "iframe".
--//
--// For example, how the InnerHTML "a<b" is tokenized depends on whether it is
--// for a <p> tag or a <script> tag.
--//
--// The input is assumed to be UTF-8 encoded.
--func NewTokenizerFragment(r io.Reader, contextTag string) *Tokenizer {
-- z := &Tokenizer{
-- r: r,
-- buf: make([]byte, 0, 4096),
-- }
-- if contextTag != "" {
-- switch s := strings.ToLower(contextTag); s {
-- case "iframe", "noembed", "noframes", "noscript", "plaintext", "script", "style", "title", "textarea", "xmp":
-- z.rawTag = s
-- }
-- }
-- return z
--}
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/token_test.go b/Godeps/_workspace/src/code.google.com/p/go.net/html/token_test.go
-deleted file mode 100644
-index f6988a8..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/html/token_test.go
-+++ /dev/null
-@@ -1,748 +0,0 @@
--// Copyright 2010 The Go Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--package html
--
--import (
-- "bytes"
-- "io"
-- "io/ioutil"
-- "reflect"
-- "runtime"
-- "strings"
-- "testing"
--)
--
--type tokenTest struct {
-- // A short description of the test case.
-- desc string
-- // The HTML to parse.
-- html string
-- // The string representations of the expected tokens, joined by '$'.
-- golden string
--}
--
--var tokenTests = []tokenTest{
-- {
-- "empty",
-- "",
-- "",
-- },
-- // A single text node. The tokenizer should not break text nodes on whitespace,
-- // nor should it normalize whitespace within a text node.
-- {
-- "text",
-- "foo bar",
-- "foo bar",
-- },
-- // An entity.
-- {
-- "entity",
-- "one < two",
-- "one < two",
-- },
-- // A start, self-closing and end tag. The tokenizer does not care if the start
-- // and end tokens don't match; that is the job of the parser.
-- {
-- "tags",
-- "<a>b<c/>d</e>",
-- "<a>$b$<c/>$d$</e>",
-- },
-- // Angle brackets that aren't a tag.
-- {
-- "not a tag #0",
-- "<",
-- "<",
-- },
-- {
-- "not a tag #1",
-- "</",
-- "</",
-- },
-- {
-- "not a tag #2",
-- "</>",
-- "<!---->",
-- },
-- {
-- "not a tag #3",
-- "a</>b",
-- "a$<!---->$b",
-- },
-- {
-- "not a tag #4",
-- "</ >",
-- "<!-- -->",
-- },
-- {
-- "not a tag #5",
-- "</.",
-- "<!--.-->",
-- },
-- {
-- "not a tag #6",
-- "</.>",
-- "<!--.-->",
-- },
-- {
-- "not a tag #7",
-- "a < b",
-- "a < b",
-- },
-- {
-- "not a tag #8",
-- "<.>",
-- "<.>",
-- },
-- {
-- "not a tag #9",
-- "a<<<b>>>c",
-- "a<<$<b>$>>c",
-- },
-- {
-- "not a tag #10",
-- "if x<0 and y < 0 then x*y>0",
-- "if x<0 and y < 0 then x*y>0",
-- },
-- {
-- "not a tag #11",
-- "<<p>",
-- "<$<p>",
-- },
-- // EOF in a tag name.
-- {
-- "tag name eof #0",
-- "<a",
-- "",
-- },
-- {
-- "tag name eof #1",
-- "<a ",
-- "",
-- },
-- {
-- "tag name eof #2",
-- "a<b",
-- "a",
-- },
-- {
-- "tag name eof #3",
-- "<a><b",
-- "<a>",
-- },
-- {
-- "tag name eof #4",
-- `<a x`,
-- ``,
-- },
-- // Some malformed tags that are missing a '>'.
-- {
-- "malformed tag #0",
-- `<p</p>`,
-- `<p< p="">`,
-- },
-- {
-- "malformed tag #1",
-- `<p </p>`,
-- `<p <="" p="">`,
-- },
-- {
-- "malformed tag #2",
-- `<p id`,
-- ``,
-- },
-- {
-- "malformed tag #3",
-- `<p id=`,
-- ``,
-- },
-- {
-- "malformed tag #4",
-- `<p id=>`,
-- `<p id="">`,
-- },
-- {
-- "malformed tag #5",
-- `<p id=0`,
-- ``,
-- },
-- {
-- "malformed tag #6",
-- `<p id=0</p>`,
-- `<p id="0</p">`,
-- },
-- {
-- "malformed tag #7",
-- `<p id="0</p>`,
-- ``,
-- },
-- {
-- "malformed tag #8",
-- `<p id="0"</p>`,
-- `<p id="0" <="" p="">`,
-- },
-- {
-- "malformed tag #9",
-- `<p></p id`,
-- `<p>`,
-- },
-- // Raw text and RCDATA.
-- {
-- "basic raw text",
-- "<script><a></b></script>",
-- "<script>$<a></b>$</script>",
-- },
-- {
-- "unfinished script end tag",
-- "<SCRIPT>a</SCR",
-- "<script>$a</SCR",
-- },
-- {
-- "broken script end tag",
-- "<SCRIPT>a</SCR ipt>",
-- "<script>$a</SCR ipt>",
-- },
-- {
-- "EOF in script end tag",
-- "<SCRIPT>a</SCRipt",
-- "<script>$a</SCRipt",
-- },
-- {
-- "scriptx end tag",
-- "<SCRIPT>a</SCRiptx",
-- "<script>$a</SCRiptx",
-- },
-- {
-- "' ' completes script end tag",
-- "<SCRIPT>a</SCRipt ",
-- "<script>$a",
-- },
-- {
-- "'>' completes script end tag",
-- "<SCRIPT>a</SCRipt>",
-- "<script>$a$</script>",
-- },
-- {
-- "self-closing script end tag",
-- "<SCRIPT>a</SCRipt/>",
-- "<script>$a$</script>",
-- },
-- {
-- "nested script tag",
-- "<SCRIPT>a</SCRipt<script>",
-- "<script>$a</SCRipt<script>",
-- },
-- {
-- "script end tag after unfinished",
-- "<SCRIPT>a</SCRipt</script>",
-- "<script>$a</SCRipt$</script>",
-- },
-- {
-- "script/style mismatched tags",
-- "<script>a</style>",
-- "<script>$a</style>",
-- },
-- {
-- "style element with entity",
-- "<style>'",
-- "<style>$&apos;",
-- },
-- {
-- "textarea with tag",
-- "<textarea><div></textarea>",
-- "<textarea>$<div>$</textarea>",
-- },
-- {
-- "title with tag and entity",
-- "<title><b>K&R C</b></title>",
-- "<title>$<b>K&R C</b>$</title>",
-- },
-- // DOCTYPE tests.
-- {
-- "Proper DOCTYPE",
-- "<!DOCTYPE html>",
-- "<!DOCTYPE html>",
-- },
-- {
-- "DOCTYPE with no space",
-- "<!doctypehtml>",
-- "<!DOCTYPE html>",
-- },
-- {
-- "DOCTYPE with two spaces",
-- "<!doctype html>",
-- "<!DOCTYPE html>",
-- },
-- {
-- "looks like DOCTYPE but isn't",
-- "<!DOCUMENT html>",
-- "<!--DOCUMENT html-->",
-- },
-- {
-- "DOCTYPE at EOF",
-- "<!DOCtype",
-- "<!DOCTYPE >",
-- },
-- // XML processing instructions.
-- {
-- "XML processing instruction",
-- "<?xml?>",
-- "<!--?xml?-->",
-- },
-- // Comments.
-- {
-- "comment0",
-- "abc<b><!-- skipme --></b>def",
-- "abc$<b>$<!-- skipme -->$</b>$def",
-- },
-- {
-- "comment1",
-- "a<!-->z",
-- "a$<!---->$z",
-- },
-- {
-- "comment2",
-- "a<!--->z",
-- "a$<!---->$z",
-- },
-- {
-- "comment3",
-- "a<!--x>-->z",
-- "a$<!--x>-->$z",
-- },
-- {
-- "comment4",
-- "a<!--x->-->z",
-- "a$<!--x->-->$z",
-- },
-- {
-- "comment5",
-- "a<!>z",
-- "a$<!---->$z",
-- },
-- {
-- "comment6",
-- "a<!->z",
-- "a$<!----->$z",
-- },
-- {
-- "comment7",
-- "a<!---<>z",
-- "a$<!---<>z-->",
-- },
-- {
-- "comment8",
-- "a<!--z",
-- "a$<!--z-->",
-- },
-- {
-- "comment9",
-- "a<!--z-",
-- "a$<!--z-->",
-- },
-- {
-- "comment10",
-- "a<!--z--",
-- "a$<!--z-->",
-- },
-- {
-- "comment11",
-- "a<!--z---",
-- "a$<!--z--->",
-- },
-- {
-- "comment12",
-- "a<!--z----",
-- "a$<!--z---->",
-- },
-- {
-- "comment13",
-- "a<!--x--!>z",
-- "a$<!--x-->$z",
-- },
-- // An attribute with a backslash.
-- {
-- "backslash",
-- `<p id="a\"b">`,
-- `<p id="a\" b"="">`,
-- },
-- // Entities, tag name and attribute key lower-casing, and whitespace
-- // normalization within a tag.
-- {
-- "tricky",
-- "<p \t\n iD=\"a"B\" foo=\"bar\"><EM>te<&;xt</em></p>",
-- `<p id="a"B" foo="bar">$<em>$te<&;xt$</em>$</p>`,
-- },
-- // A nonexistent entity. Tokenizing and converting back to a string should
-- // escape the "&" to become "&".
-- {
-- "noSuchEntity",
-- `<a b="c&noSuchEntity;d"><&alsoDoesntExist;&`,
-- `<a b="c&noSuchEntity;d">$<&alsoDoesntExist;&`,
-- },
-- {
-- "entity without semicolon",
-- `¬it;∉<a b="q=z&=5¬ice=hello¬=world">`,
-- `¬it;∉$<a b="q=z&amp=5&notice=hello¬=world">`,
-- },
-- {
-- "entity with digits",
-- "½",
-- "½",
-- },
-- // Attribute tests:
-- // http://dev.w3.org/html5/spec/Overview.html#attributes-0
-- {
-- "Empty attribute",
-- `<input disabled FOO>`,
-- `<input disabled="" foo="">`,
-- },
-- {
-- "Empty attribute, whitespace",
-- `<input disabled FOO >`,
-- `<input disabled="" foo="">`,
-- },
-- {
-- "Unquoted attribute value",
-- `<input value=yes FOO=BAR>`,
-- `<input value="yes" foo="BAR">`,
-- },
-- {
-- "Unquoted attribute value, spaces",
-- `<input value = yes FOO = BAR>`,
-- `<input value="yes" foo="BAR">`,
-- },
-- {
-- "Unquoted attribute value, trailing space",
-- `<input value=yes FOO=BAR >`,
-- `<input value="yes" foo="BAR">`,
-- },
-- {
-- "Single-quoted attribute value",
-- `<input value='yes' FOO='BAR'>`,
-- `<input value="yes" foo="BAR">`,
-- },
-- {
-- "Single-quoted attribute value, trailing space",
-- `<input value='yes' FOO='BAR' >`,
-- `<input value="yes" foo="BAR">`,
-- },
-- {
-- "Double-quoted attribute value",
-- `<input value="I'm an attribute" FOO="BAR">`,
-- `<input value="I'm an attribute" foo="BAR">`,
-- },
-- {
-- "Attribute name characters",
-- `<meta http-equiv="content-type">`,
-- `<meta http-equiv="content-type">`,
-- },
-- {
-- "Mixed attributes",
-- `a<P V="0 1" w='2' X=3 y>z`,
-- `a$<p v="0 1" w="2" x="3" y="">$z`,
-- },
-- {
-- "Attributes with a solitary single quote",
-- `<p id=can't><p id=won't>`,
-- `<p id="can't">$<p id="won't">`,
-- },
--}
--
--func TestTokenizer(t *testing.T) {
--loop:
-- for _, tt := range tokenTests {
-- z := NewTokenizer(strings.NewReader(tt.html))
-- if tt.golden != "" {
-- for i, s := range strings.Split(tt.golden, "$") {
-- if z.Next() == ErrorToken {
-- t.Errorf("%s token %d: want %q got error %v", tt.desc, i, s, z.Err())
-- continue loop
-- }
-- actual := z.Token().String()
-- if s != actual {
-- t.Errorf("%s token %d: want %q got %q", tt.desc, i, s, actual)
-- continue loop
-- }
-- }
-- }
-- z.Next()
-- if z.Err() != io.EOF {
-- t.Errorf("%s: want EOF got %q", tt.desc, z.Err())
-- }
-- }
--}
--
--func TestMaxBuffer(t *testing.T) {
-- // Exceeding the maximum buffer size generates ErrBufferExceeded.
-- z := NewTokenizer(strings.NewReader("<" + strings.Repeat("t", 10)))
-- z.SetMaxBuf(5)
-- tt := z.Next()
-- if got, want := tt, ErrorToken; got != want {
-- t.Fatalf("token type: got: %v want: %v", got, want)
-- }
-- if got, want := z.Err(), ErrBufferExceeded; got != want {
-- t.Errorf("error type: got: %v want: %v", got, want)
-- }
-- if got, want := string(z.Raw()), "<tttt"; got != want {
-- t.Fatalf("buffered before overflow: got: %q want: %q", got, want)
-- }
--}
--
--func TestMaxBufferReconstruction(t *testing.T) {
-- // Exceeding the maximum buffer size at any point while tokenizing permits
-- // reconstructing the original input.
--tests:
-- for _, test := range tokenTests {
-- for maxBuf := 1; ; maxBuf++ {
-- r := strings.NewReader(test.html)
-- z := NewTokenizer(r)
-- z.SetMaxBuf(maxBuf)
-- var tokenized bytes.Buffer
-- for {
-- tt := z.Next()
-- tokenized.Write(z.Raw())
-- if tt == ErrorToken {
-- if err := z.Err(); err != io.EOF && err != ErrBufferExceeded {
-- t.Errorf("%s: unexpected error: %v", test.desc, err)
-- }
-- break
-- }
-- }
-- // Anything tokenized along with untokenized input or data left in the reader.
-- assembled, err := ioutil.ReadAll(io.MultiReader(&tokenized, bytes.NewReader(z.Buffered()), r))
-- if err != nil {
-- t.Errorf("%s: ReadAll: %v", test.desc, err)
-- continue tests
-- }
-- if got, want := string(assembled), test.html; got != want {
-- t.Errorf("%s: reassembled html:\n got: %q\nwant: %q", test.desc, got, want)
-- continue tests
-- }
-- // EOF indicates that we completed tokenization and hence found the max
-- // maxBuf that generates ErrBufferExceeded, so continue to the next test.
-- if z.Err() == io.EOF {
-- break
-- }
-- } // buffer sizes
-- } // tests
--}
--
--func TestPassthrough(t *testing.T) {
-- // Accumulating the raw output for each parse event should reconstruct the
-- // original input.
-- for _, test := range tokenTests {
-- z := NewTokenizer(strings.NewReader(test.html))
-- var parsed bytes.Buffer
-- for {
-- tt := z.Next()
-- parsed.Write(z.Raw())
-- if tt == ErrorToken {
-- break
-- }
-- }
-- if got, want := parsed.String(), test.html; got != want {
-- t.Errorf("%s: parsed output:\n got: %q\nwant: %q", test.desc, got, want)
-- }
-- }
--}
--
--func TestBufAPI(t *testing.T) {
-- s := "0<a>1</a>2<b>3<a>4<a>5</a>6</b>7</a>8<a/>9"
-- z := NewTokenizer(bytes.NewBufferString(s))
-- var result bytes.Buffer
-- depth := 0
--loop:
-- for {
-- tt := z.Next()
-- switch tt {
-- case ErrorToken:
-- if z.Err() != io.EOF {
-- t.Error(z.Err())
-- }
-- break loop
-- case TextToken:
-- if depth > 0 {
-- result.Write(z.Text())
-- }
-- case StartTagToken, EndTagToken:
-- tn, _ := z.TagName()
-- if len(tn) == 1 && tn[0] == 'a' {
-- if tt == StartTagToken {
-- depth++
-- } else {
-- depth--
-- }
-- }
-- }
-- }
-- u := "14567"
-- v := string(result.Bytes())
-- if u != v {
-- t.Errorf("TestBufAPI: want %q got %q", u, v)
-- }
--}
--
--func TestConvertNewlines(t *testing.T) {
-- testCases := map[string]string{
-- "Mac\rDOS\r\nUnix\n": "Mac\nDOS\nUnix\n",
-- "Unix\nMac\rDOS\r\n": "Unix\nMac\nDOS\n",
-- "DOS\r\nDOS\r\nDOS\r\n": "DOS\nDOS\nDOS\n",
-- "": "",
-- "\n": "\n",
-- "\n\r": "\n\n",
-- "\r": "\n",
-- "\r\n": "\n",
-- "\r\n\n": "\n\n",
-- "\r\n\r": "\n\n",
-- "\r\n\r\n": "\n\n",
-- "\r\r": "\n\n",
-- "\r\r\n": "\n\n",
-- "\r\r\n\n": "\n\n\n",
-- "\r\r\r\n": "\n\n\n",
-- "\r \n": "\n \n",
-- "xyz": "xyz",
-- }
-- for in, want := range testCases {
-- if got := string(convertNewlines([]byte(in))); got != want {
-- t.Errorf("input %q: got %q, want %q", in, got, want)
-- }
-- }
--}
--
--func TestReaderEdgeCases(t *testing.T) {
-- const s = "<p>An io.Reader can return (0, nil) or (n, io.EOF).</p>"
-- testCases := []io.Reader{
-- &zeroOneByteReader{s: s},
-- &eofStringsReader{s: s},
-- &stuckReader{},
-- }
-- for i, tc := range testCases {
-- got := []TokenType{}
-- z := NewTokenizer(tc)
-- for {
-- tt := z.Next()
-- if tt == ErrorToken {
-- break
-- }
-- got = append(got, tt)
-- }
-- if err := z.Err(); err != nil && err != io.EOF {
-- if err != io.ErrNoProgress {
-- t.Errorf("i=%d: %v", i, err)
-- }
-- continue
-- }
-- want := []TokenType{
-- StartTagToken,
-- TextToken,
-- EndTagToken,
-- }
-- if !reflect.DeepEqual(got, want) {
-- t.Errorf("i=%d: got %v, want %v", i, got, want)
-- continue
-- }
-- }
--}
--
--// zeroOneByteReader is like a strings.Reader that alternates between
--// returning 0 bytes and 1 byte at a time.
--type zeroOneByteReader struct {
-- s string
-- n int
--}
--
--func (r *zeroOneByteReader) Read(p []byte) (int, error) {
-- if len(p) == 0 {
-- return 0, nil
-- }
-- if len(r.s) == 0 {
-- return 0, io.EOF
-- }
-- r.n++
-- if r.n%2 != 0 {
-- return 0, nil
-- }
-- p[0], r.s = r.s[0], r.s[1:]
-- return 1, nil
--}
--
--// eofStringsReader is like a strings.Reader but can return an (n, err) where
--// n > 0 && err != nil.
--type eofStringsReader struct {
-- s string
--}
--
--func (r *eofStringsReader) Read(p []byte) (int, error) {
-- n := copy(p, r.s)
-- r.s = r.s[n:]
-- if r.s != "" {
-- return n, nil
-- }
-- return n, io.EOF
--}
--
--// stuckReader is an io.Reader that always returns no data and no error.
--type stuckReader struct{}
--
--func (*stuckReader) Read(p []byte) (int, error) {
-- return 0, nil
--}
--
--const (
-- rawLevel = iota
-- lowLevel
-- highLevel
--)
--
--func benchmarkTokenizer(b *testing.B, level int) {
-- buf, err := ioutil.ReadFile("testdata/go1.html")
-- if err != nil {
-- b.Fatalf("could not read testdata/go1.html: %v", err)
-- }
-- b.SetBytes(int64(len(buf)))
-- runtime.GC()
-- b.ReportAllocs()
-- b.ResetTimer()
-- for i := 0; i < b.N; i++ {
-- z := NewTokenizer(bytes.NewBuffer(buf))
-- for {
-- tt := z.Next()
-- if tt == ErrorToken {
-- if err := z.Err(); err != nil && err != io.EOF {
-- b.Fatalf("tokenizer error: %v", err)
-- }
-- break
-- }
-- switch level {
-- case rawLevel:
-- // Calling z.Raw just returns the raw bytes of the token. It does
-- // not unescape < to <, or lower-case tag names and attribute keys.
-- z.Raw()
-- case lowLevel:
-- // Caling z.Text, z.TagName and z.TagAttr returns []byte values
-- // whose contents may change on the next call to z.Next.
-- switch tt {
-- case TextToken, CommentToken, DoctypeToken:
-- z.Text()
-- case StartTagToken, SelfClosingTagToken:
-- _, more := z.TagName()
-- for more {
-- _, _, more = z.TagAttr()
-- }
-- case EndTagToken:
-- z.TagName()
-- }
-- case highLevel:
-- // Calling z.Token converts []byte values to strings whose validity
-- // extend beyond the next call to z.Next.
-- z.Token()
-- }
-- }
-- }
--}
--
--func BenchmarkRawLevelTokenizer(b *testing.B) { benchmarkTokenizer(b, rawLevel) }
--func BenchmarkLowLevelTokenizer(b *testing.B) { benchmarkTokenizer(b, lowLevel) }
--func BenchmarkHighLevelTokenizer(b *testing.B) { benchmarkTokenizer(b, highLevel) }
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/websocket/client.go b/Godeps/_workspace/src/code.google.com/p/go.net/websocket/client.go
-deleted file mode 100644
-index a861bb9..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/websocket/client.go
-+++ /dev/null
-@@ -1,98 +0,0 @@
--// Copyright 2009 The Go Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--package websocket
--
--import (
-- "bufio"
-- "crypto/tls"
-- "io"
-- "net"
-- "net/http"
-- "net/url"
--)
--
--// DialError is an error that occurs while dialling a websocket server.
--type DialError struct {
-- *Config
-- Err error
--}
--
--func (e *DialError) Error() string {
-- return "websocket.Dial " + e.Config.Location.String() + ": " + e.Err.Error()
--}
--
--// NewConfig creates a new WebSocket config for client connection.
--func NewConfig(server, origin string) (config *Config, err error) {
-- config = new(Config)
-- config.Version = ProtocolVersionHybi13
-- config.Location, err = url.ParseRequestURI(server)
-- if err != nil {
-- return
-- }
-- config.Origin, err = url.ParseRequestURI(origin)
-- if err != nil {
-- return
-- }
-- config.Header = http.Header(make(map[string][]string))
-- return
--}
--
--// NewClient creates a new WebSocket client connection over rwc.
--func NewClient(config *Config, rwc io.ReadWriteCloser) (ws *Conn, err error) {
-- br := bufio.NewReader(rwc)
-- bw := bufio.NewWriter(rwc)
-- err = hybiClientHandshake(config, br, bw)
-- if err != nil {
-- return
-- }
-- buf := bufio.NewReadWriter(br, bw)
-- ws = newHybiClientConn(config, buf, rwc)
-- return
--}
--
--// Dial opens a new client connection to a WebSocket.
--func Dial(url_, protocol, origin string) (ws *Conn, err error) {
-- config, err := NewConfig(url_, origin)
-- if err != nil {
-- return nil, err
-- }
-- if protocol != "" {
-- config.Protocol = []string{protocol}
-- }
-- return DialConfig(config)
--}
--
--// DialConfig opens a new client connection to a WebSocket with a config.
--func DialConfig(config *Config) (ws *Conn, err error) {
-- var client net.Conn
-- if config.Location == nil {
-- return nil, &DialError{config, ErrBadWebSocketLocation}
-- }
-- if config.Origin == nil {
-- return nil, &DialError{config, ErrBadWebSocketOrigin}
-- }
-- switch config.Location.Scheme {
-- case "ws":
-- client, err = net.Dial("tcp", config.Location.Host)
--
-- case "wss":
-- client, err = tls.Dial("tcp", config.Location.Host, config.TlsConfig)
--
-- default:
-- err = ErrBadScheme
-- }
-- if err != nil {
-- goto Error
-- }
--
-- ws, err = NewClient(config, client)
-- if err != nil {
-- goto Error
-- }
-- return
--
--Error:
-- return nil, &DialError{config, err}
--}
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/websocket/exampledial_test.go b/Godeps/_workspace/src/code.google.com/p/go.net/websocket/exampledial_test.go
-deleted file mode 100644
-index 777a668..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/websocket/exampledial_test.go
-+++ /dev/null
-@@ -1,31 +0,0 @@
--// Copyright 2012 The Go Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--package websocket_test
--
--import (
-- "fmt"
-- "log"
--
-- "code.google.com/p/go.net/websocket"
--)
--
--// This example demonstrates a trivial client.
--func ExampleDial() {
-- origin := "http://localhost/"
-- url := "ws://localhost:12345/ws"
-- ws, err := websocket.Dial(url, "", origin)
-- if err != nil {
-- log.Fatal(err)
-- }
-- if _, err := ws.Write([]byte("hello, world!\n")); err != nil {
-- log.Fatal(err)
-- }
-- var msg = make([]byte, 512)
-- var n int
-- if n, err = ws.Read(msg); err != nil {
-- log.Fatal(err)
-- }
-- fmt.Printf("Received: %s.\n", msg[:n])
--}
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/websocket/examplehandler_test.go b/Godeps/_workspace/src/code.google.com/p/go.net/websocket/examplehandler_test.go
-deleted file mode 100644
-index 47b0bb9..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/websocket/examplehandler_test.go
-+++ /dev/null
-@@ -1,26 +0,0 @@
--// Copyright 2012 The Go Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--package websocket_test
--
--import (
-- "io"
-- "net/http"
--
-- "code.google.com/p/go.net/websocket"
--)
--
--// Echo the data received on the WebSocket.
--func EchoServer(ws *websocket.Conn) {
-- io.Copy(ws, ws)
--}
--
--// This example demonstrates a trivial echo server.
--func ExampleHandler() {
-- http.Handle("/echo", websocket.Handler(EchoServer))
-- err := http.ListenAndServe(":12345", nil)
-- if err != nil {
-- panic("ListenAndServe: " + err.Error())
-- }
--}
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/websocket/hybi.go b/Godeps/_workspace/src/code.google.com/p/go.net/websocket/hybi.go
-deleted file mode 100644
-index f8c0b2e..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/websocket/hybi.go
-+++ /dev/null
-@@ -1,564 +0,0 @@
--// Copyright 2011 The Go Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--package websocket
--
--// This file implements a protocol of hybi draft.
--// http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-17
--
--import (
-- "bufio"
-- "bytes"
-- "crypto/rand"
-- "crypto/sha1"
-- "encoding/base64"
-- "encoding/binary"
-- "fmt"
-- "io"
-- "io/ioutil"
-- "net/http"
-- "net/url"
-- "strings"
--)
--
--const (
-- websocketGUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"
--
-- closeStatusNormal = 1000
-- closeStatusGoingAway = 1001
-- closeStatusProtocolError = 1002
-- closeStatusUnsupportedData = 1003
-- closeStatusFrameTooLarge = 1004
-- closeStatusNoStatusRcvd = 1005
-- closeStatusAbnormalClosure = 1006
-- closeStatusBadMessageData = 1007
-- closeStatusPolicyViolation = 1008
-- closeStatusTooBigData = 1009
-- closeStatusExtensionMismatch = 1010
--
-- maxControlFramePayloadLength = 125
--)
--
--var (
-- ErrBadMaskingKey = &ProtocolError{"bad masking key"}
-- ErrBadPongMessage = &ProtocolError{"bad pong message"}
-- ErrBadClosingStatus = &ProtocolError{"bad closing status"}
-- ErrUnsupportedExtensions = &ProtocolError{"unsupported extensions"}
-- ErrNotImplemented = &ProtocolError{"not implemented"}
--
-- handshakeHeader = map[string]bool{
-- "Host": true,
-- "Upgrade": true,
-- "Connection": true,
-- "Sec-Websocket-Key": true,
-- "Sec-Websocket-Origin": true,
-- "Sec-Websocket-Version": true,
-- "Sec-Websocket-Protocol": true,
-- "Sec-Websocket-Accept": true,
-- }
--)
--
--// A hybiFrameHeader is a frame header as defined in hybi draft.
--type hybiFrameHeader struct {
-- Fin bool
-- Rsv [3]bool
-- OpCode byte
-- Length int64
-- MaskingKey []byte
--
-- data *bytes.Buffer
--}
--
--// A hybiFrameReader is a reader for hybi frame.
--type hybiFrameReader struct {
-- reader io.Reader
--
-- header hybiFrameHeader
-- pos int64
-- length int
--}
--
--func (frame *hybiFrameReader) Read(msg []byte) (n int, err error) {
-- n, err = frame.reader.Read(msg)
-- if err != nil {
-- return 0, err
-- }
-- if frame.header.MaskingKey != nil {
-- for i := 0; i < n; i++ {
-- msg[i] = msg[i] ^ frame.header.MaskingKey[frame.pos%4]
-- frame.pos++
-- }
-- }
-- return n, err
--}
--
--func (frame *hybiFrameReader) PayloadType() byte { return frame.header.OpCode }
--
--func (frame *hybiFrameReader) HeaderReader() io.Reader {
-- if frame.header.data == nil {
-- return nil
-- }
-- if frame.header.data.Len() == 0 {
-- return nil
-- }
-- return frame.header.data
--}
--
--func (frame *hybiFrameReader) TrailerReader() io.Reader { return nil }
--
--func (frame *hybiFrameReader) Len() (n int) { return frame.length }
--
--// A hybiFrameReaderFactory creates new frame reader based on its frame type.
--type hybiFrameReaderFactory struct {
-- *bufio.Reader
--}
--
--// NewFrameReader reads a frame header from the connection, and creates new reader for the frame.
--// See Section 5.2 Base Framing protocol for detail.
--// http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-17#section-5.2
--func (buf hybiFrameReaderFactory) NewFrameReader() (frame frameReader, err error) {
-- hybiFrame := new(hybiFrameReader)
-- frame = hybiFrame
-- var header []byte
-- var b byte
-- // First byte. FIN/RSV1/RSV2/RSV3/OpCode(4bits)
-- b, err = buf.ReadByte()
-- if err != nil {
-- return
-- }
-- header = append(header, b)
-- hybiFrame.header.Fin = ((header[0] >> 7) & 1) != 0
-- for i := 0; i < 3; i++ {
-- j := uint(6 - i)
-- hybiFrame.header.Rsv[i] = ((header[0] >> j) & 1) != 0
-- }
-- hybiFrame.header.OpCode = header[0] & 0x0f
--
-- // Second byte. Mask/Payload len(7bits)
-- b, err = buf.ReadByte()
-- if err != nil {
-- return
-- }
-- header = append(header, b)
-- mask := (b & 0x80) != 0
-- b &= 0x7f
-- lengthFields := 0
-- switch {
-- case b <= 125: // Payload length 7bits.
-- hybiFrame.header.Length = int64(b)
-- case b == 126: // Payload length 7+16bits
-- lengthFields = 2
-- case b == 127: // Payload length 7+64bits
-- lengthFields = 8
-- }
-- for i := 0; i < lengthFields; i++ {
-- b, err = buf.ReadByte()
-- if err != nil {
-- return
-- }
-- header = append(header, b)
-- hybiFrame.header.Length = hybiFrame.header.Length*256 + int64(b)
-- }
-- if mask {
-- // Masking key. 4 bytes.
-- for i := 0; i < 4; i++ {
-- b, err = buf.ReadByte()
-- if err != nil {
-- return
-- }
-- header = append(header, b)
-- hybiFrame.header.MaskingKey = append(hybiFrame.header.MaskingKey, b)
-- }
-- }
-- hybiFrame.reader = io.LimitReader(buf.Reader, hybiFrame.header.Length)
-- hybiFrame.header.data = bytes.NewBuffer(header)
-- hybiFrame.length = len(header) + int(hybiFrame.header.Length)
-- return
--}
--
--// A HybiFrameWriter is a writer for hybi frame.
--type hybiFrameWriter struct {
-- writer *bufio.Writer
--
-- header *hybiFrameHeader
--}
--
--func (frame *hybiFrameWriter) Write(msg []byte) (n int, err error) {
-- var header []byte
-- var b byte
-- if frame.header.Fin {
-- b |= 0x80
-- }
-- for i := 0; i < 3; i++ {
-- if frame.header.Rsv[i] {
-- j := uint(6 - i)
-- b |= 1 << j
-- }
-- }
-- b |= frame.header.OpCode
-- header = append(header, b)
-- if frame.header.MaskingKey != nil {
-- b = 0x80
-- } else {
-- b = 0
-- }
-- lengthFields := 0
-- length := len(msg)
-- switch {
-- case length <= 125:
-- b |= byte(length)
-- case length < 65536:
-- b |= 126
-- lengthFields = 2
-- default:
-- b |= 127
-- lengthFields = 8
-- }
-- header = append(header, b)
-- for i := 0; i < lengthFields; i++ {
-- j := uint((lengthFields - i - 1) * 8)
-- b = byte((length >> j) & 0xff)
-- header = append(header, b)
-- }
-- if frame.header.MaskingKey != nil {
-- if len(frame.header.MaskingKey) != 4 {
-- return 0, ErrBadMaskingKey
-- }
-- header = append(header, frame.header.MaskingKey...)
-- frame.writer.Write(header)
-- data := make([]byte, length)
-- for i := range data {
-- data[i] = msg[i] ^ frame.header.MaskingKey[i%4]
-- }
-- frame.writer.Write(data)
-- err = frame.writer.Flush()
-- return length, err
-- }
-- frame.writer.Write(header)
-- frame.writer.Write(msg)
-- err = frame.writer.Flush()
-- return length, err
--}
--
--func (frame *hybiFrameWriter) Close() error { return nil }
--
--type hybiFrameWriterFactory struct {
-- *bufio.Writer
-- needMaskingKey bool
--}
--
--func (buf hybiFrameWriterFactory) NewFrameWriter(payloadType byte) (frame frameWriter, err error) {
-- frameHeader := &hybiFrameHeader{Fin: true, OpCode: payloadType}
-- if buf.needMaskingKey {
-- frameHeader.MaskingKey, err = generateMaskingKey()
-- if err != nil {
-- return nil, err
-- }
-- }
-- return &hybiFrameWriter{writer: buf.Writer, header: frameHeader}, nil
--}
--
--type hybiFrameHandler struct {
-- conn *Conn
-- payloadType byte
--}
--
--func (handler *hybiFrameHandler) HandleFrame(frame frameReader) (r frameReader, err error) {
-- if handler.conn.IsServerConn() {
-- // The client MUST mask all frames sent to the server.
-- if frame.(*hybiFrameReader).header.MaskingKey == nil {
-- handler.WriteClose(closeStatusProtocolError)
-- return nil, io.EOF
-- }
-- } else {
-- // The server MUST NOT mask all frames.
-- if frame.(*hybiFrameReader).header.MaskingKey != nil {
-- handler.WriteClose(closeStatusProtocolError)
-- return nil, io.EOF
-- }
-- }
-- if header := frame.HeaderReader(); header != nil {
-- io.Copy(ioutil.Discard, header)
-- }
-- switch frame.PayloadType() {
-- case ContinuationFrame:
-- frame.(*hybiFrameReader).header.OpCode = handler.payloadType
-- case TextFrame, BinaryFrame:
-- handler.payloadType = frame.PayloadType()
-- case CloseFrame:
-- return nil, io.EOF
-- case PingFrame:
-- pingMsg := make([]byte, maxControlFramePayloadLength)
-- n, err := io.ReadFull(frame, pingMsg)
-- if err != nil && err != io.ErrUnexpectedEOF {
-- return nil, err
-- }
-- io.Copy(ioutil.Discard, frame)
-- n, err = handler.WritePong(pingMsg[:n])
-- if err != nil {
-- return nil, err
-- }
-- return nil, nil
-- case PongFrame:
-- return nil, ErrNotImplemented
-- }
-- return frame, nil
--}
--
--func (handler *hybiFrameHandler) WriteClose(status int) (err error) {
-- handler.conn.wio.Lock()
-- defer handler.conn.wio.Unlock()
-- w, err := handler.conn.frameWriterFactory.NewFrameWriter(CloseFrame)
-- if err != nil {
-- return err
-- }
-- msg := make([]byte, 2)
-- binary.BigEndian.PutUint16(msg, uint16(status))
-- _, err = w.Write(msg)
-- w.Close()
-- return err
--}
--
--func (handler *hybiFrameHandler) WritePong(msg []byte) (n int, err error) {
-- handler.conn.wio.Lock()
-- defer handler.conn.wio.Unlock()
-- w, err := handler.conn.frameWriterFactory.NewFrameWriter(PongFrame)
-- if err != nil {
-- return 0, err
-- }
-- n, err = w.Write(msg)
-- w.Close()
-- return n, err
--}
--
--// newHybiConn creates a new WebSocket connection speaking hybi draft protocol.
--func newHybiConn(config *Config, buf *bufio.ReadWriter, rwc io.ReadWriteCloser, request *http.Request) *Conn {
-- if buf == nil {
-- br := bufio.NewReader(rwc)
-- bw := bufio.NewWriter(rwc)
-- buf = bufio.NewReadWriter(br, bw)
-- }
-- ws := &Conn{config: config, request: request, buf: buf, rwc: rwc,
-- frameReaderFactory: hybiFrameReaderFactory{buf.Reader},
-- frameWriterFactory: hybiFrameWriterFactory{
-- buf.Writer, request == nil},
-- PayloadType: TextFrame,
-- defaultCloseStatus: closeStatusNormal}
-- ws.frameHandler = &hybiFrameHandler{conn: ws}
-- return ws
--}
--
--// generateMaskingKey generates a masking key for a frame.
--func generateMaskingKey() (maskingKey []byte, err error) {
-- maskingKey = make([]byte, 4)
-- if _, err = io.ReadFull(rand.Reader, maskingKey); err != nil {
-- return
-- }
-- return
--}
--
--// generateNonce generates a nonce consisting of a randomly selected 16-byte
--// value that has been base64-encoded.
--func generateNonce() (nonce []byte) {
-- key := make([]byte, 16)
-- if _, err := io.ReadFull(rand.Reader, key); err != nil {
-- panic(err)
-- }
-- nonce = make([]byte, 24)
-- base64.StdEncoding.Encode(nonce, key)
-- return
--}
--
--// getNonceAccept computes the base64-encoded SHA-1 of the concatenation of
--// the nonce ("Sec-WebSocket-Key" value) with the websocket GUID string.
--func getNonceAccept(nonce []byte) (expected []byte, err error) {
-- h := sha1.New()
-- if _, err = h.Write(nonce); err != nil {
-- return
-- }
-- if _, err = h.Write([]byte(websocketGUID)); err != nil {
-- return
-- }
-- expected = make([]byte, 28)
-- base64.StdEncoding.Encode(expected, h.Sum(nil))
-- return
--}
--
--// Client handshake described in draft-ietf-hybi-thewebsocket-protocol-17
--func hybiClientHandshake(config *Config, br *bufio.Reader, bw *bufio.Writer) (err error) {
-- bw.WriteString("GET " + config.Location.RequestURI() + " HTTP/1.1\r\n")
--
-- bw.WriteString("Host: " + config.Location.Host + "\r\n")
-- bw.WriteString("Upgrade: websocket\r\n")
-- bw.WriteString("Connection: Upgrade\r\n")
-- nonce := generateNonce()
-- if config.handshakeData != nil {
-- nonce = []byte(config.handshakeData["key"])
-- }
-- bw.WriteString("Sec-WebSocket-Key: " + string(nonce) + "\r\n")
-- bw.WriteString("Origin: " + strings.ToLower(config.Origin.String()) + "\r\n")
--
-- if config.Version != ProtocolVersionHybi13 {
-- return ErrBadProtocolVersion
-- }
--
-- bw.WriteString("Sec-WebSocket-Version: " + fmt.Sprintf("%d", config.Version) + "\r\n")
-- if len(config.Protocol) > 0 {
-- bw.WriteString("Sec-WebSocket-Protocol: " + strings.Join(config.Protocol, ", ") + "\r\n")
-- }
-- // TODO(ukai): send Sec-WebSocket-Extensions.
-- err = config.Header.WriteSubset(bw, handshakeHeader)
-- if err != nil {
-- return err
-- }
--
-- bw.WriteString("\r\n")
-- if err = bw.Flush(); err != nil {
-- return err
-- }
--
-- resp, err := http.ReadResponse(br, &http.Request{Method: "GET"})
-- if err != nil {
-- return err
-- }
-- if resp.StatusCode != 101 {
-- return ErrBadStatus
-- }
-- if strings.ToLower(resp.Header.Get("Upgrade")) != "websocket" ||
-- strings.ToLower(resp.Header.Get("Connection")) != "upgrade" {
-- return ErrBadUpgrade
-- }
-- expectedAccept, err := getNonceAccept(nonce)
-- if err != nil {
-- return err
-- }
-- if resp.Header.Get("Sec-WebSocket-Accept") != string(expectedAccept) {
-- return ErrChallengeResponse
-- }
-- if resp.Header.Get("Sec-WebSocket-Extensions") != "" {
-- return ErrUnsupportedExtensions
-- }
-- offeredProtocol := resp.Header.Get("Sec-WebSocket-Protocol")
-- if offeredProtocol != "" {
-- protocolMatched := false
-- for i := 0; i < len(config.Protocol); i++ {
-- if config.Protocol[i] == offeredProtocol {
-- protocolMatched = true
-- break
-- }
-- }
-- if !protocolMatched {
-- return ErrBadWebSocketProtocol
-- }
-- config.Protocol = []string{offeredProtocol}
-- }
--
-- return nil
--}
--
--// newHybiClientConn creates a client WebSocket connection after handshake.
--func newHybiClientConn(config *Config, buf *bufio.ReadWriter, rwc io.ReadWriteCloser) *Conn {
-- return newHybiConn(config, buf, rwc, nil)
--}
--
--// A HybiServerHandshaker performs a server handshake using hybi draft protocol.
--type hybiServerHandshaker struct {
-- *Config
-- accept []byte
--}
--
--func (c *hybiServerHandshaker) ReadHandshake(buf *bufio.Reader, req *http.Request) (code int, err error) {
-- c.Version = ProtocolVersionHybi13
-- if req.Method != "GET" {
-- return http.StatusMethodNotAllowed, ErrBadRequestMethod
-- }
-- // HTTP version can be safely ignored.
--
-- if strings.ToLower(req.Header.Get("Upgrade")) != "websocket" ||
-- !strings.Contains(strings.ToLower(req.Header.Get("Connection")), "upgrade") {
-- return http.StatusBadRequest, ErrNotWebSocket
-- }
--
-- key := req.Header.Get("Sec-Websocket-Key")
-- if key == "" {
-- return http.StatusBadRequest, ErrChallengeResponse
-- }
-- version := req.Header.Get("Sec-Websocket-Version")
-- switch version {
-- case "13":
-- c.Version = ProtocolVersionHybi13
-- default:
-- return http.StatusBadRequest, ErrBadWebSocketVersion
-- }
-- var scheme string
-- if req.TLS != nil {
-- scheme = "wss"
-- } else {
-- scheme = "ws"
-- }
-- c.Location, err = url.ParseRequestURI(scheme + "://" + req.Host + req.URL.RequestURI())
-- if err != nil {
-- return http.StatusBadRequest, err
-- }
-- protocol := strings.TrimSpace(req.Header.Get("Sec-Websocket-Protocol"))
-- if protocol != "" {
-- protocols := strings.Split(protocol, ",")
-- for i := 0; i < len(protocols); i++ {
-- c.Protocol = append(c.Protocol, strings.TrimSpace(protocols[i]))
-- }
-- }
-- c.accept, err = getNonceAccept([]byte(key))
-- if err != nil {
-- return http.StatusInternalServerError, err
-- }
-- return http.StatusSwitchingProtocols, nil
--}
--
--// Origin parses Origin header in "req".
--// If origin is "null", returns (nil, nil).
--func Origin(config *Config, req *http.Request) (*url.URL, error) {
-- var origin string
-- switch config.Version {
-- case ProtocolVersionHybi13:
-- origin = req.Header.Get("Origin")
-- }
-- if origin == "null" {
-- return nil, nil
-- }
-- return url.ParseRequestURI(origin)
--}
--
--func (c *hybiServerHandshaker) AcceptHandshake(buf *bufio.Writer) (err error) {
-- if len(c.Protocol) > 0 {
-- if len(c.Protocol) != 1 {
-- // You need choose a Protocol in Handshake func in Server.
-- return ErrBadWebSocketProtocol
-- }
-- }
-- buf.WriteString("HTTP/1.1 101 Switching Protocols\r\n")
-- buf.WriteString("Upgrade: websocket\r\n")
-- buf.WriteString("Connection: Upgrade\r\n")
-- buf.WriteString("Sec-WebSocket-Accept: " + string(c.accept) + "\r\n")
-- if len(c.Protocol) > 0 {
-- buf.WriteString("Sec-WebSocket-Protocol: " + c.Protocol[0] + "\r\n")
-- }
-- // TODO(ukai): send Sec-WebSocket-Extensions.
-- if c.Header != nil {
-- err := c.Header.WriteSubset(buf, handshakeHeader)
-- if err != nil {
-- return err
-- }
-- }
-- buf.WriteString("\r\n")
-- return buf.Flush()
--}
--
--func (c *hybiServerHandshaker) NewServerConn(buf *bufio.ReadWriter, rwc io.ReadWriteCloser, request *http.Request) *Conn {
-- return newHybiServerConn(c.Config, buf, rwc, request)
--}
--
--// newHybiServerConn returns a new WebSocket connection speaking hybi draft protocol.
--func newHybiServerConn(config *Config, buf *bufio.ReadWriter, rwc io.ReadWriteCloser, request *http.Request) *Conn {
-- return newHybiConn(config, buf, rwc, request)
--}
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/websocket/hybi_test.go b/Godeps/_workspace/src/code.google.com/p/go.net/websocket/hybi_test.go
-deleted file mode 100644
-index d6a1910..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/websocket/hybi_test.go
-+++ /dev/null
-@@ -1,590 +0,0 @@
--// Copyright 2011 The Go Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--package websocket
--
--import (
-- "bufio"
-- "bytes"
-- "fmt"
-- "io"
-- "net/http"
-- "net/url"
-- "strings"
-- "testing"
--)
--
--// Test the getNonceAccept function with values in
--// http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-17
--func TestSecWebSocketAccept(t *testing.T) {
-- nonce := []byte("dGhlIHNhbXBsZSBub25jZQ==")
-- expected := []byte("s3pPLMBiTxaQ9kYGzzhZRbK+xOo=")
-- accept, err := getNonceAccept(nonce)
-- if err != nil {
-- t.Errorf("getNonceAccept: returned error %v", err)
-- return
-- }
-- if !bytes.Equal(expected, accept) {
-- t.Errorf("getNonceAccept: expected %q got %q", expected, accept)
-- }
--}
--
--func TestHybiClientHandshake(t *testing.T) {
-- b := bytes.NewBuffer([]byte{})
-- bw := bufio.NewWriter(b)
-- br := bufio.NewReader(strings.NewReader(`HTTP/1.1 101 Switching Protocols
--Upgrade: websocket
--Connection: Upgrade
--Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=
--Sec-WebSocket-Protocol: chat
--
--`))
-- var err error
-- config := new(Config)
-- config.Location, err = url.ParseRequestURI("ws://server.example.com/chat")
-- if err != nil {
-- t.Fatal("location url", err)
-- }
-- config.Origin, err = url.ParseRequestURI("http://example.com")
-- if err != nil {
-- t.Fatal("origin url", err)
-- }
-- config.Protocol = append(config.Protocol, "chat")
-- config.Protocol = append(config.Protocol, "superchat")
-- config.Version = ProtocolVersionHybi13
--
-- config.handshakeData = map[string]string{
-- "key": "dGhlIHNhbXBsZSBub25jZQ==",
-- }
-- err = hybiClientHandshake(config, br, bw)
-- if err != nil {
-- t.Errorf("handshake failed: %v", err)
-- }
-- req, err := http.ReadRequest(bufio.NewReader(b))
-- if err != nil {
-- t.Fatalf("read request: %v", err)
-- }
-- if req.Method != "GET" {
-- t.Errorf("request method expected GET, but got %q", req.Method)
-- }
-- if req.URL.Path != "/chat" {
-- t.Errorf("request path expected /chat, but got %q", req.URL.Path)
-- }
-- if req.Proto != "HTTP/1.1" {
-- t.Errorf("request proto expected HTTP/1.1, but got %q", req.Proto)
-- }
-- if req.Host != "server.example.com" {
-- t.Errorf("request Host expected server.example.com, but got %v", req.Host)
-- }
-- var expectedHeader = map[string]string{
-- "Connection": "Upgrade",
-- "Upgrade": "websocket",
-- "Sec-Websocket-Key": config.handshakeData["key"],
-- "Origin": config.Origin.String(),
-- "Sec-Websocket-Protocol": "chat, superchat",
-- "Sec-Websocket-Version": fmt.Sprintf("%d", ProtocolVersionHybi13),
-- }
-- for k, v := range expectedHeader {
-- if req.Header.Get(k) != v {
-- t.Errorf(fmt.Sprintf("%s expected %q but got %q", k, v, req.Header.Get(k)))
-- }
-- }
--}
--
--func TestHybiClientHandshakeWithHeader(t *testing.T) {
-- b := bytes.NewBuffer([]byte{})
-- bw := bufio.NewWriter(b)
-- br := bufio.NewReader(strings.NewReader(`HTTP/1.1 101 Switching Protocols
--Upgrade: websocket
--Connection: Upgrade
--Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=
--Sec-WebSocket-Protocol: chat
--
--`))
-- var err error
-- config := new(Config)
-- config.Location, err = url.ParseRequestURI("ws://server.example.com/chat")
-- if err != nil {
-- t.Fatal("location url", err)
-- }
-- config.Origin, err = url.ParseRequestURI("http://example.com")
-- if err != nil {
-- t.Fatal("origin url", err)
-- }
-- config.Protocol = append(config.Protocol, "chat")
-- config.Protocol = append(config.Protocol, "superchat")
-- config.Version = ProtocolVersionHybi13
-- config.Header = http.Header(make(map[string][]string))
-- config.Header.Add("User-Agent", "test")
--
-- config.handshakeData = map[string]string{
-- "key": "dGhlIHNhbXBsZSBub25jZQ==",
-- }
-- err = hybiClientHandshake(config, br, bw)
-- if err != nil {
-- t.Errorf("handshake failed: %v", err)
-- }
-- req, err := http.ReadRequest(bufio.NewReader(b))
-- if err != nil {
-- t.Fatalf("read request: %v", err)
-- }
-- if req.Method != "GET" {
-- t.Errorf("request method expected GET, but got %q", req.Method)
-- }
-- if req.URL.Path != "/chat" {
-- t.Errorf("request path expected /chat, but got %q", req.URL.Path)
-- }
-- if req.Proto != "HTTP/1.1" {
-- t.Errorf("request proto expected HTTP/1.1, but got %q", req.Proto)
-- }
-- if req.Host != "server.example.com" {
-- t.Errorf("request Host expected server.example.com, but got %v", req.Host)
-- }
-- var expectedHeader = map[string]string{
-- "Connection": "Upgrade",
-- "Upgrade": "websocket",
-- "Sec-Websocket-Key": config.handshakeData["key"],
-- "Origin": config.Origin.String(),
-- "Sec-Websocket-Protocol": "chat, superchat",
-- "Sec-Websocket-Version": fmt.Sprintf("%d", ProtocolVersionHybi13),
-- "User-Agent": "test",
-- }
-- for k, v := range expectedHeader {
-- if req.Header.Get(k) != v {
-- t.Errorf(fmt.Sprintf("%s expected %q but got %q", k, v, req.Header.Get(k)))
-- }
-- }
--}
--
--func TestHybiServerHandshake(t *testing.T) {
-- config := new(Config)
-- handshaker := &hybiServerHandshaker{Config: config}
-- br := bufio.NewReader(strings.NewReader(`GET /chat HTTP/1.1
--Host: server.example.com
--Upgrade: websocket
--Connection: Upgrade
--Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==
--Origin: http://example.com
--Sec-WebSocket-Protocol: chat, superchat
--Sec-WebSocket-Version: 13
--
--`))
-- req, err := http.ReadRequest(br)
-- if err != nil {
-- t.Fatal("request", err)
-- }
-- code, err := handshaker.ReadHandshake(br, req)
-- if err != nil {
-- t.Errorf("handshake failed: %v", err)
-- }
-- if code != http.StatusSwitchingProtocols {
-- t.Errorf("status expected %q but got %q", http.StatusSwitchingProtocols, code)
-- }
-- expectedProtocols := []string{"chat", "superchat"}
-- if fmt.Sprintf("%v", config.Protocol) != fmt.Sprintf("%v", expectedProtocols) {
-- t.Errorf("protocol expected %q but got %q", expectedProtocols, config.Protocol)
-- }
-- b := bytes.NewBuffer([]byte{})
-- bw := bufio.NewWriter(b)
--
-- config.Protocol = config.Protocol[:1]
--
-- err = handshaker.AcceptHandshake(bw)
-- if err != nil {
-- t.Errorf("handshake response failed: %v", err)
-- }
-- expectedResponse := strings.Join([]string{
-- "HTTP/1.1 101 Switching Protocols",
-- "Upgrade: websocket",
-- "Connection: Upgrade",
-- "Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=",
-- "Sec-WebSocket-Protocol: chat",
-- "", ""}, "\r\n")
--
-- if b.String() != expectedResponse {
-- t.Errorf("handshake expected %q but got %q", expectedResponse, b.String())
-- }
--}
--
--func TestHybiServerHandshakeNoSubProtocol(t *testing.T) {
-- config := new(Config)
-- handshaker := &hybiServerHandshaker{Config: config}
-- br := bufio.NewReader(strings.NewReader(`GET /chat HTTP/1.1
--Host: server.example.com
--Upgrade: websocket
--Connection: Upgrade
--Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==
--Origin: http://example.com
--Sec-WebSocket-Version: 13
--
--`))
-- req, err := http.ReadRequest(br)
-- if err != nil {
-- t.Fatal("request", err)
-- }
-- code, err := handshaker.ReadHandshake(br, req)
-- if err != nil {
-- t.Errorf("handshake failed: %v", err)
-- }
-- if code != http.StatusSwitchingProtocols {
-- t.Errorf("status expected %q but got %q", http.StatusSwitchingProtocols, code)
-- }
-- if len(config.Protocol) != 0 {
-- t.Errorf("len(config.Protocol) expected 0, but got %q", len(config.Protocol))
-- }
-- b := bytes.NewBuffer([]byte{})
-- bw := bufio.NewWriter(b)
--
-- err = handshaker.AcceptHandshake(bw)
-- if err != nil {
-- t.Errorf("handshake response failed: %v", err)
-- }
-- expectedResponse := strings.Join([]string{
-- "HTTP/1.1 101 Switching Protocols",
-- "Upgrade: websocket",
-- "Connection: Upgrade",
-- "Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=",
-- "", ""}, "\r\n")
--
-- if b.String() != expectedResponse {
-- t.Errorf("handshake expected %q but got %q", expectedResponse, b.String())
-- }
--}
--
--func TestHybiServerHandshakeHybiBadVersion(t *testing.T) {
-- config := new(Config)
-- handshaker := &hybiServerHandshaker{Config: config}
-- br := bufio.NewReader(strings.NewReader(`GET /chat HTTP/1.1
--Host: server.example.com
--Upgrade: websocket
--Connection: Upgrade
--Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==
--Sec-WebSocket-Origin: http://example.com
--Sec-WebSocket-Protocol: chat, superchat
--Sec-WebSocket-Version: 9
--
--`))
-- req, err := http.ReadRequest(br)
-- if err != nil {
-- t.Fatal("request", err)
-- }
-- code, err := handshaker.ReadHandshake(br, req)
-- if err != ErrBadWebSocketVersion {
-- t.Errorf("handshake expected err %q but got %q", ErrBadWebSocketVersion, err)
-- }
-- if code != http.StatusBadRequest {
-- t.Errorf("status expected %q but got %q", http.StatusBadRequest, code)
-- }
--}
--
--func testHybiFrame(t *testing.T, testHeader, testPayload, testMaskedPayload []byte, frameHeader *hybiFrameHeader) {
-- b := bytes.NewBuffer([]byte{})
-- frameWriterFactory := &hybiFrameWriterFactory{bufio.NewWriter(b), false}
-- w, _ := frameWriterFactory.NewFrameWriter(TextFrame)
-- w.(*hybiFrameWriter).header = frameHeader
-- _, err := w.Write(testPayload)
-- w.Close()
-- if err != nil {
-- t.Errorf("Write error %q", err)
-- }
-- var expectedFrame []byte
-- expectedFrame = append(expectedFrame, testHeader...)
-- expectedFrame = append(expectedFrame, testMaskedPayload...)
-- if !bytes.Equal(expectedFrame, b.Bytes()) {
-- t.Errorf("frame expected %q got %q", expectedFrame, b.Bytes())
-- }
-- frameReaderFactory := &hybiFrameReaderFactory{bufio.NewReader(b)}
-- r, err := frameReaderFactory.NewFrameReader()
-- if err != nil {
-- t.Errorf("Read error %q", err)
-- }
-- if header := r.HeaderReader(); header == nil {
-- t.Errorf("no header")
-- } else {
-- actualHeader := make([]byte, r.Len())
-- n, err := header.Read(actualHeader)
-- if err != nil {
-- t.Errorf("Read header error %q", err)
-- } else {
-- if n < len(testHeader) {
-- t.Errorf("header too short %q got %q", testHeader, actualHeader[:n])
-- }
-- if !bytes.Equal(testHeader, actualHeader[:n]) {
-- t.Errorf("header expected %q got %q", testHeader, actualHeader[:n])
-- }
-- }
-- }
-- if trailer := r.TrailerReader(); trailer != nil {
-- t.Errorf("unexpected trailer %q", trailer)
-- }
-- frame := r.(*hybiFrameReader)
-- if frameHeader.Fin != frame.header.Fin ||
-- frameHeader.OpCode != frame.header.OpCode ||
-- len(testPayload) != int(frame.header.Length) {
-- t.Errorf("mismatch %v (%d) vs %v", frameHeader, len(testPayload), frame)
-- }
-- payload := make([]byte, len(testPayload))
-- _, err = r.Read(payload)
-- if err != nil {
-- t.Errorf("read %v", err)
-- }
-- if !bytes.Equal(testPayload, payload) {
-- t.Errorf("payload %q vs %q", testPayload, payload)
-- }
--}
--
--func TestHybiShortTextFrame(t *testing.T) {
-- frameHeader := &hybiFrameHeader{Fin: true, OpCode: TextFrame}
-- payload := []byte("hello")
-- testHybiFrame(t, []byte{0x81, 0x05}, payload, payload, frameHeader)
--
-- payload = make([]byte, 125)
-- testHybiFrame(t, []byte{0x81, 125}, payload, payload, frameHeader)
--}
--
--func TestHybiShortMaskedTextFrame(t *testing.T) {
-- frameHeader := &hybiFrameHeader{Fin: true, OpCode: TextFrame,
-- MaskingKey: []byte{0xcc, 0x55, 0x80, 0x20}}
-- payload := []byte("hello")
-- maskedPayload := []byte{0xa4, 0x30, 0xec, 0x4c, 0xa3}
-- header := []byte{0x81, 0x85}
-- header = append(header, frameHeader.MaskingKey...)
-- testHybiFrame(t, header, payload, maskedPayload, frameHeader)
--}
--
--func TestHybiShortBinaryFrame(t *testing.T) {
-- frameHeader := &hybiFrameHeader{Fin: true, OpCode: BinaryFrame}
-- payload := []byte("hello")
-- testHybiFrame(t, []byte{0x82, 0x05}, payload, payload, frameHeader)
--
-- payload = make([]byte, 125)
-- testHybiFrame(t, []byte{0x82, 125}, payload, payload, frameHeader)
--}
--
--func TestHybiControlFrame(t *testing.T) {
-- frameHeader := &hybiFrameHeader{Fin: true, OpCode: PingFrame}
-- payload := []byte("hello")
-- testHybiFrame(t, []byte{0x89, 0x05}, payload, payload, frameHeader)
--
-- frameHeader = &hybiFrameHeader{Fin: true, OpCode: PongFrame}
-- testHybiFrame(t, []byte{0x8A, 0x05}, payload, payload, frameHeader)
--
-- frameHeader = &hybiFrameHeader{Fin: true, OpCode: CloseFrame}
-- payload = []byte{0x03, 0xe8} // 1000
-- testHybiFrame(t, []byte{0x88, 0x02}, payload, payload, frameHeader)
--}
--
--func TestHybiLongFrame(t *testing.T) {
-- frameHeader := &hybiFrameHeader{Fin: true, OpCode: TextFrame}
-- payload := make([]byte, 126)
-- testHybiFrame(t, []byte{0x81, 126, 0x00, 126}, payload, payload, frameHeader)
--
-- payload = make([]byte, 65535)
-- testHybiFrame(t, []byte{0x81, 126, 0xff, 0xff}, payload, payload, frameHeader)
--
-- payload = make([]byte, 65536)
-- testHybiFrame(t, []byte{0x81, 127, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00}, payload, payload, frameHeader)
--}
--
--func TestHybiClientRead(t *testing.T) {
-- wireData := []byte{0x81, 0x05, 'h', 'e', 'l', 'l', 'o',
-- 0x89, 0x05, 'h', 'e', 'l', 'l', 'o', // ping
-- 0x81, 0x05, 'w', 'o', 'r', 'l', 'd'}
-- br := bufio.NewReader(bytes.NewBuffer(wireData))
-- bw := bufio.NewWriter(bytes.NewBuffer([]byte{}))
-- conn := newHybiConn(newConfig(t, "/"), bufio.NewReadWriter(br, bw), nil, nil)
--
-- msg := make([]byte, 512)
-- n, err := conn.Read(msg)
-- if err != nil {
-- t.Errorf("read 1st frame, error %q", err)
-- }
-- if n != 5 {
-- t.Errorf("read 1st frame, expect 5, got %d", n)
-- }
-- if !bytes.Equal(wireData[2:7], msg[:n]) {
-- t.Errorf("read 1st frame %v, got %v", wireData[2:7], msg[:n])
-- }
-- n, err = conn.Read(msg)
-- if err != nil {
-- t.Errorf("read 2nd frame, error %q", err)
-- }
-- if n != 5 {
-- t.Errorf("read 2nd frame, expect 5, got %d", n)
-- }
-- if !bytes.Equal(wireData[16:21], msg[:n]) {
-- t.Errorf("read 2nd frame %v, got %v", wireData[16:21], msg[:n])
-- }
-- n, err = conn.Read(msg)
-- if err == nil {
-- t.Errorf("read not EOF")
-- }
-- if n != 0 {
-- t.Errorf("expect read 0, got %d", n)
-- }
--}
--
--func TestHybiShortRead(t *testing.T) {
-- wireData := []byte{0x81, 0x05, 'h', 'e', 'l', 'l', 'o',
-- 0x89, 0x05, 'h', 'e', 'l', 'l', 'o', // ping
-- 0x81, 0x05, 'w', 'o', 'r', 'l', 'd'}
-- br := bufio.NewReader(bytes.NewBuffer(wireData))
-- bw := bufio.NewWriter(bytes.NewBuffer([]byte{}))
-- conn := newHybiConn(newConfig(t, "/"), bufio.NewReadWriter(br, bw), nil, nil)
--
-- step := 0
-- pos := 0
-- expectedPos := []int{2, 5, 16, 19}
-- expectedLen := []int{3, 2, 3, 2}
-- for {
-- msg := make([]byte, 3)
-- n, err := conn.Read(msg)
-- if step >= len(expectedPos) {
-- if err == nil {
-- t.Errorf("read not EOF")
-- }
-- if n != 0 {
-- t.Errorf("expect read 0, got %d", n)
-- }
-- return
-- }
-- pos = expectedPos[step]
-- endPos := pos + expectedLen[step]
-- if err != nil {
-- t.Errorf("read from %d, got error %q", pos, err)
-- return
-- }
-- if n != endPos-pos {
-- t.Errorf("read from %d, expect %d, got %d", pos, endPos-pos, n)
-- }
-- if !bytes.Equal(wireData[pos:endPos], msg[:n]) {
-- t.Errorf("read from %d, frame %v, got %v", pos, wireData[pos:endPos], msg[:n])
-- }
-- step++
-- }
--}
--
--func TestHybiServerRead(t *testing.T) {
-- wireData := []byte{0x81, 0x85, 0xcc, 0x55, 0x80, 0x20,
-- 0xa4, 0x30, 0xec, 0x4c, 0xa3, // hello
-- 0x89, 0x85, 0xcc, 0x55, 0x80, 0x20,
-- 0xa4, 0x30, 0xec, 0x4c, 0xa3, // ping: hello
-- 0x81, 0x85, 0xed, 0x83, 0xb4, 0x24,
-- 0x9a, 0xec, 0xc6, 0x48, 0x89, // world
-- }
-- br := bufio.NewReader(bytes.NewBuffer(wireData))
-- bw := bufio.NewWriter(bytes.NewBuffer([]byte{}))
-- conn := newHybiConn(newConfig(t, "/"), bufio.NewReadWriter(br, bw), nil, new(http.Request))
--
-- expected := [][]byte{[]byte("hello"), []byte("world")}
--
-- msg := make([]byte, 512)
-- n, err := conn.Read(msg)
-- if err != nil {
-- t.Errorf("read 1st frame, error %q", err)
-- }
-- if n != 5 {
-- t.Errorf("read 1st frame, expect 5, got %d", n)
-- }
-- if !bytes.Equal(expected[0], msg[:n]) {
-- t.Errorf("read 1st frame %q, got %q", expected[0], msg[:n])
-- }
--
-- n, err = conn.Read(msg)
-- if err != nil {
-- t.Errorf("read 2nd frame, error %q", err)
-- }
-- if n != 5 {
-- t.Errorf("read 2nd frame, expect 5, got %d", n)
-- }
-- if !bytes.Equal(expected[1], msg[:n]) {
-- t.Errorf("read 2nd frame %q, got %q", expected[1], msg[:n])
-- }
--
-- n, err = conn.Read(msg)
-- if err == nil {
-- t.Errorf("read not EOF")
-- }
-- if n != 0 {
-- t.Errorf("expect read 0, got %d", n)
-- }
--}
--
--func TestHybiServerReadWithoutMasking(t *testing.T) {
-- wireData := []byte{0x81, 0x05, 'h', 'e', 'l', 'l', 'o'}
-- br := bufio.NewReader(bytes.NewBuffer(wireData))
-- bw := bufio.NewWriter(bytes.NewBuffer([]byte{}))
-- conn := newHybiConn(newConfig(t, "/"), bufio.NewReadWriter(br, bw), nil, new(http.Request))
-- // server MUST close the connection upon receiving a non-masked frame.
-- msg := make([]byte, 512)
-- _, err := conn.Read(msg)
-- if err != io.EOF {
-- t.Errorf("read 1st frame, expect %q, but got %q", io.EOF, err)
-- }
--}
--
--func TestHybiClientReadWithMasking(t *testing.T) {
-- wireData := []byte{0x81, 0x85, 0xcc, 0x55, 0x80, 0x20,
-- 0xa4, 0x30, 0xec, 0x4c, 0xa3, // hello
-- }
-- br := bufio.NewReader(bytes.NewBuffer(wireData))
-- bw := bufio.NewWriter(bytes.NewBuffer([]byte{}))
-- conn := newHybiConn(newConfig(t, "/"), bufio.NewReadWriter(br, bw), nil, nil)
--
-- // client MUST close the connection upon receiving a masked frame.
-- msg := make([]byte, 512)
-- _, err := conn.Read(msg)
-- if err != io.EOF {
-- t.Errorf("read 1st frame, expect %q, but got %q", io.EOF, err)
-- }
--}
--
--// Test the hybiServerHandshaker supports firefox implementation and
--// checks Connection request header include (but it's not necessary
--// equal to) "upgrade"
--func TestHybiServerFirefoxHandshake(t *testing.T) {
-- config := new(Config)
-- handshaker := &hybiServerHandshaker{Config: config}
-- br := bufio.NewReader(strings.NewReader(`GET /chat HTTP/1.1
--Host: server.example.com
--Upgrade: websocket
--Connection: keep-alive, upgrade
--Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==
--Origin: http://example.com
--Sec-WebSocket-Protocol: chat, superchat
--Sec-WebSocket-Version: 13
--
--`))
-- req, err := http.ReadRequest(br)
-- if err != nil {
-- t.Fatal("request", err)
-- }
-- code, err := handshaker.ReadHandshake(br, req)
-- if err != nil {
-- t.Errorf("handshake failed: %v", err)
-- }
-- if code != http.StatusSwitchingProtocols {
-- t.Errorf("status expected %q but got %q", http.StatusSwitchingProtocols, code)
-- }
-- b := bytes.NewBuffer([]byte{})
-- bw := bufio.NewWriter(b)
--
-- config.Protocol = []string{"chat"}
--
-- err = handshaker.AcceptHandshake(bw)
-- if err != nil {
-- t.Errorf("handshake response failed: %v", err)
-- }
-- expectedResponse := strings.Join([]string{
-- "HTTP/1.1 101 Switching Protocols",
-- "Upgrade: websocket",
-- "Connection: Upgrade",
-- "Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=",
-- "Sec-WebSocket-Protocol: chat",
-- "", ""}, "\r\n")
--
-- if b.String() != expectedResponse {
-- t.Errorf("handshake expected %q but got %q", expectedResponse, b.String())
-- }
--}
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/websocket/server.go b/Godeps/_workspace/src/code.google.com/p/go.net/websocket/server.go
-deleted file mode 100644
-index 7032213..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/websocket/server.go
-+++ /dev/null
-@@ -1,114 +0,0 @@
--// Copyright 2009 The Go Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--package websocket
--
--import (
-- "bufio"
-- "fmt"
-- "io"
-- "net/http"
--)
--
--func newServerConn(rwc io.ReadWriteCloser, buf *bufio.ReadWriter, req *http.Request, config *Config, handshake func(*Config, *http.Request) error) (conn *Conn, err error) {
-- var hs serverHandshaker = &hybiServerHandshaker{Config: config}
-- code, err := hs.ReadHandshake(buf.Reader, req)
-- if err == ErrBadWebSocketVersion {
-- fmt.Fprintf(buf, "HTTP/1.1 %03d %s\r\n", code, http.StatusText(code))
-- fmt.Fprintf(buf, "Sec-WebSocket-Version: %s\r\n", SupportedProtocolVersion)
-- buf.WriteString("\r\n")
-- buf.WriteString(err.Error())
-- buf.Flush()
-- return
-- }
-- if err != nil {
-- fmt.Fprintf(buf, "HTTP/1.1 %03d %s\r\n", code, http.StatusText(code))
-- buf.WriteString("\r\n")
-- buf.WriteString(err.Error())
-- buf.Flush()
-- return
-- }
-- if handshake != nil {
-- err = handshake(config, req)
-- if err != nil {
-- code = http.StatusForbidden
-- fmt.Fprintf(buf, "HTTP/1.1 %03d %s\r\n", code, http.StatusText(code))
-- buf.WriteString("\r\n")
-- buf.Flush()
-- return
-- }
-- }
-- err = hs.AcceptHandshake(buf.Writer)
-- if err != nil {
-- code = http.StatusBadRequest
-- fmt.Fprintf(buf, "HTTP/1.1 %03d %s\r\n", code, http.StatusText(code))
-- buf.WriteString("\r\n")
-- buf.Flush()
-- return
-- }
-- conn = hs.NewServerConn(buf, rwc, req)
-- return
--}
--
--// Server represents a server of a WebSocket.
--type Server struct {
-- // Config is a WebSocket configuration for new WebSocket connection.
-- Config
--
-- // Handshake is an optional function in WebSocket handshake.
-- // For example, you can check, or don't check Origin header.
-- // Another example, you can select config.Protocol.
-- Handshake func(*Config, *http.Request) error
--
-- // Handler handles a WebSocket connection.
-- Handler
--}
--
--// ServeHTTP implements the http.Handler interface for a WebSocket
--func (s Server) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-- s.serveWebSocket(w, req)
--}
--
--func (s Server) serveWebSocket(w http.ResponseWriter, req *http.Request) {
-- rwc, buf, err := w.(http.Hijacker).Hijack()
-- if err != nil {
-- panic("Hijack failed: " + err.Error())
-- return
-- }
-- // The server should abort the WebSocket connection if it finds
-- // the client did not send a handshake that matches with protocol
-- // specification.
-- defer rwc.Close()
-- conn, err := newServerConn(rwc, buf, req, &s.Config, s.Handshake)
-- if err != nil {
-- return
-- }
-- if conn == nil {
-- panic("unexpected nil conn")
-- }
-- s.Handler(conn)
--}
--
--// Handler is a simple interface to a WebSocket browser client.
--// It checks if Origin header is valid URL by default.
--// You might want to verify websocket.Conn.Config().Origin in the func.
--// If you use Server instead of Handler, you could call websocket.Origin and
--// check the origin in your Handshake func. So, if you want to accept
--// non-browser client, which doesn't send Origin header, you could use Server
--//. that doesn't check origin in its Handshake.
--type Handler func(*Conn)
--
--func checkOrigin(config *Config, req *http.Request) (err error) {
-- config.Origin, err = Origin(config, req)
-- if err == nil && config.Origin == nil {
-- return fmt.Errorf("null origin")
-- }
-- return err
--}
--
--// ServeHTTP implements the http.Handler interface for a WebSocket
--func (h Handler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-- s := Server{Handler: h, Handshake: checkOrigin}
-- s.serveWebSocket(w, req)
--}
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/websocket/websocket.go b/Godeps/_workspace/src/code.google.com/p/go.net/websocket/websocket.go
-deleted file mode 100644
-index 0f4917b..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/websocket/websocket.go
-+++ /dev/null
-@@ -1,411 +0,0 @@
--// Copyright 2009 The Go Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--// Package websocket implements a client and server for the WebSocket protocol
--// as specified in RFC 6455.
--package websocket
--
--import (
-- "bufio"
-- "crypto/tls"
-- "encoding/json"
-- "errors"
-- "io"
-- "io/ioutil"
-- "net"
-- "net/http"
-- "net/url"
-- "sync"
-- "time"
--)
--
--const (
-- ProtocolVersionHybi13 = 13
-- ProtocolVersionHybi = ProtocolVersionHybi13
-- SupportedProtocolVersion = "13"
--
-- ContinuationFrame = 0
-- TextFrame = 1
-- BinaryFrame = 2
-- CloseFrame = 8
-- PingFrame = 9
-- PongFrame = 10
-- UnknownFrame = 255
--)
--
--// ProtocolError represents WebSocket protocol errors.
--type ProtocolError struct {
-- ErrorString string
--}
--
--func (err *ProtocolError) Error() string { return err.ErrorString }
--
--var (
-- ErrBadProtocolVersion = &ProtocolError{"bad protocol version"}
-- ErrBadScheme = &ProtocolError{"bad scheme"}
-- ErrBadStatus = &ProtocolError{"bad status"}
-- ErrBadUpgrade = &ProtocolError{"missing or bad upgrade"}
-- ErrBadWebSocketOrigin = &ProtocolError{"missing or bad WebSocket-Origin"}
-- ErrBadWebSocketLocation = &ProtocolError{"missing or bad WebSocket-Location"}
-- ErrBadWebSocketProtocol = &ProtocolError{"missing or bad WebSocket-Protocol"}
-- ErrBadWebSocketVersion = &ProtocolError{"missing or bad WebSocket Version"}
-- ErrChallengeResponse = &ProtocolError{"mismatch challenge/response"}
-- ErrBadFrame = &ProtocolError{"bad frame"}
-- ErrBadFrameBoundary = &ProtocolError{"not on frame boundary"}
-- ErrNotWebSocket = &ProtocolError{"not websocket protocol"}
-- ErrBadRequestMethod = &ProtocolError{"bad method"}
-- ErrNotSupported = &ProtocolError{"not supported"}
--)
--
--// Addr is an implementation of net.Addr for WebSocket.
--type Addr struct {
-- *url.URL
--}
--
--// Network returns the network type for a WebSocket, "websocket".
--func (addr *Addr) Network() string { return "websocket" }
--
--// Config is a WebSocket configuration
--type Config struct {
-- // A WebSocket server address.
-- Location *url.URL
--
-- // A Websocket client origin.
-- Origin *url.URL
--
-- // WebSocket subprotocols.
-- Protocol []string
--
-- // WebSocket protocol version.
-- Version int
--
-- // TLS config for secure WebSocket (wss).
-- TlsConfig *tls.Config
--
-- // Additional header fields to be sent in WebSocket opening handshake.
-- Header http.Header
--
-- handshakeData map[string]string
--}
--
--// serverHandshaker is an interface to handle WebSocket server side handshake.
--type serverHandshaker interface {
-- // ReadHandshake reads handshake request message from client.
-- // Returns http response code and error if any.
-- ReadHandshake(buf *bufio.Reader, req *http.Request) (code int, err error)
--
-- // AcceptHandshake accepts the client handshake request and sends
-- // handshake response back to client.
-- AcceptHandshake(buf *bufio.Writer) (err error)
--
-- // NewServerConn creates a new WebSocket connection.
-- NewServerConn(buf *bufio.ReadWriter, rwc io.ReadWriteCloser, request *http.Request) (conn *Conn)
--}
--
--// frameReader is an interface to read a WebSocket frame.
--type frameReader interface {
-- // Reader is to read payload of the frame.
-- io.Reader
--
-- // PayloadType returns payload type.
-- PayloadType() byte
--
-- // HeaderReader returns a reader to read header of the frame.
-- HeaderReader() io.Reader
--
-- // TrailerReader returns a reader to read trailer of the frame.
-- // If it returns nil, there is no trailer in the frame.
-- TrailerReader() io.Reader
--
-- // Len returns total length of the frame, including header and trailer.
-- Len() int
--}
--
--// frameReaderFactory is an interface to creates new frame reader.
--type frameReaderFactory interface {
-- NewFrameReader() (r frameReader, err error)
--}
--
--// frameWriter is an interface to write a WebSocket frame.
--type frameWriter interface {
-- // Writer is to write payload of the frame.
-- io.WriteCloser
--}
--
--// frameWriterFactory is an interface to create new frame writer.
--type frameWriterFactory interface {
-- NewFrameWriter(payloadType byte) (w frameWriter, err error)
--}
--
--type frameHandler interface {
-- HandleFrame(frame frameReader) (r frameReader, err error)
-- WriteClose(status int) (err error)
--}
--
--// Conn represents a WebSocket connection.
--type Conn struct {
-- config *Config
-- request *http.Request
--
-- buf *bufio.ReadWriter
-- rwc io.ReadWriteCloser
--
-- rio sync.Mutex
-- frameReaderFactory
-- frameReader
--
-- wio sync.Mutex
-- frameWriterFactory
--
-- frameHandler
-- PayloadType byte
-- defaultCloseStatus int
--}
--
--// Read implements the io.Reader interface:
--// it reads data of a frame from the WebSocket connection.
--// if msg is not large enough for the frame data, it fills the msg and next Read
--// will read the rest of the frame data.
--// it reads Text frame or Binary frame.
--func (ws *Conn) Read(msg []byte) (n int, err error) {
-- ws.rio.Lock()
-- defer ws.rio.Unlock()
--again:
-- if ws.frameReader == nil {
-- frame, err := ws.frameReaderFactory.NewFrameReader()
-- if err != nil {
-- return 0, err
-- }
-- ws.frameReader, err = ws.frameHandler.HandleFrame(frame)
-- if err != nil {
-- return 0, err
-- }
-- if ws.frameReader == nil {
-- goto again
-- }
-- }
-- n, err = ws.frameReader.Read(msg)
-- if err == io.EOF {
-- if trailer := ws.frameReader.TrailerReader(); trailer != nil {
-- io.Copy(ioutil.Discard, trailer)
-- }
-- ws.frameReader = nil
-- goto again
-- }
-- return n, err
--}
--
--// Write implements the io.Writer interface:
--// it writes data as a frame to the WebSocket connection.
--func (ws *Conn) Write(msg []byte) (n int, err error) {
-- ws.wio.Lock()
-- defer ws.wio.Unlock()
-- w, err := ws.frameWriterFactory.NewFrameWriter(ws.PayloadType)
-- if err != nil {
-- return 0, err
-- }
-- n, err = w.Write(msg)
-- w.Close()
-- if err != nil {
-- return n, err
-- }
-- return n, err
--}
--
--// Close implements the io.Closer interface.
--func (ws *Conn) Close() error {
-- err := ws.frameHandler.WriteClose(ws.defaultCloseStatus)
-- if err != nil {
-- return err
-- }
-- return ws.rwc.Close()
--}
--
--func (ws *Conn) IsClientConn() bool { return ws.request == nil }
--func (ws *Conn) IsServerConn() bool { return ws.request != nil }
--
--// LocalAddr returns the WebSocket Origin for the connection for client, or
--// the WebSocket location for server.
--func (ws *Conn) LocalAddr() net.Addr {
-- if ws.IsClientConn() {
-- return &Addr{ws.config.Origin}
-- }
-- return &Addr{ws.config.Location}
--}
--
--// RemoteAddr returns the WebSocket location for the connection for client, or
--// the Websocket Origin for server.
--func (ws *Conn) RemoteAddr() net.Addr {
-- if ws.IsClientConn() {
-- return &Addr{ws.config.Location}
-- }
-- return &Addr{ws.config.Origin}
--}
--
--var errSetDeadline = errors.New("websocket: cannot set deadline: not using a net.Conn")
--
--// SetDeadline sets the connection's network read & write deadlines.
--func (ws *Conn) SetDeadline(t time.Time) error {
-- if conn, ok := ws.rwc.(net.Conn); ok {
-- return conn.SetDeadline(t)
-- }
-- return errSetDeadline
--}
--
--// SetReadDeadline sets the connection's network read deadline.
--func (ws *Conn) SetReadDeadline(t time.Time) error {
-- if conn, ok := ws.rwc.(net.Conn); ok {
-- return conn.SetReadDeadline(t)
-- }
-- return errSetDeadline
--}
--
--// SetWriteDeadline sets the connection's network write deadline.
--func (ws *Conn) SetWriteDeadline(t time.Time) error {
-- if conn, ok := ws.rwc.(net.Conn); ok {
-- return conn.SetWriteDeadline(t)
-- }
-- return errSetDeadline
--}
--
--// Config returns the WebSocket config.
--func (ws *Conn) Config() *Config { return ws.config }
--
--// Request returns the http request upgraded to the WebSocket.
--// It is nil for client side.
--func (ws *Conn) Request() *http.Request { return ws.request }
--
--// Codec represents a symmetric pair of functions that implement a codec.
--type Codec struct {
-- Marshal func(v interface{}) (data []byte, payloadType byte, err error)
-- Unmarshal func(data []byte, payloadType byte, v interface{}) (err error)
--}
--
--// Send sends v marshaled by cd.Marshal as single frame to ws.
--func (cd Codec) Send(ws *Conn, v interface{}) (err error) {
-- data, payloadType, err := cd.Marshal(v)
-- if err != nil {
-- return err
-- }
-- ws.wio.Lock()
-- defer ws.wio.Unlock()
-- w, err := ws.frameWriterFactory.NewFrameWriter(payloadType)
-- if err != nil {
-- return err
-- }
-- _, err = w.Write(data)
-- w.Close()
-- return err
--}
--
--// Receive receives single frame from ws, unmarshaled by cd.Unmarshal and stores in v.
--func (cd Codec) Receive(ws *Conn, v interface{}) (err error) {
-- ws.rio.Lock()
-- defer ws.rio.Unlock()
-- if ws.frameReader != nil {
-- _, err = io.Copy(ioutil.Discard, ws.frameReader)
-- if err != nil {
-- return err
-- }
-- ws.frameReader = nil
-- }
--again:
-- frame, err := ws.frameReaderFactory.NewFrameReader()
-- if err != nil {
-- return err
-- }
-- frame, err = ws.frameHandler.HandleFrame(frame)
-- if err != nil {
-- return err
-- }
-- if frame == nil {
-- goto again
-- }
-- payloadType := frame.PayloadType()
-- data, err := ioutil.ReadAll(frame)
-- if err != nil {
-- return err
-- }
-- return cd.Unmarshal(data, payloadType, v)
--}
--
--func marshal(v interface{}) (msg []byte, payloadType byte, err error) {
-- switch data := v.(type) {
-- case string:
-- return []byte(data), TextFrame, nil
-- case []byte:
-- return data, BinaryFrame, nil
-- }
-- return nil, UnknownFrame, ErrNotSupported
--}
--
--func unmarshal(msg []byte, payloadType byte, v interface{}) (err error) {
-- switch data := v.(type) {
-- case *string:
-- *data = string(msg)
-- return nil
-- case *[]byte:
-- *data = msg
-- return nil
-- }
-- return ErrNotSupported
--}
--
--/*
--Message is a codec to send/receive text/binary data in a frame on WebSocket connection.
--To send/receive text frame, use string type.
--To send/receive binary frame, use []byte type.
--
--Trivial usage:
--
-- import "websocket"
--
-- // receive text frame
-- var message string
-- websocket.Message.Receive(ws, &message)
--
-- // send text frame
-- message = "hello"
-- websocket.Message.Send(ws, message)
--
-- // receive binary frame
-- var data []byte
-- websocket.Message.Receive(ws, &data)
--
-- // send binary frame
-- data = []byte{0, 1, 2}
-- websocket.Message.Send(ws, data)
--
--*/
--var Message = Codec{marshal, unmarshal}
--
--func jsonMarshal(v interface{}) (msg []byte, payloadType byte, err error) {
-- msg, err = json.Marshal(v)
-- return msg, TextFrame, err
--}
--
--func jsonUnmarshal(msg []byte, payloadType byte, v interface{}) (err error) {
-- return json.Unmarshal(msg, v)
--}
--
--/*
--JSON is a codec to send/receive JSON data in a frame from a WebSocket connection.
--
--Trivial usage:
--
-- import "websocket"
--
-- type T struct {
-- Msg string
-- Count int
-- }
--
-- // receive JSON type T
-- var data T
-- websocket.JSON.Receive(ws, &data)
--
-- // send JSON type T
-- websocket.JSON.Send(ws, data)
--*/
--var JSON = Codec{jsonMarshal, jsonUnmarshal}
-diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/websocket/websocket_test.go b/Godeps/_workspace/src/code.google.com/p/go.net/websocket/websocket_test.go
-deleted file mode 100644
-index 48f14b6..0000000
---- a/Godeps/_workspace/src/code.google.com/p/go.net/websocket/websocket_test.go
-+++ /dev/null
-@@ -1,341 +0,0 @@
--// Copyright 2009 The Go Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--package websocket
--
--import (
-- "bytes"
-- "fmt"
-- "io"
-- "log"
-- "net"
-- "net/http"
-- "net/http/httptest"
-- "net/url"
-- "strings"
-- "sync"
-- "testing"
--)
--
--var serverAddr string
--var once sync.Once
--
--func echoServer(ws *Conn) { io.Copy(ws, ws) }
--
--type Count struct {
-- S string
-- N int
--}
--
--func countServer(ws *Conn) {
-- for {
-- var count Count
-- err := JSON.Receive(ws, &count)
-- if err != nil {
-- return
-- }
-- count.N++
-- count.S = strings.Repeat(count.S, count.N)
-- err = JSON.Send(ws, count)
-- if err != nil {
-- return
-- }
-- }
--}
--
--func subProtocolHandshake(config *Config, req *http.Request) error {
-- for _, proto := range config.Protocol {
-- if proto == "chat" {
-- config.Protocol = []string{proto}
-- return nil
-- }
-- }
-- return ErrBadWebSocketProtocol
--}
--
--func subProtoServer(ws *Conn) {
-- for _, proto := range ws.Config().Protocol {
-- io.WriteString(ws, proto)
-- }
--}
--
--func startServer() {
-- http.Handle("/echo", Handler(echoServer))
-- http.Handle("/count", Handler(countServer))
-- subproto := Server{
-- Handshake: subProtocolHandshake,
-- Handler: Handler(subProtoServer),
-- }
-- http.Handle("/subproto", subproto)
-- server := httptest.NewServer(nil)
-- serverAddr = server.Listener.Addr().String()
-- log.Print("Test WebSocket server listening on ", serverAddr)
--}
--
--func newConfig(t *testing.T, path string) *Config {
-- config, _ := NewConfig(fmt.Sprintf("ws://%s%s", serverAddr, path), "http://localhost")
-- return config
--}
--
--func TestEcho(t *testing.T) {
-- once.Do(startServer)
--
-- // websocket.Dial()
-- client, err := net.Dial("tcp", serverAddr)
-- if err != nil {
-- t.Fatal("dialing", err)
-- }
-- conn, err := NewClient(newConfig(t, "/echo"), client)
-- if err != nil {
-- t.Errorf("WebSocket handshake error: %v", err)
-- return
-- }
--
-- msg := []byte("hello, world\n")
-- if _, err := conn.Write(msg); err != nil {
-- t.Errorf("Write: %v", err)
-- }
-- var actual_msg = make([]byte, 512)
-- n, err := conn.Read(actual_msg)
-- if err != nil {
-- t.Errorf("Read: %v", err)
-- }
-- actual_msg = actual_msg[0:n]
-- if !bytes.Equal(msg, actual_msg) {
-- t.Errorf("Echo: expected %q got %q", msg, actual_msg)
-- }
-- conn.Close()
--}
--
--func TestAddr(t *testing.T) {
-- once.Do(startServer)
--
-- // websocket.Dial()
-- client, err := net.Dial("tcp", serverAddr)
-- if err != nil {
-- t.Fatal("dialing", err)
-- }
-- conn, err := NewClient(newConfig(t, "/echo"), client)
-- if err != nil {
-- t.Errorf("WebSocket handshake error: %v", err)
-- return
-- }
--
-- ra := conn.RemoteAddr().String()
-- if !strings.HasPrefix(ra, "ws://") || !strings.HasSuffix(ra, "/echo") {
-- t.Errorf("Bad remote addr: %v", ra)
-- }
-- la := conn.LocalAddr().String()
-- if !strings.HasPrefix(la, "http://") {
-- t.Errorf("Bad local addr: %v", la)
-- }
-- conn.Close()
--}
--
--func TestCount(t *testing.T) {
-- once.Do(startServer)
--
-- // websocket.Dial()
-- client, err := net.Dial("tcp", serverAddr)
-- if err != nil {
-- t.Fatal("dialing", err)
-- }
-- conn, err := NewClient(newConfig(t, "/count"), client)
-- if err != nil {
-- t.Errorf("WebSocket handshake error: %v", err)
-- return
-- }
--
-- var count Count
-- count.S = "hello"
-- if err := JSON.Send(conn, count); err != nil {
-- t.Errorf("Write: %v", err)
-- }
-- if err := JSON.Receive(conn, &count); err != nil {
-- t.Errorf("Read: %v", err)
-- }
-- if count.N != 1 {
-- t.Errorf("count: expected %d got %d", 1, count.N)
-- }
-- if count.S != "hello" {
-- t.Errorf("count: expected %q got %q", "hello", count.S)
-- }
-- if err := JSON.Send(conn, count); err != nil {
-- t.Errorf("Write: %v", err)
-- }
-- if err := JSON.Receive(conn, &count); err != nil {
-- t.Errorf("Read: %v", err)
-- }
-- if count.N != 2 {
-- t.Errorf("count: expected %d got %d", 2, count.N)
-- }
-- if count.S != "hellohello" {
-- t.Errorf("count: expected %q got %q", "hellohello", count.S)
-- }
-- conn.Close()
--}
--
--func TestWithQuery(t *testing.T) {
-- once.Do(startServer)
--
-- client, err := net.Dial("tcp", serverAddr)
-- if err != nil {
-- t.Fatal("dialing", err)
-- }
--
-- config := newConfig(t, "/echo")
-- config.Location, err = url.ParseRequestURI(fmt.Sprintf("ws://%s/echo?q=v", serverAddr))
-- if err != nil {
-- t.Fatal("location url", err)
-- }
--
-- ws, err := NewClient(config, client)
-- if err != nil {
-- t.Errorf("WebSocket handshake: %v", err)
-- return
-- }
-- ws.Close()
--}
--
--func testWithProtocol(t *testing.T, subproto []string) (string, error) {
-- once.Do(startServer)
--
-- client, err := net.Dial("tcp", serverAddr)
-- if err != nil {
-- t.Fatal("dialing", err)
-- }
--
-- config := newConfig(t, "/subproto")
-- config.Protocol = subproto
--
-- ws, err := NewClient(config, client)
-- if err != nil {
-- return "", err
-- }
-- msg := make([]byte, 16)
-- n, err := ws.Read(msg)
-- if err != nil {
-- return "", err
-- }
-- ws.Close()
-- return string(msg[:n]), nil
--}
--
--func TestWithProtocol(t *testing.T) {
-- proto, err := testWithProtocol(t, []string{"chat"})
-- if err != nil {
-- t.Errorf("SubProto: unexpected error: %v", err)
-- }
-- if proto != "chat" {
-- t.Errorf("SubProto: expected %q, got %q", "chat", proto)
-- }
--}
--
--func TestWithTwoProtocol(t *testing.T) {
-- proto, err := testWithProtocol(t, []string{"test", "chat"})
-- if err != nil {
-- t.Errorf("SubProto: unexpected error: %v", err)
-- }
-- if proto != "chat" {
-- t.Errorf("SubProto: expected %q, got %q", "chat", proto)
-- }
--}
--
--func TestWithBadProtocol(t *testing.T) {
-- _, err := testWithProtocol(t, []string{"test"})
-- if err != ErrBadStatus {
-- t.Errorf("SubProto: expected %v, got %v", ErrBadStatus, err)
-- }
--}
--
--func TestHTTP(t *testing.T) {
-- once.Do(startServer)
--
-- // If the client did not send a handshake that matches the protocol
-- // specification, the server MUST return an HTTP response with an
-- // appropriate error code (such as 400 Bad Request)
-- resp, err := http.Get(fmt.Sprintf("http://%s/echo", serverAddr))
-- if err != nil {
-- t.Errorf("Get: error %#v", err)
-- return
-- }
-- if resp == nil {
-- t.Error("Get: resp is null")
-- return
-- }
-- if resp.StatusCode != http.StatusBadRequest {
-- t.Errorf("Get: expected %q got %q", http.StatusBadRequest, resp.StatusCode)
-- }
--}
--
--func TestTrailingSpaces(t *testing.T) {
-- // http://code.google.com/p/go/issues/detail?id=955
-- // The last runs of this create keys with trailing spaces that should not be
-- // generated by the client.
-- once.Do(startServer)
-- config := newConfig(t, "/echo")
-- for i := 0; i < 30; i++ {
-- // body
-- ws, err := DialConfig(config)
-- if err != nil {
-- t.Errorf("Dial #%d failed: %v", i, err)
-- break
-- }
-- ws.Close()
-- }
--}
--
--func TestDialConfigBadVersion(t *testing.T) {
-- once.Do(startServer)
-- config := newConfig(t, "/echo")
-- config.Version = 1234
--
-- _, err := DialConfig(config)
--
-- if dialerr, ok := err.(*DialError); ok {
-- if dialerr.Err != ErrBadProtocolVersion {
-- t.Errorf("dial expected err %q but got %q", ErrBadProtocolVersion, dialerr.Err)
-- }
-- }
--}
--
--func TestSmallBuffer(t *testing.T) {
-- // http://code.google.com/p/go/issues/detail?id=1145
-- // Read should be able to handle reading a fragment of a frame.
-- once.Do(startServer)
--
-- // websocket.Dial()
-- client, err := net.Dial("tcp", serverAddr)
-- if err != nil {
-- t.Fatal("dialing", err)
-- }
-- conn, err := NewClient(newConfig(t, "/echo"), client)
-- if err != nil {
-- t.Errorf("WebSocket handshake error: %v", err)
-- return
-- }
--
-- msg := []byte("hello, world\n")
-- if _, err := conn.Write(msg); err != nil {
-- t.Errorf("Write: %v", err)
-- }
-- var small_msg = make([]byte, 8)
-- n, err := conn.Read(small_msg)
-- if err != nil {
-- t.Errorf("Read: %v", err)
-- }
-- if !bytes.Equal(msg[:len(small_msg)], small_msg) {
-- t.Errorf("Echo: expected %q got %q", msg[:len(small_msg)], small_msg)
-- }
-- var second_msg = make([]byte, len(msg))
-- n, err = conn.Read(second_msg)
-- if err != nil {
-- t.Errorf("Read: %v", err)
-- }
-- second_msg = second_msg[0:n]
-- if !bytes.Equal(msg[len(small_msg):], second_msg) {
-- t.Errorf("Echo: expected %q got %q", msg[len(small_msg):], second_msg)
-- }
-- conn.Close()
--}
-diff --git a/Godeps/_workspace/src/code.google.com/p/goauth2/compute/serviceaccount/serviceaccount.go b/Godeps/_workspace/src/code.google.com/p/goauth2/compute/serviceaccount/serviceaccount.go
-deleted file mode 100644
-index ed3e10c..0000000
---- a/Godeps/_workspace/src/code.google.com/p/goauth2/compute/serviceaccount/serviceaccount.go
-+++ /dev/null
-@@ -1,172 +0,0 @@
--// Copyright 2013 The goauth2 Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--// Package serviceaccount provides support for making OAuth2-authorized
--// HTTP requests from Google Compute Engine instances using service accounts.
--//
--// See: https://developers.google.com/compute/docs/authentication
--//
--// Example usage:
--//
--// client, err := serviceaccount.NewClient(&serviceaccount.Options{})
--// if err != nil {
--// c.Errorf("failed to create service account client: %q", err)
--// return err
--// }
--// client.Post("https://www.googleapis.com/compute/...", ...)
--// client.Post("https://www.googleapis.com/bigquery/...", ...)
--//
--package serviceaccount
--
--import (
-- "encoding/json"
-- "net/http"
-- "net/url"
-- "path"
-- "sync"
-- "time"
--
-- "code.google.com/p/goauth2/oauth"
--)
--
--const (
-- metadataServer = "metadata"
-- serviceAccountPath = "/computeMetadata/v1/instance/service-accounts"
--)
--
--// Options configures a service account Client.
--type Options struct {
-- // Underlying transport of service account Client.
-- // If nil, http.DefaultTransport is used.
-- Transport http.RoundTripper
--
-- // Service account name.
-- // If empty, "default" is used.
-- Account string
--}
--
--// NewClient returns an *http.Client authorized with the service account
--// configured in the Google Compute Engine instance.
--func NewClient(opt *Options) (*http.Client, error) {
-- tr := http.DefaultTransport
-- account := "default"
-- if opt != nil {
-- if opt.Transport != nil {
-- tr = opt.Transport
-- }
-- if opt.Account != "" {
-- account = opt.Account
-- }
-- }
-- t := &transport{
-- Transport: tr,
-- Account: account,
-- }
-- // Get the initial access token.
-- if _, err := fetchToken(t); err != nil {
-- return nil, err
-- }
-- return &http.Client{
-- Transport: t,
-- }, nil
--}
--
--type tokenData struct {
-- AccessToken string `json:"access_token"`
-- ExpiresIn float64 `json:"expires_in"`
-- TokenType string `json:"token_type"`
--}
--
--// transport is an oauth.Transport with a custom Refresh and RoundTrip implementation.
--type transport struct {
-- Transport http.RoundTripper
-- Account string
--
-- mu sync.Mutex
-- *oauth.Token
--}
--
--// Refresh renews the transport's AccessToken.
--// t.mu sould be held when this is called.
--func (t *transport) refresh() error {
-- // https://developers.google.com/compute/docs/metadata#transitioning
-- // v1 requires "Metadata-Flavor: Google" header.
-- tokenURL := &url.URL{
-- Scheme: "http",
-- Host: metadataServer,
-- Path: path.Join(serviceAccountPath, t.Account, "token"),
-- }
-- req, err := http.NewRequest("GET", tokenURL.String(), nil)
-- if err != nil {
-- return err
-- }
-- req.Header.Add("Metadata-Flavor", "Google")
-- resp, err := http.DefaultClient.Do(req)
-- if err != nil {
-- return err
-- }
-- defer resp.Body.Close()
-- d := json.NewDecoder(resp.Body)
-- var token tokenData
-- err = d.Decode(&token)
-- if err != nil {
-- return err
-- }
-- t.Token = &oauth.Token{
-- AccessToken: token.AccessToken,
-- Expiry: time.Now().Add(time.Duration(token.ExpiresIn) * time.Second),
-- }
-- return nil
--}
--
--// Refresh renews the transport's AccessToken.
--func (t *transport) Refresh() error {
-- t.mu.Lock()
-- defer t.mu.Unlock()
-- return t.refresh()
--}
--
--// Fetch token from cache or generate a new one if cache miss or expired.
--func fetchToken(t *transport) (*oauth.Token, error) {
-- // Get a new token using Refresh in case of a cache miss of if it has expired.
-- t.mu.Lock()
-- defer t.mu.Unlock()
-- if t.Token == nil || t.Expired() {
-- if err := t.refresh(); err != nil {
-- return nil, err
-- }
-- }
-- return t.Token, nil
--}
--
--// cloneRequest returns a clone of the provided *http.Request.
--// The clone is a shallow copy of the struct and its Header map.
--func cloneRequest(r *http.Request) *http.Request {
-- // shallow copy of the struct
-- r2 := new(http.Request)
-- *r2 = *r
-- // deep copy of the Header
-- r2.Header = make(http.Header)
-- for k, s := range r.Header {
-- r2.Header[k] = s
-- }
-- return r2
--}
--
--// RoundTrip issues an authorized HTTP request and returns its response.
--func (t *transport) RoundTrip(req *http.Request) (*http.Response, error) {
-- token, err := fetchToken(t)
-- if err != nil {
-- return nil, err
-- }
--
-- // To set the Authorization header, we must make a copy of the Request
-- // so that we don't modify the Request we were given.
-- // This is required by the specification of http.RoundTripper.
-- newReq := cloneRequest(req)
-- newReq.Header.Set("Authorization", "Bearer "+token.AccessToken)
--
-- // Make the HTTP request.
-- return t.Transport.RoundTrip(newReq)
--}
-diff --git a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/example/oauthreq.go b/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/example/oauthreq.go
-deleted file mode 100644
-index f9651bd..0000000
---- a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/example/oauthreq.go
-+++ /dev/null
-@@ -1,100 +0,0 @@
--// Copyright 2011 The goauth2 Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--// This program makes a call to the specified API, authenticated with OAuth2.
--// a list of example APIs can be found at https://code.google.com/oauthplayground/
--package main
--
--import (
-- "flag"
-- "fmt"
-- "io"
-- "log"
-- "os"
--
-- "code.google.com/p/goauth2/oauth"
--)
--
--var (
-- clientId = flag.String("id", "", "Client ID")
-- clientSecret = flag.String("secret", "", "Client Secret")
-- scope = flag.String("scope", "https://www.googleapis.com/auth/userinfo.profile", "OAuth scope")
-- redirectURL = flag.String("redirect_url", "oob", "Redirect URL")
-- authURL = flag.String("auth_url", "https://accounts.google.com/o/oauth2/auth", "Authentication URL")
-- tokenURL = flag.String("token_url", "https://accounts.google.com/o/oauth2/token", "Token URL")
-- requestURL = flag.String("request_url", "https://www.googleapis.com/oauth2/v1/userinfo", "API request")
-- code = flag.String("code", "", "Authorization Code")
-- cachefile = flag.String("cache", "cache.json", "Token cache file")
--)
--
--const usageMsg = `
--To obtain a request token you must specify both -id and -secret.
--
--To obtain Client ID and Secret, see the "OAuth 2 Credentials" section under
--the "API Access" tab on this page: https://code.google.com/apis/console/
--
--Once you have completed the OAuth flow, the credentials should be stored inside
--the file specified by -cache and you may run without the -id and -secret flags.
--`
--
--func main() {
-- flag.Parse()
--
-- // Set up a configuration.
-- config := &oauth.Config{
-- ClientId: *clientId,
-- ClientSecret: *clientSecret,
-- RedirectURL: *redirectURL,
-- Scope: *scope,
-- AuthURL: *authURL,
-- TokenURL: *tokenURL,
-- TokenCache: oauth.CacheFile(*cachefile),
-- }
--
-- // Set up a Transport using the config.
-- transport := &oauth.Transport{Config: config}
--
-- // Try to pull the token from the cache; if this fails, we need to get one.
-- token, err := config.TokenCache.Token()
-- if err != nil {
-- if *clientId == "" || *clientSecret == "" {
-- flag.Usage()
-- fmt.Fprint(os.Stderr, usageMsg)
-- os.Exit(2)
-- }
-- if *code == "" {
-- // Get an authorization code from the data provider.
-- // ("Please ask the user if I can access this resource.")
-- url := config.AuthCodeURL("")
-- fmt.Print("Visit this URL to get a code, then run again with -code=YOUR_CODE\n\n")
-- fmt.Println(url)
-- return
-- }
-- // Exchange the authorization code for an access token.
-- // ("Here's the code you gave the user, now give me a token!")
-- token, err = transport.Exchange(*code)
-- if err != nil {
-- log.Fatal("Exchange:", err)
-- }
-- // (The Exchange method will automatically cache the token.)
-- fmt.Printf("Token is cached in %v\n", config.TokenCache)
-- }
--
-- // Make the actual request using the cached token to authenticate.
-- // ("Here's the token, let me in!")
-- transport.Token = token
--
-- // Make the request.
-- r, err := transport.Client().Get(*requestURL)
-- if err != nil {
-- log.Fatal("Get:", err)
-- }
-- defer r.Body.Close()
--
-- // Write the response to standard output.
-- io.Copy(os.Stdout, r.Body)
--
-- // Send final carriage return, just to be neat.
-- fmt.Println()
--}
-diff --git a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/example/example.client_secrets.json b/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/example/example.client_secrets.json
-deleted file mode 100644
-index 2ea86f2..0000000
---- a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/example/example.client_secrets.json
-+++ /dev/null
-@@ -1 +0,0 @@
--{"web":{"auth_uri":"https://accounts.google.com/o/oauth2/auth","token_uri":"https://accounts.google.com/o/oauth2/token","client_email":"XXXXXXXXXXXX at developer.gserviceaccount.com","client_x509_cert_url":"https://www.googleapis.com/robot/v1/metadata/x509/XXXXXXXXXXXX@developer.gserviceaccount.com","client_id":"XXXXXXXXXXXX.apps.googleusercontent.com","auth_provider_x509_cert_url":"https://www.googleapis.com/oauth2/v1/certs"}}
-diff --git a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/example/example.pem b/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/example/example.pem
-deleted file mode 100644
-index 8f78b92..0000000
---- a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/example/example.pem
-+++ /dev/null
-@@ -1,20 +0,0 @@
--Bag Attributes
-- friendlyName: privatekey
-- localKeyID: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
--Key Attributes: <No Attributes>
-------BEGIN PRIVATE KEY-----
--XXXXxyXXXXXXXxxyxxxX9y0XXYXXXXYXXxXyxxXxXxXXXyXXXXx4yx1xy1xyYxxY
--1XxYy38YxXxxxyXxyyxx+xxxxyx1Y1xYx7yx2/Y1XyyXYYYxY5YXxX0xY/Y642yX
--zYYxYXzXYxY0Y8y9YxyYXxxX40YyXxxXX4XXxx7XxXxxXyXxYYXxXyxX5XY0Yy2X
--1YX0XXyy6YXyXx9XxXxyXX9XXYXxXxXXXXXXxYXYY3Y8Yy311XYYY81XyY14Xyyx
--xXyx7xxXXXxxxxyyyX4YYYXyYyYXyxX4XYXYyxXYyx9xy23xXYyXyxYxXxx1XXXY
--y98yX6yYxyyyX4Xyx1Xy/0yxxYxXxYYx2xx7yYXXXxYXXXxyXyyYYxx5XX2xxyxy
--y6Yyyx0XX3YYYyx9YYXXXX7y0yxXXy+90XYz1y2xyx7yXxX+8X0xYxXXYxxyxYYy
--YXx8Yy4yX0Xyxxx6yYX92yxy1YYYzyyyyxy55x/yyXXXYYXYXXzXXxYYxyXY8XXX
--+y9+yXxX7XxxyYYxxXYxyY623xxXxYX59x5Y6yYyXYY4YxXXYXXXYxXYxXxXXx6x
--YXX7XxXX2X0XY7YXyYy1XXxYXxXxYY1xXXxxxyy+07zXYxYxxXyyxxyxXx1XYy5X
--5XYzyxYxXXYyX9XX7xX8xXxx+XXYyYXXXX5YY1x8Yxyx54Xy/1XXyyYXY5YxYyxY
--XyyxXyX/YxxXXXxXXYXxyxx63xX/xxyYXXyYzx0XY+YxX5xyYyyxxxXXYX/94XXy
--Xx63xYxXyXY3/XXxyyXX15XXXyz08XYY5YYXY/YXy/96x68XyyXXxYyXy4xYXx5x
--7yxxyxxYxXxyx3y=
-------END PRIVATE KEY-----
-diff --git a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/example/main.go b/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/example/main.go
-deleted file mode 100644
-index 2256e9c..0000000
---- a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/example/main.go
-+++ /dev/null
-@@ -1,114 +0,0 @@
--// Copyright 2011 The goauth2 Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--// This program makes a read only call to the Google Cloud Storage API,
--// authenticated with OAuth2. A list of example APIs can be found at
--// https://code.google.com/oauthplayground/
--package main
--
--import (
-- "encoding/json"
-- "flag"
-- "fmt"
-- "io/ioutil"
-- "log"
-- "net/http"
-- "strings"
--
-- "code.google.com/p/goauth2/oauth/jwt"
--)
--
--const scope = "https://www.googleapis.com/auth/devstorage.read_only"
--
--var (
-- secretsFile = flag.String("s", "", "JSON encoded secrets for the service account")
-- pemFile = flag.String("k", "", "private pem key file for the service account")
--)
--
--const usageMsg = `
--You must specify -k and -s.
--
--To obtain client secrets and pem, see the "OAuth 2 Credentials" section under
--the "API Access" tab on this page: https://code.google.com/apis/console/
--
--Google Cloud Storage must also be turned on in the API console.
--`
--
--func main() {
-- flag.Parse()
--
-- if *secretsFile == "" || *pemFile == "" {
-- flag.Usage()
-- fmt.Println(usageMsg)
-- return
-- }
--
-- // Read the secret file bytes into the config.
-- secretBytes, err := ioutil.ReadFile(*secretsFile)
-- if err != nil {
-- log.Fatal("error reading secerets file:", err)
-- }
-- var config struct {
-- Web struct {
-- ClientEmail string `json:"client_email"`
-- ClientID string `json:"client_id"`
-- TokenURI string `json:"token_uri"`
-- }
-- }
-- err = json.Unmarshal(secretBytes, &config)
-- if err != nil {
-- log.Fatal("error unmarshalling secerets:", err)
-- }
--
-- // Get the project ID from the client ID.
-- projectID := strings.SplitN(config.Web.ClientID, "-", 2)[0]
--
-- // Read the pem file bytes for the private key.
-- keyBytes, err := ioutil.ReadFile(*pemFile)
-- if err != nil {
-- log.Fatal("error reading private key file:", err)
-- }
--
-- // Craft the ClaimSet and JWT token.
-- t := jwt.NewToken(config.Web.ClientEmail, scope, keyBytes)
-- t.ClaimSet.Aud = config.Web.TokenURI
--
-- // We need to provide a client.
-- c := &http.Client{}
--
-- // Get the access token.
-- o, err := t.Assert(c)
-- if err != nil {
-- log.Fatal("assertion error:", err)
-- }
--
-- // Refresh token will be missing, but this access_token will be good
-- // for one hour.
-- fmt.Printf("access_token = %v\n", o.AccessToken)
-- fmt.Printf("refresh_token = %v\n", o.RefreshToken)
-- fmt.Printf("expires %v\n", o.Expiry)
--
-- // Form the request to list Google Cloud Storage buckets.
-- req, err := http.NewRequest("GET", "https://storage.googleapis.com/", nil)
-- if err != nil {
-- log.Fatal("http.NewRequest:", err)
-- }
-- req.Header.Set("Authorization", "OAuth "+o.AccessToken)
-- req.Header.Set("x-goog-api-version", "2")
-- req.Header.Set("x-goog-project-id", projectID)
--
-- // Make the request.
-- r, err := c.Do(req)
-- if err != nil {
-- log.Fatal("API request error:", err)
-- }
-- defer r.Body.Close()
--
-- // Write the response to standard output.
-- res, err := ioutil.ReadAll(r.Body)
-- if err != nil {
-- log.Fatal("error reading API request results:", err)
-- }
-- fmt.Printf("\nRESULT:\n%s\n", res)
--}
-diff --git a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/jwt.go b/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/jwt.go
-deleted file mode 100644
-index 61bf5ce..0000000
---- a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/jwt.go
-+++ /dev/null
-@@ -1,511 +0,0 @@
--// Copyright 2012 The goauth2 Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--// The jwt package provides support for creating credentials for OAuth2 service
--// account requests.
--//
--// For examples of the package usage please see jwt_test.go.
--// Example usage (error handling omitted for brevity):
--//
--// // Craft the ClaimSet and JWT token.
--// iss := "XXXXXXXXXXXX at developer.gserviceaccount.com"
--// scope := "https://www.googleapis.com/auth/devstorage.read_only"
--// t := jwt.NewToken(iss, scope, pemKeyBytes)
--//
--// // We need to provide a client.
--// c := &http.Client{}
--//
--// // Get the access token.
--// o, _ := t.Assert(c)
--//
--// // Form the request to the service.
--// req, _ := http.NewRequest("GET", "https://storage.googleapis.com/", nil)
--// req.Header.Set("Authorization", "OAuth "+o.AccessToken)
--// req.Header.Set("x-goog-api-version", "2")
--// req.Header.Set("x-goog-project-id", "XXXXXXXXXXXX")
--//
--// // Make the request.
--// result, _ := c.Do(req)
--//
--// For info on OAuth2 service accounts please see the online documentation.
--// https://developers.google.com/accounts/docs/OAuth2ServiceAccount
--//
--package jwt
--
--import (
-- "bytes"
-- "crypto"
-- "crypto/rand"
-- "crypto/rsa"
-- "crypto/sha256"
-- "crypto/x509"
-- "encoding/base64"
-- "encoding/json"
-- "encoding/pem"
-- "errors"
-- "fmt"
-- "net/http"
-- "net/url"
-- "strings"
-- "time"
--
-- "code.google.com/p/goauth2/oauth"
--)
--
--// These are the default/standard values for this to work for Google service accounts.
--const (
-- stdAlgorithm = "RS256"
-- stdType = "JWT"
-- stdAssertionType = "http://oauth.net/grant_type/jwt/1.0/bearer"
-- stdGrantType = "urn:ietf:params:oauth:grant-type:jwt-bearer"
-- stdAud = "https://accounts.google.com/o/oauth2/token"
--)
--
--var (
-- ErrInvalidKey = errors.New("Invalid Key")
--)
--
--// base64Encode returns and Base64url encoded version of the input string with any
--// trailing "=" stripped.
--func base64Encode(b []byte) string {
-- return strings.TrimRight(base64.URLEncoding.EncodeToString(b), "=")
--}
--
--// base64Decode decodes the Base64url encoded string
--func base64Decode(s string) ([]byte, error) {
-- // add back missing padding
-- switch len(s) % 4 {
-- case 2:
-- s += "=="
-- case 3:
-- s += "="
-- }
-- return base64.URLEncoding.DecodeString(s)
--}
--
--// The JWT claim set contains information about the JWT including the
--// permissions being requested (scopes), the target of the token, the issuer,
--// the time the token was issued, and the lifetime of the token.
--//
--// Aud is usually https://accounts.google.com/o/oauth2/token
--type ClaimSet struct {
-- Iss string `json:"iss"` // email address of the client_id of the application making the access token request
-- Scope string `json:"scope,omitempty"` // space-delimited list of the permissions the application requests
-- Aud string `json:"aud"` // descriptor of the intended target of the assertion (Optional).
-- Prn string `json:"prn,omitempty"` // email for which the application is requesting delegated access (Optional).
-- Exp int64 `json:"exp"`
-- Iat int64 `json:"iat"`
-- Typ string `json:"typ,omitempty"`
-- Sub string `json:"sub,omitempty"` // Add support for googleapi delegation support
--
-- // See http://tools.ietf.org/html/draft-jones-json-web-token-10#section-4.3
-- // This array is marshalled using custom code (see (c *ClaimSet) encode()).
-- PrivateClaims map[string]interface{} `json:"-"`
--
-- exp time.Time
-- iat time.Time
--}
--
--// setTimes sets iat and exp to time.Now() and iat.Add(time.Hour) respectively.
--//
--// Note that these times have nothing to do with the expiration time for the
--// access_token returned by the server. These have to do with the lifetime of
--// the encoded JWT.
--//
--// A JWT can be re-used for up to one hour after it was encoded. The access
--// token that is granted will also be good for one hour so there is little point
--// in trying to use the JWT a second time.
--func (c *ClaimSet) setTimes(t time.Time) {
-- c.iat = t
-- c.exp = c.iat.Add(time.Hour)
--}
--
--var (
-- jsonStart = []byte{'{'}
-- jsonEnd = []byte{'}'}
--)
--
--// encode returns the Base64url encoded form of the Signature.
--func (c *ClaimSet) encode() string {
-- if c.exp.IsZero() || c.iat.IsZero() {
-- c.setTimes(time.Now())
-- }
-- if c.Aud == "" {
-- c.Aud = stdAud
-- }
-- c.Exp = c.exp.Unix()
-- c.Iat = c.iat.Unix()
--
-- b, err := json.Marshal(c)
-- if err != nil {
-- panic(err)
-- }
--
-- if len(c.PrivateClaims) == 0 {
-- return base64Encode(b)
-- }
--
-- // Marshal private claim set and then append it to b.
-- prv, err := json.Marshal(c.PrivateClaims)
-- if err != nil {
-- panic(fmt.Errorf("Invalid map of private claims %v", c.PrivateClaims))
-- }
--
-- // Concatenate public and private claim JSON objects.
-- if !bytes.HasSuffix(b, jsonEnd) {
-- panic(fmt.Errorf("Invalid JSON %s", b))
-- }
-- if !bytes.HasPrefix(prv, jsonStart) {
-- panic(fmt.Errorf("Invalid JSON %s", prv))
-- }
-- b[len(b)-1] = ',' // Replace closing curly brace with a comma.
-- b = append(b, prv[1:]...) // Append private claims.
--
-- return base64Encode(b)
--}
--
--// Header describes the algorithm and type of token being generated,
--// and optionally a KeyID describing additional parameters for the
--// signature.
--type Header struct {
-- Algorithm string `json:"alg"`
-- Type string `json:"typ"`
-- KeyId string `json:"kid,omitempty"`
--}
--
--func (h *Header) encode() string {
-- b, err := json.Marshal(h)
-- if err != nil {
-- panic(err)
-- }
-- return base64Encode(b)
--}
--
--// A JWT is composed of three parts: a header, a claim set, and a signature.
--// The well formed and encoded JWT can then be exchanged for an access token.
--//
--// The Token is not a JWT, but is is encoded to produce a well formed JWT.
--//
--// When obtaining a key from the Google API console it will be downloaded in a
--// PKCS12 encoding. To use this key you will need to convert it to a PEM file.
--// This can be achieved with openssl.
--//
--// $ openssl pkcs12 -in <key.p12> -nocerts -passin pass:notasecret -nodes -out <key.pem>
--//
--// The contents of this file can then be used as the Key.
--type Token struct {
-- ClaimSet *ClaimSet // claim set used to construct the JWT
-- Header *Header // header used to construct the JWT
-- Key []byte // PEM printable encoding of the private key
-- pKey *rsa.PrivateKey
--
-- header string
-- claim string
-- sig string
--
-- useExternalSigner bool
-- signer Signer
--}
--
--// NewToken returns a filled in *Token based on the standard header,
--// and sets the Iat and Exp times based on when the call to Assert is
--// made.
--func NewToken(iss, scope string, key []byte) *Token {
-- c := &ClaimSet{
-- Iss: iss,
-- Scope: scope,
-- Aud: stdAud,
-- }
-- h := &Header{
-- Algorithm: stdAlgorithm,
-- Type: stdType,
-- }
-- t := &Token{
-- ClaimSet: c,
-- Header: h,
-- Key: key,
-- }
-- return t
--}
--
--// Signer is an interface that given a JWT token, returns the header &
--// claim (serialized and urlEncoded to a byte slice), along with the
--// signature and an error (if any occured). It could modify any data
--// to sign (typically the KeyID).
--//
--// Example usage where a SHA256 hash of the original url-encoded token
--// with an added KeyID and secret data is used as a signature:
--//
--// var privateData = "secret data added to hash, indexed by KeyID"
--//
--// type SigningService struct{}
--//
--// func (ss *SigningService) Sign(in *jwt.Token) (newTokenData, sig []byte, err error) {
--// in.Header.KeyID = "signing service"
--// newTokenData = in.EncodeWithoutSignature()
--// dataToSign := fmt.Sprintf("%s.%s", newTokenData, privateData)
--// h := sha256.New()
--// _, err := h.Write([]byte(dataToSign))
--// sig = h.Sum(nil)
--// return
--// }
--type Signer interface {
-- Sign(in *Token) (tokenData, signature []byte, err error)
--}
--
--// NewSignerToken returns a *Token, using an external signer function
--func NewSignerToken(iss, scope string, signer Signer) *Token {
-- t := NewToken(iss, scope, nil)
-- t.useExternalSigner = true
-- t.signer = signer
-- return t
--}
--
--// Expired returns a boolean value letting us know if the token has expired.
--func (t *Token) Expired() bool {
-- return t.ClaimSet.exp.Before(time.Now())
--}
--
--// Encode constructs and signs a Token returning a JWT ready to use for
--// requesting an access token.
--func (t *Token) Encode() (string, error) {
-- var tok string
-- t.header = t.Header.encode()
-- t.claim = t.ClaimSet.encode()
-- err := t.sign()
-- if err != nil {
-- return tok, err
-- }
-- tok = fmt.Sprintf("%s.%s.%s", t.header, t.claim, t.sig)
-- return tok, nil
--}
--
--// EncodeWithoutSignature returns the url-encoded value of the Token
--// before signing has occured (typically for use by external signers).
--func (t *Token) EncodeWithoutSignature() string {
-- t.header = t.Header.encode()
-- t.claim = t.ClaimSet.encode()
-- return fmt.Sprintf("%s.%s", t.header, t.claim)
--}
--
--// sign computes the signature for a Token. The details for this can be found
--// in the OAuth2 Service Account documentation.
--// https://developers.google.com/accounts/docs/OAuth2ServiceAccount#computingsignature
--func (t *Token) sign() error {
-- if t.useExternalSigner {
-- fulldata, sig, err := t.signer.Sign(t)
-- if err != nil {
-- return err
-- }
-- split := strings.Split(string(fulldata), ".")
-- if len(split) != 2 {
-- return errors.New("no token returned")
-- }
-- t.header = split[0]
-- t.claim = split[1]
-- t.sig = base64Encode(sig)
-- return err
-- }
-- ss := fmt.Sprintf("%s.%s", t.header, t.claim)
-- if t.pKey == nil {
-- err := t.parsePrivateKey()
-- if err != nil {
-- return err
-- }
-- }
-- h := sha256.New()
-- h.Write([]byte(ss))
-- b, err := rsa.SignPKCS1v15(rand.Reader, t.pKey, crypto.SHA256, h.Sum(nil))
-- t.sig = base64Encode(b)
-- return err
--}
--
--// parsePrivateKey converts the Token's Key ([]byte) into a parsed
--// rsa.PrivateKey. If the key is not well formed this method will return an
--// ErrInvalidKey error.
--func (t *Token) parsePrivateKey() error {
-- block, _ := pem.Decode(t.Key)
-- if block == nil {
-- return ErrInvalidKey
-- }
-- parsedKey, err := x509.ParsePKCS8PrivateKey(block.Bytes)
-- if err != nil {
-- parsedKey, err = x509.ParsePKCS1PrivateKey(block.Bytes)
-- if err != nil {
-- return err
-- }
-- }
-- var ok bool
-- t.pKey, ok = parsedKey.(*rsa.PrivateKey)
-- if !ok {
-- return ErrInvalidKey
-- }
-- return nil
--}
--
--// Assert obtains an *oauth.Token from the remote server by encoding and sending
--// a JWT. The access_token will expire in one hour (3600 seconds) and cannot be
--// refreshed (no refresh_token is returned with the response). Once this token
--// expires call this method again to get a fresh one.
--func (t *Token) Assert(c *http.Client) (*oauth.Token, error) {
-- var o *oauth.Token
-- t.ClaimSet.setTimes(time.Now())
-- u, v, err := t.buildRequest()
-- if err != nil {
-- return o, err
-- }
-- resp, err := c.PostForm(u, v)
-- if err != nil {
-- return o, err
-- }
-- o, err = handleResponse(resp)
-- return o, err
--}
--
--// buildRequest sets up the URL values and the proper URL string for making our
--// access_token request.
--func (t *Token) buildRequest() (string, url.Values, error) {
-- v := url.Values{}
-- j, err := t.Encode()
-- if err != nil {
-- return t.ClaimSet.Aud, v, err
-- }
-- v.Set("grant_type", stdGrantType)
-- v.Set("assertion", j)
-- return t.ClaimSet.Aud, v, nil
--}
--
--// Used for decoding the response body.
--type respBody struct {
-- IdToken string `json:"id_token"`
-- Access string `json:"access_token"`
-- Type string `json:"token_type"`
-- ExpiresIn time.Duration `json:"expires_in"`
--}
--
--// handleResponse returns a filled in *oauth.Token given the *http.Response from
--// a *http.Request created by buildRequest.
--func handleResponse(r *http.Response) (*oauth.Token, error) {
-- o := &oauth.Token{}
-- defer r.Body.Close()
-- if r.StatusCode != 200 {
-- return o, errors.New("invalid response: " + r.Status)
-- }
-- b := &respBody{}
-- err := json.NewDecoder(r.Body).Decode(b)
-- if err != nil {
-- return o, err
-- }
-- o.AccessToken = b.Access
-- if b.IdToken != "" {
-- // decode returned id token to get expiry
-- o.AccessToken = b.IdToken
-- s := strings.Split(b.IdToken, ".")
-- if len(s) < 2 {
-- return nil, errors.New("invalid token received")
-- }
-- d, err := base64Decode(s[1])
-- if err != nil {
-- return o, err
-- }
-- c := &ClaimSet{}
-- err = json.NewDecoder(bytes.NewBuffer(d)).Decode(c)
-- if err != nil {
-- return o, err
-- }
-- o.Expiry = time.Unix(c.Exp, 0)
-- return o, nil
-- }
-- o.Expiry = time.Now().Add(b.ExpiresIn * time.Second)
-- return o, nil
--}
--
--// Transport implements http.RoundTripper. When configured with a valid
--// JWT and OAuth tokens it can be used to make authenticated HTTP requests.
--//
--// t := &jwt.Transport{jwtToken, oauthToken}
--// r, _, err := t.Client().Get("http://example.org/url/requiring/auth")
--//
--// It will automatically refresh the OAuth token if it can, updating in place.
--type Transport struct {
-- JWTToken *Token
-- OAuthToken *oauth.Token
--
-- // Transport is the HTTP transport to use when making requests.
-- // It will default to http.DefaultTransport if nil.
-- Transport http.RoundTripper
--}
--
--// Creates a new authenticated transport.
--func NewTransport(token *Token) (*Transport, error) {
-- oa, err := token.Assert(new(http.Client))
-- if err != nil {
-- return nil, err
-- }
-- return &Transport{
-- JWTToken: token,
-- OAuthToken: oa,
-- }, nil
--}
--
--// Client returns an *http.Client that makes OAuth-authenticated requests.
--func (t *Transport) Client() *http.Client {
-- return &http.Client{Transport: t}
--}
--
--// Fetches the internal transport.
--func (t *Transport) transport() http.RoundTripper {
-- if t.Transport != nil {
-- return t.Transport
-- }
-- return http.DefaultTransport
--}
--
--// RoundTrip executes a single HTTP transaction using the Transport's
--// OAuthToken as authorization headers.
--//
--// This method will attempt to renew the token if it has expired and may return
--// an error related to that token renewal before attempting the client request.
--// If the token cannot be renewed a non-nil os.Error value will be returned.
--// If the token is invalid callers should expect HTTP-level errors,
--// as indicated by the Response's StatusCode.
--func (t *Transport) RoundTrip(req *http.Request) (*http.Response, error) {
-- // Sanity check the two tokens
-- if t.JWTToken == nil {
-- return nil, fmt.Errorf("no JWT token supplied")
-- }
-- if t.OAuthToken == nil {
-- return nil, fmt.Errorf("no OAuth token supplied")
-- }
-- // Refresh the OAuth token if it has expired
-- if t.OAuthToken.Expired() {
-- if oa, err := t.JWTToken.Assert(new(http.Client)); err != nil {
-- return nil, err
-- } else {
-- t.OAuthToken = oa
-- }
-- }
-- // To set the Authorization header, we must make a copy of the Request
-- // so that we don't modify the Request we were given.
-- // This is required by the specification of http.RoundTripper.
-- req = cloneRequest(req)
-- req.Header.Set("Authorization", "Bearer "+t.OAuthToken.AccessToken)
--
-- // Make the HTTP request.
-- return t.transport().RoundTrip(req)
--}
--
--// cloneRequest returns a clone of the provided *http.Request.
--// The clone is a shallow copy of the struct and its Header map.
--func cloneRequest(r *http.Request) *http.Request {
-- // shallow copy of the struct
-- r2 := new(http.Request)
-- *r2 = *r
-- // deep copy of the Header
-- r2.Header = make(http.Header)
-- for k, s := range r.Header {
-- r2.Header[k] = s
-- }
-- return r2
--}
-diff --git a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/jwt_test.go b/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/jwt_test.go
-deleted file mode 100644
-index 622843e..0000000
---- a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/jwt_test.go
-+++ /dev/null
-@@ -1,486 +0,0 @@
--// Copyright 2012 The goauth2 Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--// For package documentation please see jwt.go.
--//
--package jwt
--
--import (
-- "bytes"
-- "crypto"
-- "crypto/rand"
-- "crypto/rsa"
-- "crypto/sha256"
-- "crypto/x509"
-- "encoding/json"
-- "encoding/pem"
-- "io/ioutil"
-- "net/http"
-- "testing"
-- "time"
--)
--
--const (
-- stdHeaderStr = `{"alg":"RS256","typ":"JWT"}`
-- iss = "761326798069-r5mljlln1rd4lrbhg75efgigp36m78j5 at developer.gserviceaccount.com"
-- scope = "https://www.googleapis.com/auth/prediction"
-- exp = 1328554385
-- iat = 1328550785 // exp + 1 hour
--)
--
--// Base64url encoded Header
--const headerEnc = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9"
--
--// Base64url encoded ClaimSet
--const claimSetEnc = "eyJpc3MiOiI3NjEzMjY3OTgwNjktcjVtbGpsbG4xcmQ0bHJiaGc3NWVmZ2lncDM2bTc4ajVAZGV2ZWxvcGVyLmdzZXJ2aWNlYWNjb3VudC5jb20iLCJzY29wZSI6Imh0dHBzOi8vd3d3Lmdvb2dsZWFwaXMuY29tL2F1dGgvcHJlZGljdGlvbiIsImF1ZCI6Imh0dHBzOi8vYWNjb3VudHMuZ29vZ2xlLmNvbS9vL29hdXRoMi90b2tlbiIsImV4cCI6MTMyODU1NDM4NSwiaWF0IjoxMzI4NTUwNzg1fQ"
--
--// Base64url encoded Signature
--const sigEnc = "olukbHreNiYrgiGCTEmY3eWGeTvYDSUHYoE84Jz3BRPBSaMdZMNOn_0CYK7UHPO7OdvUofjwft1dH59UxE9GWS02pjFti1uAQoImaqjLZoTXr8qiF6O_kDa9JNoykklWlRAIwGIZkDupCS-8cTAnM_ksSymiH1coKJrLDUX_BM0x2f4iMFQzhL5vT1ll-ZipJ0lNlxb5QsyXxDYcxtHYguF12-vpv3ItgT0STfcXoWzIGQoEbhwB9SBp9JYcQ8Ygz6pYDjm0rWX9LrchmTyDArCodpKLFtutNgcIFUP9fWxvwd1C2dNw5GjLcKr9a_SAERyoJ2WnCR1_j9N0wD2o0g"
--
--// Base64url encoded Token
--const tokEnc = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiI3NjEzMjY3OTgwNjktcjVtbGpsbG4xcmQ0bHJiaGc3NWVmZ2lncDM2bTc4ajVAZGV2ZWxvcGVyLmdzZXJ2aWNlYWNjb3VudC5jb20iLCJzY29wZSI6Imh0dHBzOi8vd3d3Lmdvb2dsZWFwaXMuY29tL2F1dGgvcHJlZGljdGlvbiIsImF1ZCI6Imh0dHBzOi8vYWNjb3VudHMuZ29vZ2xlLmNvbS9vL29hdXRoMi90b2tlbiIsImV4cCI6MTMyODU1NDM4NSwiaWF0IjoxMzI4NTUwNzg1fQ.olukbHreNiYrgiGCTEmY3eWGeTvYDSUHYoE84Jz3BRPBSaMdZMNOn_0CYK7UHPO7OdvUofjwft1dH59UxE9GWS02pjFti1uAQoImaqjLZoTXr8qiF6O_kDa9JNoykklWlRAIwGIZkDupCS-8cTAnM_ksSymiH1coKJrLDUX_BM0x2f4iMFQzhL5vT1ll-ZipJ0lNlxb5QsyXxDYcxtHYguF12-vpv3ItgT0STfcXoWzIGQoEbhwB9SBp9JYcQ8Ygz6pYDjm0rWX9LrchmTyDArCodpKLFtutNgcIFUP9fWxvwd1C2dNw5GjLcKr9a_SAERyoJ2WnCR1_j9N0wD2o0g"
--
--// Private key for testing
--const privateKeyPem = `-----BEGIN RSA PRIVATE KEY-----
--MIIEpAIBAAKCAQEA4ej0p7bQ7L/r4rVGUz9RN4VQWoej1Bg1mYWIDYslvKrk1gpj
--7wZgkdmM7oVK2OfgrSj/FCTkInKPqaCR0gD7K80q+mLBrN3PUkDrJQZpvRZIff3/
--xmVU1WeruQLFJjnFb2dqu0s/FY/2kWiJtBCakXvXEOb7zfbINuayL+MSsCGSdVYs
--SliS5qQpgyDap+8b5fpXZVJkq92hrcNtbkg7hCYUJczt8n9hcCTJCfUpApvaFQ18
--pe+zpyl4+WzkP66I28hniMQyUlA1hBiskT7qiouq0m8IOodhv2fagSZKjOTTU2xk
--SBc//fy3ZpsL7WqgsZS7Q+0VRK8gKfqkxg5OYQIDAQABAoIBAQDGGHzQxGKX+ANk
--nQi53v/c6632dJKYXVJC+PDAz4+bzU800Y+n/bOYsWf/kCp94XcG4Lgsdd0Gx+Zq
--HD9CI1IcqqBRR2AFscsmmX6YzPLTuEKBGMW8twaYy3utlFxElMwoUEsrSWRcCA1y
--nHSDzTt871c7nxCXHxuZ6Nm/XCL7Bg8uidRTSC1sQrQyKgTPhtQdYrPQ4WZ1A4J9
--IisyDYmZodSNZe5P+LTJ6M1SCgH8KH9ZGIxv3diMwzNNpk3kxJc9yCnja4mjiGE2
--YCNusSycU5IhZwVeCTlhQGcNeV/skfg64xkiJE34c2y2ttFbdwBTPixStGaF09nU
--Z422D40BAoGBAPvVyRRsC3BF+qZdaSMFwI1yiXY7vQw5+JZh01tD28NuYdRFzjcJ
--vzT2n8LFpj5ZfZFvSMLMVEFVMgQvWnN0O6xdXvGov6qlRUSGaH9u+TCPNnIldjMP
--B8+xTwFMqI7uQr54wBB+Poq7dVRP+0oHb0NYAwUBXoEuvYo3c/nDoRcZAoGBAOWl
--aLHjMv4CJbArzT8sPfic/8waSiLV9Ixs3Re5YREUTtnLq7LoymqB57UXJB3BNz/2
--eCueuW71avlWlRtE/wXASj5jx6y5mIrlV4nZbVuyYff0QlcG+fgb6pcJQuO9DxMI
--aqFGrWP3zye+LK87a6iR76dS9vRU+bHZpSVvGMKJAoGAFGt3TIKeQtJJyqeUWNSk
--klORNdcOMymYMIlqG+JatXQD1rR6ThgqOt8sgRyJqFCVT++YFMOAqXOBBLnaObZZ
--CFbh1fJ66BlSjoXff0W+SuOx5HuJJAa5+WtFHrPajwxeuRcNa8jwxUsB7n41wADu
--UqWWSRedVBg4Ijbw3nWwYDECgYB0pLew4z4bVuvdt+HgnJA9n0EuYowVdadpTEJg
--soBjNHV4msLzdNqbjrAqgz6M/n8Ztg8D2PNHMNDNJPVHjJwcR7duSTA6w2p/4k28
--bvvk/45Ta3XmzlxZcZSOct3O31Cw0i2XDVc018IY5be8qendDYM08icNo7vQYkRH
--504kQQKBgQDjx60zpz8ozvm1XAj0wVhi7GwXe+5lTxiLi9Fxq721WDxPMiHDW2XL
--YXfFVy/9/GIMvEiGYdmarK1NW+VhWl1DC5xhDg0kvMfxplt4tynoq1uTsQTY31Mx
--BeF5CT/JuNYk3bEBF0H/Q3VGO1/ggVS+YezdFbLWIRoMnLj6XCFEGg==
-------END RSA PRIVATE KEY-----`
--
--// Public key to go with the private key for testing
--const publicKeyPem = `-----BEGIN CERTIFICATE-----
--MIIDIzCCAgugAwIBAgIJAMfISuBQ5m+5MA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
--BAMTCnVuaXQtdGVzdHMwHhcNMTExMjA2MTYyNjAyWhcNMjExMjAzMTYyNjAyWjAV
--MRMwEQYDVQQDEwp1bml0LXRlc3RzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
--CgKCAQEA4ej0p7bQ7L/r4rVGUz9RN4VQWoej1Bg1mYWIDYslvKrk1gpj7wZgkdmM
--7oVK2OfgrSj/FCTkInKPqaCR0gD7K80q+mLBrN3PUkDrJQZpvRZIff3/xmVU1Wer
--uQLFJjnFb2dqu0s/FY/2kWiJtBCakXvXEOb7zfbINuayL+MSsCGSdVYsSliS5qQp
--gyDap+8b5fpXZVJkq92hrcNtbkg7hCYUJczt8n9hcCTJCfUpApvaFQ18pe+zpyl4
--+WzkP66I28hniMQyUlA1hBiskT7qiouq0m8IOodhv2fagSZKjOTTU2xkSBc//fy3
--ZpsL7WqgsZS7Q+0VRK8gKfqkxg5OYQIDAQABo3YwdDAdBgNVHQ4EFgQU2RQ8yO+O
--gN8oVW2SW7RLrfYd9jEwRQYDVR0jBD4wPIAU2RQ8yO+OgN8oVW2SW7RLrfYd9jGh
--GaQXMBUxEzARBgNVBAMTCnVuaXQtdGVzdHOCCQDHyErgUOZvuTAMBgNVHRMEBTAD
--AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBRv+M/6+FiVu7KXNjFI5pSN17OcW5QUtPr
--odJMlWrJBtynn/TA1oJlYu3yV5clc/71Vr/AxuX5xGP+IXL32YDF9lTUJXG/uUGk
--+JETpKmQviPbRsvzYhz4pf6ZIOZMc3/GIcNq92ECbseGO+yAgyWUVKMmZM0HqXC9
--ovNslqe0M8C1sLm1zAR5z/h/litE7/8O2ietija3Q/qtl2TOXJdCA6sgjJX2WUql
--ybrC55ct18NKf3qhpcEkGQvFU40rVYApJpi98DiZPYFdx1oBDp/f4uZ3ojpxRVFT
--cDwcJLfNRCPUhormsY7fDS9xSyThiHsW9mjJYdcaKQkwYZ0F11yB
-------END CERTIFICATE-----`
--
--var (
-- privateKeyPemBytes = []byte(privateKeyPem)
-- publicKeyPemBytes = []byte(publicKeyPem)
-- stdHeader = &Header{Algorithm: stdAlgorithm, Type: stdType}
--)
--
--// Testing the urlEncode function.
--func TestUrlEncode(t *testing.T) {
-- enc := base64Encode([]byte(stdHeaderStr))
-- b := []byte(enc)
-- if b[len(b)-1] == 61 {
-- t.Error("TestUrlEncode: last chat == \"=\"")
-- }
-- if enc != headerEnc {
-- t.Error("TestUrlEncode: enc != headerEnc")
-- t.Errorf(" enc = %s", enc)
-- t.Errorf(" headerEnc = %s", headerEnc)
-- }
--}
--
--// Test that the times are set properly.
--func TestClaimSetSetTimes(t *testing.T) {
-- c := &ClaimSet{
-- Iss: iss,
-- Scope: scope,
-- }
-- iat := time.Unix(iat, 0)
-- c.setTimes(iat)
-- if c.exp.Unix() != exp {
-- t.Error("TestClaimSetSetTimes: c.exp != exp")
-- t.Errorf(" c.Exp = %d", c.exp.Unix())
-- t.Errorf(" exp = %d", exp)
-- }
--}
--
--// Given a well formed ClaimSet, test for proper encoding.
--func TestClaimSetEncode(t *testing.T) {
-- c := &ClaimSet{
-- Iss: iss,
-- Scope: scope,
-- exp: time.Unix(exp, 0),
-- iat: time.Unix(iat, 0),
-- }
-- enc := c.encode()
-- re, err := base64Decode(enc)
-- if err != nil {
-- t.Fatalf("error decoding encoded claim set: %v", err)
-- }
--
-- wa, err := base64Decode(claimSetEnc)
-- if err != nil {
-- t.Fatalf("error decoding encoded expected claim set: %v", err)
-- }
--
-- if enc != claimSetEnc {
-- t.Error("TestClaimSetEncode: enc != claimSetEnc")
-- t.Errorf(" enc = %s", string(re))
-- t.Errorf(" claimSetEnc = %s", string(wa))
-- }
--}
--
--// Test that claim sets with private claim names are encoded correctly.
--func TestClaimSetWithPrivateNameEncode(t *testing.T) {
-- iatT := time.Unix(iat, 0)
-- expT := time.Unix(exp, 0)
--
-- i, err := json.Marshal(iatT.Unix())
-- if err != nil {
-- t.Fatalf("error marshaling iatT value of %v: %v", iatT.Unix(), err)
-- }
-- iatStr := string(i)
-- e, err := json.Marshal(expT.Unix())
-- if err != nil {
-- t.Fatalf("error marshaling expT value of %v: %v", expT.Unix(), err)
-- }
--
-- expStr := string(e)
--
-- testCases := []struct {
-- desc string
-- input map[string]interface{}
-- want string
-- }{
-- // Test a simple int field.
-- {
-- "single simple field",
-- map[string]interface{}{"amount": 22},
-- `{` +
-- `"iss":"` + iss + `",` +
-- `"scope":"` + scope + `",` +
-- `"aud":"` + stdAud + `",` +
-- `"exp":` + expStr + `,` +
-- `"iat":` + iatStr + `,` +
-- `"amount":22` +
-- `}`,
-- },
-- {
-- "multiple simple fields",
-- map[string]interface{}{"tracking_code": "axZf", "amount": 22},
-- `{` +
-- `"iss":"` + iss + `",` +
-- `"scope":"` + scope + `",` +
-- `"aud":"` + stdAud + `",` +
-- `"exp":` + expStr + `,` +
-- `"iat":` + iatStr + `,` +
-- `"amount":22,` +
-- `"tracking_code":"axZf"` +
-- `}`,
-- },
-- {
-- "nested struct fields",
-- map[string]interface{}{
-- "tracking_code": "axZf",
-- "purchase": struct {
-- Description string `json:"desc"`
-- Quantity int32 `json:"q"`
-- Time int64 `json:"t"`
-- }{
-- "toaster",
-- 5,
-- iat,
-- },
-- },
-- `{` +
-- `"iss":"` + iss + `",` +
-- `"scope":"` + scope + `",` +
-- `"aud":"` + stdAud + `",` +
-- `"exp":` + expStr + `,` +
-- `"iat":` + iatStr + `,` +
-- `"purchase":{"desc":"toaster","q":5,"t":` + iatStr + `},` +
-- `"tracking_code":"axZf"` +
-- `}`,
-- },
-- }
--
-- for _, testCase := range testCases {
-- c := &ClaimSet{
-- Iss: iss,
-- Scope: scope,
-- Aud: stdAud,
-- iat: iatT,
-- exp: expT,
-- PrivateClaims: testCase.input,
-- }
-- cJSON, err := base64Decode(c.encode())
-- if err != nil {
-- t.Fatalf("error decoding claim set: %v", err)
-- }
-- if string(cJSON) != testCase.want {
-- t.Errorf("TestClaimSetWithPrivateNameEncode: enc != want in case %s", testCase.desc)
-- t.Errorf(" enc = %s", cJSON)
-- t.Errorf(" want = %s", testCase.want)
-- }
-- }
--}
--
--// Test the NewToken constructor.
--func TestNewToken(t *testing.T) {
-- tok := NewToken(iss, scope, privateKeyPemBytes)
-- if tok.ClaimSet.Iss != iss {
-- t.Error("TestNewToken: tok.ClaimSet.Iss != iss")
-- t.Errorf(" tok.ClaimSet.Iss = %s", tok.ClaimSet.Iss)
-- t.Errorf(" iss = %s", iss)
-- }
-- if tok.ClaimSet.Scope != scope {
-- t.Error("TestNewToken: tok.ClaimSet.Scope != scope")
-- t.Errorf(" tok.ClaimSet.Scope = %s", tok.ClaimSet.Scope)
-- t.Errorf(" scope = %s", scope)
-- }
-- if tok.ClaimSet.Aud != stdAud {
-- t.Error("TestNewToken: tok.ClaimSet.Aud != stdAud")
-- t.Errorf(" tok.ClaimSet.Aud = %s", tok.ClaimSet.Aud)
-- t.Errorf(" stdAud = %s", stdAud)
-- }
-- if !bytes.Equal(tok.Key, privateKeyPemBytes) {
-- t.Error("TestNewToken: tok.Key != privateKeyPemBytes")
-- t.Errorf(" tok.Key = %s", tok.Key)
-- t.Errorf(" privateKeyPemBytes = %s", privateKeyPemBytes)
-- }
--}
--
--// Make sure the private key parsing functions work.
--func TestParsePrivateKey(t *testing.T) {
-- tok := &Token{
-- Key: privateKeyPemBytes,
-- }
-- err := tok.parsePrivateKey()
-- if err != nil {
-- t.Errorf("TestParsePrivateKey:tok.parsePrivateKey: %v", err)
-- }
--}
--
--// Test that the token signature generated matches the golden standard.
--func TestTokenSign(t *testing.T) {
-- tok := &Token{
-- Key: privateKeyPemBytes,
-- claim: claimSetEnc,
-- header: headerEnc,
-- }
-- err := tok.parsePrivateKey()
-- if err != nil {
-- t.Errorf("TestTokenSign:tok.parsePrivateKey: %v", err)
-- }
-- err = tok.sign()
-- if err != nil {
-- t.Errorf("TestTokenSign:tok.sign: %v", err)
-- }
-- if tok.sig != sigEnc {
-- t.Error("TestTokenSign: tok.sig != sigEnc")
-- t.Errorf(" tok.sig = %s", tok.sig)
-- t.Errorf(" sigEnc = %s", sigEnc)
-- }
--}
--
--// Test that the token expiration function is working.
--func TestTokenExpired(t *testing.T) {
-- c := &ClaimSet{}
-- tok := &Token{
-- ClaimSet: c,
-- }
-- now := time.Now()
-- c.setTimes(now)
-- if tok.Expired() != false {
-- t.Error("TestTokenExpired: tok.Expired != false")
-- }
-- // Set the times as if they were set 2 hours ago.
-- c.setTimes(now.Add(-2 * time.Hour))
-- if tok.Expired() != true {
-- t.Error("TestTokenExpired: tok.Expired != true")
-- }
--}
--
--// Given a well formed Token, test for proper encoding.
--func TestTokenEncode(t *testing.T) {
-- c := &ClaimSet{
-- Iss: iss,
-- Scope: scope,
-- exp: time.Unix(exp, 0),
-- iat: time.Unix(iat, 0),
-- }
-- tok := &Token{
-- ClaimSet: c,
-- Header: stdHeader,
-- Key: privateKeyPemBytes,
-- }
-- enc, err := tok.Encode()
-- if err != nil {
-- t.Errorf("TestTokenEncode:tok.Assertion: %v", err)
-- }
-- if enc != tokEnc {
-- t.Error("TestTokenEncode: enc != tokEnc")
-- t.Errorf(" enc = %s", enc)
-- t.Errorf(" tokEnc = %s", tokEnc)
-- }
--}
--
--// Given a well formed Token we should get back a well formed request.
--func TestBuildRequest(t *testing.T) {
-- c := &ClaimSet{
-- Iss: iss,
-- Scope: scope,
-- exp: time.Unix(exp, 0),
-- iat: time.Unix(iat, 0),
-- }
-- tok := &Token{
-- ClaimSet: c,
-- Header: stdHeader,
-- Key: privateKeyPemBytes,
-- }
-- u, v, err := tok.buildRequest()
-- if err != nil {
-- t.Errorf("TestBuildRequest:BuildRequest: %v", err)
-- }
-- if u != c.Aud {
-- t.Error("TestBuildRequest: u != c.Aud")
-- t.Errorf(" u = %s", u)
-- t.Errorf(" c.Aud = %s", c.Aud)
-- }
-- if v.Get("grant_type") != stdGrantType {
-- t.Error("TestBuildRequest: grant_type != stdGrantType")
-- t.Errorf(" grant_type = %s", v.Get("grant_type"))
-- t.Errorf(" stdGrantType = %s", stdGrantType)
-- }
-- if v.Get("assertion") != tokEnc {
-- t.Error("TestBuildRequest: assertion != tokEnc")
-- t.Errorf(" assertion = %s", v.Get("assertion"))
-- t.Errorf(" tokEnc = %s", tokEnc)
-- }
--}
--
--// Given a well formed access request response we should get back a oauth.Token.
--func TestHandleResponse(t *testing.T) {
-- rb := &respBody{
-- Access: "1/8xbJqaOZXSUZbHLl5EOtu1pxz3fmmetKx9W8CV4t79M",
-- Type: "Bearer",
-- ExpiresIn: 3600,
-- }
-- b, err := json.Marshal(rb)
-- if err != nil {
-- t.Errorf("TestHandleResponse:json.Marshal: %v", err)
-- }
-- r := &http.Response{
-- Status: "200 OK",
-- StatusCode: 200,
-- Body: ioutil.NopCloser(bytes.NewReader(b)),
-- }
-- o, err := handleResponse(r)
-- if err != nil {
-- t.Errorf("TestHandleResponse:handleResponse: %v", err)
-- }
-- if o.AccessToken != rb.Access {
-- t.Error("TestHandleResponse: o.AccessToken != rb.Access")
-- t.Errorf(" o.AccessToken = %s", o.AccessToken)
-- t.Errorf(" rb.Access = %s", rb.Access)
-- }
-- if o.Expired() {
-- t.Error("TestHandleResponse: o.Expired == true")
-- }
--}
--
--// passthrough signature for test
--type FakeSigner struct{}
--
--func (f FakeSigner) Sign(tok *Token) ([]byte, []byte, error) {
-- block, _ := pem.Decode(privateKeyPemBytes)
-- pKey, _ := x509.ParsePKCS1PrivateKey(block.Bytes)
-- ss := headerEnc + "." + claimSetEnc
-- h := sha256.New()
-- h.Write([]byte(ss))
-- b, _ := rsa.SignPKCS1v15(rand.Reader, pKey, crypto.SHA256, h.Sum(nil))
-- return []byte(ss), b, nil
--}
--
--// Given an external signer, get back a valid and signed JWT
--func TestExternalSigner(t *testing.T) {
-- tok := NewSignerToken(iss, scope, FakeSigner{})
-- enc, _ := tok.Encode()
-- if enc != tokEnc {
-- t.Errorf("TestExternalSigner: enc != tokEnc")
-- t.Errorf(" enc = %s", enc)
-- t.Errorf(" tokEnc = %s", tokEnc)
-- }
--}
--
--func TestHandleResponseWithNewExpiry(t *testing.T) {
-- rb := &respBody{
-- IdToken: tokEnc,
-- }
-- b, err := json.Marshal(rb)
-- if err != nil {
-- t.Errorf("TestHandleResponse:json.Marshal: %v", err)
-- }
-- r := &http.Response{
-- Status: "200 OK",
-- StatusCode: 200,
-- Body: ioutil.NopCloser(bytes.NewReader(b)),
-- }
-- o, err := handleResponse(r)
-- if err != nil {
-- t.Errorf("TestHandleResponse:handleResponse: %v", err)
-- }
-- if o.Expiry != time.Unix(exp, 0) {
-- t.Error("TestHandleResponse: o.Expiry != exp")
-- t.Errorf(" o.Expiry = %s", o.Expiry)
-- t.Errorf(" exp = %s", time.Unix(exp, 0))
-- }
--}
--
--// Placeholder for future Assert tests.
--func TestAssert(t *testing.T) {
-- // Since this method makes a call to BuildRequest, an htttp.Client, and
-- // finally HandleResponse there is not much more to test. This is here
-- // as a placeholder if that changes.
--}
--
--// Benchmark for the end-to-end encoding of a well formed token.
--func BenchmarkTokenEncode(b *testing.B) {
-- b.StopTimer()
-- c := &ClaimSet{
-- Iss: iss,
-- Scope: scope,
-- exp: time.Unix(exp, 0),
-- iat: time.Unix(iat, 0),
-- }
-- tok := &Token{
-- ClaimSet: c,
-- Key: privateKeyPemBytes,
-- }
-- b.StartTimer()
-- for i := 0; i < b.N; i++ {
-- tok.Encode()
-- }
--}
-diff --git a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/oauth.go b/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/oauth.go
-deleted file mode 100644
-index 79d603d..0000000
---- a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/oauth.go
-+++ /dev/null
-@@ -1,405 +0,0 @@
--// Copyright 2011 The goauth2 Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--// The oauth package provides support for making
--// OAuth2-authenticated HTTP requests.
--//
--// Example usage:
--//
--// // Specify your configuration. (typically as a global variable)
--// var config = &oauth.Config{
--// ClientId: YOUR_CLIENT_ID,
--// ClientSecret: YOUR_CLIENT_SECRET,
--// Scope: "https://www.googleapis.com/auth/buzz",
--// AuthURL: "https://accounts.google.com/o/oauth2/auth",
--// TokenURL: "https://accounts.google.com/o/oauth2/token",
--// RedirectURL: "http://you.example.org/handler",
--// }
--//
--// // A landing page redirects to the OAuth provider to get the auth code.
--// func landing(w http.ResponseWriter, r *http.Request) {
--// http.Redirect(w, r, config.AuthCodeURL("foo"), http.StatusFound)
--// }
--//
--// // The user will be redirected back to this handler, that takes the
--// // "code" query parameter and Exchanges it for an access token.
--// func handler(w http.ResponseWriter, r *http.Request) {
--// t := &oauth.Transport{Config: config}
--// t.Exchange(r.FormValue("code"))
--// // The Transport now has a valid Token. Create an *http.Client
--// // with which we can make authenticated API requests.
--// c := t.Client()
--// c.Post(...)
--// // ...
--// // btw, r.FormValue("state") == "foo"
--// }
--//
--package oauth
--
--import (
-- "encoding/json"
-- "errors"
-- "fmt"
-- "io"
-- "io/ioutil"
-- "mime"
-- "net/http"
-- "net/url"
-- "os"
-- "strings"
-- "time"
--)
--
--type OAuthError struct {
-- prefix string
-- msg string
--}
--
--func (oe OAuthError) Error() string {
-- return "OAuthError: " + oe.prefix + ": " + oe.msg
--}
--
--// Cache specifies the methods that implement a Token cache.
--type Cache interface {
-- Token() (*Token, error)
-- PutToken(*Token) error
--}
--
--// CacheFile implements Cache. Its value is the name of the file in which
--// the Token is stored in JSON format.
--type CacheFile string
--
--func (f CacheFile) Token() (*Token, error) {
-- file, err := os.Open(string(f))
-- if err != nil {
-- return nil, OAuthError{"CacheFile.Token", err.Error()}
-- }
-- defer file.Close()
-- tok := &Token{}
-- if err := json.NewDecoder(file).Decode(tok); err != nil {
-- return nil, OAuthError{"CacheFile.Token", err.Error()}
-- }
-- return tok, nil
--}
--
--func (f CacheFile) PutToken(tok *Token) error {
-- file, err := os.OpenFile(string(f), os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0600)
-- if err != nil {
-- return OAuthError{"CacheFile.PutToken", err.Error()}
-- }
-- if err := json.NewEncoder(file).Encode(tok); err != nil {
-- file.Close()
-- return OAuthError{"CacheFile.PutToken", err.Error()}
-- }
-- if err := file.Close(); err != nil {
-- return OAuthError{"CacheFile.PutToken", err.Error()}
-- }
-- return nil
--}
--
--// Config is the configuration of an OAuth consumer.
--type Config struct {
-- // ClientId is the OAuth client identifier used when communicating with
-- // the configured OAuth provider.
-- ClientId string
--
-- // ClientSecret is the OAuth client secret used when communicating with
-- // the configured OAuth provider.
-- ClientSecret string
--
-- // Scope identifies the level of access being requested. Multiple scope
-- // values should be provided as a space-delimited string.
-- Scope string
--
-- // AuthURL is the URL the user will be directed to in order to grant
-- // access.
-- AuthURL string
--
-- // TokenURL is the URL used to retrieve OAuth tokens.
-- TokenURL string
--
-- // RedirectURL is the URL to which the user will be returned after
-- // granting (or denying) access.
-- RedirectURL string
--
-- // TokenCache allows tokens to be cached for subsequent requests.
-- TokenCache Cache
--
-- AccessType string // Optional, "online" (default) or "offline", no refresh token if "online"
--
-- // ApprovalPrompt indicates whether the user should be
-- // re-prompted for consent. If set to "auto" (default) the
-- // user will be prompted only if they haven't previously
-- // granted consent and the code can only be exchanged for an
-- // access token.
-- // If set to "force" the user will always be prompted, and the
-- // code can be exchanged for a refresh token.
-- ApprovalPrompt string
--}
--
--// Token contains an end-user's tokens.
--// This is the data you must store to persist authentication.
--type Token struct {
-- AccessToken string
-- RefreshToken string
-- Expiry time.Time // If zero the token has no (known) expiry time.
-- Extra map[string]string // May be nil.
--}
--
--func (t *Token) Expired() bool {
-- if t.Expiry.IsZero() {
-- return false
-- }
-- return t.Expiry.Before(time.Now())
--}
--
--// Transport implements http.RoundTripper. When configured with a valid
--// Config and Token it can be used to make authenticated HTTP requests.
--//
--// t := &oauth.Transport{config}
--// t.Exchange(code)
--// // t now contains a valid Token
--// r, _, err := t.Client().Get("http://example.org/url/requiring/auth")
--//
--// It will automatically refresh the Token if it can,
--// updating the supplied Token in place.
--type Transport struct {
-- *Config
-- *Token
--
-- // Transport is the HTTP transport to use when making requests.
-- // It will default to http.DefaultTransport if nil.
-- // (It should never be an oauth.Transport.)
-- Transport http.RoundTripper
--}
--
--// Client returns an *http.Client that makes OAuth-authenticated requests.
--func (t *Transport) Client() *http.Client {
-- return &http.Client{Transport: t}
--}
--
--func (t *Transport) transport() http.RoundTripper {
-- if t.Transport != nil {
-- return t.Transport
-- }
-- return http.DefaultTransport
--}
--
--// AuthCodeURL returns a URL that the end-user should be redirected to,
--// so that they may obtain an authorization code.
--func (c *Config) AuthCodeURL(state string) string {
-- url_, err := url.Parse(c.AuthURL)
-- if err != nil {
-- panic("AuthURL malformed: " + err.Error())
-- }
-- q := url.Values{
-- "response_type": {"code"},
-- "client_id": {c.ClientId},
-- "redirect_uri": {c.RedirectURL},
-- "scope": {c.Scope},
-- "state": {state},
-- "access_type": {c.AccessType},
-- "approval_prompt": {c.ApprovalPrompt},
-- }.Encode()
-- if url_.RawQuery == "" {
-- url_.RawQuery = q
-- } else {
-- url_.RawQuery += "&" + q
-- }
-- return url_.String()
--}
--
--// Exchange takes a code and gets access Token from the remote server.
--func (t *Transport) Exchange(code string) (*Token, error) {
-- if t.Config == nil {
-- return nil, OAuthError{"Exchange", "no Config supplied"}
-- }
--
-- // If the transport or the cache already has a token, it is
-- // passed to `updateToken` to preserve existing refresh token.
-- tok := t.Token
-- if tok == nil && t.TokenCache != nil {
-- tok, _ = t.TokenCache.Token()
-- }
-- if tok == nil {
-- tok = new(Token)
-- }
-- err := t.updateToken(tok, url.Values{
-- "grant_type": {"authorization_code"},
-- "redirect_uri": {t.RedirectURL},
-- "scope": {t.Scope},
-- "code": {code},
-- })
-- if err != nil {
-- return nil, err
-- }
-- t.Token = tok
-- if t.TokenCache != nil {
-- return tok, t.TokenCache.PutToken(tok)
-- }
-- return tok, nil
--}
--
--// RoundTrip executes a single HTTP transaction using the Transport's
--// Token as authorization headers.
--//
--// This method will attempt to renew the Token if it has expired and may return
--// an error related to that Token renewal before attempting the client request.
--// If the Token cannot be renewed a non-nil os.Error value will be returned.
--// If the Token is invalid callers should expect HTTP-level errors,
--// as indicated by the Response's StatusCode.
--func (t *Transport) RoundTrip(req *http.Request) (*http.Response, error) {
-- if t.Token == nil {
-- if t.Config == nil {
-- return nil, OAuthError{"RoundTrip", "no Config supplied"}
-- }
-- if t.TokenCache == nil {
-- return nil, OAuthError{"RoundTrip", "no Token supplied"}
-- }
-- var err error
-- t.Token, err = t.TokenCache.Token()
-- if err != nil {
-- return nil, err
-- }
-- }
--
-- // Refresh the Token if it has expired.
-- if t.Expired() {
-- if err := t.Refresh(); err != nil {
-- return nil, err
-- }
-- }
--
-- // To set the Authorization header, we must make a copy of the Request
-- // so that we don't modify the Request we were given.
-- // This is required by the specification of http.RoundTripper.
-- req = cloneRequest(req)
-- req.Header.Set("Authorization", "Bearer "+t.AccessToken)
--
-- // Make the HTTP request.
-- return t.transport().RoundTrip(req)
--}
--
--// cloneRequest returns a clone of the provided *http.Request.
--// The clone is a shallow copy of the struct and its Header map.
--func cloneRequest(r *http.Request) *http.Request {
-- // shallow copy of the struct
-- r2 := new(http.Request)
-- *r2 = *r
-- // deep copy of the Header
-- r2.Header = make(http.Header)
-- for k, s := range r.Header {
-- r2.Header[k] = s
-- }
-- return r2
--}
--
--// Refresh renews the Transport's AccessToken using its RefreshToken.
--func (t *Transport) Refresh() error {
-- if t.Token == nil {
-- return OAuthError{"Refresh", "no existing Token"}
-- }
-- if t.RefreshToken == "" {
-- return OAuthError{"Refresh", "Token expired; no Refresh Token"}
-- }
-- if t.Config == nil {
-- return OAuthError{"Refresh", "no Config supplied"}
-- }
--
-- err := t.updateToken(t.Token, url.Values{
-- "grant_type": {"refresh_token"},
-- "refresh_token": {t.RefreshToken},
-- })
-- if err != nil {
-- return err
-- }
-- if t.TokenCache != nil {
-- return t.TokenCache.PutToken(t.Token)
-- }
-- return nil
--}
--
--// AuthenticateClient gets an access Token using the client_credentials grant
--// type.
--func (t *Transport) AuthenticateClient() error {
-- if t.Config == nil {
-- return OAuthError{"Exchange", "no Config supplied"}
-- }
-- if t.Token == nil {
-- t.Token = &Token{}
-- }
-- return t.updateToken(t.Token, url.Values{"grant_type": {"client_credentials"}})
--}
--
--func (t *Transport) updateToken(tok *Token, v url.Values) error {
-- v.Set("client_id", t.ClientId)
-- v.Set("client_secret", t.ClientSecret)
-- client := &http.Client{Transport: t.transport()}
-- req, err := http.NewRequest("POST", t.TokenURL, strings.NewReader(v.Encode()))
-- if err != nil {
-- return err
-- }
-- req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-- req.SetBasicAuth(t.ClientId, t.ClientSecret)
-- r, err := client.Do(req)
-- if err != nil {
-- return err
-- }
-- defer r.Body.Close()
-- if r.StatusCode != 200 {
-- return OAuthError{"updateToken", r.Status}
-- }
-- var b struct {
-- Access string `json:"access_token"`
-- Refresh string `json:"refresh_token"`
-- ExpiresIn time.Duration `json:"expires_in"`
-- Id string `json:"id_token"`
-- }
--
-- body, err := ioutil.ReadAll(io.LimitReader(r.Body, 1<<20))
-- if err != nil {
-- return err
-- }
--
-- content, _, _ := mime.ParseMediaType(r.Header.Get("Content-Type"))
-- switch content {
-- case "application/x-www-form-urlencoded", "text/plain":
-- vals, err := url.ParseQuery(string(body))
-- if err != nil {
-- return err
-- }
--
-- b.Access = vals.Get("access_token")
-- b.Refresh = vals.Get("refresh_token")
-- b.ExpiresIn, _ = time.ParseDuration(vals.Get("expires_in") + "s")
-- b.Id = vals.Get("id_token")
-- default:
-- if err = json.Unmarshal(body, &b); err != nil {
-- return fmt.Errorf("got bad response from server: %q", body)
-- }
-- // The JSON parser treats the unitless ExpiresIn like 'ns' instead of 's' as above,
-- // so compensate here.
-- b.ExpiresIn *= time.Second
-- }
-- if b.Access == "" {
-- return errors.New("received empty access token from authorization server")
-- }
-- tok.AccessToken = b.Access
-- // Don't overwrite `RefreshToken` with an empty value
-- if len(b.Refresh) > 0 {
-- tok.RefreshToken = b.Refresh
-- }
-- if b.ExpiresIn == 0 {
-- tok.Expiry = time.Time{}
-- } else {
-- tok.Expiry = time.Now().Add(b.ExpiresIn)
-- }
-- if b.Id != "" {
-- if tok.Extra == nil {
-- tok.Extra = make(map[string]string)
-- }
-- tok.Extra["id_token"] = b.Id
-- }
-- return nil
--}
-diff --git a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/oauth_test.go b/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/oauth_test.go
-deleted file mode 100644
-index b903c16..0000000
---- a/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/oauth_test.go
-+++ /dev/null
-@@ -1,214 +0,0 @@
--// Copyright 2011 The goauth2 Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--package oauth
--
--import (
-- "io"
-- "io/ioutil"
-- "net/http"
-- "net/http/httptest"
-- "net/url"
-- "os"
-- "path/filepath"
-- "runtime"
-- "testing"
-- "time"
--)
--
--var requests = []struct {
-- path, query, auth string // request
-- contenttype, body string // response
--}{
-- {
-- path: "/token",
-- query: "grant_type=authorization_code&code=c0d3&client_id=cl13nt1d&client_secret=s3cr3t",
-- contenttype: "application/json",
-- auth: "Basic Y2wxM250MWQ6czNjcjN0",
-- body: `
-- {
-- "access_token":"token1",
-- "refresh_token":"refreshtoken1",
-- "id_token":"idtoken1",
-- "expires_in":3600
-- }
-- `,
-- },
-- {path: "/secure", auth: "Bearer token1", body: "first payload"},
-- {
-- path: "/token",
-- query: "grant_type=refresh_token&refresh_token=refreshtoken1&client_id=cl13nt1d&client_secret=s3cr3t",
-- contenttype: "application/json",
-- auth: "Basic Y2wxM250MWQ6czNjcjN0",
-- body: `
-- {
-- "access_token":"token2",
-- "refresh_token":"refreshtoken2",
-- "id_token":"idtoken2",
-- "expires_in":3600
-- }
-- `,
-- },
-- {path: "/secure", auth: "Bearer token2", body: "second payload"},
-- {
-- path: "/token",
-- query: "grant_type=refresh_token&refresh_token=refreshtoken2&client_id=cl13nt1d&client_secret=s3cr3t",
-- contenttype: "application/x-www-form-urlencoded",
-- body: "access_token=token3&refresh_token=refreshtoken3&id_token=idtoken3&expires_in=3600",
-- auth: "Basic Y2wxM250MWQ6czNjcjN0",
-- },
-- {path: "/secure", auth: "Bearer token3", body: "third payload"},
-- {
-- path: "/token",
-- query: "grant_type=client_credentials&client_id=cl13nt1d&client_secret=s3cr3t",
-- contenttype: "application/json",
-- auth: "Basic Y2wxM250MWQ6czNjcjN0",
-- body: `
-- {
-- "access_token":"token4",
-- "expires_in":3600
-- }
-- `,
-- },
-- {path: "/secure", auth: "Bearer token4", body: "fourth payload"},
--}
--
--func TestOAuth(t *testing.T) {
-- // Set up test server.
-- n := 0
-- handler := func(w http.ResponseWriter, r *http.Request) {
-- if n >= len(requests) {
-- t.Errorf("too many requests: %d", n)
-- return
-- }
-- req := requests[n]
-- n++
--
-- // Check request.
-- if g, w := r.URL.Path, req.path; g != w {
-- t.Errorf("request[%d] got path %s, want %s", n, g, w)
-- }
-- want, _ := url.ParseQuery(req.query)
-- for k := range want {
-- if g, w := r.FormValue(k), want.Get(k); g != w {
-- t.Errorf("query[%s] = %s, want %s", k, g, w)
-- }
-- }
-- if g, w := r.Header.Get("Authorization"), req.auth; w != "" && g != w {
-- t.Errorf("Authorization: %v, want %v", g, w)
-- }
--
-- // Send response.
-- w.Header().Set("Content-Type", req.contenttype)
-- io.WriteString(w, req.body)
-- }
-- server := httptest.NewServer(http.HandlerFunc(handler))
-- defer server.Close()
--
-- config := &Config{
-- ClientId: "cl13nt1d",
-- ClientSecret: "s3cr3t",
-- Scope: "https://example.net/scope",
-- AuthURL: server.URL + "/auth",
-- TokenURL: server.URL + "/token",
-- }
--
-- // TODO(adg): test AuthCodeURL
--
-- transport := &Transport{Config: config}
-- _, err := transport.Exchange("c0d3")
-- if err != nil {
-- t.Fatalf("Exchange: %v", err)
-- }
-- checkToken(t, transport.Token, "token1", "refreshtoken1", "idtoken1")
--
-- c := transport.Client()
-- resp, err := c.Get(server.URL + "/secure")
-- if err != nil {
-- t.Fatalf("Get: %v", err)
-- }
-- checkBody(t, resp, "first payload")
--
-- // test automatic refresh
-- transport.Expiry = time.Now().Add(-time.Hour)
-- resp, err = c.Get(server.URL + "/secure")
-- if err != nil {
-- t.Fatalf("Get: %v", err)
-- }
-- checkBody(t, resp, "second payload")
-- checkToken(t, transport.Token, "token2", "refreshtoken2", "idtoken2")
--
-- // refresh one more time, but get URL-encoded token instead of JSON
-- transport.Expiry = time.Now().Add(-time.Hour)
-- resp, err = c.Get(server.URL + "/secure")
-- if err != nil {
-- t.Fatalf("Get: %v", err)
-- }
-- checkBody(t, resp, "third payload")
-- checkToken(t, transport.Token, "token3", "refreshtoken3", "idtoken3")
--
-- transport.Token = &Token{}
-- err = transport.AuthenticateClient()
-- if err != nil {
-- t.Fatalf("AuthenticateClient: %v", err)
-- }
-- checkToken(t, transport.Token, "token4", "", "")
-- resp, err = c.Get(server.URL + "/secure")
-- if err != nil {
-- t.Fatalf("Get: %v", err)
-- }
-- checkBody(t, resp, "fourth payload")
--}
--
--func checkToken(t *testing.T, tok *Token, access, refresh, id string) {
-- if g, w := tok.AccessToken, access; g != w {
-- t.Errorf("AccessToken = %q, want %q", g, w)
-- }
-- if g, w := tok.RefreshToken, refresh; g != w {
-- t.Errorf("RefreshToken = %q, want %q", g, w)
-- }
-- if g, w := tok.Extra["id_token"], id; g != w {
-- t.Errorf("Extra['id_token'] = %q, want %q", g, w)
-- }
-- exp := tok.Expiry.Sub(time.Now())
-- if (time.Hour-time.Second) > exp || exp > time.Hour {
-- t.Errorf("Expiry = %v, want ~1 hour", exp)
-- }
--}
--
--func checkBody(t *testing.T, r *http.Response, body string) {
-- b, err := ioutil.ReadAll(r.Body)
-- if err != nil {
-- t.Errorf("reading reponse body: %v, want %q", err, body)
-- }
-- if g, w := string(b), body; g != w {
-- t.Errorf("request body mismatch: got %q, want %q", g, w)
-- }
--}
--
--func TestCachePermissions(t *testing.T) {
-- if runtime.GOOS == "windows" {
-- // Windows doesn't support file mode bits.
-- return
-- }
--
-- td, err := ioutil.TempDir("", "oauth-test")
-- if err != nil {
-- t.Fatalf("ioutil.TempDir: %v", err)
-- }
-- defer os.RemoveAll(td)
-- tempFile := filepath.Join(td, "cache-file")
--
-- cf := CacheFile(tempFile)
-- if err := cf.PutToken(new(Token)); err != nil {
-- t.Fatalf("PutToken: %v", err)
-- }
-- fi, err := os.Stat(tempFile)
-- if err != nil {
-- t.Fatalf("os.Stat: %v", err)
-- }
-- if fi.Mode()&0077 != 0 {
-- t.Errorf("Created cache file has mode %#o, want non-accessible to group+other", fi.Mode())
-- }
--}
-diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/AUTHORS b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/AUTHORS
-deleted file mode 100644
-index f73b725..0000000
---- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/AUTHORS
-+++ /dev/null
-@@ -1,10 +0,0 @@
--# This is the official list of authors for copyright purposes.
--# This file is distinct from the CONTRIBUTORS files.
--# See the latter for an explanation.
--
--# Names should be added to this file as
--# Name or Organization <email address>
--# The email address is not required for organizations.
--
--# Please keep the list sorted.
--Google Inc.
-diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/CONTRIBUTORS b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/CONTRIBUTORS
-deleted file mode 100644
-index 4af9298..0000000
---- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/CONTRIBUTORS
-+++ /dev/null
-@@ -1,46 +0,0 @@
--# This is the official list of people who can contribute
--# (and typically have contributed) code to the repository.
--# The AUTHORS file lists the copyright holders; this file
--# lists people. For example, Google employees are listed here
--# but not in AUTHORS, because Google holds the copyright.
--#
--# The submission process automatically checks to make sure
--# that people submitting code are listed in this file (by email address).
--#
--# Names should be added to this file only after verifying that
--# the individual or the individual's organization has agreed to
--# the appropriate Contributor License Agreement, found here:
--#
--# http://code.google.com/legal/individual-cla-v1.0.html
--# http://code.google.com/legal/corporate-cla-v1.0.html
--#
--# The agreement for individuals can be filled out on the web.
--#
--# When adding J Random Contributor's name to this file,
--# either J's name or J's organization's name should be
--# added to the AUTHORS file, depending on whether the
--# individual or corporate CLA was used.
--
--# Names should be added to this file like so:
--# Name <email address>
--#
--# An entry with two email addresses specifies that the
--# first address should be used in the submit logs and
--# that the second address should be recognized as the
--# same person when interacting with Rietveld.
--
--# Please keep the list sorted.
--
--Alain Vongsouvanhalainv <alainv at google.com>
--Andrew Gerrand <adg at golang.org>
--Brad Fitzpatrick <bradfitz at golang.org>
--Francesc Campoy <campoy at golang.org>
--Garrick Evans <garrick at google.com>
--Glenn Lewis <gmlewis at google.com>
--Ivan Krasin <krasin at golang.org>
--Jason Hall <jasonhall at google.com>
--Johan Euphrosine <proppy at google.com>
--Kostik Shtoyk <kostik at google.com>
--Nick Craig-Wood <nickcw at gmail.com>
--Scott Van Woudenberg <scottvw at google.com>
--Takashi Matsuo <tmatsuo at google.com>
-diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/LICENSE b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/LICENSE
-deleted file mode 100644
-index 263aa7a..0000000
---- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/LICENSE
-+++ /dev/null
-@@ -1,27 +0,0 @@
--Copyright (c) 2011 Google Inc. All rights reserved.
--
--Redistribution and use in source and binary forms, with or without
--modification, are permitted provided that the following conditions are
--met:
--
-- * Redistributions of source code must retain the above copyright
--notice, this list of conditions and the following disclaimer.
-- * Redistributions in binary form must reproduce the above
--copyright notice, this list of conditions and the following disclaimer
--in the documentation and/or other materials provided with the
--distribution.
-- * Neither the name of Google Inc. nor the names of its
--contributors may be used to endorse or promote products derived from
--this software without specific prior written permission.
--
--THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
--"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
--LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
--A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
--OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
--SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
--LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
--DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
--THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
--(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
--OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/Makefile b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/Makefile
-deleted file mode 100644
-index 20ce8a5..0000000
---- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/Makefile
-+++ /dev/null
-@@ -1,9 +0,0 @@
--all:
-- go install code.google.com/p/google-api-go-client/googleapi
-- go install code.google.com/p/google-api-go-client/google-api-go-generator
-- $(GOPATH)/bin/google-api-go-generator -cache=false -install -api=*
--
--cached:
-- go install code.google.com/p/google-api-go-client/googleapi
-- go install code.google.com/p/google-api-go-client/google-api-go-generator
-- $(GOPATH)/bin/google-api-go-generator -cache=true -install -api=*
-diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/NOTES b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/NOTES
-deleted file mode 100644
-index 3b10889..0000000
---- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/NOTES
-+++ /dev/null
-@@ -1,13 +0,0 @@
--Discovery Service:
--http://code.google.com/apis/discovery/
--http://code.google.com/apis/discovery/v1/reference.html
--
--The "type" key:
--http://tools.ietf.org/html/draft-zyp-json-schema-03#section-5.1
--
--The "format" key:
--http://tools.ietf.org/html/draft-zyp-json-schema-03#section-5.23
--http://code.google.com/apis/discovery/v1/reference.html#parameter-format-summary
--
--Google JSON format docs:
--http://google-styleguide.googlecode.com/svn/trunk/jsoncstyleguide.xml
-diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/README b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/README
-deleted file mode 100644
-index 9aca57b..0000000
---- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/README
-+++ /dev/null
-@@ -1,10 +0,0 @@
--Most of this project is auto-generated.
--
--The notable directories which are not auto-generated:
--
-- google-api-go-generator/ -- the generator itself
-- google-api/ -- shared common code, used by auto-generated code
-- examples/ -- sample code
--
--When changing the generator, re-compile all APIs and submit the
--modified APIs in the same CL as the generator changes itself.
-diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/TODO b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/TODO
-deleted file mode 100644
-index af55f14..0000000
---- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/TODO
-+++ /dev/null
-@@ -1,2 +0,0 @@
--Moved to:
--http://code.google.com/p/google-api-go-client/issues/
-diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/compute/v1/compute-api.json b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/compute/v1/compute-api.json
-deleted file mode 100644
-index 726a0ac..0000000
---- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/compute/v1/compute-api.json
+index 726a0ac..0000000
+--- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/compute/v1/compute-api.json
+++ /dev/null
@@ -1,9526 +0,0 @@
-{
@@ -51674,3010 +17638,18515 @@ index 726a0ac..0000000
- }
- }
-}
-diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/compute/v1/compute-gen.go b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/compute/v1/compute-gen.go
-deleted file mode 100644
-index 7d193b5..0000000
---- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/compute/v1/compute-gen.go
-+++ /dev/null
-@@ -1,16952 +0,0 @@
--// Package compute provides access to the Compute Engine API.
--//
--// See https://developers.google.com/compute/docs/reference/latest/
--//
--// Usage example:
--//
--// import "code.google.com/p/google-api-go-client/compute/v1"
--// ...
--// computeService, err := compute.New(oauthHttpClient)
--package compute
+diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/compute/v1/compute-gen.go b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/compute/v1/compute-gen.go
+deleted file mode 100644
+index 7d193b5..0000000
+--- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/compute/v1/compute-gen.go
++++ /dev/null
+@@ -1,16952 +0,0 @@
+-// Package compute provides access to the Compute Engine API.
+-//
+-// See https://developers.google.com/compute/docs/reference/latest/
+-//
+-// Usage example:
+-//
+-// import "code.google.com/p/google-api-go-client/compute/v1"
+-// ...
+-// computeService, err := compute.New(oauthHttpClient)
+-package compute
+-
+-import (
+- "bytes"
+- "code.google.com/p/google-api-go-client/googleapi"
+- "encoding/json"
+- "errors"
+- "fmt"
+- "io"
+- "net/http"
+- "net/url"
+- "strconv"
+- "strings"
+-)
+-
+-// Always reference these packages, just in case the auto-generated code
+-// below doesn't.
+-var _ = bytes.NewBuffer
+-var _ = strconv.Itoa
+-var _ = fmt.Sprintf
+-var _ = json.NewDecoder
+-var _ = io.Copy
+-var _ = url.Parse
+-var _ = googleapi.Version
+-var _ = errors.New
+-var _ = strings.Replace
+-
+-const apiId = "compute:v1"
+-const apiName = "compute"
+-const apiVersion = "v1"
+-const basePath = "https://www.googleapis.com/compute/v1/projects/"
+-
+-// OAuth2 scopes used by this API.
+-const (
+- // View and manage your Google Compute Engine resources
+- ComputeScope = "https://www.googleapis.com/auth/compute"
+-
+- // View your Google Compute Engine resources
+- ComputeReadonlyScope = "https://www.googleapis.com/auth/compute.readonly"
+-
+- // Manage your data and permissions in Google Cloud Storage
+- DevstorageFull_controlScope = "https://www.googleapis.com/auth/devstorage.full_control"
+-
+- // View your data in Google Cloud Storage
+- DevstorageRead_onlyScope = "https://www.googleapis.com/auth/devstorage.read_only"
+-
+- // Manage your data in Google Cloud Storage
+- DevstorageRead_writeScope = "https://www.googleapis.com/auth/devstorage.read_write"
+-)
+-
+-func New(client *http.Client) (*Service, error) {
+- if client == nil {
+- return nil, errors.New("client is nil")
+- }
+- s := &Service{client: client, BasePath: basePath}
+- s.Addresses = NewAddressesService(s)
+- s.BackendServices = NewBackendServicesService(s)
+- s.DiskTypes = NewDiskTypesService(s)
+- s.Disks = NewDisksService(s)
+- s.Firewalls = NewFirewallsService(s)
+- s.ForwardingRules = NewForwardingRulesService(s)
+- s.GlobalAddresses = NewGlobalAddressesService(s)
+- s.GlobalForwardingRules = NewGlobalForwardingRulesService(s)
+- s.GlobalOperations = NewGlobalOperationsService(s)
+- s.HttpHealthChecks = NewHttpHealthChecksService(s)
+- s.Images = NewImagesService(s)
+- s.InstanceTemplates = NewInstanceTemplatesService(s)
+- s.Instances = NewInstancesService(s)
+- s.Licenses = NewLicensesService(s)
+- s.MachineTypes = NewMachineTypesService(s)
+- s.Networks = NewNetworksService(s)
+- s.Projects = NewProjectsService(s)
+- s.RegionOperations = NewRegionOperationsService(s)
+- s.Regions = NewRegionsService(s)
+- s.Routes = NewRoutesService(s)
+- s.Snapshots = NewSnapshotsService(s)
+- s.TargetHttpProxies = NewTargetHttpProxiesService(s)
+- s.TargetInstances = NewTargetInstancesService(s)
+- s.TargetPools = NewTargetPoolsService(s)
+- s.UrlMaps = NewUrlMapsService(s)
+- s.ZoneOperations = NewZoneOperationsService(s)
+- s.Zones = NewZonesService(s)
+- return s, nil
+-}
+-
+-type Service struct {
+- client *http.Client
+- BasePath string // API endpoint base URL
+-
+- Addresses *AddressesService
+-
+- BackendServices *BackendServicesService
+-
+- DiskTypes *DiskTypesService
+-
+- Disks *DisksService
+-
+- Firewalls *FirewallsService
+-
+- ForwardingRules *ForwardingRulesService
+-
+- GlobalAddresses *GlobalAddressesService
+-
+- GlobalForwardingRules *GlobalForwardingRulesService
+-
+- GlobalOperations *GlobalOperationsService
+-
+- HttpHealthChecks *HttpHealthChecksService
+-
+- Images *ImagesService
+-
+- InstanceTemplates *InstanceTemplatesService
+-
+- Instances *InstancesService
+-
+- Licenses *LicensesService
+-
+- MachineTypes *MachineTypesService
+-
+- Networks *NetworksService
+-
+- Projects *ProjectsService
+-
+- RegionOperations *RegionOperationsService
+-
+- Regions *RegionsService
+-
+- Routes *RoutesService
+-
+- Snapshots *SnapshotsService
+-
+- TargetHttpProxies *TargetHttpProxiesService
+-
+- TargetInstances *TargetInstancesService
+-
+- TargetPools *TargetPoolsService
+-
+- UrlMaps *UrlMapsService
+-
+- ZoneOperations *ZoneOperationsService
+-
+- Zones *ZonesService
+-}
+-
+-func NewAddressesService(s *Service) *AddressesService {
+- rs := &AddressesService{s: s}
+- return rs
+-}
+-
+-type AddressesService struct {
+- s *Service
+-}
+-
+-func NewBackendServicesService(s *Service) *BackendServicesService {
+- rs := &BackendServicesService{s: s}
+- return rs
+-}
+-
+-type BackendServicesService struct {
+- s *Service
+-}
+-
+-func NewDiskTypesService(s *Service) *DiskTypesService {
+- rs := &DiskTypesService{s: s}
+- return rs
+-}
+-
+-type DiskTypesService struct {
+- s *Service
+-}
+-
+-func NewDisksService(s *Service) *DisksService {
+- rs := &DisksService{s: s}
+- return rs
+-}
+-
+-type DisksService struct {
+- s *Service
+-}
+-
+-func NewFirewallsService(s *Service) *FirewallsService {
+- rs := &FirewallsService{s: s}
+- return rs
+-}
+-
+-type FirewallsService struct {
+- s *Service
+-}
+-
+-func NewForwardingRulesService(s *Service) *ForwardingRulesService {
+- rs := &ForwardingRulesService{s: s}
+- return rs
+-}
+-
+-type ForwardingRulesService struct {
+- s *Service
+-}
+-
+-func NewGlobalAddressesService(s *Service) *GlobalAddressesService {
+- rs := &GlobalAddressesService{s: s}
+- return rs
+-}
+-
+-type GlobalAddressesService struct {
+- s *Service
+-}
+-
+-func NewGlobalForwardingRulesService(s *Service) *GlobalForwardingRulesService {
+- rs := &GlobalForwardingRulesService{s: s}
+- return rs
+-}
+-
+-type GlobalForwardingRulesService struct {
+- s *Service
+-}
+-
+-func NewGlobalOperationsService(s *Service) *GlobalOperationsService {
+- rs := &GlobalOperationsService{s: s}
+- return rs
+-}
+-
+-type GlobalOperationsService struct {
+- s *Service
+-}
+-
+-func NewHttpHealthChecksService(s *Service) *HttpHealthChecksService {
+- rs := &HttpHealthChecksService{s: s}
+- return rs
+-}
+-
+-type HttpHealthChecksService struct {
+- s *Service
+-}
+-
+-func NewImagesService(s *Service) *ImagesService {
+- rs := &ImagesService{s: s}
+- return rs
+-}
+-
+-type ImagesService struct {
+- s *Service
+-}
+-
+-func NewInstanceTemplatesService(s *Service) *InstanceTemplatesService {
+- rs := &InstanceTemplatesService{s: s}
+- return rs
+-}
+-
+-type InstanceTemplatesService struct {
+- s *Service
+-}
+-
+-func NewInstancesService(s *Service) *InstancesService {
+- rs := &InstancesService{s: s}
+- return rs
+-}
+-
+-type InstancesService struct {
+- s *Service
+-}
+-
+-func NewLicensesService(s *Service) *LicensesService {
+- rs := &LicensesService{s: s}
+- return rs
+-}
+-
+-type LicensesService struct {
+- s *Service
+-}
+-
+-func NewMachineTypesService(s *Service) *MachineTypesService {
+- rs := &MachineTypesService{s: s}
+- return rs
+-}
+-
+-type MachineTypesService struct {
+- s *Service
+-}
+-
+-func NewNetworksService(s *Service) *NetworksService {
+- rs := &NetworksService{s: s}
+- return rs
+-}
+-
+-type NetworksService struct {
+- s *Service
+-}
+-
+-func NewProjectsService(s *Service) *ProjectsService {
+- rs := &ProjectsService{s: s}
+- return rs
+-}
+-
+-type ProjectsService struct {
+- s *Service
+-}
+-
+-func NewRegionOperationsService(s *Service) *RegionOperationsService {
+- rs := &RegionOperationsService{s: s}
+- return rs
+-}
+-
+-type RegionOperationsService struct {
+- s *Service
+-}
+-
+-func NewRegionsService(s *Service) *RegionsService {
+- rs := &RegionsService{s: s}
+- return rs
+-}
+-
+-type RegionsService struct {
+- s *Service
+-}
+-
+-func NewRoutesService(s *Service) *RoutesService {
+- rs := &RoutesService{s: s}
+- return rs
+-}
+-
+-type RoutesService struct {
+- s *Service
+-}
+-
+-func NewSnapshotsService(s *Service) *SnapshotsService {
+- rs := &SnapshotsService{s: s}
+- return rs
+-}
+-
+-type SnapshotsService struct {
+- s *Service
+-}
+-
+-func NewTargetHttpProxiesService(s *Service) *TargetHttpProxiesService {
+- rs := &TargetHttpProxiesService{s: s}
+- return rs
+-}
+-
+-type TargetHttpProxiesService struct {
+- s *Service
+-}
+-
+-func NewTargetInstancesService(s *Service) *TargetInstancesService {
+- rs := &TargetInstancesService{s: s}
+- return rs
+-}
+-
+-type TargetInstancesService struct {
+- s *Service
+-}
+-
+-func NewTargetPoolsService(s *Service) *TargetPoolsService {
+- rs := &TargetPoolsService{s: s}
+- return rs
+-}
+-
+-type TargetPoolsService struct {
+- s *Service
+-}
+-
+-func NewUrlMapsService(s *Service) *UrlMapsService {
+- rs := &UrlMapsService{s: s}
+- return rs
+-}
+-
+-type UrlMapsService struct {
+- s *Service
+-}
+-
+-func NewZoneOperationsService(s *Service) *ZoneOperationsService {
+- rs := &ZoneOperationsService{s: s}
+- return rs
+-}
+-
+-type ZoneOperationsService struct {
+- s *Service
+-}
+-
+-func NewZonesService(s *Service) *ZonesService {
+- rs := &ZonesService{s: s}
+- return rs
+-}
+-
+-type ZonesService struct {
+- s *Service
+-}
+-
+-type AccessConfig struct {
+- // Kind: Type of the resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // Name: Name of this access configuration.
+- Name string `json:"name,omitempty"`
+-
+- // NatIP: An external IP address associated with this instance. Specify
+- // an unused static IP address available to the project. If not
+- // specified, the external IP will be drawn from a shared ephemeral
+- // pool.
+- NatIP string `json:"natIP,omitempty"`
+-
+- // Type: Type of configuration. Must be set to "ONE_TO_ONE_NAT". This
+- // configures port-for-port NAT to the internet.
+- Type string `json:"type,omitempty"`
+-}
+-
+-type Address struct {
+- // Address: The IP address represented by this resource.
+- Address string `json:"address,omitempty"`
+-
+- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
+- // only).
+- CreationTimestamp string `json:"creationTimestamp,omitempty"`
+-
+- // Description: An optional textual description of the resource;
+- // provided by the client when the resource is created.
+- Description string `json:"description,omitempty"`
+-
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id uint64 `json:"id,omitempty,string"`
+-
+- // Kind: Type of the resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // Name: Name of the resource; provided by the client when the resource
+- // is created. The name must be 1-63 characters long, and comply with
+- // RFC1035.
+- Name string `json:"name,omitempty"`
+-
+- // Region: URL of the region where the regional address resides (output
+- // only). This field is not applicable to global addresses.
+- Region string `json:"region,omitempty"`
+-
+- // SelfLink: Server defined URL for the resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-
+- // Status: The status of the address (output only).
+- Status string `json:"status,omitempty"`
+-
+- // Users: The resources that are using this address resource.
+- Users []string `json:"users,omitempty"`
+-}
+-
+-type AddressAggregatedList struct {
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id string `json:"id,omitempty"`
+-
+- // Items: A map of scoped address lists.
+- Items map[string]AddressesScopedList `json:"items,omitempty"`
+-
+- // Kind: Type of resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // NextPageToken: A token used to continue a truncated list request
+- // (output only).
+- NextPageToken string `json:"nextPageToken,omitempty"`
+-
+- // SelfLink: Server defined URL for this resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-}
+-
+-type AddressList struct {
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id string `json:"id,omitempty"`
+-
+- // Items: The address resources.
+- Items []*Address `json:"items,omitempty"`
+-
+- // Kind: Type of resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // NextPageToken: A token used to continue a truncated list request
+- // (output only).
+- NextPageToken string `json:"nextPageToken,omitempty"`
+-
+- // SelfLink: Server defined URL for the resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-}
+-
+-type AddressesScopedList struct {
+- // Addresses: List of addresses contained in this scope.
+- Addresses []*Address `json:"addresses,omitempty"`
+-
+- // Warning: Informational warning which replaces the list of addresses
+- // when the list is empty.
+- Warning *AddressesScopedListWarning `json:"warning,omitempty"`
+-}
+-
+-type AddressesScopedListWarning struct {
+- // Code: The warning type identifier for this warning.
+- Code string `json:"code,omitempty"`
+-
+- // Data: Metadata for this warning in 'key: value' format.
+- Data []*AddressesScopedListWarningData `json:"data,omitempty"`
+-
+- // Message: Optional human-readable details for this warning.
+- Message string `json:"message,omitempty"`
+-}
+-
+-type AddressesScopedListWarningData struct {
+- // Key: A key for the warning data.
+- Key string `json:"key,omitempty"`
+-
+- // Value: A warning data value corresponding to the key.
+- Value string `json:"value,omitempty"`
+-}
+-
+-type AttachedDisk struct {
+- // AutoDelete: Whether the disk will be auto-deleted when the instance
+- // is deleted (but not when the disk is detached from the instance).
+- AutoDelete bool `json:"autoDelete,omitempty"`
+-
+- // Boot: Indicates that this is a boot disk. VM will use the first
+- // partition of the disk for its root filesystem.
+- Boot bool `json:"boot,omitempty"`
+-
+- // DeviceName: Persistent disk only; must be unique within the instance
+- // when specified. This represents a unique device name that is
+- // reflected into the /dev/ tree of a Linux operating system running
+- // within the instance. If not specified, a default will be chosen by
+- // the system.
+- DeviceName string `json:"deviceName,omitempty"`
+-
+- // Index: A zero-based index to assign to this disk, where 0 is reserved
+- // for the boot disk. If not specified, the server will choose an
+- // appropriate value (output only).
+- Index int64 `json:"index,omitempty"`
+-
+- // InitializeParams: Initialization parameters.
+- InitializeParams *AttachedDiskInitializeParams `json:"initializeParams,omitempty"`
+-
+- Interface string `json:"interface,omitempty"`
+-
+- // Kind: Type of the resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // Licenses: Public visible licenses.
+- Licenses []string `json:"licenses,omitempty"`
+-
+- // Mode: The mode in which to attach this disk, either "READ_WRITE" or
+- // "READ_ONLY".
+- Mode string `json:"mode,omitempty"`
+-
+- // Source: Persistent disk only; the URL of the persistent disk
+- // resource.
+- Source string `json:"source,omitempty"`
+-
+- // Type: Type of the disk, either "SCRATCH" or "PERSISTENT". Note that
+- // persistent disks must be created before you can specify them here.
+- Type string `json:"type,omitempty"`
+-}
+-
+-type AttachedDiskInitializeParams struct {
+- // DiskName: Name of the disk (when not provided defaults to the name of
+- // the instance).
+- DiskName string `json:"diskName,omitempty"`
+-
+- // DiskSizeGb: Size of the disk in base-2 GB.
+- DiskSizeGb int64 `json:"diskSizeGb,omitempty,string"`
+-
+- // DiskType: URL of the disk type resource describing which disk type to
+- // use to create the disk; provided by the client when the disk is
+- // created.
+- DiskType string `json:"diskType,omitempty"`
+-
+- // SourceImage: The source image used to create this disk.
+- SourceImage string `json:"sourceImage,omitempty"`
+-}
+-
+-type Backend struct {
+- // BalancingMode: The balancing mode of this backend, default is
+- // UTILIZATION.
+- BalancingMode string `json:"balancingMode,omitempty"`
+-
+- // CapacityScaler: The multiplier (a value between 0 and 1e6) of the max
+- // capacity (CPU or RPS, depending on 'balancingMode') the group should
+- // serve up to. 0 means the group is totally drained. Default value is
+- // 1. Valid range is [0, 1e6].
+- CapacityScaler float64 `json:"capacityScaler,omitempty"`
+-
+- // Description: An optional textual description of the resource, which
+- // is provided by the client when the resource is created.
+- Description string `json:"description,omitempty"`
+-
+- // Group: URL of a zonal Cloud Resource View resource. This resource
+- // view defines the list of instances that serve traffic. Member virtual
+- // machine instances from each resource view must live in the same zone
+- // as the resource view itself. No two backends in a backend service are
+- // allowed to use same Resource View resource.
+- Group string `json:"group,omitempty"`
+-
+- // MaxRate: The max RPS of the group. Can be used with either balancing
+- // mode, but required if RATE mode. For RATE mode, either maxRate or
+- // maxRatePerInstance must be set.
+- MaxRate int64 `json:"maxRate,omitempty"`
+-
+- // MaxRatePerInstance: The max RPS that a single backed instance can
+- // handle. This is used to calculate the capacity of the group. Can be
+- // used in either balancing mode. For RATE mode, either maxRate or
+- // maxRatePerInstance must be set.
+- MaxRatePerInstance float64 `json:"maxRatePerInstance,omitempty"`
+-
+- // MaxUtilization: Used when 'balancingMode' is UTILIZATION. This ratio
+- // defines the CPU utilization target for the group. The default is 0.8.
+- // Valid range is [0, 1].
+- MaxUtilization float64 `json:"maxUtilization,omitempty"`
+-}
+-
+-type BackendService struct {
+- // Backends: The list of backends that serve this BackendService.
+- Backends []*Backend `json:"backends,omitempty"`
+-
+- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
+- // only).
+- CreationTimestamp string `json:"creationTimestamp,omitempty"`
+-
+- // Description: An optional textual description of the resource;
+- // provided by the client when the resource is created.
+- Description string `json:"description,omitempty"`
+-
+- // Fingerprint: Fingerprint of this resource. A hash of the contents
+- // stored in this object. This field is used in optimistic locking. This
+- // field will be ignored when inserting a BackendService. An up-to-date
+- // fingerprint must be provided in order to update the BackendService.
+- Fingerprint string `json:"fingerprint,omitempty"`
+-
+- // HealthChecks: The list of URLs to the HttpHealthCheck resource for
+- // health checking this BackendService. Currently at most one health
+- // check can be specified, and a health check is required.
+- HealthChecks []string `json:"healthChecks,omitempty"`
+-
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id uint64 `json:"id,omitempty,string"`
+-
+- // Kind: Type of the resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // Name: Name of the resource; provided by the client when the resource
+- // is created. The name must be 1-63 characters long, and comply with
+- // RFC1035.
+- Name string `json:"name,omitempty"`
+-
+- // Port: Deprecated in favor of port_name. The TCP port to connect on
+- // the backend. The default value is 80.
+- Port int64 `json:"port,omitempty"`
+-
+- // PortName: Name of backend port. The same name should appear in the
+- // resource views referenced by this service. Required.
+- PortName string `json:"portName,omitempty"`
+-
+- Protocol string `json:"protocol,omitempty"`
+-
+- // SelfLink: Server defined URL for the resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-
+- // TimeoutSec: How many seconds to wait for the backend before
+- // considering it a failed request. Default is 30 seconds.
+- TimeoutSec int64 `json:"timeoutSec,omitempty"`
+-}
+-
+-type BackendServiceGroupHealth struct {
+- HealthStatus []*HealthStatus `json:"healthStatus,omitempty"`
+-
+- // Kind: Type of resource.
+- Kind string `json:"kind,omitempty"`
+-}
+-
+-type BackendServiceList struct {
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id string `json:"id,omitempty"`
+-
+- // Items: The BackendService resources.
+- Items []*BackendService `json:"items,omitempty"`
+-
+- // Kind: Type of resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // NextPageToken: A token used to continue a truncated list request
+- // (output only).
+- NextPageToken string `json:"nextPageToken,omitempty"`
+-
+- // SelfLink: Server defined URL for this resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-}
+-
+-type DeprecationStatus struct {
+- // Deleted: An optional RFC3339 timestamp on or after which the
+- // deprecation state of this resource will be changed to DELETED.
+- Deleted string `json:"deleted,omitempty"`
+-
+- // Deprecated: An optional RFC3339 timestamp on or after which the
+- // deprecation state of this resource will be changed to DEPRECATED.
+- Deprecated string `json:"deprecated,omitempty"`
+-
+- // Obsolete: An optional RFC3339 timestamp on or after which the
+- // deprecation state of this resource will be changed to OBSOLETE.
+- Obsolete string `json:"obsolete,omitempty"`
+-
+- // Replacement: A URL of the suggested replacement for the deprecated
+- // resource. The deprecated resource and its replacement must be
+- // resources of the same kind.
+- Replacement string `json:"replacement,omitempty"`
+-
+- // State: The deprecation state. Can be "DEPRECATED", "OBSOLETE", or
+- // "DELETED". Operations which create a new resource using a
+- // "DEPRECATED" resource will return successfully, but with a warning
+- // indicating the deprecated resource and recommending its replacement.
+- // New uses of "OBSOLETE" or "DELETED" resources will result in an
+- // error.
+- State string `json:"state,omitempty"`
+-}
+-
+-type Disk struct {
+- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
+- // only).
+- CreationTimestamp string `json:"creationTimestamp,omitempty"`
+-
+- // Description: An optional textual description of the resource;
+- // provided by the client when the resource is created.
+- Description string `json:"description,omitempty"`
+-
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id uint64 `json:"id,omitempty,string"`
+-
+- // Kind: Type of the resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // Licenses: Public visible licenses.
+- Licenses []string `json:"licenses,omitempty"`
+-
+- // Name: Name of the resource; provided by the client when the resource
+- // is created. The name must be 1-63 characters long, and comply with
+- // RFC1035.
+- Name string `json:"name,omitempty"`
+-
+- // Options: Internal use only.
+- Options string `json:"options,omitempty"`
+-
+- // SelfLink: Server defined URL for the resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-
+- // SizeGb: Size of the persistent disk, specified in GB. This parameter
+- // is optional when creating a disk from a disk image or a snapshot,
+- // otherwise it is required.
+- SizeGb int64 `json:"sizeGb,omitempty,string"`
+-
+- // SourceImage: The source image used to create this disk.
+- SourceImage string `json:"sourceImage,omitempty"`
+-
+- // SourceImageId: The 'id' value of the image used to create this disk.
+- // This value may be used to determine whether the disk was created from
+- // the current or a previous instance of a given image.
+- SourceImageId string `json:"sourceImageId,omitempty"`
+-
+- // SourceSnapshot: The source snapshot used to create this disk.
+- SourceSnapshot string `json:"sourceSnapshot,omitempty"`
+-
+- // SourceSnapshotId: The 'id' value of the snapshot used to create this
+- // disk. This value may be used to determine whether the disk was
+- // created from the current or a previous instance of a given disk
+- // snapshot.
+- SourceSnapshotId string `json:"sourceSnapshotId,omitempty"`
+-
+- // Status: The status of disk creation (output only).
+- Status string `json:"status,omitempty"`
+-
+- // Type: URL of the disk type resource describing which disk type to use
+- // to create the disk; provided by the client when the disk is created.
+- Type string `json:"type,omitempty"`
+-
+- // Zone: URL of the zone where the disk resides (output only).
+- Zone string `json:"zone,omitempty"`
+-}
+-
+-type DiskAggregatedList struct {
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id string `json:"id,omitempty"`
+-
+- // Items: A map of scoped disk lists.
+- Items map[string]DisksScopedList `json:"items,omitempty"`
+-
+- // Kind: Type of resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // NextPageToken: A token used to continue a truncated list request
+- // (output only).
+- NextPageToken string `json:"nextPageToken,omitempty"`
+-
+- // SelfLink: Server defined URL for this resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-}
+-
+-type DiskList struct {
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id string `json:"id,omitempty"`
+-
+- // Items: The persistent disk resources.
+- Items []*Disk `json:"items,omitempty"`
+-
+- // Kind: Type of resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // NextPageToken: A token used to continue a truncated list request
+- // (output only).
+- NextPageToken string `json:"nextPageToken,omitempty"`
+-
+- // SelfLink: Server defined URL for this resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-}
+-
+-type DiskType struct {
+- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
+- // only).
+- CreationTimestamp string `json:"creationTimestamp,omitempty"`
+-
+- // DefaultDiskSizeGb: Server defined default disk size in gb (output
+- // only).
+- DefaultDiskSizeGb int64 `json:"defaultDiskSizeGb,omitempty,string"`
+-
+- // Deprecated: The deprecation status associated with this disk type.
+- Deprecated *DeprecationStatus `json:"deprecated,omitempty"`
+-
+- // Description: An optional textual description of the resource.
+- Description string `json:"description,omitempty"`
+-
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id uint64 `json:"id,omitempty,string"`
+-
+- // Kind: Type of the resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // Name: Name of the resource.
+- Name string `json:"name,omitempty"`
+-
+- // SelfLink: Server defined URL for the resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-
+- // ValidDiskSize: An optional textual descroption of the valid disk
+- // size, e.g., "10GB-10TB".
+- ValidDiskSize string `json:"validDiskSize,omitempty"`
+-
+- // Zone: Url of the zone where the disk type resides (output only).
+- Zone string `json:"zone,omitempty"`
+-}
+-
+-type DiskTypeAggregatedList struct {
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id string `json:"id,omitempty"`
+-
+- // Items: A map of scoped disk type lists.
+- Items map[string]DiskTypesScopedList `json:"items,omitempty"`
+-
+- // Kind: Type of resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // NextPageToken: A token used to continue a truncated list request
+- // (output only).
+- NextPageToken string `json:"nextPageToken,omitempty"`
+-
+- // SelfLink: Server defined URL for this resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-}
+-
+-type DiskTypeList struct {
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id string `json:"id,omitempty"`
+-
+- // Items: The disk type resources.
+- Items []*DiskType `json:"items,omitempty"`
+-
+- // Kind: Type of resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // NextPageToken: A token used to continue a truncated list request
+- // (output only).
+- NextPageToken string `json:"nextPageToken,omitempty"`
+-
+- // SelfLink: Server defined URL for this resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-}
+-
+-type DiskTypesScopedList struct {
+- // DiskTypes: List of disk types contained in this scope.
+- DiskTypes []*DiskType `json:"diskTypes,omitempty"`
+-
+- // Warning: Informational warning which replaces the list of disk types
+- // when the list is empty.
+- Warning *DiskTypesScopedListWarning `json:"warning,omitempty"`
+-}
+-
+-type DiskTypesScopedListWarning struct {
+- // Code: The warning type identifier for this warning.
+- Code string `json:"code,omitempty"`
+-
+- // Data: Metadata for this warning in 'key: value' format.
+- Data []*DiskTypesScopedListWarningData `json:"data,omitempty"`
+-
+- // Message: Optional human-readable details for this warning.
+- Message string `json:"message,omitempty"`
+-}
+-
+-type DiskTypesScopedListWarningData struct {
+- // Key: A key for the warning data.
+- Key string `json:"key,omitempty"`
+-
+- // Value: A warning data value corresponding to the key.
+- Value string `json:"value,omitempty"`
+-}
+-
+-type DisksScopedList struct {
+- // Disks: List of disks contained in this scope.
+- Disks []*Disk `json:"disks,omitempty"`
+-
+- // Warning: Informational warning which replaces the list of disks when
+- // the list is empty.
+- Warning *DisksScopedListWarning `json:"warning,omitempty"`
+-}
+-
+-type DisksScopedListWarning struct {
+- // Code: The warning type identifier for this warning.
+- Code string `json:"code,omitempty"`
+-
+- // Data: Metadata for this warning in 'key: value' format.
+- Data []*DisksScopedListWarningData `json:"data,omitempty"`
+-
+- // Message: Optional human-readable details for this warning.
+- Message string `json:"message,omitempty"`
+-}
+-
+-type DisksScopedListWarningData struct {
+- // Key: A key for the warning data.
+- Key string `json:"key,omitempty"`
+-
+- // Value: A warning data value corresponding to the key.
+- Value string `json:"value,omitempty"`
+-}
+-
+-type Firewall struct {
+- // Allowed: The list of rules specified by this firewall. Each rule
+- // specifies a protocol and port-range tuple that describes a permitted
+- // connection.
+- Allowed []*FirewallAllowed `json:"allowed,omitempty"`
+-
+- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
+- // only).
+- CreationTimestamp string `json:"creationTimestamp,omitempty"`
+-
+- // Description: An optional textual description of the resource;
+- // provided by the client when the resource is created.
+- Description string `json:"description,omitempty"`
+-
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id uint64 `json:"id,omitempty,string"`
+-
+- // Kind: Type of the resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // Name: Name of the resource; provided by the client when the resource
+- // is created. The name must be 1-63 characters long, and comply with
+- // RFC1035.
+- Name string `json:"name,omitempty"`
+-
+- // Network: URL of the network to which this firewall is applied;
+- // provided by the client when the firewall is created.
+- Network string `json:"network,omitempty"`
+-
+- // SelfLink: Server defined URL for the resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-
+- // SourceRanges: A list of IP address blocks expressed in CIDR format
+- // which this rule applies to. One or both of sourceRanges and
+- // sourceTags may be set; an inbound connection is allowed if either the
+- // range or the tag of the source matches.
+- SourceRanges []string `json:"sourceRanges,omitempty"`
+-
+- // SourceTags: A list of instance tags which this rule applies to. One
+- // or both of sourceRanges and sourceTags may be set; an inbound
+- // connection is allowed if either the range or the tag of the source
+- // matches.
+- SourceTags []string `json:"sourceTags,omitempty"`
+-
+- // TargetTags: A list of instance tags indicating sets of instances
+- // located on network which may make network connections as specified in
+- // allowed. If no targetTags are specified, the firewall rule applies to
+- // all instances on the specified network.
+- TargetTags []string `json:"targetTags,omitempty"`
+-}
+-
+-type FirewallAllowed struct {
+- // IPProtocol: Required; this is the IP protocol that is allowed for
+- // this rule. This can either be one of the following well known
+- // protocol strings ["tcp", "udp", "icmp", "esp", "ah", "sctp"], or the
+- // IP protocol number.
+- IPProtocol string `json:"IPProtocol,omitempty"`
+-
+- // Ports: An optional list of ports which are allowed. It is an error to
+- // specify this for any protocol that isn't UDP or TCP. Each entry must
+- // be either an integer or a range. If not specified, connections
+- // through any port are allowed.
+- //
+- // Example inputs include: ["22"],
+- // ["80","443"] and ["12345-12349"].
+- Ports []string `json:"ports,omitempty"`
+-}
+-
+-type FirewallList struct {
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id string `json:"id,omitempty"`
+-
+- // Items: The firewall resources.
+- Items []*Firewall `json:"items,omitempty"`
+-
+- // Kind: Type of resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // NextPageToken: A token used to continue a truncated list request
+- // (output only).
+- NextPageToken string `json:"nextPageToken,omitempty"`
+-
+- // SelfLink: Server defined URL for this resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-}
+-
+-type ForwardingRule struct {
+- // IPAddress: Value of the reserved IP address that this forwarding rule
+- // is serving on behalf of. For global forwarding rules, the address
+- // must be a global IP; for regional forwarding rules, the address must
+- // live in the same region as the forwarding rule. If left empty
+- // (default value), an ephemeral IP from the same scope (global or
+- // regional) will be assigned.
+- IPAddress string `json:"IPAddress,omitempty"`
+-
+- // IPProtocol: The IP protocol to which this rule applies, valid options
+- // are 'TCP', 'UDP', 'ESP', 'AH' or 'SCTP'.
+- IPProtocol string `json:"IPProtocol,omitempty"`
+-
+- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
+- // only).
+- CreationTimestamp string `json:"creationTimestamp,omitempty"`
+-
+- // Description: An optional textual description of the resource;
+- // provided by the client when the resource is created.
+- Description string `json:"description,omitempty"`
+-
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id uint64 `json:"id,omitempty,string"`
+-
+- // Kind: Type of the resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // Name: Name of the resource; provided by the client when the resource
+- // is created. The name must be 1-63 characters long, and comply with
+- // RFC1035.
+- Name string `json:"name,omitempty"`
+-
+- // PortRange: Applicable only when 'IPProtocol' is 'TCP', 'UDP' or
+- // 'SCTP', only packets addressed to ports in the specified range will
+- // be forwarded to 'target'. If 'portRange' is left empty (default
+- // value), all ports are forwarded. Forwarding rules with the same
+- // [IPAddress, IPProtocol] pair must have disjoint port ranges.
+- PortRange string `json:"portRange,omitempty"`
+-
+- // Region: URL of the region where the regional forwarding rule resides
+- // (output only). This field is not applicable to global forwarding
+- // rules.
+- Region string `json:"region,omitempty"`
+-
+- // SelfLink: Server defined URL for the resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-
+- // Target: The URL of the target resource to receive the matched
+- // traffic. For regional forwarding rules, this target must live in the
+- // same region as the forwarding rule. For global forwarding rules, this
+- // target must be a global TargetHttpProxy resource.
+- Target string `json:"target,omitempty"`
+-}
+-
+-type ForwardingRuleAggregatedList struct {
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id string `json:"id,omitempty"`
+-
+- // Items: A map of scoped forwarding rule lists.
+- Items map[string]ForwardingRulesScopedList `json:"items,omitempty"`
+-
+- // Kind: Type of resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // NextPageToken: A token used to continue a truncated list request
+- // (output only).
+- NextPageToken string `json:"nextPageToken,omitempty"`
+-
+- // SelfLink: Server defined URL for this resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-}
+-
+-type ForwardingRuleList struct {
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id string `json:"id,omitempty"`
+-
+- // Items: The ForwardingRule resources.
+- Items []*ForwardingRule `json:"items,omitempty"`
+-
+- // Kind: Type of resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // NextPageToken: A token used to continue a truncated list request
+- // (output only).
+- NextPageToken string `json:"nextPageToken,omitempty"`
+-
+- // SelfLink: Server defined URL for this resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-}
+-
+-type ForwardingRulesScopedList struct {
+- // ForwardingRules: List of forwarding rules contained in this scope.
+- ForwardingRules []*ForwardingRule `json:"forwardingRules,omitempty"`
+-
+- // Warning: Informational warning which replaces the list of forwarding
+- // rules when the list is empty.
+- Warning *ForwardingRulesScopedListWarning `json:"warning,omitempty"`
+-}
+-
+-type ForwardingRulesScopedListWarning struct {
+- // Code: The warning type identifier for this warning.
+- Code string `json:"code,omitempty"`
+-
+- // Data: Metadata for this warning in 'key: value' format.
+- Data []*ForwardingRulesScopedListWarningData `json:"data,omitempty"`
+-
+- // Message: Optional human-readable details for this warning.
+- Message string `json:"message,omitempty"`
+-}
+-
+-type ForwardingRulesScopedListWarningData struct {
+- // Key: A key for the warning data.
+- Key string `json:"key,omitempty"`
+-
+- // Value: A warning data value corresponding to the key.
+- Value string `json:"value,omitempty"`
+-}
+-
+-type HealthCheckReference struct {
+- HealthCheck string `json:"healthCheck,omitempty"`
+-}
+-
+-type HealthStatus struct {
+- // HealthState: Health state of the instance.
+- HealthState string `json:"healthState,omitempty"`
+-
+- // Instance: URL of the instance resource.
+- Instance string `json:"instance,omitempty"`
+-
+- // IpAddress: The IP address represented by this resource.
+- IpAddress string `json:"ipAddress,omitempty"`
+-
+- // Port: The port on the instance.
+- Port int64 `json:"port,omitempty"`
+-}
+-
+-type HostRule struct {
+- Description string `json:"description,omitempty"`
+-
+- // Hosts: The list of host patterns to match. They must be valid
+- // hostnames except that they may start with *. or *-. The * acts like a
+- // glob and will match any string of atoms (separated by .s and -s) to
+- // the left.
+- Hosts []string `json:"hosts,omitempty"`
+-
+- // PathMatcher: The name of the PathMatcher to match the path portion of
+- // the URL, if the this HostRule matches the URL's host portion.
+- PathMatcher string `json:"pathMatcher,omitempty"`
+-}
+-
+-type HttpHealthCheck struct {
+- // CheckIntervalSec: How often (in seconds) to send a health check. The
+- // default value is 5 seconds.
+- CheckIntervalSec int64 `json:"checkIntervalSec,omitempty"`
+-
+- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
+- // only).
+- CreationTimestamp string `json:"creationTimestamp,omitempty"`
+-
+- // Description: An optional textual description of the resource;
+- // provided by the client when the resource is created.
+- Description string `json:"description,omitempty"`
+-
+- // HealthyThreshold: A so-far unhealthy VM will be marked healthy after
+- // this many consecutive successes. The default value is 2.
+- HealthyThreshold int64 `json:"healthyThreshold,omitempty"`
+-
+- // Host: The value of the host header in the HTTP health check request.
+- // If left empty (default value), the public IP on behalf of which this
+- // health check is performed will be used.
+- Host string `json:"host,omitempty"`
+-
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id uint64 `json:"id,omitempty,string"`
+-
+- // Kind: Type of the resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // Name: Name of the resource; provided by the client when the resource
+- // is created. The name must be 1-63 characters long, and comply with
+- // RFC1035.
+- Name string `json:"name,omitempty"`
+-
+- // Port: The TCP port number for the HTTP health check request. The
+- // default value is 80.
+- Port int64 `json:"port,omitempty"`
+-
+- // RequestPath: The request path of the HTTP health check request. The
+- // default value is "/".
+- RequestPath string `json:"requestPath,omitempty"`
+-
+- // SelfLink: Server defined URL for the resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-
+- // TimeoutSec: How long (in seconds) to wait before claiming failure.
+- // The default value is 5 seconds.
+- TimeoutSec int64 `json:"timeoutSec,omitempty"`
+-
+- // UnhealthyThreshold: A so-far healthy VM will be marked unhealthy
+- // after this many consecutive failures. The default value is 2.
+- UnhealthyThreshold int64 `json:"unhealthyThreshold,omitempty"`
+-}
+-
+-type HttpHealthCheckList struct {
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id string `json:"id,omitempty"`
+-
+- // Items: The HttpHealthCheck resources.
+- Items []*HttpHealthCheck `json:"items,omitempty"`
+-
+- // Kind: Type of resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // NextPageToken: A token used to continue a truncated list request
+- // (output only).
+- NextPageToken string `json:"nextPageToken,omitempty"`
+-
+- // SelfLink: Server defined URL for this resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-}
+-
+-type Image struct {
+- // ArchiveSizeBytes: Size of the image tar.gz archive stored in Google
+- // Cloud Storage (in bytes).
+- ArchiveSizeBytes int64 `json:"archiveSizeBytes,omitempty,string"`
+-
+- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
+- // only).
+- CreationTimestamp string `json:"creationTimestamp,omitempty"`
+-
+- // Deprecated: The deprecation status associated with this image.
+- Deprecated *DeprecationStatus `json:"deprecated,omitempty"`
+-
+- // Description: Textual description of the resource; provided by the
+- // client when the resource is created.
+- Description string `json:"description,omitempty"`
+-
+- // DiskSizeGb: Size of the image when restored onto a disk (in GiB).
+- DiskSizeGb int64 `json:"diskSizeGb,omitempty,string"`
+-
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id uint64 `json:"id,omitempty,string"`
+-
+- // Kind: Type of the resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // Licenses: Public visible licenses.
+- Licenses []string `json:"licenses,omitempty"`
+-
+- // Name: Name of the resource; provided by the client when the resource
+- // is created. The name must be 1-63 characters long, and comply with
+- // RFC1035.
+- Name string `json:"name,omitempty"`
+-
+- // RawDisk: The raw disk image parameters.
+- RawDisk *ImageRawDisk `json:"rawDisk,omitempty"`
+-
+- // SelfLink: Server defined URL for the resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-
+- // SourceDisk: The source disk used to create this image.
+- SourceDisk string `json:"sourceDisk,omitempty"`
+-
+- // SourceDiskId: The 'id' value of the disk used to create this image.
+- // This value may be used to determine whether the image was taken from
+- // the current or a previous instance of a given disk name.
+- SourceDiskId string `json:"sourceDiskId,omitempty"`
+-
+- // SourceType: Must be "RAW"; provided by the client when the disk image
+- // is created.
+- SourceType string `json:"sourceType,omitempty"`
+-
+- // Status: Status of the image (output only). It will be one of the
+- // following READY - after image has been successfully created and is
+- // ready for use FAILED - if creating the image fails for some reason
+- // PENDING - the image creation is in progress An image can be used to
+- // create other resources suck as instances only after the image has
+- // been successfully created and the status is set to READY.
+- Status string `json:"status,omitempty"`
+-}
+-
+-type ImageRawDisk struct {
+- // ContainerType: The format used to encode and transmit the block
+- // device. Should be TAR. This is just a container and transmission
+- // format and not a runtime format. Provided by the client when the disk
+- // image is created.
+- ContainerType string `json:"containerType,omitempty"`
+-
+- // Sha1Checksum: An optional SHA1 checksum of the disk image before
+- // unpackaging; provided by the client when the disk image is created.
+- Sha1Checksum string `json:"sha1Checksum,omitempty"`
+-
+- // Source: The full Google Cloud Storage URL where the disk image is
+- // stored; provided by the client when the disk image is created.
+- Source string `json:"source,omitempty"`
+-}
+-
+-type ImageList struct {
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id string `json:"id,omitempty"`
+-
+- // Items: The disk image resources.
+- Items []*Image `json:"items,omitempty"`
+-
+- // Kind: Type of resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // NextPageToken: A token used to continue a truncated list request
+- // (output only).
+- NextPageToken string `json:"nextPageToken,omitempty"`
+-
+- // SelfLink: Server defined URL for this resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-}
+-
+-type Instance struct {
+- // CanIpForward: Allows this instance to send packets with source IP
+- // addresses other than its own and receive packets with destination IP
+- // addresses other than its own. If this instance will be used as an IP
+- // gateway or it will be set as the next-hop in a Route resource, say
+- // true. If unsure, leave this set to false.
+- CanIpForward bool `json:"canIpForward,omitempty"`
+-
+- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
+- // only).
+- CreationTimestamp string `json:"creationTimestamp,omitempty"`
+-
+- // Description: An optional textual description of the resource;
+- // provided by the client when the resource is created.
+- Description string `json:"description,omitempty"`
+-
+- // Disks: Array of disks associated with this instance. Persistent disks
+- // must be created before you can assign them.
+- Disks []*AttachedDisk `json:"disks,omitempty"`
+-
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id uint64 `json:"id,omitempty,string"`
+-
+- // Kind: Type of the resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // MachineType: URL of the machine type resource describing which
+- // machine type to use to host the instance; provided by the client when
+- // the instance is created.
+- MachineType string `json:"machineType,omitempty"`
+-
+- // Metadata: Metadata key/value pairs assigned to this instance.
+- // Consists of custom metadata or predefined keys; see Instance
+- // documentation for more information.
+- Metadata *Metadata `json:"metadata,omitempty"`
+-
+- // Name: Name of the resource; provided by the client when the resource
+- // is created. The name must be 1-63 characters long, and comply with
+- // RFC1035.
+- Name string `json:"name,omitempty"`
+-
+- // NetworkInterfaces: Array of configurations for this interface. This
+- // specifies how this interface is configured to interact with other
+- // network services, such as connecting to the internet. Currently,
+- // ONE_TO_ONE_NAT is the only access config supported. If there are no
+- // accessConfigs specified, then this instance will have no external
+- // internet access.
+- NetworkInterfaces []*NetworkInterface `json:"networkInterfaces,omitempty"`
+-
+- // Scheduling: Scheduling options for this instance.
+- Scheduling *Scheduling `json:"scheduling,omitempty"`
+-
+- // SelfLink: Server defined URL for this resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-
+- // ServiceAccounts: A list of service accounts each with specified
+- // scopes, for which access tokens are to be made available to the
+- // instance through metadata queries.
+- ServiceAccounts []*ServiceAccount `json:"serviceAccounts,omitempty"`
+-
+- // Status: Instance status. One of the following values: "PROVISIONING",
+- // "STAGING", "RUNNING", "STOPPING", "STOPPED", "TERMINATED" (output
+- // only).
+- Status string `json:"status,omitempty"`
+-
+- // StatusMessage: An optional, human-readable explanation of the status
+- // (output only).
+- StatusMessage string `json:"statusMessage,omitempty"`
+-
+- // Tags: A list of tags to be applied to this instance. Used to identify
+- // valid sources or targets for network firewalls. Provided by the
+- // client on instance creation. The tags can be later modified by the
+- // setTags method. Each tag within the list must comply with RFC1035.
+- Tags *Tags `json:"tags,omitempty"`
+-
+- // Zone: URL of the zone where the instance resides (output only).
+- Zone string `json:"zone,omitempty"`
+-}
+-
+-type InstanceAggregatedList struct {
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id string `json:"id,omitempty"`
+-
+- // Items: A map of scoped instance lists.
+- Items map[string]InstancesScopedList `json:"items,omitempty"`
+-
+- // Kind: Type of resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // NextPageToken: A token used to continue a truncated list request
+- // (output only).
+- NextPageToken string `json:"nextPageToken,omitempty"`
+-
+- // SelfLink: Server defined URL for this resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-}
+-
+-type InstanceList struct {
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id string `json:"id,omitempty"`
+-
+- // Items: A list of instance resources.
+- Items []*Instance `json:"items,omitempty"`
+-
+- // Kind: Type of resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // NextPageToken: A token used to continue a truncated list request
+- // (output only).
+- NextPageToken string `json:"nextPageToken,omitempty"`
+-
+- // SelfLink: Server defined URL for this resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-}
+-
+-type InstanceProperties struct {
+- // CanIpForward: Allows instances created based on this template to send
+- // packets with source IP addresses other than their own and receive
+- // packets with destination IP addresses other than their own. If these
+- // instances will be used as an IP gateway or it will be set as the
+- // next-hop in a Route resource, say true. If unsure, leave this set to
+- // false.
+- CanIpForward bool `json:"canIpForward,omitempty"`
+-
+- // Description: An optional textual description for the instances
+- // created based on the instance template resource; provided by the
+- // client when the template is created.
+- Description string `json:"description,omitempty"`
+-
+- // Disks: Array of disks associated with instance created based on this
+- // template.
+- Disks []*AttachedDisk `json:"disks,omitempty"`
+-
+- // MachineType: Name of the machine type resource describing which
+- // machine type to use to host the instances created based on this
+- // template; provided by the client when the instance template is
+- // created.
+- MachineType string `json:"machineType,omitempty"`
+-
+- // Metadata: Metadata key/value pairs assigned to instances created
+- // based on this template. Consists of custom metadata or predefined
+- // keys; see Instance documentation for more information.
+- Metadata *Metadata `json:"metadata,omitempty"`
+-
+- // NetworkInterfaces: Array of configurations for this interface. This
+- // specifies how this interface is configured to interact with other
+- // network services, such as connecting to the internet. Currently,
+- // ONE_TO_ONE_NAT is the only access config supported. If there are no
+- // accessConfigs specified, then this instances created based based on
+- // this template will have no external internet access.
+- NetworkInterfaces []*NetworkInterface `json:"networkInterfaces,omitempty"`
+-
+- // Scheduling: Scheduling options for the instances created based on
+- // this template.
+- Scheduling *Scheduling `json:"scheduling,omitempty"`
+-
+- // ServiceAccounts: A list of service accounts each with specified
+- // scopes, for which access tokens are to be made available to the
+- // instances created based on this template, through metadata queries.
+- ServiceAccounts []*ServiceAccount `json:"serviceAccounts,omitempty"`
+-
+- // Tags: A list of tags to be applied to the instances created based on
+- // this template used to identify valid sources or targets for network
+- // firewalls. Provided by the client on instance creation. The tags can
+- // be later modified by the setTags method. Each tag within the list
+- // must comply with RFC1035.
+- Tags *Tags `json:"tags,omitempty"`
+-}
+-
+-type InstanceReference struct {
+- Instance string `json:"instance,omitempty"`
+-}
+-
+-type InstanceTemplate struct {
+- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
+- // only).
+- CreationTimestamp string `json:"creationTimestamp,omitempty"`
+-
+- // Description: An optional textual description of the instance template
+- // resource; provided by the client when the resource is created.
+- Description string `json:"description,omitempty"`
+-
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id uint64 `json:"id,omitempty,string"`
+-
+- // Kind: Type of the resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // Name: Name of the instance template resource; provided by the client
+- // when the resource is created. The name must be 1-63 characters long,
+- // and comply with RFC1035
+- Name string `json:"name,omitempty"`
+-
+- // Properties: The instance properties portion of this instance template
+- // resource.
+- Properties *InstanceProperties `json:"properties,omitempty"`
+-
+- // SelfLink: Server defined URL for the resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-}
+-
+-type InstanceTemplateList struct {
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id string `json:"id,omitempty"`
+-
+- // Items: A list of instance template resources.
+- Items []*InstanceTemplate `json:"items,omitempty"`
+-
+- // Kind: Type of resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // NextPageToken: A token used to continue a truncated list request
+- // (output only).
+- NextPageToken string `json:"nextPageToken,omitempty"`
+-
+- // SelfLink: Server defined URL for this resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-}
+-
+-type InstancesScopedList struct {
+- // Instances: List of instances contained in this scope.
+- Instances []*Instance `json:"instances,omitempty"`
+-
+- // Warning: Informational warning which replaces the list of instances
+- // when the list is empty.
+- Warning *InstancesScopedListWarning `json:"warning,omitempty"`
+-}
+-
+-type InstancesScopedListWarning struct {
+- // Code: The warning type identifier for this warning.
+- Code string `json:"code,omitempty"`
+-
+- // Data: Metadata for this warning in 'key: value' format.
+- Data []*InstancesScopedListWarningData `json:"data,omitempty"`
+-
+- // Message: Optional human-readable details for this warning.
+- Message string `json:"message,omitempty"`
+-}
+-
+-type InstancesScopedListWarningData struct {
+- // Key: A key for the warning data.
+- Key string `json:"key,omitempty"`
+-
+- // Value: A warning data value corresponding to the key.
+- Value string `json:"value,omitempty"`
+-}
+-
+-type License struct {
+- // ChargesUseFee: If true, the customer will be charged license fee for
+- // running software that contains this license on an instance.
+- ChargesUseFee bool `json:"chargesUseFee,omitempty"`
+-
+- // Kind: Type of resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // Name: Name of the resource; provided by the client when the resource
+- // is created. The name must be 1-63 characters long, and comply with
+- // RFC1035.
+- Name string `json:"name,omitempty"`
+-
+- // SelfLink: Server defined URL for the resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-}
+-
+-type MachineType struct {
+- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
+- // only).
+- CreationTimestamp string `json:"creationTimestamp,omitempty"`
+-
+- // Deprecated: The deprecation status associated with this machine type.
+- Deprecated *DeprecationStatus `json:"deprecated,omitempty"`
+-
+- // Description: An optional textual description of the resource.
+- Description string `json:"description,omitempty"`
+-
+- // GuestCpus: Count of CPUs exposed to the instance.
+- GuestCpus int64 `json:"guestCpus,omitempty"`
+-
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id uint64 `json:"id,omitempty,string"`
+-
+- // ImageSpaceGb: Space allotted for the image, defined in GB.
+- ImageSpaceGb int64 `json:"imageSpaceGb,omitempty"`
+-
+- // Kind: Type of the resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // MaximumPersistentDisks: Maximum persistent disks allowed.
+- MaximumPersistentDisks int64 `json:"maximumPersistentDisks,omitempty"`
+-
+- // MaximumPersistentDisksSizeGb: Maximum total persistent disks size
+- // (GB) allowed.
+- MaximumPersistentDisksSizeGb int64 `json:"maximumPersistentDisksSizeGb,omitempty,string"`
+-
+- // MemoryMb: Physical memory assigned to the instance, defined in MB.
+- MemoryMb int64 `json:"memoryMb,omitempty"`
+-
+- // Name: Name of the resource.
+- Name string `json:"name,omitempty"`
+-
+- // ScratchDisks: List of extended scratch disks assigned to the
+- // instance.
+- ScratchDisks []*MachineTypeScratchDisks `json:"scratchDisks,omitempty"`
+-
+- // SelfLink: Server defined URL for the resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-
+- // Zone: Url of the zone where the machine type resides (output only).
+- Zone string `json:"zone,omitempty"`
+-}
+-
+-type MachineTypeScratchDisks struct {
+- // DiskGb: Size of the scratch disk, defined in GB.
+- DiskGb int64 `json:"diskGb,omitempty"`
+-}
+-
+-type MachineTypeAggregatedList struct {
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id string `json:"id,omitempty"`
+-
+- // Items: A map of scoped machine type lists.
+- Items map[string]MachineTypesScopedList `json:"items,omitempty"`
+-
+- // Kind: Type of resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // NextPageToken: A token used to continue a truncated list request
+- // (output only).
+- NextPageToken string `json:"nextPageToken,omitempty"`
+-
+- // SelfLink: Server defined URL for this resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-}
+-
+-type MachineTypeList struct {
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id string `json:"id,omitempty"`
+-
+- // Items: The machine type resources.
+- Items []*MachineType `json:"items,omitempty"`
+-
+- // Kind: Type of resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // NextPageToken: A token used to continue a truncated list request
+- // (output only).
+- NextPageToken string `json:"nextPageToken,omitempty"`
+-
+- // SelfLink: Server defined URL for this resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-}
+-
+-type MachineTypesScopedList struct {
+- // MachineTypes: List of machine types contained in this scope.
+- MachineTypes []*MachineType `json:"machineTypes,omitempty"`
+-
+- // Warning: Informational warning which replaces the list of machine
+- // types when the list is empty.
+- Warning *MachineTypesScopedListWarning `json:"warning,omitempty"`
+-}
+-
+-type MachineTypesScopedListWarning struct {
+- // Code: The warning type identifier for this warning.
+- Code string `json:"code,omitempty"`
+-
+- // Data: Metadata for this warning in 'key: value' format.
+- Data []*MachineTypesScopedListWarningData `json:"data,omitempty"`
+-
+- // Message: Optional human-readable details for this warning.
+- Message string `json:"message,omitempty"`
+-}
+-
+-type MachineTypesScopedListWarningData struct {
+- // Key: A key for the warning data.
+- Key string `json:"key,omitempty"`
+-
+- // Value: A warning data value corresponding to the key.
+- Value string `json:"value,omitempty"`
+-}
+-
+-type Metadata struct {
+- // Fingerprint: Fingerprint of this resource. A hash of the metadata's
+- // contents. This field is used for optimistic locking. An up-to-date
+- // metadata fingerprint must be provided in order to modify metadata.
+- Fingerprint string `json:"fingerprint,omitempty"`
+-
+- // Items: Array of key/value pairs. The total size of all keys and
+- // values must be less than 512 KB.
+- Items []*MetadataItems `json:"items,omitempty"`
+-
+- // Kind: Type of the resource.
+- Kind string `json:"kind,omitempty"`
+-}
+-
+-type MetadataItems struct {
+- // Key: Key for the metadata entry. Keys must conform to the following
+- // regexp: [a-zA-Z0-9-_]+, and be less than 128 bytes in length. This is
+- // reflected as part of a URL in the metadata server. Additionally, to
+- // avoid ambiguity, keys must not conflict with any other metadata keys
+- // for the project.
+- Key string `json:"key,omitempty"`
+-
+- // Value: Value for the metadata entry. These are free-form strings, and
+- // only have meaning as interpreted by the image running in the
+- // instance. The only restriction placed on values is that their size
+- // must be less than or equal to 32768 bytes.
+- Value string `json:"value,omitempty"`
+-}
+-
+-type Network struct {
+- // IPv4Range: Required; The range of internal addresses that are legal
+- // on this network. This range is a CIDR specification, for example:
+- // 192.168.0.0/16. Provided by the client when the network is created.
+- IPv4Range string `json:"IPv4Range,omitempty"`
+-
+- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
+- // only).
+- CreationTimestamp string `json:"creationTimestamp,omitempty"`
+-
+- // Description: An optional textual description of the resource;
+- // provided by the client when the resource is created.
+- Description string `json:"description,omitempty"`
+-
+- // GatewayIPv4: An optional address that is used for default routing to
+- // other networks. This must be within the range specified by IPv4Range,
+- // and is typically the first usable address in that range. If not
+- // specified, the default value is the first usable address in
+- // IPv4Range.
+- GatewayIPv4 string `json:"gatewayIPv4,omitempty"`
+-
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id uint64 `json:"id,omitempty,string"`
+-
+- // Kind: Type of the resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // Name: Name of the resource; provided by the client when the resource
+- // is created. The name must be 1-63 characters long, and comply with
+- // RFC1035.
+- Name string `json:"name,omitempty"`
+-
+- // SelfLink: Server defined URL for the resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-}
+-
+-type NetworkInterface struct {
+- // AccessConfigs: Array of configurations for this interface. This
+- // specifies how this interface is configured to interact with other
+- // network services, such as connecting to the internet. Currently,
+- // ONE_TO_ONE_NAT is the only access config supported. If there are no
+- // accessConfigs specified, then this instance will have no external
+- // internet access.
+- AccessConfigs []*AccessConfig `json:"accessConfigs,omitempty"`
+-
+- // Name: Name of the network interface, determined by the server; for
+- // network devices, these are e.g. eth0, eth1, etc. (output only).
+- Name string `json:"name,omitempty"`
+-
+- // Network: URL of the network resource attached to this interface.
+- Network string `json:"network,omitempty"`
+-
+- // NetworkIP: An optional IPV4 internal network address assigned to the
+- // instance for this network interface (output only).
+- NetworkIP string `json:"networkIP,omitempty"`
+-}
+-
+-type NetworkList struct {
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id string `json:"id,omitempty"`
+-
+- // Items: The network resources.
+- Items []*Network `json:"items,omitempty"`
+-
+- // Kind: Type of resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // NextPageToken: A token used to continue a truncated list request
+- // (output only).
+- NextPageToken string `json:"nextPageToken,omitempty"`
+-
+- // SelfLink: Server defined URL for this resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-}
+-
+-type Operation struct {
+- // ClientOperationId: An optional identifier specified by the client
+- // when the mutation was initiated. Must be unique for all operation
+- // resources in the project (output only).
+- ClientOperationId string `json:"clientOperationId,omitempty"`
+-
+- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
+- // only).
+- CreationTimestamp string `json:"creationTimestamp,omitempty"`
+-
+- // EndTime: The time that this operation was completed. This is in RFC
+- // 3339 format (output only).
+- EndTime string `json:"endTime,omitempty"`
+-
+- // Error: If errors occurred during processing of this operation, this
+- // field will be populated (output only).
+- Error *OperationError `json:"error,omitempty"`
+-
+- // HttpErrorMessage: If operation fails, the HTTP error message
+- // returned, e.g. NOT FOUND. (output only).
+- HttpErrorMessage string `json:"httpErrorMessage,omitempty"`
+-
+- // HttpErrorStatusCode: If operation fails, the HTTP error status code
+- // returned, e.g. 404. (output only).
+- HttpErrorStatusCode int64 `json:"httpErrorStatusCode,omitempty"`
+-
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id uint64 `json:"id,omitempty,string"`
+-
+- // InsertTime: The time that this operation was requested. This is in
+- // RFC 3339 format (output only).
+- InsertTime string `json:"insertTime,omitempty"`
+-
+- // Kind: Type of the resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // Name: Name of the resource (output only).
+- Name string `json:"name,omitempty"`
+-
+- // OperationType: Type of the operation. Examples include "insert",
+- // "update", and "delete" (output only).
+- OperationType string `json:"operationType,omitempty"`
+-
+- // Progress: An optional progress indicator that ranges from 0 to 100.
+- // There is no requirement that this be linear or support any
+- // granularity of operations. This should not be used to guess at when
+- // the operation will be complete. This number should be monotonically
+- // increasing as the operation progresses (output only).
+- Progress int64 `json:"progress,omitempty"`
+-
+- // Region: URL of the region where the operation resides (output only).
+- Region string `json:"region,omitempty"`
+-
+- // SelfLink: Server defined URL for the resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-
+- // StartTime: The time that this operation was started by the server.
+- // This is in RFC 3339 format (output only).
+- StartTime string `json:"startTime,omitempty"`
+-
+- // Status: Status of the operation. Can be one of the following:
+- // "PENDING", "RUNNING", or "DONE" (output only).
+- Status string `json:"status,omitempty"`
+-
+- // StatusMessage: An optional textual description of the current status
+- // of the operation (output only).
+- StatusMessage string `json:"statusMessage,omitempty"`
+-
+- // TargetId: Unique target id which identifies a particular incarnation
+- // of the target (output only).
+- TargetId uint64 `json:"targetId,omitempty,string"`
+-
+- // TargetLink: URL of the resource the operation is mutating (output
+- // only).
+- TargetLink string `json:"targetLink,omitempty"`
+-
+- // User: User who requested the operation, for example
+- // "user at example.com" (output only).
+- User string `json:"user,omitempty"`
+-
+- // Warnings: If warning messages generated during processing of this
+- // operation, this field will be populated (output only).
+- Warnings []*OperationWarnings `json:"warnings,omitempty"`
+-
+- // Zone: URL of the zone where the operation resides (output only).
+- Zone string `json:"zone,omitempty"`
+-}
+-
+-type OperationError struct {
+- // Errors: The array of errors encountered while processing this
+- // operation.
+- Errors []*OperationErrorErrors `json:"errors,omitempty"`
+-}
+-
+-type OperationErrorErrors struct {
+- // Code: The error type identifier for this error.
+- Code string `json:"code,omitempty"`
+-
+- // Location: Indicates the field in the request which caused the error.
+- // This property is optional.
+- Location string `json:"location,omitempty"`
+-
+- // Message: An optional, human-readable error message.
+- Message string `json:"message,omitempty"`
+-}
+-
+-type OperationWarnings struct {
+- // Code: The warning type identifier for this warning.
+- Code string `json:"code,omitempty"`
+-
+- // Data: Metadata for this warning in 'key: value' format.
+- Data []*OperationWarningsData `json:"data,omitempty"`
+-
+- // Message: Optional human-readable details for this warning.
+- Message string `json:"message,omitempty"`
+-}
+-
+-type OperationWarningsData struct {
+- // Key: A key for the warning data.
+- Key string `json:"key,omitempty"`
+-
+- // Value: A warning data value corresponding to the key.
+- Value string `json:"value,omitempty"`
+-}
+-
+-type OperationAggregatedList struct {
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id string `json:"id,omitempty"`
+-
+- // Items: A map of scoped operation lists.
+- Items map[string]OperationsScopedList `json:"items,omitempty"`
+-
+- // Kind: Type of resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // NextPageToken: A token used to continue a truncated list request
+- // (output only).
+- NextPageToken string `json:"nextPageToken,omitempty"`
+-
+- // SelfLink: Server defined URL for this resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-}
+-
+-type OperationList struct {
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id string `json:"id,omitempty"`
+-
+- // Items: The operation resources.
+- Items []*Operation `json:"items,omitempty"`
+-
+- // Kind: Type of resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // NextPageToken: A token used to continue a truncated list request
+- // (output only).
+- NextPageToken string `json:"nextPageToken,omitempty"`
+-
+- // SelfLink: Server defined URL for this resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-}
+-
+-type OperationsScopedList struct {
+- // Operations: List of operations contained in this scope.
+- Operations []*Operation `json:"operations,omitempty"`
+-
+- // Warning: Informational warning which replaces the list of operations
+- // when the list is empty.
+- Warning *OperationsScopedListWarning `json:"warning,omitempty"`
+-}
+-
+-type OperationsScopedListWarning struct {
+- // Code: The warning type identifier for this warning.
+- Code string `json:"code,omitempty"`
+-
+- // Data: Metadata for this warning in 'key: value' format.
+- Data []*OperationsScopedListWarningData `json:"data,omitempty"`
+-
+- // Message: Optional human-readable details for this warning.
+- Message string `json:"message,omitempty"`
+-}
+-
+-type OperationsScopedListWarningData struct {
+- // Key: A key for the warning data.
+- Key string `json:"key,omitempty"`
+-
+- // Value: A warning data value corresponding to the key.
+- Value string `json:"value,omitempty"`
+-}
+-
+-type PathMatcher struct {
+- // DefaultService: The URL to the BackendService resource. This will be
+- // used if none of the 'pathRules' defined by this PathMatcher is met by
+- // the URL's path portion.
+- DefaultService string `json:"defaultService,omitempty"`
+-
+- Description string `json:"description,omitempty"`
+-
+- // Name: The name to which this PathMatcher is referred by the HostRule.
+- Name string `json:"name,omitempty"`
+-
+- // PathRules: The list of path rules.
+- PathRules []*PathRule `json:"pathRules,omitempty"`
+-}
+-
+-type PathRule struct {
+- // Paths: The list of path patterns to match. Each must start with / and
+- // the only place a * is allowed is at the end following a /. The string
+- // fed to the path matcher does not include any text after the first ?
+- // or #, and those chars are not allowed here.
+- Paths []string `json:"paths,omitempty"`
+-
+- // Service: The URL of the BackendService resource if this rule is
+- // matched.
+- Service string `json:"service,omitempty"`
+-}
+-
+-type Project struct {
+- // CommonInstanceMetadata: Metadata key/value pairs available to all
+- // instances contained in this project.
+- CommonInstanceMetadata *Metadata `json:"commonInstanceMetadata,omitempty"`
+-
+- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
+- // only).
+- CreationTimestamp string `json:"creationTimestamp,omitempty"`
+-
+- // Description: An optional textual description of the resource.
+- Description string `json:"description,omitempty"`
+-
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id uint64 `json:"id,omitempty,string"`
+-
+- // Kind: Type of the resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // Name: Name of the resource.
+- Name string `json:"name,omitempty"`
+-
+- // Quotas: Quotas assigned to this project.
+- Quotas []*Quota `json:"quotas,omitempty"`
+-
+- // SelfLink: Server defined URL for the resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-
+- // UsageExportLocation: The location in Cloud Storage and naming method
+- // of the daily usage report.
+- UsageExportLocation *UsageExportLocation `json:"usageExportLocation,omitempty"`
+-}
+-
+-type Quota struct {
+- // Limit: Quota limit for this metric.
+- Limit float64 `json:"limit,omitempty"`
+-
+- // Metric: Name of the quota metric.
+- Metric string `json:"metric,omitempty"`
+-
+- // Usage: Current usage of this metric.
+- Usage float64 `json:"usage,omitempty"`
+-}
+-
+-type Region struct {
+- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
+- // only).
+- CreationTimestamp string `json:"creationTimestamp,omitempty"`
+-
+- // Deprecated: The deprecation status associated with this region.
+- Deprecated *DeprecationStatus `json:"deprecated,omitempty"`
+-
+- // Description: Textual description of the resource.
+- Description string `json:"description,omitempty"`
+-
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id uint64 `json:"id,omitempty,string"`
+-
+- // Kind: Type of the resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // Name: Name of the resource.
+- Name string `json:"name,omitempty"`
+-
+- // Quotas: Quotas assigned to this region.
+- Quotas []*Quota `json:"quotas,omitempty"`
+-
+- // SelfLink: Server defined URL for the resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-
+- // Status: Status of the region, "UP" or "DOWN".
+- Status string `json:"status,omitempty"`
+-
+- // Zones: A list of zones homed in this region, in the form of resource
+- // URLs.
+- Zones []string `json:"zones,omitempty"`
+-}
+-
+-type RegionList struct {
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id string `json:"id,omitempty"`
+-
+- // Items: The region resources.
+- Items []*Region `json:"items,omitempty"`
+-
+- // Kind: Type of resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // NextPageToken: A token used to continue a truncated list request
+- // (output only).
+- NextPageToken string `json:"nextPageToken,omitempty"`
+-
+- // SelfLink: Server defined URL for this resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-}
+-
+-type ResourceGroupReference struct {
+- // Group: A URI referencing one of the resource views listed in the
+- // backend service.
+- Group string `json:"group,omitempty"`
+-}
+-
+-type Route struct {
+- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
+- // only).
+- CreationTimestamp string `json:"creationTimestamp,omitempty"`
+-
+- // Description: An optional textual description of the resource;
+- // provided by the client when the resource is created.
+- Description string `json:"description,omitempty"`
+-
+- // DestRange: Which packets does this route apply to?
+- DestRange string `json:"destRange,omitempty"`
+-
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id uint64 `json:"id,omitempty,string"`
+-
+- // Kind: Type of the resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // Name: Name of the resource; provided by the client when the resource
+- // is created. The name must be 1-63 characters long, and comply with
+- // RFC1035.
+- Name string `json:"name,omitempty"`
+-
+- // Network: URL of the network to which this route is applied; provided
+- // by the client when the route is created.
+- Network string `json:"network,omitempty"`
+-
+- // NextHopGateway: The URL to a gateway that should handle matching
+- // packets.
+- NextHopGateway string `json:"nextHopGateway,omitempty"`
+-
+- // NextHopInstance: The URL to an instance that should handle matching
+- // packets.
+- NextHopInstance string `json:"nextHopInstance,omitempty"`
+-
+- // NextHopIp: The network IP address of an instance that should handle
+- // matching packets.
+- NextHopIp string `json:"nextHopIp,omitempty"`
+-
+- // NextHopNetwork: The URL of the local network if it should handle
+- // matching packets.
+- NextHopNetwork string `json:"nextHopNetwork,omitempty"`
+-
+- // Priority: Breaks ties between Routes of equal specificity. Routes
+- // with smaller values win when tied with routes with larger values.
+- Priority int64 `json:"priority,omitempty"`
+-
+- // SelfLink: Server defined URL for the resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-
+- // Tags: A list of instance tags to which this route applies.
+- Tags []string `json:"tags,omitempty"`
+-
+- // Warnings: If potential misconfigurations are detected for this route,
+- // this field will be populated with warning messages.
+- Warnings []*RouteWarnings `json:"warnings,omitempty"`
+-}
+-
+-type RouteWarnings struct {
+- // Code: The warning type identifier for this warning.
+- Code string `json:"code,omitempty"`
+-
+- // Data: Metadata for this warning in 'key: value' format.
+- Data []*RouteWarningsData `json:"data,omitempty"`
+-
+- // Message: Optional human-readable details for this warning.
+- Message string `json:"message,omitempty"`
+-}
+-
+-type RouteWarningsData struct {
+- // Key: A key for the warning data.
+- Key string `json:"key,omitempty"`
+-
+- // Value: A warning data value corresponding to the key.
+- Value string `json:"value,omitempty"`
+-}
+-
+-type RouteList struct {
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id string `json:"id,omitempty"`
+-
+- // Items: The route resources.
+- Items []*Route `json:"items,omitempty"`
+-
+- // Kind: Type of resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // NextPageToken: A token used to continue a truncated list request
+- // (output only).
+- NextPageToken string `json:"nextPageToken,omitempty"`
+-
+- // SelfLink: Server defined URL for this resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-}
+-
+-type Scheduling struct {
+- // AutomaticRestart: Whether the Instance should be automatically
+- // restarted whenever it is terminated by Compute Engine (not terminated
+- // by user).
+- AutomaticRestart bool `json:"automaticRestart,omitempty"`
+-
+- // OnHostMaintenance: How the instance should behave when the host
+- // machine undergoes maintenance that may temporarily impact instance
+- // performance.
+- OnHostMaintenance string `json:"onHostMaintenance,omitempty"`
+-}
+-
+-type SerialPortOutput struct {
+- // Contents: The contents of the console output.
+- Contents string `json:"contents,omitempty"`
+-
+- // Kind: Type of the resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // SelfLink: Server defined URL for the resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-}
+-
+-type ServiceAccount struct {
+- // Email: Email address of the service account.
+- Email string `json:"email,omitempty"`
+-
+- // Scopes: The list of scopes to be made available for this service
+- // account.
+- Scopes []string `json:"scopes,omitempty"`
+-}
+-
+-type Snapshot struct {
+- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
+- // only).
+- CreationTimestamp string `json:"creationTimestamp,omitempty"`
+-
+- // Description: An optional textual description of the resource;
+- // provided by the client when the resource is created.
+- Description string `json:"description,omitempty"`
+-
+- // DiskSizeGb: Size of the persistent disk snapshot, specified in GB
+- // (output only).
+- DiskSizeGb int64 `json:"diskSizeGb,omitempty,string"`
+-
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id uint64 `json:"id,omitempty,string"`
+-
+- // Kind: Type of the resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // Licenses: Public visible licenses.
+- Licenses []string `json:"licenses,omitempty"`
+-
+- // Name: Name of the resource; provided by the client when the resource
+- // is created. The name must be 1-63 characters long, and comply with
+- // RFC1035.
+- Name string `json:"name,omitempty"`
+-
+- // SelfLink: Server defined URL for the resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-
+- // SourceDisk: The source disk used to create this snapshot.
+- SourceDisk string `json:"sourceDisk,omitempty"`
+-
+- // SourceDiskId: The 'id' value of the disk used to create this
+- // snapshot. This value may be used to determine whether the snapshot
+- // was taken from the current or a previous instance of a given disk
+- // name.
+- SourceDiskId string `json:"sourceDiskId,omitempty"`
+-
+- // Status: The status of the persistent disk snapshot (output only).
+- Status string `json:"status,omitempty"`
+-
+- // StorageBytes: A size of the the storage used by the snapshot. As
+- // snapshots share storage this number is expected to change with
+- // snapshot creation/deletion.
+- StorageBytes int64 `json:"storageBytes,omitempty,string"`
+-
+- // StorageBytesStatus: An indicator whether storageBytes is in a stable
+- // state, or it is being adjusted as a result of shared storage
+- // reallocation.
+- StorageBytesStatus string `json:"storageBytesStatus,omitempty"`
+-}
+-
+-type SnapshotList struct {
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id string `json:"id,omitempty"`
+-
+- // Items: The persistent snapshot resources.
+- Items []*Snapshot `json:"items,omitempty"`
+-
+- // Kind: Type of resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // NextPageToken: A token used to continue a truncated list request
+- // (output only).
+- NextPageToken string `json:"nextPageToken,omitempty"`
+-
+- // SelfLink: Server defined URL for this resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-}
+-
+-type Tags struct {
+- // Fingerprint: Fingerprint of this resource. A hash of the tags stored
+- // in this object. This field is used optimistic locking. An up-to-date
+- // tags fingerprint must be provided in order to modify tags.
+- Fingerprint string `json:"fingerprint,omitempty"`
+-
+- // Items: An array of tags. Each tag must be 1-63 characters long, and
+- // comply with RFC1035.
+- Items []string `json:"items,omitempty"`
+-}
+-
+-type TargetHttpProxy struct {
+- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
+- // only).
+- CreationTimestamp string `json:"creationTimestamp,omitempty"`
+-
+- // Description: An optional textual description of the resource;
+- // provided by the client when the resource is created.
+- Description string `json:"description,omitempty"`
+-
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id uint64 `json:"id,omitempty,string"`
+-
+- // Kind: Type of the resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // Name: Name of the resource; provided by the client when the resource
+- // is created. The name must be 1-63 characters long, and comply with
+- // RFC1035.
+- Name string `json:"name,omitempty"`
+-
+- // SelfLink: Server defined URL for the resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-
+- // UrlMap: URL to the UrlMap resource that defines the mapping from URL
+- // to the BackendService.
+- UrlMap string `json:"urlMap,omitempty"`
+-}
+-
+-type TargetHttpProxyList struct {
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id string `json:"id,omitempty"`
+-
+- // Items: The TargetHttpProxy resources.
+- Items []*TargetHttpProxy `json:"items,omitempty"`
+-
+- // Kind: Type of resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // NextPageToken: A token used to continue a truncated list request
+- // (output only).
+- NextPageToken string `json:"nextPageToken,omitempty"`
+-
+- // SelfLink: Server defined URL for this resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-}
+-
+-type TargetInstance struct {
+- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
+- // only).
+- CreationTimestamp string `json:"creationTimestamp,omitempty"`
+-
+- // Description: An optional textual description of the resource;
+- // provided by the client when the resource is created.
+- Description string `json:"description,omitempty"`
+-
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id uint64 `json:"id,omitempty,string"`
+-
+- // Instance: The URL to the instance that terminates the relevant
+- // traffic.
+- Instance string `json:"instance,omitempty"`
+-
+- // Kind: Type of the resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // Name: Name of the resource; provided by the client when the resource
+- // is created. The name must be 1-63 characters long, and comply with
+- // RFC1035.
+- Name string `json:"name,omitempty"`
+-
+- // NatPolicy: NAT option controlling how IPs are NAT'ed to the VM.
+- // Currently only NO_NAT (default value) is supported.
+- NatPolicy string `json:"natPolicy,omitempty"`
+-
+- // SelfLink: Server defined URL for the resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-
+- // Zone: URL of the zone where the target instance resides (output
+- // only).
+- Zone string `json:"zone,omitempty"`
+-}
+-
+-type TargetInstanceAggregatedList struct {
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id string `json:"id,omitempty"`
+-
+- // Items: A map of scoped target instance lists.
+- Items map[string]TargetInstancesScopedList `json:"items,omitempty"`
+-
+- // Kind: Type of resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // NextPageToken: A token used to continue a truncated list request
+- // (output only).
+- NextPageToken string `json:"nextPageToken,omitempty"`
+-
+- // SelfLink: Server defined URL for this resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-}
+-
+-type TargetInstanceList struct {
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id string `json:"id,omitempty"`
+-
+- // Items: The TargetInstance resources.
+- Items []*TargetInstance `json:"items,omitempty"`
+-
+- // Kind: Type of resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // NextPageToken: A token used to continue a truncated list request
+- // (output only).
+- NextPageToken string `json:"nextPageToken,omitempty"`
+-
+- // SelfLink: Server defined URL for this resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-}
+-
+-type TargetInstancesScopedList struct {
+- // TargetInstances: List of target instances contained in this scope.
+- TargetInstances []*TargetInstance `json:"targetInstances,omitempty"`
+-
+- // Warning: Informational warning which replaces the list of addresses
+- // when the list is empty.
+- Warning *TargetInstancesScopedListWarning `json:"warning,omitempty"`
+-}
+-
+-type TargetInstancesScopedListWarning struct {
+- // Code: The warning type identifier for this warning.
+- Code string `json:"code,omitempty"`
+-
+- // Data: Metadata for this warning in 'key: value' format.
+- Data []*TargetInstancesScopedListWarningData `json:"data,omitempty"`
+-
+- // Message: Optional human-readable details for this warning.
+- Message string `json:"message,omitempty"`
+-}
+-
+-type TargetInstancesScopedListWarningData struct {
+- // Key: A key for the warning data.
+- Key string `json:"key,omitempty"`
+-
+- // Value: A warning data value corresponding to the key.
+- Value string `json:"value,omitempty"`
+-}
+-
+-type TargetPool struct {
+- // BackupPool: This field is applicable only when the containing target
+- // pool is serving a forwarding rule as the primary pool, and its
+- // 'failoverRatio' field is properly set to a value between [0,
+- // 1].
+- //
+- // 'backupPool' and 'failoverRatio' together define the fallback
+- // behavior of the primary target pool: if the ratio of the healthy VMs
+- // in the primary pool is at or below 'failoverRatio', traffic arriving
+- // at the load-balanced IP will be directed to the backup pool.
+- //
+- // In case
+- // where 'failoverRatio' and 'backupPool' are not set, or all the VMs in
+- // the backup pool are unhealthy, the traffic will be directed back to
+- // the primary pool in the "force" mode, where traffic will be spread to
+- // the healthy VMs with the best effort, or to all VMs when no VM is
+- // healthy.
+- BackupPool string `json:"backupPool,omitempty"`
+-
+- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
+- // only).
+- CreationTimestamp string `json:"creationTimestamp,omitempty"`
+-
+- // Description: An optional textual description of the resource;
+- // provided by the client when the resource is created.
+- Description string `json:"description,omitempty"`
+-
+- // FailoverRatio: This field is applicable only when the containing
+- // target pool is serving a forwarding rule as the primary pool (i.e.,
+- // not as a backup pool to some other target pool). The value of the
+- // field must be in [0, 1].
+- //
+- // If set, 'backupPool' must also be set. They
+- // together define the fallback behavior of the primary target pool: if
+- // the ratio of the healthy VMs in the primary pool is at or below this
+- // number, traffic arriving at the load-balanced IP will be directed to
+- // the backup pool.
+- //
+- // In case where 'failoverRatio' is not set or all the
+- // VMs in the backup pool are unhealthy, the traffic will be directed
+- // back to the primary pool in the "force" mode, where traffic will be
+- // spread to the healthy VMs with the best effort, or to all VMs when no
+- // VM is healthy.
+- FailoverRatio float64 `json:"failoverRatio,omitempty"`
+-
+- // HealthChecks: A list of URLs to the HttpHealthCheck resource. A
+- // member VM in this pool is considered healthy if and only if all
+- // specified health checks pass. An empty list means all member VMs will
+- // be considered healthy at all times.
+- HealthChecks []string `json:"healthChecks,omitempty"`
+-
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id uint64 `json:"id,omitempty,string"`
+-
+- // Instances: A list of resource URLs to the member VMs serving this
+- // pool. They must live in zones contained in the same region as this
+- // pool.
+- Instances []string `json:"instances,omitempty"`
+-
+- // Kind: Type of the resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // Name: Name of the resource; provided by the client when the resource
+- // is created. The name must be 1-63 characters long, and comply with
+- // RFC1035.
+- Name string `json:"name,omitempty"`
+-
+- // Region: URL of the region where the target pool resides (output
+- // only).
+- Region string `json:"region,omitempty"`
+-
+- // SelfLink: Server defined URL for the resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-
+- // SessionAffinity: Sesssion affinity option, must be one of the
+- // following values: 'NONE': Connections from the same client IP may go
+- // to any VM in the pool; 'CLIENT_IP': Connections from the same client
+- // IP will go to the same VM in the pool while that VM remains healthy.
+- // 'CLIENT_IP_PROTO': Connections from the same client IP with the same
+- // IP protocol will go to the same VM in the pool while that VM remains
+- // healthy.
+- SessionAffinity string `json:"sessionAffinity,omitempty"`
+-}
+-
+-type TargetPoolAggregatedList struct {
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id string `json:"id,omitempty"`
+-
+- // Items: A map of scoped target pool lists.
+- Items map[string]TargetPoolsScopedList `json:"items,omitempty"`
+-
+- // Kind: Type of resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // NextPageToken: A token used to continue a truncated list request
+- // (output only).
+- NextPageToken string `json:"nextPageToken,omitempty"`
+-
+- // SelfLink: Server defined URL for this resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-}
+-
+-type TargetPoolInstanceHealth struct {
+- HealthStatus []*HealthStatus `json:"healthStatus,omitempty"`
+-
+- // Kind: Type of resource.
+- Kind string `json:"kind,omitempty"`
+-}
+-
+-type TargetPoolList struct {
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id string `json:"id,omitempty"`
+-
+- // Items: The TargetPool resources.
+- Items []*TargetPool `json:"items,omitempty"`
+-
+- // Kind: Type of resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // NextPageToken: A token used to continue a truncated list request
+- // (output only).
+- NextPageToken string `json:"nextPageToken,omitempty"`
+-
+- // SelfLink: Server defined URL for this resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-}
+-
+-type TargetPoolsAddHealthCheckRequest struct {
+- // HealthChecks: Health check URLs to be added to targetPool.
+- HealthChecks []*HealthCheckReference `json:"healthChecks,omitempty"`
+-}
+-
+-type TargetPoolsAddInstanceRequest struct {
+- // Instances: URLs of the instances to be added to targetPool.
+- Instances []*InstanceReference `json:"instances,omitempty"`
+-}
+-
+-type TargetPoolsRemoveHealthCheckRequest struct {
+- // HealthChecks: Health check URLs to be removed from targetPool.
+- HealthChecks []*HealthCheckReference `json:"healthChecks,omitempty"`
+-}
+-
+-type TargetPoolsRemoveInstanceRequest struct {
+- // Instances: URLs of the instances to be removed from targetPool.
+- Instances []*InstanceReference `json:"instances,omitempty"`
+-}
+-
+-type TargetPoolsScopedList struct {
+- // TargetPools: List of target pools contained in this scope.
+- TargetPools []*TargetPool `json:"targetPools,omitempty"`
+-
+- // Warning: Informational warning which replaces the list of addresses
+- // when the list is empty.
+- Warning *TargetPoolsScopedListWarning `json:"warning,omitempty"`
+-}
+-
+-type TargetPoolsScopedListWarning struct {
+- // Code: The warning type identifier for this warning.
+- Code string `json:"code,omitempty"`
+-
+- // Data: Metadata for this warning in 'key: value' format.
+- Data []*TargetPoolsScopedListWarningData `json:"data,omitempty"`
+-
+- // Message: Optional human-readable details for this warning.
+- Message string `json:"message,omitempty"`
+-}
+-
+-type TargetPoolsScopedListWarningData struct {
+- // Key: A key for the warning data.
+- Key string `json:"key,omitempty"`
+-
+- // Value: A warning data value corresponding to the key.
+- Value string `json:"value,omitempty"`
+-}
+-
+-type TargetReference struct {
+- Target string `json:"target,omitempty"`
+-}
+-
+-type TestFailure struct {
+- ActualService string `json:"actualService,omitempty"`
+-
+- ExpectedService string `json:"expectedService,omitempty"`
+-
+- Host string `json:"host,omitempty"`
+-
+- Path string `json:"path,omitempty"`
+-}
+-
+-type UrlMap struct {
+- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
+- // only).
+- CreationTimestamp string `json:"creationTimestamp,omitempty"`
+-
+- // DefaultService: The URL of the BackendService resource if none of the
+- // hostRules match.
+- DefaultService string `json:"defaultService,omitempty"`
+-
+- // Description: An optional textual description of the resource;
+- // provided by the client when the resource is created.
+- Description string `json:"description,omitempty"`
+-
+- // Fingerprint: Fingerprint of this resource. A hash of the contents
+- // stored in this object. This field is used in optimistic locking. This
+- // field will be ignored when inserting a UrlMap. An up-to-date
+- // fingerprint must be provided in order to update the UrlMap.
+- Fingerprint string `json:"fingerprint,omitempty"`
+-
+- // HostRules: The list of HostRules to use against the URL.
+- HostRules []*HostRule `json:"hostRules,omitempty"`
+-
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id uint64 `json:"id,omitempty,string"`
+-
+- // Kind: Type of the resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // Name: Name of the resource; provided by the client when the resource
+- // is created. The name must be 1-63 characters long, and comply with
+- // RFC1035.
+- Name string `json:"name,omitempty"`
+-
+- // PathMatchers: The list of named PathMatchers to use against the URL.
+- PathMatchers []*PathMatcher `json:"pathMatchers,omitempty"`
+-
+- // SelfLink: Server defined URL for the resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-
+- // Tests: The list of expected URL mappings. Request to update this
+- // UrlMap will succeed only all of the test cases pass.
+- Tests []*UrlMapTest `json:"tests,omitempty"`
+-}
+-
+-type UrlMapList struct {
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id string `json:"id,omitempty"`
+-
+- // Items: The UrlMap resources.
+- Items []*UrlMap `json:"items,omitempty"`
+-
+- // Kind: Type of resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // NextPageToken: A token used to continue a truncated list request
+- // (output only).
+- NextPageToken string `json:"nextPageToken,omitempty"`
+-
+- // SelfLink: Server defined URL for this resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-}
+-
+-type UrlMapReference struct {
+- UrlMap string `json:"urlMap,omitempty"`
+-}
+-
+-type UrlMapTest struct {
+- // Description: Description of this test case.
+- Description string `json:"description,omitempty"`
+-
+- // Host: Host portion of the URL.
+- Host string `json:"host,omitempty"`
+-
+- // Path: Path portion of the URL.
+- Path string `json:"path,omitempty"`
+-
+- // Service: Expected BackendService resource the given URL should be
+- // mapped to.
+- Service string `json:"service,omitempty"`
+-}
+-
+-type UrlMapValidationResult struct {
+- LoadErrors []string `json:"loadErrors,omitempty"`
+-
+- // LoadSucceeded: Whether the given UrlMap can be successfully loaded.
+- // If false, 'loadErrors' indicates the reasons.
+- LoadSucceeded bool `json:"loadSucceeded,omitempty"`
+-
+- TestFailures []*TestFailure `json:"testFailures,omitempty"`
+-
+- // TestPassed: If successfully loaded, this field indicates whether the
+- // test passed. If false, 'testFailures's indicate the reason of
+- // failure.
+- TestPassed bool `json:"testPassed,omitempty"`
+-}
+-
+-type UrlMapsValidateRequest struct {
+- // Resource: Content of the UrlMap to be validated.
+- Resource *UrlMap `json:"resource,omitempty"`
+-}
+-
+-type UrlMapsValidateResponse struct {
+- Result *UrlMapValidationResult `json:"result,omitempty"`
+-}
+-
+-type UsageExportLocation struct {
+- // BucketName: The name of an existing bucket in Cloud Storage where the
+- // usage report object is stored. The Google Service Account is granted
+- // write access to this bucket. This is simply the bucket name, with no
+- // "gs://" or "https://storage.googleapis.com/" in front of it.
+- BucketName string `json:"bucketName,omitempty"`
+-
+- // ReportNamePrefix: An optional prefix for the name of the usage report
+- // object stored in bucket_name. If not supplied, defaults to "usage_".
+- // The report is stored as a CSV file named _gce_.csv. where is the day
+- // of the usage according to Pacific Time. The prefix should conform to
+- // Cloud Storage object naming conventions.
+- ReportNamePrefix string `json:"reportNamePrefix,omitempty"`
+-}
+-
+-type Zone struct {
+- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
+- // only).
+- CreationTimestamp string `json:"creationTimestamp,omitempty"`
+-
+- // Deprecated: The deprecation status associated with this zone.
+- Deprecated *DeprecationStatus `json:"deprecated,omitempty"`
+-
+- // Description: Textual description of the resource.
+- Description string `json:"description,omitempty"`
+-
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id uint64 `json:"id,omitempty,string"`
+-
+- // Kind: Type of the resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // MaintenanceWindows: Scheduled maintenance windows for the zone. When
+- // the zone is in a maintenance window, all resources which reside in
+- // the zone will be unavailable.
+- MaintenanceWindows []*ZoneMaintenanceWindows `json:"maintenanceWindows,omitempty"`
+-
+- // Name: Name of the resource.
+- Name string `json:"name,omitempty"`
+-
+- // Region: Full URL reference to the region which hosts the zone (output
+- // only).
+- Region string `json:"region,omitempty"`
+-
+- // SelfLink: Server defined URL for the resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-
+- // Status: Status of the zone. "UP" or "DOWN".
+- Status string `json:"status,omitempty"`
+-}
+-
+-type ZoneMaintenanceWindows struct {
+- // BeginTime: Begin time of the maintenance window, in RFC 3339 format.
+- BeginTime string `json:"beginTime,omitempty"`
+-
+- // Description: Textual description of the maintenance window.
+- Description string `json:"description,omitempty"`
+-
+- // EndTime: End time of the maintenance window, in RFC 3339 format.
+- EndTime string `json:"endTime,omitempty"`
+-
+- // Name: Name of the maintenance window.
+- Name string `json:"name,omitempty"`
+-}
+-
+-type ZoneList struct {
+- // Id: Unique identifier for the resource; defined by the server (output
+- // only).
+- Id string `json:"id,omitempty"`
+-
+- // Items: The zone resources.
+- Items []*Zone `json:"items,omitempty"`
+-
+- // Kind: Type of resource.
+- Kind string `json:"kind,omitempty"`
+-
+- // NextPageToken: A token used to continue a truncated list request
+- // (output only).
+- NextPageToken string `json:"nextPageToken,omitempty"`
+-
+- // SelfLink: Server defined URL for this resource (output only).
+- SelfLink string `json:"selfLink,omitempty"`
+-}
+-
+-// method id "compute.addresses.aggregatedList":
+-
+-type AddressesAggregatedListCall struct {
+- s *Service
+- project string
+- opt_ map[string]interface{}
+-}
+-
+-// AggregatedList: Retrieves the list of addresses grouped by scope.
+-func (r *AddressesService) AggregatedList(project string) *AddressesAggregatedListCall {
+- c := &AddressesAggregatedListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- return c
+-}
+-
+-// Filter sets the optional parameter "filter": Filter expression for
+-// filtering listed resources.
+-func (c *AddressesAggregatedListCall) Filter(filter string) *AddressesAggregatedListCall {
+- c.opt_["filter"] = filter
+- return c
+-}
+-
+-// MaxResults sets the optional parameter "maxResults": Maximum count of
+-// results to be returned. Maximum value is 500 and default value is
+-// 500.
+-func (c *AddressesAggregatedListCall) MaxResults(maxResults int64) *AddressesAggregatedListCall {
+- c.opt_["maxResults"] = maxResults
+- return c
+-}
+-
+-// PageToken sets the optional parameter "pageToken": Tag returned by a
+-// previous list request truncated by maxResults. Used to continue a
+-// previous list request.
+-func (c *AddressesAggregatedListCall) PageToken(pageToken string) *AddressesAggregatedListCall {
+- c.opt_["pageToken"] = pageToken
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *AddressesAggregatedListCall) Fields(s ...googleapi.Field) *AddressesAggregatedListCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *AddressesAggregatedListCall) Do() (*AddressAggregatedList, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["filter"]; ok {
+- params.Set("filter", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["maxResults"]; ok {
+- params.Set("maxResults", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["pageToken"]; ok {
+- params.Set("pageToken", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/aggregated/addresses")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *AddressAggregatedList
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Retrieves the list of addresses grouped by scope.",
+- // "httpMethod": "GET",
+- // "id": "compute.addresses.aggregatedList",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "filter": {
+- // "description": "Optional. Filter expression for filtering listed resources.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "maxResults": {
+- // "default": "500",
+- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
+- // "format": "uint32",
+- // "location": "query",
+- // "maximum": "500",
+- // "minimum": "0",
+- // "type": "integer"
+- // },
+- // "pageToken": {
+- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/aggregated/addresses",
+- // "response": {
+- // "$ref": "AddressAggregatedList"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.addresses.delete":
+-
+-type AddressesDeleteCall struct {
+- s *Service
+- project string
+- region string
+- address string
+- opt_ map[string]interface{}
+-}
+-
+-// Delete: Deletes the specified address resource.
+-func (r *AddressesService) Delete(project string, region string, address string) *AddressesDeleteCall {
+- c := &AddressesDeleteCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.region = region
+- c.address = address
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *AddressesDeleteCall) Fields(s ...googleapi.Field) *AddressesDeleteCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *AddressesDeleteCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/addresses/{address}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("DELETE", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "region": c.region,
+- "address": c.address,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Deletes the specified address resource.",
+- // "httpMethod": "DELETE",
+- // "id": "compute.addresses.delete",
+- // "parameterOrder": [
+- // "project",
+- // "region",
+- // "address"
+- // ],
+- // "parameters": {
+- // "address": {
+- // "description": "Name of the address resource to delete.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "region": {
+- // "description": "Name of the region scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/regions/{region}/addresses/{address}",
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.addresses.get":
+-
+-type AddressesGetCall struct {
+- s *Service
+- project string
+- region string
+- address string
+- opt_ map[string]interface{}
+-}
+-
+-// Get: Returns the specified address resource.
+-func (r *AddressesService) Get(project string, region string, address string) *AddressesGetCall {
+- c := &AddressesGetCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.region = region
+- c.address = address
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *AddressesGetCall) Fields(s ...googleapi.Field) *AddressesGetCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *AddressesGetCall) Do() (*Address, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/addresses/{address}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "region": c.region,
+- "address": c.address,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Address
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Returns the specified address resource.",
+- // "httpMethod": "GET",
+- // "id": "compute.addresses.get",
+- // "parameterOrder": [
+- // "project",
+- // "region",
+- // "address"
+- // ],
+- // "parameters": {
+- // "address": {
+- // "description": "Name of the address resource to return.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "region": {
+- // "description": "Name of the region scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/regions/{region}/addresses/{address}",
+- // "response": {
+- // "$ref": "Address"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.addresses.insert":
+-
+-type AddressesInsertCall struct {
+- s *Service
+- project string
+- region string
+- address *Address
+- opt_ map[string]interface{}
+-}
+-
+-// Insert: Creates an address resource in the specified project using
+-// the data included in the request.
+-func (r *AddressesService) Insert(project string, region string, address *Address) *AddressesInsertCall {
+- c := &AddressesInsertCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.region = region
+- c.address = address
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *AddressesInsertCall) Fields(s ...googleapi.Field) *AddressesInsertCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *AddressesInsertCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.address)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/addresses")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "region": c.region,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Creates an address resource in the specified project using the data included in the request.",
+- // "httpMethod": "POST",
+- // "id": "compute.addresses.insert",
+- // "parameterOrder": [
+- // "project",
+- // "region"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "region": {
+- // "description": "Name of the region scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/regions/{region}/addresses",
+- // "request": {
+- // "$ref": "Address"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.addresses.list":
+-
+-type AddressesListCall struct {
+- s *Service
+- project string
+- region string
+- opt_ map[string]interface{}
+-}
+-
+-// List: Retrieves the list of address resources contained within the
+-// specified region.
+-func (r *AddressesService) List(project string, region string) *AddressesListCall {
+- c := &AddressesListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.region = region
+- return c
+-}
+-
+-// Filter sets the optional parameter "filter": Filter expression for
+-// filtering listed resources.
+-func (c *AddressesListCall) Filter(filter string) *AddressesListCall {
+- c.opt_["filter"] = filter
+- return c
+-}
+-
+-// MaxResults sets the optional parameter "maxResults": Maximum count of
+-// results to be returned. Maximum value is 500 and default value is
+-// 500.
+-func (c *AddressesListCall) MaxResults(maxResults int64) *AddressesListCall {
+- c.opt_["maxResults"] = maxResults
+- return c
+-}
+-
+-// PageToken sets the optional parameter "pageToken": Tag returned by a
+-// previous list request truncated by maxResults. Used to continue a
+-// previous list request.
+-func (c *AddressesListCall) PageToken(pageToken string) *AddressesListCall {
+- c.opt_["pageToken"] = pageToken
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *AddressesListCall) Fields(s ...googleapi.Field) *AddressesListCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *AddressesListCall) Do() (*AddressList, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["filter"]; ok {
+- params.Set("filter", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["maxResults"]; ok {
+- params.Set("maxResults", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["pageToken"]; ok {
+- params.Set("pageToken", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/addresses")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "region": c.region,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *AddressList
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Retrieves the list of address resources contained within the specified region.",
+- // "httpMethod": "GET",
+- // "id": "compute.addresses.list",
+- // "parameterOrder": [
+- // "project",
+- // "region"
+- // ],
+- // "parameters": {
+- // "filter": {
+- // "description": "Optional. Filter expression for filtering listed resources.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "maxResults": {
+- // "default": "500",
+- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
+- // "format": "uint32",
+- // "location": "query",
+- // "maximum": "500",
+- // "minimum": "0",
+- // "type": "integer"
+- // },
+- // "pageToken": {
+- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "region": {
+- // "description": "Name of the region scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/regions/{region}/addresses",
+- // "response": {
+- // "$ref": "AddressList"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.backendServices.delete":
+-
+-type BackendServicesDeleteCall struct {
+- s *Service
+- project string
+- backendService string
+- opt_ map[string]interface{}
+-}
+-
+-// Delete: Deletes the specified BackendService resource.
+-func (r *BackendServicesService) Delete(project string, backendService string) *BackendServicesDeleteCall {
+- c := &BackendServicesDeleteCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.backendService = backendService
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *BackendServicesDeleteCall) Fields(s ...googleapi.Field) *BackendServicesDeleteCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *BackendServicesDeleteCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/backendServices/{backendService}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("DELETE", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "backendService": c.backendService,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Deletes the specified BackendService resource.",
+- // "httpMethod": "DELETE",
+- // "id": "compute.backendServices.delete",
+- // "parameterOrder": [
+- // "project",
+- // "backendService"
+- // ],
+- // "parameters": {
+- // "backendService": {
+- // "description": "Name of the BackendService resource to delete.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/backendServices/{backendService}",
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.backendServices.get":
+-
+-type BackendServicesGetCall struct {
+- s *Service
+- project string
+- backendService string
+- opt_ map[string]interface{}
+-}
+-
+-// Get: Returns the specified BackendService resource.
+-func (r *BackendServicesService) Get(project string, backendService string) *BackendServicesGetCall {
+- c := &BackendServicesGetCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.backendService = backendService
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *BackendServicesGetCall) Fields(s ...googleapi.Field) *BackendServicesGetCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *BackendServicesGetCall) Do() (*BackendService, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/backendServices/{backendService}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "backendService": c.backendService,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *BackendService
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Returns the specified BackendService resource.",
+- // "httpMethod": "GET",
+- // "id": "compute.backendServices.get",
+- // "parameterOrder": [
+- // "project",
+- // "backendService"
+- // ],
+- // "parameters": {
+- // "backendService": {
+- // "description": "Name of the BackendService resource to return.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/backendServices/{backendService}",
+- // "response": {
+- // "$ref": "BackendService"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.backendServices.getHealth":
+-
+-type BackendServicesGetHealthCall struct {
+- s *Service
+- project string
+- backendService string
+- resourcegroupreference *ResourceGroupReference
+- opt_ map[string]interface{}
+-}
+-
+-// GetHealth: Gets the most recent health check results for this
+-// BackendService.
+-func (r *BackendServicesService) GetHealth(project string, backendService string, resourcegroupreference *ResourceGroupReference) *BackendServicesGetHealthCall {
+- c := &BackendServicesGetHealthCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.backendService = backendService
+- c.resourcegroupreference = resourcegroupreference
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *BackendServicesGetHealthCall) Fields(s ...googleapi.Field) *BackendServicesGetHealthCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *BackendServicesGetHealthCall) Do() (*BackendServiceGroupHealth, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.resourcegroupreference)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/backendServices/{backendService}/getHealth")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "backendService": c.backendService,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *BackendServiceGroupHealth
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Gets the most recent health check results for this BackendService.",
+- // "httpMethod": "POST",
+- // "id": "compute.backendServices.getHealth",
+- // "parameterOrder": [
+- // "project",
+- // "backendService"
+- // ],
+- // "parameters": {
+- // "backendService": {
+- // "description": "Name of the BackendService resource to which the queried instance belongs.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/backendServices/{backendService}/getHealth",
+- // "request": {
+- // "$ref": "ResourceGroupReference"
+- // },
+- // "response": {
+- // "$ref": "BackendServiceGroupHealth"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.backendServices.insert":
+-
+-type BackendServicesInsertCall struct {
+- s *Service
+- project string
+- backendservice *BackendService
+- opt_ map[string]interface{}
+-}
+-
+-// Insert: Creates a BackendService resource in the specified project
+-// using the data included in the request.
+-func (r *BackendServicesService) Insert(project string, backendservice *BackendService) *BackendServicesInsertCall {
+- c := &BackendServicesInsertCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.backendservice = backendservice
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *BackendServicesInsertCall) Fields(s ...googleapi.Field) *BackendServicesInsertCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *BackendServicesInsertCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.backendservice)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/backendServices")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Creates a BackendService resource in the specified project using the data included in the request.",
+- // "httpMethod": "POST",
+- // "id": "compute.backendServices.insert",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/backendServices",
+- // "request": {
+- // "$ref": "BackendService"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.backendServices.list":
+-
+-type BackendServicesListCall struct {
+- s *Service
+- project string
+- opt_ map[string]interface{}
+-}
+-
+-// List: Retrieves the list of BackendService resources available to the
+-// specified project.
+-func (r *BackendServicesService) List(project string) *BackendServicesListCall {
+- c := &BackendServicesListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- return c
+-}
+-
+-// Filter sets the optional parameter "filter": Filter expression for
+-// filtering listed resources.
+-func (c *BackendServicesListCall) Filter(filter string) *BackendServicesListCall {
+- c.opt_["filter"] = filter
+- return c
+-}
+-
+-// MaxResults sets the optional parameter "maxResults": Maximum count of
+-// results to be returned. Maximum value is 500 and default value is
+-// 500.
+-func (c *BackendServicesListCall) MaxResults(maxResults int64) *BackendServicesListCall {
+- c.opt_["maxResults"] = maxResults
+- return c
+-}
+-
+-// PageToken sets the optional parameter "pageToken": Tag returned by a
+-// previous list request truncated by maxResults. Used to continue a
+-// previous list request.
+-func (c *BackendServicesListCall) PageToken(pageToken string) *BackendServicesListCall {
+- c.opt_["pageToken"] = pageToken
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *BackendServicesListCall) Fields(s ...googleapi.Field) *BackendServicesListCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *BackendServicesListCall) Do() (*BackendServiceList, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["filter"]; ok {
+- params.Set("filter", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["maxResults"]; ok {
+- params.Set("maxResults", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["pageToken"]; ok {
+- params.Set("pageToken", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/backendServices")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *BackendServiceList
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Retrieves the list of BackendService resources available to the specified project.",
+- // "httpMethod": "GET",
+- // "id": "compute.backendServices.list",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "filter": {
+- // "description": "Optional. Filter expression for filtering listed resources.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "maxResults": {
+- // "default": "500",
+- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
+- // "format": "uint32",
+- // "location": "query",
+- // "maximum": "500",
+- // "minimum": "0",
+- // "type": "integer"
+- // },
+- // "pageToken": {
+- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/backendServices",
+- // "response": {
+- // "$ref": "BackendServiceList"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.backendServices.patch":
+-
+-type BackendServicesPatchCall struct {
+- s *Service
+- project string
+- backendService string
+- backendservice *BackendService
+- opt_ map[string]interface{}
+-}
+-
+-// Patch: Update the entire content of the BackendService resource. This
+-// method supports patch semantics.
+-func (r *BackendServicesService) Patch(project string, backendService string, backendservice *BackendService) *BackendServicesPatchCall {
+- c := &BackendServicesPatchCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.backendService = backendService
+- c.backendservice = backendservice
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *BackendServicesPatchCall) Fields(s ...googleapi.Field) *BackendServicesPatchCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *BackendServicesPatchCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.backendservice)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/backendServices/{backendService}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("PATCH", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "backendService": c.backendService,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Update the entire content of the BackendService resource. This method supports patch semantics.",
+- // "httpMethod": "PATCH",
+- // "id": "compute.backendServices.patch",
+- // "parameterOrder": [
+- // "project",
+- // "backendService"
+- // ],
+- // "parameters": {
+- // "backendService": {
+- // "description": "Name of the BackendService resource to update.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/backendServices/{backendService}",
+- // "request": {
+- // "$ref": "BackendService"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.backendServices.update":
+-
+-type BackendServicesUpdateCall struct {
+- s *Service
+- project string
+- backendService string
+- backendservice *BackendService
+- opt_ map[string]interface{}
+-}
+-
+-// Update: Update the entire content of the BackendService resource.
+-func (r *BackendServicesService) Update(project string, backendService string, backendservice *BackendService) *BackendServicesUpdateCall {
+- c := &BackendServicesUpdateCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.backendService = backendService
+- c.backendservice = backendservice
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *BackendServicesUpdateCall) Fields(s ...googleapi.Field) *BackendServicesUpdateCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *BackendServicesUpdateCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.backendservice)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/backendServices/{backendService}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("PUT", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "backendService": c.backendService,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Update the entire content of the BackendService resource.",
+- // "httpMethod": "PUT",
+- // "id": "compute.backendServices.update",
+- // "parameterOrder": [
+- // "project",
+- // "backendService"
+- // ],
+- // "parameters": {
+- // "backendService": {
+- // "description": "Name of the BackendService resource to update.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/backendServices/{backendService}",
+- // "request": {
+- // "$ref": "BackendService"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.diskTypes.aggregatedList":
+-
+-type DiskTypesAggregatedListCall struct {
+- s *Service
+- project string
+- opt_ map[string]interface{}
+-}
+-
+-// AggregatedList: Retrieves the list of disk type resources grouped by
+-// scope.
+-func (r *DiskTypesService) AggregatedList(project string) *DiskTypesAggregatedListCall {
+- c := &DiskTypesAggregatedListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- return c
+-}
+-
+-// Filter sets the optional parameter "filter": Filter expression for
+-// filtering listed resources.
+-func (c *DiskTypesAggregatedListCall) Filter(filter string) *DiskTypesAggregatedListCall {
+- c.opt_["filter"] = filter
+- return c
+-}
+-
+-// MaxResults sets the optional parameter "maxResults": Maximum count of
+-// results to be returned. Maximum value is 500 and default value is
+-// 500.
+-func (c *DiskTypesAggregatedListCall) MaxResults(maxResults int64) *DiskTypesAggregatedListCall {
+- c.opt_["maxResults"] = maxResults
+- return c
+-}
+-
+-// PageToken sets the optional parameter "pageToken": Tag returned by a
+-// previous list request truncated by maxResults. Used to continue a
+-// previous list request.
+-func (c *DiskTypesAggregatedListCall) PageToken(pageToken string) *DiskTypesAggregatedListCall {
+- c.opt_["pageToken"] = pageToken
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *DiskTypesAggregatedListCall) Fields(s ...googleapi.Field) *DiskTypesAggregatedListCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *DiskTypesAggregatedListCall) Do() (*DiskTypeAggregatedList, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["filter"]; ok {
+- params.Set("filter", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["maxResults"]; ok {
+- params.Set("maxResults", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["pageToken"]; ok {
+- params.Set("pageToken", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/aggregated/diskTypes")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *DiskTypeAggregatedList
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Retrieves the list of disk type resources grouped by scope.",
+- // "httpMethod": "GET",
+- // "id": "compute.diskTypes.aggregatedList",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "filter": {
+- // "description": "Optional. Filter expression for filtering listed resources.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "maxResults": {
+- // "default": "500",
+- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
+- // "format": "uint32",
+- // "location": "query",
+- // "maximum": "500",
+- // "minimum": "0",
+- // "type": "integer"
+- // },
+- // "pageToken": {
+- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/aggregated/diskTypes",
+- // "response": {
+- // "$ref": "DiskTypeAggregatedList"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.diskTypes.get":
+-
+-type DiskTypesGetCall struct {
+- s *Service
+- project string
+- zone string
+- diskType string
+- opt_ map[string]interface{}
+-}
+-
+-// Get: Returns the specified disk type resource.
+-func (r *DiskTypesService) Get(project string, zone string, diskType string) *DiskTypesGetCall {
+- c := &DiskTypesGetCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.zone = zone
+- c.diskType = diskType
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *DiskTypesGetCall) Fields(s ...googleapi.Field) *DiskTypesGetCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *DiskTypesGetCall) Do() (*DiskType, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/diskTypes/{diskType}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "zone": c.zone,
+- "diskType": c.diskType,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *DiskType
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Returns the specified disk type resource.",
+- // "httpMethod": "GET",
+- // "id": "compute.diskTypes.get",
+- // "parameterOrder": [
+- // "project",
+- // "zone",
+- // "diskType"
+- // ],
+- // "parameters": {
+- // "diskType": {
+- // "description": "Name of the disk type resource to return.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "zone": {
+- // "description": "Name of the zone scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/zones/{zone}/diskTypes/{diskType}",
+- // "response": {
+- // "$ref": "DiskType"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.diskTypes.list":
+-
+-type DiskTypesListCall struct {
+- s *Service
+- project string
+- zone string
+- opt_ map[string]interface{}
+-}
+-
+-// List: Retrieves the list of disk type resources available to the
+-// specified project.
+-func (r *DiskTypesService) List(project string, zone string) *DiskTypesListCall {
+- c := &DiskTypesListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.zone = zone
+- return c
+-}
+-
+-// Filter sets the optional parameter "filter": Filter expression for
+-// filtering listed resources.
+-func (c *DiskTypesListCall) Filter(filter string) *DiskTypesListCall {
+- c.opt_["filter"] = filter
+- return c
+-}
+-
+-// MaxResults sets the optional parameter "maxResults": Maximum count of
+-// results to be returned. Maximum value is 500 and default value is
+-// 500.
+-func (c *DiskTypesListCall) MaxResults(maxResults int64) *DiskTypesListCall {
+- c.opt_["maxResults"] = maxResults
+- return c
+-}
+-
+-// PageToken sets the optional parameter "pageToken": Tag returned by a
+-// previous list request truncated by maxResults. Used to continue a
+-// previous list request.
+-func (c *DiskTypesListCall) PageToken(pageToken string) *DiskTypesListCall {
+- c.opt_["pageToken"] = pageToken
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *DiskTypesListCall) Fields(s ...googleapi.Field) *DiskTypesListCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *DiskTypesListCall) Do() (*DiskTypeList, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["filter"]; ok {
+- params.Set("filter", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["maxResults"]; ok {
+- params.Set("maxResults", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["pageToken"]; ok {
+- params.Set("pageToken", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/diskTypes")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "zone": c.zone,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *DiskTypeList
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Retrieves the list of disk type resources available to the specified project.",
+- // "httpMethod": "GET",
+- // "id": "compute.diskTypes.list",
+- // "parameterOrder": [
+- // "project",
+- // "zone"
+- // ],
+- // "parameters": {
+- // "filter": {
+- // "description": "Optional. Filter expression for filtering listed resources.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "maxResults": {
+- // "default": "500",
+- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
+- // "format": "uint32",
+- // "location": "query",
+- // "maximum": "500",
+- // "minimum": "0",
+- // "type": "integer"
+- // },
+- // "pageToken": {
+- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "zone": {
+- // "description": "Name of the zone scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/zones/{zone}/diskTypes",
+- // "response": {
+- // "$ref": "DiskTypeList"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.disks.aggregatedList":
+-
+-type DisksAggregatedListCall struct {
+- s *Service
+- project string
+- opt_ map[string]interface{}
+-}
+-
+-// AggregatedList: Retrieves the list of disks grouped by scope.
+-func (r *DisksService) AggregatedList(project string) *DisksAggregatedListCall {
+- c := &DisksAggregatedListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- return c
+-}
+-
+-// Filter sets the optional parameter "filter": Filter expression for
+-// filtering listed resources.
+-func (c *DisksAggregatedListCall) Filter(filter string) *DisksAggregatedListCall {
+- c.opt_["filter"] = filter
+- return c
+-}
+-
+-// MaxResults sets the optional parameter "maxResults": Maximum count of
+-// results to be returned. Maximum value is 500 and default value is
+-// 500.
+-func (c *DisksAggregatedListCall) MaxResults(maxResults int64) *DisksAggregatedListCall {
+- c.opt_["maxResults"] = maxResults
+- return c
+-}
+-
+-// PageToken sets the optional parameter "pageToken": Tag returned by a
+-// previous list request truncated by maxResults. Used to continue a
+-// previous list request.
+-func (c *DisksAggregatedListCall) PageToken(pageToken string) *DisksAggregatedListCall {
+- c.opt_["pageToken"] = pageToken
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *DisksAggregatedListCall) Fields(s ...googleapi.Field) *DisksAggregatedListCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *DisksAggregatedListCall) Do() (*DiskAggregatedList, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["filter"]; ok {
+- params.Set("filter", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["maxResults"]; ok {
+- params.Set("maxResults", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["pageToken"]; ok {
+- params.Set("pageToken", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/aggregated/disks")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *DiskAggregatedList
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Retrieves the list of disks grouped by scope.",
+- // "httpMethod": "GET",
+- // "id": "compute.disks.aggregatedList",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "filter": {
+- // "description": "Optional. Filter expression for filtering listed resources.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "maxResults": {
+- // "default": "500",
+- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
+- // "format": "uint32",
+- // "location": "query",
+- // "maximum": "500",
+- // "minimum": "0",
+- // "type": "integer"
+- // },
+- // "pageToken": {
+- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/aggregated/disks",
+- // "response": {
+- // "$ref": "DiskAggregatedList"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.disks.createSnapshot":
+-
+-type DisksCreateSnapshotCall struct {
+- s *Service
+- project string
+- zone string
+- disk string
+- snapshot *Snapshot
+- opt_ map[string]interface{}
+-}
+-
+-// CreateSnapshot:
+-func (r *DisksService) CreateSnapshot(project string, zone string, disk string, snapshot *Snapshot) *DisksCreateSnapshotCall {
+- c := &DisksCreateSnapshotCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.zone = zone
+- c.disk = disk
+- c.snapshot = snapshot
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *DisksCreateSnapshotCall) Fields(s ...googleapi.Field) *DisksCreateSnapshotCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *DisksCreateSnapshotCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.snapshot)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/disks/{disk}/createSnapshot")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "zone": c.zone,
+- "disk": c.disk,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "httpMethod": "POST",
+- // "id": "compute.disks.createSnapshot",
+- // "parameterOrder": [
+- // "project",
+- // "zone",
+- // "disk"
+- // ],
+- // "parameters": {
+- // "disk": {
+- // "description": "Name of the persistent disk resource to snapshot.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "zone": {
+- // "description": "Name of the zone scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/zones/{zone}/disks/{disk}/createSnapshot",
+- // "request": {
+- // "$ref": "Snapshot"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.disks.delete":
+-
+-type DisksDeleteCall struct {
+- s *Service
+- project string
+- zone string
+- disk string
+- opt_ map[string]interface{}
+-}
+-
+-// Delete: Deletes the specified persistent disk resource.
+-func (r *DisksService) Delete(project string, zone string, disk string) *DisksDeleteCall {
+- c := &DisksDeleteCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.zone = zone
+- c.disk = disk
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *DisksDeleteCall) Fields(s ...googleapi.Field) *DisksDeleteCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *DisksDeleteCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/disks/{disk}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("DELETE", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "zone": c.zone,
+- "disk": c.disk,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Deletes the specified persistent disk resource.",
+- // "httpMethod": "DELETE",
+- // "id": "compute.disks.delete",
+- // "parameterOrder": [
+- // "project",
+- // "zone",
+- // "disk"
+- // ],
+- // "parameters": {
+- // "disk": {
+- // "description": "Name of the persistent disk resource to delete.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "zone": {
+- // "description": "Name of the zone scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/zones/{zone}/disks/{disk}",
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.disks.get":
+-
+-type DisksGetCall struct {
+- s *Service
+- project string
+- zone string
+- disk string
+- opt_ map[string]interface{}
+-}
+-
+-// Get: Returns the specified persistent disk resource.
+-func (r *DisksService) Get(project string, zone string, disk string) *DisksGetCall {
+- c := &DisksGetCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.zone = zone
+- c.disk = disk
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *DisksGetCall) Fields(s ...googleapi.Field) *DisksGetCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *DisksGetCall) Do() (*Disk, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/disks/{disk}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "zone": c.zone,
+- "disk": c.disk,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Disk
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Returns the specified persistent disk resource.",
+- // "httpMethod": "GET",
+- // "id": "compute.disks.get",
+- // "parameterOrder": [
+- // "project",
+- // "zone",
+- // "disk"
+- // ],
+- // "parameters": {
+- // "disk": {
+- // "description": "Name of the persistent disk resource to return.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "zone": {
+- // "description": "Name of the zone scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/zones/{zone}/disks/{disk}",
+- // "response": {
+- // "$ref": "Disk"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.disks.insert":
+-
+-type DisksInsertCall struct {
+- s *Service
+- project string
+- zone string
+- disk *Disk
+- opt_ map[string]interface{}
+-}
+-
+-// Insert: Creates a persistent disk resource in the specified project
+-// using the data included in the request.
+-func (r *DisksService) Insert(project string, zone string, disk *Disk) *DisksInsertCall {
+- c := &DisksInsertCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.zone = zone
+- c.disk = disk
+- return c
+-}
+-
+-// SourceImage sets the optional parameter "sourceImage": Source image
+-// to restore onto a disk.
+-func (c *DisksInsertCall) SourceImage(sourceImage string) *DisksInsertCall {
+- c.opt_["sourceImage"] = sourceImage
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *DisksInsertCall) Fields(s ...googleapi.Field) *DisksInsertCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *DisksInsertCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.disk)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["sourceImage"]; ok {
+- params.Set("sourceImage", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/disks")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "zone": c.zone,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Creates a persistent disk resource in the specified project using the data included in the request.",
+- // "httpMethod": "POST",
+- // "id": "compute.disks.insert",
+- // "parameterOrder": [
+- // "project",
+- // "zone"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "sourceImage": {
+- // "description": "Optional. Source image to restore onto a disk.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "zone": {
+- // "description": "Name of the zone scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/zones/{zone}/disks",
+- // "request": {
+- // "$ref": "Disk"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.disks.list":
+-
+-type DisksListCall struct {
+- s *Service
+- project string
+- zone string
+- opt_ map[string]interface{}
+-}
+-
+-// List: Retrieves the list of persistent disk resources contained
+-// within the specified zone.
+-func (r *DisksService) List(project string, zone string) *DisksListCall {
+- c := &DisksListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.zone = zone
+- return c
+-}
+-
+-// Filter sets the optional parameter "filter": Filter expression for
+-// filtering listed resources.
+-func (c *DisksListCall) Filter(filter string) *DisksListCall {
+- c.opt_["filter"] = filter
+- return c
+-}
+-
+-// MaxResults sets the optional parameter "maxResults": Maximum count of
+-// results to be returned. Maximum value is 500 and default value is
+-// 500.
+-func (c *DisksListCall) MaxResults(maxResults int64) *DisksListCall {
+- c.opt_["maxResults"] = maxResults
+- return c
+-}
+-
+-// PageToken sets the optional parameter "pageToken": Tag returned by a
+-// previous list request truncated by maxResults. Used to continue a
+-// previous list request.
+-func (c *DisksListCall) PageToken(pageToken string) *DisksListCall {
+- c.opt_["pageToken"] = pageToken
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *DisksListCall) Fields(s ...googleapi.Field) *DisksListCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *DisksListCall) Do() (*DiskList, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["filter"]; ok {
+- params.Set("filter", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["maxResults"]; ok {
+- params.Set("maxResults", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["pageToken"]; ok {
+- params.Set("pageToken", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/disks")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "zone": c.zone,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *DiskList
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Retrieves the list of persistent disk resources contained within the specified zone.",
+- // "httpMethod": "GET",
+- // "id": "compute.disks.list",
+- // "parameterOrder": [
+- // "project",
+- // "zone"
+- // ],
+- // "parameters": {
+- // "filter": {
+- // "description": "Optional. Filter expression for filtering listed resources.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "maxResults": {
+- // "default": "500",
+- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
+- // "format": "uint32",
+- // "location": "query",
+- // "maximum": "500",
+- // "minimum": "0",
+- // "type": "integer"
+- // },
+- // "pageToken": {
+- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "zone": {
+- // "description": "Name of the zone scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/zones/{zone}/disks",
+- // "response": {
+- // "$ref": "DiskList"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.firewalls.delete":
+-
+-type FirewallsDeleteCall struct {
+- s *Service
+- project string
+- firewall string
+- opt_ map[string]interface{}
+-}
+-
+-// Delete: Deletes the specified firewall resource.
+-func (r *FirewallsService) Delete(project string, firewall string) *FirewallsDeleteCall {
+- c := &FirewallsDeleteCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.firewall = firewall
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *FirewallsDeleteCall) Fields(s ...googleapi.Field) *FirewallsDeleteCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *FirewallsDeleteCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/firewalls/{firewall}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("DELETE", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "firewall": c.firewall,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Deletes the specified firewall resource.",
+- // "httpMethod": "DELETE",
+- // "id": "compute.firewalls.delete",
+- // "parameterOrder": [
+- // "project",
+- // "firewall"
+- // ],
+- // "parameters": {
+- // "firewall": {
+- // "description": "Name of the firewall resource to delete.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/firewalls/{firewall}",
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.firewalls.get":
+-
+-type FirewallsGetCall struct {
+- s *Service
+- project string
+- firewall string
+- opt_ map[string]interface{}
+-}
+-
+-// Get: Returns the specified firewall resource.
+-func (r *FirewallsService) Get(project string, firewall string) *FirewallsGetCall {
+- c := &FirewallsGetCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.firewall = firewall
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *FirewallsGetCall) Fields(s ...googleapi.Field) *FirewallsGetCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *FirewallsGetCall) Do() (*Firewall, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/firewalls/{firewall}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "firewall": c.firewall,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Firewall
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Returns the specified firewall resource.",
+- // "httpMethod": "GET",
+- // "id": "compute.firewalls.get",
+- // "parameterOrder": [
+- // "project",
+- // "firewall"
+- // ],
+- // "parameters": {
+- // "firewall": {
+- // "description": "Name of the firewall resource to return.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/firewalls/{firewall}",
+- // "response": {
+- // "$ref": "Firewall"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.firewalls.insert":
+-
+-type FirewallsInsertCall struct {
+- s *Service
+- project string
+- firewall *Firewall
+- opt_ map[string]interface{}
+-}
+-
+-// Insert: Creates a firewall resource in the specified project using
+-// the data included in the request.
+-func (r *FirewallsService) Insert(project string, firewall *Firewall) *FirewallsInsertCall {
+- c := &FirewallsInsertCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.firewall = firewall
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *FirewallsInsertCall) Fields(s ...googleapi.Field) *FirewallsInsertCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *FirewallsInsertCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.firewall)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/firewalls")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Creates a firewall resource in the specified project using the data included in the request.",
+- // "httpMethod": "POST",
+- // "id": "compute.firewalls.insert",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/firewalls",
+- // "request": {
+- // "$ref": "Firewall"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.firewalls.list":
+-
+-type FirewallsListCall struct {
+- s *Service
+- project string
+- opt_ map[string]interface{}
+-}
+-
+-// List: Retrieves the list of firewall resources available to the
+-// specified project.
+-func (r *FirewallsService) List(project string) *FirewallsListCall {
+- c := &FirewallsListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- return c
+-}
+-
+-// Filter sets the optional parameter "filter": Filter expression for
+-// filtering listed resources.
+-func (c *FirewallsListCall) Filter(filter string) *FirewallsListCall {
+- c.opt_["filter"] = filter
+- return c
+-}
+-
+-// MaxResults sets the optional parameter "maxResults": Maximum count of
+-// results to be returned. Maximum value is 500 and default value is
+-// 500.
+-func (c *FirewallsListCall) MaxResults(maxResults int64) *FirewallsListCall {
+- c.opt_["maxResults"] = maxResults
+- return c
+-}
+-
+-// PageToken sets the optional parameter "pageToken": Tag returned by a
+-// previous list request truncated by maxResults. Used to continue a
+-// previous list request.
+-func (c *FirewallsListCall) PageToken(pageToken string) *FirewallsListCall {
+- c.opt_["pageToken"] = pageToken
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *FirewallsListCall) Fields(s ...googleapi.Field) *FirewallsListCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *FirewallsListCall) Do() (*FirewallList, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["filter"]; ok {
+- params.Set("filter", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["maxResults"]; ok {
+- params.Set("maxResults", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["pageToken"]; ok {
+- params.Set("pageToken", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/firewalls")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *FirewallList
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Retrieves the list of firewall resources available to the specified project.",
+- // "httpMethod": "GET",
+- // "id": "compute.firewalls.list",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "filter": {
+- // "description": "Optional. Filter expression for filtering listed resources.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "maxResults": {
+- // "default": "500",
+- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
+- // "format": "uint32",
+- // "location": "query",
+- // "maximum": "500",
+- // "minimum": "0",
+- // "type": "integer"
+- // },
+- // "pageToken": {
+- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/firewalls",
+- // "response": {
+- // "$ref": "FirewallList"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.firewalls.patch":
+-
+-type FirewallsPatchCall struct {
+- s *Service
+- project string
+- firewall string
+- firewall2 *Firewall
+- opt_ map[string]interface{}
+-}
+-
+-// Patch: Updates the specified firewall resource with the data included
+-// in the request. This method supports patch semantics.
+-func (r *FirewallsService) Patch(project string, firewall string, firewall2 *Firewall) *FirewallsPatchCall {
+- c := &FirewallsPatchCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.firewall = firewall
+- c.firewall2 = firewall2
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *FirewallsPatchCall) Fields(s ...googleapi.Field) *FirewallsPatchCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *FirewallsPatchCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.firewall2)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/firewalls/{firewall}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("PATCH", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "firewall": c.firewall,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Updates the specified firewall resource with the data included in the request. This method supports patch semantics.",
+- // "httpMethod": "PATCH",
+- // "id": "compute.firewalls.patch",
+- // "parameterOrder": [
+- // "project",
+- // "firewall"
+- // ],
+- // "parameters": {
+- // "firewall": {
+- // "description": "Name of the firewall resource to update.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/firewalls/{firewall}",
+- // "request": {
+- // "$ref": "Firewall"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.firewalls.update":
+-
+-type FirewallsUpdateCall struct {
+- s *Service
+- project string
+- firewall string
+- firewall2 *Firewall
+- opt_ map[string]interface{}
+-}
+-
+-// Update: Updates the specified firewall resource with the data
+-// included in the request.
+-func (r *FirewallsService) Update(project string, firewall string, firewall2 *Firewall) *FirewallsUpdateCall {
+- c := &FirewallsUpdateCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.firewall = firewall
+- c.firewall2 = firewall2
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *FirewallsUpdateCall) Fields(s ...googleapi.Field) *FirewallsUpdateCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *FirewallsUpdateCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.firewall2)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/firewalls/{firewall}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("PUT", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "firewall": c.firewall,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Updates the specified firewall resource with the data included in the request.",
+- // "httpMethod": "PUT",
+- // "id": "compute.firewalls.update",
+- // "parameterOrder": [
+- // "project",
+- // "firewall"
+- // ],
+- // "parameters": {
+- // "firewall": {
+- // "description": "Name of the firewall resource to update.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/firewalls/{firewall}",
+- // "request": {
+- // "$ref": "Firewall"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.forwardingRules.aggregatedList":
+-
+-type ForwardingRulesAggregatedListCall struct {
+- s *Service
+- project string
+- opt_ map[string]interface{}
+-}
+-
+-// AggregatedList: Retrieves the list of forwarding rules grouped by
+-// scope.
+-func (r *ForwardingRulesService) AggregatedList(project string) *ForwardingRulesAggregatedListCall {
+- c := &ForwardingRulesAggregatedListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- return c
+-}
+-
+-// Filter sets the optional parameter "filter": Filter expression for
+-// filtering listed resources.
+-func (c *ForwardingRulesAggregatedListCall) Filter(filter string) *ForwardingRulesAggregatedListCall {
+- c.opt_["filter"] = filter
+- return c
+-}
+-
+-// MaxResults sets the optional parameter "maxResults": Maximum count of
+-// results to be returned. Maximum value is 500 and default value is
+-// 500.
+-func (c *ForwardingRulesAggregatedListCall) MaxResults(maxResults int64) *ForwardingRulesAggregatedListCall {
+- c.opt_["maxResults"] = maxResults
+- return c
+-}
+-
+-// PageToken sets the optional parameter "pageToken": Tag returned by a
+-// previous list request truncated by maxResults. Used to continue a
+-// previous list request.
+-func (c *ForwardingRulesAggregatedListCall) PageToken(pageToken string) *ForwardingRulesAggregatedListCall {
+- c.opt_["pageToken"] = pageToken
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *ForwardingRulesAggregatedListCall) Fields(s ...googleapi.Field) *ForwardingRulesAggregatedListCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *ForwardingRulesAggregatedListCall) Do() (*ForwardingRuleAggregatedList, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["filter"]; ok {
+- params.Set("filter", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["maxResults"]; ok {
+- params.Set("maxResults", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["pageToken"]; ok {
+- params.Set("pageToken", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/aggregated/forwardingRules")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *ForwardingRuleAggregatedList
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Retrieves the list of forwarding rules grouped by scope.",
+- // "httpMethod": "GET",
+- // "id": "compute.forwardingRules.aggregatedList",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "filter": {
+- // "description": "Optional. Filter expression for filtering listed resources.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "maxResults": {
+- // "default": "500",
+- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
+- // "format": "uint32",
+- // "location": "query",
+- // "maximum": "500",
+- // "minimum": "0",
+- // "type": "integer"
+- // },
+- // "pageToken": {
+- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/aggregated/forwardingRules",
+- // "response": {
+- // "$ref": "ForwardingRuleAggregatedList"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.forwardingRules.delete":
+-
+-type ForwardingRulesDeleteCall struct {
+- s *Service
+- project string
+- region string
+- forwardingRule string
+- opt_ map[string]interface{}
+-}
+-
+-// Delete: Deletes the specified ForwardingRule resource.
+-func (r *ForwardingRulesService) Delete(project string, region string, forwardingRule string) *ForwardingRulesDeleteCall {
+- c := &ForwardingRulesDeleteCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.region = region
+- c.forwardingRule = forwardingRule
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *ForwardingRulesDeleteCall) Fields(s ...googleapi.Field) *ForwardingRulesDeleteCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *ForwardingRulesDeleteCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/forwardingRules/{forwardingRule}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("DELETE", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "region": c.region,
+- "forwardingRule": c.forwardingRule,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Deletes the specified ForwardingRule resource.",
+- // "httpMethod": "DELETE",
+- // "id": "compute.forwardingRules.delete",
+- // "parameterOrder": [
+- // "project",
+- // "region",
+- // "forwardingRule"
+- // ],
+- // "parameters": {
+- // "forwardingRule": {
+- // "description": "Name of the ForwardingRule resource to delete.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "region": {
+- // "description": "Name of the region scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/regions/{region}/forwardingRules/{forwardingRule}",
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.forwardingRules.get":
+-
+-type ForwardingRulesGetCall struct {
+- s *Service
+- project string
+- region string
+- forwardingRule string
+- opt_ map[string]interface{}
+-}
+-
+-// Get: Returns the specified ForwardingRule resource.
+-func (r *ForwardingRulesService) Get(project string, region string, forwardingRule string) *ForwardingRulesGetCall {
+- c := &ForwardingRulesGetCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.region = region
+- c.forwardingRule = forwardingRule
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *ForwardingRulesGetCall) Fields(s ...googleapi.Field) *ForwardingRulesGetCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *ForwardingRulesGetCall) Do() (*ForwardingRule, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/forwardingRules/{forwardingRule}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "region": c.region,
+- "forwardingRule": c.forwardingRule,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *ForwardingRule
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Returns the specified ForwardingRule resource.",
+- // "httpMethod": "GET",
+- // "id": "compute.forwardingRules.get",
+- // "parameterOrder": [
+- // "project",
+- // "region",
+- // "forwardingRule"
+- // ],
+- // "parameters": {
+- // "forwardingRule": {
+- // "description": "Name of the ForwardingRule resource to return.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "region": {
+- // "description": "Name of the region scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/regions/{region}/forwardingRules/{forwardingRule}",
+- // "response": {
+- // "$ref": "ForwardingRule"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.forwardingRules.insert":
+-
+-type ForwardingRulesInsertCall struct {
+- s *Service
+- project string
+- region string
+- forwardingrule *ForwardingRule
+- opt_ map[string]interface{}
+-}
+-
+-// Insert: Creates a ForwardingRule resource in the specified project
+-// and region using the data included in the request.
+-func (r *ForwardingRulesService) Insert(project string, region string, forwardingrule *ForwardingRule) *ForwardingRulesInsertCall {
+- c := &ForwardingRulesInsertCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.region = region
+- c.forwardingrule = forwardingrule
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *ForwardingRulesInsertCall) Fields(s ...googleapi.Field) *ForwardingRulesInsertCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *ForwardingRulesInsertCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.forwardingrule)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/forwardingRules")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "region": c.region,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Creates a ForwardingRule resource in the specified project and region using the data included in the request.",
+- // "httpMethod": "POST",
+- // "id": "compute.forwardingRules.insert",
+- // "parameterOrder": [
+- // "project",
+- // "region"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "region": {
+- // "description": "Name of the region scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/regions/{region}/forwardingRules",
+- // "request": {
+- // "$ref": "ForwardingRule"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.forwardingRules.list":
+-
+-type ForwardingRulesListCall struct {
+- s *Service
+- project string
+- region string
+- opt_ map[string]interface{}
+-}
+-
+-// List: Retrieves the list of ForwardingRule resources available to the
+-// specified project and region.
+-func (r *ForwardingRulesService) List(project string, region string) *ForwardingRulesListCall {
+- c := &ForwardingRulesListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.region = region
+- return c
+-}
+-
+-// Filter sets the optional parameter "filter": Filter expression for
+-// filtering listed resources.
+-func (c *ForwardingRulesListCall) Filter(filter string) *ForwardingRulesListCall {
+- c.opt_["filter"] = filter
+- return c
+-}
+-
+-// MaxResults sets the optional parameter "maxResults": Maximum count of
+-// results to be returned. Maximum value is 500 and default value is
+-// 500.
+-func (c *ForwardingRulesListCall) MaxResults(maxResults int64) *ForwardingRulesListCall {
+- c.opt_["maxResults"] = maxResults
+- return c
+-}
+-
+-// PageToken sets the optional parameter "pageToken": Tag returned by a
+-// previous list request truncated by maxResults. Used to continue a
+-// previous list request.
+-func (c *ForwardingRulesListCall) PageToken(pageToken string) *ForwardingRulesListCall {
+- c.opt_["pageToken"] = pageToken
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *ForwardingRulesListCall) Fields(s ...googleapi.Field) *ForwardingRulesListCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *ForwardingRulesListCall) Do() (*ForwardingRuleList, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["filter"]; ok {
+- params.Set("filter", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["maxResults"]; ok {
+- params.Set("maxResults", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["pageToken"]; ok {
+- params.Set("pageToken", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/forwardingRules")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "region": c.region,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *ForwardingRuleList
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Retrieves the list of ForwardingRule resources available to the specified project and region.",
+- // "httpMethod": "GET",
+- // "id": "compute.forwardingRules.list",
+- // "parameterOrder": [
+- // "project",
+- // "region"
+- // ],
+- // "parameters": {
+- // "filter": {
+- // "description": "Optional. Filter expression for filtering listed resources.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "maxResults": {
+- // "default": "500",
+- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
+- // "format": "uint32",
+- // "location": "query",
+- // "maximum": "500",
+- // "minimum": "0",
+- // "type": "integer"
+- // },
+- // "pageToken": {
+- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "region": {
+- // "description": "Name of the region scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/regions/{region}/forwardingRules",
+- // "response": {
+- // "$ref": "ForwardingRuleList"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.forwardingRules.setTarget":
+-
+-type ForwardingRulesSetTargetCall struct {
+- s *Service
+- project string
+- region string
+- forwardingRule string
+- targetreference *TargetReference
+- opt_ map[string]interface{}
+-}
+-
+-// SetTarget: Changes target url for forwarding rule.
+-func (r *ForwardingRulesService) SetTarget(project string, region string, forwardingRule string, targetreference *TargetReference) *ForwardingRulesSetTargetCall {
+- c := &ForwardingRulesSetTargetCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.region = region
+- c.forwardingRule = forwardingRule
+- c.targetreference = targetreference
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *ForwardingRulesSetTargetCall) Fields(s ...googleapi.Field) *ForwardingRulesSetTargetCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *ForwardingRulesSetTargetCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.targetreference)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/forwardingRules/{forwardingRule}/setTarget")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "region": c.region,
+- "forwardingRule": c.forwardingRule,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Changes target url for forwarding rule.",
+- // "httpMethod": "POST",
+- // "id": "compute.forwardingRules.setTarget",
+- // "parameterOrder": [
+- // "project",
+- // "region",
+- // "forwardingRule"
+- // ],
+- // "parameters": {
+- // "forwardingRule": {
+- // "description": "Name of the ForwardingRule resource in which target is to be set.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "region": {
+- // "description": "Name of the region scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/regions/{region}/forwardingRules/{forwardingRule}/setTarget",
+- // "request": {
+- // "$ref": "TargetReference"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.globalAddresses.delete":
+-
+-type GlobalAddressesDeleteCall struct {
+- s *Service
+- project string
+- address string
+- opt_ map[string]interface{}
+-}
+-
+-// Delete: Deletes the specified address resource.
+-func (r *GlobalAddressesService) Delete(project string, address string) *GlobalAddressesDeleteCall {
+- c := &GlobalAddressesDeleteCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.address = address
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *GlobalAddressesDeleteCall) Fields(s ...googleapi.Field) *GlobalAddressesDeleteCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *GlobalAddressesDeleteCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/addresses/{address}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("DELETE", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "address": c.address,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Deletes the specified address resource.",
+- // "httpMethod": "DELETE",
+- // "id": "compute.globalAddresses.delete",
+- // "parameterOrder": [
+- // "project",
+- // "address"
+- // ],
+- // "parameters": {
+- // "address": {
+- // "description": "Name of the address resource to delete.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/addresses/{address}",
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.globalAddresses.get":
+-
+-type GlobalAddressesGetCall struct {
+- s *Service
+- project string
+- address string
+- opt_ map[string]interface{}
+-}
+-
+-// Get: Returns the specified address resource.
+-func (r *GlobalAddressesService) Get(project string, address string) *GlobalAddressesGetCall {
+- c := &GlobalAddressesGetCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.address = address
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *GlobalAddressesGetCall) Fields(s ...googleapi.Field) *GlobalAddressesGetCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *GlobalAddressesGetCall) Do() (*Address, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/addresses/{address}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "address": c.address,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Address
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Returns the specified address resource.",
+- // "httpMethod": "GET",
+- // "id": "compute.globalAddresses.get",
+- // "parameterOrder": [
+- // "project",
+- // "address"
+- // ],
+- // "parameters": {
+- // "address": {
+- // "description": "Name of the address resource to return.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/addresses/{address}",
+- // "response": {
+- // "$ref": "Address"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.globalAddresses.insert":
+-
+-type GlobalAddressesInsertCall struct {
+- s *Service
+- project string
+- address *Address
+- opt_ map[string]interface{}
+-}
+-
+-// Insert: Creates an address resource in the specified project using
+-// the data included in the request.
+-func (r *GlobalAddressesService) Insert(project string, address *Address) *GlobalAddressesInsertCall {
+- c := &GlobalAddressesInsertCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.address = address
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *GlobalAddressesInsertCall) Fields(s ...googleapi.Field) *GlobalAddressesInsertCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *GlobalAddressesInsertCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.address)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/addresses")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Creates an address resource in the specified project using the data included in the request.",
+- // "httpMethod": "POST",
+- // "id": "compute.globalAddresses.insert",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/addresses",
+- // "request": {
+- // "$ref": "Address"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.globalAddresses.list":
+-
+-type GlobalAddressesListCall struct {
+- s *Service
+- project string
+- opt_ map[string]interface{}
+-}
+-
+-// List: Retrieves the list of global address resources.
+-func (r *GlobalAddressesService) List(project string) *GlobalAddressesListCall {
+- c := &GlobalAddressesListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- return c
+-}
+-
+-// Filter sets the optional parameter "filter": Filter expression for
+-// filtering listed resources.
+-func (c *GlobalAddressesListCall) Filter(filter string) *GlobalAddressesListCall {
+- c.opt_["filter"] = filter
+- return c
+-}
+-
+-// MaxResults sets the optional parameter "maxResults": Maximum count of
+-// results to be returned. Maximum value is 500 and default value is
+-// 500.
+-func (c *GlobalAddressesListCall) MaxResults(maxResults int64) *GlobalAddressesListCall {
+- c.opt_["maxResults"] = maxResults
+- return c
+-}
+-
+-// PageToken sets the optional parameter "pageToken": Tag returned by a
+-// previous list request truncated by maxResults. Used to continue a
+-// previous list request.
+-func (c *GlobalAddressesListCall) PageToken(pageToken string) *GlobalAddressesListCall {
+- c.opt_["pageToken"] = pageToken
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *GlobalAddressesListCall) Fields(s ...googleapi.Field) *GlobalAddressesListCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *GlobalAddressesListCall) Do() (*AddressList, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["filter"]; ok {
+- params.Set("filter", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["maxResults"]; ok {
+- params.Set("maxResults", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["pageToken"]; ok {
+- params.Set("pageToken", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/addresses")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *AddressList
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Retrieves the list of global address resources.",
+- // "httpMethod": "GET",
+- // "id": "compute.globalAddresses.list",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "filter": {
+- // "description": "Optional. Filter expression for filtering listed resources.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "maxResults": {
+- // "default": "500",
+- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
+- // "format": "uint32",
+- // "location": "query",
+- // "maximum": "500",
+- // "minimum": "0",
+- // "type": "integer"
+- // },
+- // "pageToken": {
+- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/addresses",
+- // "response": {
+- // "$ref": "AddressList"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.globalForwardingRules.delete":
+-
+-type GlobalForwardingRulesDeleteCall struct {
+- s *Service
+- project string
+- forwardingRule string
+- opt_ map[string]interface{}
+-}
+-
+-// Delete: Deletes the specified ForwardingRule resource.
+-func (r *GlobalForwardingRulesService) Delete(project string, forwardingRule string) *GlobalForwardingRulesDeleteCall {
+- c := &GlobalForwardingRulesDeleteCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.forwardingRule = forwardingRule
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *GlobalForwardingRulesDeleteCall) Fields(s ...googleapi.Field) *GlobalForwardingRulesDeleteCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *GlobalForwardingRulesDeleteCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/forwardingRules/{forwardingRule}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("DELETE", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "forwardingRule": c.forwardingRule,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Deletes the specified ForwardingRule resource.",
+- // "httpMethod": "DELETE",
+- // "id": "compute.globalForwardingRules.delete",
+- // "parameterOrder": [
+- // "project",
+- // "forwardingRule"
+- // ],
+- // "parameters": {
+- // "forwardingRule": {
+- // "description": "Name of the ForwardingRule resource to delete.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/forwardingRules/{forwardingRule}",
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.globalForwardingRules.get":
+-
+-type GlobalForwardingRulesGetCall struct {
+- s *Service
+- project string
+- forwardingRule string
+- opt_ map[string]interface{}
+-}
+-
+-// Get: Returns the specified ForwardingRule resource.
+-func (r *GlobalForwardingRulesService) Get(project string, forwardingRule string) *GlobalForwardingRulesGetCall {
+- c := &GlobalForwardingRulesGetCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.forwardingRule = forwardingRule
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *GlobalForwardingRulesGetCall) Fields(s ...googleapi.Field) *GlobalForwardingRulesGetCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *GlobalForwardingRulesGetCall) Do() (*ForwardingRule, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/forwardingRules/{forwardingRule}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "forwardingRule": c.forwardingRule,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *ForwardingRule
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Returns the specified ForwardingRule resource.",
+- // "httpMethod": "GET",
+- // "id": "compute.globalForwardingRules.get",
+- // "parameterOrder": [
+- // "project",
+- // "forwardingRule"
+- // ],
+- // "parameters": {
+- // "forwardingRule": {
+- // "description": "Name of the ForwardingRule resource to return.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/forwardingRules/{forwardingRule}",
+- // "response": {
+- // "$ref": "ForwardingRule"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.globalForwardingRules.insert":
+-
+-type GlobalForwardingRulesInsertCall struct {
+- s *Service
+- project string
+- forwardingrule *ForwardingRule
+- opt_ map[string]interface{}
+-}
+-
+-// Insert: Creates a ForwardingRule resource in the specified project
+-// and region using the data included in the request.
+-func (r *GlobalForwardingRulesService) Insert(project string, forwardingrule *ForwardingRule) *GlobalForwardingRulesInsertCall {
+- c := &GlobalForwardingRulesInsertCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.forwardingrule = forwardingrule
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *GlobalForwardingRulesInsertCall) Fields(s ...googleapi.Field) *GlobalForwardingRulesInsertCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *GlobalForwardingRulesInsertCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.forwardingrule)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/forwardingRules")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Creates a ForwardingRule resource in the specified project and region using the data included in the request.",
+- // "httpMethod": "POST",
+- // "id": "compute.globalForwardingRules.insert",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/forwardingRules",
+- // "request": {
+- // "$ref": "ForwardingRule"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.globalForwardingRules.list":
+-
+-type GlobalForwardingRulesListCall struct {
+- s *Service
+- project string
+- opt_ map[string]interface{}
+-}
+-
+-// List: Retrieves the list of ForwardingRule resources available to the
+-// specified project.
+-func (r *GlobalForwardingRulesService) List(project string) *GlobalForwardingRulesListCall {
+- c := &GlobalForwardingRulesListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- return c
+-}
+-
+-// Filter sets the optional parameter "filter": Filter expression for
+-// filtering listed resources.
+-func (c *GlobalForwardingRulesListCall) Filter(filter string) *GlobalForwardingRulesListCall {
+- c.opt_["filter"] = filter
+- return c
+-}
+-
+-// MaxResults sets the optional parameter "maxResults": Maximum count of
+-// results to be returned. Maximum value is 500 and default value is
+-// 500.
+-func (c *GlobalForwardingRulesListCall) MaxResults(maxResults int64) *GlobalForwardingRulesListCall {
+- c.opt_["maxResults"] = maxResults
+- return c
+-}
+-
+-// PageToken sets the optional parameter "pageToken": Tag returned by a
+-// previous list request truncated by maxResults. Used to continue a
+-// previous list request.
+-func (c *GlobalForwardingRulesListCall) PageToken(pageToken string) *GlobalForwardingRulesListCall {
+- c.opt_["pageToken"] = pageToken
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *GlobalForwardingRulesListCall) Fields(s ...googleapi.Field) *GlobalForwardingRulesListCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *GlobalForwardingRulesListCall) Do() (*ForwardingRuleList, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["filter"]; ok {
+- params.Set("filter", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["maxResults"]; ok {
+- params.Set("maxResults", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["pageToken"]; ok {
+- params.Set("pageToken", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/forwardingRules")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *ForwardingRuleList
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Retrieves the list of ForwardingRule resources available to the specified project.",
+- // "httpMethod": "GET",
+- // "id": "compute.globalForwardingRules.list",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "filter": {
+- // "description": "Optional. Filter expression for filtering listed resources.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "maxResults": {
+- // "default": "500",
+- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
+- // "format": "uint32",
+- // "location": "query",
+- // "maximum": "500",
+- // "minimum": "0",
+- // "type": "integer"
+- // },
+- // "pageToken": {
+- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/forwardingRules",
+- // "response": {
+- // "$ref": "ForwardingRuleList"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.globalForwardingRules.setTarget":
+-
+-type GlobalForwardingRulesSetTargetCall struct {
+- s *Service
+- project string
+- forwardingRule string
+- targetreference *TargetReference
+- opt_ map[string]interface{}
+-}
+-
+-// SetTarget: Changes target url for forwarding rule.
+-func (r *GlobalForwardingRulesService) SetTarget(project string, forwardingRule string, targetreference *TargetReference) *GlobalForwardingRulesSetTargetCall {
+- c := &GlobalForwardingRulesSetTargetCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.forwardingRule = forwardingRule
+- c.targetreference = targetreference
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *GlobalForwardingRulesSetTargetCall) Fields(s ...googleapi.Field) *GlobalForwardingRulesSetTargetCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *GlobalForwardingRulesSetTargetCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.targetreference)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/forwardingRules/{forwardingRule}/setTarget")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "forwardingRule": c.forwardingRule,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Changes target url for forwarding rule.",
+- // "httpMethod": "POST",
+- // "id": "compute.globalForwardingRules.setTarget",
+- // "parameterOrder": [
+- // "project",
+- // "forwardingRule"
+- // ],
+- // "parameters": {
+- // "forwardingRule": {
+- // "description": "Name of the ForwardingRule resource in which target is to be set.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/forwardingRules/{forwardingRule}/setTarget",
+- // "request": {
+- // "$ref": "TargetReference"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.globalOperations.aggregatedList":
+-
+-type GlobalOperationsAggregatedListCall struct {
+- s *Service
+- project string
+- opt_ map[string]interface{}
+-}
+-
+-// AggregatedList: Retrieves the list of all operations grouped by
+-// scope.
+-func (r *GlobalOperationsService) AggregatedList(project string) *GlobalOperationsAggregatedListCall {
+- c := &GlobalOperationsAggregatedListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- return c
+-}
+-
+-// Filter sets the optional parameter "filter": Filter expression for
+-// filtering listed resources.
+-func (c *GlobalOperationsAggregatedListCall) Filter(filter string) *GlobalOperationsAggregatedListCall {
+- c.opt_["filter"] = filter
+- return c
+-}
+-
+-// MaxResults sets the optional parameter "maxResults": Maximum count of
+-// results to be returned. Maximum value is 500 and default value is
+-// 500.
+-func (c *GlobalOperationsAggregatedListCall) MaxResults(maxResults int64) *GlobalOperationsAggregatedListCall {
+- c.opt_["maxResults"] = maxResults
+- return c
+-}
+-
+-// PageToken sets the optional parameter "pageToken": Tag returned by a
+-// previous list request truncated by maxResults. Used to continue a
+-// previous list request.
+-func (c *GlobalOperationsAggregatedListCall) PageToken(pageToken string) *GlobalOperationsAggregatedListCall {
+- c.opt_["pageToken"] = pageToken
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *GlobalOperationsAggregatedListCall) Fields(s ...googleapi.Field) *GlobalOperationsAggregatedListCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *GlobalOperationsAggregatedListCall) Do() (*OperationAggregatedList, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["filter"]; ok {
+- params.Set("filter", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["maxResults"]; ok {
+- params.Set("maxResults", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["pageToken"]; ok {
+- params.Set("pageToken", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/aggregated/operations")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *OperationAggregatedList
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Retrieves the list of all operations grouped by scope.",
+- // "httpMethod": "GET",
+- // "id": "compute.globalOperations.aggregatedList",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "filter": {
+- // "description": "Optional. Filter expression for filtering listed resources.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "maxResults": {
+- // "default": "500",
+- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
+- // "format": "uint32",
+- // "location": "query",
+- // "maximum": "500",
+- // "minimum": "0",
+- // "type": "integer"
+- // },
+- // "pageToken": {
+- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/aggregated/operations",
+- // "response": {
+- // "$ref": "OperationAggregatedList"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.globalOperations.delete":
+-
+-type GlobalOperationsDeleteCall struct {
+- s *Service
+- project string
+- operation string
+- opt_ map[string]interface{}
+-}
+-
+-// Delete: Deletes the specified operation resource.
+-func (r *GlobalOperationsService) Delete(project string, operation string) *GlobalOperationsDeleteCall {
+- c := &GlobalOperationsDeleteCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.operation = operation
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *GlobalOperationsDeleteCall) Fields(s ...googleapi.Field) *GlobalOperationsDeleteCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *GlobalOperationsDeleteCall) Do() error {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/operations/{operation}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("DELETE", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "operation": c.operation,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return err
+- }
+- return nil
+- // {
+- // "description": "Deletes the specified operation resource.",
+- // "httpMethod": "DELETE",
+- // "id": "compute.globalOperations.delete",
+- // "parameterOrder": [
+- // "project",
+- // "operation"
+- // ],
+- // "parameters": {
+- // "operation": {
+- // "description": "Name of the operation resource to delete.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/operations/{operation}",
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.globalOperations.get":
+-
+-type GlobalOperationsGetCall struct {
+- s *Service
+- project string
+- operation string
+- opt_ map[string]interface{}
+-}
+-
+-// Get: Retrieves the specified operation resource.
+-func (r *GlobalOperationsService) Get(project string, operation string) *GlobalOperationsGetCall {
+- c := &GlobalOperationsGetCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.operation = operation
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *GlobalOperationsGetCall) Fields(s ...googleapi.Field) *GlobalOperationsGetCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *GlobalOperationsGetCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/operations/{operation}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "operation": c.operation,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Retrieves the specified operation resource.",
+- // "httpMethod": "GET",
+- // "id": "compute.globalOperations.get",
+- // "parameterOrder": [
+- // "project",
+- // "operation"
+- // ],
+- // "parameters": {
+- // "operation": {
+- // "description": "Name of the operation resource to return.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/operations/{operation}",
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.globalOperations.list":
+-
+-type GlobalOperationsListCall struct {
+- s *Service
+- project string
+- opt_ map[string]interface{}
+-}
+-
+-// List: Retrieves the list of operation resources contained within the
+-// specified project.
+-func (r *GlobalOperationsService) List(project string) *GlobalOperationsListCall {
+- c := &GlobalOperationsListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- return c
+-}
+-
+-// Filter sets the optional parameter "filter": Filter expression for
+-// filtering listed resources.
+-func (c *GlobalOperationsListCall) Filter(filter string) *GlobalOperationsListCall {
+- c.opt_["filter"] = filter
+- return c
+-}
+-
+-// MaxResults sets the optional parameter "maxResults": Maximum count of
+-// results to be returned. Maximum value is 500 and default value is
+-// 500.
+-func (c *GlobalOperationsListCall) MaxResults(maxResults int64) *GlobalOperationsListCall {
+- c.opt_["maxResults"] = maxResults
+- return c
+-}
+-
+-// PageToken sets the optional parameter "pageToken": Tag returned by a
+-// previous list request truncated by maxResults. Used to continue a
+-// previous list request.
+-func (c *GlobalOperationsListCall) PageToken(pageToken string) *GlobalOperationsListCall {
+- c.opt_["pageToken"] = pageToken
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *GlobalOperationsListCall) Fields(s ...googleapi.Field) *GlobalOperationsListCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *GlobalOperationsListCall) Do() (*OperationList, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["filter"]; ok {
+- params.Set("filter", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["maxResults"]; ok {
+- params.Set("maxResults", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["pageToken"]; ok {
+- params.Set("pageToken", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/operations")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *OperationList
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Retrieves the list of operation resources contained within the specified project.",
+- // "httpMethod": "GET",
+- // "id": "compute.globalOperations.list",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "filter": {
+- // "description": "Optional. Filter expression for filtering listed resources.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "maxResults": {
+- // "default": "500",
+- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
+- // "format": "uint32",
+- // "location": "query",
+- // "maximum": "500",
+- // "minimum": "0",
+- // "type": "integer"
+- // },
+- // "pageToken": {
+- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/operations",
+- // "response": {
+- // "$ref": "OperationList"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.httpHealthChecks.delete":
+-
+-type HttpHealthChecksDeleteCall struct {
+- s *Service
+- project string
+- httpHealthCheck string
+- opt_ map[string]interface{}
+-}
+-
+-// Delete: Deletes the specified HttpHealthCheck resource.
+-func (r *HttpHealthChecksService) Delete(project string, httpHealthCheck string) *HttpHealthChecksDeleteCall {
+- c := &HttpHealthChecksDeleteCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.httpHealthCheck = httpHealthCheck
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *HttpHealthChecksDeleteCall) Fields(s ...googleapi.Field) *HttpHealthChecksDeleteCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *HttpHealthChecksDeleteCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/httpHealthChecks/{httpHealthCheck}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("DELETE", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "httpHealthCheck": c.httpHealthCheck,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Deletes the specified HttpHealthCheck resource.",
+- // "httpMethod": "DELETE",
+- // "id": "compute.httpHealthChecks.delete",
+- // "parameterOrder": [
+- // "project",
+- // "httpHealthCheck"
+- // ],
+- // "parameters": {
+- // "httpHealthCheck": {
+- // "description": "Name of the HttpHealthCheck resource to delete.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/httpHealthChecks/{httpHealthCheck}",
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.httpHealthChecks.get":
+-
+-type HttpHealthChecksGetCall struct {
+- s *Service
+- project string
+- httpHealthCheck string
+- opt_ map[string]interface{}
+-}
+-
+-// Get: Returns the specified HttpHealthCheck resource.
+-func (r *HttpHealthChecksService) Get(project string, httpHealthCheck string) *HttpHealthChecksGetCall {
+- c := &HttpHealthChecksGetCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.httpHealthCheck = httpHealthCheck
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *HttpHealthChecksGetCall) Fields(s ...googleapi.Field) *HttpHealthChecksGetCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *HttpHealthChecksGetCall) Do() (*HttpHealthCheck, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/httpHealthChecks/{httpHealthCheck}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "httpHealthCheck": c.httpHealthCheck,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *HttpHealthCheck
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Returns the specified HttpHealthCheck resource.",
+- // "httpMethod": "GET",
+- // "id": "compute.httpHealthChecks.get",
+- // "parameterOrder": [
+- // "project",
+- // "httpHealthCheck"
+- // ],
+- // "parameters": {
+- // "httpHealthCheck": {
+- // "description": "Name of the HttpHealthCheck resource to return.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/httpHealthChecks/{httpHealthCheck}",
+- // "response": {
+- // "$ref": "HttpHealthCheck"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.httpHealthChecks.insert":
+-
+-type HttpHealthChecksInsertCall struct {
+- s *Service
+- project string
+- httphealthcheck *HttpHealthCheck
+- opt_ map[string]interface{}
+-}
+-
+-// Insert: Creates a HttpHealthCheck resource in the specified project
+-// using the data included in the request.
+-func (r *HttpHealthChecksService) Insert(project string, httphealthcheck *HttpHealthCheck) *HttpHealthChecksInsertCall {
+- c := &HttpHealthChecksInsertCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.httphealthcheck = httphealthcheck
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *HttpHealthChecksInsertCall) Fields(s ...googleapi.Field) *HttpHealthChecksInsertCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *HttpHealthChecksInsertCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.httphealthcheck)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/httpHealthChecks")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Creates a HttpHealthCheck resource in the specified project using the data included in the request.",
+- // "httpMethod": "POST",
+- // "id": "compute.httpHealthChecks.insert",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/httpHealthChecks",
+- // "request": {
+- // "$ref": "HttpHealthCheck"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.httpHealthChecks.list":
+-
+-type HttpHealthChecksListCall struct {
+- s *Service
+- project string
+- opt_ map[string]interface{}
+-}
+-
+-// List: Retrieves the list of HttpHealthCheck resources available to
+-// the specified project.
+-func (r *HttpHealthChecksService) List(project string) *HttpHealthChecksListCall {
+- c := &HttpHealthChecksListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- return c
+-}
+-
+-// Filter sets the optional parameter "filter": Filter expression for
+-// filtering listed resources.
+-func (c *HttpHealthChecksListCall) Filter(filter string) *HttpHealthChecksListCall {
+- c.opt_["filter"] = filter
+- return c
+-}
+-
+-// MaxResults sets the optional parameter "maxResults": Maximum count of
+-// results to be returned. Maximum value is 500 and default value is
+-// 500.
+-func (c *HttpHealthChecksListCall) MaxResults(maxResults int64) *HttpHealthChecksListCall {
+- c.opt_["maxResults"] = maxResults
+- return c
+-}
+-
+-// PageToken sets the optional parameter "pageToken": Tag returned by a
+-// previous list request truncated by maxResults. Used to continue a
+-// previous list request.
+-func (c *HttpHealthChecksListCall) PageToken(pageToken string) *HttpHealthChecksListCall {
+- c.opt_["pageToken"] = pageToken
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *HttpHealthChecksListCall) Fields(s ...googleapi.Field) *HttpHealthChecksListCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *HttpHealthChecksListCall) Do() (*HttpHealthCheckList, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["filter"]; ok {
+- params.Set("filter", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["maxResults"]; ok {
+- params.Set("maxResults", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["pageToken"]; ok {
+- params.Set("pageToken", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/httpHealthChecks")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *HttpHealthCheckList
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Retrieves the list of HttpHealthCheck resources available to the specified project.",
+- // "httpMethod": "GET",
+- // "id": "compute.httpHealthChecks.list",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "filter": {
+- // "description": "Optional. Filter expression for filtering listed resources.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "maxResults": {
+- // "default": "500",
+- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
+- // "format": "uint32",
+- // "location": "query",
+- // "maximum": "500",
+- // "minimum": "0",
+- // "type": "integer"
+- // },
+- // "pageToken": {
+- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/httpHealthChecks",
+- // "response": {
+- // "$ref": "HttpHealthCheckList"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.httpHealthChecks.patch":
+-
+-type HttpHealthChecksPatchCall struct {
+- s *Service
+- project string
+- httpHealthCheck string
+- httphealthcheck *HttpHealthCheck
+- opt_ map[string]interface{}
+-}
+-
+-// Patch: Updates a HttpHealthCheck resource in the specified project
+-// using the data included in the request. This method supports patch
+-// semantics.
+-func (r *HttpHealthChecksService) Patch(project string, httpHealthCheck string, httphealthcheck *HttpHealthCheck) *HttpHealthChecksPatchCall {
+- c := &HttpHealthChecksPatchCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.httpHealthCheck = httpHealthCheck
+- c.httphealthcheck = httphealthcheck
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *HttpHealthChecksPatchCall) Fields(s ...googleapi.Field) *HttpHealthChecksPatchCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *HttpHealthChecksPatchCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.httphealthcheck)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/httpHealthChecks/{httpHealthCheck}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("PATCH", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "httpHealthCheck": c.httpHealthCheck,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Updates a HttpHealthCheck resource in the specified project using the data included in the request. This method supports patch semantics.",
+- // "httpMethod": "PATCH",
+- // "id": "compute.httpHealthChecks.patch",
+- // "parameterOrder": [
+- // "project",
+- // "httpHealthCheck"
+- // ],
+- // "parameters": {
+- // "httpHealthCheck": {
+- // "description": "Name of the HttpHealthCheck resource to update.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/httpHealthChecks/{httpHealthCheck}",
+- // "request": {
+- // "$ref": "HttpHealthCheck"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.httpHealthChecks.update":
+-
+-type HttpHealthChecksUpdateCall struct {
+- s *Service
+- project string
+- httpHealthCheck string
+- httphealthcheck *HttpHealthCheck
+- opt_ map[string]interface{}
+-}
+-
+-// Update: Updates a HttpHealthCheck resource in the specified project
+-// using the data included in the request.
+-func (r *HttpHealthChecksService) Update(project string, httpHealthCheck string, httphealthcheck *HttpHealthCheck) *HttpHealthChecksUpdateCall {
+- c := &HttpHealthChecksUpdateCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.httpHealthCheck = httpHealthCheck
+- c.httphealthcheck = httphealthcheck
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *HttpHealthChecksUpdateCall) Fields(s ...googleapi.Field) *HttpHealthChecksUpdateCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *HttpHealthChecksUpdateCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.httphealthcheck)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/httpHealthChecks/{httpHealthCheck}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("PUT", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "httpHealthCheck": c.httpHealthCheck,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Updates a HttpHealthCheck resource in the specified project using the data included in the request.",
+- // "httpMethod": "PUT",
+- // "id": "compute.httpHealthChecks.update",
+- // "parameterOrder": [
+- // "project",
+- // "httpHealthCheck"
+- // ],
+- // "parameters": {
+- // "httpHealthCheck": {
+- // "description": "Name of the HttpHealthCheck resource to update.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/httpHealthChecks/{httpHealthCheck}",
+- // "request": {
+- // "$ref": "HttpHealthCheck"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.images.delete":
+-
+-type ImagesDeleteCall struct {
+- s *Service
+- project string
+- image string
+- opt_ map[string]interface{}
+-}
+-
+-// Delete: Deletes the specified image resource.
+-func (r *ImagesService) Delete(project string, image string) *ImagesDeleteCall {
+- c := &ImagesDeleteCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.image = image
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *ImagesDeleteCall) Fields(s ...googleapi.Field) *ImagesDeleteCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *ImagesDeleteCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/images/{image}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("DELETE", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "image": c.image,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Deletes the specified image resource.",
+- // "httpMethod": "DELETE",
+- // "id": "compute.images.delete",
+- // "parameterOrder": [
+- // "project",
+- // "image"
+- // ],
+- // "parameters": {
+- // "image": {
+- // "description": "Name of the image resource to delete.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/images/{image}",
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.images.deprecate":
+-
+-type ImagesDeprecateCall struct {
+- s *Service
+- project string
+- image string
+- deprecationstatus *DeprecationStatus
+- opt_ map[string]interface{}
+-}
+-
+-// Deprecate: Sets the deprecation status of an image. If no message
+-// body is given, clears the deprecation status instead.
+-func (r *ImagesService) Deprecate(project string, image string, deprecationstatus *DeprecationStatus) *ImagesDeprecateCall {
+- c := &ImagesDeprecateCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.image = image
+- c.deprecationstatus = deprecationstatus
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *ImagesDeprecateCall) Fields(s ...googleapi.Field) *ImagesDeprecateCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *ImagesDeprecateCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.deprecationstatus)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/images/{image}/deprecate")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "image": c.image,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Sets the deprecation status of an image. If no message body is given, clears the deprecation status instead.",
+- // "httpMethod": "POST",
+- // "id": "compute.images.deprecate",
+- // "parameterOrder": [
+- // "project",
+- // "image"
+- // ],
+- // "parameters": {
+- // "image": {
+- // "description": "Image name.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/images/{image}/deprecate",
+- // "request": {
+- // "$ref": "DeprecationStatus"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.images.get":
+-
+-type ImagesGetCall struct {
+- s *Service
+- project string
+- image string
+- opt_ map[string]interface{}
+-}
+-
+-// Get: Returns the specified image resource.
+-func (r *ImagesService) Get(project string, image string) *ImagesGetCall {
+- c := &ImagesGetCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.image = image
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *ImagesGetCall) Fields(s ...googleapi.Field) *ImagesGetCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *ImagesGetCall) Do() (*Image, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/images/{image}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "image": c.image,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Image
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Returns the specified image resource.",
+- // "httpMethod": "GET",
+- // "id": "compute.images.get",
+- // "parameterOrder": [
+- // "project",
+- // "image"
+- // ],
+- // "parameters": {
+- // "image": {
+- // "description": "Name of the image resource to return.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/images/{image}",
+- // "response": {
+- // "$ref": "Image"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.images.insert":
+-
+-type ImagesInsertCall struct {
+- s *Service
+- project string
+- image *Image
+- opt_ map[string]interface{}
+-}
+-
+-// Insert: Creates an image resource in the specified project using the
+-// data included in the request.
+-func (r *ImagesService) Insert(project string, image *Image) *ImagesInsertCall {
+- c := &ImagesInsertCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.image = image
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *ImagesInsertCall) Fields(s ...googleapi.Field) *ImagesInsertCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *ImagesInsertCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.image)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/images")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Creates an image resource in the specified project using the data included in the request.",
+- // "httpMethod": "POST",
+- // "id": "compute.images.insert",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/images",
+- // "request": {
+- // "$ref": "Image"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/devstorage.full_control",
+- // "https://www.googleapis.com/auth/devstorage.read_only",
+- // "https://www.googleapis.com/auth/devstorage.read_write"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.images.list":
+-
+-type ImagesListCall struct {
+- s *Service
+- project string
+- opt_ map[string]interface{}
+-}
+-
+-// List: Retrieves the list of image resources available to the
+-// specified project.
+-func (r *ImagesService) List(project string) *ImagesListCall {
+- c := &ImagesListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- return c
+-}
+-
+-// Filter sets the optional parameter "filter": Filter expression for
+-// filtering listed resources.
+-func (c *ImagesListCall) Filter(filter string) *ImagesListCall {
+- c.opt_["filter"] = filter
+- return c
+-}
+-
+-// MaxResults sets the optional parameter "maxResults": Maximum count of
+-// results to be returned. Maximum value is 500 and default value is
+-// 500.
+-func (c *ImagesListCall) MaxResults(maxResults int64) *ImagesListCall {
+- c.opt_["maxResults"] = maxResults
+- return c
+-}
+-
+-// PageToken sets the optional parameter "pageToken": Tag returned by a
+-// previous list request truncated by maxResults. Used to continue a
+-// previous list request.
+-func (c *ImagesListCall) PageToken(pageToken string) *ImagesListCall {
+- c.opt_["pageToken"] = pageToken
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *ImagesListCall) Fields(s ...googleapi.Field) *ImagesListCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *ImagesListCall) Do() (*ImageList, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["filter"]; ok {
+- params.Set("filter", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["maxResults"]; ok {
+- params.Set("maxResults", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["pageToken"]; ok {
+- params.Set("pageToken", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/images")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *ImageList
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Retrieves the list of image resources available to the specified project.",
+- // "httpMethod": "GET",
+- // "id": "compute.images.list",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "filter": {
+- // "description": "Optional. Filter expression for filtering listed resources.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "maxResults": {
+- // "default": "500",
+- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
+- // "format": "uint32",
+- // "location": "query",
+- // "maximum": "500",
+- // "minimum": "0",
+- // "type": "integer"
+- // },
+- // "pageToken": {
+- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/images",
+- // "response": {
+- // "$ref": "ImageList"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.instanceTemplates.delete":
+-
+-type InstanceTemplatesDeleteCall struct {
+- s *Service
+- project string
+- instanceTemplate string
+- opt_ map[string]interface{}
+-}
+-
+-// Delete: Deletes the specified instance template resource.
+-func (r *InstanceTemplatesService) Delete(project string, instanceTemplate string) *InstanceTemplatesDeleteCall {
+- c := &InstanceTemplatesDeleteCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.instanceTemplate = instanceTemplate
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *InstanceTemplatesDeleteCall) Fields(s ...googleapi.Field) *InstanceTemplatesDeleteCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *InstanceTemplatesDeleteCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/instanceTemplates/{instanceTemplate}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("DELETE", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "instanceTemplate": c.instanceTemplate,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Deletes the specified instance template resource.",
+- // "httpMethod": "DELETE",
+- // "id": "compute.instanceTemplates.delete",
+- // "parameterOrder": [
+- // "project",
+- // "instanceTemplate"
+- // ],
+- // "parameters": {
+- // "instanceTemplate": {
+- // "description": "Name of the instance template resource to delete.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/instanceTemplates/{instanceTemplate}",
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.instanceTemplates.get":
+-
+-type InstanceTemplatesGetCall struct {
+- s *Service
+- project string
+- instanceTemplate string
+- opt_ map[string]interface{}
+-}
+-
+-// Get: Returns the specified instance template resource.
+-func (r *InstanceTemplatesService) Get(project string, instanceTemplate string) *InstanceTemplatesGetCall {
+- c := &InstanceTemplatesGetCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.instanceTemplate = instanceTemplate
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *InstanceTemplatesGetCall) Fields(s ...googleapi.Field) *InstanceTemplatesGetCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *InstanceTemplatesGetCall) Do() (*InstanceTemplate, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/instanceTemplates/{instanceTemplate}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "instanceTemplate": c.instanceTemplate,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *InstanceTemplate
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Returns the specified instance template resource.",
+- // "httpMethod": "GET",
+- // "id": "compute.instanceTemplates.get",
+- // "parameterOrder": [
+- // "project",
+- // "instanceTemplate"
+- // ],
+- // "parameters": {
+- // "instanceTemplate": {
+- // "description": "Name of the instance template resource to return.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/instanceTemplates/{instanceTemplate}",
+- // "response": {
+- // "$ref": "InstanceTemplate"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.instanceTemplates.insert":
+-
+-type InstanceTemplatesInsertCall struct {
+- s *Service
+- project string
+- instancetemplate *InstanceTemplate
+- opt_ map[string]interface{}
+-}
+-
+-// Insert: Creates an instance template resource in the specified
+-// project using the data included in the request.
+-func (r *InstanceTemplatesService) Insert(project string, instancetemplate *InstanceTemplate) *InstanceTemplatesInsertCall {
+- c := &InstanceTemplatesInsertCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.instancetemplate = instancetemplate
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *InstanceTemplatesInsertCall) Fields(s ...googleapi.Field) *InstanceTemplatesInsertCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *InstanceTemplatesInsertCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.instancetemplate)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/instanceTemplates")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Creates an instance template resource in the specified project using the data included in the request.",
+- // "httpMethod": "POST",
+- // "id": "compute.instanceTemplates.insert",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/instanceTemplates",
+- // "request": {
+- // "$ref": "InstanceTemplate"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.instanceTemplates.list":
+-
+-type InstanceTemplatesListCall struct {
+- s *Service
+- project string
+- opt_ map[string]interface{}
+-}
+-
+-// List: Retrieves the list of instance template resources contained
+-// within the specified project.
+-func (r *InstanceTemplatesService) List(project string) *InstanceTemplatesListCall {
+- c := &InstanceTemplatesListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- return c
+-}
+-
+-// Filter sets the optional parameter "filter": Filter expression for
+-// filtering listed resources.
+-func (c *InstanceTemplatesListCall) Filter(filter string) *InstanceTemplatesListCall {
+- c.opt_["filter"] = filter
+- return c
+-}
+-
+-// MaxResults sets the optional parameter "maxResults": Maximum count of
+-// results to be returned. Maximum value is 500 and default value is
+-// 500.
+-func (c *InstanceTemplatesListCall) MaxResults(maxResults int64) *InstanceTemplatesListCall {
+- c.opt_["maxResults"] = maxResults
+- return c
+-}
+-
+-// PageToken sets the optional parameter "pageToken": Tag returned by a
+-// previous list request truncated by maxResults. Used to continue a
+-// previous list request.
+-func (c *InstanceTemplatesListCall) PageToken(pageToken string) *InstanceTemplatesListCall {
+- c.opt_["pageToken"] = pageToken
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *InstanceTemplatesListCall) Fields(s ...googleapi.Field) *InstanceTemplatesListCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *InstanceTemplatesListCall) Do() (*InstanceTemplateList, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["filter"]; ok {
+- params.Set("filter", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["maxResults"]; ok {
+- params.Set("maxResults", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["pageToken"]; ok {
+- params.Set("pageToken", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/instanceTemplates")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *InstanceTemplateList
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Retrieves the list of instance template resources contained within the specified project.",
+- // "httpMethod": "GET",
+- // "id": "compute.instanceTemplates.list",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "filter": {
+- // "description": "Optional. Filter expression for filtering listed resources.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "maxResults": {
+- // "default": "500",
+- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
+- // "format": "uint32",
+- // "location": "query",
+- // "maximum": "500",
+- // "minimum": "0",
+- // "type": "integer"
+- // },
+- // "pageToken": {
+- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/instanceTemplates",
+- // "response": {
+- // "$ref": "InstanceTemplateList"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.instances.addAccessConfig":
+-
+-type InstancesAddAccessConfigCall struct {
+- s *Service
+- project string
+- zone string
+- instance string
+- networkInterface string
+- accessconfig *AccessConfig
+- opt_ map[string]interface{}
+-}
+-
+-// AddAccessConfig: Adds an access config to an instance's network
+-// interface.
+-func (r *InstancesService) AddAccessConfig(project string, zone string, instance string, networkInterface string, accessconfig *AccessConfig) *InstancesAddAccessConfigCall {
+- c := &InstancesAddAccessConfigCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.zone = zone
+- c.instance = instance
+- c.networkInterface = networkInterface
+- c.accessconfig = accessconfig
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *InstancesAddAccessConfigCall) Fields(s ...googleapi.Field) *InstancesAddAccessConfigCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *InstancesAddAccessConfigCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.accessconfig)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- params.Set("networkInterface", fmt.Sprintf("%v", c.networkInterface))
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/instances/{instance}/addAccessConfig")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "zone": c.zone,
+- "instance": c.instance,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Adds an access config to an instance's network interface.",
+- // "httpMethod": "POST",
+- // "id": "compute.instances.addAccessConfig",
+- // "parameterOrder": [
+- // "project",
+- // "zone",
+- // "instance",
+- // "networkInterface"
+- // ],
+- // "parameters": {
+- // "instance": {
+- // "description": "Instance name.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "networkInterface": {
+- // "description": "Network interface name.",
+- // "location": "query",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Project name.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "zone": {
+- // "description": "Name of the zone scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/zones/{zone}/instances/{instance}/addAccessConfig",
+- // "request": {
+- // "$ref": "AccessConfig"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.instances.aggregatedList":
+-
+-type InstancesAggregatedListCall struct {
+- s *Service
+- project string
+- opt_ map[string]interface{}
+-}
+-
+-// AggregatedList:
+-func (r *InstancesService) AggregatedList(project string) *InstancesAggregatedListCall {
+- c := &InstancesAggregatedListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- return c
+-}
+-
+-// Filter sets the optional parameter "filter": Filter expression for
+-// filtering listed resources.
+-func (c *InstancesAggregatedListCall) Filter(filter string) *InstancesAggregatedListCall {
+- c.opt_["filter"] = filter
+- return c
+-}
+-
+-// MaxResults sets the optional parameter "maxResults": Maximum count of
+-// results to be returned. Maximum value is 500 and default value is
+-// 500.
+-func (c *InstancesAggregatedListCall) MaxResults(maxResults int64) *InstancesAggregatedListCall {
+- c.opt_["maxResults"] = maxResults
+- return c
+-}
+-
+-// PageToken sets the optional parameter "pageToken": Tag returned by a
+-// previous list request truncated by maxResults. Used to continue a
+-// previous list request.
+-func (c *InstancesAggregatedListCall) PageToken(pageToken string) *InstancesAggregatedListCall {
+- c.opt_["pageToken"] = pageToken
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *InstancesAggregatedListCall) Fields(s ...googleapi.Field) *InstancesAggregatedListCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *InstancesAggregatedListCall) Do() (*InstanceAggregatedList, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["filter"]; ok {
+- params.Set("filter", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["maxResults"]; ok {
+- params.Set("maxResults", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["pageToken"]; ok {
+- params.Set("pageToken", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/aggregated/instances")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *InstanceAggregatedList
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "httpMethod": "GET",
+- // "id": "compute.instances.aggregatedList",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "filter": {
+- // "description": "Optional. Filter expression for filtering listed resources.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "maxResults": {
+- // "default": "500",
+- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
+- // "format": "uint32",
+- // "location": "query",
+- // "maximum": "500",
+- // "minimum": "0",
+- // "type": "integer"
+- // },
+- // "pageToken": {
+- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/aggregated/instances",
+- // "response": {
+- // "$ref": "InstanceAggregatedList"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.instances.attachDisk":
+-
+-type InstancesAttachDiskCall struct {
+- s *Service
+- project string
+- zone string
+- instance string
+- attacheddisk *AttachedDisk
+- opt_ map[string]interface{}
+-}
+-
+-// AttachDisk: Attaches a disk resource to an instance.
+-func (r *InstancesService) AttachDisk(project string, zone string, instance string, attacheddisk *AttachedDisk) *InstancesAttachDiskCall {
+- c := &InstancesAttachDiskCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.zone = zone
+- c.instance = instance
+- c.attacheddisk = attacheddisk
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *InstancesAttachDiskCall) Fields(s ...googleapi.Field) *InstancesAttachDiskCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *InstancesAttachDiskCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.attacheddisk)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/instances/{instance}/attachDisk")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "zone": c.zone,
+- "instance": c.instance,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Attaches a disk resource to an instance.",
+- // "httpMethod": "POST",
+- // "id": "compute.instances.attachDisk",
+- // "parameterOrder": [
+- // "project",
+- // "zone",
+- // "instance"
+- // ],
+- // "parameters": {
+- // "instance": {
+- // "description": "Instance name.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Project name.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "zone": {
+- // "description": "Name of the zone scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/zones/{zone}/instances/{instance}/attachDisk",
+- // "request": {
+- // "$ref": "AttachedDisk"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.instances.delete":
+-
+-type InstancesDeleteCall struct {
+- s *Service
+- project string
+- zone string
+- instance string
+- opt_ map[string]interface{}
+-}
+-
+-// Delete: Deletes the specified instance resource.
+-func (r *InstancesService) Delete(project string, zone string, instance string) *InstancesDeleteCall {
+- c := &InstancesDeleteCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.zone = zone
+- c.instance = instance
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *InstancesDeleteCall) Fields(s ...googleapi.Field) *InstancesDeleteCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *InstancesDeleteCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/instances/{instance}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("DELETE", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "zone": c.zone,
+- "instance": c.instance,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Deletes the specified instance resource.",
+- // "httpMethod": "DELETE",
+- // "id": "compute.instances.delete",
+- // "parameterOrder": [
+- // "project",
+- // "zone",
+- // "instance"
+- // ],
+- // "parameters": {
+- // "instance": {
+- // "description": "Name of the instance resource to delete.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "zone": {
+- // "description": "Name of the zone scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/zones/{zone}/instances/{instance}",
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.instances.deleteAccessConfig":
+-
+-type InstancesDeleteAccessConfigCall struct {
+- s *Service
+- project string
+- zone string
+- instance string
+- accessConfig string
+- networkInterface string
+- opt_ map[string]interface{}
+-}
+-
+-// DeleteAccessConfig: Deletes an access config from an instance's
+-// network interface.
+-func (r *InstancesService) DeleteAccessConfig(project string, zone string, instance string, accessConfig string, networkInterface string) *InstancesDeleteAccessConfigCall {
+- c := &InstancesDeleteAccessConfigCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.zone = zone
+- c.instance = instance
+- c.accessConfig = accessConfig
+- c.networkInterface = networkInterface
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *InstancesDeleteAccessConfigCall) Fields(s ...googleapi.Field) *InstancesDeleteAccessConfigCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *InstancesDeleteAccessConfigCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- params.Set("accessConfig", fmt.Sprintf("%v", c.accessConfig))
+- params.Set("networkInterface", fmt.Sprintf("%v", c.networkInterface))
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/instances/{instance}/deleteAccessConfig")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "zone": c.zone,
+- "instance": c.instance,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Deletes an access config from an instance's network interface.",
+- // "httpMethod": "POST",
+- // "id": "compute.instances.deleteAccessConfig",
+- // "parameterOrder": [
+- // "project",
+- // "zone",
+- // "instance",
+- // "accessConfig",
+- // "networkInterface"
+- // ],
+- // "parameters": {
+- // "accessConfig": {
+- // "description": "Access config name.",
+- // "location": "query",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "instance": {
+- // "description": "Instance name.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "networkInterface": {
+- // "description": "Network interface name.",
+- // "location": "query",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Project name.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "zone": {
+- // "description": "Name of the zone scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/zones/{zone}/instances/{instance}/deleteAccessConfig",
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.instances.detachDisk":
+-
+-type InstancesDetachDiskCall struct {
+- s *Service
+- project string
+- zone string
+- instance string
+- deviceName string
+- opt_ map[string]interface{}
+-}
+-
+-// DetachDisk: Detaches a disk from an instance.
+-func (r *InstancesService) DetachDisk(project string, zone string, instance string, deviceName string) *InstancesDetachDiskCall {
+- c := &InstancesDetachDiskCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.zone = zone
+- c.instance = instance
+- c.deviceName = deviceName
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *InstancesDetachDiskCall) Fields(s ...googleapi.Field) *InstancesDetachDiskCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *InstancesDetachDiskCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- params.Set("deviceName", fmt.Sprintf("%v", c.deviceName))
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/instances/{instance}/detachDisk")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "zone": c.zone,
+- "instance": c.instance,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Detaches a disk from an instance.",
+- // "httpMethod": "POST",
+- // "id": "compute.instances.detachDisk",
+- // "parameterOrder": [
+- // "project",
+- // "zone",
+- // "instance",
+- // "deviceName"
+- // ],
+- // "parameters": {
+- // "deviceName": {
+- // "description": "Disk device name to detach.",
+- // "location": "query",
+- // "pattern": "\\w[\\w.-]{0,254}",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "instance": {
+- // "description": "Instance name.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Project name.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "zone": {
+- // "description": "Name of the zone scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/zones/{zone}/instances/{instance}/detachDisk",
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.instances.get":
+-
+-type InstancesGetCall struct {
+- s *Service
+- project string
+- zone string
+- instance string
+- opt_ map[string]interface{}
+-}
+-
+-// Get: Returns the specified instance resource.
+-func (r *InstancesService) Get(project string, zone string, instance string) *InstancesGetCall {
+- c := &InstancesGetCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.zone = zone
+- c.instance = instance
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *InstancesGetCall) Fields(s ...googleapi.Field) *InstancesGetCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *InstancesGetCall) Do() (*Instance, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/instances/{instance}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "zone": c.zone,
+- "instance": c.instance,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Instance
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Returns the specified instance resource.",
+- // "httpMethod": "GET",
+- // "id": "compute.instances.get",
+- // "parameterOrder": [
+- // "project",
+- // "zone",
+- // "instance"
+- // ],
+- // "parameters": {
+- // "instance": {
+- // "description": "Name of the instance resource to return.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "zone": {
+- // "description": "Name of the zone scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/zones/{zone}/instances/{instance}",
+- // "response": {
+- // "$ref": "Instance"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.instances.getSerialPortOutput":
+-
+-type InstancesGetSerialPortOutputCall struct {
+- s *Service
+- project string
+- zone string
+- instance string
+- opt_ map[string]interface{}
+-}
+-
+-// GetSerialPortOutput: Returns the specified instance's serial port
+-// output.
+-func (r *InstancesService) GetSerialPortOutput(project string, zone string, instance string) *InstancesGetSerialPortOutputCall {
+- c := &InstancesGetSerialPortOutputCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.zone = zone
+- c.instance = instance
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *InstancesGetSerialPortOutputCall) Fields(s ...googleapi.Field) *InstancesGetSerialPortOutputCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *InstancesGetSerialPortOutputCall) Do() (*SerialPortOutput, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/instances/{instance}/serialPort")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "zone": c.zone,
+- "instance": c.instance,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *SerialPortOutput
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Returns the specified instance's serial port output.",
+- // "httpMethod": "GET",
+- // "id": "compute.instances.getSerialPortOutput",
+- // "parameterOrder": [
+- // "project",
+- // "zone",
+- // "instance"
+- // ],
+- // "parameters": {
+- // "instance": {
+- // "description": "Name of the instance scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "zone": {
+- // "description": "Name of the zone scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/zones/{zone}/instances/{instance}/serialPort",
+- // "response": {
+- // "$ref": "SerialPortOutput"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.instances.insert":
+-
+-type InstancesInsertCall struct {
+- s *Service
+- project string
+- zone string
+- instance *Instance
+- opt_ map[string]interface{}
+-}
+-
+-// Insert: Creates an instance resource in the specified project using
+-// the data included in the request.
+-func (r *InstancesService) Insert(project string, zone string, instance *Instance) *InstancesInsertCall {
+- c := &InstancesInsertCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.zone = zone
+- c.instance = instance
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *InstancesInsertCall) Fields(s ...googleapi.Field) *InstancesInsertCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *InstancesInsertCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.instance)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/instances")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "zone": c.zone,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Creates an instance resource in the specified project using the data included in the request.",
+- // "httpMethod": "POST",
+- // "id": "compute.instances.insert",
+- // "parameterOrder": [
+- // "project",
+- // "zone"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "zone": {
+- // "description": "Name of the zone scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/zones/{zone}/instances",
+- // "request": {
+- // "$ref": "Instance"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.instances.list":
+-
+-type InstancesListCall struct {
+- s *Service
+- project string
+- zone string
+- opt_ map[string]interface{}
+-}
+-
+-// List: Retrieves the list of instance resources contained within the
+-// specified zone.
+-func (r *InstancesService) List(project string, zone string) *InstancesListCall {
+- c := &InstancesListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.zone = zone
+- return c
+-}
+-
+-// Filter sets the optional parameter "filter": Filter expression for
+-// filtering listed resources.
+-func (c *InstancesListCall) Filter(filter string) *InstancesListCall {
+- c.opt_["filter"] = filter
+- return c
+-}
+-
+-// MaxResults sets the optional parameter "maxResults": Maximum count of
+-// results to be returned. Maximum value is 500 and default value is
+-// 500.
+-func (c *InstancesListCall) MaxResults(maxResults int64) *InstancesListCall {
+- c.opt_["maxResults"] = maxResults
+- return c
+-}
+-
+-// PageToken sets the optional parameter "pageToken": Tag returned by a
+-// previous list request truncated by maxResults. Used to continue a
+-// previous list request.
+-func (c *InstancesListCall) PageToken(pageToken string) *InstancesListCall {
+- c.opt_["pageToken"] = pageToken
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *InstancesListCall) Fields(s ...googleapi.Field) *InstancesListCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *InstancesListCall) Do() (*InstanceList, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["filter"]; ok {
+- params.Set("filter", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["maxResults"]; ok {
+- params.Set("maxResults", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["pageToken"]; ok {
+- params.Set("pageToken", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/instances")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "zone": c.zone,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *InstanceList
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Retrieves the list of instance resources contained within the specified zone.",
+- // "httpMethod": "GET",
+- // "id": "compute.instances.list",
+- // "parameterOrder": [
+- // "project",
+- // "zone"
+- // ],
+- // "parameters": {
+- // "filter": {
+- // "description": "Optional. Filter expression for filtering listed resources.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "maxResults": {
+- // "default": "500",
+- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
+- // "format": "uint32",
+- // "location": "query",
+- // "maximum": "500",
+- // "minimum": "0",
+- // "type": "integer"
+- // },
+- // "pageToken": {
+- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "zone": {
+- // "description": "Name of the zone scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/zones/{zone}/instances",
+- // "response": {
+- // "$ref": "InstanceList"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.instances.reset":
+-
+-type InstancesResetCall struct {
+- s *Service
+- project string
+- zone string
+- instance string
+- opt_ map[string]interface{}
+-}
+-
+-// Reset: Performs a hard reset on the instance.
+-func (r *InstancesService) Reset(project string, zone string, instance string) *InstancesResetCall {
+- c := &InstancesResetCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.zone = zone
+- c.instance = instance
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *InstancesResetCall) Fields(s ...googleapi.Field) *InstancesResetCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *InstancesResetCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/instances/{instance}/reset")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "zone": c.zone,
+- "instance": c.instance,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Performs a hard reset on the instance.",
+- // "httpMethod": "POST",
+- // "id": "compute.instances.reset",
+- // "parameterOrder": [
+- // "project",
+- // "zone",
+- // "instance"
+- // ],
+- // "parameters": {
+- // "instance": {
+- // "description": "Name of the instance scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "zone": {
+- // "description": "Name of the zone scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/zones/{zone}/instances/{instance}/reset",
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.instances.setDiskAutoDelete":
+-
+-type InstancesSetDiskAutoDeleteCall struct {
+- s *Service
+- project string
+- zone string
+- instance string
+- autoDelete bool
+- deviceName string
+- opt_ map[string]interface{}
+-}
+-
+-// SetDiskAutoDelete: Sets the auto-delete flag for a disk attached to
+-// an instance
+-func (r *InstancesService) SetDiskAutoDelete(project string, zone string, instance string, autoDelete bool, deviceName string) *InstancesSetDiskAutoDeleteCall {
+- c := &InstancesSetDiskAutoDeleteCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.zone = zone
+- c.instance = instance
+- c.autoDelete = autoDelete
+- c.deviceName = deviceName
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *InstancesSetDiskAutoDeleteCall) Fields(s ...googleapi.Field) *InstancesSetDiskAutoDeleteCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *InstancesSetDiskAutoDeleteCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- params.Set("autoDelete", fmt.Sprintf("%v", c.autoDelete))
+- params.Set("deviceName", fmt.Sprintf("%v", c.deviceName))
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/instances/{instance}/setDiskAutoDelete")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "zone": c.zone,
+- "instance": c.instance,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Sets the auto-delete flag for a disk attached to an instance",
+- // "httpMethod": "POST",
+- // "id": "compute.instances.setDiskAutoDelete",
+- // "parameterOrder": [
+- // "project",
+- // "zone",
+- // "instance",
+- // "autoDelete",
+- // "deviceName"
+- // ],
+- // "parameters": {
+- // "autoDelete": {
+- // "description": "Whether to auto-delete the disk when the instance is deleted.",
+- // "location": "query",
+- // "required": true,
+- // "type": "boolean"
+- // },
+- // "deviceName": {
+- // "description": "Disk device name to modify.",
+- // "location": "query",
+- // "pattern": "\\w[\\w.-]{0,254}",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "instance": {
+- // "description": "Instance name.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Project name.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "zone": {
+- // "description": "Name of the zone scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/zones/{zone}/instances/{instance}/setDiskAutoDelete",
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.instances.setMetadata":
+-
+-type InstancesSetMetadataCall struct {
+- s *Service
+- project string
+- zone string
+- instance string
+- metadata *Metadata
+- opt_ map[string]interface{}
+-}
+-
+-// SetMetadata: Sets metadata for the specified instance to the data
+-// included in the request.
+-func (r *InstancesService) SetMetadata(project string, zone string, instance string, metadata *Metadata) *InstancesSetMetadataCall {
+- c := &InstancesSetMetadataCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.zone = zone
+- c.instance = instance
+- c.metadata = metadata
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *InstancesSetMetadataCall) Fields(s ...googleapi.Field) *InstancesSetMetadataCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *InstancesSetMetadataCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.metadata)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/instances/{instance}/setMetadata")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "zone": c.zone,
+- "instance": c.instance,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Sets metadata for the specified instance to the data included in the request.",
+- // "httpMethod": "POST",
+- // "id": "compute.instances.setMetadata",
+- // "parameterOrder": [
+- // "project",
+- // "zone",
+- // "instance"
+- // ],
+- // "parameters": {
+- // "instance": {
+- // "description": "Name of the instance scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "zone": {
+- // "description": "Name of the zone scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/zones/{zone}/instances/{instance}/setMetadata",
+- // "request": {
+- // "$ref": "Metadata"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.instances.setScheduling":
+-
+-type InstancesSetSchedulingCall struct {
+- s *Service
+- project string
+- zone string
+- instance string
+- scheduling *Scheduling
+- opt_ map[string]interface{}
+-}
+-
+-// SetScheduling: Sets an instance's scheduling options.
+-func (r *InstancesService) SetScheduling(project string, zone string, instance string, scheduling *Scheduling) *InstancesSetSchedulingCall {
+- c := &InstancesSetSchedulingCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.zone = zone
+- c.instance = instance
+- c.scheduling = scheduling
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *InstancesSetSchedulingCall) Fields(s ...googleapi.Field) *InstancesSetSchedulingCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *InstancesSetSchedulingCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.scheduling)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/instances/{instance}/setScheduling")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "zone": c.zone,
+- "instance": c.instance,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Sets an instance's scheduling options.",
+- // "httpMethod": "POST",
+- // "id": "compute.instances.setScheduling",
+- // "parameterOrder": [
+- // "project",
+- // "zone",
+- // "instance"
+- // ],
+- // "parameters": {
+- // "instance": {
+- // "description": "Instance name.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Project name.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "zone": {
+- // "description": "Name of the zone scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/zones/{zone}/instances/{instance}/setScheduling",
+- // "request": {
+- // "$ref": "Scheduling"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
+-
+-}
-
--import (
-- "bytes"
-- "code.google.com/p/google-api-go-client/googleapi"
-- "encoding/json"
-- "errors"
-- "fmt"
-- "io"
-- "net/http"
-- "net/url"
-- "strconv"
-- "strings"
--)
+-// method id "compute.instances.setTags":
-
--// Always reference these packages, just in case the auto-generated code
--// below doesn't.
--var _ = bytes.NewBuffer
--var _ = strconv.Itoa
--var _ = fmt.Sprintf
--var _ = json.NewDecoder
--var _ = io.Copy
--var _ = url.Parse
--var _ = googleapi.Version
--var _ = errors.New
--var _ = strings.Replace
+-type InstancesSetTagsCall struct {
+- s *Service
+- project string
+- zone string
+- instance string
+- tags *Tags
+- opt_ map[string]interface{}
+-}
-
--const apiId = "compute:v1"
--const apiName = "compute"
--const apiVersion = "v1"
--const basePath = "https://www.googleapis.com/compute/v1/projects/"
+-// SetTags: Sets tags for the specified instance to the data included in
+-// the request.
+-func (r *InstancesService) SetTags(project string, zone string, instance string, tags *Tags) *InstancesSetTagsCall {
+- c := &InstancesSetTagsCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.zone = zone
+- c.instance = instance
+- c.tags = tags
+- return c
+-}
-
--// OAuth2 scopes used by this API.
--const (
-- // View and manage your Google Compute Engine resources
-- ComputeScope = "https://www.googleapis.com/auth/compute"
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *InstancesSetTagsCall) Fields(s ...googleapi.Field) *InstancesSetTagsCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
-
-- // View your Google Compute Engine resources
-- ComputeReadonlyScope = "https://www.googleapis.com/auth/compute.readonly"
+-func (c *InstancesSetTagsCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.tags)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/instances/{instance}/setTags")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "zone": c.zone,
+- "instance": c.instance,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Sets tags for the specified instance to the data included in the request.",
+- // "httpMethod": "POST",
+- // "id": "compute.instances.setTags",
+- // "parameterOrder": [
+- // "project",
+- // "zone",
+- // "instance"
+- // ],
+- // "parameters": {
+- // "instance": {
+- // "description": "Name of the instance scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "zone": {
+- // "description": "Name of the zone scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/zones/{zone}/instances/{instance}/setTags",
+- // "request": {
+- // "$ref": "Tags"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
-
-- // Manage your data and permissions in Google Cloud Storage
-- DevstorageFull_controlScope = "https://www.googleapis.com/auth/devstorage.full_control"
+-}
-
-- // View your data in Google Cloud Storage
-- DevstorageRead_onlyScope = "https://www.googleapis.com/auth/devstorage.read_only"
+-// method id "compute.licenses.get":
-
-- // Manage your data in Google Cloud Storage
-- DevstorageRead_writeScope = "https://www.googleapis.com/auth/devstorage.read_write"
--)
+-type LicensesGetCall struct {
+- s *Service
+- project string
+- license string
+- opt_ map[string]interface{}
+-}
-
--func New(client *http.Client) (*Service, error) {
-- if client == nil {
-- return nil, errors.New("client is nil")
+-// Get: Returns the specified license resource.
+-func (r *LicensesService) Get(project string, license string) *LicensesGetCall {
+- c := &LicensesGetCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.license = license
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *LicensesGetCall) Fields(s ...googleapi.Field) *LicensesGetCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *LicensesGetCall) Do() (*License, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
- }
-- s := &Service{client: client, BasePath: basePath}
-- s.Addresses = NewAddressesService(s)
-- s.BackendServices = NewBackendServicesService(s)
-- s.DiskTypes = NewDiskTypesService(s)
-- s.Disks = NewDisksService(s)
-- s.Firewalls = NewFirewallsService(s)
-- s.ForwardingRules = NewForwardingRulesService(s)
-- s.GlobalAddresses = NewGlobalAddressesService(s)
-- s.GlobalForwardingRules = NewGlobalForwardingRulesService(s)
-- s.GlobalOperations = NewGlobalOperationsService(s)
-- s.HttpHealthChecks = NewHttpHealthChecksService(s)
-- s.Images = NewImagesService(s)
-- s.InstanceTemplates = NewInstanceTemplatesService(s)
-- s.Instances = NewInstancesService(s)
-- s.Licenses = NewLicensesService(s)
-- s.MachineTypes = NewMachineTypesService(s)
-- s.Networks = NewNetworksService(s)
-- s.Projects = NewProjectsService(s)
-- s.RegionOperations = NewRegionOperationsService(s)
-- s.Regions = NewRegionsService(s)
-- s.Routes = NewRoutesService(s)
-- s.Snapshots = NewSnapshotsService(s)
-- s.TargetHttpProxies = NewTargetHttpProxiesService(s)
-- s.TargetInstances = NewTargetInstancesService(s)
-- s.TargetPools = NewTargetPoolsService(s)
-- s.UrlMaps = NewUrlMapsService(s)
-- s.ZoneOperations = NewZoneOperationsService(s)
-- s.Zones = NewZonesService(s)
-- return s, nil
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/licenses/{license}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "license": c.license,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *License
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Returns the specified license resource.",
+- // "httpMethod": "GET",
+- // "id": "compute.licenses.get",
+- // "parameterOrder": [
+- // "project",
+- // "license"
+- // ],
+- // "parameters": {
+- // "license": {
+- // "description": "Name of the license resource to return.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/licenses/{license}",
+- // "response": {
+- // "$ref": "License"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
+-
-}
-
--type Service struct {
-- client *http.Client
-- BasePath string // API endpoint base URL
+-// method id "compute.machineTypes.aggregatedList":
-
-- Addresses *AddressesService
+-type MachineTypesAggregatedListCall struct {
+- s *Service
+- project string
+- opt_ map[string]interface{}
+-}
-
-- BackendServices *BackendServicesService
+-// AggregatedList: Retrieves the list of machine type resources grouped
+-// by scope.
+-func (r *MachineTypesService) AggregatedList(project string) *MachineTypesAggregatedListCall {
+- c := &MachineTypesAggregatedListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- return c
+-}
-
-- DiskTypes *DiskTypesService
+-// Filter sets the optional parameter "filter": Filter expression for
+-// filtering listed resources.
+-func (c *MachineTypesAggregatedListCall) Filter(filter string) *MachineTypesAggregatedListCall {
+- c.opt_["filter"] = filter
+- return c
+-}
+-
+-// MaxResults sets the optional parameter "maxResults": Maximum count of
+-// results to be returned. Maximum value is 500 and default value is
+-// 500.
+-func (c *MachineTypesAggregatedListCall) MaxResults(maxResults int64) *MachineTypesAggregatedListCall {
+- c.opt_["maxResults"] = maxResults
+- return c
+-}
+-
+-// PageToken sets the optional parameter "pageToken": Tag returned by a
+-// previous list request truncated by maxResults. Used to continue a
+-// previous list request.
+-func (c *MachineTypesAggregatedListCall) PageToken(pageToken string) *MachineTypesAggregatedListCall {
+- c.opt_["pageToken"] = pageToken
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *MachineTypesAggregatedListCall) Fields(s ...googleapi.Field) *MachineTypesAggregatedListCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *MachineTypesAggregatedListCall) Do() (*MachineTypeAggregatedList, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["filter"]; ok {
+- params.Set("filter", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["maxResults"]; ok {
+- params.Set("maxResults", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["pageToken"]; ok {
+- params.Set("pageToken", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/aggregated/machineTypes")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *MachineTypeAggregatedList
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Retrieves the list of machine type resources grouped by scope.",
+- // "httpMethod": "GET",
+- // "id": "compute.machineTypes.aggregatedList",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "filter": {
+- // "description": "Optional. Filter expression for filtering listed resources.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "maxResults": {
+- // "default": "500",
+- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
+- // "format": "uint32",
+- // "location": "query",
+- // "maximum": "500",
+- // "minimum": "0",
+- // "type": "integer"
+- // },
+- // "pageToken": {
+- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/aggregated/machineTypes",
+- // "response": {
+- // "$ref": "MachineTypeAggregatedList"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
+-
+-}
+-
+-// method id "compute.machineTypes.get":
+-
+-type MachineTypesGetCall struct {
+- s *Service
+- project string
+- zone string
+- machineType string
+- opt_ map[string]interface{}
+-}
+-
+-// Get: Returns the specified machine type resource.
+-func (r *MachineTypesService) Get(project string, zone string, machineType string) *MachineTypesGetCall {
+- c := &MachineTypesGetCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.zone = zone
+- c.machineType = machineType
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *MachineTypesGetCall) Fields(s ...googleapi.Field) *MachineTypesGetCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *MachineTypesGetCall) Do() (*MachineType, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/machineTypes/{machineType}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "zone": c.zone,
+- "machineType": c.machineType,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *MachineType
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Returns the specified machine type resource.",
+- // "httpMethod": "GET",
+- // "id": "compute.machineTypes.get",
+- // "parameterOrder": [
+- // "project",
+- // "zone",
+- // "machineType"
+- // ],
+- // "parameters": {
+- // "machineType": {
+- // "description": "Name of the machine type resource to return.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "zone": {
+- // "description": "Name of the zone scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/zones/{zone}/machineTypes/{machineType}",
+- // "response": {
+- // "$ref": "MachineType"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
-
-- Disks *DisksService
+-}
-
-- Firewalls *FirewallsService
+-// method id "compute.machineTypes.list":
-
-- ForwardingRules *ForwardingRulesService
+-type MachineTypesListCall struct {
+- s *Service
+- project string
+- zone string
+- opt_ map[string]interface{}
+-}
-
-- GlobalAddresses *GlobalAddressesService
+-// List: Retrieves the list of machine type resources available to the
+-// specified project.
+-func (r *MachineTypesService) List(project string, zone string) *MachineTypesListCall {
+- c := &MachineTypesListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.zone = zone
+- return c
+-}
-
-- GlobalForwardingRules *GlobalForwardingRulesService
+-// Filter sets the optional parameter "filter": Filter expression for
+-// filtering listed resources.
+-func (c *MachineTypesListCall) Filter(filter string) *MachineTypesListCall {
+- c.opt_["filter"] = filter
+- return c
+-}
-
-- GlobalOperations *GlobalOperationsService
+-// MaxResults sets the optional parameter "maxResults": Maximum count of
+-// results to be returned. Maximum value is 500 and default value is
+-// 500.
+-func (c *MachineTypesListCall) MaxResults(maxResults int64) *MachineTypesListCall {
+- c.opt_["maxResults"] = maxResults
+- return c
+-}
-
-- HttpHealthChecks *HttpHealthChecksService
+-// PageToken sets the optional parameter "pageToken": Tag returned by a
+-// previous list request truncated by maxResults. Used to continue a
+-// previous list request.
+-func (c *MachineTypesListCall) PageToken(pageToken string) *MachineTypesListCall {
+- c.opt_["pageToken"] = pageToken
+- return c
+-}
-
-- Images *ImagesService
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *MachineTypesListCall) Fields(s ...googleapi.Field) *MachineTypesListCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
-
-- InstanceTemplates *InstanceTemplatesService
+-func (c *MachineTypesListCall) Do() (*MachineTypeList, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["filter"]; ok {
+- params.Set("filter", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["maxResults"]; ok {
+- params.Set("maxResults", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["pageToken"]; ok {
+- params.Set("pageToken", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/machineTypes")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "zone": c.zone,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *MachineTypeList
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Retrieves the list of machine type resources available to the specified project.",
+- // "httpMethod": "GET",
+- // "id": "compute.machineTypes.list",
+- // "parameterOrder": [
+- // "project",
+- // "zone"
+- // ],
+- // "parameters": {
+- // "filter": {
+- // "description": "Optional. Filter expression for filtering listed resources.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "maxResults": {
+- // "default": "500",
+- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
+- // "format": "uint32",
+- // "location": "query",
+- // "maximum": "500",
+- // "minimum": "0",
+- // "type": "integer"
+- // },
+- // "pageToken": {
+- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "zone": {
+- // "description": "Name of the zone scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/zones/{zone}/machineTypes",
+- // "response": {
+- // "$ref": "MachineTypeList"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
-
-- Instances *InstancesService
+-}
-
-- Licenses *LicensesService
+-// method id "compute.networks.delete":
-
-- MachineTypes *MachineTypesService
+-type NetworksDeleteCall struct {
+- s *Service
+- project string
+- network string
+- opt_ map[string]interface{}
+-}
-
-- Networks *NetworksService
+-// Delete: Deletes the specified network resource.
+-func (r *NetworksService) Delete(project string, network string) *NetworksDeleteCall {
+- c := &NetworksDeleteCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.network = network
+- return c
+-}
-
-- Projects *ProjectsService
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *NetworksDeleteCall) Fields(s ...googleapi.Field) *NetworksDeleteCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
-
-- RegionOperations *RegionOperationsService
+-func (c *NetworksDeleteCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/networks/{network}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("DELETE", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "network": c.network,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Deletes the specified network resource.",
+- // "httpMethod": "DELETE",
+- // "id": "compute.networks.delete",
+- // "parameterOrder": [
+- // "project",
+- // "network"
+- // ],
+- // "parameters": {
+- // "network": {
+- // "description": "Name of the network resource to delete.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/networks/{network}",
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
-
-- Regions *RegionsService
+-}
-
-- Routes *RoutesService
+-// method id "compute.networks.get":
-
-- Snapshots *SnapshotsService
+-type NetworksGetCall struct {
+- s *Service
+- project string
+- network string
+- opt_ map[string]interface{}
+-}
-
-- TargetHttpProxies *TargetHttpProxiesService
+-// Get: Returns the specified network resource.
+-func (r *NetworksService) Get(project string, network string) *NetworksGetCall {
+- c := &NetworksGetCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.network = network
+- return c
+-}
-
-- TargetInstances *TargetInstancesService
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *NetworksGetCall) Fields(s ...googleapi.Field) *NetworksGetCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
-
-- TargetPools *TargetPoolsService
+-func (c *NetworksGetCall) Do() (*Network, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/networks/{network}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "network": c.network,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Network
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Returns the specified network resource.",
+- // "httpMethod": "GET",
+- // "id": "compute.networks.get",
+- // "parameterOrder": [
+- // "project",
+- // "network"
+- // ],
+- // "parameters": {
+- // "network": {
+- // "description": "Name of the network resource to return.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/networks/{network}",
+- // "response": {
+- // "$ref": "Network"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
-
-- UrlMaps *UrlMapsService
+-}
-
-- ZoneOperations *ZoneOperationsService
+-// method id "compute.networks.insert":
-
-- Zones *ZonesService
+-type NetworksInsertCall struct {
+- s *Service
+- project string
+- network *Network
+- opt_ map[string]interface{}
-}
-
--func NewAddressesService(s *Service) *AddressesService {
-- rs := &AddressesService{s: s}
-- return rs
+-// Insert: Creates a network resource in the specified project using the
+-// data included in the request.
+-func (r *NetworksService) Insert(project string, network *Network) *NetworksInsertCall {
+- c := &NetworksInsertCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.network = network
+- return c
-}
-
--type AddressesService struct {
-- s *Service
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *NetworksInsertCall) Fields(s ...googleapi.Field) *NetworksInsertCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
-}
-
--func NewBackendServicesService(s *Service) *BackendServicesService {
-- rs := &BackendServicesService{s: s}
-- return rs
--}
+-func (c *NetworksInsertCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.network)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/networks")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Creates a network resource in the specified project using the data included in the request.",
+- // "httpMethod": "POST",
+- // "id": "compute.networks.insert",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/networks",
+- // "request": {
+- // "$ref": "Network"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
-
--type BackendServicesService struct {
-- s *Service
-}
-
--func NewDiskTypesService(s *Service) *DiskTypesService {
-- rs := &DiskTypesService{s: s}
-- return rs
+-// method id "compute.networks.list":
+-
+-type NetworksListCall struct {
+- s *Service
+- project string
+- opt_ map[string]interface{}
-}
-
--type DiskTypesService struct {
-- s *Service
+-// List: Retrieves the list of network resources available to the
+-// specified project.
+-func (r *NetworksService) List(project string) *NetworksListCall {
+- c := &NetworksListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- return c
-}
-
--func NewDisksService(s *Service) *DisksService {
-- rs := &DisksService{s: s}
-- return rs
+-// Filter sets the optional parameter "filter": Filter expression for
+-// filtering listed resources.
+-func (c *NetworksListCall) Filter(filter string) *NetworksListCall {
+- c.opt_["filter"] = filter
+- return c
-}
-
--type DisksService struct {
-- s *Service
+-// MaxResults sets the optional parameter "maxResults": Maximum count of
+-// results to be returned. Maximum value is 500 and default value is
+-// 500.
+-func (c *NetworksListCall) MaxResults(maxResults int64) *NetworksListCall {
+- c.opt_["maxResults"] = maxResults
+- return c
-}
-
--func NewFirewallsService(s *Service) *FirewallsService {
-- rs := &FirewallsService{s: s}
-- return rs
+-// PageToken sets the optional parameter "pageToken": Tag returned by a
+-// previous list request truncated by maxResults. Used to continue a
+-// previous list request.
+-func (c *NetworksListCall) PageToken(pageToken string) *NetworksListCall {
+- c.opt_["pageToken"] = pageToken
+- return c
-}
-
--type FirewallsService struct {
-- s *Service
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *NetworksListCall) Fields(s ...googleapi.Field) *NetworksListCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
-}
-
--func NewForwardingRulesService(s *Service) *ForwardingRulesService {
-- rs := &ForwardingRulesService{s: s}
-- return rs
+-func (c *NetworksListCall) Do() (*NetworkList, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["filter"]; ok {
+- params.Set("filter", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["maxResults"]; ok {
+- params.Set("maxResults", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["pageToken"]; ok {
+- params.Set("pageToken", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/networks")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *NetworkList
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Retrieves the list of network resources available to the specified project.",
+- // "httpMethod": "GET",
+- // "id": "compute.networks.list",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "filter": {
+- // "description": "Optional. Filter expression for filtering listed resources.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "maxResults": {
+- // "default": "500",
+- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
+- // "format": "uint32",
+- // "location": "query",
+- // "maximum": "500",
+- // "minimum": "0",
+- // "type": "integer"
+- // },
+- // "pageToken": {
+- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/networks",
+- // "response": {
+- // "$ref": "NetworkList"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
+-
-}
-
--type ForwardingRulesService struct {
-- s *Service
--}
+-// method id "compute.projects.get":
-
--func NewGlobalAddressesService(s *Service) *GlobalAddressesService {
-- rs := &GlobalAddressesService{s: s}
-- return rs
+-type ProjectsGetCall struct {
+- s *Service
+- project string
+- opt_ map[string]interface{}
-}
-
--type GlobalAddressesService struct {
-- s *Service
+-// Get: Returns the specified project resource.
+-func (r *ProjectsService) Get(project string) *ProjectsGetCall {
+- c := &ProjectsGetCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- return c
-}
-
--func NewGlobalForwardingRulesService(s *Service) *GlobalForwardingRulesService {
-- rs := &GlobalForwardingRulesService{s: s}
-- return rs
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *ProjectsGetCall) Fields(s ...googleapi.Field) *ProjectsGetCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
-}
-
--type GlobalForwardingRulesService struct {
-- s *Service
--}
+-func (c *ProjectsGetCall) Do() (*Project, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Project
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Returns the specified project resource.",
+- // "httpMethod": "GET",
+- // "id": "compute.projects.get",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project resource to retrieve.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}",
+- // "response": {
+- // "$ref": "Project"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
-
--func NewGlobalOperationsService(s *Service) *GlobalOperationsService {
-- rs := &GlobalOperationsService{s: s}
-- return rs
-}
-
--type GlobalOperationsService struct {
-- s *Service
--}
+-// method id "compute.projects.setCommonInstanceMetadata":
-
--func NewHttpHealthChecksService(s *Service) *HttpHealthChecksService {
-- rs := &HttpHealthChecksService{s: s}
-- return rs
+-type ProjectsSetCommonInstanceMetadataCall struct {
+- s *Service
+- project string
+- metadata *Metadata
+- opt_ map[string]interface{}
-}
-
--type HttpHealthChecksService struct {
-- s *Service
+-// SetCommonInstanceMetadata: Sets metadata common to all instances
+-// within the specified project using the data included in the request.
+-func (r *ProjectsService) SetCommonInstanceMetadata(project string, metadata *Metadata) *ProjectsSetCommonInstanceMetadataCall {
+- c := &ProjectsSetCommonInstanceMetadataCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.metadata = metadata
+- return c
-}
-
--func NewImagesService(s *Service) *ImagesService {
-- rs := &ImagesService{s: s}
-- return rs
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *ProjectsSetCommonInstanceMetadataCall) Fields(s ...googleapi.Field) *ProjectsSetCommonInstanceMetadataCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
-}
-
--type ImagesService struct {
-- s *Service
--}
+-func (c *ProjectsSetCommonInstanceMetadataCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.metadata)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/setCommonInstanceMetadata")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Sets metadata common to all instances within the specified project using the data included in the request.",
+- // "httpMethod": "POST",
+- // "id": "compute.projects.setCommonInstanceMetadata",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/setCommonInstanceMetadata",
+- // "request": {
+- // "$ref": "Metadata"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
-
--func NewInstanceTemplatesService(s *Service) *InstanceTemplatesService {
-- rs := &InstanceTemplatesService{s: s}
-- return rs
-}
-
--type InstanceTemplatesService struct {
-- s *Service
--}
+-// method id "compute.projects.setUsageExportBucket":
-
--func NewInstancesService(s *Service) *InstancesService {
-- rs := &InstancesService{s: s}
-- return rs
+-type ProjectsSetUsageExportBucketCall struct {
+- s *Service
+- project string
+- usageexportlocation *UsageExportLocation
+- opt_ map[string]interface{}
-}
-
--type InstancesService struct {
-- s *Service
+-// SetUsageExportBucket: Sets usage export location
+-func (r *ProjectsService) SetUsageExportBucket(project string, usageexportlocation *UsageExportLocation) *ProjectsSetUsageExportBucketCall {
+- c := &ProjectsSetUsageExportBucketCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.usageexportlocation = usageexportlocation
+- return c
-}
-
--func NewLicensesService(s *Service) *LicensesService {
-- rs := &LicensesService{s: s}
-- return rs
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *ProjectsSetUsageExportBucketCall) Fields(s ...googleapi.Field) *ProjectsSetUsageExportBucketCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
-}
-
--type LicensesService struct {
-- s *Service
--}
+-func (c *ProjectsSetUsageExportBucketCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.usageexportlocation)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/setUsageExportBucket")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Sets usage export location",
+- // "httpMethod": "POST",
+- // "id": "compute.projects.setUsageExportBucket",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/setUsageExportBucket",
+- // "request": {
+- // "$ref": "UsageExportLocation"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/devstorage.full_control",
+- // "https://www.googleapis.com/auth/devstorage.read_only",
+- // "https://www.googleapis.com/auth/devstorage.read_write"
+- // ]
+- // }
-
--func NewMachineTypesService(s *Service) *MachineTypesService {
-- rs := &MachineTypesService{s: s}
-- return rs
-}
-
--type MachineTypesService struct {
-- s *Service
--}
+-// method id "compute.regionOperations.delete":
-
--func NewNetworksService(s *Service) *NetworksService {
-- rs := &NetworksService{s: s}
-- return rs
+-type RegionOperationsDeleteCall struct {
+- s *Service
+- project string
+- region string
+- operation string
+- opt_ map[string]interface{}
-}
-
--type NetworksService struct {
-- s *Service
+-// Delete: Deletes the specified region-specific operation resource.
+-func (r *RegionOperationsService) Delete(project string, region string, operation string) *RegionOperationsDeleteCall {
+- c := &RegionOperationsDeleteCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.region = region
+- c.operation = operation
+- return c
-}
-
--func NewProjectsService(s *Service) *ProjectsService {
-- rs := &ProjectsService{s: s}
-- return rs
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *RegionOperationsDeleteCall) Fields(s ...googleapi.Field) *RegionOperationsDeleteCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
-}
-
--type ProjectsService struct {
-- s *Service
--}
+-func (c *RegionOperationsDeleteCall) Do() error {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/operations/{operation}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("DELETE", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "region": c.region,
+- "operation": c.operation,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return err
+- }
+- return nil
+- // {
+- // "description": "Deletes the specified region-specific operation resource.",
+- // "httpMethod": "DELETE",
+- // "id": "compute.regionOperations.delete",
+- // "parameterOrder": [
+- // "project",
+- // "region",
+- // "operation"
+- // ],
+- // "parameters": {
+- // "operation": {
+- // "description": "Name of the operation resource to delete.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "region": {
+- // "description": "Name of the region scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/regions/{region}/operations/{operation}",
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
-
--func NewRegionOperationsService(s *Service) *RegionOperationsService {
-- rs := &RegionOperationsService{s: s}
-- return rs
-}
-
--type RegionOperationsService struct {
-- s *Service
--}
+-// method id "compute.regionOperations.get":
-
--func NewRegionsService(s *Service) *RegionsService {
-- rs := &RegionsService{s: s}
-- return rs
+-type RegionOperationsGetCall struct {
+- s *Service
+- project string
+- region string
+- operation string
+- opt_ map[string]interface{}
-}
-
--type RegionsService struct {
-- s *Service
+-// Get: Retrieves the specified region-specific operation resource.
+-func (r *RegionOperationsService) Get(project string, region string, operation string) *RegionOperationsGetCall {
+- c := &RegionOperationsGetCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.region = region
+- c.operation = operation
+- return c
-}
-
--func NewRoutesService(s *Service) *RoutesService {
-- rs := &RoutesService{s: s}
-- return rs
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *RegionOperationsGetCall) Fields(s ...googleapi.Field) *RegionOperationsGetCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
-}
-
--type RoutesService struct {
-- s *Service
--}
+-func (c *RegionOperationsGetCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/operations/{operation}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "region": c.region,
+- "operation": c.operation,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Retrieves the specified region-specific operation resource.",
+- // "httpMethod": "GET",
+- // "id": "compute.regionOperations.get",
+- // "parameterOrder": [
+- // "project",
+- // "region",
+- // "operation"
+- // ],
+- // "parameters": {
+- // "operation": {
+- // "description": "Name of the operation resource to return.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "region": {
+- // "description": "Name of the zone scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/regions/{region}/operations/{operation}",
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
-
--func NewSnapshotsService(s *Service) *SnapshotsService {
-- rs := &SnapshotsService{s: s}
-- return rs
-}
-
--type SnapshotsService struct {
-- s *Service
--}
+-// method id "compute.regionOperations.list":
-
--func NewTargetHttpProxiesService(s *Service) *TargetHttpProxiesService {
-- rs := &TargetHttpProxiesService{s: s}
-- return rs
+-type RegionOperationsListCall struct {
+- s *Service
+- project string
+- region string
+- opt_ map[string]interface{}
-}
-
--type TargetHttpProxiesService struct {
-- s *Service
+-// List: Retrieves the list of operation resources contained within the
+-// specified region.
+-func (r *RegionOperationsService) List(project string, region string) *RegionOperationsListCall {
+- c := &RegionOperationsListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.region = region
+- return c
-}
-
--func NewTargetInstancesService(s *Service) *TargetInstancesService {
-- rs := &TargetInstancesService{s: s}
-- return rs
+-// Filter sets the optional parameter "filter": Filter expression for
+-// filtering listed resources.
+-func (c *RegionOperationsListCall) Filter(filter string) *RegionOperationsListCall {
+- c.opt_["filter"] = filter
+- return c
-}
-
--type TargetInstancesService struct {
-- s *Service
+-// MaxResults sets the optional parameter "maxResults": Maximum count of
+-// results to be returned. Maximum value is 500 and default value is
+-// 500.
+-func (c *RegionOperationsListCall) MaxResults(maxResults int64) *RegionOperationsListCall {
+- c.opt_["maxResults"] = maxResults
+- return c
-}
-
--func NewTargetPoolsService(s *Service) *TargetPoolsService {
-- rs := &TargetPoolsService{s: s}
-- return rs
+-// PageToken sets the optional parameter "pageToken": Tag returned by a
+-// previous list request truncated by maxResults. Used to continue a
+-// previous list request.
+-func (c *RegionOperationsListCall) PageToken(pageToken string) *RegionOperationsListCall {
+- c.opt_["pageToken"] = pageToken
+- return c
-}
-
--type TargetPoolsService struct {
-- s *Service
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *RegionOperationsListCall) Fields(s ...googleapi.Field) *RegionOperationsListCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
-}
-
--func NewUrlMapsService(s *Service) *UrlMapsService {
-- rs := &UrlMapsService{s: s}
-- return rs
--}
+-func (c *RegionOperationsListCall) Do() (*OperationList, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["filter"]; ok {
+- params.Set("filter", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["maxResults"]; ok {
+- params.Set("maxResults", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["pageToken"]; ok {
+- params.Set("pageToken", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/operations")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "region": c.region,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *OperationList
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Retrieves the list of operation resources contained within the specified region.",
+- // "httpMethod": "GET",
+- // "id": "compute.regionOperations.list",
+- // "parameterOrder": [
+- // "project",
+- // "region"
+- // ],
+- // "parameters": {
+- // "filter": {
+- // "description": "Optional. Filter expression for filtering listed resources.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "maxResults": {
+- // "default": "500",
+- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
+- // "format": "uint32",
+- // "location": "query",
+- // "maximum": "500",
+- // "minimum": "0",
+- // "type": "integer"
+- // },
+- // "pageToken": {
+- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "region": {
+- // "description": "Name of the region scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/regions/{region}/operations",
+- // "response": {
+- // "$ref": "OperationList"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
-
--type UrlMapsService struct {
-- s *Service
-}
-
--func NewZoneOperationsService(s *Service) *ZoneOperationsService {
-- rs := &ZoneOperationsService{s: s}
-- return rs
--}
+-// method id "compute.regions.get":
-
--type ZoneOperationsService struct {
-- s *Service
+-type RegionsGetCall struct {
+- s *Service
+- project string
+- region string
+- opt_ map[string]interface{}
-}
-
--func NewZonesService(s *Service) *ZonesService {
-- rs := &ZonesService{s: s}
-- return rs
+-// Get: Returns the specified region resource.
+-func (r *RegionsService) Get(project string, region string) *RegionsGetCall {
+- c := &RegionsGetCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.region = region
+- return c
-}
-
--type ZonesService struct {
-- s *Service
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *RegionsGetCall) Fields(s ...googleapi.Field) *RegionsGetCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
-}
-
--type AccessConfig struct {
-- // Kind: Type of the resource.
-- Kind string `json:"kind,omitempty"`
--
-- // Name: Name of this access configuration.
-- Name string `json:"name,omitempty"`
--
-- // NatIP: An external IP address associated with this instance. Specify
-- // an unused static IP address available to the project. If not
-- // specified, the external IP will be drawn from a shared ephemeral
-- // pool.
-- NatIP string `json:"natIP,omitempty"`
+-func (c *RegionsGetCall) Do() (*Region, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "region": c.region,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Region
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Returns the specified region resource.",
+- // "httpMethod": "GET",
+- // "id": "compute.regions.get",
+- // "parameterOrder": [
+- // "project",
+- // "region"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "region": {
+- // "description": "Name of the region resource to return.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/regions/{region}",
+- // "response": {
+- // "$ref": "Region"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
-
-- // Type: Type of configuration. Must be set to "ONE_TO_ONE_NAT". This
-- // configures port-for-port NAT to the internet.
-- Type string `json:"type,omitempty"`
-}
-
--type Address struct {
-- // Address: The IP address represented by this resource.
-- Address string `json:"address,omitempty"`
--
-- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
-- // only).
-- CreationTimestamp string `json:"creationTimestamp,omitempty"`
--
-- // Description: An optional textual description of the resource;
-- // provided by the client when the resource is created.
-- Description string `json:"description,omitempty"`
--
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id uint64 `json:"id,omitempty,string"`
--
-- // Kind: Type of the resource.
-- Kind string `json:"kind,omitempty"`
--
-- // Name: Name of the resource; provided by the client when the resource
-- // is created. The name must be 1-63 characters long, and comply with
-- // RFC1035.
-- Name string `json:"name,omitempty"`
--
-- // Region: URL of the region where the regional address resides (output
-- // only). This field is not applicable to global addresses.
-- Region string `json:"region,omitempty"`
--
-- // SelfLink: Server defined URL for the resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
--
-- // Status: The status of the address (output only).
-- Status string `json:"status,omitempty"`
+-// method id "compute.regions.list":
-
-- // Users: The resources that are using this address resource.
-- Users []string `json:"users,omitempty"`
+-type RegionsListCall struct {
+- s *Service
+- project string
+- opt_ map[string]interface{}
-}
-
--type AddressAggregatedList struct {
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id string `json:"id,omitempty"`
--
-- // Items: A map of scoped address lists.
-- Items map[string]AddressesScopedList `json:"items,omitempty"`
--
-- // Kind: Type of resource.
-- Kind string `json:"kind,omitempty"`
--
-- // NextPageToken: A token used to continue a truncated list request
-- // (output only).
-- NextPageToken string `json:"nextPageToken,omitempty"`
--
-- // SelfLink: Server defined URL for this resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-// List: Retrieves the list of region resources available to the
+-// specified project.
+-func (r *RegionsService) List(project string) *RegionsListCall {
+- c := &RegionsListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- return c
-}
-
--type AddressList struct {
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id string `json:"id,omitempty"`
--
-- // Items: The address resources.
-- Items []*Address `json:"items,omitempty"`
--
-- // Kind: Type of resource.
-- Kind string `json:"kind,omitempty"`
--
-- // NextPageToken: A token used to continue a truncated list request
-- // (output only).
-- NextPageToken string `json:"nextPageToken,omitempty"`
--
-- // SelfLink: Server defined URL for the resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-// Filter sets the optional parameter "filter": Filter expression for
+-// filtering listed resources.
+-func (c *RegionsListCall) Filter(filter string) *RegionsListCall {
+- c.opt_["filter"] = filter
+- return c
-}
-
--type AddressesScopedList struct {
-- // Addresses: List of addresses contained in this scope.
-- Addresses []*Address `json:"addresses,omitempty"`
--
-- // Warning: Informational warning which replaces the list of addresses
-- // when the list is empty.
-- Warning *AddressesScopedListWarning `json:"warning,omitempty"`
+-// MaxResults sets the optional parameter "maxResults": Maximum count of
+-// results to be returned. Maximum value is 500 and default value is
+-// 500.
+-func (c *RegionsListCall) MaxResults(maxResults int64) *RegionsListCall {
+- c.opt_["maxResults"] = maxResults
+- return c
-}
-
--type AddressesScopedListWarning struct {
-- // Code: The warning type identifier for this warning.
-- Code string `json:"code,omitempty"`
--
-- // Data: Metadata for this warning in 'key: value' format.
-- Data []*AddressesScopedListWarningData `json:"data,omitempty"`
--
-- // Message: Optional human-readable details for this warning.
-- Message string `json:"message,omitempty"`
+-// PageToken sets the optional parameter "pageToken": Tag returned by a
+-// previous list request truncated by maxResults. Used to continue a
+-// previous list request.
+-func (c *RegionsListCall) PageToken(pageToken string) *RegionsListCall {
+- c.opt_["pageToken"] = pageToken
+- return c
-}
-
--type AddressesScopedListWarningData struct {
-- // Key: A key for the warning data.
-- Key string `json:"key,omitempty"`
--
-- // Value: A warning data value corresponding to the key.
-- Value string `json:"value,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *RegionsListCall) Fields(s ...googleapi.Field) *RegionsListCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
-}
-
--type AttachedDisk struct {
-- // AutoDelete: Whether the disk will be auto-deleted when the instance
-- // is deleted (but not when the disk is detached from the instance).
-- AutoDelete bool `json:"autoDelete,omitempty"`
--
-- // Boot: Indicates that this is a boot disk. VM will use the first
-- // partition of the disk for its root filesystem.
-- Boot bool `json:"boot,omitempty"`
--
-- // DeviceName: Persistent disk only; must be unique within the instance
-- // when specified. This represents a unique device name that is
-- // reflected into the /dev/ tree of a Linux operating system running
-- // within the instance. If not specified, a default will be chosen by
-- // the system.
-- DeviceName string `json:"deviceName,omitempty"`
--
-- // Index: A zero-based index to assign to this disk, where 0 is reserved
-- // for the boot disk. If not specified, the server will choose an
-- // appropriate value (output only).
-- Index int64 `json:"index,omitempty"`
--
-- // InitializeParams: Initialization parameters.
-- InitializeParams *AttachedDiskInitializeParams `json:"initializeParams,omitempty"`
--
-- Interface string `json:"interface,omitempty"`
--
-- // Kind: Type of the resource.
-- Kind string `json:"kind,omitempty"`
--
-- // Licenses: Public visible licenses.
-- Licenses []string `json:"licenses,omitempty"`
--
-- // Mode: The mode in which to attach this disk, either "READ_WRITE" or
-- // "READ_ONLY".
-- Mode string `json:"mode,omitempty"`
--
-- // Source: Persistent disk only; the URL of the persistent disk
-- // resource.
-- Source string `json:"source,omitempty"`
+-func (c *RegionsListCall) Do() (*RegionList, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["filter"]; ok {
+- params.Set("filter", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["maxResults"]; ok {
+- params.Set("maxResults", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["pageToken"]; ok {
+- params.Set("pageToken", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *RegionList
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Retrieves the list of region resources available to the specified project.",
+- // "httpMethod": "GET",
+- // "id": "compute.regions.list",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "filter": {
+- // "description": "Optional. Filter expression for filtering listed resources.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "maxResults": {
+- // "default": "500",
+- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
+- // "format": "uint32",
+- // "location": "query",
+- // "maximum": "500",
+- // "minimum": "0",
+- // "type": "integer"
+- // },
+- // "pageToken": {
+- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/regions",
+- // "response": {
+- // "$ref": "RegionList"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
-
-- // Type: Type of the disk, either "SCRATCH" or "PERSISTENT". Note that
-- // persistent disks must be created before you can specify them here.
-- Type string `json:"type,omitempty"`
-}
-
--type AttachedDiskInitializeParams struct {
-- // DiskName: Name of the disk (when not provided defaults to the name of
-- // the instance).
-- DiskName string `json:"diskName,omitempty"`
--
-- // DiskSizeGb: Size of the disk in base-2 GB.
-- DiskSizeGb int64 `json:"diskSizeGb,omitempty,string"`
--
-- // DiskType: URL of the disk type resource describing which disk type to
-- // use to create the disk; provided by the client when the disk is
-- // created.
-- DiskType string `json:"diskType,omitempty"`
+-// method id "compute.routes.delete":
-
-- // SourceImage: The source image used to create this disk.
-- SourceImage string `json:"sourceImage,omitempty"`
+-type RoutesDeleteCall struct {
+- s *Service
+- project string
+- route string
+- opt_ map[string]interface{}
-}
-
--type Backend struct {
-- // BalancingMode: The balancing mode of this backend, default is
-- // UTILIZATION.
-- BalancingMode string `json:"balancingMode,omitempty"`
--
-- // CapacityScaler: The multiplier (a value between 0 and 1e6) of the max
-- // capacity (CPU or RPS, depending on 'balancingMode') the group should
-- // serve up to. 0 means the group is totally drained. Default value is
-- // 1. Valid range is [0, 1e6].
-- CapacityScaler float64 `json:"capacityScaler,omitempty"`
--
-- // Description: An optional textual description of the resource, which
-- // is provided by the client when the resource is created.
-- Description string `json:"description,omitempty"`
--
-- // Group: URL of a zonal Cloud Resource View resource. This resource
-- // view defines the list of instances that serve traffic. Member virtual
-- // machine instances from each resource view must live in the same zone
-- // as the resource view itself. No two backends in a backend service are
-- // allowed to use same Resource View resource.
-- Group string `json:"group,omitempty"`
--
-- // MaxRate: The max RPS of the group. Can be used with either balancing
-- // mode, but required if RATE mode. For RATE mode, either maxRate or
-- // maxRatePerInstance must be set.
-- MaxRate int64 `json:"maxRate,omitempty"`
--
-- // MaxRatePerInstance: The max RPS that a single backed instance can
-- // handle. This is used to calculate the capacity of the group. Can be
-- // used in either balancing mode. For RATE mode, either maxRate or
-- // maxRatePerInstance must be set.
-- MaxRatePerInstance float64 `json:"maxRatePerInstance,omitempty"`
--
-- // MaxUtilization: Used when 'balancingMode' is UTILIZATION. This ratio
-- // defines the CPU utilization target for the group. The default is 0.8.
-- // Valid range is [0, 1].
-- MaxUtilization float64 `json:"maxUtilization,omitempty"`
+-// Delete: Deletes the specified route resource.
+-func (r *RoutesService) Delete(project string, route string) *RoutesDeleteCall {
+- c := &RoutesDeleteCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.route = route
+- return c
-}
-
--type BackendService struct {
-- // Backends: The list of backends that serve this BackendService.
-- Backends []*Backend `json:"backends,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *RoutesDeleteCall) Fields(s ...googleapi.Field) *RoutesDeleteCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
-
-- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
-- // only).
-- CreationTimestamp string `json:"creationTimestamp,omitempty"`
+-func (c *RoutesDeleteCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/routes/{route}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("DELETE", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "route": c.route,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Deletes the specified route resource.",
+- // "httpMethod": "DELETE",
+- // "id": "compute.routes.delete",
+- // "parameterOrder": [
+- // "project",
+- // "route"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "route": {
+- // "description": "Name of the route resource to delete.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/routes/{route}",
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
-
-- // Description: An optional textual description of the resource;
-- // provided by the client when the resource is created.
-- Description string `json:"description,omitempty"`
+-}
-
-- // Fingerprint: Fingerprint of this resource. A hash of the contents
-- // stored in this object. This field is used in optimistic locking. This
-- // field will be ignored when inserting a BackendService. An up-to-date
-- // fingerprint must be provided in order to update the BackendService.
-- Fingerprint string `json:"fingerprint,omitempty"`
+-// method id "compute.routes.get":
-
-- // HealthChecks: The list of URLs to the HttpHealthCheck resource for
-- // health checking this BackendService. Currently at most one health
-- // check can be specified, and a health check is required.
-- HealthChecks []string `json:"healthChecks,omitempty"`
+-type RoutesGetCall struct {
+- s *Service
+- project string
+- route string
+- opt_ map[string]interface{}
+-}
-
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id uint64 `json:"id,omitempty,string"`
+-// Get: Returns the specified route resource.
+-func (r *RoutesService) Get(project string, route string) *RoutesGetCall {
+- c := &RoutesGetCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.route = route
+- return c
+-}
-
-- // Kind: Type of the resource.
-- Kind string `json:"kind,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *RoutesGetCall) Fields(s ...googleapi.Field) *RoutesGetCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
-
-- // Name: Name of the resource; provided by the client when the resource
-- // is created. The name must be 1-63 characters long, and comply with
-- // RFC1035.
-- Name string `json:"name,omitempty"`
+-func (c *RoutesGetCall) Do() (*Route, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/routes/{route}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "route": c.route,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Route
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Returns the specified route resource.",
+- // "httpMethod": "GET",
+- // "id": "compute.routes.get",
+- // "parameterOrder": [
+- // "project",
+- // "route"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "route": {
+- // "description": "Name of the route resource to return.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/routes/{route}",
+- // "response": {
+- // "$ref": "Route"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
-
-- // Port: Deprecated in favor of port_name. The TCP port to connect on
-- // the backend. The default value is 80.
-- Port int64 `json:"port,omitempty"`
+-}
-
-- // PortName: Name of backend port. The same name should appear in the
-- // resource views referenced by this service. Required.
-- PortName string `json:"portName,omitempty"`
+-// method id "compute.routes.insert":
-
-- Protocol string `json:"protocol,omitempty"`
+-type RoutesInsertCall struct {
+- s *Service
+- project string
+- route *Route
+- opt_ map[string]interface{}
+-}
-
-- // SelfLink: Server defined URL for the resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-// Insert: Creates a route resource in the specified project using the
+-// data included in the request.
+-func (r *RoutesService) Insert(project string, route *Route) *RoutesInsertCall {
+- c := &RoutesInsertCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.route = route
+- return c
+-}
-
-- // TimeoutSec: How many seconds to wait for the backend before
-- // considering it a failed request. Default is 30 seconds.
-- TimeoutSec int64 `json:"timeoutSec,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *RoutesInsertCall) Fields(s ...googleapi.Field) *RoutesInsertCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
-}
-
--type BackendServiceGroupHealth struct {
-- HealthStatus []*HealthStatus `json:"healthStatus,omitempty"`
+-func (c *RoutesInsertCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.route)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/routes")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Creates a route resource in the specified project using the data included in the request.",
+- // "httpMethod": "POST",
+- // "id": "compute.routes.insert",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/routes",
+- // "request": {
+- // "$ref": "Route"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
-
-- // Kind: Type of resource.
-- Kind string `json:"kind,omitempty"`
-}
-
--type BackendServiceList struct {
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id string `json:"id,omitempty"`
--
-- // Items: The BackendService resources.
-- Items []*BackendService `json:"items,omitempty"`
+-// method id "compute.routes.list":
-
-- // Kind: Type of resource.
-- Kind string `json:"kind,omitempty"`
+-type RoutesListCall struct {
+- s *Service
+- project string
+- opt_ map[string]interface{}
+-}
-
-- // NextPageToken: A token used to continue a truncated list request
-- // (output only).
-- NextPageToken string `json:"nextPageToken,omitempty"`
+-// List: Retrieves the list of route resources available to the
+-// specified project.
+-func (r *RoutesService) List(project string) *RoutesListCall {
+- c := &RoutesListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- return c
+-}
-
-- // SelfLink: Server defined URL for this resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-// Filter sets the optional parameter "filter": Filter expression for
+-// filtering listed resources.
+-func (c *RoutesListCall) Filter(filter string) *RoutesListCall {
+- c.opt_["filter"] = filter
+- return c
-}
-
--type DeprecationStatus struct {
-- // Deleted: An optional RFC3339 timestamp on or after which the
-- // deprecation state of this resource will be changed to DELETED.
-- Deleted string `json:"deleted,omitempty"`
+-// MaxResults sets the optional parameter "maxResults": Maximum count of
+-// results to be returned. Maximum value is 500 and default value is
+-// 500.
+-func (c *RoutesListCall) MaxResults(maxResults int64) *RoutesListCall {
+- c.opt_["maxResults"] = maxResults
+- return c
+-}
-
-- // Deprecated: An optional RFC3339 timestamp on or after which the
-- // deprecation state of this resource will be changed to DEPRECATED.
-- Deprecated string `json:"deprecated,omitempty"`
+-// PageToken sets the optional parameter "pageToken": Tag returned by a
+-// previous list request truncated by maxResults. Used to continue a
+-// previous list request.
+-func (c *RoutesListCall) PageToken(pageToken string) *RoutesListCall {
+- c.opt_["pageToken"] = pageToken
+- return c
+-}
-
-- // Obsolete: An optional RFC3339 timestamp on or after which the
-- // deprecation state of this resource will be changed to OBSOLETE.
-- Obsolete string `json:"obsolete,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *RoutesListCall) Fields(s ...googleapi.Field) *RoutesListCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
-
-- // Replacement: A URL of the suggested replacement for the deprecated
-- // resource. The deprecated resource and its replacement must be
-- // resources of the same kind.
-- Replacement string `json:"replacement,omitempty"`
+-func (c *RoutesListCall) Do() (*RouteList, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["filter"]; ok {
+- params.Set("filter", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["maxResults"]; ok {
+- params.Set("maxResults", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["pageToken"]; ok {
+- params.Set("pageToken", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/routes")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *RouteList
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Retrieves the list of route resources available to the specified project.",
+- // "httpMethod": "GET",
+- // "id": "compute.routes.list",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "filter": {
+- // "description": "Optional. Filter expression for filtering listed resources.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "maxResults": {
+- // "default": "500",
+- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
+- // "format": "uint32",
+- // "location": "query",
+- // "maximum": "500",
+- // "minimum": "0",
+- // "type": "integer"
+- // },
+- // "pageToken": {
+- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/routes",
+- // "response": {
+- // "$ref": "RouteList"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
-
-- // State: The deprecation state. Can be "DEPRECATED", "OBSOLETE", or
-- // "DELETED". Operations which create a new resource using a
-- // "DEPRECATED" resource will return successfully, but with a warning
-- // indicating the deprecated resource and recommending its replacement.
-- // New uses of "OBSOLETE" or "DELETED" resources will result in an
-- // error.
-- State string `json:"state,omitempty"`
-}
-
--type Disk struct {
-- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
-- // only).
-- CreationTimestamp string `json:"creationTimestamp,omitempty"`
--
-- // Description: An optional textual description of the resource;
-- // provided by the client when the resource is created.
-- Description string `json:"description,omitempty"`
--
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id uint64 `json:"id,omitempty,string"`
--
-- // Kind: Type of the resource.
-- Kind string `json:"kind,omitempty"`
--
-- // Licenses: Public visible licenses.
-- Licenses []string `json:"licenses,omitempty"`
--
-- // Name: Name of the resource; provided by the client when the resource
-- // is created. The name must be 1-63 characters long, and comply with
-- // RFC1035.
-- Name string `json:"name,omitempty"`
--
-- // Options: Internal use only.
-- Options string `json:"options,omitempty"`
--
-- // SelfLink: Server defined URL for the resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
--
-- // SizeGb: Size of the persistent disk, specified in GB. This parameter
-- // is optional when creating a disk from a disk image or a snapshot,
-- // otherwise it is required.
-- SizeGb int64 `json:"sizeGb,omitempty,string"`
--
-- // SourceImage: The source image used to create this disk.
-- SourceImage string `json:"sourceImage,omitempty"`
--
-- // SourceImageId: The 'id' value of the image used to create this disk.
-- // This value may be used to determine whether the disk was created from
-- // the current or a previous instance of a given image.
-- SourceImageId string `json:"sourceImageId,omitempty"`
--
-- // SourceSnapshot: The source snapshot used to create this disk.
-- SourceSnapshot string `json:"sourceSnapshot,omitempty"`
--
-- // SourceSnapshotId: The 'id' value of the snapshot used to create this
-- // disk. This value may be used to determine whether the disk was
-- // created from the current or a previous instance of a given disk
-- // snapshot.
-- SourceSnapshotId string `json:"sourceSnapshotId,omitempty"`
--
-- // Status: The status of disk creation (output only).
-- Status string `json:"status,omitempty"`
--
-- // Type: URL of the disk type resource describing which disk type to use
-- // to create the disk; provided by the client when the disk is created.
-- Type string `json:"type,omitempty"`
+-// method id "compute.snapshots.delete":
-
-- // Zone: URL of the zone where the disk resides (output only).
-- Zone string `json:"zone,omitempty"`
+-type SnapshotsDeleteCall struct {
+- s *Service
+- project string
+- snapshot string
+- opt_ map[string]interface{}
-}
-
--type DiskAggregatedList struct {
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id string `json:"id,omitempty"`
--
-- // Items: A map of scoped disk lists.
-- Items map[string]DisksScopedList `json:"items,omitempty"`
--
-- // Kind: Type of resource.
-- Kind string `json:"kind,omitempty"`
--
-- // NextPageToken: A token used to continue a truncated list request
-- // (output only).
-- NextPageToken string `json:"nextPageToken,omitempty"`
--
-- // SelfLink: Server defined URL for this resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-// Delete: Deletes the specified persistent disk snapshot resource.
+-func (r *SnapshotsService) Delete(project string, snapshot string) *SnapshotsDeleteCall {
+- c := &SnapshotsDeleteCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.snapshot = snapshot
+- return c
-}
-
--type DiskList struct {
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id string `json:"id,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *SnapshotsDeleteCall) Fields(s ...googleapi.Field) *SnapshotsDeleteCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
-
-- // Items: The persistent disk resources.
-- Items []*Disk `json:"items,omitempty"`
+-func (c *SnapshotsDeleteCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/snapshots/{snapshot}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("DELETE", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "snapshot": c.snapshot,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Deletes the specified persistent disk snapshot resource.",
+- // "httpMethod": "DELETE",
+- // "id": "compute.snapshots.delete",
+- // "parameterOrder": [
+- // "project",
+- // "snapshot"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "snapshot": {
+- // "description": "Name of the persistent disk snapshot resource to delete.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/snapshots/{snapshot}",
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
-
-- // Kind: Type of resource.
-- Kind string `json:"kind,omitempty"`
+-}
-
-- // NextPageToken: A token used to continue a truncated list request
-- // (output only).
-- NextPageToken string `json:"nextPageToken,omitempty"`
+-// method id "compute.snapshots.get":
-
-- // SelfLink: Server defined URL for this resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-type SnapshotsGetCall struct {
+- s *Service
+- project string
+- snapshot string
+- opt_ map[string]interface{}
-}
-
--type DiskType struct {
-- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
-- // only).
-- CreationTimestamp string `json:"creationTimestamp,omitempty"`
+-// Get: Returns the specified persistent disk snapshot resource.
+-func (r *SnapshotsService) Get(project string, snapshot string) *SnapshotsGetCall {
+- c := &SnapshotsGetCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.snapshot = snapshot
+- return c
+-}
-
-- // DefaultDiskSizeGb: Server defined default disk size in gb (output
-- // only).
-- DefaultDiskSizeGb int64 `json:"defaultDiskSizeGb,omitempty,string"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *SnapshotsGetCall) Fields(s ...googleapi.Field) *SnapshotsGetCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
-
-- // Deprecated: The deprecation status associated with this disk type.
-- Deprecated *DeprecationStatus `json:"deprecated,omitempty"`
+-func (c *SnapshotsGetCall) Do() (*Snapshot, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/snapshots/{snapshot}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "snapshot": c.snapshot,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Snapshot
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Returns the specified persistent disk snapshot resource.",
+- // "httpMethod": "GET",
+- // "id": "compute.snapshots.get",
+- // "parameterOrder": [
+- // "project",
+- // "snapshot"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "snapshot": {
+- // "description": "Name of the persistent disk snapshot resource to return.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/snapshots/{snapshot}",
+- // "response": {
+- // "$ref": "Snapshot"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
-
-- // Description: An optional textual description of the resource.
-- Description string `json:"description,omitempty"`
+-}
-
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id uint64 `json:"id,omitempty,string"`
+-// method id "compute.snapshots.list":
-
-- // Kind: Type of the resource.
-- Kind string `json:"kind,omitempty"`
+-type SnapshotsListCall struct {
+- s *Service
+- project string
+- opt_ map[string]interface{}
+-}
-
-- // Name: Name of the resource.
-- Name string `json:"name,omitempty"`
+-// List: Retrieves the list of persistent disk snapshot resources
+-// contained within the specified project.
+-func (r *SnapshotsService) List(project string) *SnapshotsListCall {
+- c := &SnapshotsListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- return c
+-}
-
-- // SelfLink: Server defined URL for the resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-// Filter sets the optional parameter "filter": Filter expression for
+-// filtering listed resources.
+-func (c *SnapshotsListCall) Filter(filter string) *SnapshotsListCall {
+- c.opt_["filter"] = filter
+- return c
+-}
-
-- // ValidDiskSize: An optional textual descroption of the valid disk
-- // size, e.g., "10GB-10TB".
-- ValidDiskSize string `json:"validDiskSize,omitempty"`
+-// MaxResults sets the optional parameter "maxResults": Maximum count of
+-// results to be returned. Maximum value is 500 and default value is
+-// 500.
+-func (c *SnapshotsListCall) MaxResults(maxResults int64) *SnapshotsListCall {
+- c.opt_["maxResults"] = maxResults
+- return c
+-}
-
-- // Zone: Url of the zone where the disk type resides (output only).
-- Zone string `json:"zone,omitempty"`
+-// PageToken sets the optional parameter "pageToken": Tag returned by a
+-// previous list request truncated by maxResults. Used to continue a
+-// previous list request.
+-func (c *SnapshotsListCall) PageToken(pageToken string) *SnapshotsListCall {
+- c.opt_["pageToken"] = pageToken
+- return c
-}
-
--type DiskTypeAggregatedList struct {
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id string `json:"id,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *SnapshotsListCall) Fields(s ...googleapi.Field) *SnapshotsListCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
-
-- // Items: A map of scoped disk type lists.
-- Items map[string]DiskTypesScopedList `json:"items,omitempty"`
+-func (c *SnapshotsListCall) Do() (*SnapshotList, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["filter"]; ok {
+- params.Set("filter", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["maxResults"]; ok {
+- params.Set("maxResults", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["pageToken"]; ok {
+- params.Set("pageToken", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/snapshots")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *SnapshotList
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Retrieves the list of persistent disk snapshot resources contained within the specified project.",
+- // "httpMethod": "GET",
+- // "id": "compute.snapshots.list",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "filter": {
+- // "description": "Optional. Filter expression for filtering listed resources.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "maxResults": {
+- // "default": "500",
+- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
+- // "format": "uint32",
+- // "location": "query",
+- // "maximum": "500",
+- // "minimum": "0",
+- // "type": "integer"
+- // },
+- // "pageToken": {
+- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/snapshots",
+- // "response": {
+- // "$ref": "SnapshotList"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
-
-- // Kind: Type of resource.
-- Kind string `json:"kind,omitempty"`
+-}
-
-- // NextPageToken: A token used to continue a truncated list request
-- // (output only).
-- NextPageToken string `json:"nextPageToken,omitempty"`
+-// method id "compute.targetHttpProxies.delete":
-
-- // SelfLink: Server defined URL for this resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-type TargetHttpProxiesDeleteCall struct {
+- s *Service
+- project string
+- targetHttpProxy string
+- opt_ map[string]interface{}
-}
-
--type DiskTypeList struct {
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id string `json:"id,omitempty"`
--
-- // Items: The disk type resources.
-- Items []*DiskType `json:"items,omitempty"`
+-// Delete: Deletes the specified TargetHttpProxy resource.
+-func (r *TargetHttpProxiesService) Delete(project string, targetHttpProxy string) *TargetHttpProxiesDeleteCall {
+- c := &TargetHttpProxiesDeleteCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.targetHttpProxy = targetHttpProxy
+- return c
+-}
-
-- // Kind: Type of resource.
-- Kind string `json:"kind,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *TargetHttpProxiesDeleteCall) Fields(s ...googleapi.Field) *TargetHttpProxiesDeleteCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
-
-- // NextPageToken: A token used to continue a truncated list request
-- // (output only).
-- NextPageToken string `json:"nextPageToken,omitempty"`
+-func (c *TargetHttpProxiesDeleteCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/targetHttpProxies/{targetHttpProxy}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("DELETE", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "targetHttpProxy": c.targetHttpProxy,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Deletes the specified TargetHttpProxy resource.",
+- // "httpMethod": "DELETE",
+- // "id": "compute.targetHttpProxies.delete",
+- // "parameterOrder": [
+- // "project",
+- // "targetHttpProxy"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "targetHttpProxy": {
+- // "description": "Name of the TargetHttpProxy resource to delete.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/targetHttpProxies/{targetHttpProxy}",
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
-
-- // SelfLink: Server defined URL for this resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
-}
-
--type DiskTypesScopedList struct {
-- // DiskTypes: List of disk types contained in this scope.
-- DiskTypes []*DiskType `json:"diskTypes,omitempty"`
+-// method id "compute.targetHttpProxies.get":
-
-- // Warning: Informational warning which replaces the list of disk types
-- // when the list is empty.
-- Warning *DiskTypesScopedListWarning `json:"warning,omitempty"`
+-type TargetHttpProxiesGetCall struct {
+- s *Service
+- project string
+- targetHttpProxy string
+- opt_ map[string]interface{}
-}
-
--type DiskTypesScopedListWarning struct {
-- // Code: The warning type identifier for this warning.
-- Code string `json:"code,omitempty"`
--
-- // Data: Metadata for this warning in 'key: value' format.
-- Data []*DiskTypesScopedListWarningData `json:"data,omitempty"`
--
-- // Message: Optional human-readable details for this warning.
-- Message string `json:"message,omitempty"`
+-// Get: Returns the specified TargetHttpProxy resource.
+-func (r *TargetHttpProxiesService) Get(project string, targetHttpProxy string) *TargetHttpProxiesGetCall {
+- c := &TargetHttpProxiesGetCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.targetHttpProxy = targetHttpProxy
+- return c
-}
-
--type DiskTypesScopedListWarningData struct {
-- // Key: A key for the warning data.
-- Key string `json:"key,omitempty"`
--
-- // Value: A warning data value corresponding to the key.
-- Value string `json:"value,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *TargetHttpProxiesGetCall) Fields(s ...googleapi.Field) *TargetHttpProxiesGetCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
-}
-
--type DisksScopedList struct {
-- // Disks: List of disks contained in this scope.
-- Disks []*Disk `json:"disks,omitempty"`
+-func (c *TargetHttpProxiesGetCall) Do() (*TargetHttpProxy, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/targetHttpProxies/{targetHttpProxy}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "targetHttpProxy": c.targetHttpProxy,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *TargetHttpProxy
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Returns the specified TargetHttpProxy resource.",
+- // "httpMethod": "GET",
+- // "id": "compute.targetHttpProxies.get",
+- // "parameterOrder": [
+- // "project",
+- // "targetHttpProxy"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "targetHttpProxy": {
+- // "description": "Name of the TargetHttpProxy resource to return.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/targetHttpProxies/{targetHttpProxy}",
+- // "response": {
+- // "$ref": "TargetHttpProxy"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
-
-- // Warning: Informational warning which replaces the list of disks when
-- // the list is empty.
-- Warning *DisksScopedListWarning `json:"warning,omitempty"`
-}
-
--type DisksScopedListWarning struct {
-- // Code: The warning type identifier for this warning.
-- Code string `json:"code,omitempty"`
--
-- // Data: Metadata for this warning in 'key: value' format.
-- Data []*DisksScopedListWarningData `json:"data,omitempty"`
+-// method id "compute.targetHttpProxies.insert":
-
-- // Message: Optional human-readable details for this warning.
-- Message string `json:"message,omitempty"`
+-type TargetHttpProxiesInsertCall struct {
+- s *Service
+- project string
+- targethttpproxy *TargetHttpProxy
+- opt_ map[string]interface{}
-}
-
--type DisksScopedListWarningData struct {
-- // Key: A key for the warning data.
-- Key string `json:"key,omitempty"`
--
-- // Value: A warning data value corresponding to the key.
-- Value string `json:"value,omitempty"`
+-// Insert: Creates a TargetHttpProxy resource in the specified project
+-// using the data included in the request.
+-func (r *TargetHttpProxiesService) Insert(project string, targethttpproxy *TargetHttpProxy) *TargetHttpProxiesInsertCall {
+- c := &TargetHttpProxiesInsertCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.targethttpproxy = targethttpproxy
+- return c
-}
-
--type Firewall struct {
-- // Allowed: The list of rules specified by this firewall. Each rule
-- // specifies a protocol and port-range tuple that describes a permitted
-- // connection.
-- Allowed []*FirewallAllowed `json:"allowed,omitempty"`
--
-- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
-- // only).
-- CreationTimestamp string `json:"creationTimestamp,omitempty"`
--
-- // Description: An optional textual description of the resource;
-- // provided by the client when the resource is created.
-- Description string `json:"description,omitempty"`
--
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id uint64 `json:"id,omitempty,string"`
--
-- // Kind: Type of the resource.
-- Kind string `json:"kind,omitempty"`
--
-- // Name: Name of the resource; provided by the client when the resource
-- // is created. The name must be 1-63 characters long, and comply with
-- // RFC1035.
-- Name string `json:"name,omitempty"`
--
-- // Network: URL of the network to which this firewall is applied;
-- // provided by the client when the firewall is created.
-- Network string `json:"network,omitempty"`
--
-- // SelfLink: Server defined URL for the resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
--
-- // SourceRanges: A list of IP address blocks expressed in CIDR format
-- // which this rule applies to. One or both of sourceRanges and
-- // sourceTags may be set; an inbound connection is allowed if either the
-- // range or the tag of the source matches.
-- SourceRanges []string `json:"sourceRanges,omitempty"`
--
-- // SourceTags: A list of instance tags which this rule applies to. One
-- // or both of sourceRanges and sourceTags may be set; an inbound
-- // connection is allowed if either the range or the tag of the source
-- // matches.
-- SourceTags []string `json:"sourceTags,omitempty"`
--
-- // TargetTags: A list of instance tags indicating sets of instances
-- // located on network which may make network connections as specified in
-- // allowed. If no targetTags are specified, the firewall rule applies to
-- // all instances on the specified network.
-- TargetTags []string `json:"targetTags,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *TargetHttpProxiesInsertCall) Fields(s ...googleapi.Field) *TargetHttpProxiesInsertCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
-}
-
--type FirewallAllowed struct {
-- // IPProtocol: Required; this is the IP protocol that is allowed for
-- // this rule. This can either be one of the following well known
-- // protocol strings ["tcp", "udp", "icmp", "esp", "ah", "sctp"], or the
-- // IP protocol number.
-- IPProtocol string `json:"IPProtocol,omitempty"`
+-func (c *TargetHttpProxiesInsertCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.targethttpproxy)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/targetHttpProxies")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Creates a TargetHttpProxy resource in the specified project using the data included in the request.",
+- // "httpMethod": "POST",
+- // "id": "compute.targetHttpProxies.insert",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/targetHttpProxies",
+- // "request": {
+- // "$ref": "TargetHttpProxy"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
-
-- // Ports: An optional list of ports which are allowed. It is an error to
-- // specify this for any protocol that isn't UDP or TCP. Each entry must
-- // be either an integer or a range. If not specified, connections
-- // through any port are allowed.
-- //
-- // Example inputs include: ["22"],
-- // ["80","443"] and ["12345-12349"].
-- Ports []string `json:"ports,omitempty"`
-}
-
--type FirewallList struct {
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id string `json:"id,omitempty"`
--
-- // Items: The firewall resources.
-- Items []*Firewall `json:"items,omitempty"`
+-// method id "compute.targetHttpProxies.list":
-
-- // Kind: Type of resource.
-- Kind string `json:"kind,omitempty"`
+-type TargetHttpProxiesListCall struct {
+- s *Service
+- project string
+- opt_ map[string]interface{}
+-}
-
-- // NextPageToken: A token used to continue a truncated list request
-- // (output only).
-- NextPageToken string `json:"nextPageToken,omitempty"`
+-// List: Retrieves the list of TargetHttpProxy resources available to
+-// the specified project.
+-func (r *TargetHttpProxiesService) List(project string) *TargetHttpProxiesListCall {
+- c := &TargetHttpProxiesListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- return c
+-}
-
-- // SelfLink: Server defined URL for this resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-// Filter sets the optional parameter "filter": Filter expression for
+-// filtering listed resources.
+-func (c *TargetHttpProxiesListCall) Filter(filter string) *TargetHttpProxiesListCall {
+- c.opt_["filter"] = filter
+- return c
-}
-
--type ForwardingRule struct {
-- // IPAddress: Value of the reserved IP address that this forwarding rule
-- // is serving on behalf of. For global forwarding rules, the address
-- // must be a global IP; for regional forwarding rules, the address must
-- // live in the same region as the forwarding rule. If left empty
-- // (default value), an ephemeral IP from the same scope (global or
-- // regional) will be assigned.
-- IPAddress string `json:"IPAddress,omitempty"`
+-// MaxResults sets the optional parameter "maxResults": Maximum count of
+-// results to be returned. Maximum value is 500 and default value is
+-// 500.
+-func (c *TargetHttpProxiesListCall) MaxResults(maxResults int64) *TargetHttpProxiesListCall {
+- c.opt_["maxResults"] = maxResults
+- return c
+-}
-
-- // IPProtocol: The IP protocol to which this rule applies, valid options
-- // are 'TCP', 'UDP', 'ESP', 'AH' or 'SCTP'.
-- IPProtocol string `json:"IPProtocol,omitempty"`
+-// PageToken sets the optional parameter "pageToken": Tag returned by a
+-// previous list request truncated by maxResults. Used to continue a
+-// previous list request.
+-func (c *TargetHttpProxiesListCall) PageToken(pageToken string) *TargetHttpProxiesListCall {
+- c.opt_["pageToken"] = pageToken
+- return c
+-}
-
-- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
-- // only).
-- CreationTimestamp string `json:"creationTimestamp,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *TargetHttpProxiesListCall) Fields(s ...googleapi.Field) *TargetHttpProxiesListCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
-
-- // Description: An optional textual description of the resource;
-- // provided by the client when the resource is created.
-- Description string `json:"description,omitempty"`
+-func (c *TargetHttpProxiesListCall) Do() (*TargetHttpProxyList, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["filter"]; ok {
+- params.Set("filter", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["maxResults"]; ok {
+- params.Set("maxResults", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["pageToken"]; ok {
+- params.Set("pageToken", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/targetHttpProxies")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *TargetHttpProxyList
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Retrieves the list of TargetHttpProxy resources available to the specified project.",
+- // "httpMethod": "GET",
+- // "id": "compute.targetHttpProxies.list",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "filter": {
+- // "description": "Optional. Filter expression for filtering listed resources.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "maxResults": {
+- // "default": "500",
+- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
+- // "format": "uint32",
+- // "location": "query",
+- // "maximum": "500",
+- // "minimum": "0",
+- // "type": "integer"
+- // },
+- // "pageToken": {
+- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/targetHttpProxies",
+- // "response": {
+- // "$ref": "TargetHttpProxyList"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
-
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id uint64 `json:"id,omitempty,string"`
+-}
-
-- // Kind: Type of the resource.
-- Kind string `json:"kind,omitempty"`
+-// method id "compute.targetHttpProxies.setUrlMap":
-
-- // Name: Name of the resource; provided by the client when the resource
-- // is created. The name must be 1-63 characters long, and comply with
-- // RFC1035.
-- Name string `json:"name,omitempty"`
+-type TargetHttpProxiesSetUrlMapCall struct {
+- s *Service
+- project string
+- targetHttpProxy string
+- urlmapreference *UrlMapReference
+- opt_ map[string]interface{}
+-}
-
-- // PortRange: Applicable only when 'IPProtocol' is 'TCP', 'UDP' or
-- // 'SCTP', only packets addressed to ports in the specified range will
-- // be forwarded to 'target'. If 'portRange' is left empty (default
-- // value), all ports are forwarded. Forwarding rules with the same
-- // [IPAddress, IPProtocol] pair must have disjoint port ranges.
-- PortRange string `json:"portRange,omitempty"`
+-// SetUrlMap: Changes the URL map for TargetHttpProxy.
+-func (r *TargetHttpProxiesService) SetUrlMap(project string, targetHttpProxy string, urlmapreference *UrlMapReference) *TargetHttpProxiesSetUrlMapCall {
+- c := &TargetHttpProxiesSetUrlMapCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.targetHttpProxy = targetHttpProxy
+- c.urlmapreference = urlmapreference
+- return c
+-}
-
-- // Region: URL of the region where the regional forwarding rule resides
-- // (output only). This field is not applicable to global forwarding
-- // rules.
-- Region string `json:"region,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *TargetHttpProxiesSetUrlMapCall) Fields(s ...googleapi.Field) *TargetHttpProxiesSetUrlMapCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
-
-- // SelfLink: Server defined URL for the resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-func (c *TargetHttpProxiesSetUrlMapCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.urlmapreference)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/targetHttpProxies/{targetHttpProxy}/setUrlMap")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "targetHttpProxy": c.targetHttpProxy,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Changes the URL map for TargetHttpProxy.",
+- // "httpMethod": "POST",
+- // "id": "compute.targetHttpProxies.setUrlMap",
+- // "parameterOrder": [
+- // "project",
+- // "targetHttpProxy"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "targetHttpProxy": {
+- // "description": "Name of the TargetHttpProxy resource whose URL map is to be set.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/targetHttpProxies/{targetHttpProxy}/setUrlMap",
+- // "request": {
+- // "$ref": "UrlMapReference"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
-
-- // Target: The URL of the target resource to receive the matched
-- // traffic. For regional forwarding rules, this target must live in the
-- // same region as the forwarding rule. For global forwarding rules, this
-- // target must be a global TargetHttpProxy resource.
-- Target string `json:"target,omitempty"`
-}
-
--type ForwardingRuleAggregatedList struct {
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id string `json:"id,omitempty"`
--
-- // Items: A map of scoped forwarding rule lists.
-- Items map[string]ForwardingRulesScopedList `json:"items,omitempty"`
--
-- // Kind: Type of resource.
-- Kind string `json:"kind,omitempty"`
--
-- // NextPageToken: A token used to continue a truncated list request
-- // (output only).
-- NextPageToken string `json:"nextPageToken,omitempty"`
+-// method id "compute.targetInstances.aggregatedList":
-
-- // SelfLink: Server defined URL for this resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-type TargetInstancesAggregatedListCall struct {
+- s *Service
+- project string
+- opt_ map[string]interface{}
-}
-
--type ForwardingRuleList struct {
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id string `json:"id,omitempty"`
--
-- // Items: The ForwardingRule resources.
-- Items []*ForwardingRule `json:"items,omitempty"`
--
-- // Kind: Type of resource.
-- Kind string `json:"kind,omitempty"`
--
-- // NextPageToken: A token used to continue a truncated list request
-- // (output only).
-- NextPageToken string `json:"nextPageToken,omitempty"`
--
-- // SelfLink: Server defined URL for this resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-// AggregatedList: Retrieves the list of target instances grouped by
+-// scope.
+-func (r *TargetInstancesService) AggregatedList(project string) *TargetInstancesAggregatedListCall {
+- c := &TargetInstancesAggregatedListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- return c
-}
-
--type ForwardingRulesScopedList struct {
-- // ForwardingRules: List of forwarding rules contained in this scope.
-- ForwardingRules []*ForwardingRule `json:"forwardingRules,omitempty"`
--
-- // Warning: Informational warning which replaces the list of forwarding
-- // rules when the list is empty.
-- Warning *ForwardingRulesScopedListWarning `json:"warning,omitempty"`
+-// Filter sets the optional parameter "filter": Filter expression for
+-// filtering listed resources.
+-func (c *TargetInstancesAggregatedListCall) Filter(filter string) *TargetInstancesAggregatedListCall {
+- c.opt_["filter"] = filter
+- return c
-}
-
--type ForwardingRulesScopedListWarning struct {
-- // Code: The warning type identifier for this warning.
-- Code string `json:"code,omitempty"`
--
-- // Data: Metadata for this warning in 'key: value' format.
-- Data []*ForwardingRulesScopedListWarningData `json:"data,omitempty"`
--
-- // Message: Optional human-readable details for this warning.
-- Message string `json:"message,omitempty"`
+-// MaxResults sets the optional parameter "maxResults": Maximum count of
+-// results to be returned. Maximum value is 500 and default value is
+-// 500.
+-func (c *TargetInstancesAggregatedListCall) MaxResults(maxResults int64) *TargetInstancesAggregatedListCall {
+- c.opt_["maxResults"] = maxResults
+- return c
-}
-
--type ForwardingRulesScopedListWarningData struct {
-- // Key: A key for the warning data.
-- Key string `json:"key,omitempty"`
--
-- // Value: A warning data value corresponding to the key.
-- Value string `json:"value,omitempty"`
+-// PageToken sets the optional parameter "pageToken": Tag returned by a
+-// previous list request truncated by maxResults. Used to continue a
+-// previous list request.
+-func (c *TargetInstancesAggregatedListCall) PageToken(pageToken string) *TargetInstancesAggregatedListCall {
+- c.opt_["pageToken"] = pageToken
+- return c
-}
-
--type HealthCheckReference struct {
-- HealthCheck string `json:"healthCheck,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *TargetInstancesAggregatedListCall) Fields(s ...googleapi.Field) *TargetInstancesAggregatedListCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
-}
-
--type HealthStatus struct {
-- // HealthState: Health state of the instance.
-- HealthState string `json:"healthState,omitempty"`
--
-- // Instance: URL of the instance resource.
-- Instance string `json:"instance,omitempty"`
--
-- // IpAddress: The IP address represented by this resource.
-- IpAddress string `json:"ipAddress,omitempty"`
+-func (c *TargetInstancesAggregatedListCall) Do() (*TargetInstanceAggregatedList, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["filter"]; ok {
+- params.Set("filter", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["maxResults"]; ok {
+- params.Set("maxResults", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["pageToken"]; ok {
+- params.Set("pageToken", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/aggregated/targetInstances")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *TargetInstanceAggregatedList
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Retrieves the list of target instances grouped by scope.",
+- // "httpMethod": "GET",
+- // "id": "compute.targetInstances.aggregatedList",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "filter": {
+- // "description": "Optional. Filter expression for filtering listed resources.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "maxResults": {
+- // "default": "500",
+- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
+- // "format": "uint32",
+- // "location": "query",
+- // "maximum": "500",
+- // "minimum": "0",
+- // "type": "integer"
+- // },
+- // "pageToken": {
+- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/aggregated/targetInstances",
+- // "response": {
+- // "$ref": "TargetInstanceAggregatedList"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
-
-- // Port: The port on the instance.
-- Port int64 `json:"port,omitempty"`
-}
-
--type HostRule struct {
-- Description string `json:"description,omitempty"`
--
-- // Hosts: The list of host patterns to match. They must be valid
-- // hostnames except that they may start with *. or *-. The * acts like a
-- // glob and will match any string of atoms (separated by .s and -s) to
-- // the left.
-- Hosts []string `json:"hosts,omitempty"`
+-// method id "compute.targetInstances.delete":
-
-- // PathMatcher: The name of the PathMatcher to match the path portion of
-- // the URL, if the this HostRule matches the URL's host portion.
-- PathMatcher string `json:"pathMatcher,omitempty"`
+-type TargetInstancesDeleteCall struct {
+- s *Service
+- project string
+- zone string
+- targetInstance string
+- opt_ map[string]interface{}
-}
-
--type HttpHealthCheck struct {
-- // CheckIntervalSec: How often (in seconds) to send a health check. The
-- // default value is 5 seconds.
-- CheckIntervalSec int64 `json:"checkIntervalSec,omitempty"`
--
-- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
-- // only).
-- CreationTimestamp string `json:"creationTimestamp,omitempty"`
--
-- // Description: An optional textual description of the resource;
-- // provided by the client when the resource is created.
-- Description string `json:"description,omitempty"`
--
-- // HealthyThreshold: A so-far unhealthy VM will be marked healthy after
-- // this many consecutive successes. The default value is 2.
-- HealthyThreshold int64 `json:"healthyThreshold,omitempty"`
--
-- // Host: The value of the host header in the HTTP health check request.
-- // If left empty (default value), the public IP on behalf of which this
-- // health check is performed will be used.
-- Host string `json:"host,omitempty"`
--
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id uint64 `json:"id,omitempty,string"`
--
-- // Kind: Type of the resource.
-- Kind string `json:"kind,omitempty"`
--
-- // Name: Name of the resource; provided by the client when the resource
-- // is created. The name must be 1-63 characters long, and comply with
-- // RFC1035.
-- Name string `json:"name,omitempty"`
--
-- // Port: The TCP port number for the HTTP health check request. The
-- // default value is 80.
-- Port int64 `json:"port,omitempty"`
--
-- // RequestPath: The request path of the HTTP health check request. The
-- // default value is "/".
-- RequestPath string `json:"requestPath,omitempty"`
--
-- // SelfLink: Server defined URL for the resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
--
-- // TimeoutSec: How long (in seconds) to wait before claiming failure.
-- // The default value is 5 seconds.
-- TimeoutSec int64 `json:"timeoutSec,omitempty"`
--
-- // UnhealthyThreshold: A so-far healthy VM will be marked unhealthy
-- // after this many consecutive failures. The default value is 2.
-- UnhealthyThreshold int64 `json:"unhealthyThreshold,omitempty"`
+-// Delete: Deletes the specified TargetInstance resource.
+-func (r *TargetInstancesService) Delete(project string, zone string, targetInstance string) *TargetInstancesDeleteCall {
+- c := &TargetInstancesDeleteCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.zone = zone
+- c.targetInstance = targetInstance
+- return c
-}
-
--type HttpHealthCheckList struct {
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id string `json:"id,omitempty"`
--
-- // Items: The HttpHealthCheck resources.
-- Items []*HttpHealthCheck `json:"items,omitempty"`
--
-- // Kind: Type of resource.
-- Kind string `json:"kind,omitempty"`
--
-- // NextPageToken: A token used to continue a truncated list request
-- // (output only).
-- NextPageToken string `json:"nextPageToken,omitempty"`
--
-- // SelfLink: Server defined URL for this resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *TargetInstancesDeleteCall) Fields(s ...googleapi.Field) *TargetInstancesDeleteCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
-}
-
--type Image struct {
-- // ArchiveSizeBytes: Size of the image tar.gz archive stored in Google
-- // Cloud Storage (in bytes).
-- ArchiveSizeBytes int64 `json:"archiveSizeBytes,omitempty,string"`
--
-- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
-- // only).
-- CreationTimestamp string `json:"creationTimestamp,omitempty"`
--
-- // Deprecated: The deprecation status associated with this image.
-- Deprecated *DeprecationStatus `json:"deprecated,omitempty"`
--
-- // Description: Textual description of the resource; provided by the
-- // client when the resource is created.
-- Description string `json:"description,omitempty"`
--
-- // DiskSizeGb: Size of the image when restored onto a disk (in GiB).
-- DiskSizeGb int64 `json:"diskSizeGb,omitempty,string"`
--
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id uint64 `json:"id,omitempty,string"`
--
-- // Kind: Type of the resource.
-- Kind string `json:"kind,omitempty"`
--
-- // Licenses: Public visible licenses.
-- Licenses []string `json:"licenses,omitempty"`
+-func (c *TargetInstancesDeleteCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/targetInstances/{targetInstance}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("DELETE", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "zone": c.zone,
+- "targetInstance": c.targetInstance,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Deletes the specified TargetInstance resource.",
+- // "httpMethod": "DELETE",
+- // "id": "compute.targetInstances.delete",
+- // "parameterOrder": [
+- // "project",
+- // "zone",
+- // "targetInstance"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "targetInstance": {
+- // "description": "Name of the TargetInstance resource to delete.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "zone": {
+- // "description": "Name of the zone scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/zones/{zone}/targetInstances/{targetInstance}",
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
-
-- // Name: Name of the resource; provided by the client when the resource
-- // is created. The name must be 1-63 characters long, and comply with
-- // RFC1035.
-- Name string `json:"name,omitempty"`
+-}
-
-- // RawDisk: The raw disk image parameters.
-- RawDisk *ImageRawDisk `json:"rawDisk,omitempty"`
+-// method id "compute.targetInstances.get":
-
-- // SelfLink: Server defined URL for the resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-type TargetInstancesGetCall struct {
+- s *Service
+- project string
+- zone string
+- targetInstance string
+- opt_ map[string]interface{}
+-}
-
-- // SourceDisk: The source disk used to create this image.
-- SourceDisk string `json:"sourceDisk,omitempty"`
+-// Get: Returns the specified TargetInstance resource.
+-func (r *TargetInstancesService) Get(project string, zone string, targetInstance string) *TargetInstancesGetCall {
+- c := &TargetInstancesGetCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.zone = zone
+- c.targetInstance = targetInstance
+- return c
+-}
-
-- // SourceDiskId: The 'id' value of the disk used to create this image.
-- // This value may be used to determine whether the image was taken from
-- // the current or a previous instance of a given disk name.
-- SourceDiskId string `json:"sourceDiskId,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *TargetInstancesGetCall) Fields(s ...googleapi.Field) *TargetInstancesGetCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
-
-- // SourceType: Must be "RAW"; provided by the client when the disk image
-- // is created.
-- SourceType string `json:"sourceType,omitempty"`
+-func (c *TargetInstancesGetCall) Do() (*TargetInstance, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/targetInstances/{targetInstance}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "zone": c.zone,
+- "targetInstance": c.targetInstance,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *TargetInstance
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Returns the specified TargetInstance resource.",
+- // "httpMethod": "GET",
+- // "id": "compute.targetInstances.get",
+- // "parameterOrder": [
+- // "project",
+- // "zone",
+- // "targetInstance"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "targetInstance": {
+- // "description": "Name of the TargetInstance resource to return.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "zone": {
+- // "description": "Name of the zone scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/zones/{zone}/targetInstances/{targetInstance}",
+- // "response": {
+- // "$ref": "TargetInstance"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
-
-- // Status: Status of the image (output only). It will be one of the
-- // following READY - after image has been successfully created and is
-- // ready for use FAILED - if creating the image fails for some reason
-- // PENDING - the image creation is in progress An image can be used to
-- // create other resources suck as instances only after the image has
-- // been successfully created and the status is set to READY.
-- Status string `json:"status,omitempty"`
-}
-
--type ImageRawDisk struct {
-- // ContainerType: The format used to encode and transmit the block
-- // device. Should be TAR. This is just a container and transmission
-- // format and not a runtime format. Provided by the client when the disk
-- // image is created.
-- ContainerType string `json:"containerType,omitempty"`
+-// method id "compute.targetInstances.insert":
-
-- // Sha1Checksum: An optional SHA1 checksum of the disk image before
-- // unpackaging; provided by the client when the disk image is created.
-- Sha1Checksum string `json:"sha1Checksum,omitempty"`
+-type TargetInstancesInsertCall struct {
+- s *Service
+- project string
+- zone string
+- targetinstance *TargetInstance
+- opt_ map[string]interface{}
+-}
-
-- // Source: The full Google Cloud Storage URL where the disk image is
-- // stored; provided by the client when the disk image is created.
-- Source string `json:"source,omitempty"`
+-// Insert: Creates a TargetInstance resource in the specified project
+-// and zone using the data included in the request.
+-func (r *TargetInstancesService) Insert(project string, zone string, targetinstance *TargetInstance) *TargetInstancesInsertCall {
+- c := &TargetInstancesInsertCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.zone = zone
+- c.targetinstance = targetinstance
+- return c
-}
-
--type ImageList struct {
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id string `json:"id,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *TargetInstancesInsertCall) Fields(s ...googleapi.Field) *TargetInstancesInsertCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
-
-- // Items: The disk image resources.
-- Items []*Image `json:"items,omitempty"`
+-func (c *TargetInstancesInsertCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.targetinstance)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/targetInstances")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "zone": c.zone,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Creates a TargetInstance resource in the specified project and zone using the data included in the request.",
+- // "httpMethod": "POST",
+- // "id": "compute.targetInstances.insert",
+- // "parameterOrder": [
+- // "project",
+- // "zone"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "zone": {
+- // "description": "Name of the zone scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/zones/{zone}/targetInstances",
+- // "request": {
+- // "$ref": "TargetInstance"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
-
-- // Kind: Type of resource.
-- Kind string `json:"kind,omitempty"`
+-}
-
-- // NextPageToken: A token used to continue a truncated list request
-- // (output only).
-- NextPageToken string `json:"nextPageToken,omitempty"`
+-// method id "compute.targetInstances.list":
-
-- // SelfLink: Server defined URL for this resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-type TargetInstancesListCall struct {
+- s *Service
+- project string
+- zone string
+- opt_ map[string]interface{}
-}
-
--type Instance struct {
-- // CanIpForward: Allows this instance to send packets with source IP
-- // addresses other than its own and receive packets with destination IP
-- // addresses other than its own. If this instance will be used as an IP
-- // gateway or it will be set as the next-hop in a Route resource, say
-- // true. If unsure, leave this set to false.
-- CanIpForward bool `json:"canIpForward,omitempty"`
+-// List: Retrieves the list of TargetInstance resources available to the
+-// specified project and zone.
+-func (r *TargetInstancesService) List(project string, zone string) *TargetInstancesListCall {
+- c := &TargetInstancesListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.zone = zone
+- return c
+-}
-
-- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
-- // only).
-- CreationTimestamp string `json:"creationTimestamp,omitempty"`
+-// Filter sets the optional parameter "filter": Filter expression for
+-// filtering listed resources.
+-func (c *TargetInstancesListCall) Filter(filter string) *TargetInstancesListCall {
+- c.opt_["filter"] = filter
+- return c
+-}
-
-- // Description: An optional textual description of the resource;
-- // provided by the client when the resource is created.
-- Description string `json:"description,omitempty"`
+-// MaxResults sets the optional parameter "maxResults": Maximum count of
+-// results to be returned. Maximum value is 500 and default value is
+-// 500.
+-func (c *TargetInstancesListCall) MaxResults(maxResults int64) *TargetInstancesListCall {
+- c.opt_["maxResults"] = maxResults
+- return c
+-}
-
-- // Disks: Array of disks associated with this instance. Persistent disks
-- // must be created before you can assign them.
-- Disks []*AttachedDisk `json:"disks,omitempty"`
+-// PageToken sets the optional parameter "pageToken": Tag returned by a
+-// previous list request truncated by maxResults. Used to continue a
+-// previous list request.
+-func (c *TargetInstancesListCall) PageToken(pageToken string) *TargetInstancesListCall {
+- c.opt_["pageToken"] = pageToken
+- return c
+-}
-
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id uint64 `json:"id,omitempty,string"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *TargetInstancesListCall) Fields(s ...googleapi.Field) *TargetInstancesListCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
-
-- // Kind: Type of the resource.
-- Kind string `json:"kind,omitempty"`
+-func (c *TargetInstancesListCall) Do() (*TargetInstanceList, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["filter"]; ok {
+- params.Set("filter", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["maxResults"]; ok {
+- params.Set("maxResults", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["pageToken"]; ok {
+- params.Set("pageToken", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/targetInstances")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "zone": c.zone,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *TargetInstanceList
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Retrieves the list of TargetInstance resources available to the specified project and zone.",
+- // "httpMethod": "GET",
+- // "id": "compute.targetInstances.list",
+- // "parameterOrder": [
+- // "project",
+- // "zone"
+- // ],
+- // "parameters": {
+- // "filter": {
+- // "description": "Optional. Filter expression for filtering listed resources.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "maxResults": {
+- // "default": "500",
+- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
+- // "format": "uint32",
+- // "location": "query",
+- // "maximum": "500",
+- // "minimum": "0",
+- // "type": "integer"
+- // },
+- // "pageToken": {
+- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "zone": {
+- // "description": "Name of the zone scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/zones/{zone}/targetInstances",
+- // "response": {
+- // "$ref": "TargetInstanceList"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
-
-- // MachineType: URL of the machine type resource describing which
-- // machine type to use to host the instance; provided by the client when
-- // the instance is created.
-- MachineType string `json:"machineType,omitempty"`
+-}
-
-- // Metadata: Metadata key/value pairs assigned to this instance.
-- // Consists of custom metadata or predefined keys; see Instance
-- // documentation for more information.
-- Metadata *Metadata `json:"metadata,omitempty"`
+-// method id "compute.targetPools.addHealthCheck":
-
-- // Name: Name of the resource; provided by the client when the resource
-- // is created. The name must be 1-63 characters long, and comply with
-- // RFC1035.
-- Name string `json:"name,omitempty"`
+-type TargetPoolsAddHealthCheckCall struct {
+- s *Service
+- project string
+- region string
+- targetPool string
+- targetpoolsaddhealthcheckrequest *TargetPoolsAddHealthCheckRequest
+- opt_ map[string]interface{}
+-}
-
-- // NetworkInterfaces: Array of configurations for this interface. This
-- // specifies how this interface is configured to interact with other
-- // network services, such as connecting to the internet. Currently,
-- // ONE_TO_ONE_NAT is the only access config supported. If there are no
-- // accessConfigs specified, then this instance will have no external
-- // internet access.
-- NetworkInterfaces []*NetworkInterface `json:"networkInterfaces,omitempty"`
+-// AddHealthCheck: Adds health check URL to targetPool.
+-func (r *TargetPoolsService) AddHealthCheck(project string, region string, targetPool string, targetpoolsaddhealthcheckrequest *TargetPoolsAddHealthCheckRequest) *TargetPoolsAddHealthCheckCall {
+- c := &TargetPoolsAddHealthCheckCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.region = region
+- c.targetPool = targetPool
+- c.targetpoolsaddhealthcheckrequest = targetpoolsaddhealthcheckrequest
+- return c
+-}
-
-- // Scheduling: Scheduling options for this instance.
-- Scheduling *Scheduling `json:"scheduling,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *TargetPoolsAddHealthCheckCall) Fields(s ...googleapi.Field) *TargetPoolsAddHealthCheckCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
-
-- // SelfLink: Server defined URL for this resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-func (c *TargetPoolsAddHealthCheckCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.targetpoolsaddhealthcheckrequest)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/targetPools/{targetPool}/addHealthCheck")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "region": c.region,
+- "targetPool": c.targetPool,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Adds health check URL to targetPool.",
+- // "httpMethod": "POST",
+- // "id": "compute.targetPools.addHealthCheck",
+- // "parameterOrder": [
+- // "project",
+- // "region",
+- // "targetPool"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "region": {
+- // "description": "Name of the region scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "targetPool": {
+- // "description": "Name of the TargetPool resource to which health_check_url is to be added.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/regions/{region}/targetPools/{targetPool}/addHealthCheck",
+- // "request": {
+- // "$ref": "TargetPoolsAddHealthCheckRequest"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
-
-- // ServiceAccounts: A list of service accounts each with specified
-- // scopes, for which access tokens are to be made available to the
-- // instance through metadata queries.
-- ServiceAccounts []*ServiceAccount `json:"serviceAccounts,omitempty"`
+-}
-
-- // Status: Instance status. One of the following values: "PROVISIONING",
-- // "STAGING", "RUNNING", "STOPPING", "STOPPED", "TERMINATED" (output
-- // only).
-- Status string `json:"status,omitempty"`
+-// method id "compute.targetPools.addInstance":
-
-- // StatusMessage: An optional, human-readable explanation of the status
-- // (output only).
-- StatusMessage string `json:"statusMessage,omitempty"`
+-type TargetPoolsAddInstanceCall struct {
+- s *Service
+- project string
+- region string
+- targetPool string
+- targetpoolsaddinstancerequest *TargetPoolsAddInstanceRequest
+- opt_ map[string]interface{}
+-}
-
-- // Tags: A list of tags to be applied to this instance. Used to identify
-- // valid sources or targets for network firewalls. Provided by the
-- // client on instance creation. The tags can be later modified by the
-- // setTags method. Each tag within the list must comply with RFC1035.
-- Tags *Tags `json:"tags,omitempty"`
+-// AddInstance: Adds instance url to targetPool.
+-func (r *TargetPoolsService) AddInstance(project string, region string, targetPool string, targetpoolsaddinstancerequest *TargetPoolsAddInstanceRequest) *TargetPoolsAddInstanceCall {
+- c := &TargetPoolsAddInstanceCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.region = region
+- c.targetPool = targetPool
+- c.targetpoolsaddinstancerequest = targetpoolsaddinstancerequest
+- return c
+-}
+-
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *TargetPoolsAddInstanceCall) Fields(s ...googleapi.Field) *TargetPoolsAddInstanceCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *TargetPoolsAddInstanceCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.targetpoolsaddinstancerequest)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/targetPools/{targetPool}/addInstance")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "region": c.region,
+- "targetPool": c.targetPool,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Adds instance url to targetPool.",
+- // "httpMethod": "POST",
+- // "id": "compute.targetPools.addInstance",
+- // "parameterOrder": [
+- // "project",
+- // "region",
+- // "targetPool"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "region": {
+- // "description": "Name of the region scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "targetPool": {
+- // "description": "Name of the TargetPool resource to which instance_url is to be added.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/regions/{region}/targetPools/{targetPool}/addInstance",
+- // "request": {
+- // "$ref": "TargetPoolsAddInstanceRequest"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
-
-- // Zone: URL of the zone where the instance resides (output only).
-- Zone string `json:"zone,omitempty"`
-}
-
--type InstanceAggregatedList struct {
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id string `json:"id,omitempty"`
--
-- // Items: A map of scoped instance lists.
-- Items map[string]InstancesScopedList `json:"items,omitempty"`
+-// method id "compute.targetPools.aggregatedList":
-
-- // Kind: Type of resource.
-- Kind string `json:"kind,omitempty"`
+-type TargetPoolsAggregatedListCall struct {
+- s *Service
+- project string
+- opt_ map[string]interface{}
+-}
-
-- // NextPageToken: A token used to continue a truncated list request
-- // (output only).
-- NextPageToken string `json:"nextPageToken,omitempty"`
+-// AggregatedList: Retrieves the list of target pools grouped by scope.
+-func (r *TargetPoolsService) AggregatedList(project string) *TargetPoolsAggregatedListCall {
+- c := &TargetPoolsAggregatedListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- return c
+-}
-
-- // SelfLink: Server defined URL for this resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-// Filter sets the optional parameter "filter": Filter expression for
+-// filtering listed resources.
+-func (c *TargetPoolsAggregatedListCall) Filter(filter string) *TargetPoolsAggregatedListCall {
+- c.opt_["filter"] = filter
+- return c
-}
-
--type InstanceList struct {
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id string `json:"id,omitempty"`
+-// MaxResults sets the optional parameter "maxResults": Maximum count of
+-// results to be returned. Maximum value is 500 and default value is
+-// 500.
+-func (c *TargetPoolsAggregatedListCall) MaxResults(maxResults int64) *TargetPoolsAggregatedListCall {
+- c.opt_["maxResults"] = maxResults
+- return c
+-}
-
-- // Items: A list of instance resources.
-- Items []*Instance `json:"items,omitempty"`
+-// PageToken sets the optional parameter "pageToken": Tag returned by a
+-// previous list request truncated by maxResults. Used to continue a
+-// previous list request.
+-func (c *TargetPoolsAggregatedListCall) PageToken(pageToken string) *TargetPoolsAggregatedListCall {
+- c.opt_["pageToken"] = pageToken
+- return c
+-}
-
-- // Kind: Type of resource.
-- Kind string `json:"kind,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *TargetPoolsAggregatedListCall) Fields(s ...googleapi.Field) *TargetPoolsAggregatedListCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
-
-- // NextPageToken: A token used to continue a truncated list request
-- // (output only).
-- NextPageToken string `json:"nextPageToken,omitempty"`
+-func (c *TargetPoolsAggregatedListCall) Do() (*TargetPoolAggregatedList, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["filter"]; ok {
+- params.Set("filter", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["maxResults"]; ok {
+- params.Set("maxResults", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["pageToken"]; ok {
+- params.Set("pageToken", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/aggregated/targetPools")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *TargetPoolAggregatedList
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Retrieves the list of target pools grouped by scope.",
+- // "httpMethod": "GET",
+- // "id": "compute.targetPools.aggregatedList",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "filter": {
+- // "description": "Optional. Filter expression for filtering listed resources.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "maxResults": {
+- // "default": "500",
+- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
+- // "format": "uint32",
+- // "location": "query",
+- // "maximum": "500",
+- // "minimum": "0",
+- // "type": "integer"
+- // },
+- // "pageToken": {
+- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/aggregated/targetPools",
+- // "response": {
+- // "$ref": "TargetPoolAggregatedList"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
-
-- // SelfLink: Server defined URL for this resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
-}
-
--type InstanceProperties struct {
-- // CanIpForward: Allows instances created based on this template to send
-- // packets with source IP addresses other than their own and receive
-- // packets with destination IP addresses other than their own. If these
-- // instances will be used as an IP gateway or it will be set as the
-- // next-hop in a Route resource, say true. If unsure, leave this set to
-- // false.
-- CanIpForward bool `json:"canIpForward,omitempty"`
+-// method id "compute.targetPools.delete":
-
-- // Description: An optional textual description for the instances
-- // created based on the instance template resource; provided by the
-- // client when the template is created.
-- Description string `json:"description,omitempty"`
+-type TargetPoolsDeleteCall struct {
+- s *Service
+- project string
+- region string
+- targetPool string
+- opt_ map[string]interface{}
+-}
-
-- // Disks: Array of disks associated with instance created based on this
-- // template.
-- Disks []*AttachedDisk `json:"disks,omitempty"`
+-// Delete: Deletes the specified TargetPool resource.
+-func (r *TargetPoolsService) Delete(project string, region string, targetPool string) *TargetPoolsDeleteCall {
+- c := &TargetPoolsDeleteCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.region = region
+- c.targetPool = targetPool
+- return c
+-}
-
-- // MachineType: Name of the machine type resource describing which
-- // machine type to use to host the instances created based on this
-- // template; provided by the client when the instance template is
-- // created.
-- MachineType string `json:"machineType,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *TargetPoolsDeleteCall) Fields(s ...googleapi.Field) *TargetPoolsDeleteCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
-
-- // Metadata: Metadata key/value pairs assigned to instances created
-- // based on this template. Consists of custom metadata or predefined
-- // keys; see Instance documentation for more information.
-- Metadata *Metadata `json:"metadata,omitempty"`
+-func (c *TargetPoolsDeleteCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/targetPools/{targetPool}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("DELETE", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "region": c.region,
+- "targetPool": c.targetPool,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Deletes the specified TargetPool resource.",
+- // "httpMethod": "DELETE",
+- // "id": "compute.targetPools.delete",
+- // "parameterOrder": [
+- // "project",
+- // "region",
+- // "targetPool"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "region": {
+- // "description": "Name of the region scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "targetPool": {
+- // "description": "Name of the TargetPool resource to delete.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/regions/{region}/targetPools/{targetPool}",
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
-
-- // NetworkInterfaces: Array of configurations for this interface. This
-- // specifies how this interface is configured to interact with other
-- // network services, such as connecting to the internet. Currently,
-- // ONE_TO_ONE_NAT is the only access config supported. If there are no
-- // accessConfigs specified, then this instances created based based on
-- // this template will have no external internet access.
-- NetworkInterfaces []*NetworkInterface `json:"networkInterfaces,omitempty"`
+-}
-
-- // Scheduling: Scheduling options for the instances created based on
-- // this template.
-- Scheduling *Scheduling `json:"scheduling,omitempty"`
+-// method id "compute.targetPools.get":
-
-- // ServiceAccounts: A list of service accounts each with specified
-- // scopes, for which access tokens are to be made available to the
-- // instances created based on this template, through metadata queries.
-- ServiceAccounts []*ServiceAccount `json:"serviceAccounts,omitempty"`
+-type TargetPoolsGetCall struct {
+- s *Service
+- project string
+- region string
+- targetPool string
+- opt_ map[string]interface{}
+-}
-
-- // Tags: A list of tags to be applied to the instances created based on
-- // this template used to identify valid sources or targets for network
-- // firewalls. Provided by the client on instance creation. The tags can
-- // be later modified by the setTags method. Each tag within the list
-- // must comply with RFC1035.
-- Tags *Tags `json:"tags,omitempty"`
+-// Get: Returns the specified TargetPool resource.
+-func (r *TargetPoolsService) Get(project string, region string, targetPool string) *TargetPoolsGetCall {
+- c := &TargetPoolsGetCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.region = region
+- c.targetPool = targetPool
+- return c
-}
-
--type InstanceReference struct {
-- Instance string `json:"instance,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *TargetPoolsGetCall) Fields(s ...googleapi.Field) *TargetPoolsGetCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
-}
-
--type InstanceTemplate struct {
-- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
-- // only).
-- CreationTimestamp string `json:"creationTimestamp,omitempty"`
+-func (c *TargetPoolsGetCall) Do() (*TargetPool, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/targetPools/{targetPool}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "region": c.region,
+- "targetPool": c.targetPool,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *TargetPool
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Returns the specified TargetPool resource.",
+- // "httpMethod": "GET",
+- // "id": "compute.targetPools.get",
+- // "parameterOrder": [
+- // "project",
+- // "region",
+- // "targetPool"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "region": {
+- // "description": "Name of the region scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "targetPool": {
+- // "description": "Name of the TargetPool resource to return.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/regions/{region}/targetPools/{targetPool}",
+- // "response": {
+- // "$ref": "TargetPool"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
-
-- // Description: An optional textual description of the instance template
-- // resource; provided by the client when the resource is created.
-- Description string `json:"description,omitempty"`
+-}
-
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id uint64 `json:"id,omitempty,string"`
+-// method id "compute.targetPools.getHealth":
-
-- // Kind: Type of the resource.
-- Kind string `json:"kind,omitempty"`
+-type TargetPoolsGetHealthCall struct {
+- s *Service
+- project string
+- region string
+- targetPool string
+- instancereference *InstanceReference
+- opt_ map[string]interface{}
+-}
-
-- // Name: Name of the instance template resource; provided by the client
-- // when the resource is created. The name must be 1-63 characters long,
-- // and comply with RFC1035
-- Name string `json:"name,omitempty"`
+-// GetHealth: Gets the most recent health check results for each IP for
+-// the given instance that is referenced by given TargetPool.
+-func (r *TargetPoolsService) GetHealth(project string, region string, targetPool string, instancereference *InstanceReference) *TargetPoolsGetHealthCall {
+- c := &TargetPoolsGetHealthCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.region = region
+- c.targetPool = targetPool
+- c.instancereference = instancereference
+- return c
+-}
-
-- // Properties: The instance properties portion of this instance template
-- // resource.
-- Properties *InstanceProperties `json:"properties,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *TargetPoolsGetHealthCall) Fields(s ...googleapi.Field) *TargetPoolsGetHealthCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
+-
+-func (c *TargetPoolsGetHealthCall) Do() (*TargetPoolInstanceHealth, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.instancereference)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/targetPools/{targetPool}/getHealth")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "region": c.region,
+- "targetPool": c.targetPool,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *TargetPoolInstanceHealth
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Gets the most recent health check results for each IP for the given instance that is referenced by given TargetPool.",
+- // "httpMethod": "POST",
+- // "id": "compute.targetPools.getHealth",
+- // "parameterOrder": [
+- // "project",
+- // "region",
+- // "targetPool"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "region": {
+- // "description": "Name of the region scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "targetPool": {
+- // "description": "Name of the TargetPool resource to which the queried instance belongs.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/regions/{region}/targetPools/{targetPool}/getHealth",
+- // "request": {
+- // "$ref": "InstanceReference"
+- // },
+- // "response": {
+- // "$ref": "TargetPoolInstanceHealth"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
-
-- // SelfLink: Server defined URL for the resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
-}
-
--type InstanceTemplateList struct {
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id string `json:"id,omitempty"`
--
-- // Items: A list of instance template resources.
-- Items []*InstanceTemplate `json:"items,omitempty"`
--
-- // Kind: Type of resource.
-- Kind string `json:"kind,omitempty"`
--
-- // NextPageToken: A token used to continue a truncated list request
-- // (output only).
-- NextPageToken string `json:"nextPageToken,omitempty"`
+-// method id "compute.targetPools.insert":
-
-- // SelfLink: Server defined URL for this resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-type TargetPoolsInsertCall struct {
+- s *Service
+- project string
+- region string
+- targetpool *TargetPool
+- opt_ map[string]interface{}
-}
-
--type InstancesScopedList struct {
-- // Instances: List of instances contained in this scope.
-- Instances []*Instance `json:"instances,omitempty"`
--
-- // Warning: Informational warning which replaces the list of instances
-- // when the list is empty.
-- Warning *InstancesScopedListWarning `json:"warning,omitempty"`
+-// Insert: Creates a TargetPool resource in the specified project and
+-// region using the data included in the request.
+-func (r *TargetPoolsService) Insert(project string, region string, targetpool *TargetPool) *TargetPoolsInsertCall {
+- c := &TargetPoolsInsertCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.region = region
+- c.targetpool = targetpool
+- return c
-}
-
--type InstancesScopedListWarning struct {
-- // Code: The warning type identifier for this warning.
-- Code string `json:"code,omitempty"`
--
-- // Data: Metadata for this warning in 'key: value' format.
-- Data []*InstancesScopedListWarningData `json:"data,omitempty"`
--
-- // Message: Optional human-readable details for this warning.
-- Message string `json:"message,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *TargetPoolsInsertCall) Fields(s ...googleapi.Field) *TargetPoolsInsertCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
-}
-
--type InstancesScopedListWarningData struct {
-- // Key: A key for the warning data.
-- Key string `json:"key,omitempty"`
+-func (c *TargetPoolsInsertCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.targetpool)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/targetPools")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "region": c.region,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Creates a TargetPool resource in the specified project and region using the data included in the request.",
+- // "httpMethod": "POST",
+- // "id": "compute.targetPools.insert",
+- // "parameterOrder": [
+- // "project",
+- // "region"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "region": {
+- // "description": "Name of the region scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/regions/{region}/targetPools",
+- // "request": {
+- // "$ref": "TargetPool"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
-
-- // Value: A warning data value corresponding to the key.
-- Value string `json:"value,omitempty"`
-}
-
--type License struct {
-- // ChargesUseFee: If true, the customer will be charged license fee for
-- // running software that contains this license on an instance.
-- ChargesUseFee bool `json:"chargesUseFee,omitempty"`
--
-- // Kind: Type of resource.
-- Kind string `json:"kind,omitempty"`
+-// method id "compute.targetPools.list":
-
-- // Name: Name of the resource; provided by the client when the resource
-- // is created. The name must be 1-63 characters long, and comply with
-- // RFC1035.
-- Name string `json:"name,omitempty"`
+-type TargetPoolsListCall struct {
+- s *Service
+- project string
+- region string
+- opt_ map[string]interface{}
+-}
-
-- // SelfLink: Server defined URL for the resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-// List: Retrieves the list of TargetPool resources available to the
+-// specified project and region.
+-func (r *TargetPoolsService) List(project string, region string) *TargetPoolsListCall {
+- c := &TargetPoolsListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.region = region
+- return c
-}
-
--type MachineType struct {
-- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
-- // only).
-- CreationTimestamp string `json:"creationTimestamp,omitempty"`
+-// Filter sets the optional parameter "filter": Filter expression for
+-// filtering listed resources.
+-func (c *TargetPoolsListCall) Filter(filter string) *TargetPoolsListCall {
+- c.opt_["filter"] = filter
+- return c
+-}
-
-- // Deprecated: The deprecation status associated with this machine type.
-- Deprecated *DeprecationStatus `json:"deprecated,omitempty"`
+-// MaxResults sets the optional parameter "maxResults": Maximum count of
+-// results to be returned. Maximum value is 500 and default value is
+-// 500.
+-func (c *TargetPoolsListCall) MaxResults(maxResults int64) *TargetPoolsListCall {
+- c.opt_["maxResults"] = maxResults
+- return c
+-}
-
-- // Description: An optional textual description of the resource.
-- Description string `json:"description,omitempty"`
+-// PageToken sets the optional parameter "pageToken": Tag returned by a
+-// previous list request truncated by maxResults. Used to continue a
+-// previous list request.
+-func (c *TargetPoolsListCall) PageToken(pageToken string) *TargetPoolsListCall {
+- c.opt_["pageToken"] = pageToken
+- return c
+-}
-
-- // GuestCpus: Count of CPUs exposed to the instance.
-- GuestCpus int64 `json:"guestCpus,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *TargetPoolsListCall) Fields(s ...googleapi.Field) *TargetPoolsListCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
-
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id uint64 `json:"id,omitempty,string"`
+-func (c *TargetPoolsListCall) Do() (*TargetPoolList, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["filter"]; ok {
+- params.Set("filter", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["maxResults"]; ok {
+- params.Set("maxResults", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["pageToken"]; ok {
+- params.Set("pageToken", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/targetPools")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "region": c.region,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *TargetPoolList
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Retrieves the list of TargetPool resources available to the specified project and region.",
+- // "httpMethod": "GET",
+- // "id": "compute.targetPools.list",
+- // "parameterOrder": [
+- // "project",
+- // "region"
+- // ],
+- // "parameters": {
+- // "filter": {
+- // "description": "Optional. Filter expression for filtering listed resources.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "maxResults": {
+- // "default": "500",
+- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
+- // "format": "uint32",
+- // "location": "query",
+- // "maximum": "500",
+- // "minimum": "0",
+- // "type": "integer"
+- // },
+- // "pageToken": {
+- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "region": {
+- // "description": "Name of the region scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/regions/{region}/targetPools",
+- // "response": {
+- // "$ref": "TargetPoolList"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
-
-- // ImageSpaceGb: Space allotted for the image, defined in GB.
-- ImageSpaceGb int64 `json:"imageSpaceGb,omitempty"`
+-}
-
-- // Kind: Type of the resource.
-- Kind string `json:"kind,omitempty"`
+-// method id "compute.targetPools.removeHealthCheck":
-
-- // MaximumPersistentDisks: Maximum persistent disks allowed.
-- MaximumPersistentDisks int64 `json:"maximumPersistentDisks,omitempty"`
+-type TargetPoolsRemoveHealthCheckCall struct {
+- s *Service
+- project string
+- region string
+- targetPool string
+- targetpoolsremovehealthcheckrequest *TargetPoolsRemoveHealthCheckRequest
+- opt_ map[string]interface{}
+-}
-
-- // MaximumPersistentDisksSizeGb: Maximum total persistent disks size
-- // (GB) allowed.
-- MaximumPersistentDisksSizeGb int64 `json:"maximumPersistentDisksSizeGb,omitempty,string"`
+-// RemoveHealthCheck: Removes health check URL from targetPool.
+-func (r *TargetPoolsService) RemoveHealthCheck(project string, region string, targetPool string, targetpoolsremovehealthcheckrequest *TargetPoolsRemoveHealthCheckRequest) *TargetPoolsRemoveHealthCheckCall {
+- c := &TargetPoolsRemoveHealthCheckCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.region = region
+- c.targetPool = targetPool
+- c.targetpoolsremovehealthcheckrequest = targetpoolsremovehealthcheckrequest
+- return c
+-}
-
-- // MemoryMb: Physical memory assigned to the instance, defined in MB.
-- MemoryMb int64 `json:"memoryMb,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *TargetPoolsRemoveHealthCheckCall) Fields(s ...googleapi.Field) *TargetPoolsRemoveHealthCheckCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
-
-- // Name: Name of the resource.
-- Name string `json:"name,omitempty"`
+-func (c *TargetPoolsRemoveHealthCheckCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.targetpoolsremovehealthcheckrequest)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/targetPools/{targetPool}/removeHealthCheck")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "region": c.region,
+- "targetPool": c.targetPool,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Removes health check URL from targetPool.",
+- // "httpMethod": "POST",
+- // "id": "compute.targetPools.removeHealthCheck",
+- // "parameterOrder": [
+- // "project",
+- // "region",
+- // "targetPool"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "region": {
+- // "description": "Name of the region scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "targetPool": {
+- // "description": "Name of the TargetPool resource to which health_check_url is to be removed.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/regions/{region}/targetPools/{targetPool}/removeHealthCheck",
+- // "request": {
+- // "$ref": "TargetPoolsRemoveHealthCheckRequest"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
-
-- // ScratchDisks: List of extended scratch disks assigned to the
-- // instance.
-- ScratchDisks []*MachineTypeScratchDisks `json:"scratchDisks,omitempty"`
+-}
-
-- // SelfLink: Server defined URL for the resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-// method id "compute.targetPools.removeInstance":
-
-- // Zone: Url of the zone where the machine type resides (output only).
-- Zone string `json:"zone,omitempty"`
+-type TargetPoolsRemoveInstanceCall struct {
+- s *Service
+- project string
+- region string
+- targetPool string
+- targetpoolsremoveinstancerequest *TargetPoolsRemoveInstanceRequest
+- opt_ map[string]interface{}
-}
-
--type MachineTypeScratchDisks struct {
-- // DiskGb: Size of the scratch disk, defined in GB.
-- DiskGb int64 `json:"diskGb,omitempty"`
+-// RemoveInstance: Removes instance URL from targetPool.
+-func (r *TargetPoolsService) RemoveInstance(project string, region string, targetPool string, targetpoolsremoveinstancerequest *TargetPoolsRemoveInstanceRequest) *TargetPoolsRemoveInstanceCall {
+- c := &TargetPoolsRemoveInstanceCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.region = region
+- c.targetPool = targetPool
+- c.targetpoolsremoveinstancerequest = targetpoolsremoveinstancerequest
+- return c
-}
-
--type MachineTypeAggregatedList struct {
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id string `json:"id,omitempty"`
--
-- // Items: A map of scoped machine type lists.
-- Items map[string]MachineTypesScopedList `json:"items,omitempty"`
--
-- // Kind: Type of resource.
-- Kind string `json:"kind,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *TargetPoolsRemoveInstanceCall) Fields(s ...googleapi.Field) *TargetPoolsRemoveInstanceCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
-
-- // NextPageToken: A token used to continue a truncated list request
-- // (output only).
-- NextPageToken string `json:"nextPageToken,omitempty"`
+-func (c *TargetPoolsRemoveInstanceCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.targetpoolsremoveinstancerequest)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/targetPools/{targetPool}/removeInstance")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "region": c.region,
+- "targetPool": c.targetPool,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Removes instance URL from targetPool.",
+- // "httpMethod": "POST",
+- // "id": "compute.targetPools.removeInstance",
+- // "parameterOrder": [
+- // "project",
+- // "region",
+- // "targetPool"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "region": {
+- // "description": "Name of the region scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "targetPool": {
+- // "description": "Name of the TargetPool resource to which instance_url is to be removed.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/regions/{region}/targetPools/{targetPool}/removeInstance",
+- // "request": {
+- // "$ref": "TargetPoolsRemoveInstanceRequest"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
-
-- // SelfLink: Server defined URL for this resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
-}
-
--type MachineTypeList struct {
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id string `json:"id,omitempty"`
--
-- // Items: The machine type resources.
-- Items []*MachineType `json:"items,omitempty"`
--
-- // Kind: Type of resource.
-- Kind string `json:"kind,omitempty"`
--
-- // NextPageToken: A token used to continue a truncated list request
-- // (output only).
-- NextPageToken string `json:"nextPageToken,omitempty"`
+-// method id "compute.targetPools.setBackup":
-
-- // SelfLink: Server defined URL for this resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-type TargetPoolsSetBackupCall struct {
+- s *Service
+- project string
+- region string
+- targetPool string
+- targetreference *TargetReference
+- opt_ map[string]interface{}
-}
-
--type MachineTypesScopedList struct {
-- // MachineTypes: List of machine types contained in this scope.
-- MachineTypes []*MachineType `json:"machineTypes,omitempty"`
--
-- // Warning: Informational warning which replaces the list of machine
-- // types when the list is empty.
-- Warning *MachineTypesScopedListWarning `json:"warning,omitempty"`
+-// SetBackup: Changes backup pool configurations.
+-func (r *TargetPoolsService) SetBackup(project string, region string, targetPool string, targetreference *TargetReference) *TargetPoolsSetBackupCall {
+- c := &TargetPoolsSetBackupCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.region = region
+- c.targetPool = targetPool
+- c.targetreference = targetreference
+- return c
-}
-
--type MachineTypesScopedListWarning struct {
-- // Code: The warning type identifier for this warning.
-- Code string `json:"code,omitempty"`
--
-- // Data: Metadata for this warning in 'key: value' format.
-- Data []*MachineTypesScopedListWarningData `json:"data,omitempty"`
--
-- // Message: Optional human-readable details for this warning.
-- Message string `json:"message,omitempty"`
+-// FailoverRatio sets the optional parameter "failoverRatio": New
+-// failoverRatio value for the containing target pool.
+-func (c *TargetPoolsSetBackupCall) FailoverRatio(failoverRatio float64) *TargetPoolsSetBackupCall {
+- c.opt_["failoverRatio"] = failoverRatio
+- return c
-}
-
--type MachineTypesScopedListWarningData struct {
-- // Key: A key for the warning data.
-- Key string `json:"key,omitempty"`
--
-- // Value: A warning data value corresponding to the key.
-- Value string `json:"value,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *TargetPoolsSetBackupCall) Fields(s ...googleapi.Field) *TargetPoolsSetBackupCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
-}
-
--type Metadata struct {
-- // Fingerprint: Fingerprint of this resource. A hash of the metadata's
-- // contents. This field is used for optimistic locking. An up-to-date
-- // metadata fingerprint must be provided in order to modify metadata.
-- Fingerprint string `json:"fingerprint,omitempty"`
--
-- // Items: Array of key/value pairs. The total size of all keys and
-- // values must be less than 512 KB.
-- Items []*MetadataItems `json:"items,omitempty"`
+-func (c *TargetPoolsSetBackupCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.targetreference)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["failoverRatio"]; ok {
+- params.Set("failoverRatio", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/targetPools/{targetPool}/setBackup")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "region": c.region,
+- "targetPool": c.targetPool,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Changes backup pool configurations.",
+- // "httpMethod": "POST",
+- // "id": "compute.targetPools.setBackup",
+- // "parameterOrder": [
+- // "project",
+- // "region",
+- // "targetPool"
+- // ],
+- // "parameters": {
+- // "failoverRatio": {
+- // "description": "New failoverRatio value for the containing target pool.",
+- // "format": "float",
+- // "location": "query",
+- // "type": "number"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "region": {
+- // "description": "Name of the region scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "targetPool": {
+- // "description": "Name of the TargetPool resource for which the backup is to be set.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/regions/{region}/targetPools/{targetPool}/setBackup",
+- // "request": {
+- // "$ref": "TargetReference"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
-
-- // Kind: Type of the resource.
-- Kind string `json:"kind,omitempty"`
-}
-
--type MetadataItems struct {
-- // Key: Key for the metadata entry. Keys must conform to the following
-- // regexp: [a-zA-Z0-9-_]+, and be less than 128 bytes in length. This is
-- // reflected as part of a URL in the metadata server. Additionally, to
-- // avoid ambiguity, keys must not conflict with any other metadata keys
-- // for the project.
-- Key string `json:"key,omitempty"`
+-// method id "compute.urlMaps.delete":
-
-- // Value: Value for the metadata entry. These are free-form strings, and
-- // only have meaning as interpreted by the image running in the
-- // instance. The only restriction placed on values is that their size
-- // must be less than or equal to 32768 bytes.
-- Value string `json:"value,omitempty"`
+-type UrlMapsDeleteCall struct {
+- s *Service
+- project string
+- urlMap string
+- opt_ map[string]interface{}
-}
-
--type Network struct {
-- // IPv4Range: Required; The range of internal addresses that are legal
-- // on this network. This range is a CIDR specification, for example:
-- // 192.168.0.0/16. Provided by the client when the network is created.
-- IPv4Range string `json:"IPv4Range,omitempty"`
--
-- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
-- // only).
-- CreationTimestamp string `json:"creationTimestamp,omitempty"`
--
-- // Description: An optional textual description of the resource;
-- // provided by the client when the resource is created.
-- Description string `json:"description,omitempty"`
--
-- // GatewayIPv4: An optional address that is used for default routing to
-- // other networks. This must be within the range specified by IPv4Range,
-- // and is typically the first usable address in that range. If not
-- // specified, the default value is the first usable address in
-- // IPv4Range.
-- GatewayIPv4 string `json:"gatewayIPv4,omitempty"`
--
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id uint64 `json:"id,omitempty,string"`
--
-- // Kind: Type of the resource.
-- Kind string `json:"kind,omitempty"`
--
-- // Name: Name of the resource; provided by the client when the resource
-- // is created. The name must be 1-63 characters long, and comply with
-- // RFC1035.
-- Name string `json:"name,omitempty"`
--
-- // SelfLink: Server defined URL for the resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-// Delete: Deletes the specified UrlMap resource.
+-func (r *UrlMapsService) Delete(project string, urlMap string) *UrlMapsDeleteCall {
+- c := &UrlMapsDeleteCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.urlMap = urlMap
+- return c
-}
-
--type NetworkInterface struct {
-- // AccessConfigs: Array of configurations for this interface. This
-- // specifies how this interface is configured to interact with other
-- // network services, such as connecting to the internet. Currently,
-- // ONE_TO_ONE_NAT is the only access config supported. If there are no
-- // accessConfigs specified, then this instance will have no external
-- // internet access.
-- AccessConfigs []*AccessConfig `json:"accessConfigs,omitempty"`
--
-- // Name: Name of the network interface, determined by the server; for
-- // network devices, these are e.g. eth0, eth1, etc. (output only).
-- Name string `json:"name,omitempty"`
--
-- // Network: URL of the network resource attached to this interface.
-- Network string `json:"network,omitempty"`
--
-- // NetworkIP: An optional IPV4 internal network address assigned to the
-- // instance for this network interface (output only).
-- NetworkIP string `json:"networkIP,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *UrlMapsDeleteCall) Fields(s ...googleapi.Field) *UrlMapsDeleteCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
-}
-
--type NetworkList struct {
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id string `json:"id,omitempty"`
--
-- // Items: The network resources.
-- Items []*Network `json:"items,omitempty"`
+-func (c *UrlMapsDeleteCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/urlMaps/{urlMap}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("DELETE", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "urlMap": c.urlMap,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Deletes the specified UrlMap resource.",
+- // "httpMethod": "DELETE",
+- // "id": "compute.urlMaps.delete",
+- // "parameterOrder": [
+- // "project",
+- // "urlMap"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "urlMap": {
+- // "description": "Name of the UrlMap resource to delete.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/urlMaps/{urlMap}",
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
-
-- // Kind: Type of resource.
-- Kind string `json:"kind,omitempty"`
+-}
-
-- // NextPageToken: A token used to continue a truncated list request
-- // (output only).
-- NextPageToken string `json:"nextPageToken,omitempty"`
+-// method id "compute.urlMaps.get":
-
-- // SelfLink: Server defined URL for this resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-type UrlMapsGetCall struct {
+- s *Service
+- project string
+- urlMap string
+- opt_ map[string]interface{}
-}
-
--type Operation struct {
-- // ClientOperationId: An optional identifier specified by the client
-- // when the mutation was initiated. Must be unique for all operation
-- // resources in the project (output only).
-- ClientOperationId string `json:"clientOperationId,omitempty"`
--
-- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
-- // only).
-- CreationTimestamp string `json:"creationTimestamp,omitempty"`
+-// Get: Returns the specified UrlMap resource.
+-func (r *UrlMapsService) Get(project string, urlMap string) *UrlMapsGetCall {
+- c := &UrlMapsGetCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.urlMap = urlMap
+- return c
+-}
-
-- // EndTime: The time that this operation was completed. This is in RFC
-- // 3339 format (output only).
-- EndTime string `json:"endTime,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *UrlMapsGetCall) Fields(s ...googleapi.Field) *UrlMapsGetCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
-
-- // Error: If errors occurred during processing of this operation, this
-- // field will be populated (output only).
-- Error *OperationError `json:"error,omitempty"`
+-func (c *UrlMapsGetCall) Do() (*UrlMap, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/urlMaps/{urlMap}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "urlMap": c.urlMap,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *UrlMap
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Returns the specified UrlMap resource.",
+- // "httpMethod": "GET",
+- // "id": "compute.urlMaps.get",
+- // "parameterOrder": [
+- // "project",
+- // "urlMap"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "urlMap": {
+- // "description": "Name of the UrlMap resource to return.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/urlMaps/{urlMap}",
+- // "response": {
+- // "$ref": "UrlMap"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
-
-- // HttpErrorMessage: If operation fails, the HTTP error message
-- // returned, e.g. NOT FOUND. (output only).
-- HttpErrorMessage string `json:"httpErrorMessage,omitempty"`
+-}
-
-- // HttpErrorStatusCode: If operation fails, the HTTP error status code
-- // returned, e.g. 404. (output only).
-- HttpErrorStatusCode int64 `json:"httpErrorStatusCode,omitempty"`
+-// method id "compute.urlMaps.insert":
-
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id uint64 `json:"id,omitempty,string"`
+-type UrlMapsInsertCall struct {
+- s *Service
+- project string
+- urlmap *UrlMap
+- opt_ map[string]interface{}
+-}
-
-- // InsertTime: The time that this operation was requested. This is in
-- // RFC 3339 format (output only).
-- InsertTime string `json:"insertTime,omitempty"`
+-// Insert: Creates a UrlMap resource in the specified project using the
+-// data included in the request.
+-func (r *UrlMapsService) Insert(project string, urlmap *UrlMap) *UrlMapsInsertCall {
+- c := &UrlMapsInsertCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.urlmap = urlmap
+- return c
+-}
-
-- // Kind: Type of the resource.
-- Kind string `json:"kind,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *UrlMapsInsertCall) Fields(s ...googleapi.Field) *UrlMapsInsertCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
-
-- // Name: Name of the resource (output only).
-- Name string `json:"name,omitempty"`
+-func (c *UrlMapsInsertCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.urlmap)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/urlMaps")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Creates a UrlMap resource in the specified project using the data included in the request.",
+- // "httpMethod": "POST",
+- // "id": "compute.urlMaps.insert",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/urlMaps",
+- // "request": {
+- // "$ref": "UrlMap"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
-
-- // OperationType: Type of the operation. Examples include "insert",
-- // "update", and "delete" (output only).
-- OperationType string `json:"operationType,omitempty"`
+-}
-
-- // Progress: An optional progress indicator that ranges from 0 to 100.
-- // There is no requirement that this be linear or support any
-- // granularity of operations. This should not be used to guess at when
-- // the operation will be complete. This number should be monotonically
-- // increasing as the operation progresses (output only).
-- Progress int64 `json:"progress,omitempty"`
+-// method id "compute.urlMaps.list":
-
-- // Region: URL of the region where the operation resides (output only).
-- Region string `json:"region,omitempty"`
+-type UrlMapsListCall struct {
+- s *Service
+- project string
+- opt_ map[string]interface{}
+-}
-
-- // SelfLink: Server defined URL for the resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-// List: Retrieves the list of UrlMap resources available to the
+-// specified project.
+-func (r *UrlMapsService) List(project string) *UrlMapsListCall {
+- c := &UrlMapsListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- return c
+-}
-
-- // StartTime: The time that this operation was started by the server.
-- // This is in RFC 3339 format (output only).
-- StartTime string `json:"startTime,omitempty"`
+-// Filter sets the optional parameter "filter": Filter expression for
+-// filtering listed resources.
+-func (c *UrlMapsListCall) Filter(filter string) *UrlMapsListCall {
+- c.opt_["filter"] = filter
+- return c
+-}
-
-- // Status: Status of the operation. Can be one of the following:
-- // "PENDING", "RUNNING", or "DONE" (output only).
-- Status string `json:"status,omitempty"`
+-// MaxResults sets the optional parameter "maxResults": Maximum count of
+-// results to be returned. Maximum value is 500 and default value is
+-// 500.
+-func (c *UrlMapsListCall) MaxResults(maxResults int64) *UrlMapsListCall {
+- c.opt_["maxResults"] = maxResults
+- return c
+-}
-
-- // StatusMessage: An optional textual description of the current status
-- // of the operation (output only).
-- StatusMessage string `json:"statusMessage,omitempty"`
+-// PageToken sets the optional parameter "pageToken": Tag returned by a
+-// previous list request truncated by maxResults. Used to continue a
+-// previous list request.
+-func (c *UrlMapsListCall) PageToken(pageToken string) *UrlMapsListCall {
+- c.opt_["pageToken"] = pageToken
+- return c
+-}
-
-- // TargetId: Unique target id which identifies a particular incarnation
-- // of the target (output only).
-- TargetId uint64 `json:"targetId,omitempty,string"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *UrlMapsListCall) Fields(s ...googleapi.Field) *UrlMapsListCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
-
-- // TargetLink: URL of the resource the operation is mutating (output
-- // only).
-- TargetLink string `json:"targetLink,omitempty"`
+-func (c *UrlMapsListCall) Do() (*UrlMapList, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["filter"]; ok {
+- params.Set("filter", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["maxResults"]; ok {
+- params.Set("maxResults", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["pageToken"]; ok {
+- params.Set("pageToken", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/urlMaps")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *UrlMapList
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Retrieves the list of UrlMap resources available to the specified project.",
+- // "httpMethod": "GET",
+- // "id": "compute.urlMaps.list",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "filter": {
+- // "description": "Optional. Filter expression for filtering listed resources.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "maxResults": {
+- // "default": "500",
+- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
+- // "format": "uint32",
+- // "location": "query",
+- // "maximum": "500",
+- // "minimum": "0",
+- // "type": "integer"
+- // },
+- // "pageToken": {
+- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/urlMaps",
+- // "response": {
+- // "$ref": "UrlMapList"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
-
-- // User: User who requested the operation, for example
-- // "user at example.com" (output only).
-- User string `json:"user,omitempty"`
+-}
-
-- // Warnings: If warning messages generated during processing of this
-- // operation, this field will be populated (output only).
-- Warnings []*OperationWarnings `json:"warnings,omitempty"`
+-// method id "compute.urlMaps.patch":
-
-- // Zone: URL of the zone where the operation resides (output only).
-- Zone string `json:"zone,omitempty"`
+-type UrlMapsPatchCall struct {
+- s *Service
+- project string
+- urlMap string
+- urlmap *UrlMap
+- opt_ map[string]interface{}
-}
-
--type OperationError struct {
-- // Errors: The array of errors encountered while processing this
-- // operation.
-- Errors []*OperationErrorErrors `json:"errors,omitempty"`
+-// Patch: Update the entire content of the UrlMap resource. This method
+-// supports patch semantics.
+-func (r *UrlMapsService) Patch(project string, urlMap string, urlmap *UrlMap) *UrlMapsPatchCall {
+- c := &UrlMapsPatchCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.urlMap = urlMap
+- c.urlmap = urlmap
+- return c
-}
-
--type OperationErrorErrors struct {
-- // Code: The error type identifier for this error.
-- Code string `json:"code,omitempty"`
--
-- // Location: Indicates the field in the request which caused the error.
-- // This property is optional.
-- Location string `json:"location,omitempty"`
--
-- // Message: An optional, human-readable error message.
-- Message string `json:"message,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *UrlMapsPatchCall) Fields(s ...googleapi.Field) *UrlMapsPatchCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
-}
-
--type OperationWarnings struct {
-- // Code: The warning type identifier for this warning.
-- Code string `json:"code,omitempty"`
--
-- // Data: Metadata for this warning in 'key: value' format.
-- Data []*OperationWarningsData `json:"data,omitempty"`
+-func (c *UrlMapsPatchCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.urlmap)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/urlMaps/{urlMap}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("PATCH", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "urlMap": c.urlMap,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Update the entire content of the UrlMap resource. This method supports patch semantics.",
+- // "httpMethod": "PATCH",
+- // "id": "compute.urlMaps.patch",
+- // "parameterOrder": [
+- // "project",
+- // "urlMap"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "urlMap": {
+- // "description": "Name of the UrlMap resource to update.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/urlMaps/{urlMap}",
+- // "request": {
+- // "$ref": "UrlMap"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
-
-- // Message: Optional human-readable details for this warning.
-- Message string `json:"message,omitempty"`
-}
-
--type OperationWarningsData struct {
-- // Key: A key for the warning data.
-- Key string `json:"key,omitempty"`
+-// method id "compute.urlMaps.update":
-
-- // Value: A warning data value corresponding to the key.
-- Value string `json:"value,omitempty"`
+-type UrlMapsUpdateCall struct {
+- s *Service
+- project string
+- urlMap string
+- urlmap *UrlMap
+- opt_ map[string]interface{}
-}
-
--type OperationAggregatedList struct {
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id string `json:"id,omitempty"`
--
-- // Items: A map of scoped operation lists.
-- Items map[string]OperationsScopedList `json:"items,omitempty"`
+-// Update: Update the entire content of the UrlMap resource.
+-func (r *UrlMapsService) Update(project string, urlMap string, urlmap *UrlMap) *UrlMapsUpdateCall {
+- c := &UrlMapsUpdateCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.urlMap = urlMap
+- c.urlmap = urlmap
+- return c
+-}
-
-- // Kind: Type of resource.
-- Kind string `json:"kind,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *UrlMapsUpdateCall) Fields(s ...googleapi.Field) *UrlMapsUpdateCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
-
-- // NextPageToken: A token used to continue a truncated list request
-- // (output only).
-- NextPageToken string `json:"nextPageToken,omitempty"`
+-func (c *UrlMapsUpdateCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.urlmap)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/urlMaps/{urlMap}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("PUT", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "urlMap": c.urlMap,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Update the entire content of the UrlMap resource.",
+- // "httpMethod": "PUT",
+- // "id": "compute.urlMaps.update",
+- // "parameterOrder": [
+- // "project",
+- // "urlMap"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "urlMap": {
+- // "description": "Name of the UrlMap resource to update.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/urlMaps/{urlMap}",
+- // "request": {
+- // "$ref": "UrlMap"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
-
-- // SelfLink: Server defined URL for this resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
-}
-
--type OperationList struct {
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id string `json:"id,omitempty"`
--
-- // Items: The operation resources.
-- Items []*Operation `json:"items,omitempty"`
+-// method id "compute.urlMaps.validate":
-
-- // Kind: Type of resource.
-- Kind string `json:"kind,omitempty"`
+-type UrlMapsValidateCall struct {
+- s *Service
+- project string
+- urlMap string
+- urlmapsvalidaterequest *UrlMapsValidateRequest
+- opt_ map[string]interface{}
+-}
-
-- // NextPageToken: A token used to continue a truncated list request
-- // (output only).
-- NextPageToken string `json:"nextPageToken,omitempty"`
+-// Validate: Run static validation for the UrlMap. In particular, the
+-// tests of the provided UrlMap will be run. Calling this method does
+-// NOT create the UrlMap.
+-func (r *UrlMapsService) Validate(project string, urlMap string, urlmapsvalidaterequest *UrlMapsValidateRequest) *UrlMapsValidateCall {
+- c := &UrlMapsValidateCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.urlMap = urlMap
+- c.urlmapsvalidaterequest = urlmapsvalidaterequest
+- return c
+-}
-
-- // SelfLink: Server defined URL for this resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *UrlMapsValidateCall) Fields(s ...googleapi.Field) *UrlMapsValidateCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
-}
-
--type OperationsScopedList struct {
-- // Operations: List of operations contained in this scope.
-- Operations []*Operation `json:"operations,omitempty"`
+-func (c *UrlMapsValidateCall) Do() (*UrlMapsValidateResponse, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.urlmapsvalidaterequest)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/urlMaps/{urlMap}/validate")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "urlMap": c.urlMap,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *UrlMapsValidateResponse
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Run static validation for the UrlMap. In particular, the tests of the provided UrlMap will be run. Calling this method does NOT create the UrlMap.",
+- // "httpMethod": "POST",
+- // "id": "compute.urlMaps.validate",
+- // "parameterOrder": [
+- // "project",
+- // "urlMap"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "urlMap": {
+- // "description": "Name of the UrlMap resource to be validated as.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/global/urlMaps/{urlMap}/validate",
+- // "request": {
+- // "$ref": "UrlMapsValidateRequest"
+- // },
+- // "response": {
+- // "$ref": "UrlMapsValidateResponse"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
-
-- // Warning: Informational warning which replaces the list of operations
-- // when the list is empty.
-- Warning *OperationsScopedListWarning `json:"warning,omitempty"`
-}
-
--type OperationsScopedListWarning struct {
-- // Code: The warning type identifier for this warning.
-- Code string `json:"code,omitempty"`
--
-- // Data: Metadata for this warning in 'key: value' format.
-- Data []*OperationsScopedListWarningData `json:"data,omitempty"`
+-// method id "compute.zoneOperations.delete":
-
-- // Message: Optional human-readable details for this warning.
-- Message string `json:"message,omitempty"`
+-type ZoneOperationsDeleteCall struct {
+- s *Service
+- project string
+- zone string
+- operation string
+- opt_ map[string]interface{}
-}
-
--type OperationsScopedListWarningData struct {
-- // Key: A key for the warning data.
-- Key string `json:"key,omitempty"`
--
-- // Value: A warning data value corresponding to the key.
-- Value string `json:"value,omitempty"`
+-// Delete: Deletes the specified zone-specific operation resource.
+-func (r *ZoneOperationsService) Delete(project string, zone string, operation string) *ZoneOperationsDeleteCall {
+- c := &ZoneOperationsDeleteCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.zone = zone
+- c.operation = operation
+- return c
-}
-
--type PathMatcher struct {
-- // DefaultService: The URL to the BackendService resource. This will be
-- // used if none of the 'pathRules' defined by this PathMatcher is met by
-- // the URL's path portion.
-- DefaultService string `json:"defaultService,omitempty"`
--
-- Description string `json:"description,omitempty"`
--
-- // Name: The name to which this PathMatcher is referred by the HostRule.
-- Name string `json:"name,omitempty"`
--
-- // PathRules: The list of path rules.
-- PathRules []*PathRule `json:"pathRules,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *ZoneOperationsDeleteCall) Fields(s ...googleapi.Field) *ZoneOperationsDeleteCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
-}
-
--type PathRule struct {
-- // Paths: The list of path patterns to match. Each must start with / and
-- // the only place a * is allowed is at the end following a /. The string
-- // fed to the path matcher does not include any text after the first ?
-- // or #, and those chars are not allowed here.
-- Paths []string `json:"paths,omitempty"`
+-func (c *ZoneOperationsDeleteCall) Do() error {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/operations/{operation}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("DELETE", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "zone": c.zone,
+- "operation": c.operation,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return err
+- }
+- return nil
+- // {
+- // "description": "Deletes the specified zone-specific operation resource.",
+- // "httpMethod": "DELETE",
+- // "id": "compute.zoneOperations.delete",
+- // "parameterOrder": [
+- // "project",
+- // "zone",
+- // "operation"
+- // ],
+- // "parameters": {
+- // "operation": {
+- // "description": "Name of the operation resource to delete.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "zone": {
+- // "description": "Name of the zone scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/zones/{zone}/operations/{operation}",
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute"
+- // ]
+- // }
-
-- // Service: The URL of the BackendService resource if this rule is
-- // matched.
-- Service string `json:"service,omitempty"`
-}
-
--type Project struct {
-- // CommonInstanceMetadata: Metadata key/value pairs available to all
-- // instances contained in this project.
-- CommonInstanceMetadata *Metadata `json:"commonInstanceMetadata,omitempty"`
--
-- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
-- // only).
-- CreationTimestamp string `json:"creationTimestamp,omitempty"`
--
-- // Description: An optional textual description of the resource.
-- Description string `json:"description,omitempty"`
--
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id uint64 `json:"id,omitempty,string"`
--
-- // Kind: Type of the resource.
-- Kind string `json:"kind,omitempty"`
--
-- // Name: Name of the resource.
-- Name string `json:"name,omitempty"`
--
-- // Quotas: Quotas assigned to this project.
-- Quotas []*Quota `json:"quotas,omitempty"`
--
-- // SelfLink: Server defined URL for the resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-// method id "compute.zoneOperations.get":
-
-- // UsageExportLocation: The location in Cloud Storage and naming method
-- // of the daily usage report.
-- UsageExportLocation *UsageExportLocation `json:"usageExportLocation,omitempty"`
+-type ZoneOperationsGetCall struct {
+- s *Service
+- project string
+- zone string
+- operation string
+- opt_ map[string]interface{}
-}
-
--type Quota struct {
-- // Limit: Quota limit for this metric.
-- Limit float64 `json:"limit,omitempty"`
--
-- // Metric: Name of the quota metric.
-- Metric string `json:"metric,omitempty"`
--
-- // Usage: Current usage of this metric.
-- Usage float64 `json:"usage,omitempty"`
+-// Get: Retrieves the specified zone-specific operation resource.
+-func (r *ZoneOperationsService) Get(project string, zone string, operation string) *ZoneOperationsGetCall {
+- c := &ZoneOperationsGetCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.zone = zone
+- c.operation = operation
+- return c
-}
-
--type Region struct {
-- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
-- // only).
-- CreationTimestamp string `json:"creationTimestamp,omitempty"`
--
-- // Deprecated: The deprecation status associated with this region.
-- Deprecated *DeprecationStatus `json:"deprecated,omitempty"`
--
-- // Description: Textual description of the resource.
-- Description string `json:"description,omitempty"`
--
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id uint64 `json:"id,omitempty,string"`
--
-- // Kind: Type of the resource.
-- Kind string `json:"kind,omitempty"`
--
-- // Name: Name of the resource.
-- Name string `json:"name,omitempty"`
--
-- // Quotas: Quotas assigned to this region.
-- Quotas []*Quota `json:"quotas,omitempty"`
--
-- // SelfLink: Server defined URL for the resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
--
-- // Status: Status of the region, "UP" or "DOWN".
-- Status string `json:"status,omitempty"`
--
-- // Zones: A list of zones homed in this region, in the form of resource
-- // URLs.
-- Zones []string `json:"zones,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *ZoneOperationsGetCall) Fields(s ...googleapi.Field) *ZoneOperationsGetCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
-}
-
--type RegionList struct {
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id string `json:"id,omitempty"`
--
-- // Items: The region resources.
-- Items []*Region `json:"items,omitempty"`
+-func (c *ZoneOperationsGetCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/operations/{operation}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "zone": c.zone,
+- "operation": c.operation,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Retrieves the specified zone-specific operation resource.",
+- // "httpMethod": "GET",
+- // "id": "compute.zoneOperations.get",
+- // "parameterOrder": [
+- // "project",
+- // "zone",
+- // "operation"
+- // ],
+- // "parameters": {
+- // "operation": {
+- // "description": "Name of the operation resource to return.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "zone": {
+- // "description": "Name of the zone scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/zones/{zone}/operations/{operation}",
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
-
-- // Kind: Type of resource.
-- Kind string `json:"kind,omitempty"`
+-}
-
-- // NextPageToken: A token used to continue a truncated list request
-- // (output only).
-- NextPageToken string `json:"nextPageToken,omitempty"`
+-// method id "compute.zoneOperations.list":
-
-- // SelfLink: Server defined URL for this resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-type ZoneOperationsListCall struct {
+- s *Service
+- project string
+- zone string
+- opt_ map[string]interface{}
-}
-
--type ResourceGroupReference struct {
-- // Group: A URI referencing one of the resource views listed in the
-- // backend service.
-- Group string `json:"group,omitempty"`
+-// List: Retrieves the list of operation resources contained within the
+-// specified zone.
+-func (r *ZoneOperationsService) List(project string, zone string) *ZoneOperationsListCall {
+- c := &ZoneOperationsListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.zone = zone
+- return c
-}
-
--type Route struct {
-- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
-- // only).
-- CreationTimestamp string `json:"creationTimestamp,omitempty"`
--
-- // Description: An optional textual description of the resource;
-- // provided by the client when the resource is created.
-- Description string `json:"description,omitempty"`
--
-- // DestRange: Which packets does this route apply to?
-- DestRange string `json:"destRange,omitempty"`
--
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id uint64 `json:"id,omitempty,string"`
--
-- // Kind: Type of the resource.
-- Kind string `json:"kind,omitempty"`
--
-- // Name: Name of the resource; provided by the client when the resource
-- // is created. The name must be 1-63 characters long, and comply with
-- // RFC1035.
-- Name string `json:"name,omitempty"`
--
-- // Network: URL of the network to which this route is applied; provided
-- // by the client when the route is created.
-- Network string `json:"network,omitempty"`
--
-- // NextHopGateway: The URL to a gateway that should handle matching
-- // packets.
-- NextHopGateway string `json:"nextHopGateway,omitempty"`
--
-- // NextHopInstance: The URL to an instance that should handle matching
-- // packets.
-- NextHopInstance string `json:"nextHopInstance,omitempty"`
--
-- // NextHopIp: The network IP address of an instance that should handle
-- // matching packets.
-- NextHopIp string `json:"nextHopIp,omitempty"`
--
-- // NextHopNetwork: The URL of the local network if it should handle
-- // matching packets.
-- NextHopNetwork string `json:"nextHopNetwork,omitempty"`
--
-- // Priority: Breaks ties between Routes of equal specificity. Routes
-- // with smaller values win when tied with routes with larger values.
-- Priority int64 `json:"priority,omitempty"`
--
-- // SelfLink: Server defined URL for the resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
--
-- // Tags: A list of instance tags to which this route applies.
-- Tags []string `json:"tags,omitempty"`
--
-- // Warnings: If potential misconfigurations are detected for this route,
-- // this field will be populated with warning messages.
-- Warnings []*RouteWarnings `json:"warnings,omitempty"`
+-// Filter sets the optional parameter "filter": Filter expression for
+-// filtering listed resources.
+-func (c *ZoneOperationsListCall) Filter(filter string) *ZoneOperationsListCall {
+- c.opt_["filter"] = filter
+- return c
-}
-
--type RouteWarnings struct {
-- // Code: The warning type identifier for this warning.
-- Code string `json:"code,omitempty"`
--
-- // Data: Metadata for this warning in 'key: value' format.
-- Data []*RouteWarningsData `json:"data,omitempty"`
--
-- // Message: Optional human-readable details for this warning.
-- Message string `json:"message,omitempty"`
+-// MaxResults sets the optional parameter "maxResults": Maximum count of
+-// results to be returned. Maximum value is 500 and default value is
+-// 500.
+-func (c *ZoneOperationsListCall) MaxResults(maxResults int64) *ZoneOperationsListCall {
+- c.opt_["maxResults"] = maxResults
+- return c
-}
-
--type RouteWarningsData struct {
-- // Key: A key for the warning data.
-- Key string `json:"key,omitempty"`
--
-- // Value: A warning data value corresponding to the key.
-- Value string `json:"value,omitempty"`
+-// PageToken sets the optional parameter "pageToken": Tag returned by a
+-// previous list request truncated by maxResults. Used to continue a
+-// previous list request.
+-func (c *ZoneOperationsListCall) PageToken(pageToken string) *ZoneOperationsListCall {
+- c.opt_["pageToken"] = pageToken
+- return c
-}
-
--type RouteList struct {
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id string `json:"id,omitempty"`
--
-- // Items: The route resources.
-- Items []*Route `json:"items,omitempty"`
--
-- // Kind: Type of resource.
-- Kind string `json:"kind,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *ZoneOperationsListCall) Fields(s ...googleapi.Field) *ZoneOperationsListCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
-
-- // NextPageToken: A token used to continue a truncated list request
-- // (output only).
-- NextPageToken string `json:"nextPageToken,omitempty"`
+-func (c *ZoneOperationsListCall) Do() (*OperationList, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["filter"]; ok {
+- params.Set("filter", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["maxResults"]; ok {
+- params.Set("maxResults", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["pageToken"]; ok {
+- params.Set("pageToken", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/operations")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "zone": c.zone,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *OperationList
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Retrieves the list of operation resources contained within the specified zone.",
+- // "httpMethod": "GET",
+- // "id": "compute.zoneOperations.list",
+- // "parameterOrder": [
+- // "project",
+- // "zone"
+- // ],
+- // "parameters": {
+- // "filter": {
+- // "description": "Optional. Filter expression for filtering listed resources.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "maxResults": {
+- // "default": "500",
+- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
+- // "format": "uint32",
+- // "location": "query",
+- // "maximum": "500",
+- // "minimum": "0",
+- // "type": "integer"
+- // },
+- // "pageToken": {
+- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "zone": {
+- // "description": "Name of the zone scoping this request.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/zones/{zone}/operations",
+- // "response": {
+- // "$ref": "OperationList"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
-
-- // SelfLink: Server defined URL for this resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
-}
-
--type Scheduling struct {
-- // AutomaticRestart: Whether the Instance should be automatically
-- // restarted whenever it is terminated by Compute Engine (not terminated
-- // by user).
-- AutomaticRestart bool `json:"automaticRestart,omitempty"`
+-// method id "compute.zones.get":
-
-- // OnHostMaintenance: How the instance should behave when the host
-- // machine undergoes maintenance that may temporarily impact instance
-- // performance.
-- OnHostMaintenance string `json:"onHostMaintenance,omitempty"`
+-type ZonesGetCall struct {
+- s *Service
+- project string
+- zone string
+- opt_ map[string]interface{}
-}
-
--type SerialPortOutput struct {
-- // Contents: The contents of the console output.
-- Contents string `json:"contents,omitempty"`
--
-- // Kind: Type of the resource.
-- Kind string `json:"kind,omitempty"`
--
-- // SelfLink: Server defined URL for the resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-// Get: Returns the specified zone resource.
+-func (r *ZonesService) Get(project string, zone string) *ZonesGetCall {
+- c := &ZonesGetCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- c.zone = zone
+- return c
-}
-
--type ServiceAccount struct {
-- // Email: Email address of the service account.
-- Email string `json:"email,omitempty"`
--
-- // Scopes: The list of scopes to be made available for this service
-- // account.
-- Scopes []string `json:"scopes,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *ZonesGetCall) Fields(s ...googleapi.Field) *ZonesGetCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
-}
-
--type Snapshot struct {
-- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
-- // only).
-- CreationTimestamp string `json:"creationTimestamp,omitempty"`
--
-- // Description: An optional textual description of the resource;
-- // provided by the client when the resource is created.
-- Description string `json:"description,omitempty"`
--
-- // DiskSizeGb: Size of the persistent disk snapshot, specified in GB
-- // (output only).
-- DiskSizeGb int64 `json:"diskSizeGb,omitempty,string"`
--
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id uint64 `json:"id,omitempty,string"`
--
-- // Kind: Type of the resource.
-- Kind string `json:"kind,omitempty"`
--
-- // Licenses: Public visible licenses.
-- Licenses []string `json:"licenses,omitempty"`
--
-- // Name: Name of the resource; provided by the client when the resource
-- // is created. The name must be 1-63 characters long, and comply with
-- // RFC1035.
-- Name string `json:"name,omitempty"`
--
-- // SelfLink: Server defined URL for the resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
--
-- // SourceDisk: The source disk used to create this snapshot.
-- SourceDisk string `json:"sourceDisk,omitempty"`
--
-- // SourceDiskId: The 'id' value of the disk used to create this
-- // snapshot. This value may be used to determine whether the snapshot
-- // was taken from the current or a previous instance of a given disk
-- // name.
-- SourceDiskId string `json:"sourceDiskId,omitempty"`
--
-- // Status: The status of the persistent disk snapshot (output only).
-- Status string `json:"status,omitempty"`
--
-- // StorageBytes: A size of the the storage used by the snapshot. As
-- // snapshots share storage this number is expected to change with
-- // snapshot creation/deletion.
-- StorageBytes int64 `json:"storageBytes,omitempty,string"`
+-func (c *ZonesGetCall) Do() (*Zone, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- "zone": c.zone,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Zone
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Returns the specified zone resource.",
+- // "httpMethod": "GET",
+- // "id": "compute.zones.get",
+- // "parameterOrder": [
+- // "project",
+- // "zone"
+- // ],
+- // "parameters": {
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "zone": {
+- // "description": "Name of the zone resource to return.",
+- // "location": "path",
+- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/zones/{zone}",
+- // "response": {
+- // "$ref": "Zone"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
-
-- // StorageBytesStatus: An indicator whether storageBytes is in a stable
-- // state, or it is being adjusted as a result of shared storage
-- // reallocation.
-- StorageBytesStatus string `json:"storageBytesStatus,omitempty"`
-}
-
--type SnapshotList struct {
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id string `json:"id,omitempty"`
--
-- // Items: The persistent snapshot resources.
-- Items []*Snapshot `json:"items,omitempty"`
--
-- // Kind: Type of resource.
-- Kind string `json:"kind,omitempty"`
--
-- // NextPageToken: A token used to continue a truncated list request
-- // (output only).
-- NextPageToken string `json:"nextPageToken,omitempty"`
+-// method id "compute.zones.list":
-
-- // SelfLink: Server defined URL for this resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-type ZonesListCall struct {
+- s *Service
+- project string
+- opt_ map[string]interface{}
-}
-
--type Tags struct {
-- // Fingerprint: Fingerprint of this resource. A hash of the tags stored
-- // in this object. This field is used optimistic locking. An up-to-date
-- // tags fingerprint must be provided in order to modify tags.
-- Fingerprint string `json:"fingerprint,omitempty"`
--
-- // Items: An array of tags. Each tag must be 1-63 characters long, and
-- // comply with RFC1035.
-- Items []string `json:"items,omitempty"`
+-// List: Retrieves the list of zone resources available to the specified
+-// project.
+-func (r *ZonesService) List(project string) *ZonesListCall {
+- c := &ZonesListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.project = project
+- return c
-}
-
--type TargetHttpProxy struct {
-- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
-- // only).
-- CreationTimestamp string `json:"creationTimestamp,omitempty"`
--
-- // Description: An optional textual description of the resource;
-- // provided by the client when the resource is created.
-- Description string `json:"description,omitempty"`
+-// Filter sets the optional parameter "filter": Filter expression for
+-// filtering listed resources.
+-func (c *ZonesListCall) Filter(filter string) *ZonesListCall {
+- c.opt_["filter"] = filter
+- return c
+-}
-
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id uint64 `json:"id,omitempty,string"`
+-// MaxResults sets the optional parameter "maxResults": Maximum count of
+-// results to be returned. Maximum value is 500 and default value is
+-// 500.
+-func (c *ZonesListCall) MaxResults(maxResults int64) *ZonesListCall {
+- c.opt_["maxResults"] = maxResults
+- return c
+-}
-
-- // Kind: Type of the resource.
-- Kind string `json:"kind,omitempty"`
+-// PageToken sets the optional parameter "pageToken": Tag returned by a
+-// previous list request truncated by maxResults. Used to continue a
+-// previous list request.
+-func (c *ZonesListCall) PageToken(pageToken string) *ZonesListCall {
+- c.opt_["pageToken"] = pageToken
+- return c
+-}
-
-- // Name: Name of the resource; provided by the client when the resource
-- // is created. The name must be 1-63 characters long, and comply with
-- // RFC1035.
-- Name string `json:"name,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *ZonesListCall) Fields(s ...googleapi.Field) *ZonesListCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
-
-- // SelfLink: Server defined URL for the resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-func (c *ZonesListCall) Do() (*ZoneList, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["filter"]; ok {
+- params.Set("filter", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["maxResults"]; ok {
+- params.Set("maxResults", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["pageToken"]; ok {
+- params.Set("pageToken", fmt.Sprintf("%v", v))
+- }
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "project": c.project,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *ZoneList
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Retrieves the list of zone resources available to the specified project.",
+- // "httpMethod": "GET",
+- // "id": "compute.zones.list",
+- // "parameterOrder": [
+- // "project"
+- // ],
+- // "parameters": {
+- // "filter": {
+- // "description": "Optional. Filter expression for filtering listed resources.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "maxResults": {
+- // "default": "500",
+- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
+- // "format": "uint32",
+- // "location": "query",
+- // "maximum": "500",
+- // "minimum": "0",
+- // "type": "integer"
+- // },
+- // "pageToken": {
+- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
+- // "location": "query",
+- // "type": "string"
+- // },
+- // "project": {
+- // "description": "Name of the project scoping this request.",
+- // "location": "path",
+- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{project}/zones",
+- // "response": {
+- // "$ref": "ZoneList"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/compute",
+- // "https://www.googleapis.com/auth/compute.readonly"
+- // ]
+- // }
-
-- // UrlMap: URL to the UrlMap resource that defines the mapping from URL
-- // to the BackendService.
-- UrlMap string `json:"urlMap,omitempty"`
-}
+diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/container/v1beta1/container-api.json b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/container/v1beta1/container-api.json
+deleted file mode 100644
+index bca5a31..0000000
+--- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/container/v1beta1/container-api.json
++++ /dev/null
+@@ -1,579 +0,0 @@
+-{
+- "kind": "discovery#restDescription",
+- "etag": "\"l66ggWbucbkBw9Lpos72oziyefE/ZrZBeDfQYPqAxFURJt0IhCOLUHQ\"",
+- "discoveryVersion": "v1",
+- "id": "container:v1beta1",
+- "name": "container",
+- "version": "v1beta1",
+- "revision": "20141103",
+- "title": "Google Container Engine API",
+- "description": "The Google Container Engine API is used for building and managing container based applications, powered by the open source Kubernetes technology.",
+- "ownerDomain": "google.com",
+- "ownerName": "Google",
+- "icons": {
+- "x16": "http://www.google.com/images/icons/product/search-16.gif",
+- "x32": "http://www.google.com/images/icons/product/search-32.gif"
+- },
+- "protocol": "rest",
+- "baseUrl": "https://www.googleapis.com/container/v1beta1/projects/",
+- "basePath": "/container/v1beta1/projects/",
+- "rootUrl": "https://www.googleapis.com/",
+- "servicePath": "container/v1beta1/projects/",
+- "batchPath": "batch",
+- "parameters": {
+- "alt": {
+- "type": "string",
+- "description": "Data format for the response.",
+- "default": "json",
+- "enum": [
+- "json"
+- ],
+- "enumDescriptions": [
+- "Responses with Content-Type of application/json"
+- ],
+- "location": "query"
+- },
+- "fields": {
+- "type": "string",
+- "description": "Selector specifying which fields to include in a partial response.",
+- "location": "query"
+- },
+- "key": {
+- "type": "string",
+- "description": "API key. Your API key identifies your project and provides you with API access, quota, and reports. Required unless you provide an OAuth 2.0 token.",
+- "location": "query"
+- },
+- "oauth_token": {
+- "type": "string",
+- "description": "OAuth 2.0 token for the current user.",
+- "location": "query"
+- },
+- "prettyPrint": {
+- "type": "boolean",
+- "description": "Returns response with indentations and line breaks.",
+- "default": "true",
+- "location": "query"
+- },
+- "quotaUser": {
+- "type": "string",
+- "description": "Available to use for quota purposes for server-side applications. Can be any arbitrary string assigned to a user, but should not exceed 40 characters. Overrides userIp if both are provided.",
+- "location": "query"
+- },
+- "userIp": {
+- "type": "string",
+- "description": "IP address of the site where the request originates. Use this if you want to enforce per-user limits.",
+- "location": "query"
+- }
+- },
+- "auth": {
+- "oauth2": {
+- "scopes": {
+- "https://www.googleapis.com/auth/cloud-platform": {
+- "description": "View and manage your data across Google Cloud Platform services"
+- }
+- }
+- }
+- },
+- "schemas": {
+- "Cluster": {
+- "id": "Cluster",
+- "type": "object",
+- "externalTypeName": "container.v1beta1.Cluster",
+- "properties": {
+- "clusterApiVersion": {
+- "type": "string",
+- "description": "The API version of the Kubernetes master and kubelets running in this cluster. Allowed value is 0.4.2, or leave blank to pick up the latest stable release."
+- },
+- "containerIpv4Cidr": {
+- "type": "string",
+- "description": "[Output only] The IP addresses of the container pods in this cluster, in CIDR notation (e.g. 1.2.3.4/29)."
+- },
+- "creationTimestamp": {
+- "type": "string",
+- "description": "[Output only] The time the cluster was created, in RFC3339 text format."
+- },
+- "description": {
+- "type": "string",
+- "description": "An optional description of this cluster."
+- },
+- "endpoint": {
+- "type": "string",
+- "description": "[Output only] The IP address of this cluster's Kubernetes master. The endpoint can be accessed from the internet at https://username:password@endpoint/.\n\nSee the masterAuth property of this resource for username and password information."
+- },
+- "masterAuth": {
+- "$ref": "MasterAuth",
+- "description": "The HTTP basic authentication information for accessing the master. Because the master endpoint is open to the internet, you should create a strong password."
+- },
+- "name": {
+- "type": "string",
+- "description": "The name of this cluster. The name must be unique within this project and zone, and can be up to 40 characters with the following restrictions: \n- Lowercase letters, numbers, and hyphens only.\n- Must start with a letter.\n- Must end with a number or a letter."
+- },
+- "nodeConfig": {
+- "$ref": "NodeConfig",
+- "description": "The machine type and image to use for all nodes in this cluster. See the descriptions of the child properties of nodeConfig."
+- },
+- "nodeRoutingPrefixSize": {
+- "type": "integer",
+- "description": "[Output only] The size of the address space on each node for hosting containers.",
+- "format": "int32"
+- },
+- "numNodes": {
+- "type": "integer",
+- "description": "The number of nodes to create in this cluster. You must ensure that your Compute Engine resource quota is sufficient for this number of instances plus one (to include the master). You must also have available firewall and routes quota.",
+- "format": "int32"
+- },
+- "servicesIpv4Cidr": {
+- "type": "string",
+- "description": "[Output only] The IP addresses of the Kubernetes services in this cluster, in CIDR notation (e.g. 1.2.3.4/29). Service addresses are always in the 10.0.0.0/16 range."
+- },
+- "status": {
+- "type": "string",
+- "description": "[Output only] The current status of this cluster.",
+- "enum": [
+- "error",
+- "provisioning",
+- "running",
+- "stopping"
+- ],
+- "enumDescriptions": [
+- "",
+- "",
+- "",
+- ""
+- ]
+- },
+- "statusMessage": {
+- "type": "string",
+- "description": "[Output only] Additional information about the current status of this cluster, if available."
+- },
+- "zone": {
+- "type": "string",
+- "description": "[Output only] The name of the Google Compute Engine zone in which the cluster resides."
+- }
+- }
+- },
+- "CreateClusterRequest": {
+- "id": "CreateClusterRequest",
+- "type": "object",
+- "externalTypeName": "container.v1beta1.CreateClusterRequest",
+- "properties": {
+- "cluster": {
+- "$ref": "Cluster",
+- "description": "A cluster resource."
+- }
+- }
+- },
+- "ListAggregatedClustersResponse": {
+- "id": "ListAggregatedClustersResponse",
+- "type": "object",
+- "externalTypeName": "container.v1beta1.ListAggregatedClustersResponse",
+- "properties": {
+- "clusters": {
+- "type": "array",
+- "description": "A list of clusters in the project, across all zones.",
+- "items": {
+- "$ref": "Cluster"
+- }
+- }
+- }
+- },
+- "ListAggregatedOperationsResponse": {
+- "id": "ListAggregatedOperationsResponse",
+- "type": "object",
+- "externalTypeName": "container.v1beta1.ListAggregatedOperationsResponse",
+- "properties": {
+- "operations": {
+- "type": "array",
+- "description": "A list of operations in the project, across all zones.",
+- "items": {
+- "$ref": "Operation"
+- }
+- }
+- }
+- },
+- "ListClustersResponse": {
+- "id": "ListClustersResponse",
+- "type": "object",
+- "externalTypeName": "container.v1beta1.ListClustersResponse",
+- "properties": {
+- "clusters": {
+- "type": "array",
+- "description": "A list of clusters in the project in the specified zone.",
+- "items": {
+- "$ref": "Cluster"
+- }
+- }
+- }
+- },
+- "ListOperationsResponse": {
+- "id": "ListOperationsResponse",
+- "type": "object",
+- "externalTypeName": "container.v1beta1.ListOperationsResponse",
+- "properties": {
+- "operations": {
+- "type": "array",
+- "description": "A list of operations in the project in the specified zone.",
+- "items": {
+- "$ref": "Operation"
+- }
+- }
+- }
+- },
+- "MasterAuth": {
+- "id": "MasterAuth",
+- "type": "object",
+- "externalTypeName": "container.v1beta1.MasterAuth",
+- "properties": {
+- "password": {
+- "type": "string",
+- "description": "The password to use when accessing the Kubernetes master endpoint."
+- },
+- "user": {
+- "type": "string",
+- "description": "The username to use when accessing the Kubernetes master endpoint."
+- }
+- }
+- },
+- "NodeConfig": {
+- "id": "NodeConfig",
+- "type": "object",
+- "externalTypeName": "container.v1beta1.NodeConfig",
+- "properties": {
+- "machineType": {
+- "type": "string",
+- "description": "The name of a Google Compute Engine machine type (e.g. n1-standard-1).\n\nIf unspecified, the default machine type is n1-standard-1."
+- },
+- "sourceImage": {
+- "type": "string",
+- "description": "The fully-specified name of a Google Compute Engine image. For example: https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/backports-debian-7-wheezy-vYYYYMMDD (where YYYMMDD is the version date).\n\nIf specifying an image, you are responsible for ensuring its compatibility with the Debian 7 backports image. We recommend leaving this field blank to accept the default backports-debian-7-wheezy value."
+- }
+- }
+- },
+- "Operation": {
+- "id": "Operation",
+- "type": "object",
+- "description": "Defines the operation resource. All fields are output only.",
+- "externalTypeName": "container.v1beta1.Operation",
+- "properties": {
+- "errorMessage": {
+- "type": "string",
+- "description": "If an error has occurred, a textual description of the error."
+- },
+- "name": {
+- "type": "string",
+- "description": "The server-assigned ID for this operation. If the operation is fulfilled upfront, it may not have a resource name."
+- },
+- "operationType": {
+- "type": "string",
+- "description": "The operation type.",
+- "enum": [
+- "createCluster",
+- "deleteCluster"
+- ],
+- "enumDescriptions": [
+- "",
+- ""
+- ]
+- },
+- "status": {
+- "type": "string",
+- "description": "The current status of the operation.",
+- "enum": [
+- "done",
+- "pending",
+- "running"
+- ],
+- "enumDescriptions": [
+- "",
+- "",
+- ""
+- ]
+- },
+- "target": {
+- "type": "string",
+- "description": "[Optional] The URL of the cluster resource that this operation is associated with."
+- },
+- "zone": {
+- "type": "string",
+- "description": "The name of the Google Compute Engine zone in which the operation is taking place."
+- }
+- }
+- }
+- },
+- "resources": {
+- "projects": {
+- "resources": {
+- "clusters": {
+- "methods": {
+- "list": {
+- "id": "container.projects.clusters.list",
+- "path": "{projectId}/clusters",
+- "httpMethod": "GET",
+- "description": "Lists all clusters owned by a project across all zones.",
+- "parameters": {
+- "projectId": {
+- "type": "string",
+- "description": "The Google Developers Console project ID or project number.",
+- "required": true,
+- "location": "path"
+- }
+- },
+- "parameterOrder": [
+- "projectId"
+- ],
+- "response": {
+- "$ref": "ListAggregatedClustersResponse"
+- },
+- "scopes": [
+- "https://www.googleapis.com/auth/cloud-platform"
+- ]
+- }
+- }
+- },
+- "operations": {
+- "methods": {
+- "list": {
+- "id": "container.projects.operations.list",
+- "path": "{projectId}/operations",
+- "httpMethod": "GET",
+- "description": "Lists all operations in a project, across all zones.",
+- "parameters": {
+- "projectId": {
+- "type": "string",
+- "description": "The Google Developers Console project ID or project number.",
+- "required": true,
+- "location": "path"
+- }
+- },
+- "parameterOrder": [
+- "projectId"
+- ],
+- "response": {
+- "$ref": "ListAggregatedOperationsResponse"
+- },
+- "scopes": [
+- "https://www.googleapis.com/auth/cloud-platform"
+- ]
+- }
+- }
+- },
+- "zones": {
+- "resources": {
+- "clusters": {
+- "methods": {
+- "create": {
+- "id": "container.projects.zones.clusters.create",
+- "path": "{projectId}/zones/{zoneId}/clusters",
+- "httpMethod": "POST",
+- "description": "Creates a cluster, consisting of the specified number and type of Google Compute Engine instances, plus a Kubernetes master instance.\n\nThe cluster is created in the project's default network.\n\nA firewall is added that allows traffic into port 443 on the master, which enables HTTPS. A firewall and a route is added for each node to allow the containers on that node to communicate with all other instances in the cluster.\n\nFinally, a route named k8s-iproute-10-xx-0-0 is created to track that the cluster's 10.xx.0.0/16 CIDR has been assigned.",
+- "parameters": {
+- "projectId": {
+- "type": "string",
+- "description": "The Google Developers Console project ID or project number.",
+- "required": true,
+- "location": "path"
+- },
+- "zoneId": {
+- "type": "string",
+- "description": "The name of the Google Compute Engine zone in which the cluster resides.",
+- "required": true,
+- "location": "path"
+- }
+- },
+- "parameterOrder": [
+- "projectId",
+- "zoneId"
+- ],
+- "request": {
+- "$ref": "CreateClusterRequest"
+- },
+- "response": {
+- "$ref": "Operation"
+- },
+- "scopes": [
+- "https://www.googleapis.com/auth/cloud-platform"
+- ]
+- },
+- "delete": {
+- "id": "container.projects.zones.clusters.delete",
+- "path": "{projectId}/zones/{zoneId}/clusters/{clusterId}",
+- "httpMethod": "DELETE",
+- "description": "Deletes the cluster, including the Kubernetes master and all worker nodes.\n\nFirewalls and routes that were configured at cluster creation are also deleted.",
+- "parameters": {
+- "clusterId": {
+- "type": "string",
+- "description": "The name of the cluster to delete.",
+- "required": true,
+- "location": "path"
+- },
+- "projectId": {
+- "type": "string",
+- "description": "The Google Developers Console project ID or project number.",
+- "required": true,
+- "location": "path"
+- },
+- "zoneId": {
+- "type": "string",
+- "description": "The name of the Google Compute Engine zone in which the cluster resides.",
+- "required": true,
+- "location": "path"
+- }
+- },
+- "parameterOrder": [
+- "projectId",
+- "zoneId",
+- "clusterId"
+- ],
+- "response": {
+- "$ref": "Operation"
+- },
+- "scopes": [
+- "https://www.googleapis.com/auth/cloud-platform"
+- ]
+- },
+- "get": {
+- "id": "container.projects.zones.clusters.get",
+- "path": "{projectId}/zones/{zoneId}/clusters/{clusterId}",
+- "httpMethod": "GET",
+- "description": "Gets a specific cluster.",
+- "parameters": {
+- "clusterId": {
+- "type": "string",
+- "description": "The name of the cluster to retrieve.",
+- "required": true,
+- "location": "path"
+- },
+- "projectId": {
+- "type": "string",
+- "description": "The Google Developers Console project ID or project number.",
+- "required": true,
+- "location": "path"
+- },
+- "zoneId": {
+- "type": "string",
+- "description": "The name of the Google Compute Engine zone in which the cluster resides.",
+- "required": true,
+- "location": "path"
+- }
+- },
+- "parameterOrder": [
+- "projectId",
+- "zoneId",
+- "clusterId"
+- ],
+- "response": {
+- "$ref": "Cluster"
+- },
+- "scopes": [
+- "https://www.googleapis.com/auth/cloud-platform"
+- ]
+- },
+- "list": {
+- "id": "container.projects.zones.clusters.list",
+- "path": "{projectId}/zones/{zoneId}/clusters",
+- "httpMethod": "GET",
+- "description": "Lists all clusters owned by a project in the specified zone.",
+- "parameters": {
+- "projectId": {
+- "type": "string",
+- "description": "The Google Developers Console project ID or project number.",
+- "required": true,
+- "location": "path"
+- },
+- "zoneId": {
+- "type": "string",
+- "description": "The name of the Google Compute Engine zone in which the cluster resides.",
+- "required": true,
+- "location": "path"
+- }
+- },
+- "parameterOrder": [
+- "projectId",
+- "zoneId"
+- ],
+- "response": {
+- "$ref": "ListClustersResponse"
+- },
+- "scopes": [
+- "https://www.googleapis.com/auth/cloud-platform"
+- ]
+- }
+- }
+- },
+- "operations": {
+- "methods": {
+- "get": {
+- "id": "container.projects.zones.operations.get",
+- "path": "{projectId}/zones/{zoneId}/operations/{operationId}",
+- "httpMethod": "GET",
+- "description": "Gets the specified operation.",
+- "parameters": {
+- "operationId": {
+- "type": "string",
+- "description": "The server-assigned name of the operation.",
+- "required": true,
+- "location": "path"
+- },
+- "projectId": {
+- "type": "string",
+- "description": "The Google Developers Console project ID or project number.",
+- "required": true,
+- "location": "path"
+- },
+- "zoneId": {
+- "type": "string",
+- "description": "The name of the Google Compute Engine zone in which the operation resides. This is always the same zone as the cluster with which the operation is associated.",
+- "required": true,
+- "location": "path"
+- }
+- },
+- "parameterOrder": [
+- "projectId",
+- "zoneId",
+- "operationId"
+- ],
+- "response": {
+- "$ref": "Operation"
+- },
+- "scopes": [
+- "https://www.googleapis.com/auth/cloud-platform"
+- ]
+- },
+- "list": {
+- "id": "container.projects.zones.operations.list",
+- "path": "{projectId}/zones/{zoneId}/operations",
+- "httpMethod": "GET",
+- "description": "Lists all operations in a project in a specific zone.",
+- "parameters": {
+- "projectId": {
+- "type": "string",
+- "description": "The Google Developers Console project ID or project number.",
+- "required": true,
+- "location": "path"
+- },
+- "zoneId": {
+- "type": "string",
+- "description": "The name of the Google Compute Engine zone to return operations for.",
+- "required": true,
+- "location": "path"
+- }
+- },
+- "parameterOrder": [
+- "projectId",
+- "zoneId"
+- ],
+- "response": {
+- "$ref": "ListOperationsResponse"
+- },
+- "scopes": [
+- "https://www.googleapis.com/auth/cloud-platform"
+- ]
+- }
+- }
+- }
+- }
+- }
+- }
+- }
+- }
+-}
+diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/container/v1beta1/container-gen.go b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/container/v1beta1/container-gen.go
+deleted file mode 100644
+index c9fce64..0000000
+--- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/container/v1beta1/container-gen.go
++++ /dev/null
+@@ -1,1007 +0,0 @@
+-// Package container provides access to the Google Container Engine API.
+-//
+-// Usage example:
+-//
+-// import "code.google.com/p/google-api-go-client/container/v1beta1"
+-// ...
+-// containerService, err := container.New(oauthHttpClient)
+-package container
-
--type TargetHttpProxyList struct {
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id string `json:"id,omitempty"`
+-import (
+- "bytes"
+- "code.google.com/p/google-api-go-client/googleapi"
+- "encoding/json"
+- "errors"
+- "fmt"
+- "io"
+- "net/http"
+- "net/url"
+- "strconv"
+- "strings"
+-)
-
-- // Items: The TargetHttpProxy resources.
-- Items []*TargetHttpProxy `json:"items,omitempty"`
+-// Always reference these packages, just in case the auto-generated code
+-// below doesn't.
+-var _ = bytes.NewBuffer
+-var _ = strconv.Itoa
+-var _ = fmt.Sprintf
+-var _ = json.NewDecoder
+-var _ = io.Copy
+-var _ = url.Parse
+-var _ = googleapi.Version
+-var _ = errors.New
+-var _ = strings.Replace
-
-- // Kind: Type of resource.
-- Kind string `json:"kind,omitempty"`
+-const apiId = "container:v1beta1"
+-const apiName = "container"
+-const apiVersion = "v1beta1"
+-const basePath = "https://www.googleapis.com/container/v1beta1/projects/"
-
-- // NextPageToken: A token used to continue a truncated list request
-- // (output only).
-- NextPageToken string `json:"nextPageToken,omitempty"`
+-// OAuth2 scopes used by this API.
+-const (
+- // View and manage your data across Google Cloud Platform services
+- CloudPlatformScope = "https://www.googleapis.com/auth/cloud-platform"
+-)
-
-- // SelfLink: Server defined URL for this resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-func New(client *http.Client) (*Service, error) {
+- if client == nil {
+- return nil, errors.New("client is nil")
+- }
+- s := &Service{client: client, BasePath: basePath}
+- s.Projects = NewProjectsService(s)
+- return s, nil
-}
-
--type TargetInstance struct {
-- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
-- // only).
-- CreationTimestamp string `json:"creationTimestamp,omitempty"`
--
-- // Description: An optional textual description of the resource;
-- // provided by the client when the resource is created.
-- Description string `json:"description,omitempty"`
--
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id uint64 `json:"id,omitempty,string"`
--
-- // Instance: The URL to the instance that terminates the relevant
-- // traffic.
-- Instance string `json:"instance,omitempty"`
--
-- // Kind: Type of the resource.
-- Kind string `json:"kind,omitempty"`
--
-- // Name: Name of the resource; provided by the client when the resource
-- // is created. The name must be 1-63 characters long, and comply with
-- // RFC1035.
-- Name string `json:"name,omitempty"`
--
-- // NatPolicy: NAT option controlling how IPs are NAT'ed to the VM.
-- // Currently only NO_NAT (default value) is supported.
-- NatPolicy string `json:"natPolicy,omitempty"`
--
-- // SelfLink: Server defined URL for the resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-type Service struct {
+- client *http.Client
+- BasePath string // API endpoint base URL
-
-- // Zone: URL of the zone where the target instance resides (output
-- // only).
-- Zone string `json:"zone,omitempty"`
+- Projects *ProjectsService
-}
-
--type TargetInstanceAggregatedList struct {
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id string `json:"id,omitempty"`
+-func NewProjectsService(s *Service) *ProjectsService {
+- rs := &ProjectsService{s: s}
+- rs.Clusters = NewProjectsClustersService(s)
+- rs.Operations = NewProjectsOperationsService(s)
+- rs.Zones = NewProjectsZonesService(s)
+- return rs
+-}
-
-- // Items: A map of scoped target instance lists.
-- Items map[string]TargetInstancesScopedList `json:"items,omitempty"`
+-type ProjectsService struct {
+- s *Service
-
-- // Kind: Type of resource.
-- Kind string `json:"kind,omitempty"`
+- Clusters *ProjectsClustersService
-
-- // NextPageToken: A token used to continue a truncated list request
-- // (output only).
-- NextPageToken string `json:"nextPageToken,omitempty"`
+- Operations *ProjectsOperationsService
-
-- // SelfLink: Server defined URL for this resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+- Zones *ProjectsZonesService
-}
-
--type TargetInstanceList struct {
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id string `json:"id,omitempty"`
+-func NewProjectsClustersService(s *Service) *ProjectsClustersService {
+- rs := &ProjectsClustersService{s: s}
+- return rs
+-}
-
-- // Items: The TargetInstance resources.
-- Items []*TargetInstance `json:"items,omitempty"`
+-type ProjectsClustersService struct {
+- s *Service
+-}
-
-- // Kind: Type of resource.
-- Kind string `json:"kind,omitempty"`
+-func NewProjectsOperationsService(s *Service) *ProjectsOperationsService {
+- rs := &ProjectsOperationsService{s: s}
+- return rs
+-}
-
-- // NextPageToken: A token used to continue a truncated list request
-- // (output only).
-- NextPageToken string `json:"nextPageToken,omitempty"`
+-type ProjectsOperationsService struct {
+- s *Service
+-}
-
-- // SelfLink: Server defined URL for this resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-func NewProjectsZonesService(s *Service) *ProjectsZonesService {
+- rs := &ProjectsZonesService{s: s}
+- rs.Clusters = NewProjectsZonesClustersService(s)
+- rs.Operations = NewProjectsZonesOperationsService(s)
+- return rs
-}
-
--type TargetInstancesScopedList struct {
-- // TargetInstances: List of target instances contained in this scope.
-- TargetInstances []*TargetInstance `json:"targetInstances,omitempty"`
+-type ProjectsZonesService struct {
+- s *Service
-
-- // Warning: Informational warning which replaces the list of addresses
-- // when the list is empty.
-- Warning *TargetInstancesScopedListWarning `json:"warning,omitempty"`
--}
+- Clusters *ProjectsZonesClustersService
-
--type TargetInstancesScopedListWarning struct {
-- // Code: The warning type identifier for this warning.
-- Code string `json:"code,omitempty"`
+- Operations *ProjectsZonesOperationsService
+-}
-
-- // Data: Metadata for this warning in 'key: value' format.
-- Data []*TargetInstancesScopedListWarningData `json:"data,omitempty"`
+-func NewProjectsZonesClustersService(s *Service) *ProjectsZonesClustersService {
+- rs := &ProjectsZonesClustersService{s: s}
+- return rs
+-}
-
-- // Message: Optional human-readable details for this warning.
-- Message string `json:"message,omitempty"`
+-type ProjectsZonesClustersService struct {
+- s *Service
-}
-
--type TargetInstancesScopedListWarningData struct {
-- // Key: A key for the warning data.
-- Key string `json:"key,omitempty"`
+-func NewProjectsZonesOperationsService(s *Service) *ProjectsZonesOperationsService {
+- rs := &ProjectsZonesOperationsService{s: s}
+- return rs
+-}
-
-- // Value: A warning data value corresponding to the key.
-- Value string `json:"value,omitempty"`
+-type ProjectsZonesOperationsService struct {
+- s *Service
-}
-
--type TargetPool struct {
-- // BackupPool: This field is applicable only when the containing target
-- // pool is serving a forwarding rule as the primary pool, and its
-- // 'failoverRatio' field is properly set to a value between [0,
-- // 1].
-- //
-- // 'backupPool' and 'failoverRatio' together define the fallback
-- // behavior of the primary target pool: if the ratio of the healthy VMs
-- // in the primary pool is at or below 'failoverRatio', traffic arriving
-- // at the load-balanced IP will be directed to the backup pool.
-- //
-- // In case
-- // where 'failoverRatio' and 'backupPool' are not set, or all the VMs in
-- // the backup pool are unhealthy, the traffic will be directed back to
-- // the primary pool in the "force" mode, where traffic will be spread to
-- // the healthy VMs with the best effort, or to all VMs when no VM is
-- // healthy.
-- BackupPool string `json:"backupPool,omitempty"`
+-type Cluster struct {
+- // ClusterApiVersion: The API version of the Kubernetes master and
+- // kubelets running in this cluster. Allowed value is 0.4.2, or leave
+- // blank to pick up the latest stable release.
+- ClusterApiVersion string `json:"clusterApiVersion,omitempty"`
-
-- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
-- // only).
+- // ContainerIpv4Cidr: [Output only] The IP addresses of the container
+- // pods in this cluster, in CIDR notation (e.g. 1.2.3.4/29).
+- ContainerIpv4Cidr string `json:"containerIpv4Cidr,omitempty"`
+-
+- // CreationTimestamp: [Output only] The time the cluster was created, in
+- // RFC3339 text format.
- CreationTimestamp string `json:"creationTimestamp,omitempty"`
-
-- // Description: An optional textual description of the resource;
-- // provided by the client when the resource is created.
+- // Description: An optional description of this cluster.
- Description string `json:"description,omitempty"`
-
-- // FailoverRatio: This field is applicable only when the containing
-- // target pool is serving a forwarding rule as the primary pool (i.e.,
-- // not as a backup pool to some other target pool). The value of the
-- // field must be in [0, 1].
-- //
-- // If set, 'backupPool' must also be set. They
-- // together define the fallback behavior of the primary target pool: if
-- // the ratio of the healthy VMs in the primary pool is at or below this
-- // number, traffic arriving at the load-balanced IP will be directed to
-- // the backup pool.
+- // Endpoint: [Output only] The IP address of this cluster's Kubernetes
+- // master. The endpoint can be accessed from the internet at
+- // https://username:password@endpoint/.
- //
-- // In case where 'failoverRatio' is not set or all the
-- // VMs in the backup pool are unhealthy, the traffic will be directed
-- // back to the primary pool in the "force" mode, where traffic will be
-- // spread to the healthy VMs with the best effort, or to all VMs when no
-- // VM is healthy.
-- FailoverRatio float64 `json:"failoverRatio,omitempty"`
--
-- // HealthChecks: A list of URLs to the HttpHealthCheck resource. A
-- // member VM in this pool is considered healthy if and only if all
-- // specified health checks pass. An empty list means all member VMs will
-- // be considered healthy at all times.
-- HealthChecks []string `json:"healthChecks,omitempty"`
--
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id uint64 `json:"id,omitempty,string"`
--
-- // Instances: A list of resource URLs to the member VMs serving this
-- // pool. They must live in zones contained in the same region as this
-- // pool.
-- Instances []string `json:"instances,omitempty"`
+- // See the masterAuth property of
+- // this resource for username and password information.
+- Endpoint string `json:"endpoint,omitempty"`
-
-- // Kind: Type of the resource.
-- Kind string `json:"kind,omitempty"`
+- // MasterAuth: The HTTP basic authentication information for accessing
+- // the master. Because the master endpoint is open to the internet, you
+- // should create a strong password.
+- MasterAuth *MasterAuth `json:"masterAuth,omitempty"`
-
-- // Name: Name of the resource; provided by the client when the resource
-- // is created. The name must be 1-63 characters long, and comply with
-- // RFC1035.
+- // Name: The name of this cluster. The name must be unique within this
+- // project and zone, and can be up to 40 characters with the following
+- // restrictions:
+- // - Lowercase letters, numbers, and hyphens only.
+- // -
+- // Must start with a letter.
+- // - Must end with a number or a letter.
- Name string `json:"name,omitempty"`
-
-- // Region: URL of the region where the target pool resides (output
-- // only).
-- Region string `json:"region,omitempty"`
--
-- // SelfLink: Server defined URL for the resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+- // NodeConfig: The machine type and image to use for all nodes in this
+- // cluster. See the descriptions of the child properties of nodeConfig.
+- NodeConfig *NodeConfig `json:"nodeConfig,omitempty"`
-
-- // SessionAffinity: Sesssion affinity option, must be one of the
-- // following values: 'NONE': Connections from the same client IP may go
-- // to any VM in the pool; 'CLIENT_IP': Connections from the same client
-- // IP will go to the same VM in the pool while that VM remains healthy.
-- // 'CLIENT_IP_PROTO': Connections from the same client IP with the same
-- // IP protocol will go to the same VM in the pool while that VM remains
-- // healthy.
-- SessionAffinity string `json:"sessionAffinity,omitempty"`
--}
+- // NodeRoutingPrefixSize: [Output only] The size of the address space on
+- // each node for hosting containers.
+- NodeRoutingPrefixSize int64 `json:"nodeRoutingPrefixSize,omitempty"`
-
--type TargetPoolAggregatedList struct {
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id string `json:"id,omitempty"`
+- // NumNodes: The number of nodes to create in this cluster. You must
+- // ensure that your Compute Engine resource quota is sufficient for this
+- // number of instances plus one (to include the master). You must also
+- // have available firewall and routes quota.
+- NumNodes int64 `json:"numNodes,omitempty"`
-
-- // Items: A map of scoped target pool lists.
-- Items map[string]TargetPoolsScopedList `json:"items,omitempty"`
+- // ServicesIpv4Cidr: [Output only] The IP addresses of the Kubernetes
+- // services in this cluster, in CIDR notation (e.g. 1.2.3.4/29).
+- // Service addresses are always in the 10.0.0.0/16 range.
+- ServicesIpv4Cidr string `json:"servicesIpv4Cidr,omitempty"`
-
-- // Kind: Type of resource.
-- Kind string `json:"kind,omitempty"`
+- // Status: [Output only] The current status of this cluster.
+- Status string `json:"status,omitempty"`
-
-- // NextPageToken: A token used to continue a truncated list request
-- // (output only).
-- NextPageToken string `json:"nextPageToken,omitempty"`
+- // StatusMessage: [Output only] Additional information about the current
+- // status of this cluster, if available.
+- StatusMessage string `json:"statusMessage,omitempty"`
-
-- // SelfLink: Server defined URL for this resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+- // Zone: [Output only] The name of the Google Compute Engine zone in
+- // which the cluster resides.
+- Zone string `json:"zone,omitempty"`
-}
-
--type TargetPoolInstanceHealth struct {
-- HealthStatus []*HealthStatus `json:"healthStatus,omitempty"`
--
-- // Kind: Type of resource.
-- Kind string `json:"kind,omitempty"`
+-type CreateClusterRequest struct {
+- // Cluster: A cluster resource.
+- Cluster *Cluster `json:"cluster,omitempty"`
-}
-
--type TargetPoolList struct {
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id string `json:"id,omitempty"`
--
-- // Items: The TargetPool resources.
-- Items []*TargetPool `json:"items,omitempty"`
--
-- // Kind: Type of resource.
-- Kind string `json:"kind,omitempty"`
--
-- // NextPageToken: A token used to continue a truncated list request
-- // (output only).
-- NextPageToken string `json:"nextPageToken,omitempty"`
--
-- // SelfLink: Server defined URL for this resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-type ListAggregatedClustersResponse struct {
+- // Clusters: A list of clusters in the project, across all zones.
+- Clusters []*Cluster `json:"clusters,omitempty"`
-}
-
--type TargetPoolsAddHealthCheckRequest struct {
-- // HealthChecks: Health check URLs to be added to targetPool.
-- HealthChecks []*HealthCheckReference `json:"healthChecks,omitempty"`
+-type ListAggregatedOperationsResponse struct {
+- // Operations: A list of operations in the project, across all zones.
+- Operations []*Operation `json:"operations,omitempty"`
-}
-
--type TargetPoolsAddInstanceRequest struct {
-- // Instances: URLs of the instances to be added to targetPool.
-- Instances []*InstanceReference `json:"instances,omitempty"`
+-type ListClustersResponse struct {
+- // Clusters: A list of clusters in the project in the specified zone.
+- Clusters []*Cluster `json:"clusters,omitempty"`
-}
-
--type TargetPoolsRemoveHealthCheckRequest struct {
-- // HealthChecks: Health check URLs to be removed from targetPool.
-- HealthChecks []*HealthCheckReference `json:"healthChecks,omitempty"`
+-type ListOperationsResponse struct {
+- // Operations: A list of operations in the project in the specified
+- // zone.
+- Operations []*Operation `json:"operations,omitempty"`
-}
-
--type TargetPoolsRemoveInstanceRequest struct {
-- // Instances: URLs of the instances to be removed from targetPool.
-- Instances []*InstanceReference `json:"instances,omitempty"`
+-type MasterAuth struct {
+- // Password: The password to use when accessing the Kubernetes master
+- // endpoint.
+- Password string `json:"password,omitempty"`
+-
+- // User: The username to use when accessing the Kubernetes master
+- // endpoint.
+- User string `json:"user,omitempty"`
-}
-
--type TargetPoolsScopedList struct {
-- // TargetPools: List of target pools contained in this scope.
-- TargetPools []*TargetPool `json:"targetPools,omitempty"`
+-type NodeConfig struct {
+- // MachineType: The name of a Google Compute Engine machine type (e.g.
+- // n1-standard-1).
+- //
+- // If unspecified, the default machine type is
+- // n1-standard-1.
+- MachineType string `json:"machineType,omitempty"`
-
-- // Warning: Informational warning which replaces the list of addresses
-- // when the list is empty.
-- Warning *TargetPoolsScopedListWarning `json:"warning,omitempty"`
+- // SourceImage: The fully-specified name of a Google Compute Engine
+- // image. For example:
+- // https://www.googleapis.com/compute/v1/projects/debian-cloud/global/ima
+- // ges/backports-debian-7-wheezy-vYYYYMMDD (where YYYMMDD is the version
+- // date).
+- //
+- // If specifying an image, you are responsible for ensuring its
+- // compatibility with the Debian 7 backports image. We recommend leaving
+- // this field blank to accept the default backports-debian-7-wheezy
+- // value.
+- SourceImage string `json:"sourceImage,omitempty"`
-}
-
--type TargetPoolsScopedListWarning struct {
-- // Code: The warning type identifier for this warning.
-- Code string `json:"code,omitempty"`
--
-- // Data: Metadata for this warning in 'key: value' format.
-- Data []*TargetPoolsScopedListWarningData `json:"data,omitempty"`
+-type Operation struct {
+- // ErrorMessage: If an error has occurred, a textual description of the
+- // error.
+- ErrorMessage string `json:"errorMessage,omitempty"`
-
-- // Message: Optional human-readable details for this warning.
-- Message string `json:"message,omitempty"`
--}
+- // Name: The server-assigned ID for this operation. If the operation is
+- // fulfilled upfront, it may not have a resource name.
+- Name string `json:"name,omitempty"`
-
--type TargetPoolsScopedListWarningData struct {
-- // Key: A key for the warning data.
-- Key string `json:"key,omitempty"`
+- // OperationType: The operation type.
+- OperationType string `json:"operationType,omitempty"`
-
-- // Value: A warning data value corresponding to the key.
-- Value string `json:"value,omitempty"`
--}
+- // Status: The current status of the operation.
+- Status string `json:"status,omitempty"`
-
--type TargetReference struct {
+- // Target: [Optional] The URL of the cluster resource that this
+- // operation is associated with.
- Target string `json:"target,omitempty"`
--}
--
--type TestFailure struct {
-- ActualService string `json:"actualService,omitempty"`
-
-- ExpectedService string `json:"expectedService,omitempty"`
+- // Zone: The name of the Google Compute Engine zone in which the
+- // operation is taking place.
+- Zone string `json:"zone,omitempty"`
+-}
-
-- Host string `json:"host,omitempty"`
+-// method id "container.projects.clusters.list":
-
-- Path string `json:"path,omitempty"`
+-type ProjectsClustersListCall struct {
+- s *Service
+- projectId string
+- opt_ map[string]interface{}
-}
-
--type UrlMap struct {
-- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
-- // only).
-- CreationTimestamp string `json:"creationTimestamp,omitempty"`
--
-- // DefaultService: The URL of the BackendService resource if none of the
-- // hostRules match.
-- DefaultService string `json:"defaultService,omitempty"`
+-// List: Lists all clusters owned by a project across all zones.
+-func (r *ProjectsClustersService) List(projectId string) *ProjectsClustersListCall {
+- c := &ProjectsClustersListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.projectId = projectId
+- return c
+-}
-
-- // Description: An optional textual description of the resource;
-- // provided by the client when the resource is created.
-- Description string `json:"description,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *ProjectsClustersListCall) Fields(s ...googleapi.Field) *ProjectsClustersListCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
-
-- // Fingerprint: Fingerprint of this resource. A hash of the contents
-- // stored in this object. This field is used in optimistic locking. This
-- // field will be ignored when inserting a UrlMap. An up-to-date
-- // fingerprint must be provided in order to update the UrlMap.
-- Fingerprint string `json:"fingerprint,omitempty"`
+-func (c *ProjectsClustersListCall) Do() (*ListAggregatedClustersResponse, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{projectId}/clusters")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "projectId": c.projectId,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *ListAggregatedClustersResponse
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Lists all clusters owned by a project across all zones.",
+- // "httpMethod": "GET",
+- // "id": "container.projects.clusters.list",
+- // "parameterOrder": [
+- // "projectId"
+- // ],
+- // "parameters": {
+- // "projectId": {
+- // "description": "The Google Developers Console project ID or project number.",
+- // "location": "path",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{projectId}/clusters",
+- // "response": {
+- // "$ref": "ListAggregatedClustersResponse"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/cloud-platform"
+- // ]
+- // }
-
-- // HostRules: The list of HostRules to use against the URL.
-- HostRules []*HostRule `json:"hostRules,omitempty"`
+-}
-
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id uint64 `json:"id,omitempty,string"`
+-// method id "container.projects.operations.list":
-
-- // Kind: Type of the resource.
-- Kind string `json:"kind,omitempty"`
+-type ProjectsOperationsListCall struct {
+- s *Service
+- projectId string
+- opt_ map[string]interface{}
+-}
-
-- // Name: Name of the resource; provided by the client when the resource
-- // is created. The name must be 1-63 characters long, and comply with
-- // RFC1035.
-- Name string `json:"name,omitempty"`
+-// List: Lists all operations in a project, across all zones.
+-func (r *ProjectsOperationsService) List(projectId string) *ProjectsOperationsListCall {
+- c := &ProjectsOperationsListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.projectId = projectId
+- return c
+-}
-
-- // PathMatchers: The list of named PathMatchers to use against the URL.
-- PathMatchers []*PathMatcher `json:"pathMatchers,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *ProjectsOperationsListCall) Fields(s ...googleapi.Field) *ProjectsOperationsListCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
-
-- // SelfLink: Server defined URL for the resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-func (c *ProjectsOperationsListCall) Do() (*ListAggregatedOperationsResponse, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{projectId}/operations")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "projectId": c.projectId,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *ListAggregatedOperationsResponse
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Lists all operations in a project, across all zones.",
+- // "httpMethod": "GET",
+- // "id": "container.projects.operations.list",
+- // "parameterOrder": [
+- // "projectId"
+- // ],
+- // "parameters": {
+- // "projectId": {
+- // "description": "The Google Developers Console project ID or project number.",
+- // "location": "path",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{projectId}/operations",
+- // "response": {
+- // "$ref": "ListAggregatedOperationsResponse"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/cloud-platform"
+- // ]
+- // }
-
-- // Tests: The list of expected URL mappings. Request to update this
-- // UrlMap will succeed only all of the test cases pass.
-- Tests []*UrlMapTest `json:"tests,omitempty"`
-}
-
--type UrlMapList struct {
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id string `json:"id,omitempty"`
--
-- // Items: The UrlMap resources.
-- Items []*UrlMap `json:"items,omitempty"`
--
-- // Kind: Type of resource.
-- Kind string `json:"kind,omitempty"`
--
-- // NextPageToken: A token used to continue a truncated list request
-- // (output only).
-- NextPageToken string `json:"nextPageToken,omitempty"`
+-// method id "container.projects.zones.clusters.create":
-
-- // SelfLink: Server defined URL for this resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-type ProjectsZonesClustersCreateCall struct {
+- s *Service
+- projectId string
+- zoneId string
+- createclusterrequest *CreateClusterRequest
+- opt_ map[string]interface{}
-}
-
--type UrlMapReference struct {
-- UrlMap string `json:"urlMap,omitempty"`
+-// Create: Creates a cluster, consisting of the specified number and
+-// type of Google Compute Engine instances, plus a Kubernetes master
+-// instance.
+-//
+-// The cluster is created in the project's default
+-// network.
+-//
+-// A firewall is added that allows traffic into port 443 on
+-// the master, which enables HTTPS. A firewall and a route is added for
+-// each node to allow the containers on that node to communicate with
+-// all other instances in the cluster.
+-//
+-// Finally, a route named
+-// k8s-iproute-10-xx-0-0 is created to track that the cluster's
+-// 10.xx.0.0/16 CIDR has been assigned.
+-func (r *ProjectsZonesClustersService) Create(projectId string, zoneId string, createclusterrequest *CreateClusterRequest) *ProjectsZonesClustersCreateCall {
+- c := &ProjectsZonesClustersCreateCall{s: r.s, opt_: make(map[string]interface{})}
+- c.projectId = projectId
+- c.zoneId = zoneId
+- c.createclusterrequest = createclusterrequest
+- return c
-}
-
--type UrlMapTest struct {
-- // Description: Description of this test case.
-- Description string `json:"description,omitempty"`
--
-- // Host: Host portion of the URL.
-- Host string `json:"host,omitempty"`
--
-- // Path: Path portion of the URL.
-- Path string `json:"path,omitempty"`
--
-- // Service: Expected BackendService resource the given URL should be
-- // mapped to.
-- Service string `json:"service,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *ProjectsZonesClustersCreateCall) Fields(s ...googleapi.Field) *ProjectsZonesClustersCreateCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
-}
-
--type UrlMapValidationResult struct {
-- LoadErrors []string `json:"loadErrors,omitempty"`
+-func (c *ProjectsZonesClustersCreateCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- body, err := googleapi.WithoutDataWrapper.JSONReader(c.createclusterrequest)
+- if err != nil {
+- return nil, err
+- }
+- ctype := "application/json"
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{projectId}/zones/{zoneId}/clusters")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("POST", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "projectId": c.projectId,
+- "zoneId": c.zoneId,
+- })
+- req.Header.Set("Content-Type", ctype)
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Creates a cluster, consisting of the specified number and type of Google Compute Engine instances, plus a Kubernetes master instance.\n\nThe cluster is created in the project's default network.\n\nA firewall is added that allows traffic into port 443 on the master, which enables HTTPS. A firewall and a route is added for each node to allow the containers on that node to communicate with all other instances in the cluster.\n\nFinally, a route named k8s-iproute-10-xx-0-0 is created to track that the cluster's 10.xx.0.0/16 CIDR has been assigned.",
+- // "httpMethod": "POST",
+- // "id": "container.projects.zones.clusters.create",
+- // "parameterOrder": [
+- // "projectId",
+- // "zoneId"
+- // ],
+- // "parameters": {
+- // "projectId": {
+- // "description": "The Google Developers Console project ID or project number.",
+- // "location": "path",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "zoneId": {
+- // "description": "The name of the Google Compute Engine zone in which the cluster resides.",
+- // "location": "path",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{projectId}/zones/{zoneId}/clusters",
+- // "request": {
+- // "$ref": "CreateClusterRequest"
+- // },
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/cloud-platform"
+- // ]
+- // }
-
-- // LoadSucceeded: Whether the given UrlMap can be successfully loaded.
-- // If false, 'loadErrors' indicates the reasons.
-- LoadSucceeded bool `json:"loadSucceeded,omitempty"`
+-}
-
-- TestFailures []*TestFailure `json:"testFailures,omitempty"`
+-// method id "container.projects.zones.clusters.delete":
-
-- // TestPassed: If successfully loaded, this field indicates whether the
-- // test passed. If false, 'testFailures's indicate the reason of
-- // failure.
-- TestPassed bool `json:"testPassed,omitempty"`
+-type ProjectsZonesClustersDeleteCall struct {
+- s *Service
+- projectId string
+- zoneId string
+- clusterId string
+- opt_ map[string]interface{}
-}
-
--type UrlMapsValidateRequest struct {
-- // Resource: Content of the UrlMap to be validated.
-- Resource *UrlMap `json:"resource,omitempty"`
+-// Delete: Deletes the cluster, including the Kubernetes master and all
+-// worker nodes.
+-//
+-// Firewalls and routes that were configured at cluster
+-// creation are also deleted.
+-func (r *ProjectsZonesClustersService) Delete(projectId string, zoneId string, clusterId string) *ProjectsZonesClustersDeleteCall {
+- c := &ProjectsZonesClustersDeleteCall{s: r.s, opt_: make(map[string]interface{})}
+- c.projectId = projectId
+- c.zoneId = zoneId
+- c.clusterId = clusterId
+- return c
-}
-
--type UrlMapsValidateResponse struct {
-- Result *UrlMapValidationResult `json:"result,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *ProjectsZonesClustersDeleteCall) Fields(s ...googleapi.Field) *ProjectsZonesClustersDeleteCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
-}
-
--type UsageExportLocation struct {
-- // BucketName: The name of an existing bucket in Cloud Storage where the
-- // usage report object is stored. The Google Service Account is granted
-- // write access to this bucket. This is simply the bucket name, with no
-- // "gs://" or "https://storage.googleapis.com/" in front of it.
-- BucketName string `json:"bucketName,omitempty"`
+-func (c *ProjectsZonesClustersDeleteCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{projectId}/zones/{zoneId}/clusters/{clusterId}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("DELETE", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "projectId": c.projectId,
+- "zoneId": c.zoneId,
+- "clusterId": c.clusterId,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Deletes the cluster, including the Kubernetes master and all worker nodes.\n\nFirewalls and routes that were configured at cluster creation are also deleted.",
+- // "httpMethod": "DELETE",
+- // "id": "container.projects.zones.clusters.delete",
+- // "parameterOrder": [
+- // "projectId",
+- // "zoneId",
+- // "clusterId"
+- // ],
+- // "parameters": {
+- // "clusterId": {
+- // "description": "The name of the cluster to delete.",
+- // "location": "path",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "projectId": {
+- // "description": "The Google Developers Console project ID or project number.",
+- // "location": "path",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "zoneId": {
+- // "description": "The name of the Google Compute Engine zone in which the cluster resides.",
+- // "location": "path",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{projectId}/zones/{zoneId}/clusters/{clusterId}",
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/cloud-platform"
+- // ]
+- // }
-
-- // ReportNamePrefix: An optional prefix for the name of the usage report
-- // object stored in bucket_name. If not supplied, defaults to "usage_".
-- // The report is stored as a CSV file named _gce_.csv. where is the day
-- // of the usage according to Pacific Time. The prefix should conform to
-- // Cloud Storage object naming conventions.
-- ReportNamePrefix string `json:"reportNamePrefix,omitempty"`
-}
-
--type Zone struct {
-- // CreationTimestamp: Creation timestamp in RFC3339 text format (output
-- // only).
-- CreationTimestamp string `json:"creationTimestamp,omitempty"`
--
-- // Deprecated: The deprecation status associated with this zone.
-- Deprecated *DeprecationStatus `json:"deprecated,omitempty"`
--
-- // Description: Textual description of the resource.
-- Description string `json:"description,omitempty"`
--
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id uint64 `json:"id,omitempty,string"`
--
-- // Kind: Type of the resource.
-- Kind string `json:"kind,omitempty"`
+-// method id "container.projects.zones.clusters.get":
-
-- // MaintenanceWindows: Scheduled maintenance windows for the zone. When
-- // the zone is in a maintenance window, all resources which reside in
-- // the zone will be unavailable.
-- MaintenanceWindows []*ZoneMaintenanceWindows `json:"maintenanceWindows,omitempty"`
+-type ProjectsZonesClustersGetCall struct {
+- s *Service
+- projectId string
+- zoneId string
+- clusterId string
+- opt_ map[string]interface{}
+-}
-
-- // Name: Name of the resource.
-- Name string `json:"name,omitempty"`
+-// Get: Gets a specific cluster.
+-func (r *ProjectsZonesClustersService) Get(projectId string, zoneId string, clusterId string) *ProjectsZonesClustersGetCall {
+- c := &ProjectsZonesClustersGetCall{s: r.s, opt_: make(map[string]interface{})}
+- c.projectId = projectId
+- c.zoneId = zoneId
+- c.clusterId = clusterId
+- return c
+-}
-
-- // Region: Full URL reference to the region which hosts the zone (output
-- // only).
-- Region string `json:"region,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *ProjectsZonesClustersGetCall) Fields(s ...googleapi.Field) *ProjectsZonesClustersGetCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
-
-- // SelfLink: Server defined URL for the resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-func (c *ProjectsZonesClustersGetCall) Do() (*Cluster, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{projectId}/zones/{zoneId}/clusters/{clusterId}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "projectId": c.projectId,
+- "zoneId": c.zoneId,
+- "clusterId": c.clusterId,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Cluster
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Gets a specific cluster.",
+- // "httpMethod": "GET",
+- // "id": "container.projects.zones.clusters.get",
+- // "parameterOrder": [
+- // "projectId",
+- // "zoneId",
+- // "clusterId"
+- // ],
+- // "parameters": {
+- // "clusterId": {
+- // "description": "The name of the cluster to retrieve.",
+- // "location": "path",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "projectId": {
+- // "description": "The Google Developers Console project ID or project number.",
+- // "location": "path",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "zoneId": {
+- // "description": "The name of the Google Compute Engine zone in which the cluster resides.",
+- // "location": "path",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{projectId}/zones/{zoneId}/clusters/{clusterId}",
+- // "response": {
+- // "$ref": "Cluster"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/cloud-platform"
+- // ]
+- // }
-
-- // Status: Status of the zone. "UP" or "DOWN".
-- Status string `json:"status,omitempty"`
-}
-
--type ZoneMaintenanceWindows struct {
-- // BeginTime: Begin time of the maintenance window, in RFC 3339 format.
-- BeginTime string `json:"beginTime,omitempty"`
--
-- // Description: Textual description of the maintenance window.
-- Description string `json:"description,omitempty"`
+-// method id "container.projects.zones.clusters.list":
-
-- // EndTime: End time of the maintenance window, in RFC 3339 format.
-- EndTime string `json:"endTime,omitempty"`
+-type ProjectsZonesClustersListCall struct {
+- s *Service
+- projectId string
+- zoneId string
+- opt_ map[string]interface{}
+-}
-
-- // Name: Name of the maintenance window.
-- Name string `json:"name,omitempty"`
+-// List: Lists all clusters owned by a project in the specified zone.
+-func (r *ProjectsZonesClustersService) List(projectId string, zoneId string) *ProjectsZonesClustersListCall {
+- c := &ProjectsZonesClustersListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.projectId = projectId
+- c.zoneId = zoneId
+- return c
-}
-
--type ZoneList struct {
-- // Id: Unique identifier for the resource; defined by the server (output
-- // only).
-- Id string `json:"id,omitempty"`
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *ProjectsZonesClustersListCall) Fields(s ...googleapi.Field) *ProjectsZonesClustersListCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
+-}
-
-- // Items: The zone resources.
-- Items []*Zone `json:"items,omitempty"`
+-func (c *ProjectsZonesClustersListCall) Do() (*ListClustersResponse, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{projectId}/zones/{zoneId}/clusters")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "projectId": c.projectId,
+- "zoneId": c.zoneId,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *ListClustersResponse
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Lists all clusters owned by a project in the specified zone.",
+- // "httpMethod": "GET",
+- // "id": "container.projects.zones.clusters.list",
+- // "parameterOrder": [
+- // "projectId",
+- // "zoneId"
+- // ],
+- // "parameters": {
+- // "projectId": {
+- // "description": "The Google Developers Console project ID or project number.",
+- // "location": "path",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "zoneId": {
+- // "description": "The name of the Google Compute Engine zone in which the cluster resides.",
+- // "location": "path",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{projectId}/zones/{zoneId}/clusters",
+- // "response": {
+- // "$ref": "ListClustersResponse"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/cloud-platform"
+- // ]
+- // }
-
-- // Kind: Type of resource.
-- Kind string `json:"kind,omitempty"`
+-}
-
-- // NextPageToken: A token used to continue a truncated list request
-- // (output only).
-- NextPageToken string `json:"nextPageToken,omitempty"`
+-// method id "container.projects.zones.operations.get":
-
-- // SelfLink: Server defined URL for this resource (output only).
-- SelfLink string `json:"selfLink,omitempty"`
+-type ProjectsZonesOperationsGetCall struct {
+- s *Service
+- projectId string
+- zoneId string
+- operationId string
+- opt_ map[string]interface{}
-}
-
--// method id "compute.addresses.aggregatedList":
+-// Get: Gets the specified operation.
+-func (r *ProjectsZonesOperationsService) Get(projectId string, zoneId string, operationId string) *ProjectsZonesOperationsGetCall {
+- c := &ProjectsZonesOperationsGetCall{s: r.s, opt_: make(map[string]interface{})}
+- c.projectId = projectId
+- c.zoneId = zoneId
+- c.operationId = operationId
+- return c
+-}
-
--type AddressesAggregatedListCall struct {
-- s *Service
-- project string
-- opt_ map[string]interface{}
+-// Fields allows partial responses to be retrieved.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-// for more information.
+-func (c *ProjectsZonesOperationsGetCall) Fields(s ...googleapi.Field) *ProjectsZonesOperationsGetCall {
+- c.opt_["fields"] = googleapi.CombineFields(s)
+- return c
-}
-
--// AggregatedList: Retrieves the list of addresses grouped by scope.
--func (r *AddressesService) AggregatedList(project string) *AddressesAggregatedListCall {
-- c := &AddressesAggregatedListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- return c
+-func (c *ProjectsZonesOperationsGetCall) Do() (*Operation, error) {
+- var body io.Reader = nil
+- params := make(url.Values)
+- params.Set("alt", "json")
+- if v, ok := c.opt_["fields"]; ok {
+- params.Set("fields", fmt.Sprintf("%v", v))
+- }
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{projectId}/zones/{zoneId}/operations/{operationId}")
+- urls += "?" + params.Encode()
+- req, _ := http.NewRequest("GET", urls, body)
+- googleapi.Expand(req.URL, map[string]string{
+- "projectId": c.projectId,
+- "zoneId": c.zoneId,
+- "operationId": c.operationId,
+- })
+- req.Header.Set("User-Agent", "google-api-go-client/0.5")
+- res, err := c.s.client.Do(req)
+- if err != nil {
+- return nil, err
+- }
+- defer googleapi.CloseBody(res)
+- if err := googleapi.CheckResponse(res); err != nil {
+- return nil, err
+- }
+- var ret *Operation
+- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return nil, err
+- }
+- return ret, nil
+- // {
+- // "description": "Gets the specified operation.",
+- // "httpMethod": "GET",
+- // "id": "container.projects.zones.operations.get",
+- // "parameterOrder": [
+- // "projectId",
+- // "zoneId",
+- // "operationId"
+- // ],
+- // "parameters": {
+- // "operationId": {
+- // "description": "The server-assigned name of the operation.",
+- // "location": "path",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "projectId": {
+- // "description": "The Google Developers Console project ID or project number.",
+- // "location": "path",
+- // "required": true,
+- // "type": "string"
+- // },
+- // "zoneId": {
+- // "description": "The name of the Google Compute Engine zone in which the operation resides. This is always the same zone as the cluster with which the operation is associated.",
+- // "location": "path",
+- // "required": true,
+- // "type": "string"
+- // }
+- // },
+- // "path": "{projectId}/zones/{zoneId}/operations/{operationId}",
+- // "response": {
+- // "$ref": "Operation"
+- // },
+- // "scopes": [
+- // "https://www.googleapis.com/auth/cloud-platform"
+- // ]
+- // }
+-
-}
-
--// Filter sets the optional parameter "filter": Filter expression for
--// filtering listed resources.
--func (c *AddressesAggregatedListCall) Filter(filter string) *AddressesAggregatedListCall {
-- c.opt_["filter"] = filter
-- return c
--}
+-// method id "container.projects.zones.operations.list":
-
--// MaxResults sets the optional parameter "maxResults": Maximum count of
--// results to be returned. Maximum value is 500 and default value is
--// 500.
--func (c *AddressesAggregatedListCall) MaxResults(maxResults int64) *AddressesAggregatedListCall {
-- c.opt_["maxResults"] = maxResults
-- return c
+-type ProjectsZonesOperationsListCall struct {
+- s *Service
+- projectId string
+- zoneId string
+- opt_ map[string]interface{}
-}
-
--// PageToken sets the optional parameter "pageToken": Tag returned by a
--// previous list request truncated by maxResults. Used to continue a
--// previous list request.
--func (c *AddressesAggregatedListCall) PageToken(pageToken string) *AddressesAggregatedListCall {
-- c.opt_["pageToken"] = pageToken
+-// List: Lists all operations in a project in a specific zone.
+-func (r *ProjectsZonesOperationsService) List(projectId string, zoneId string) *ProjectsZonesOperationsListCall {
+- c := &ProjectsZonesOperationsListCall{s: r.s, opt_: make(map[string]interface{})}
+- c.projectId = projectId
+- c.zoneId = zoneId
- return c
-}
-
-// Fields allows partial responses to be retrieved.
-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
-// for more information.
--func (c *AddressesAggregatedListCall) Fields(s ...googleapi.Field) *AddressesAggregatedListCall {
+-func (c *ProjectsZonesOperationsListCall) Fields(s ...googleapi.Field) *ProjectsZonesOperationsListCall {
- c.opt_["fields"] = googleapi.CombineFields(s)
- return c
-}
-
--func (c *AddressesAggregatedListCall) Do() (*AddressAggregatedList, error) {
+-func (c *ProjectsZonesOperationsListCall) Do() (*ListOperationsResponse, error) {
- var body io.Reader = nil
- params := make(url.Values)
- params.Set("alt", "json")
-- if v, ok := c.opt_["filter"]; ok {
-- params.Set("filter", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["maxResults"]; ok {
-- params.Set("maxResults", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["pageToken"]; ok {
-- params.Set("pageToken", fmt.Sprintf("%v", v))
-- }
- if v, ok := c.opt_["fields"]; ok {
- params.Set("fields", fmt.Sprintf("%v", v))
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/aggregated/addresses")
+- urls := googleapi.ResolveRelative(c.s.BasePath, "{projectId}/zones/{zoneId}/operations")
- urls += "?" + params.Encode()
- req, _ := http.NewRequest("GET", urls, body)
- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
+- "projectId": c.projectId,
+- "zoneId": c.zoneId,
- })
- req.Header.Set("User-Agent", "google-api-go-client/0.5")
- res, err := c.s.client.Do(req)
@@ -54688,38743 +36157,43033 @@ index 7d193b5..0000000
- if err := googleapi.CheckResponse(res); err != nil {
- return nil, err
- }
-- var ret *AddressAggregatedList
+- var ret *ListOperationsResponse
- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
- return nil, err
- }
- return ret, nil
- // {
-- // "description": "Retrieves the list of addresses grouped by scope.",
+- // "description": "Lists all operations in a project in a specific zone.",
- // "httpMethod": "GET",
-- // "id": "compute.addresses.aggregatedList",
+- // "id": "container.projects.zones.operations.list",
- // "parameterOrder": [
-- // "project"
+- // "projectId",
+- // "zoneId"
- // ],
- // "parameters": {
-- // "filter": {
-- // "description": "Optional. Filter expression for filtering listed resources.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "maxResults": {
-- // "default": "500",
-- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
-- // "format": "uint32",
-- // "location": "query",
-- // "maximum": "500",
-- // "minimum": "0",
-- // "type": "integer"
-- // },
-- // "pageToken": {
-- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
-- // "location": "query",
+- // "projectId": {
+- // "description": "The Google Developers Console project ID or project number.",
+- // "location": "path",
+- // "required": true,
- // "type": "string"
- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
+- // "zoneId": {
+- // "description": "The name of the Google Compute Engine zone to return operations for.",
- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
- // "required": true,
- // "type": "string"
- // }
- // },
-- // "path": "{project}/aggregated/addresses",
+- // "path": "{projectId}/zones/{zoneId}/operations",
- // "response": {
-- // "$ref": "AddressAggregatedList"
+- // "$ref": "ListOperationsResponse"
- // },
- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
+- // "https://www.googleapis.com/auth/cloud-platform"
- // ]
- // }
-
-}
+diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/googleapi.go b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/googleapi.go
+deleted file mode 100644
+index d6e5cd8..0000000
+--- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/googleapi.go
++++ /dev/null
+@@ -1,401 +0,0 @@
+-// Copyright 2011 Google Inc. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-// Package googleapi contains the common code shared by all Google API
+-// libraries.
+-package googleapi
+-
+-import (
+- "bytes"
+- "encoding/json"
+- "fmt"
+- "io"
+- "io/ioutil"
+- "mime/multipart"
+- "net/http"
+- "net/textproto"
+- "net/url"
+- "os"
+- "strings"
+-
+- "code.google.com/p/google-api-go-client/googleapi/internal/uritemplates"
+-)
+-
+-// ContentTyper is an interface for Readers which know (or would like
+-// to override) their Content-Type. If a media body doesn't implement
+-// ContentTyper, the type is sniffed from the content using
+-// http.DetectContentType.
+-type ContentTyper interface {
+- ContentType() string
+-}
+-
+-const Version = "0.5"
+-
+-// Error contains an error response from the server.
+-type Error struct {
+- // Code is the HTTP response status code and will always be populated.
+- Code int `json:"code"`
+- // Message is the server response message and is only populated when
+- // explicitly referenced by the JSON server response.
+- Message string `json:"message"`
+- // Body is the raw response returned by the server.
+- // It is often but not always JSON, depending on how the request fails.
+- Body string
+-
+- Errors []ErrorItem
+-}
+-
+-// ErrorItem is a detailed error code & message from the Google API frontend.
+-type ErrorItem struct {
+- // Reason is the typed error code. For example: "some_example".
+- Reason string `json:"reason"`
+- // Message is the human-readable description of the error.
+- Message string `json:"message"`
+-}
+-
+-func (e *Error) Error() string {
+- if len(e.Errors) == 0 && e.Message == "" {
+- return fmt.Sprintf("googleapi: got HTTP response code %d with body: %v", e.Code, e.Body)
+- }
+- var buf bytes.Buffer
+- fmt.Fprintf(&buf, "googleapi: Error %d: ", e.Code)
+- if e.Message != "" {
+- fmt.Fprintf(&buf, "%s", e.Message)
+- }
+- if len(e.Errors) == 0 {
+- return strings.TrimSpace(buf.String())
+- }
+- if len(e.Errors) == 1 && e.Errors[0].Message == e.Message {
+- fmt.Fprintf(&buf, ", %s", e.Errors[0].Reason)
+- return buf.String()
+- }
+- fmt.Fprintln(&buf, "\nMore details:")
+- for _, v := range e.Errors {
+- fmt.Fprintf(&buf, "Reason: %s, Message: %s\n", v.Reason, v.Message)
+- }
+- return buf.String()
+-}
+-
+-type errorReply struct {
+- Error *Error `json:"error"`
+-}
+-
+-// CheckResponse returns an error (of type *Error) if the response
+-// status code is not 2xx.
+-func CheckResponse(res *http.Response) error {
+- if res.StatusCode >= 200 && res.StatusCode <= 299 {
+- return nil
+- }
+- slurp, err := ioutil.ReadAll(res.Body)
+- if err == nil {
+- jerr := new(errorReply)
+- err = json.Unmarshal(slurp, jerr)
+- if err == nil && jerr.Error != nil {
+- if jerr.Error.Code == 0 {
+- jerr.Error.Code = res.StatusCode
+- }
+- jerr.Error.Body = string(slurp)
+- return jerr.Error
+- }
+- }
+- return &Error{
+- Code: res.StatusCode,
+- Body: string(slurp),
+- }
+-}
+-
+-type MarshalStyle bool
+-
+-var WithDataWrapper = MarshalStyle(true)
+-var WithoutDataWrapper = MarshalStyle(false)
+-
+-func (wrap MarshalStyle) JSONReader(v interface{}) (io.Reader, error) {
+- buf := new(bytes.Buffer)
+- if wrap {
+- buf.Write([]byte(`{"data": `))
+- }
+- err := json.NewEncoder(buf).Encode(v)
+- if err != nil {
+- return nil, err
+- }
+- if wrap {
+- buf.Write([]byte(`}`))
+- }
+- return buf, nil
+-}
+-
+-func getMediaType(media io.Reader) (io.Reader, string) {
+- if typer, ok := media.(ContentTyper); ok {
+- return media, typer.ContentType()
+- }
+-
+- typ := "application/octet-stream"
+- buf := make([]byte, 1024)
+- n, err := media.Read(buf)
+- buf = buf[:n]
+- if err == nil {
+- typ = http.DetectContentType(buf)
+- }
+- return io.MultiReader(bytes.NewBuffer(buf), media), typ
+-}
+-
+-type Lengther interface {
+- Len() int
+-}
+-
+-// endingWithErrorReader from r until it returns an error. If the
+-// final error from r is os.EOF and e is non-nil, e is used instead.
+-type endingWithErrorReader struct {
+- r io.Reader
+- e error
+-}
+-
+-func (er endingWithErrorReader) Read(p []byte) (n int, err error) {
+- n, err = er.r.Read(p)
+- if err == io.EOF && er.e != nil {
+- err = er.e
+- }
+- return
+-}
+-
+-func getReaderSize(r io.Reader) (io.Reader, int64) {
+- // Ideal case, the reader knows its own size.
+- if lr, ok := r.(Lengther); ok {
+- return r, int64(lr.Len())
+- }
+-
+- // But maybe it's a seeker and we can seek to the end to find its size.
+- if s, ok := r.(io.Seeker); ok {
+- pos0, err := s.Seek(0, os.SEEK_CUR)
+- if err == nil {
+- posend, err := s.Seek(0, os.SEEK_END)
+- if err == nil {
+- _, err = s.Seek(pos0, os.SEEK_SET)
+- if err == nil {
+- return r, posend - pos0
+- } else {
+- // We moved it forward but can't restore it.
+- // Seems unlikely, but can't really restore now.
+- return endingWithErrorReader{strings.NewReader(""), err}, posend - pos0
+- }
+- }
+- }
+- }
+-
+- // Otherwise we have to make a copy to calculate how big the reader is.
+- buf := new(bytes.Buffer)
+- // TODO(bradfitz): put a cap on this copy? spill to disk after
+- // a certain point?
+- _, err := io.Copy(buf, r)
+- return endingWithErrorReader{buf, err}, int64(buf.Len())
+-}
+-
+-func typeHeader(contentType string) textproto.MIMEHeader {
+- h := make(textproto.MIMEHeader)
+- h.Set("Content-Type", contentType)
+- return h
+-}
+-
+-// countingWriter counts the number of bytes it receives to write, but
+-// discards them.
+-type countingWriter struct {
+- n *int64
+-}
+-
+-func (w countingWriter) Write(p []byte) (int, error) {
+- *w.n += int64(len(p))
+- return len(p), nil
+-}
+-
+-// ConditionallyIncludeMedia does nothing if media is nil.
+-//
+-// bodyp is an in/out parameter. It should initially point to the
+-// reader of the application/json (or whatever) payload to send in the
+-// API request. It's updated to point to the multipart body reader.
+-//
+-// ctypep is an in/out parameter. It should initially point to the
+-// content type of the bodyp, usually "application/json". It's updated
+-// to the "multipart/related" content type, with random boundary.
+-//
+-// The return value is the content-length of the entire multpart body.
+-func ConditionallyIncludeMedia(media io.Reader, bodyp *io.Reader, ctypep *string) (totalContentLength int64, ok bool) {
+- if media == nil {
+- return
+- }
+- // Get the media type and size. The type check might return a
+- // different reader instance, so do the size check first,
+- // which looks at the specific type of the io.Reader.
+- var mediaType string
+- if typer, ok := media.(ContentTyper); ok {
+- mediaType = typer.ContentType()
+- }
+- media, mediaSize := getReaderSize(media)
+- if mediaType == "" {
+- media, mediaType = getMediaType(media)
+- }
+- body, bodyType := *bodyp, *ctypep
+- body, bodySize := getReaderSize(body)
+-
+- // Calculate how big the the multipart will be.
+- {
+- totalContentLength = bodySize + mediaSize
+- mpw := multipart.NewWriter(countingWriter{&totalContentLength})
+- mpw.CreatePart(typeHeader(bodyType))
+- mpw.CreatePart(typeHeader(mediaType))
+- mpw.Close()
+- }
+-
+- pr, pw := io.Pipe()
+- mpw := multipart.NewWriter(pw)
+- *bodyp = pr
+- *ctypep = "multipart/related; boundary=" + mpw.Boundary()
+- go func() {
+- defer pw.Close()
+- defer mpw.Close()
+-
+- w, err := mpw.CreatePart(typeHeader(bodyType))
+- if err != nil {
+- return
+- }
+- _, err = io.Copy(w, body)
+- if err != nil {
+- return
+- }
+-
+- w, err = mpw.CreatePart(typeHeader(mediaType))
+- if err != nil {
+- return
+- }
+- _, err = io.Copy(w, media)
+- if err != nil {
+- return
+- }
+- }()
+- return totalContentLength, true
+-}
+-
+-func ResolveRelative(basestr, relstr string) string {
+- u, _ := url.Parse(basestr)
+- rel, _ := url.Parse(relstr)
+- u = u.ResolveReference(rel)
+- us := u.String()
+- us = strings.Replace(us, "%7B", "{", -1)
+- us = strings.Replace(us, "%7D", "}", -1)
+- return us
+-}
+-
+-// has4860Fix is whether this Go environment contains the fix for
+-// http://golang.org/issue/4860
+-var has4860Fix bool
+-
+-// init initializes has4860Fix by checking the behavior of the net/http package.
+-func init() {
+- r := http.Request{
+- URL: &url.URL{
+- Scheme: "http",
+- Opaque: "//opaque",
+- },
+- }
+- b := &bytes.Buffer{}
+- r.Write(b)
+- has4860Fix = bytes.HasPrefix(b.Bytes(), []byte("GET http"))
+-}
+-
+-// SetOpaque sets u.Opaque from u.Path such that HTTP requests to it
+-// don't alter any hex-escaped characters in u.Path.
+-func SetOpaque(u *url.URL) {
+- u.Opaque = "//" + u.Host + u.Path
+- if !has4860Fix {
+- u.Opaque = u.Scheme + ":" + u.Opaque
+- }
+-}
+-
+-// Expand subsitutes any {encoded} strings in the URL passed in using
+-// the map supplied.
+-//
+-// This calls SetOpaque to avoid encoding of the parameters in the URL path.
+-func Expand(u *url.URL, expansions map[string]string) {
+- expanded, err := uritemplates.Expand(u.Path, expansions)
+- if err == nil {
+- u.Path = expanded
+- SetOpaque(u)
+- }
+-}
+-
+-// CloseBody is used to close res.Body.
+-// Prior to calling Close, it also tries to Read a small amount to see an EOF.
+-// Not seeing an EOF can prevent HTTP Transports from reusing connections.
+-func CloseBody(res *http.Response) {
+- if res == nil || res.Body == nil {
+- return
+- }
+- // Justification for 3 byte reads: two for up to "\r\n" after
+- // a JSON/XML document, and then 1 to see EOF if we haven't yet.
+- // TODO(bradfitz): detect Go 1.3+ and skip these reads.
+- // See https://codereview.appspot.com/58240043
+- // and https://codereview.appspot.com/49570044
+- buf := make([]byte, 1)
+- for i := 0; i < 3; i++ {
+- _, err := res.Body.Read(buf)
+- if err != nil {
+- break
+- }
+- }
+- res.Body.Close()
+-
+-}
+-
+-// VariantType returns the type name of the given variant.
+-// If the map doesn't contain the named key or the value is not a []interface{}, "" is returned.
+-// This is used to support "variant" APIs that can return one of a number of different types.
+-func VariantType(t map[string]interface{}) string {
+- s, _ := t["type"].(string)
+- return s
+-}
+-
+-// ConvertVariant uses the JSON encoder/decoder to fill in the struct 'dst' with the fields found in variant 'v'.
+-// This is used to support "variant" APIs that can return one of a number of different types.
+-// It reports whether the conversion was successful.
+-func ConvertVariant(v map[string]interface{}, dst interface{}) bool {
+- var buf bytes.Buffer
+- err := json.NewEncoder(&buf).Encode(v)
+- if err != nil {
+- return false
+- }
+- return json.Unmarshal(buf.Bytes(), dst) == nil
+-}
-
--// method id "compute.addresses.delete":
+-// A Field names a field to be retrieved with a partial response.
+-// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+-//
+-// Partial responses can dramatically reduce the amount of data that must be sent to your application.
+-// In order to request partial responses, you can specify the full list of fields
+-// that your application needs by adding the Fields option to your request.
+-//
+-// Field strings use camelCase with leading lower-case characters to identify fields within the response.
+-//
+-// For example, if your response has a "NextPageToken" and a slice of "Items" with "Id" fields,
+-// you could request just those fields like this:
+-//
+-// svc.Events.List().Fields("nextPageToken", "items/id").Do()
+-//
+-// or if you were also interested in each Item's "Updated" field, you can combine them like this:
+-//
+-// svc.Events.List().Fields("nextPageToken", "items(id,updated)").Do()
+-//
+-// More information about field formatting can be found here:
+-// https://developers.google.com/+/api/#fields-syntax
+-//
+-// Another way to find field names is through the Google API explorer:
+-// https://developers.google.com/apis-explorer/#p/
+-type Field string
-
--type AddressesDeleteCall struct {
-- s *Service
-- project string
-- region string
-- address string
-- opt_ map[string]interface{}
+-// CombineFields combines fields into a single string.
+-func CombineFields(s []Field) string {
+- r := make([]string, len(s))
+- for i, v := range s {
+- r[i] = string(v)
+- }
+- return strings.Join(r, ",")
-}
+diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/googleapi_test.go b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/googleapi_test.go
+deleted file mode 100644
+index abc5185..0000000
+--- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/googleapi_test.go
++++ /dev/null
+@@ -1,361 +0,0 @@
+-// Copyright 2011 Google Inc. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
--// Delete: Deletes the specified address resource.
--func (r *AddressesService) Delete(project string, region string, address string) *AddressesDeleteCall {
-- c := &AddressesDeleteCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.region = region
-- c.address = address
-- return c
+-package googleapi
+-
+-import (
+- "bytes"
+- "encoding/json"
+- "fmt"
+- "io/ioutil"
+- "net/http"
+- "net/url"
+- "reflect"
+- "strings"
+- "testing"
+-)
+-
+-type SetOpaqueTest struct {
+- in *url.URL
+- wantRequestURI string
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *AddressesDeleteCall) Fields(s ...googleapi.Field) *AddressesDeleteCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-var setOpaqueTests = []SetOpaqueTest{
+- // no path
+- {
+- &url.URL{
+- Scheme: "http",
+- Host: "www.golang.org",
+- },
+- "http://www.golang.org",
+- },
+- // path
+- {
+- &url.URL{
+- Scheme: "http",
+- Host: "www.golang.org",
+- Path: "/",
+- },
+- "http://www.golang.org/",
+- },
+- // file with hex escaping
+- {
+- &url.URL{
+- Scheme: "https",
+- Host: "www.golang.org",
+- Path: "/file%20one&two",
+- },
+- "https://www.golang.org/file%20one&two",
+- },
+- // query
+- {
+- &url.URL{
+- Scheme: "http",
+- Host: "www.golang.org",
+- Path: "/",
+- RawQuery: "q=go+language",
+- },
+- "http://www.golang.org/?q=go+language",
+- },
+- // file with hex escaping in path plus query
+- {
+- &url.URL{
+- Scheme: "https",
+- Host: "www.golang.org",
+- Path: "/file%20one&two",
+- RawQuery: "q=go+language",
+- },
+- "https://www.golang.org/file%20one&two?q=go+language",
+- },
+- // query with hex escaping
+- {
+- &url.URL{
+- Scheme: "http",
+- Host: "www.golang.org",
+- Path: "/",
+- RawQuery: "q=go%20language",
+- },
+- "http://www.golang.org/?q=go%20language",
+- },
-}
-
--func (c *AddressesDeleteCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/addresses/{address}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("DELETE", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "region": c.region,
-- "address": c.address,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-// prefixTmpl is a template for the expected prefix of the output of writing
+-// an HTTP request.
+-const prefixTmpl = "GET %v HTTP/1.1\r\nHost: %v\r\n"
+-
+-func TestSetOpaque(t *testing.T) {
+- for _, test := range setOpaqueTests {
+- u := *test.in
+- SetOpaque(&u)
+-
+- w := &bytes.Buffer{}
+- r := &http.Request{URL: &u}
+- if err := r.Write(w); err != nil {
+- t.Errorf("write request: %v", err)
+- continue
+- }
+-
+- prefix := fmt.Sprintf(prefixTmpl, test.wantRequestURI, test.in.Host)
+- if got := string(w.Bytes()); !strings.HasPrefix(got, prefix) {
+- t.Errorf("got %q expected prefix %q", got, prefix)
+- }
- }
-- return ret, nil
-- // {
-- // "description": "Deletes the specified address resource.",
-- // "httpMethod": "DELETE",
-- // "id": "compute.addresses.delete",
-- // "parameterOrder": [
-- // "project",
-- // "region",
-- // "address"
-- // ],
-- // "parameters": {
-- // "address": {
-- // "description": "Name of the address resource to delete.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "region": {
-- // "description": "Name of the region scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/regions/{region}/addresses/{address}",
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
+-}
-
+-type ExpandTest struct {
+- in string
+- expansions map[string]string
+- want string
-}
-
--// method id "compute.addresses.get":
+-var expandTests = []ExpandTest{
+- // no expansions
+- {
+- "http://www.golang.org/",
+- map[string]string{},
+- "http://www.golang.org/",
+- },
+- // one expansion, no escaping
+- {
+- "http://www.golang.org/{bucket}/delete",
+- map[string]string{
+- "bucket": "red",
+- },
+- "http://www.golang.org/red/delete",
+- },
+- // one expansion, with hex escapes
+- {
+- "http://www.golang.org/{bucket}/delete",
+- map[string]string{
+- "bucket": "red/blue",
+- },
+- "http://www.golang.org/red%2Fblue/delete",
+- },
+- // one expansion, with space
+- {
+- "http://www.golang.org/{bucket}/delete",
+- map[string]string{
+- "bucket": "red or blue",
+- },
+- "http://www.golang.org/red%20or%20blue/delete",
+- },
+- // expansion not found
+- {
+- "http://www.golang.org/{object}/delete",
+- map[string]string{
+- "bucket": "red or blue",
+- },
+- "http://www.golang.org//delete",
+- },
+- // multiple expansions
+- {
+- "http://www.golang.org/{one}/{two}/{three}/get",
+- map[string]string{
+- "one": "ONE",
+- "two": "TWO",
+- "three": "THREE",
+- },
+- "http://www.golang.org/ONE/TWO/THREE/get",
+- },
+- // utf-8 characters
+- {
+- "http://www.golang.org/{bucket}/get",
+- map[string]string{
+- "bucket": "£100",
+- },
+- "http://www.golang.org/%C2%A3100/get",
+- },
+- // punctuations
+- {
+- "http://www.golang.org/{bucket}/get",
+- map[string]string{
+- "bucket": `/\@:,.`,
+- },
+- "http://www.golang.org/%2F%5C%40%3A%2C./get",
+- },
+- // mis-matched brackets
+- {
+- "http://www.golang.org/{bucket/get",
+- map[string]string{
+- "bucket": "red",
+- },
+- "http://www.golang.org/{bucket/get",
+- },
+- // "+" prefix for suppressing escape
+- // See also: http://tools.ietf.org/html/rfc6570#section-3.2.3
+- {
+- "http://www.golang.org/{+topic}",
+- map[string]string{
+- "topic": "/topics/myproject/mytopic",
+- },
+- // The double slashes here look weird, but it's intentional
+- "http://www.golang.org//topics/myproject/mytopic",
+- },
+-}
-
--type AddressesGetCall struct {
-- s *Service
-- project string
-- region string
-- address string
-- opt_ map[string]interface{}
+-func TestExpand(t *testing.T) {
+- for i, test := range expandTests {
+- u := url.URL{
+- Path: test.in,
+- }
+- Expand(&u, test.expansions)
+- got := u.Path
+- if got != test.want {
+- t.Errorf("got %q expected %q in test %d", got, test.want, i+1)
+- }
+- }
-}
-
--// Get: Returns the specified address resource.
--func (r *AddressesService) Get(project string, region string, address string) *AddressesGetCall {
-- c := &AddressesGetCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.region = region
-- c.address = address
-- return c
+-type CheckResponseTest struct {
+- in *http.Response
+- bodyText string
+- want error
+- errText string
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *AddressesGetCall) Fields(s ...googleapi.Field) *AddressesGetCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-var checkResponseTests = []CheckResponseTest{
+- {
+- &http.Response{
+- StatusCode: http.StatusOK,
+- },
+- "",
+- nil,
+- "",
+- },
+- {
+- &http.Response{
+- StatusCode: http.StatusInternalServerError,
+- },
+- `{"error":{}}`,
+- &Error{
+- Code: http.StatusInternalServerError,
+- Body: `{"error":{}}`,
+- },
+- `googleapi: got HTTP response code 500 with body: {"error":{}}`,
+- },
+- {
+- &http.Response{
+- StatusCode: http.StatusNotFound,
+- },
+- `{"error":{"message":"Error message for StatusNotFound."}}`,
+- &Error{
+- Code: http.StatusNotFound,
+- Message: "Error message for StatusNotFound.",
+- Body: `{"error":{"message":"Error message for StatusNotFound."}}`,
+- },
+- "googleapi: Error 404: Error message for StatusNotFound.",
+- },
+- {
+- &http.Response{
+- StatusCode: http.StatusBadRequest,
+- },
+- `{"error":"invalid_token","error_description":"Invalid Value"}`,
+- &Error{
+- Code: http.StatusBadRequest,
+- Body: `{"error":"invalid_token","error_description":"Invalid Value"}`,
+- },
+- `googleapi: got HTTP response code 400 with body: {"error":"invalid_token","error_description":"Invalid Value"}`,
+- },
+- {
+- &http.Response{
+- StatusCode: http.StatusBadRequest,
+- },
+- `{"error":{"errors":[{"domain":"usageLimits","reason":"keyInvalid","message":"Bad Request"}],"code":400,"message":"Bad Request"}}`,
+- &Error{
+- Code: http.StatusBadRequest,
+- Errors: []ErrorItem{
+- {
+- Reason: "keyInvalid",
+- Message: "Bad Request",
+- },
+- },
+- Body: `{"error":{"errors":[{"domain":"usageLimits","reason":"keyInvalid","message":"Bad Request"}],"code":400,"message":"Bad Request"}}`,
+- Message: "Bad Request",
+- },
+- "googleapi: Error 400: Bad Request, keyInvalid",
+- },
-}
-
--func (c *AddressesGetCall) Do() (*Address, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/addresses/{address}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "region": c.region,
-- "address": c.address,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Address
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-func TestCheckResponse(t *testing.T) {
+- for _, test := range checkResponseTests {
+- res := test.in
+- if test.bodyText != "" {
+- res.Body = ioutil.NopCloser(strings.NewReader(test.bodyText))
+- }
+- g := CheckResponse(res)
+- if !reflect.DeepEqual(g, test.want) {
+- t.Errorf("CheckResponse: got %v, want %v", g, test.want)
+- gotJson, err := json.Marshal(g)
+- if err != nil {
+- t.Error(err)
+- }
+- wantJson, err := json.Marshal(test.want)
+- if err != nil {
+- t.Error(err)
+- }
+- t.Errorf("json(got): %q\njson(want): %q", string(gotJson), string(wantJson))
+- }
+- if g != nil && g.Error() != test.errText {
+- t.Errorf("CheckResponse: unexpected error message.\nGot: %q\nwant: %q", g, test.errText)
+- }
- }
-- return ret, nil
-- // {
-- // "description": "Returns the specified address resource.",
-- // "httpMethod": "GET",
-- // "id": "compute.addresses.get",
-- // "parameterOrder": [
-- // "project",
-- // "region",
-- // "address"
-- // ],
-- // "parameters": {
-- // "address": {
-- // "description": "Name of the address resource to return.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "region": {
-- // "description": "Name of the region scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/regions/{region}/addresses/{address}",
-- // "response": {
-- // "$ref": "Address"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
+-}
+-
+-type VariantPoint struct {
+- Type string
+- Coordinates []float64
+-}
-
+-type VariantTest struct {
+- in map[string]interface{}
+- result bool
+- want VariantPoint
-}
-
--// method id "compute.addresses.insert":
+-var coords = []interface{}{1.0, 2.0}
-
--type AddressesInsertCall struct {
-- s *Service
-- project string
-- region string
-- address *Address
-- opt_ map[string]interface{}
+-var variantTests = []VariantTest{
+- {
+- in: map[string]interface{}{
+- "type": "Point",
+- "coordinates": coords,
+- },
+- result: true,
+- want: VariantPoint{
+- Type: "Point",
+- Coordinates: []float64{1.0, 2.0},
+- },
+- },
+- {
+- in: map[string]interface{}{
+- "type": "Point",
+- "bogus": coords,
+- },
+- result: true,
+- want: VariantPoint{
+- Type: "Point",
+- },
+- },
-}
-
--// Insert: Creates an address resource in the specified project using
--// the data included in the request.
--func (r *AddressesService) Insert(project string, region string, address *Address) *AddressesInsertCall {
-- c := &AddressesInsertCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.region = region
-- c.address = address
-- return c
+-func TestVariantType(t *testing.T) {
+- for _, test := range variantTests {
+- if g := VariantType(test.in); g != test.want.Type {
+- t.Errorf("VariantType(%v): got %v, want %v", test.in, g, test.want.Type)
+- }
+- }
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *AddressesInsertCall) Fields(s ...googleapi.Field) *AddressesInsertCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func TestConvertVariant(t *testing.T) {
+- for _, test := range variantTests {
+- g := VariantPoint{}
+- r := ConvertVariant(test.in, &g)
+- if r != test.result {
+- t.Errorf("ConvertVariant(%v): got %v, want %v", test.in, r, test.result)
+- }
+- if !reflect.DeepEqual(g, test.want) {
+- t.Errorf("ConvertVariant(%v): got %v, want %v", test.in, g, test.want)
+- }
+- }
-}
+diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates/LICENSE b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates/LICENSE
+deleted file mode 100644
+index de9c88c..0000000
+--- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates/LICENSE
++++ /dev/null
+@@ -1,18 +0,0 @@
+-Copyright (c) 2013 Joshua Tacoma
-
--func (c *AddressesInsertCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.address)
-- if err != nil {
-- return nil, err
-- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/addresses")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "region": c.region,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Creates an address resource in the specified project using the data included in the request.",
-- // "httpMethod": "POST",
-- // "id": "compute.addresses.insert",
-- // "parameterOrder": [
-- // "project",
-- // "region"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "region": {
-- // "description": "Name of the region scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/regions/{region}/addresses",
-- // "request": {
-- // "$ref": "Address"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
+-Permission is hereby granted, free of charge, to any person obtaining a copy of
+-this software and associated documentation files (the "Software"), to deal in
+-the Software without restriction, including without limitation the rights to
+-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+-the Software, and to permit persons to whom the Software is furnished to do so,
+-subject to the following conditions:
-
--}
+-The above copyright notice and this permission notice shall be included in all
+-copies or substantial portions of the Software.
-
--// method id "compute.addresses.list":
+-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates/uritemplates.go b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates/uritemplates.go
+deleted file mode 100644
+index 8a84813..0000000
+--- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates/uritemplates.go
++++ /dev/null
+@@ -1,359 +0,0 @@
+-// Copyright 2013 Joshua Tacoma. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
--type AddressesListCall struct {
-- s *Service
-- project string
-- region string
-- opt_ map[string]interface{}
+-// Package uritemplates is a level 4 implementation of RFC 6570 (URI
+-// Template, http://tools.ietf.org/html/rfc6570).
+-//
+-// To use uritemplates, parse a template string and expand it with a value
+-// map:
+-//
+-// template, _ := uritemplates.Parse("https://api.github.com/repos{/user,repo}")
+-// values := make(map[string]interface{})
+-// values["user"] = "jtacoma"
+-// values["repo"] = "uritemplates"
+-// expanded, _ := template.ExpandString(values)
+-// fmt.Printf(expanded)
+-//
+-package uritemplates
+-
+-import (
+- "bytes"
+- "errors"
+- "fmt"
+- "reflect"
+- "regexp"
+- "strconv"
+- "strings"
+-)
+-
+-var (
+- unreserved = regexp.MustCompile("[^A-Za-z0-9\\-._~]")
+- reserved = regexp.MustCompile("[^A-Za-z0-9\\-._~:/?#[\\]@!$&'()*+,;=]")
+- validname = regexp.MustCompile("^([A-Za-z0-9_\\.]|%[0-9A-Fa-f][0-9A-Fa-f])+$")
+- hex = []byte("0123456789ABCDEF")
+-)
+-
+-func pctEncode(src []byte) []byte {
+- dst := make([]byte, len(src)*3)
+- for i, b := range src {
+- buf := dst[i*3 : i*3+3]
+- buf[0] = 0x25
+- buf[1] = hex[b/16]
+- buf[2] = hex[b%16]
+- }
+- return dst
-}
-
--// List: Retrieves the list of address resources contained within the
--// specified region.
--func (r *AddressesService) List(project string, region string) *AddressesListCall {
-- c := &AddressesListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.region = region
-- return c
+-func escape(s string, allowReserved bool) (escaped string) {
+- if allowReserved {
+- escaped = string(reserved.ReplaceAllFunc([]byte(s), pctEncode))
+- } else {
+- escaped = string(unreserved.ReplaceAllFunc([]byte(s), pctEncode))
+- }
+- return escaped
-}
-
--// Filter sets the optional parameter "filter": Filter expression for
--// filtering listed resources.
--func (c *AddressesListCall) Filter(filter string) *AddressesListCall {
-- c.opt_["filter"] = filter
-- return c
+-// A UriTemplate is a parsed representation of a URI template.
+-type UriTemplate struct {
+- raw string
+- parts []templatePart
-}
-
--// MaxResults sets the optional parameter "maxResults": Maximum count of
--// results to be returned. Maximum value is 500 and default value is
--// 500.
--func (c *AddressesListCall) MaxResults(maxResults int64) *AddressesListCall {
-- c.opt_["maxResults"] = maxResults
-- return c
+-// Parse parses a URI template string into a UriTemplate object.
+-func Parse(rawtemplate string) (template *UriTemplate, err error) {
+- template = new(UriTemplate)
+- template.raw = rawtemplate
+- split := strings.Split(rawtemplate, "{")
+- template.parts = make([]templatePart, len(split)*2-1)
+- for i, s := range split {
+- if i == 0 {
+- if strings.Contains(s, "}") {
+- err = errors.New("unexpected }")
+- break
+- }
+- template.parts[i].raw = s
+- } else {
+- subsplit := strings.Split(s, "}")
+- if len(subsplit) != 2 {
+- err = errors.New("malformed template")
+- break
+- }
+- expression := subsplit[0]
+- template.parts[i*2-1], err = parseExpression(expression)
+- if err != nil {
+- break
+- }
+- template.parts[i*2].raw = subsplit[1]
+- }
+- }
+- if err != nil {
+- template = nil
+- }
+- return template, err
-}
-
--// PageToken sets the optional parameter "pageToken": Tag returned by a
--// previous list request truncated by maxResults. Used to continue a
--// previous list request.
--func (c *AddressesListCall) PageToken(pageToken string) *AddressesListCall {
-- c.opt_["pageToken"] = pageToken
-- return c
+-type templatePart struct {
+- raw string
+- terms []templateTerm
+- first string
+- sep string
+- named bool
+- ifemp string
+- allowReserved bool
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *AddressesListCall) Fields(s ...googleapi.Field) *AddressesListCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-type templateTerm struct {
+- name string
+- explode bool
+- truncate int
-}
-
--func (c *AddressesListCall) Do() (*AddressList, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["filter"]; ok {
-- params.Set("filter", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["maxResults"]; ok {
-- params.Set("maxResults", fmt.Sprintf("%v", v))
+-func parseExpression(expression string) (result templatePart, err error) {
+- switch expression[0] {
+- case '+':
+- result.sep = ","
+- result.allowReserved = true
+- expression = expression[1:]
+- case '.':
+- result.first = "."
+- result.sep = "."
+- expression = expression[1:]
+- case '/':
+- result.first = "/"
+- result.sep = "/"
+- expression = expression[1:]
+- case ';':
+- result.first = ";"
+- result.sep = ";"
+- result.named = true
+- expression = expression[1:]
+- case '?':
+- result.first = "?"
+- result.sep = "&"
+- result.named = true
+- result.ifemp = "="
+- expression = expression[1:]
+- case '&':
+- result.first = "&"
+- result.sep = "&"
+- result.named = true
+- result.ifemp = "="
+- expression = expression[1:]
+- case '#':
+- result.first = "#"
+- result.sep = ","
+- result.allowReserved = true
+- expression = expression[1:]
+- default:
+- result.sep = ","
- }
-- if v, ok := c.opt_["pageToken"]; ok {
-- params.Set("pageToken", fmt.Sprintf("%v", v))
+- rawterms := strings.Split(expression, ",")
+- result.terms = make([]templateTerm, len(rawterms))
+- for i, raw := range rawterms {
+- result.terms[i], err = parseTerm(raw)
+- if err != nil {
+- break
+- }
- }
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+- return result, err
+-}
+-
+-func parseTerm(term string) (result templateTerm, err error) {
+- if strings.HasSuffix(term, "*") {
+- result.explode = true
+- term = term[:len(term)-1]
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/addresses")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "region": c.region,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
+- split := strings.Split(term, ":")
+- if len(split) == 1 {
+- result.name = term
+- } else if len(split) == 2 {
+- result.name = split[0]
+- var parsed int64
+- parsed, err = strconv.ParseInt(split[1], 10, 0)
+- result.truncate = int(parsed)
+- } else {
+- err = errors.New("multiple colons in same term")
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- if !validname.MatchString(result.name) {
+- err = errors.New("not a valid name: " + result.name)
- }
-- var ret *AddressList
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- if result.explode && result.truncate > 0 {
+- err = errors.New("both explode and prefix modifers on same term")
- }
-- return ret, nil
-- // {
-- // "description": "Retrieves the list of address resources contained within the specified region.",
-- // "httpMethod": "GET",
-- // "id": "compute.addresses.list",
-- // "parameterOrder": [
-- // "project",
-- // "region"
-- // ],
-- // "parameters": {
-- // "filter": {
-- // "description": "Optional. Filter expression for filtering listed resources.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "maxResults": {
-- // "default": "500",
-- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
-- // "format": "uint32",
-- // "location": "query",
-- // "maximum": "500",
-- // "minimum": "0",
-- // "type": "integer"
-- // },
-- // "pageToken": {
-- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "region": {
-- // "description": "Name of the region scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/regions/{region}/addresses",
-- // "response": {
-- // "$ref": "AddressList"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
--
+- return result, err
-}
-
--// method id "compute.backendServices.delete":
+-// Expand expands a URI template with a set of values to produce a string.
+-func (self *UriTemplate) Expand(value interface{}) (string, error) {
+- values, ismap := value.(map[string]interface{})
+- if !ismap {
+- if m, ismap := struct2map(value); !ismap {
+- return "", errors.New("expected map[string]interface{}, struct, or pointer to struct.")
+- } else {
+- return self.Expand(m)
+- }
+- }
+- var buf bytes.Buffer
+- for _, p := range self.parts {
+- err := p.expand(&buf, values)
+- if err != nil {
+- return "", err
+- }
+- }
+- return buf.String(), nil
+-}
-
--type BackendServicesDeleteCall struct {
-- s *Service
-- project string
-- backendService string
-- opt_ map[string]interface{}
+-func (self *templatePart) expand(buf *bytes.Buffer, values map[string]interface{}) error {
+- if len(self.raw) > 0 {
+- buf.WriteString(self.raw)
+- return nil
+- }
+- var zeroLen = buf.Len()
+- buf.WriteString(self.first)
+- var firstLen = buf.Len()
+- for _, term := range self.terms {
+- value, exists := values[term.name]
+- if !exists {
+- continue
+- }
+- if buf.Len() != firstLen {
+- buf.WriteString(self.sep)
+- }
+- switch v := value.(type) {
+- case string:
+- self.expandString(buf, term, v)
+- case []interface{}:
+- self.expandArray(buf, term, v)
+- case map[string]interface{}:
+- if term.truncate > 0 {
+- return errors.New("cannot truncate a map expansion")
+- }
+- self.expandMap(buf, term, v)
+- default:
+- if m, ismap := struct2map(value); ismap {
+- if term.truncate > 0 {
+- return errors.New("cannot truncate a map expansion")
+- }
+- self.expandMap(buf, term, m)
+- } else {
+- str := fmt.Sprintf("%v", value)
+- self.expandString(buf, term, str)
+- }
+- }
+- }
+- if buf.Len() == firstLen {
+- original := buf.Bytes()[:zeroLen]
+- buf.Reset()
+- buf.Write(original)
+- }
+- return nil
-}
-
--// Delete: Deletes the specified BackendService resource.
--func (r *BackendServicesService) Delete(project string, backendService string) *BackendServicesDeleteCall {
-- c := &BackendServicesDeleteCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.backendService = backendService
-- return c
+-func (self *templatePart) expandName(buf *bytes.Buffer, name string, empty bool) {
+- if self.named {
+- buf.WriteString(name)
+- if empty {
+- buf.WriteString(self.ifemp)
+- } else {
+- buf.WriteString("=")
+- }
+- }
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *BackendServicesDeleteCall) Fields(s ...googleapi.Field) *BackendServicesDeleteCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func (self *templatePart) expandString(buf *bytes.Buffer, t templateTerm, s string) {
+- if len(s) > t.truncate && t.truncate > 0 {
+- s = s[:t.truncate]
+- }
+- self.expandName(buf, t.name, len(s) == 0)
+- buf.WriteString(escape(s, self.allowReserved))
-}
-
--func (c *BackendServicesDeleteCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/backendServices/{backendService}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("DELETE", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "backendService": c.backendService,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+-func (self *templatePart) expandArray(buf *bytes.Buffer, t templateTerm, a []interface{}) {
+- if len(a) == 0 {
+- return
+- } else if !t.explode {
+- self.expandName(buf, t.name, false)
- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- for i, value := range a {
+- if t.explode && i > 0 {
+- buf.WriteString(self.sep)
+- } else if i > 0 {
+- buf.WriteString(",")
+- }
+- var s string
+- switch v := value.(type) {
+- case string:
+- s = v
+- default:
+- s = fmt.Sprintf("%v", v)
+- }
+- if len(s) > t.truncate && t.truncate > 0 {
+- s = s[:t.truncate]
+- }
+- if self.named && t.explode {
+- self.expandName(buf, t.name, len(s) == 0)
+- }
+- buf.WriteString(escape(s, self.allowReserved))
- }
-- return ret, nil
-- // {
-- // "description": "Deletes the specified BackendService resource.",
-- // "httpMethod": "DELETE",
-- // "id": "compute.backendServices.delete",
-- // "parameterOrder": [
-- // "project",
-- // "backendService"
-- // ],
-- // "parameters": {
-- // "backendService": {
-- // "description": "Name of the BackendService resource to delete.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/backendServices/{backendService}",
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
--
--}
--
--// method id "compute.backendServices.get":
--
--type BackendServicesGetCall struct {
-- s *Service
-- project string
-- backendService string
-- opt_ map[string]interface{}
-}
-
--// Get: Returns the specified BackendService resource.
--func (r *BackendServicesService) Get(project string, backendService string) *BackendServicesGetCall {
-- c := &BackendServicesGetCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.backendService = backendService
-- return c
+-func (self *templatePart) expandMap(buf *bytes.Buffer, t templateTerm, m map[string]interface{}) {
+- if len(m) == 0 {
+- return
+- }
+- if !t.explode {
+- self.expandName(buf, t.name, len(m) == 0)
+- }
+- var firstLen = buf.Len()
+- for k, value := range m {
+- if firstLen != buf.Len() {
+- if t.explode {
+- buf.WriteString(self.sep)
+- } else {
+- buf.WriteString(",")
+- }
+- }
+- var s string
+- switch v := value.(type) {
+- case string:
+- s = v
+- default:
+- s = fmt.Sprintf("%v", v)
+- }
+- if t.explode {
+- buf.WriteString(escape(k, self.allowReserved))
+- buf.WriteRune('=')
+- buf.WriteString(escape(s, self.allowReserved))
+- } else {
+- buf.WriteString(escape(k, self.allowReserved))
+- buf.WriteRune(',')
+- buf.WriteString(escape(s, self.allowReserved))
+- }
+- }
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *BackendServicesGetCall) Fields(s ...googleapi.Field) *BackendServicesGetCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func struct2map(v interface{}) (map[string]interface{}, bool) {
+- value := reflect.ValueOf(v)
+- switch value.Type().Kind() {
+- case reflect.Ptr:
+- return struct2map(value.Elem().Interface())
+- case reflect.Struct:
+- m := make(map[string]interface{})
+- for i := 0; i < value.NumField(); i++ {
+- tag := value.Type().Field(i).Tag
+- var name string
+- if strings.Contains(string(tag), ":") {
+- name = tag.Get("uri")
+- } else {
+- name = strings.TrimSpace(string(tag))
+- }
+- if len(name) == 0 {
+- name = value.Type().Field(i).Name
+- }
+- m[name] = value.Field(i).Interface()
+- }
+- return m, true
+- }
+- return nil, false
-}
+diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates/utils.go b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates/utils.go
+deleted file mode 100644
+index 399ef46..0000000
+--- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates/utils.go
++++ /dev/null
+@@ -1,13 +0,0 @@
+-package uritemplates
-
--func (c *BackendServicesGetCall) Do() (*BackendService, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/backendServices/{backendService}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "backendService": c.backendService,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+-func Expand(path string, expansions map[string]string) (string, error) {
+- template, err := Parse(path)
- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- return "", err
- }
-- var ret *BackendService
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- values := make(map[string]interface{})
+- for k, v := range expansions {
+- values[k] = v
- }
-- return ret, nil
-- // {
-- // "description": "Returns the specified BackendService resource.",
-- // "httpMethod": "GET",
-- // "id": "compute.backendServices.get",
-- // "parameterOrder": [
-- // "project",
-- // "backendService"
-- // ],
-- // "parameters": {
-- // "backendService": {
-- // "description": "Name of the BackendService resource to return.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/backendServices/{backendService}",
-- // "response": {
-- // "$ref": "BackendService"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
--
+- return template.Expand(values)
-}
+diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/transport/apikey.go b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/transport/apikey.go
+deleted file mode 100644
+index eca1ea2..0000000
+--- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/transport/apikey.go
++++ /dev/null
+@@ -1,38 +0,0 @@
+-// Copyright 2012 Google Inc. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
--// method id "compute.backendServices.getHealth":
+-// Package transport contains HTTP transports used to make
+-// authenticated API requests.
+-package transport
-
--type BackendServicesGetHealthCall struct {
-- s *Service
-- project string
-- backendService string
-- resourcegroupreference *ResourceGroupReference
-- opt_ map[string]interface{}
--}
+-import (
+- "errors"
+- "net/http"
+-)
-
--// GetHealth: Gets the most recent health check results for this
--// BackendService.
--func (r *BackendServicesService) GetHealth(project string, backendService string, resourcegroupreference *ResourceGroupReference) *BackendServicesGetHealthCall {
-- c := &BackendServicesGetHealthCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.backendService = backendService
-- c.resourcegroupreference = resourcegroupreference
-- return c
--}
+-// APIKey is an HTTP Transport which wraps an underlying transport and
+-// appends an API Key "key" parameter to the URL of outgoing requests.
+-type APIKey struct {
+- // Key is the API Key to set on requests.
+- Key string
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *BackendServicesGetHealthCall) Fields(s ...googleapi.Field) *BackendServicesGetHealthCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+- // Transport is the underlying HTTP transport.
+- // If nil, http.DefaultTransport is used.
+- Transport http.RoundTripper
-}
-
--func (c *BackendServicesGetHealthCall) Do() (*BackendServiceGroupHealth, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.resourcegroupreference)
-- if err != nil {
-- return nil, err
-- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/backendServices/{backendService}/getHealth")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "backendService": c.backendService,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *BackendServiceGroupHealth
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-func (t *APIKey) RoundTrip(req *http.Request) (*http.Response, error) {
+- rt := t.Transport
+- if rt == nil {
+- rt = http.DefaultTransport
+- if rt == nil {
+- return nil, errors.New("googleapi/transport: no Transport specified or available")
+- }
- }
-- return ret, nil
-- // {
-- // "description": "Gets the most recent health check results for this BackendService.",
-- // "httpMethod": "POST",
-- // "id": "compute.backendServices.getHealth",
-- // "parameterOrder": [
-- // "project",
-- // "backendService"
-- // ],
-- // "parameters": {
-- // "backendService": {
-- // "description": "Name of the BackendService resource to which the queried instance belongs.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/backendServices/{backendService}/getHealth",
-- // "request": {
-- // "$ref": "ResourceGroupReference"
-- // },
-- // "response": {
-- // "$ref": "BackendServiceGroupHealth"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
--
+- newReq := *req
+- args := newReq.URL.Query()
+- args.Set("key", t.Key)
+- newReq.URL.RawQuery = args.Encode()
+- return rt.RoundTrip(&newReq)
-}
+diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/types.go b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/types.go
+deleted file mode 100644
+index 7ed7dd9..0000000
+--- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/types.go
++++ /dev/null
+@@ -1,150 +0,0 @@
+-// Copyright 2013 Google Inc. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
--// method id "compute.backendServices.insert":
+-package googleapi
-
--type BackendServicesInsertCall struct {
-- s *Service
-- project string
-- backendservice *BackendService
-- opt_ map[string]interface{}
--}
+-import (
+- "encoding/json"
+- "strconv"
+-)
-
--// Insert: Creates a BackendService resource in the specified project
--// using the data included in the request.
--func (r *BackendServicesService) Insert(project string, backendservice *BackendService) *BackendServicesInsertCall {
-- c := &BackendServicesInsertCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.backendservice = backendservice
-- return c
--}
+-// Int64s is a slice of int64s that marshal as quoted strings in JSON.
+-type Int64s []int64
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *BackendServicesInsertCall) Fields(s ...googleapi.Field) *BackendServicesInsertCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func (q *Int64s) UnmarshalJSON(raw []byte) error {
+- *q = (*q)[:0]
+- var ss []string
+- if err := json.Unmarshal(raw, &ss); err != nil {
+- return err
+- }
+- for _, s := range ss {
+- v, err := strconv.ParseInt(s, 10, 64)
+- if err != nil {
+- return err
+- }
+- *q = append(*q, int64(v))
+- }
+- return nil
-}
-
--func (c *BackendServicesInsertCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.backendservice)
-- if err != nil {
-- return nil, err
+-// Int32s is a slice of int32s that marshal as quoted strings in JSON.
+-type Int32s []int32
+-
+-func (q *Int32s) UnmarshalJSON(raw []byte) error {
+- *q = (*q)[:0]
+- var ss []string
+- if err := json.Unmarshal(raw, &ss); err != nil {
+- return err
- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+- for _, s := range ss {
+- v, err := strconv.ParseInt(s, 10, 32)
+- if err != nil {
+- return err
+- }
+- *q = append(*q, int32(v))
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/backendServices")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
+- return nil
+-}
+-
+-// Uint64s is a slice of uint64s that marshal as quoted strings in JSON.
+-type Uint64s []uint64
+-
+-func (q *Uint64s) UnmarshalJSON(raw []byte) error {
+- *q = (*q)[:0]
+- var ss []string
+- if err := json.Unmarshal(raw, &ss); err != nil {
+- return err
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- for _, s := range ss {
+- v, err := strconv.ParseUint(s, 10, 64)
+- if err != nil {
+- return err
+- }
+- *q = append(*q, uint64(v))
+- }
+- return nil
+-}
+-
+-// Uint32s is a slice of uint32s that marshal as quoted strings in JSON.
+-type Uint32s []uint32
+-
+-func (q *Uint32s) UnmarshalJSON(raw []byte) error {
+- *q = (*q)[:0]
+- var ss []string
+- if err := json.Unmarshal(raw, &ss); err != nil {
+- return err
- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- for _, s := range ss {
+- v, err := strconv.ParseUint(s, 10, 32)
+- if err != nil {
+- return err
+- }
+- *q = append(*q, uint32(v))
- }
-- return ret, nil
-- // {
-- // "description": "Creates a BackendService resource in the specified project using the data included in the request.",
-- // "httpMethod": "POST",
-- // "id": "compute.backendServices.insert",
-- // "parameterOrder": [
-- // "project"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/backendServices",
-- // "request": {
-- // "$ref": "BackendService"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
--
+- return nil
-}
-
--// method id "compute.backendServices.list":
+-// Float64s is a slice of float64s that marshal as quoted strings in JSON.
+-type Float64s []float64
-
--type BackendServicesListCall struct {
-- s *Service
-- project string
-- opt_ map[string]interface{}
+-func (q *Float64s) UnmarshalJSON(raw []byte) error {
+- *q = (*q)[:0]
+- var ss []string
+- if err := json.Unmarshal(raw, &ss); err != nil {
+- return err
+- }
+- for _, s := range ss {
+- v, err := strconv.ParseFloat(s, 64)
+- if err != nil {
+- return err
+- }
+- *q = append(*q, float64(v))
+- }
+- return nil
-}
-
--// List: Retrieves the list of BackendService resources available to the
--// specified project.
--func (r *BackendServicesService) List(project string) *BackendServicesListCall {
-- c := &BackendServicesListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- return c
+-func quotedList(n int, fn func(dst []byte, i int) []byte) ([]byte, error) {
+- dst := make([]byte, 0, 2+n*10) // somewhat arbitrary
+- dst = append(dst, '[')
+- for i := 0; i < n; i++ {
+- if i > 0 {
+- dst = append(dst, ',')
+- }
+- dst = append(dst, '"')
+- dst = fn(dst, i)
+- dst = append(dst, '"')
+- }
+- dst = append(dst, ']')
+- return dst, nil
-}
-
--// Filter sets the optional parameter "filter": Filter expression for
--// filtering listed resources.
--func (c *BackendServicesListCall) Filter(filter string) *BackendServicesListCall {
-- c.opt_["filter"] = filter
-- return c
+-func (s Int64s) MarshalJSON() ([]byte, error) {
+- return quotedList(len(s), func(dst []byte, i int) []byte {
+- return strconv.AppendInt(dst, s[i], 10)
+- })
-}
-
--// MaxResults sets the optional parameter "maxResults": Maximum count of
--// results to be returned. Maximum value is 500 and default value is
--// 500.
--func (c *BackendServicesListCall) MaxResults(maxResults int64) *BackendServicesListCall {
-- c.opt_["maxResults"] = maxResults
-- return c
+-func (s Int32s) MarshalJSON() ([]byte, error) {
+- return quotedList(len(s), func(dst []byte, i int) []byte {
+- return strconv.AppendInt(dst, int64(s[i]), 10)
+- })
-}
-
--// PageToken sets the optional parameter "pageToken": Tag returned by a
--// previous list request truncated by maxResults. Used to continue a
--// previous list request.
--func (c *BackendServicesListCall) PageToken(pageToken string) *BackendServicesListCall {
-- c.opt_["pageToken"] = pageToken
-- return c
+-func (s Uint64s) MarshalJSON() ([]byte, error) {
+- return quotedList(len(s), func(dst []byte, i int) []byte {
+- return strconv.AppendUint(dst, s[i], 10)
+- })
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *BackendServicesListCall) Fields(s ...googleapi.Field) *BackendServicesListCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func (s Uint32s) MarshalJSON() ([]byte, error) {
+- return quotedList(len(s), func(dst []byte, i int) []byte {
+- return strconv.AppendUint(dst, uint64(s[i]), 10)
+- })
-}
-
--func (c *BackendServicesListCall) Do() (*BackendServiceList, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["filter"]; ok {
-- params.Set("filter", fmt.Sprintf("%v", v))
+-func (s Float64s) MarshalJSON() ([]byte, error) {
+- return quotedList(len(s), func(dst []byte, i int) []byte {
+- return strconv.AppendFloat(dst, s[i], 'g', -1, 64)
+- })
+-}
+diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/types_test.go b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/types_test.go
+deleted file mode 100644
+index a6b2045..0000000
+--- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/types_test.go
++++ /dev/null
+@@ -1,44 +0,0 @@
+-// Copyright 2013 Google Inc. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-package googleapi
+-
+-import (
+- "encoding/json"
+- "reflect"
+- "testing"
+-)
+-
+-func TestTypes(t *testing.T) {
+- type T struct {
+- I32 Int32s
+- I64 Int64s
+- U32 Uint32s
+- U64 Uint64s
+- F64 Float64s
- }
-- if v, ok := c.opt_["maxResults"]; ok {
-- params.Set("maxResults", fmt.Sprintf("%v", v))
+- v := &T{
+- I32: Int32s{-1, 2, 3},
+- I64: Int64s{-1, 2, 1 << 33},
+- U32: Uint32s{1, 2},
+- U64: Uint64s{1, 2, 1 << 33},
+- F64: Float64s{1.5, 3.33},
- }
-- if v, ok := c.opt_["pageToken"]; ok {
-- params.Set("pageToken", fmt.Sprintf("%v", v))
+- got, err := json.Marshal(v)
+- if err != nil {
+- t.Fatal(err)
- }
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+- want := `{"I32":["-1","2","3"],"I64":["-1","2","8589934592"],"U32":["1","2"],"U64":["1","2","8589934592"],"F64":["1.5","3.33"]}`
+- if string(got) != want {
+- t.Fatalf("Marshal mismatch.\n got: %s\nwant: %s\n", got, want)
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/backendServices")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
+-
+- v2 := new(T)
+- if err := json.Unmarshal(got, v2); err != nil {
+- t.Fatalf("Unmarshal: %v", err)
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- if !reflect.DeepEqual(v, v2) {
+- t.Fatalf("Unmarshal didn't produce same results.\n got: %#v\nwant: %#v\n", v, v2)
- }
-- var ret *BackendServiceList
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+-}
+diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/add_child.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/add_child.go
+deleted file mode 100644
+index 7122be0..0000000
+--- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/add_child.go
++++ /dev/null
+@@ -1,23 +0,0 @@
+-package etcd
+-
+-// Add a new directory with a random etcd-generated key under the given path.
+-func (c *Client) AddChildDir(key string, ttl uint64) (*Response, error) {
+- raw, err := c.post(key, "", ttl)
+-
+- if err != nil {
- return nil, err
- }
-- return ret, nil
-- // {
-- // "description": "Retrieves the list of BackendService resources available to the specified project.",
-- // "httpMethod": "GET",
-- // "id": "compute.backendServices.list",
-- // "parameterOrder": [
-- // "project"
-- // ],
-- // "parameters": {
-- // "filter": {
-- // "description": "Optional. Filter expression for filtering listed resources.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "maxResults": {
-- // "default": "500",
-- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
-- // "format": "uint32",
-- // "location": "query",
-- // "maximum": "500",
-- // "minimum": "0",
-- // "type": "integer"
-- // },
-- // "pageToken": {
-- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/backendServices",
-- // "response": {
-- // "$ref": "BackendServiceList"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
-
+- return raw.Unmarshal()
-}
-
--// method id "compute.backendServices.patch":
+-// Add a new file with a random etcd-generated key under the given path.
+-func (c *Client) AddChild(key string, value string, ttl uint64) (*Response, error) {
+- raw, err := c.post(key, value, ttl)
-
--type BackendServicesPatchCall struct {
-- s *Service
-- project string
-- backendService string
-- backendservice *BackendService
-- opt_ map[string]interface{}
--}
+- if err != nil {
+- return nil, err
+- }
-
--// Patch: Update the entire content of the BackendService resource. This
--// method supports patch semantics.
--func (r *BackendServicesService) Patch(project string, backendService string, backendservice *BackendService) *BackendServicesPatchCall {
-- c := &BackendServicesPatchCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.backendService = backendService
-- c.backendservice = backendservice
-- return c
+- return raw.Unmarshal()
-}
+diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/add_child_test.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/add_child_test.go
+deleted file mode 100644
+index 26223ff..0000000
+--- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/add_child_test.go
++++ /dev/null
+@@ -1,73 +0,0 @@
+-package etcd
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *BackendServicesPatchCall) Fields(s ...googleapi.Field) *BackendServicesPatchCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
--}
+-import "testing"
-
--func (c *BackendServicesPatchCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.backendservice)
+-func TestAddChild(t *testing.T) {
+- c := NewClient(nil)
+- defer func() {
+- c.Delete("fooDir", true)
+- c.Delete("nonexistentDir", true)
+- }()
+-
+- c.CreateDir("fooDir", 5)
+-
+- _, err := c.AddChild("fooDir", "v0", 5)
- if err != nil {
-- return nil, err
-- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+- t.Fatal(err)
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/backendServices/{backendService}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("PATCH", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "backendService": c.backendService,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+-
+- _, err = c.AddChild("fooDir", "v1", 5)
- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- t.Fatal(err)
- }
-- return ret, nil
-- // {
-- // "description": "Update the entire content of the BackendService resource. This method supports patch semantics.",
-- // "httpMethod": "PATCH",
-- // "id": "compute.backendServices.patch",
-- // "parameterOrder": [
-- // "project",
-- // "backendService"
-- // ],
-- // "parameters": {
-- // "backendService": {
-- // "description": "Name of the BackendService resource to update.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/backendServices/{backendService}",
-- // "request": {
-- // "$ref": "BackendService"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
--
--}
-
--// method id "compute.backendServices.update":
+- resp, err := c.Get("fooDir", true, false)
+- // The child with v0 should proceed the child with v1 because it's added
+- // earlier, so it should have a lower key.
+- if !(len(resp.Node.Nodes) == 2 && (resp.Node.Nodes[0].Value == "v0" && resp.Node.Nodes[1].Value == "v1")) {
+- t.Fatalf("AddChild 1 failed. There should be two chlidren whose values are v0 and v1, respectively."+
+- " The response was: %#v", resp)
+- }
-
--type BackendServicesUpdateCall struct {
-- s *Service
-- project string
-- backendService string
-- backendservice *BackendService
-- opt_ map[string]interface{}
+- // Creating a child under a nonexistent directory should succeed.
+- // The directory should be created.
+- resp, err = c.AddChild("nonexistentDir", "foo", 5)
+- if err != nil {
+- t.Fatal(err)
+- }
-}
-
--// Update: Update the entire content of the BackendService resource.
--func (r *BackendServicesService) Update(project string, backendService string, backendservice *BackendService) *BackendServicesUpdateCall {
-- c := &BackendServicesUpdateCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.backendService = backendService
-- c.backendservice = backendservice
-- return c
--}
+-func TestAddChildDir(t *testing.T) {
+- c := NewClient(nil)
+- defer func() {
+- c.Delete("fooDir", true)
+- c.Delete("nonexistentDir", true)
+- }()
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *BackendServicesUpdateCall) Fields(s ...googleapi.Field) *BackendServicesUpdateCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
--}
+- c.CreateDir("fooDir", 5)
-
--func (c *BackendServicesUpdateCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.backendservice)
+- _, err := c.AddChildDir("fooDir", 5)
- if err != nil {
-- return nil, err
-- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+- t.Fatal(err)
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/backendServices/{backendService}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("PUT", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "backendService": c.backendService,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+-
+- _, err = c.AddChildDir("fooDir", 5)
- if err != nil {
-- return nil, err
+- t.Fatal(err)
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+-
+- resp, err := c.Get("fooDir", true, false)
+- // The child with v0 should proceed the child with v1 because it's added
+- // earlier, so it should have a lower key.
+- if !(len(resp.Node.Nodes) == 2 && (len(resp.Node.Nodes[0].Nodes) == 0 && len(resp.Node.Nodes[1].Nodes) == 0)) {
+- t.Fatalf("AddChildDir 1 failed. There should be two chlidren whose values are v0 and v1, respectively."+
+- " The response was: %#v", resp)
- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-
+- // Creating a child under a nonexistent directory should succeed.
+- // The directory should be created.
+- resp, err = c.AddChildDir("nonexistentDir", 5)
+- if err != nil {
+- t.Fatal(err)
- }
-- return ret, nil
-- // {
-- // "description": "Update the entire content of the BackendService resource.",
-- // "httpMethod": "PUT",
-- // "id": "compute.backendServices.update",
-- // "parameterOrder": [
-- // "project",
-- // "backendService"
-- // ],
-- // "parameters": {
-- // "backendService": {
-- // "description": "Name of the BackendService resource to update.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/backendServices/{backendService}",
-- // "request": {
-- // "$ref": "BackendService"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
+-}
+diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/client.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/client.go
+deleted file mode 100644
+index f6ae548..0000000
+--- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/client.go
++++ /dev/null
+@@ -1,435 +0,0 @@
+-package etcd
+-
+-import (
+- "crypto/tls"
+- "crypto/x509"
+- "encoding/json"
+- "errors"
+- "io"
+- "io/ioutil"
+- "net"
+- "net/http"
+- "net/url"
+- "os"
+- "path"
+- "time"
+-)
-
--}
+-// See SetConsistency for how to use these constants.
+-const (
+- // Using strings rather than iota because the consistency level
+- // could be persisted to disk, so it'd be better to use
+- // human-readable values.
+- STRONG_CONSISTENCY = "STRONG"
+- WEAK_CONSISTENCY = "WEAK"
+-)
-
--// method id "compute.diskTypes.aggregatedList":
+-const (
+- defaultBufferSize = 10
+-)
-
--type DiskTypesAggregatedListCall struct {
-- s *Service
-- project string
-- opt_ map[string]interface{}
+-type Config struct {
+- CertFile string `json:"certFile"`
+- KeyFile string `json:"keyFile"`
+- CaCertFile []string `json:"caCertFiles"`
+- DialTimeout time.Duration `json:"timeout"`
+- Consistency string `json:"consistency"`
-}
-
--// AggregatedList: Retrieves the list of disk type resources grouped by
--// scope.
--func (r *DiskTypesService) AggregatedList(project string) *DiskTypesAggregatedListCall {
-- c := &DiskTypesAggregatedListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- return c
+-type Client struct {
+- config Config `json:"config"`
+- cluster *Cluster `json:"cluster"`
+- httpClient *http.Client
+- persistence io.Writer
+- cURLch chan string
+- // CheckRetry can be used to control the policy for failed requests
+- // and modify the cluster if needed.
+- // The client calls it before sending requests again, and
+- // stops retrying if CheckRetry returns some error. The cases that
+- // this function needs to handle include no response and unexpected
+- // http status code of response.
+- // If CheckRetry is nil, client will call the default one
+- // `DefaultCheckRetry`.
+- // Argument cluster is the etcd.Cluster object that these requests have been made on.
+- // Argument numReqs is the number of http.Requests that have been made so far.
+- // Argument lastResp is the http.Responses from the last request.
+- // Argument err is the reason of the failure.
+- CheckRetry func(cluster *Cluster, numReqs int,
+- lastResp http.Response, err error) error
-}
-
--// Filter sets the optional parameter "filter": Filter expression for
--// filtering listed resources.
--func (c *DiskTypesAggregatedListCall) Filter(filter string) *DiskTypesAggregatedListCall {
-- c.opt_["filter"] = filter
-- return c
--}
+-// NewClient create a basic client that is configured to be used
+-// with the given machine list.
+-func NewClient(machines []string) *Client {
+- config := Config{
+- // default timeout is one second
+- DialTimeout: time.Second,
+- // default consistency level is STRONG
+- Consistency: STRONG_CONSISTENCY,
+- }
-
--// MaxResults sets the optional parameter "maxResults": Maximum count of
--// results to be returned. Maximum value is 500 and default value is
--// 500.
--func (c *DiskTypesAggregatedListCall) MaxResults(maxResults int64) *DiskTypesAggregatedListCall {
-- c.opt_["maxResults"] = maxResults
-- return c
--}
+- client := &Client{
+- cluster: NewCluster(machines),
+- config: config,
+- }
-
--// PageToken sets the optional parameter "pageToken": Tag returned by a
--// previous list request truncated by maxResults. Used to continue a
--// previous list request.
--func (c *DiskTypesAggregatedListCall) PageToken(pageToken string) *DiskTypesAggregatedListCall {
-- c.opt_["pageToken"] = pageToken
-- return c
--}
+- client.initHTTPClient()
+- client.saveConfig()
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *DiskTypesAggregatedListCall) Fields(s ...googleapi.Field) *DiskTypesAggregatedListCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+- return client
-}
-
--func (c *DiskTypesAggregatedListCall) Do() (*DiskTypeAggregatedList, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["filter"]; ok {
-- params.Set("filter", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["maxResults"]; ok {
-- params.Set("maxResults", fmt.Sprintf("%v", v))
+-// NewTLSClient create a basic client with TLS configuration
+-func NewTLSClient(machines []string, cert, key, caCert string) (*Client, error) {
+- // overwrite the default machine to use https
+- if len(machines) == 0 {
+- machines = []string{"https://127.0.0.1:4001"}
- }
-- if v, ok := c.opt_["pageToken"]; ok {
-- params.Set("pageToken", fmt.Sprintf("%v", v))
+-
+- config := Config{
+- // default timeout is one second
+- DialTimeout: time.Second,
+- // default consistency level is STRONG
+- Consistency: STRONG_CONSISTENCY,
+- CertFile: cert,
+- KeyFile: key,
+- CaCertFile: make([]string, 0),
- }
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+-
+- client := &Client{
+- cluster: NewCluster(machines),
+- config: config,
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/aggregated/diskTypes")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+-
+- err := client.initHTTPSClient(cert, key)
- if err != nil {
- return nil, err
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *DiskTypeAggregatedList
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Retrieves the list of disk type resources grouped by scope.",
-- // "httpMethod": "GET",
-- // "id": "compute.diskTypes.aggregatedList",
-- // "parameterOrder": [
-- // "project"
-- // ],
-- // "parameters": {
-- // "filter": {
-- // "description": "Optional. Filter expression for filtering listed resources.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "maxResults": {
-- // "default": "500",
-- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
-- // "format": "uint32",
-- // "location": "query",
-- // "maximum": "500",
-- // "minimum": "0",
-- // "type": "integer"
-- // },
-- // "pageToken": {
-- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/aggregated/diskTypes",
-- // "response": {
-- // "$ref": "DiskTypeAggregatedList"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
-
--}
+- err = client.AddRootCA(caCert)
-
--// method id "compute.diskTypes.get":
+- client.saveConfig()
-
--type DiskTypesGetCall struct {
-- s *Service
-- project string
-- zone string
-- diskType string
-- opt_ map[string]interface{}
+- return client, nil
-}
-
--// Get: Returns the specified disk type resource.
--func (r *DiskTypesService) Get(project string, zone string, diskType string) *DiskTypesGetCall {
-- c := &DiskTypesGetCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.zone = zone
-- c.diskType = diskType
-- return c
--}
+-// NewClientFromFile creates a client from a given file path.
+-// The given file is expected to use the JSON format.
+-func NewClientFromFile(fpath string) (*Client, error) {
+- fi, err := os.Open(fpath)
+- if err != nil {
+- return nil, err
+- }
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *DiskTypesGetCall) Fields(s ...googleapi.Field) *DiskTypesGetCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+- defer func() {
+- if err := fi.Close(); err != nil {
+- panic(err)
+- }
+- }()
+-
+- return NewClientFromReader(fi)
-}
-
--func (c *DiskTypesGetCall) Do() (*DiskType, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/diskTypes/{diskType}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "zone": c.zone,
-- "diskType": c.diskType,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+-// NewClientFromReader creates a Client configured from a given reader.
+-// The configuration is expected to use the JSON format.
+-func NewClientFromReader(reader io.Reader) (*Client, error) {
+- c := new(Client)
+-
+- b, err := ioutil.ReadAll(reader)
- if err != nil {
- return nil, err
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
+-
+- err = json.Unmarshal(b, c)
+- if err != nil {
- return nil, err
- }
-- var ret *DiskType
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- if c.config.CertFile == "" {
+- c.initHTTPClient()
+- } else {
+- err = c.initHTTPSClient(c.config.CertFile, c.config.KeyFile)
+- }
+-
+- if err != nil {
- return nil, err
- }
-- return ret, nil
-- // {
-- // "description": "Returns the specified disk type resource.",
-- // "httpMethod": "GET",
-- // "id": "compute.diskTypes.get",
-- // "parameterOrder": [
-- // "project",
-- // "zone",
-- // "diskType"
-- // ],
-- // "parameters": {
-- // "diskType": {
-- // "description": "Name of the disk type resource to return.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "zone": {
-- // "description": "Name of the zone scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/zones/{zone}/diskTypes/{diskType}",
-- // "response": {
-- // "$ref": "DiskType"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
-
--}
+- for _, caCert := range c.config.CaCertFile {
+- if err := c.AddRootCA(caCert); err != nil {
+- return nil, err
+- }
+- }
-
--// method id "compute.diskTypes.list":
+- return c, nil
+-}
-
--type DiskTypesListCall struct {
-- s *Service
-- project string
-- zone string
-- opt_ map[string]interface{}
+-// Override the Client's HTTP Transport object
+-func (c *Client) SetTransport(tr *http.Transport) {
+- c.httpClient.Transport = tr
-}
-
--// List: Retrieves the list of disk type resources available to the
--// specified project.
--func (r *DiskTypesService) List(project string, zone string) *DiskTypesListCall {
-- c := &DiskTypesListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.zone = zone
-- return c
+-// initHTTPClient initializes a HTTP client for etcd client
+-func (c *Client) initHTTPClient() {
+- tr := &http.Transport{
+- Dial: c.dial,
+- TLSClientConfig: &tls.Config{
+- InsecureSkipVerify: true,
+- },
+- }
+- c.httpClient = &http.Client{Transport: tr}
-}
-
--// Filter sets the optional parameter "filter": Filter expression for
--// filtering listed resources.
--func (c *DiskTypesListCall) Filter(filter string) *DiskTypesListCall {
-- c.opt_["filter"] = filter
-- return c
+-// initHTTPClient initializes a HTTPS client for etcd client
+-func (c *Client) initHTTPSClient(cert, key string) error {
+- if cert == "" || key == "" {
+- return errors.New("Require both cert and key path")
+- }
+-
+- tlsCert, err := tls.LoadX509KeyPair(cert, key)
+- if err != nil {
+- return err
+- }
+-
+- tlsConfig := &tls.Config{
+- Certificates: []tls.Certificate{tlsCert},
+- InsecureSkipVerify: true,
+- }
+-
+- tr := &http.Transport{
+- TLSClientConfig: tlsConfig,
+- Dial: c.dial,
+- }
+-
+- c.httpClient = &http.Client{Transport: tr}
+- return nil
-}
-
--// MaxResults sets the optional parameter "maxResults": Maximum count of
--// results to be returned. Maximum value is 500 and default value is
--// 500.
--func (c *DiskTypesListCall) MaxResults(maxResults int64) *DiskTypesListCall {
-- c.opt_["maxResults"] = maxResults
-- return c
+-// SetPersistence sets a writer to which the config will be
+-// written every time it's changed.
+-func (c *Client) SetPersistence(writer io.Writer) {
+- c.persistence = writer
-}
-
--// PageToken sets the optional parameter "pageToken": Tag returned by a
--// previous list request truncated by maxResults. Used to continue a
--// previous list request.
--func (c *DiskTypesListCall) PageToken(pageToken string) *DiskTypesListCall {
-- c.opt_["pageToken"] = pageToken
-- return c
+-// SetConsistency changes the consistency level of the client.
+-//
+-// When consistency is set to STRONG_CONSISTENCY, all requests,
+-// including GET, are sent to the leader. This means that, assuming
+-// the absence of leader failures, GET requests are guaranteed to see
+-// the changes made by previous requests.
+-//
+-// When consistency is set to WEAK_CONSISTENCY, other requests
+-// are still sent to the leader, but GET requests are sent to a
+-// random server from the server pool. This reduces the read
+-// load on the leader, but it's not guaranteed that the GET requests
+-// will see changes made by previous requests (they might have not
+-// yet been committed on non-leader servers).
+-func (c *Client) SetConsistency(consistency string) error {
+- if !(consistency == STRONG_CONSISTENCY || consistency == WEAK_CONSISTENCY) {
+- return errors.New("The argument must be either STRONG_CONSISTENCY or WEAK_CONSISTENCY.")
+- }
+- c.config.Consistency = consistency
+- return nil
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *DiskTypesListCall) Fields(s ...googleapi.Field) *DiskTypesListCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-// Sets the DialTimeout value
+-func (c *Client) SetDialTimeout(d time.Duration) {
+- c.config.DialTimeout = d
-}
-
--func (c *DiskTypesListCall) Do() (*DiskTypeList, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["filter"]; ok {
-- params.Set("filter", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["maxResults"]; ok {
-- params.Set("maxResults", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["pageToken"]; ok {
-- params.Set("pageToken", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+-// AddRootCA adds a root CA cert for the etcd client
+-func (c *Client) AddRootCA(caCert string) error {
+- if c.httpClient == nil {
+- return errors.New("Client has not been initialized yet!")
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/diskTypes")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "zone": c.zone,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+-
+- certBytes, err := ioutil.ReadFile(caCert)
- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *DiskTypeList
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- return err
+- }
+-
+- tr, ok := c.httpClient.Transport.(*http.Transport)
+-
+- if !ok {
+- panic("AddRootCA(): Transport type assert should not fail")
- }
-- return ret, nil
-- // {
-- // "description": "Retrieves the list of disk type resources available to the specified project.",
-- // "httpMethod": "GET",
-- // "id": "compute.diskTypes.list",
-- // "parameterOrder": [
-- // "project",
-- // "zone"
-- // ],
-- // "parameters": {
-- // "filter": {
-- // "description": "Optional. Filter expression for filtering listed resources.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "maxResults": {
-- // "default": "500",
-- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
-- // "format": "uint32",
-- // "location": "query",
-- // "maximum": "500",
-- // "minimum": "0",
-- // "type": "integer"
-- // },
-- // "pageToken": {
-- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "zone": {
-- // "description": "Name of the zone scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/zones/{zone}/diskTypes",
-- // "response": {
-- // "$ref": "DiskTypeList"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
-
--}
+- if tr.TLSClientConfig.RootCAs == nil {
+- caCertPool := x509.NewCertPool()
+- ok = caCertPool.AppendCertsFromPEM(certBytes)
+- if ok {
+- tr.TLSClientConfig.RootCAs = caCertPool
+- }
+- tr.TLSClientConfig.InsecureSkipVerify = false
+- } else {
+- ok = tr.TLSClientConfig.RootCAs.AppendCertsFromPEM(certBytes)
+- }
-
--// method id "compute.disks.aggregatedList":
+- if !ok {
+- err = errors.New("Unable to load caCert")
+- }
-
--type DisksAggregatedListCall struct {
-- s *Service
-- project string
-- opt_ map[string]interface{}
--}
+- c.config.CaCertFile = append(c.config.CaCertFile, caCert)
+- c.saveConfig()
-
--// AggregatedList: Retrieves the list of disks grouped by scope.
--func (r *DisksService) AggregatedList(project string) *DisksAggregatedListCall {
-- c := &DisksAggregatedListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- return c
+- return err
-}
-
--// Filter sets the optional parameter "filter": Filter expression for
--// filtering listed resources.
--func (c *DisksAggregatedListCall) Filter(filter string) *DisksAggregatedListCall {
-- c.opt_["filter"] = filter
-- return c
+-// SetCluster updates cluster information using the given machine list.
+-func (c *Client) SetCluster(machines []string) bool {
+- success := c.internalSyncCluster(machines)
+- return success
-}
-
--// MaxResults sets the optional parameter "maxResults": Maximum count of
--// results to be returned. Maximum value is 500 and default value is
--// 500.
--func (c *DisksAggregatedListCall) MaxResults(maxResults int64) *DisksAggregatedListCall {
-- c.opt_["maxResults"] = maxResults
-- return c
+-func (c *Client) GetCluster() []string {
+- return c.cluster.Machines
-}
-
--// PageToken sets the optional parameter "pageToken": Tag returned by a
--// previous list request truncated by maxResults. Used to continue a
--// previous list request.
--func (c *DisksAggregatedListCall) PageToken(pageToken string) *DisksAggregatedListCall {
-- c.opt_["pageToken"] = pageToken
-- return c
+-// SyncCluster updates the cluster information using the internal machine list.
+-func (c *Client) SyncCluster() bool {
+- return c.internalSyncCluster(c.cluster.Machines)
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *DisksAggregatedListCall) Fields(s ...googleapi.Field) *DisksAggregatedListCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
--}
+-// internalSyncCluster syncs cluster information using the given machine list.
+-func (c *Client) internalSyncCluster(machines []string) bool {
+- for _, machine := range machines {
+- httpPath := c.createHttpPath(machine, path.Join(version, "machines"))
+- resp, err := c.httpClient.Get(httpPath)
+- if err != nil {
+- // try another machine in the cluster
+- continue
+- } else {
+- b, err := ioutil.ReadAll(resp.Body)
+- resp.Body.Close()
+- if err != nil {
+- // try another machine in the cluster
+- continue
+- }
-
--func (c *DisksAggregatedListCall) Do() (*DiskAggregatedList, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["filter"]; ok {
-- params.Set("filter", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["maxResults"]; ok {
-- params.Set("maxResults", fmt.Sprintf("%v", v))
+- // update Machines List
+- c.cluster.updateFromStr(string(b))
+-
+- // update leader
+- // the first one in the machine list is the leader
+- c.cluster.switchLeader(0)
+-
+- logger.Debug("sync.machines ", c.cluster.Machines)
+- c.saveConfig()
+- return true
+- }
- }
-- if v, ok := c.opt_["pageToken"]; ok {
-- params.Set("pageToken", fmt.Sprintf("%v", v))
+- return false
+-}
+-
+-// createHttpPath creates a complete HTTP URL.
+-// serverName should contain both the host name and a port number, if any.
+-func (c *Client) createHttpPath(serverName string, _path string) string {
+- u, err := url.Parse(serverName)
+- if err != nil {
+- panic(err)
- }
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+-
+- u.Path = path.Join(u.Path, _path)
+-
+- if u.Scheme == "" {
+- u.Scheme = "http"
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/aggregated/disks")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+- return u.String()
+-}
+-
+-// dial attempts to open a TCP connection to the provided address, explicitly
+-// enabling keep-alives with a one-second interval.
+-func (c *Client) dial(network, addr string) (net.Conn, error) {
+- conn, err := net.DialTimeout(network, addr, c.config.DialTimeout)
- if err != nil {
- return nil, err
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
+-
+- tcpConn, ok := conn.(*net.TCPConn)
+- if !ok {
+- return nil, errors.New("Failed type-assertion of net.Conn as *net.TCPConn")
+- }
+-
+- // Keep TCP alive to check whether or not the remote machine is down
+- if err = tcpConn.SetKeepAlive(true); err != nil {
- return nil, err
- }
-- var ret *DiskAggregatedList
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+-
+- if err = tcpConn.SetKeepAlivePeriod(time.Second); err != nil {
- return nil, err
- }
-- return ret, nil
-- // {
-- // "description": "Retrieves the list of disks grouped by scope.",
-- // "httpMethod": "GET",
-- // "id": "compute.disks.aggregatedList",
-- // "parameterOrder": [
-- // "project"
-- // ],
-- // "parameters": {
-- // "filter": {
-- // "description": "Optional. Filter expression for filtering listed resources.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "maxResults": {
-- // "default": "500",
-- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
-- // "format": "uint32",
-- // "location": "query",
-- // "maximum": "500",
-- // "minimum": "0",
-- // "type": "integer"
-- // },
-- // "pageToken": {
-- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/aggregated/disks",
-- // "response": {
-- // "$ref": "DiskAggregatedList"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
-
+- return tcpConn, nil
-}
-
--// method id "compute.disks.createSnapshot":
+-func (c *Client) OpenCURL() {
+- c.cURLch = make(chan string, defaultBufferSize)
+-}
-
--type DisksCreateSnapshotCall struct {
-- s *Service
-- project string
-- zone string
-- disk string
-- snapshot *Snapshot
-- opt_ map[string]interface{}
+-func (c *Client) CloseCURL() {
+- c.cURLch = nil
-}
-
--// CreateSnapshot:
--func (r *DisksService) CreateSnapshot(project string, zone string, disk string, snapshot *Snapshot) *DisksCreateSnapshotCall {
-- c := &DisksCreateSnapshotCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.zone = zone
-- c.disk = disk
-- c.snapshot = snapshot
-- return c
+-func (c *Client) sendCURL(command string) {
+- go func() {
+- select {
+- case c.cURLch <- command:
+- default:
+- }
+- }()
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *DisksCreateSnapshotCall) Fields(s ...googleapi.Field) *DisksCreateSnapshotCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func (c *Client) RecvCURL() string {
+- return <-c.cURLch
-}
-
--func (c *DisksCreateSnapshotCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.snapshot)
-- if err != nil {
-- return nil, err
-- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+-// saveConfig saves the current config using c.persistence.
+-func (c *Client) saveConfig() error {
+- if c.persistence != nil {
+- b, err := json.Marshal(c)
+- if err != nil {
+- return err
+- }
+-
+- _, err = c.persistence.Write(b)
+- if err != nil {
+- return err
+- }
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/disks/{disk}/createSnapshot")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "zone": c.zone,
-- "disk": c.disk,
+-
+- return nil
+-}
+-
+-// MarshalJSON implements the Marshaller interface
+-// as defined by the standard JSON package.
+-func (c *Client) MarshalJSON() ([]byte, error) {
+- b, err := json.Marshal(struct {
+- Config Config `json:"config"`
+- Cluster *Cluster `json:"cluster"`
+- }{
+- Config: c.config,
+- Cluster: c.cluster,
- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+-
- if err != nil {
- return nil, err
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "httpMethod": "POST",
-- // "id": "compute.disks.createSnapshot",
-- // "parameterOrder": [
-- // "project",
-- // "zone",
-- // "disk"
-- // ],
-- // "parameters": {
-- // "disk": {
-- // "description": "Name of the persistent disk resource to snapshot.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "zone": {
-- // "description": "Name of the zone scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/zones/{zone}/disks/{disk}/createSnapshot",
-- // "request": {
-- // "$ref": "Snapshot"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
-
+- return b, nil
-}
-
--// method id "compute.disks.delete":
+-// UnmarshalJSON implements the Unmarshaller interface
+-// as defined by the standard JSON package.
+-func (c *Client) UnmarshalJSON(b []byte) error {
+- temp := struct {
+- Config Config `json:"config"`
+- Cluster *Cluster `json:"cluster"`
+- }{}
+- err := json.Unmarshal(b, &temp)
+- if err != nil {
+- return err
+- }
-
--type DisksDeleteCall struct {
-- s *Service
-- project string
-- zone string
-- disk string
-- opt_ map[string]interface{}
+- c.cluster = temp.Cluster
+- c.config = temp.Config
+- return nil
-}
+diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/client_test.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/client_test.go
+deleted file mode 100644
+index c245e47..0000000
+--- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/client_test.go
++++ /dev/null
+@@ -1,96 +0,0 @@
+-package etcd
-
--// Delete: Deletes the specified persistent disk resource.
--func (r *DisksService) Delete(project string, zone string, disk string) *DisksDeleteCall {
-- c := &DisksDeleteCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.zone = zone
-- c.disk = disk
-- return c
--}
+-import (
+- "encoding/json"
+- "fmt"
+- "net"
+- "net/url"
+- "os"
+- "testing"
+-)
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *DisksDeleteCall) Fields(s ...googleapi.Field) *DisksDeleteCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
--}
+-// To pass this test, we need to create a cluster of 3 machines
+-// The server should be listening on 127.0.0.1:4001, 4002, 4003
+-func TestSync(t *testing.T) {
+- fmt.Println("Make sure there are three nodes at 0.0.0.0:4001-4003")
-
--func (c *DisksDeleteCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+- // Explicit trailing slash to ensure this doesn't reproduce:
+- // https://github.com/coreos/go-etcd/issues/82
+- c := NewClient([]string{"http://127.0.0.1:4001/"})
+-
+- success := c.SyncCluster()
+- if !success {
+- t.Fatal("cannot sync machines")
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/disks/{disk}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("DELETE", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "zone": c.zone,
-- "disk": c.disk,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
+-
+- for _, m := range c.GetCluster() {
+- u, err := url.Parse(m)
+- if err != nil {
+- t.Fatal(err)
+- }
+- if u.Scheme != "http" {
+- t.Fatal("scheme must be http")
+- }
+-
+- host, _, err := net.SplitHostPort(u.Host)
+- if err != nil {
+- t.Fatal(err)
+- }
+- if host != "127.0.0.1" {
+- t.Fatal("Host must be 127.0.0.1")
+- }
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+-
+- badMachines := []string{"abc", "edef"}
+-
+- success = c.SetCluster(badMachines)
+-
+- if success {
+- t.Fatal("should not sync on bad machines")
- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-
+- goodMachines := []string{"127.0.0.1:4002"}
+-
+- success = c.SetCluster(goodMachines)
+-
+- if !success {
+- t.Fatal("cannot sync machines")
+- } else {
+- fmt.Println(c.cluster.Machines)
- }
-- return ret, nil
-- // {
-- // "description": "Deletes the specified persistent disk resource.",
-- // "httpMethod": "DELETE",
-- // "id": "compute.disks.delete",
-- // "parameterOrder": [
-- // "project",
-- // "zone",
-- // "disk"
-- // ],
-- // "parameters": {
-- // "disk": {
-- // "description": "Name of the persistent disk resource to delete.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "zone": {
-- // "description": "Name of the zone scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/zones/{zone}/disks/{disk}",
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
-
-}
-
--// method id "compute.disks.get":
+-func TestPersistence(t *testing.T) {
+- c := NewClient(nil)
+- c.SyncCluster()
+-
+- fo, err := os.Create("config.json")
+- if err != nil {
+- t.Fatal(err)
+- }
+- defer func() {
+- if err := fo.Close(); err != nil {
+- panic(err)
+- }
+- }()
+-
+- c.SetPersistence(fo)
+- err = c.saveConfig()
+- if err != nil {
+- t.Fatal(err)
+- }
+-
+- c2, err := NewClientFromFile("config.json")
+- if err != nil {
+- t.Fatal(err)
+- }
+-
+- // Verify that the two clients have the same config
+- b1, _ := json.Marshal(c)
+- b2, _ := json.Marshal(c2)
-
--type DisksGetCall struct {
-- s *Service
-- project string
-- zone string
-- disk string
-- opt_ map[string]interface{}
+- if string(b1) != string(b2) {
+- t.Fatalf("The two configs should be equal!")
+- }
-}
+diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/cluster.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/cluster.go
+deleted file mode 100644
+index aaa2054..0000000
+--- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/cluster.go
++++ /dev/null
+@@ -1,51 +0,0 @@
+-package etcd
-
--// Get: Returns the specified persistent disk resource.
--func (r *DisksService) Get(project string, zone string, disk string) *DisksGetCall {
-- c := &DisksGetCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.zone = zone
-- c.disk = disk
-- return c
--}
+-import (
+- "net/url"
+- "strings"
+-)
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *DisksGetCall) Fields(s ...googleapi.Field) *DisksGetCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-type Cluster struct {
+- Leader string `json:"leader"`
+- Machines []string `json:"machines"`
-}
-
--func (c *DisksGetCall) Do() (*Disk, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/disks/{disk}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "zone": c.zone,
-- "disk": c.disk,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Disk
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-func NewCluster(machines []string) *Cluster {
+- // if an empty slice was sent in then just assume HTTP 4001 on localhost
+- if len(machines) == 0 {
+- machines = []string{"http://127.0.0.1:4001"}
- }
-- return ret, nil
-- // {
-- // "description": "Returns the specified persistent disk resource.",
-- // "httpMethod": "GET",
-- // "id": "compute.disks.get",
-- // "parameterOrder": [
-- // "project",
-- // "zone",
-- // "disk"
-- // ],
-- // "parameters": {
-- // "disk": {
-- // "description": "Name of the persistent disk resource to return.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "zone": {
-- // "description": "Name of the zone scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/zones/{zone}/disks/{disk}",
-- // "response": {
-- // "$ref": "Disk"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
-
+- // default leader and machines
+- return &Cluster{
+- Leader: machines[0],
+- Machines: machines,
+- }
-}
-
--// method id "compute.disks.insert":
+-// switchLeader switch the current leader to machines[num]
+-func (cl *Cluster) switchLeader(num int) {
+- logger.Debugf("switch.leader[from %v to %v]",
+- cl.Leader, cl.Machines[num])
-
--type DisksInsertCall struct {
-- s *Service
-- project string
-- zone string
-- disk *Disk
-- opt_ map[string]interface{}
+- cl.Leader = cl.Machines[num]
-}
-
--// Insert: Creates a persistent disk resource in the specified project
--// using the data included in the request.
--func (r *DisksService) Insert(project string, zone string, disk *Disk) *DisksInsertCall {
-- c := &DisksInsertCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.zone = zone
-- c.disk = disk
-- return c
+-func (cl *Cluster) updateFromStr(machines string) {
+- cl.Machines = strings.Split(machines, ", ")
-}
-
--// SourceImage sets the optional parameter "sourceImage": Source image
--// to restore onto a disk.
--func (c *DisksInsertCall) SourceImage(sourceImage string) *DisksInsertCall {
-- c.opt_["sourceImage"] = sourceImage
-- return c
+-func (cl *Cluster) updateLeader(leader string) {
+- logger.Debugf("update.leader[%s,%s]", cl.Leader, leader)
+- cl.Leader = leader
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *DisksInsertCall) Fields(s ...googleapi.Field) *DisksInsertCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func (cl *Cluster) updateLeaderFromURL(u *url.URL) {
+- var leader string
+- if u.Scheme == "" {
+- leader = "http://" + u.Host
+- } else {
+- leader = u.Scheme + "://" + u.Host
+- }
+- cl.updateLeader(leader)
-}
+diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/compare_and_delete.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/compare_and_delete.go
+deleted file mode 100644
+index 11131bb..0000000
+--- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/compare_and_delete.go
++++ /dev/null
+@@ -1,34 +0,0 @@
+-package etcd
-
--func (c *DisksInsertCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.disk)
+-import "fmt"
+-
+-func (c *Client) CompareAndDelete(key string, prevValue string, prevIndex uint64) (*Response, error) {
+- raw, err := c.RawCompareAndDelete(key, prevValue, prevIndex)
- if err != nil {
- return nil, err
- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["sourceImage"]; ok {
-- params.Set("sourceImage", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+-
+- return raw.Unmarshal()
+-}
+-
+-func (c *Client) RawCompareAndDelete(key string, prevValue string, prevIndex uint64) (*RawResponse, error) {
+- if prevValue == "" && prevIndex == 0 {
+- return nil, fmt.Errorf("You must give either prevValue or prevIndex.")
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/disks")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "zone": c.zone,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
+-
+- options := Options{}
+- if prevValue != "" {
+- options["prevValue"] = prevValue
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- if prevIndex != 0 {
+- options["prevIndex"] = prevIndex
- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+-
+- raw, err := c.delete(key, options)
+-
+- if err != nil {
- return nil, err
- }
-- return ret, nil
-- // {
-- // "description": "Creates a persistent disk resource in the specified project using the data included in the request.",
-- // "httpMethod": "POST",
-- // "id": "compute.disks.insert",
-- // "parameterOrder": [
-- // "project",
-- // "zone"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "sourceImage": {
-- // "description": "Optional. Source image to restore onto a disk.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "zone": {
-- // "description": "Name of the zone scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/zones/{zone}/disks",
-- // "request": {
-- // "$ref": "Disk"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
-
+- return raw, err
-}
+diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/compare_and_delete_test.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/compare_and_delete_test.go
+deleted file mode 100644
+index 223e50f..0000000
+--- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/compare_and_delete_test.go
++++ /dev/null
+@@ -1,46 +0,0 @@
+-package etcd
-
--// method id "compute.disks.list":
+-import (
+- "testing"
+-)
-
--type DisksListCall struct {
-- s *Service
-- project string
-- zone string
-- opt_ map[string]interface{}
--}
+-func TestCompareAndDelete(t *testing.T) {
+- c := NewClient(nil)
+- defer func() {
+- c.Delete("foo", true)
+- }()
-
--// List: Retrieves the list of persistent disk resources contained
--// within the specified zone.
--func (r *DisksService) List(project string, zone string) *DisksListCall {
-- c := &DisksListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.zone = zone
-- return c
--}
+- c.Set("foo", "bar", 5)
-
--// Filter sets the optional parameter "filter": Filter expression for
--// filtering listed resources.
--func (c *DisksListCall) Filter(filter string) *DisksListCall {
-- c.opt_["filter"] = filter
-- return c
--}
+- // This should succeed an correct prevValue
+- resp, err := c.CompareAndDelete("foo", "bar", 0)
+- if err != nil {
+- t.Fatal(err)
+- }
+- if !(resp.PrevNode.Value == "bar" && resp.PrevNode.Key == "/foo" && resp.PrevNode.TTL == 5) {
+- t.Fatalf("CompareAndDelete 1 prevNode failed: %#v", resp)
+- }
-
--// MaxResults sets the optional parameter "maxResults": Maximum count of
--// results to be returned. Maximum value is 500 and default value is
--// 500.
--func (c *DisksListCall) MaxResults(maxResults int64) *DisksListCall {
-- c.opt_["maxResults"] = maxResults
-- return c
--}
+- resp, _ = c.Set("foo", "bar", 5)
+- // This should fail because it gives an incorrect prevValue
+- _, err = c.CompareAndDelete("foo", "xxx", 0)
+- if err == nil {
+- t.Fatalf("CompareAndDelete 2 should have failed. The response is: %#v", resp)
+- }
-
--// PageToken sets the optional parameter "pageToken": Tag returned by a
--// previous list request truncated by maxResults. Used to continue a
--// previous list request.
--func (c *DisksListCall) PageToken(pageToken string) *DisksListCall {
-- c.opt_["pageToken"] = pageToken
-- return c
--}
+- // This should succeed because it gives an correct prevIndex
+- resp, err = c.CompareAndDelete("foo", "", resp.Node.ModifiedIndex)
+- if err != nil {
+- t.Fatal(err)
+- }
+- if !(resp.PrevNode.Value == "bar" && resp.PrevNode.Key == "/foo" && resp.PrevNode.TTL == 5) {
+- t.Fatalf("CompareAndSwap 3 prevNode failed: %#v", resp)
+- }
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *DisksListCall) Fields(s ...googleapi.Field) *DisksListCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+- c.Set("foo", "bar", 5)
+- // This should fail because it gives an incorrect prevIndex
+- resp, err = c.CompareAndDelete("foo", "", 29817514)
+- if err == nil {
+- t.Fatalf("CompareAndDelete 4 should have failed. The response is: %#v", resp)
+- }
-}
+diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/compare_and_swap.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/compare_and_swap.go
+deleted file mode 100644
+index bb4f906..0000000
+--- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/compare_and_swap.go
++++ /dev/null
+@@ -1,36 +0,0 @@
+-package etcd
-
--func (c *DisksListCall) Do() (*DiskList, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["filter"]; ok {
-- params.Set("filter", fmt.Sprintf("%v", v))
+-import "fmt"
+-
+-func (c *Client) CompareAndSwap(key string, value string, ttl uint64,
+- prevValue string, prevIndex uint64) (*Response, error) {
+- raw, err := c.RawCompareAndSwap(key, value, ttl, prevValue, prevIndex)
+- if err != nil {
+- return nil, err
- }
-- if v, ok := c.opt_["maxResults"]; ok {
-- params.Set("maxResults", fmt.Sprintf("%v", v))
+-
+- return raw.Unmarshal()
+-}
+-
+-func (c *Client) RawCompareAndSwap(key string, value string, ttl uint64,
+- prevValue string, prevIndex uint64) (*RawResponse, error) {
+- if prevValue == "" && prevIndex == 0 {
+- return nil, fmt.Errorf("You must give either prevValue or prevIndex.")
- }
-- if v, ok := c.opt_["pageToken"]; ok {
-- params.Set("pageToken", fmt.Sprintf("%v", v))
+-
+- options := Options{}
+- if prevValue != "" {
+- options["prevValue"] = prevValue
- }
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+- if prevIndex != 0 {
+- options["prevIndex"] = prevIndex
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/disks")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "zone": c.zone,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+-
+- raw, err := c.put(key, value, ttl, options)
+-
- if err != nil {
- return nil, err
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *DiskList
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Retrieves the list of persistent disk resources contained within the specified zone.",
-- // "httpMethod": "GET",
-- // "id": "compute.disks.list",
-- // "parameterOrder": [
-- // "project",
-- // "zone"
-- // ],
-- // "parameters": {
-- // "filter": {
-- // "description": "Optional. Filter expression for filtering listed resources.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "maxResults": {
-- // "default": "500",
-- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
-- // "format": "uint32",
-- // "location": "query",
-- // "maximum": "500",
-- // "minimum": "0",
-- // "type": "integer"
-- // },
-- // "pageToken": {
-- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "zone": {
-- // "description": "Name of the zone scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/zones/{zone}/disks",
-- // "response": {
-- // "$ref": "DiskList"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
-
+- return raw, err
-}
+diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/compare_and_swap_test.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/compare_and_swap_test.go
+deleted file mode 100644
+index 14a1b00..0000000
+--- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/compare_and_swap_test.go
++++ /dev/null
+@@ -1,57 +0,0 @@
+-package etcd
-
--// method id "compute.firewalls.delete":
+-import (
+- "testing"
+-)
-
--type FirewallsDeleteCall struct {
-- s *Service
-- project string
-- firewall string
-- opt_ map[string]interface{}
--}
+-func TestCompareAndSwap(t *testing.T) {
+- c := NewClient(nil)
+- defer func() {
+- c.Delete("foo", true)
+- }()
-
--// Delete: Deletes the specified firewall resource.
--func (r *FirewallsService) Delete(project string, firewall string) *FirewallsDeleteCall {
-- c := &FirewallsDeleteCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.firewall = firewall
-- return c
--}
+- c.Set("foo", "bar", 5)
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *FirewallsDeleteCall) Fields(s ...googleapi.Field) *FirewallsDeleteCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
--}
+- // This should succeed
+- resp, err := c.CompareAndSwap("foo", "bar2", 5, "bar", 0)
+- if err != nil {
+- t.Fatal(err)
+- }
+- if !(resp.Node.Value == "bar2" && resp.Node.Key == "/foo" && resp.Node.TTL == 5) {
+- t.Fatalf("CompareAndSwap 1 failed: %#v", resp)
+- }
+-
+- if !(resp.PrevNode.Value == "bar" && resp.PrevNode.Key == "/foo" && resp.PrevNode.TTL == 5) {
+- t.Fatalf("CompareAndSwap 1 prevNode failed: %#v", resp)
+- }
+-
+- // This should fail because it gives an incorrect prevValue
+- resp, err = c.CompareAndSwap("foo", "bar3", 5, "xxx", 0)
+- if err == nil {
+- t.Fatalf("CompareAndSwap 2 should have failed. The response is: %#v", resp)
+- }
-
--func (c *FirewallsDeleteCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+- resp, err = c.Set("foo", "bar", 5)
+- if err != nil {
+- t.Fatal(err)
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/firewalls/{firewall}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("DELETE", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "firewall": c.firewall,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+-
+- // This should succeed
+- resp, err = c.CompareAndSwap("foo", "bar2", 5, "", resp.Node.ModifiedIndex)
- if err != nil {
-- return nil, err
+- t.Fatal(err)
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- if !(resp.Node.Value == "bar2" && resp.Node.Key == "/foo" && resp.Node.TTL == 5) {
+- t.Fatalf("CompareAndSwap 3 failed: %#v", resp)
- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-
+- if !(resp.PrevNode.Value == "bar" && resp.PrevNode.Key == "/foo" && resp.PrevNode.TTL == 5) {
+- t.Fatalf("CompareAndSwap 3 prevNode failed: %#v", resp)
- }
-- return ret, nil
-- // {
-- // "description": "Deletes the specified firewall resource.",
-- // "httpMethod": "DELETE",
-- // "id": "compute.firewalls.delete",
-- // "parameterOrder": [
-- // "project",
-- // "firewall"
-- // ],
-- // "parameters": {
-- // "firewall": {
-- // "description": "Name of the firewall resource to delete.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/firewalls/{firewall}",
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
-
+- // This should fail because it gives an incorrect prevIndex
+- resp, err = c.CompareAndSwap("foo", "bar3", 5, "", 29817514)
+- if err == nil {
+- t.Fatalf("CompareAndSwap 4 should have failed. The response is: %#v", resp)
+- }
-}
+diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/debug.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/debug.go
+deleted file mode 100644
+index 0f77788..0000000
+--- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/debug.go
++++ /dev/null
+@@ -1,55 +0,0 @@
+-package etcd
-
--// method id "compute.firewalls.get":
+-import (
+- "fmt"
+- "io/ioutil"
+- "log"
+- "strings"
+-)
-
--type FirewallsGetCall struct {
-- s *Service
-- project string
-- firewall string
-- opt_ map[string]interface{}
+-var logger *etcdLogger
+-
+-func SetLogger(l *log.Logger) {
+- logger = &etcdLogger{l}
-}
-
--// Get: Returns the specified firewall resource.
--func (r *FirewallsService) Get(project string, firewall string) *FirewallsGetCall {
-- c := &FirewallsGetCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.firewall = firewall
-- return c
+-func GetLogger() *log.Logger {
+- return logger.log
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *FirewallsGetCall) Fields(s ...googleapi.Field) *FirewallsGetCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-type etcdLogger struct {
+- log *log.Logger
-}
-
--func (c *FirewallsGetCall) Do() (*Firewall, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/firewalls/{firewall}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "firewall": c.firewall,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Firewall
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-func (p *etcdLogger) Debug(args ...interface{}) {
+- msg := "DEBUG: " + fmt.Sprint(args...)
+- p.log.Println(msg)
+-}
+-
+-func (p *etcdLogger) Debugf(f string, args ...interface{}) {
+- msg := "DEBUG: " + fmt.Sprintf(f, args...)
+- // Append newline if necessary
+- if !strings.HasSuffix(msg, "\n") {
+- msg = msg + "\n"
- }
-- return ret, nil
-- // {
-- // "description": "Returns the specified firewall resource.",
-- // "httpMethod": "GET",
-- // "id": "compute.firewalls.get",
-- // "parameterOrder": [
-- // "project",
-- // "firewall"
-- // ],
-- // "parameters": {
-- // "firewall": {
-- // "description": "Name of the firewall resource to return.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/firewalls/{firewall}",
-- // "response": {
-- // "$ref": "Firewall"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
+- p.log.Print(msg)
+-}
-
+-func (p *etcdLogger) Warning(args ...interface{}) {
+- msg := "WARNING: " + fmt.Sprint(args...)
+- p.log.Println(msg)
-}
-
--// method id "compute.firewalls.insert":
+-func (p *etcdLogger) Warningf(f string, args ...interface{}) {
+- msg := "WARNING: " + fmt.Sprintf(f, args...)
+- // Append newline if necessary
+- if !strings.HasSuffix(msg, "\n") {
+- msg = msg + "\n"
+- }
+- p.log.Print(msg)
+-}
-
--type FirewallsInsertCall struct {
-- s *Service
-- project string
-- firewall *Firewall
-- opt_ map[string]interface{}
+-func init() {
+- // Default logger uses the go default log.
+- SetLogger(log.New(ioutil.Discard, "go-etcd", log.LstdFlags))
-}
+diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/debug_test.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/debug_test.go
+deleted file mode 100644
+index 97f6d11..0000000
+--- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/debug_test.go
++++ /dev/null
+@@ -1,28 +0,0 @@
+-package etcd
-
--// Insert: Creates a firewall resource in the specified project using
--// the data included in the request.
--func (r *FirewallsService) Insert(project string, firewall *Firewall) *FirewallsInsertCall {
-- c := &FirewallsInsertCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.firewall = firewall
-- return c
+-import (
+- "testing"
+-)
+-
+-type Foo struct{}
+-type Bar struct {
+- one string
+- two int
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *FirewallsInsertCall) Fields(s ...googleapi.Field) *FirewallsInsertCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-// Tests that logs don't panic with arbitrary interfaces
+-func TestDebug(t *testing.T) {
+- f := &Foo{}
+- b := &Bar{"asfd", 3}
+- for _, test := range []interface{}{
+- 1234,
+- "asdf",
+- f,
+- b,
+- } {
+- logger.Debug(test)
+- logger.Debugf("something, %s", test)
+- logger.Warning(test)
+- logger.Warningf("something, %s", test)
+- }
-}
+diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/delete.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/delete.go
+deleted file mode 100644
+index b37accd..0000000
+--- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/delete.go
++++ /dev/null
+@@ -1,40 +0,0 @@
+-package etcd
+-
+-// Delete deletes the given key.
+-//
+-// When recursive set to false, if the key points to a
+-// directory the method will fail.
+-//
+-// When recursive set to true, if the key points to a file,
+-// the file will be deleted; if the key points to a directory,
+-// then everything under the directory (including all child directories)
+-// will be deleted.
+-func (c *Client) Delete(key string, recursive bool) (*Response, error) {
+- raw, err := c.RawDelete(key, recursive, false)
-
--func (c *FirewallsInsertCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.firewall)
- if err != nil {
- return nil, err
- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/firewalls")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+-
+- return raw.Unmarshal()
+-}
+-
+-// DeleteDir deletes an empty directory or a key value pair
+-func (c *Client) DeleteDir(key string) (*Response, error) {
+- raw, err := c.RawDelete(key, false, true)
+-
- if err != nil {
- return nil, err
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Creates a firewall resource in the specified project using the data included in the request.",
-- // "httpMethod": "POST",
-- // "id": "compute.firewalls.insert",
-- // "parameterOrder": [
-- // "project"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/firewalls",
-- // "request": {
-- // "$ref": "Firewall"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
-
+- return raw.Unmarshal()
-}
-
--// method id "compute.firewalls.list":
+-func (c *Client) RawDelete(key string, recursive bool, dir bool) (*RawResponse, error) {
+- ops := Options{
+- "recursive": recursive,
+- "dir": dir,
+- }
-
--type FirewallsListCall struct {
-- s *Service
-- project string
-- opt_ map[string]interface{}
+- return c.delete(key, ops)
-}
+diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/delete_test.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/delete_test.go
+deleted file mode 100644
+index 5904971..0000000
+--- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/delete_test.go
++++ /dev/null
+@@ -1,81 +0,0 @@
+-package etcd
-
--// List: Retrieves the list of firewall resources available to the
--// specified project.
--func (r *FirewallsService) List(project string) *FirewallsListCall {
-- c := &FirewallsListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- return c
--}
+-import (
+- "testing"
+-)
-
--// Filter sets the optional parameter "filter": Filter expression for
--// filtering listed resources.
--func (c *FirewallsListCall) Filter(filter string) *FirewallsListCall {
-- c.opt_["filter"] = filter
-- return c
--}
+-func TestDelete(t *testing.T) {
+- c := NewClient(nil)
+- defer func() {
+- c.Delete("foo", true)
+- }()
-
--// MaxResults sets the optional parameter "maxResults": Maximum count of
--// results to be returned. Maximum value is 500 and default value is
--// 500.
--func (c *FirewallsListCall) MaxResults(maxResults int64) *FirewallsListCall {
-- c.opt_["maxResults"] = maxResults
-- return c
--}
+- c.Set("foo", "bar", 5)
+- resp, err := c.Delete("foo", false)
+- if err != nil {
+- t.Fatal(err)
+- }
-
--// PageToken sets the optional parameter "pageToken": Tag returned by a
--// previous list request truncated by maxResults. Used to continue a
--// previous list request.
--func (c *FirewallsListCall) PageToken(pageToken string) *FirewallsListCall {
-- c.opt_["pageToken"] = pageToken
-- return c
--}
+- if !(resp.Node.Value == "") {
+- t.Fatalf("Delete failed with %s", resp.Node.Value)
+- }
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *FirewallsListCall) Fields(s ...googleapi.Field) *FirewallsListCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+- if !(resp.PrevNode.Value == "bar") {
+- t.Fatalf("Delete PrevNode failed with %s", resp.Node.Value)
+- }
+-
+- resp, err = c.Delete("foo", false)
+- if err == nil {
+- t.Fatalf("Delete should have failed because the key foo did not exist. "+
+- "The response was: %v", resp)
+- }
-}
-
--func (c *FirewallsListCall) Do() (*FirewallList, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["filter"]; ok {
-- params.Set("filter", fmt.Sprintf("%v", v))
+-func TestDeleteAll(t *testing.T) {
+- c := NewClient(nil)
+- defer func() {
+- c.Delete("foo", true)
+- c.Delete("fooDir", true)
+- }()
+-
+- c.SetDir("foo", 5)
+- // test delete an empty dir
+- resp, err := c.DeleteDir("foo")
+- if err != nil {
+- t.Fatal(err)
- }
-- if v, ok := c.opt_["maxResults"]; ok {
-- params.Set("maxResults", fmt.Sprintf("%v", v))
+-
+- if !(resp.Node.Value == "") {
+- t.Fatalf("DeleteAll 1 failed: %#v", resp)
- }
-- if v, ok := c.opt_["pageToken"]; ok {
-- params.Set("pageToken", fmt.Sprintf("%v", v))
+-
+- if !(resp.PrevNode.Dir == true && resp.PrevNode.Value == "") {
+- t.Fatalf("DeleteAll 1 PrevNode failed: %#v", resp)
- }
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+-
+- c.CreateDir("fooDir", 5)
+- c.Set("fooDir/foo", "bar", 5)
+- _, err = c.DeleteDir("fooDir")
+- if err == nil {
+- t.Fatal("should not able to delete a non-empty dir with deletedir")
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/firewalls")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+-
+- resp, err = c.Delete("fooDir", true)
- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- t.Fatal(err)
- }
-- var ret *FirewallList
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-
+- if !(resp.Node.Value == "") {
+- t.Fatalf("DeleteAll 2 failed: %#v", resp)
+- }
+-
+- if !(resp.PrevNode.Dir == true && resp.PrevNode.Value == "") {
+- t.Fatalf("DeleteAll 2 PrevNode failed: %#v", resp)
- }
-- return ret, nil
-- // {
-- // "description": "Retrieves the list of firewall resources available to the specified project.",
-- // "httpMethod": "GET",
-- // "id": "compute.firewalls.list",
-- // "parameterOrder": [
-- // "project"
-- // ],
-- // "parameters": {
-- // "filter": {
-- // "description": "Optional. Filter expression for filtering listed resources.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "maxResults": {
-- // "default": "500",
-- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
-- // "format": "uint32",
-- // "location": "query",
-- // "maximum": "500",
-- // "minimum": "0",
-- // "type": "integer"
-- // },
-- // "pageToken": {
-- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/firewalls",
-- // "response": {
-- // "$ref": "FirewallList"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
-
+- resp, err = c.Delete("foo", true)
+- if err == nil {
+- t.Fatalf("DeleteAll should have failed because the key foo did not exist. "+
+- "The response was: %v", resp)
+- }
-}
+diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/error.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/error.go
+deleted file mode 100644
+index 7e69287..0000000
+--- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/error.go
++++ /dev/null
+@@ -1,48 +0,0 @@
+-package etcd
-
--// method id "compute.firewalls.patch":
+-import (
+- "encoding/json"
+- "fmt"
+-)
-
--type FirewallsPatchCall struct {
-- s *Service
-- project string
-- firewall string
-- firewall2 *Firewall
-- opt_ map[string]interface{}
+-const (
+- ErrCodeEtcdNotReachable = 501
+-)
+-
+-var (
+- errorMap = map[int]string{
+- ErrCodeEtcdNotReachable: "All the given peers are not reachable",
+- }
+-)
+-
+-type EtcdError struct {
+- ErrorCode int `json:"errorCode"`
+- Message string `json:"message"`
+- Cause string `json:"cause,omitempty"`
+- Index uint64 `json:"index"`
-}
-
--// Patch: Updates the specified firewall resource with the data included
--// in the request. This method supports patch semantics.
--func (r *FirewallsService) Patch(project string, firewall string, firewall2 *Firewall) *FirewallsPatchCall {
-- c := &FirewallsPatchCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.firewall = firewall
-- c.firewall2 = firewall2
-- return c
+-func (e EtcdError) Error() string {
+- return fmt.Sprintf("%v: %v (%v) [%v]", e.ErrorCode, e.Message, e.Cause, e.Index)
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *FirewallsPatchCall) Fields(s ...googleapi.Field) *FirewallsPatchCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func newError(errorCode int, cause string, index uint64) *EtcdError {
+- return &EtcdError{
+- ErrorCode: errorCode,
+- Message: errorMap[errorCode],
+- Cause: cause,
+- Index: index,
+- }
-}
-
--func (c *FirewallsPatchCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.firewall2)
+-func handleError(b []byte) error {
+- etcdErr := new(EtcdError)
+-
+- err := json.Unmarshal(b, etcdErr)
- if err != nil {
-- return nil, err
-- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+- logger.Warningf("cannot unmarshal etcd error: %v", err)
+- return err
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/firewalls/{firewall}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("PATCH", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "firewall": c.firewall,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+-
+- return etcdErr
+-}
+diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/get.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/get.go
+deleted file mode 100644
+index 976bf07..0000000
+--- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/get.go
++++ /dev/null
+@@ -1,27 +0,0 @@
+-package etcd
+-
+-// Get gets the file or directory associated with the given key.
+-// If the key points to a directory, files and directories under
+-// it will be returned in sorted or unsorted order, depending on
+-// the sort flag.
+-// If recursive is set to false, contents under child directories
+-// will not be returned.
+-// If recursive is set to true, all the contents will be returned.
+-func (c *Client) Get(key string, sort, recursive bool) (*Response, error) {
+- raw, err := c.RawGet(key, sort, recursive)
+-
- if err != nil {
- return nil, err
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Updates the specified firewall resource with the data included in the request. This method supports patch semantics.",
-- // "httpMethod": "PATCH",
-- // "id": "compute.firewalls.patch",
-- // "parameterOrder": [
-- // "project",
-- // "firewall"
-- // ],
-- // "parameters": {
-- // "firewall": {
-- // "description": "Name of the firewall resource to update.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/firewalls/{firewall}",
-- // "request": {
-- // "$ref": "Firewall"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
-
+- return raw.Unmarshal()
-}
-
--// method id "compute.firewalls.update":
+-func (c *Client) RawGet(key string, sort, recursive bool) (*RawResponse, error) {
+- ops := Options{
+- "recursive": recursive,
+- "sorted": sort,
+- }
-
--type FirewallsUpdateCall struct {
-- s *Service
-- project string
-- firewall string
-- firewall2 *Firewall
-- opt_ map[string]interface{}
+- return c.get(key, ops)
-}
+diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/get_test.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/get_test.go
+deleted file mode 100644
+index 279c4e2..0000000
+--- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/get_test.go
++++ /dev/null
+@@ -1,131 +0,0 @@
+-package etcd
-
--// Update: Updates the specified firewall resource with the data
--// included in the request.
--func (r *FirewallsService) Update(project string, firewall string, firewall2 *Firewall) *FirewallsUpdateCall {
-- c := &FirewallsUpdateCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.firewall = firewall
-- c.firewall2 = firewall2
-- return c
+-import (
+- "reflect"
+- "testing"
+-)
+-
+-// cleanNode scrubs Expiration, ModifiedIndex and CreatedIndex of a node.
+-func cleanNode(n *Node) {
+- n.Expiration = nil
+- n.ModifiedIndex = 0
+- n.CreatedIndex = 0
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *FirewallsUpdateCall) Fields(s ...googleapi.Field) *FirewallsUpdateCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-// cleanResult scrubs a result object two levels deep of Expiration,
+-// ModifiedIndex and CreatedIndex.
+-func cleanResult(result *Response) {
+- // TODO(philips): make this recursive.
+- cleanNode(result.Node)
+- for i, _ := range result.Node.Nodes {
+- cleanNode(result.Node.Nodes[i])
+- for j, _ := range result.Node.Nodes[i].Nodes {
+- cleanNode(result.Node.Nodes[i].Nodes[j])
+- }
+- }
-}
-
--func (c *FirewallsUpdateCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.firewall2)
+-func TestGet(t *testing.T) {
+- c := NewClient(nil)
+- defer func() {
+- c.Delete("foo", true)
+- }()
+-
+- c.Set("foo", "bar", 5)
+-
+- result, err := c.Get("foo", false, false)
+-
- if err != nil {
-- return nil, err
+- t.Fatal(err)
- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+-
+- if result.Node.Key != "/foo" || result.Node.Value != "bar" {
+- t.Fatalf("Get failed with %s %s %v", result.Node.Key, result.Node.Value, result.Node.TTL)
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/firewalls/{firewall}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("PUT", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "firewall": c.firewall,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+-
+- result, err = c.Get("goo", false, false)
+- if err == nil {
+- t.Fatalf("should not be able to get non-exist key")
+- }
+-}
+-
+-func TestGetAll(t *testing.T) {
+- c := NewClient(nil)
+- defer func() {
+- c.Delete("fooDir", true)
+- }()
+-
+- c.CreateDir("fooDir", 5)
+- c.Set("fooDir/k0", "v0", 5)
+- c.Set("fooDir/k1", "v1", 5)
+-
+- // Return kv-pairs in sorted order
+- result, err := c.Get("fooDir", true, false)
+-
- if err != nil {
-- return nil, err
+- t.Fatal(err)
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+-
+- expected := Nodes{
+- &Node{
+- Key: "/fooDir/k0",
+- Value: "v0",
+- TTL: 5,
+- },
+- &Node{
+- Key: "/fooDir/k1",
+- Value: "v1",
+- TTL: 5,
+- },
- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-
+- cleanResult(result)
+-
+- if !reflect.DeepEqual(result.Node.Nodes, expected) {
+- t.Fatalf("(actual) %v != (expected) %v", result.Node.Nodes, expected)
- }
-- return ret, nil
-- // {
-- // "description": "Updates the specified firewall resource with the data included in the request.",
-- // "httpMethod": "PUT",
-- // "id": "compute.firewalls.update",
-- // "parameterOrder": [
-- // "project",
-- // "firewall"
-- // ],
-- // "parameters": {
-- // "firewall": {
-- // "description": "Name of the firewall resource to update.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/firewalls/{firewall}",
-- // "request": {
-- // "$ref": "Firewall"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
-
--}
+- // Test the `recursive` option
+- c.CreateDir("fooDir/childDir", 5)
+- c.Set("fooDir/childDir/k2", "v2", 5)
-
--// method id "compute.forwardingRules.aggregatedList":
+- // Return kv-pairs in sorted order
+- result, err = c.Get("fooDir", true, true)
-
--type ForwardingRulesAggregatedListCall struct {
-- s *Service
-- project string
-- opt_ map[string]interface{}
--}
+- cleanResult(result)
-
--// AggregatedList: Retrieves the list of forwarding rules grouped by
--// scope.
--func (r *ForwardingRulesService) AggregatedList(project string) *ForwardingRulesAggregatedListCall {
-- c := &ForwardingRulesAggregatedListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- return c
--}
+- if err != nil {
+- t.Fatal(err)
+- }
-
--// Filter sets the optional parameter "filter": Filter expression for
--// filtering listed resources.
--func (c *ForwardingRulesAggregatedListCall) Filter(filter string) *ForwardingRulesAggregatedListCall {
-- c.opt_["filter"] = filter
-- return c
--}
+- expected = Nodes{
+- &Node{
+- Key: "/fooDir/childDir",
+- Dir: true,
+- Nodes: Nodes{
+- &Node{
+- Key: "/fooDir/childDir/k2",
+- Value: "v2",
+- TTL: 5,
+- },
+- },
+- TTL: 5,
+- },
+- &Node{
+- Key: "/fooDir/k0",
+- Value: "v0",
+- TTL: 5,
+- },
+- &Node{
+- Key: "/fooDir/k1",
+- Value: "v1",
+- TTL: 5,
+- },
+- }
-
--// MaxResults sets the optional parameter "maxResults": Maximum count of
--// results to be returned. Maximum value is 500 and default value is
--// 500.
--func (c *ForwardingRulesAggregatedListCall) MaxResults(maxResults int64) *ForwardingRulesAggregatedListCall {
-- c.opt_["maxResults"] = maxResults
-- return c
--}
+- cleanResult(result)
-
--// PageToken sets the optional parameter "pageToken": Tag returned by a
--// previous list request truncated by maxResults. Used to continue a
--// previous list request.
--func (c *ForwardingRulesAggregatedListCall) PageToken(pageToken string) *ForwardingRulesAggregatedListCall {
-- c.opt_["pageToken"] = pageToken
-- return c
+- if !reflect.DeepEqual(result.Node.Nodes, expected) {
+- t.Fatalf("(actual) %v != (expected) %v", result.Node.Nodes, expected)
+- }
-}
+diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/options.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/options.go
+deleted file mode 100644
+index 701c9b3..0000000
+--- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/options.go
++++ /dev/null
+@@ -1,72 +0,0 @@
+-package etcd
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *ForwardingRulesAggregatedListCall) Fields(s ...googleapi.Field) *ForwardingRulesAggregatedListCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
--}
+-import (
+- "fmt"
+- "net/url"
+- "reflect"
+-)
-
--func (c *ForwardingRulesAggregatedListCall) Do() (*ForwardingRuleAggregatedList, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["filter"]; ok {
-- params.Set("filter", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["maxResults"]; ok {
-- params.Set("maxResults", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["pageToken"]; ok {
-- params.Set("pageToken", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/aggregated/forwardingRules")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+-type Options map[string]interface{}
+-
+-// An internally-used data structure that represents a mapping
+-// between valid options and their kinds
+-type validOptions map[string]reflect.Kind
+-
+-// Valid options for GET, PUT, POST, DELETE
+-// Using CAPITALIZED_UNDERSCORE to emphasize that these
+-// values are meant to be used as constants.
+-var (
+- VALID_GET_OPTIONS = validOptions{
+- "recursive": reflect.Bool,
+- "consistent": reflect.Bool,
+- "sorted": reflect.Bool,
+- "wait": reflect.Bool,
+- "waitIndex": reflect.Uint64,
- }
-- var ret *ForwardingRuleAggregatedList
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-
+- VALID_PUT_OPTIONS = validOptions{
+- "prevValue": reflect.String,
+- "prevIndex": reflect.Uint64,
+- "prevExist": reflect.Bool,
+- "dir": reflect.Bool,
- }
-- return ret, nil
-- // {
-- // "description": "Retrieves the list of forwarding rules grouped by scope.",
-- // "httpMethod": "GET",
-- // "id": "compute.forwardingRules.aggregatedList",
-- // "parameterOrder": [
-- // "project"
-- // ],
-- // "parameters": {
-- // "filter": {
-- // "description": "Optional. Filter expression for filtering listed resources.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "maxResults": {
-- // "default": "500",
-- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
-- // "format": "uint32",
-- // "location": "query",
-- // "maximum": "500",
-- // "minimum": "0",
-- // "type": "integer"
-- // },
-- // "pageToken": {
-- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/aggregated/forwardingRules",
-- // "response": {
-- // "$ref": "ForwardingRuleAggregatedList"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
-
--}
+- VALID_POST_OPTIONS = validOptions{}
-
--// method id "compute.forwardingRules.delete":
+- VALID_DELETE_OPTIONS = validOptions{
+- "recursive": reflect.Bool,
+- "dir": reflect.Bool,
+- "prevValue": reflect.String,
+- "prevIndex": reflect.Uint64,
+- }
+-)
-
--type ForwardingRulesDeleteCall struct {
-- s *Service
-- project string
-- region string
-- forwardingRule string
-- opt_ map[string]interface{}
+-// Convert options to a string of HTML parameters
+-func (ops Options) toParameters(validOps validOptions) (string, error) {
+- p := "?"
+- values := url.Values{}
+-
+- if ops == nil {
+- return "", nil
+- }
+-
+- for k, v := range ops {
+- // Check if the given option is valid (that it exists)
+- kind := validOps[k]
+- if kind == reflect.Invalid {
+- return "", fmt.Errorf("Invalid option: %v", k)
+- }
+-
+- // Check if the given option is of the valid type
+- t := reflect.TypeOf(v)
+- if kind != t.Kind() {
+- return "", fmt.Errorf("Option %s should be of %v kind, not of %v kind.",
+- k, kind, t.Kind())
+- }
+-
+- values.Set(k, fmt.Sprintf("%v", v))
+- }
+-
+- p += values.Encode()
+- return p, nil
-}
+diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/requests.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/requests.go
+deleted file mode 100644
+index 5d8b45a..0000000
+--- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/requests.go
++++ /dev/null
+@@ -1,377 +0,0 @@
+-package etcd
-
--// Delete: Deletes the specified ForwardingRule resource.
--func (r *ForwardingRulesService) Delete(project string, region string, forwardingRule string) *ForwardingRulesDeleteCall {
-- c := &ForwardingRulesDeleteCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.region = region
-- c.forwardingRule = forwardingRule
-- return c
+-import (
+- "errors"
+- "fmt"
+- "io/ioutil"
+- "math/rand"
+- "net/http"
+- "net/url"
+- "path"
+- "strings"
+- "sync"
+- "time"
+-)
+-
+-// Errors introduced by handling requests
+-var (
+- ErrRequestCancelled = errors.New("sending request is cancelled")
+-)
+-
+-type RawRequest struct {
+- Method string
+- RelativePath string
+- Values url.Values
+- Cancel <-chan bool
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *ForwardingRulesDeleteCall) Fields(s ...googleapi.Field) *ForwardingRulesDeleteCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-// NewRawRequest returns a new RawRequest
+-func NewRawRequest(method, relativePath string, values url.Values, cancel <-chan bool) *RawRequest {
+- return &RawRequest{
+- Method: method,
+- RelativePath: relativePath,
+- Values: values,
+- Cancel: cancel,
+- }
-}
-
--func (c *ForwardingRulesDeleteCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+-// getCancelable issues a cancelable GET request
+-func (c *Client) getCancelable(key string, options Options,
+- cancel <-chan bool) (*RawResponse, error) {
+- logger.Debugf("get %s [%s]", key, c.cluster.Leader)
+- p := keyToPath(key)
+-
+- // If consistency level is set to STRONG, append
+- // the `consistent` query string.
+- if c.config.Consistency == STRONG_CONSISTENCY {
+- options["consistent"] = true
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/forwardingRules/{forwardingRule}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("DELETE", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "region": c.region,
-- "forwardingRule": c.forwardingRule,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+-
+- str, err := options.toParameters(VALID_GET_OPTIONS)
- if err != nil {
- return nil, err
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- p += str
+-
+- req := NewRawRequest("GET", p, nil, cancel)
+- resp, err := c.SendRequest(req)
+-
+- if err != nil {
- return nil, err
- }
-- return ret, nil
-- // {
-- // "description": "Deletes the specified ForwardingRule resource.",
-- // "httpMethod": "DELETE",
-- // "id": "compute.forwardingRules.delete",
-- // "parameterOrder": [
-- // "project",
-- // "region",
-- // "forwardingRule"
-- // ],
-- // "parameters": {
-- // "forwardingRule": {
-- // "description": "Name of the ForwardingRule resource to delete.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "region": {
-- // "description": "Name of the region scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/regions/{region}/forwardingRules/{forwardingRule}",
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
-
+- return resp, nil
-}
-
--// method id "compute.forwardingRules.get":
--
--type ForwardingRulesGetCall struct {
-- s *Service
-- project string
-- region string
-- forwardingRule string
-- opt_ map[string]interface{}
+-// get issues a GET request
+-func (c *Client) get(key string, options Options) (*RawResponse, error) {
+- return c.getCancelable(key, options, nil)
-}
-
--// Get: Returns the specified ForwardingRule resource.
--func (r *ForwardingRulesService) Get(project string, region string, forwardingRule string) *ForwardingRulesGetCall {
-- c := &ForwardingRulesGetCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.region = region
-- c.forwardingRule = forwardingRule
-- return c
--}
+-// put issues a PUT request
+-func (c *Client) put(key string, value string, ttl uint64,
+- options Options) (*RawResponse, error) {
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *ForwardingRulesGetCall) Fields(s ...googleapi.Field) *ForwardingRulesGetCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
--}
+- logger.Debugf("put %s, %s, ttl: %d, [%s]", key, value, ttl, c.cluster.Leader)
+- p := keyToPath(key)
-
--func (c *ForwardingRulesGetCall) Do() (*ForwardingRule, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/forwardingRules/{forwardingRule}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "region": c.region,
-- "forwardingRule": c.forwardingRule,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+- str, err := options.toParameters(VALID_PUT_OPTIONS)
- if err != nil {
- return nil, err
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *ForwardingRule
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- p += str
+-
+- req := NewRawRequest("PUT", p, buildValues(value, ttl), nil)
+- resp, err := c.SendRequest(req)
+-
+- if err != nil {
- return nil, err
- }
-- return ret, nil
-- // {
-- // "description": "Returns the specified ForwardingRule resource.",
-- // "httpMethod": "GET",
-- // "id": "compute.forwardingRules.get",
-- // "parameterOrder": [
-- // "project",
-- // "region",
-- // "forwardingRule"
-- // ],
-- // "parameters": {
-- // "forwardingRule": {
-- // "description": "Name of the ForwardingRule resource to return.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "region": {
-- // "description": "Name of the region scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/regions/{region}/forwardingRules/{forwardingRule}",
-- // "response": {
-- // "$ref": "ForwardingRule"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
-
+- return resp, nil
-}
-
--// method id "compute.forwardingRules.insert":
+-// post issues a POST request
+-func (c *Client) post(key string, value string, ttl uint64) (*RawResponse, error) {
+- logger.Debugf("post %s, %s, ttl: %d, [%s]", key, value, ttl, c.cluster.Leader)
+- p := keyToPath(key)
-
--type ForwardingRulesInsertCall struct {
-- s *Service
-- project string
-- region string
-- forwardingrule *ForwardingRule
-- opt_ map[string]interface{}
--}
+- req := NewRawRequest("POST", p, buildValues(value, ttl), nil)
+- resp, err := c.SendRequest(req)
-
--// Insert: Creates a ForwardingRule resource in the specified project
--// and region using the data included in the request.
--func (r *ForwardingRulesService) Insert(project string, region string, forwardingrule *ForwardingRule) *ForwardingRulesInsertCall {
-- c := &ForwardingRulesInsertCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.region = region
-- c.forwardingrule = forwardingrule
-- return c
--}
+- if err != nil {
+- return nil, err
+- }
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *ForwardingRulesInsertCall) Fields(s ...googleapi.Field) *ForwardingRulesInsertCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+- return resp, nil
-}
-
--func (c *ForwardingRulesInsertCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.forwardingrule)
+-// delete issues a DELETE request
+-func (c *Client) delete(key string, options Options) (*RawResponse, error) {
+- logger.Debugf("delete %s [%s]", key, c.cluster.Leader)
+- p := keyToPath(key)
+-
+- str, err := options.toParameters(VALID_DELETE_OPTIONS)
- if err != nil {
- return nil, err
- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/forwardingRules")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "region": c.region,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+- p += str
+-
+- req := NewRawRequest("DELETE", p, nil, nil)
+- resp, err := c.SendRequest(req)
+-
- if err != nil {
- return nil, err
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+-
+- return resp, nil
+-}
+-
+-// SendRequest sends a HTTP request and returns a Response as defined by etcd
+-func (c *Client) SendRequest(rr *RawRequest) (*RawResponse, error) {
+-
+- var req *http.Request
+- var resp *http.Response
+- var httpPath string
+- var err error
+- var respBody []byte
+-
+- var numReqs = 1
+-
+- checkRetry := c.CheckRetry
+- if checkRetry == nil {
+- checkRetry = DefaultCheckRetry
- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-
+- cancelled := make(chan bool, 1)
+- reqLock := new(sync.Mutex)
+-
+- if rr.Cancel != nil {
+- cancelRoutine := make(chan bool)
+- defer close(cancelRoutine)
+-
+- go func() {
+- select {
+- case <-rr.Cancel:
+- cancelled <- true
+- logger.Debug("send.request is cancelled")
+- case <-cancelRoutine:
+- return
+- }
+-
+- // Repeat canceling request until this thread is stopped
+- // because we have no idea about whether it succeeds.
+- for {
+- reqLock.Lock()
+- c.httpClient.Transport.(*http.Transport).CancelRequest(req)
+- reqLock.Unlock()
+-
+- select {
+- case <-time.After(100 * time.Millisecond):
+- case <-cancelRoutine:
+- return
+- }
+- }
+- }()
- }
-- return ret, nil
-- // {
-- // "description": "Creates a ForwardingRule resource in the specified project and region using the data included in the request.",
-- // "httpMethod": "POST",
-- // "id": "compute.forwardingRules.insert",
-- // "parameterOrder": [
-- // "project",
-- // "region"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "region": {
-- // "description": "Name of the region scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/regions/{region}/forwardingRules",
-- // "request": {
-- // "$ref": "ForwardingRule"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
-
--}
+- // If we connect to a follower and consistency is required, retry until
+- // we connect to a leader
+- sleep := 25 * time.Millisecond
+- maxSleep := time.Second
+- for attempt := 0; ; attempt++ {
+- if attempt > 0 {
+- select {
+- case <-cancelled:
+- return nil, ErrRequestCancelled
+- case <-time.After(sleep):
+- sleep = sleep * 2
+- if sleep > maxSleep {
+- sleep = maxSleep
+- }
+- }
+- }
+-
+- logger.Debug("Connecting to etcd: attempt", attempt+1, "for", rr.RelativePath)
+-
+- if rr.Method == "GET" && c.config.Consistency == WEAK_CONSISTENCY {
+- // If it's a GET and consistency level is set to WEAK,
+- // then use a random machine.
+- httpPath = c.getHttpPath(true, rr.RelativePath)
+- } else {
+- // Else use the leader.
+- httpPath = c.getHttpPath(false, rr.RelativePath)
+- }
+-
+- // Return a cURL command if curlChan is set
+- if c.cURLch != nil {
+- command := fmt.Sprintf("curl -X %s %s", rr.Method, httpPath)
+- for key, value := range rr.Values {
+- command += fmt.Sprintf(" -d %s=%s", key, value[0])
+- }
+- c.sendCURL(command)
+- }
+-
+- logger.Debug("send.request.to ", httpPath, " | method ", rr.Method)
+-
+- reqLock.Lock()
+- if rr.Values == nil {
+- if req, err = http.NewRequest(rr.Method, httpPath, nil); err != nil {
+- return nil, err
+- }
+- } else {
+- body := strings.NewReader(rr.Values.Encode())
+- if req, err = http.NewRequest(rr.Method, httpPath, body); err != nil {
+- return nil, err
+- }
+-
+- req.Header.Set("Content-Type",
+- "application/x-www-form-urlencoded; param=value")
+- }
+- reqLock.Unlock()
+-
+- resp, err = c.httpClient.Do(req)
+- defer func() {
+- if resp != nil {
+- resp.Body.Close()
+- }
+- }()
+-
+- // If the request was cancelled, return ErrRequestCancelled directly
+- select {
+- case <-cancelled:
+- return nil, ErrRequestCancelled
+- default:
+- }
+-
+- numReqs++
+-
+- // network error, change a machine!
+- if err != nil {
+- logger.Debug("network error:", err.Error())
+- lastResp := http.Response{}
+- if checkErr := checkRetry(c.cluster, numReqs, lastResp, err); checkErr != nil {
+- return nil, checkErr
+- }
+-
+- c.cluster.switchLeader(attempt % len(c.cluster.Machines))
+- continue
+- }
-
--// method id "compute.forwardingRules.list":
+- // if there is no error, it should receive response
+- logger.Debug("recv.response.from", httpPath)
-
--type ForwardingRulesListCall struct {
-- s *Service
-- project string
-- region string
-- opt_ map[string]interface{}
--}
+- if validHttpStatusCode[resp.StatusCode] {
+- // try to read byte code and break the loop
+- respBody, err = ioutil.ReadAll(resp.Body)
+- if err == nil {
+- logger.Debug("recv.success.", httpPath)
+- break
+- }
+- // ReadAll error may be caused due to cancel request
+- select {
+- case <-cancelled:
+- return nil, ErrRequestCancelled
+- default:
+- }
+- }
-
--// List: Retrieves the list of ForwardingRule resources available to the
--// specified project and region.
--func (r *ForwardingRulesService) List(project string, region string) *ForwardingRulesListCall {
-- c := &ForwardingRulesListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.region = region
-- return c
--}
+- // if resp is TemporaryRedirect, set the new leader and retry
+- if resp.StatusCode == http.StatusTemporaryRedirect {
+- u, err := resp.Location()
-
--// Filter sets the optional parameter "filter": Filter expression for
--// filtering listed resources.
--func (c *ForwardingRulesListCall) Filter(filter string) *ForwardingRulesListCall {
-- c.opt_["filter"] = filter
-- return c
--}
+- if err != nil {
+- logger.Warning(err)
+- } else {
+- // Update cluster leader based on redirect location
+- // because it should point to the leader address
+- c.cluster.updateLeaderFromURL(u)
+- logger.Debug("recv.response.relocate", u.String())
+- }
+- resp.Body.Close()
+- continue
+- }
-
--// MaxResults sets the optional parameter "maxResults": Maximum count of
--// results to be returned. Maximum value is 500 and default value is
--// 500.
--func (c *ForwardingRulesListCall) MaxResults(maxResults int64) *ForwardingRulesListCall {
-- c.opt_["maxResults"] = maxResults
-- return c
--}
+- if checkErr := checkRetry(c.cluster, numReqs, *resp,
+- errors.New("Unexpected HTTP status code")); checkErr != nil {
+- return nil, checkErr
+- }
+- resp.Body.Close()
+- }
-
--// PageToken sets the optional parameter "pageToken": Tag returned by a
--// previous list request truncated by maxResults. Used to continue a
--// previous list request.
--func (c *ForwardingRulesListCall) PageToken(pageToken string) *ForwardingRulesListCall {
-- c.opt_["pageToken"] = pageToken
-- return c
--}
+- r := &RawResponse{
+- StatusCode: resp.StatusCode,
+- Body: respBody,
+- Header: resp.Header,
+- }
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *ForwardingRulesListCall) Fields(s ...googleapi.Field) *ForwardingRulesListCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+- return r, nil
-}
-
--func (c *ForwardingRulesListCall) Do() (*ForwardingRuleList, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["filter"]; ok {
-- params.Set("filter", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["maxResults"]; ok {
-- params.Set("maxResults", fmt.Sprintf("%v", v))
+-// DefaultCheckRetry defines the retrying behaviour for bad HTTP requests
+-// If we have retried 2 * machine number, stop retrying.
+-// If status code is InternalServerError, sleep for 200ms.
+-func DefaultCheckRetry(cluster *Cluster, numReqs int, lastResp http.Response,
+- err error) error {
+-
+- if numReqs >= 2*len(cluster.Machines) {
+- return newError(ErrCodeEtcdNotReachable,
+- "Tried to connect to each peer twice and failed", 0)
- }
-- if v, ok := c.opt_["pageToken"]; ok {
-- params.Set("pageToken", fmt.Sprintf("%v", v))
+-
+- code := lastResp.StatusCode
+- if code == http.StatusInternalServerError {
+- time.Sleep(time.Millisecond * 200)
+-
- }
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+-
+- logger.Warning("bad response status code", code)
+- return nil
+-}
+-
+-func (c *Client) getHttpPath(random bool, s ...string) string {
+- var machine string
+- if random {
+- machine = c.cluster.Machines[rand.Intn(len(c.cluster.Machines))]
+- } else {
+- machine = c.cluster.Leader
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/forwardingRules")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "region": c.region,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
+-
+- fullPath := machine + "/" + version
+- for _, seg := range s {
+- fullPath = fullPath + "/" + seg
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+-
+- return fullPath
+-}
+-
+-// buildValues builds a url.Values map according to the given value and ttl
+-func buildValues(value string, ttl uint64) url.Values {
+- v := url.Values{}
+-
+- if value != "" {
+- v.Set("value", value)
- }
-- var ret *ForwardingRuleList
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-
+- if ttl > 0 {
+- v.Set("ttl", fmt.Sprintf("%v", ttl))
- }
-- return ret, nil
-- // {
-- // "description": "Retrieves the list of ForwardingRule resources available to the specified project and region.",
-- // "httpMethod": "GET",
-- // "id": "compute.forwardingRules.list",
-- // "parameterOrder": [
-- // "project",
-- // "region"
-- // ],
-- // "parameters": {
-- // "filter": {
-- // "description": "Optional. Filter expression for filtering listed resources.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "maxResults": {
-- // "default": "500",
-- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
-- // "format": "uint32",
-- // "location": "query",
-- // "maximum": "500",
-- // "minimum": "0",
-- // "type": "integer"
-- // },
-- // "pageToken": {
-- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "region": {
-- // "description": "Name of the region scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/regions/{region}/forwardingRules",
-- // "response": {
-- // "$ref": "ForwardingRuleList"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
-
+- return v
-}
-
--// method id "compute.forwardingRules.setTarget":
+-// convert key string to http path exclude version
+-// for example: key[foo] -> path[keys/foo]
+-// key[/] -> path[keys/]
+-func keyToPath(key string) string {
+- p := path.Join("keys", key)
-
--type ForwardingRulesSetTargetCall struct {
-- s *Service
-- project string
-- region string
-- forwardingRule string
-- targetreference *TargetReference
-- opt_ map[string]interface{}
--}
+- // corner case: if key is "/" or "//" ect
+- // path join will clear the tailing "/"
+- // we need to add it back
+- if p == "keys" {
+- p = "keys/"
+- }
-
--// SetTarget: Changes target url for forwarding rule.
--func (r *ForwardingRulesService) SetTarget(project string, region string, forwardingRule string, targetreference *TargetReference) *ForwardingRulesSetTargetCall {
-- c := &ForwardingRulesSetTargetCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.region = region
-- c.forwardingRule = forwardingRule
-- c.targetreference = targetreference
-- return c
+- return p
-}
+diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/response.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/response.go
+deleted file mode 100644
+index 1fe9b4e..0000000
+--- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/response.go
++++ /dev/null
+@@ -1,89 +0,0 @@
+-package etcd
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *ForwardingRulesSetTargetCall) Fields(s ...googleapi.Field) *ForwardingRulesSetTargetCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-import (
+- "encoding/json"
+- "net/http"
+- "strconv"
+- "time"
+-)
+-
+-const (
+- rawResponse = iota
+- normalResponse
+-)
+-
+-type responseType int
+-
+-type RawResponse struct {
+- StatusCode int
+- Body []byte
+- Header http.Header
-}
-
--func (c *ForwardingRulesSetTargetCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.targetreference)
-- if err != nil {
-- return nil, err
+-var (
+- validHttpStatusCode = map[int]bool{
+- http.StatusCreated: true,
+- http.StatusOK: true,
+- http.StatusBadRequest: true,
+- http.StatusNotFound: true,
+- http.StatusPreconditionFailed: true,
+- http.StatusForbidden: true,
- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+-)
+-
+-// Unmarshal parses RawResponse and stores the result in Response
+-func (rr *RawResponse) Unmarshal() (*Response, error) {
+- if rr.StatusCode != http.StatusOK && rr.StatusCode != http.StatusCreated {
+- return nil, handleError(rr.Body)
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/forwardingRules/{forwardingRule}/setTarget")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "region": c.region,
-- "forwardingRule": c.forwardingRule,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+-
+- resp := new(Response)
+-
+- err := json.Unmarshal(rr.Body, resp)
+-
- if err != nil {
- return nil, err
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Changes target url for forwarding rule.",
-- // "httpMethod": "POST",
-- // "id": "compute.forwardingRules.setTarget",
-- // "parameterOrder": [
-- // "project",
-- // "region",
-- // "forwardingRule"
-- // ],
-- // "parameters": {
-- // "forwardingRule": {
-- // "description": "Name of the ForwardingRule resource in which target is to be set.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "region": {
-- // "description": "Name of the region scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/regions/{region}/forwardingRules/{forwardingRule}/setTarget",
-- // "request": {
-- // "$ref": "TargetReference"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
-
+- // attach index and term to response
+- resp.EtcdIndex, _ = strconv.ParseUint(rr.Header.Get("X-Etcd-Index"), 10, 64)
+- resp.RaftIndex, _ = strconv.ParseUint(rr.Header.Get("X-Raft-Index"), 10, 64)
+- resp.RaftTerm, _ = strconv.ParseUint(rr.Header.Get("X-Raft-Term"), 10, 64)
+-
+- return resp, nil
-}
-
--// method id "compute.globalAddresses.delete":
+-type Response struct {
+- Action string `json:"action"`
+- Node *Node `json:"node"`
+- PrevNode *Node `json:"prevNode,omitempty"`
+- EtcdIndex uint64 `json:"etcdIndex"`
+- RaftIndex uint64 `json:"raftIndex"`
+- RaftTerm uint64 `json:"raftTerm"`
+-}
-
--type GlobalAddressesDeleteCall struct {
-- s *Service
-- project string
-- address string
-- opt_ map[string]interface{}
+-type Node struct {
+- Key string `json:"key, omitempty"`
+- Value string `json:"value,omitempty"`
+- Dir bool `json:"dir,omitempty"`
+- Expiration *time.Time `json:"expiration,omitempty"`
+- TTL int64 `json:"ttl,omitempty"`
+- Nodes Nodes `json:"nodes,omitempty"`
+- ModifiedIndex uint64 `json:"modifiedIndex,omitempty"`
+- CreatedIndex uint64 `json:"createdIndex,omitempty"`
-}
-
--// Delete: Deletes the specified address resource.
--func (r *GlobalAddressesService) Delete(project string, address string) *GlobalAddressesDeleteCall {
-- c := &GlobalAddressesDeleteCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.address = address
-- return c
+-type Nodes []*Node
+-
+-// interfaces for sorting
+-func (ns Nodes) Len() int {
+- return len(ns)
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *GlobalAddressesDeleteCall) Fields(s ...googleapi.Field) *GlobalAddressesDeleteCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func (ns Nodes) Less(i, j int) bool {
+- return ns[i].Key < ns[j].Key
-}
-
--func (c *GlobalAddressesDeleteCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/addresses/{address}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("DELETE", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "address": c.address,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+-func (ns Nodes) Swap(i, j int) {
+- ns[i], ns[j] = ns[j], ns[i]
+-}
+diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/set_curl_chan_test.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/set_curl_chan_test.go
+deleted file mode 100644
+index 756e317..0000000
+--- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/set_curl_chan_test.go
++++ /dev/null
+@@ -1,42 +0,0 @@
+-package etcd
+-
+-import (
+- "fmt"
+- "testing"
+-)
+-
+-func TestSetCurlChan(t *testing.T) {
+- c := NewClient(nil)
+- c.OpenCURL()
+-
+- defer func() {
+- c.Delete("foo", true)
+- }()
+-
+- _, err := c.Set("foo", "bar", 5)
- if err != nil {
-- return nil, err
+- t.Fatal(err)
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+-
+- expected := fmt.Sprintf("curl -X PUT %s/v2/keys/foo -d value=bar -d ttl=5",
+- c.cluster.Leader)
+- actual := c.RecvCURL()
+- if expected != actual {
+- t.Fatalf(`Command "%s" is not equal to expected value "%s"`,
+- actual, expected)
- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-
+- c.SetConsistency(STRONG_CONSISTENCY)
+- _, err = c.Get("foo", false, false)
+- if err != nil {
+- t.Fatal(err)
- }
-- return ret, nil
-- // {
-- // "description": "Deletes the specified address resource.",
-- // "httpMethod": "DELETE",
-- // "id": "compute.globalAddresses.delete",
-- // "parameterOrder": [
-- // "project",
-- // "address"
-- // ],
-- // "parameters": {
-- // "address": {
-- // "description": "Name of the address resource to delete.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/addresses/{address}",
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
-
+- expected = fmt.Sprintf("curl -X GET %s/v2/keys/foo?consistent=true&recursive=false&sorted=false",
+- c.cluster.Leader)
+- actual = c.RecvCURL()
+- if expected != actual {
+- t.Fatalf(`Command "%s" is not equal to expected value "%s"`,
+- actual, expected)
+- }
-}
+diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/set_update_create.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/set_update_create.go
+deleted file mode 100644
+index cb0d567..0000000
+--- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/set_update_create.go
++++ /dev/null
+@@ -1,137 +0,0 @@
+-package etcd
-
--// method id "compute.globalAddresses.get":
+-// Set sets the given key to the given value.
+-// It will create a new key value pair or replace the old one.
+-// It will not replace a existing directory.
+-func (c *Client) Set(key string, value string, ttl uint64) (*Response, error) {
+- raw, err := c.RawSet(key, value, ttl)
-
--type GlobalAddressesGetCall struct {
-- s *Service
-- project string
-- address string
-- opt_ map[string]interface{}
--}
+- if err != nil {
+- return nil, err
+- }
-
--// Get: Returns the specified address resource.
--func (r *GlobalAddressesService) Get(project string, address string) *GlobalAddressesGetCall {
-- c := &GlobalAddressesGetCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.address = address
-- return c
+- return raw.Unmarshal()
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *GlobalAddressesGetCall) Fields(s ...googleapi.Field) *GlobalAddressesGetCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
--}
+-// Set sets the given key to a directory.
+-// It will create a new directory or replace the old key value pair by a directory.
+-// It will not replace a existing directory.
+-func (c *Client) SetDir(key string, ttl uint64) (*Response, error) {
+- raw, err := c.RawSetDir(key, ttl)
-
--func (c *GlobalAddressesGetCall) Do() (*Address, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/addresses/{address}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "address": c.address,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
- if err != nil {
- return nil, err
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Address
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+-
+- return raw.Unmarshal()
+-}
+-
+-// CreateDir creates a directory. It succeeds only if
+-// the given key does not yet exist.
+-func (c *Client) CreateDir(key string, ttl uint64) (*Response, error) {
+- raw, err := c.RawCreateDir(key, ttl)
+-
+- if err != nil {
- return nil, err
- }
-- return ret, nil
-- // {
-- // "description": "Returns the specified address resource.",
-- // "httpMethod": "GET",
-- // "id": "compute.globalAddresses.get",
-- // "parameterOrder": [
-- // "project",
-- // "address"
-- // ],
-- // "parameters": {
-- // "address": {
-- // "description": "Name of the address resource to return.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/addresses/{address}",
-- // "response": {
-- // "$ref": "Address"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
-
+- return raw.Unmarshal()
-}
-
--// method id "compute.globalAddresses.insert":
+-// UpdateDir updates the given directory. It succeeds only if the
+-// given key already exists.
+-func (c *Client) UpdateDir(key string, ttl uint64) (*Response, error) {
+- raw, err := c.RawUpdateDir(key, ttl)
-
--type GlobalAddressesInsertCall struct {
-- s *Service
-- project string
-- address *Address
-- opt_ map[string]interface{}
--}
+- if err != nil {
+- return nil, err
+- }
-
--// Insert: Creates an address resource in the specified project using
--// the data included in the request.
--func (r *GlobalAddressesService) Insert(project string, address *Address) *GlobalAddressesInsertCall {
-- c := &GlobalAddressesInsertCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.address = address
-- return c
+- return raw.Unmarshal()
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *GlobalAddressesInsertCall) Fields(s ...googleapi.Field) *GlobalAddressesInsertCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
--}
+-// Create creates a file with the given value under the given key. It succeeds
+-// only if the given key does not yet exist.
+-func (c *Client) Create(key string, value string, ttl uint64) (*Response, error) {
+- raw, err := c.RawCreate(key, value, ttl)
-
--func (c *GlobalAddressesInsertCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.address)
- if err != nil {
- return nil, err
- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/addresses")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+-
+- return raw.Unmarshal()
+-}
+-
+-// CreateInOrder creates a file with a key that's guaranteed to be higher than other
+-// keys in the given directory. It is useful for creating queues.
+-func (c *Client) CreateInOrder(dir string, value string, ttl uint64) (*Response, error) {
+- raw, err := c.RawCreateInOrder(dir, value, ttl)
+-
- if err != nil {
- return nil, err
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
+-
+- return raw.Unmarshal()
+-}
+-
+-// Update updates the given key to the given value. It succeeds only if the
+-// given key already exists.
+-func (c *Client) Update(key string, value string, ttl uint64) (*Response, error) {
+- raw, err := c.RawUpdate(key, value, ttl)
+-
+- if err != nil {
- return nil, err
- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-
+- return raw.Unmarshal()
+-}
+-
+-func (c *Client) RawUpdateDir(key string, ttl uint64) (*RawResponse, error) {
+- ops := Options{
+- "prevExist": true,
+- "dir": true,
- }
-- return ret, nil
-- // {
-- // "description": "Creates an address resource in the specified project using the data included in the request.",
-- // "httpMethod": "POST",
-- // "id": "compute.globalAddresses.insert",
-- // "parameterOrder": [
-- // "project"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/addresses",
-- // "request": {
-- // "$ref": "Address"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
-
+- return c.put(key, "", ttl, ops)
-}
-
--// method id "compute.globalAddresses.list":
+-func (c *Client) RawCreateDir(key string, ttl uint64) (*RawResponse, error) {
+- ops := Options{
+- "prevExist": false,
+- "dir": true,
+- }
-
--type GlobalAddressesListCall struct {
-- s *Service
-- project string
-- opt_ map[string]interface{}
+- return c.put(key, "", ttl, ops)
-}
-
--// List: Retrieves the list of global address resources.
--func (r *GlobalAddressesService) List(project string) *GlobalAddressesListCall {
-- c := &GlobalAddressesListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- return c
+-func (c *Client) RawSet(key string, value string, ttl uint64) (*RawResponse, error) {
+- return c.put(key, value, ttl, nil)
-}
-
--// Filter sets the optional parameter "filter": Filter expression for
--// filtering listed resources.
--func (c *GlobalAddressesListCall) Filter(filter string) *GlobalAddressesListCall {
-- c.opt_["filter"] = filter
-- return c
+-func (c *Client) RawSetDir(key string, ttl uint64) (*RawResponse, error) {
+- ops := Options{
+- "dir": true,
+- }
+-
+- return c.put(key, "", ttl, ops)
-}
-
--// MaxResults sets the optional parameter "maxResults": Maximum count of
--// results to be returned. Maximum value is 500 and default value is
--// 500.
--func (c *GlobalAddressesListCall) MaxResults(maxResults int64) *GlobalAddressesListCall {
-- c.opt_["maxResults"] = maxResults
-- return c
+-func (c *Client) RawUpdate(key string, value string, ttl uint64) (*RawResponse, error) {
+- ops := Options{
+- "prevExist": true,
+- }
+-
+- return c.put(key, value, ttl, ops)
-}
-
--// PageToken sets the optional parameter "pageToken": Tag returned by a
--// previous list request truncated by maxResults. Used to continue a
--// previous list request.
--func (c *GlobalAddressesListCall) PageToken(pageToken string) *GlobalAddressesListCall {
-- c.opt_["pageToken"] = pageToken
-- return c
+-func (c *Client) RawCreate(key string, value string, ttl uint64) (*RawResponse, error) {
+- ops := Options{
+- "prevExist": false,
+- }
+-
+- return c.put(key, value, ttl, ops)
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *GlobalAddressesListCall) Fields(s ...googleapi.Field) *GlobalAddressesListCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func (c *Client) RawCreateInOrder(dir string, value string, ttl uint64) (*RawResponse, error) {
+- return c.post(dir, value, ttl)
-}
+diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/set_update_create_test.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/set_update_create_test.go
+deleted file mode 100644
+index ced0f06..0000000
+--- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/set_update_create_test.go
++++ /dev/null
+@@ -1,241 +0,0 @@
+-package etcd
-
--func (c *GlobalAddressesListCall) Do() (*AddressList, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["filter"]; ok {
-- params.Set("filter", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["maxResults"]; ok {
-- params.Set("maxResults", fmt.Sprintf("%v", v))
+-import (
+- "testing"
+-)
+-
+-func TestSet(t *testing.T) {
+- c := NewClient(nil)
+- defer func() {
+- c.Delete("foo", true)
+- }()
+-
+- resp, err := c.Set("foo", "bar", 5)
+- if err != nil {
+- t.Fatal(err)
- }
-- if v, ok := c.opt_["pageToken"]; ok {
-- params.Set("pageToken", fmt.Sprintf("%v", v))
+- if resp.Node.Key != "/foo" || resp.Node.Value != "bar" || resp.Node.TTL != 5 {
+- t.Fatalf("Set 1 failed: %#v", resp)
- }
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+- if resp.PrevNode != nil {
+- t.Fatalf("Set 1 PrevNode failed: %#v", resp)
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/addresses")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+-
+- resp, err = c.Set("foo", "bar2", 5)
- if err != nil {
-- return nil, err
+- t.Fatal(err)
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- if !(resp.Node.Key == "/foo" && resp.Node.Value == "bar2" && resp.Node.TTL == 5) {
+- t.Fatalf("Set 2 failed: %#v", resp)
- }
-- var ret *AddressList
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- if resp.PrevNode.Key != "/foo" || resp.PrevNode.Value != "bar" || resp.Node.TTL != 5 {
+- t.Fatalf("Set 2 PrevNode failed: %#v", resp)
- }
-- return ret, nil
-- // {
-- // "description": "Retrieves the list of global address resources.",
-- // "httpMethod": "GET",
-- // "id": "compute.globalAddresses.list",
-- // "parameterOrder": [
-- // "project"
-- // ],
-- // "parameters": {
-- // "filter": {
-- // "description": "Optional. Filter expression for filtering listed resources.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "maxResults": {
-- // "default": "500",
-- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
-- // "format": "uint32",
-- // "location": "query",
-- // "maximum": "500",
-- // "minimum": "0",
-- // "type": "integer"
-- // },
-- // "pageToken": {
-- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/addresses",
-- // "response": {
-- // "$ref": "AddressList"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
--
-}
-
--// method id "compute.globalForwardingRules.delete":
+-func TestUpdate(t *testing.T) {
+- c := NewClient(nil)
+- defer func() {
+- c.Delete("foo", true)
+- c.Delete("nonexistent", true)
+- }()
-
--type GlobalForwardingRulesDeleteCall struct {
-- s *Service
-- project string
-- forwardingRule string
-- opt_ map[string]interface{}
--}
+- resp, err := c.Set("foo", "bar", 5)
-
--// Delete: Deletes the specified ForwardingRule resource.
--func (r *GlobalForwardingRulesService) Delete(project string, forwardingRule string) *GlobalForwardingRulesDeleteCall {
-- c := &GlobalForwardingRulesDeleteCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.forwardingRule = forwardingRule
-- return c
--}
+- if err != nil {
+- t.Fatal(err)
+- }
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *GlobalForwardingRulesDeleteCall) Fields(s ...googleapi.Field) *GlobalForwardingRulesDeleteCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
--}
+- // This should succeed.
+- resp, err = c.Update("foo", "wakawaka", 5)
+- if err != nil {
+- t.Fatal(err)
+- }
-
--func (c *GlobalForwardingRulesDeleteCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+- if !(resp.Action == "update" && resp.Node.Key == "/foo" && resp.Node.TTL == 5) {
+- t.Fatalf("Update 1 failed: %#v", resp)
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/forwardingRules/{forwardingRule}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("DELETE", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "forwardingRule": c.forwardingRule,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
+- if !(resp.PrevNode.Key == "/foo" && resp.PrevNode.Value == "bar" && resp.Node.TTL == 5) {
+- t.Fatalf("Update 1 prevValue failed: %#v", resp)
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+-
+- // This should fail because the key does not exist.
+- resp, err = c.Update("nonexistent", "whatever", 5)
+- if err == nil {
+- t.Fatalf("The key %v did not exist, so the update should have failed."+
+- "The response was: %#v", resp.Node.Key, resp)
- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-}
+-
+-func TestCreate(t *testing.T) {
+- c := NewClient(nil)
+- defer func() {
+- c.Delete("newKey", true)
+- }()
+-
+- newKey := "/newKey"
+- newValue := "/newValue"
+-
+- // This should succeed
+- resp, err := c.Create(newKey, newValue, 5)
+- if err != nil {
+- t.Fatal(err)
+- }
+-
+- if !(resp.Action == "create" && resp.Node.Key == newKey &&
+- resp.Node.Value == newValue && resp.Node.TTL == 5) {
+- t.Fatalf("Create 1 failed: %#v", resp)
+- }
+- if resp.PrevNode != nil {
+- t.Fatalf("Create 1 PrevNode failed: %#v", resp)
- }
-- return ret, nil
-- // {
-- // "description": "Deletes the specified ForwardingRule resource.",
-- // "httpMethod": "DELETE",
-- // "id": "compute.globalForwardingRules.delete",
-- // "parameterOrder": [
-- // "project",
-- // "forwardingRule"
-- // ],
-- // "parameters": {
-- // "forwardingRule": {
-- // "description": "Name of the ForwardingRule resource to delete.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/forwardingRules/{forwardingRule}",
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
-
+- // This should fail, because the key is already there
+- resp, err = c.Create(newKey, newValue, 5)
+- if err == nil {
+- t.Fatalf("The key %v did exist, so the creation should have failed."+
+- "The response was: %#v", resp.Node.Key, resp)
+- }
-}
-
--// method id "compute.globalForwardingRules.get":
--
--type GlobalForwardingRulesGetCall struct {
-- s *Service
-- project string
-- forwardingRule string
-- opt_ map[string]interface{}
--}
+-func TestCreateInOrder(t *testing.T) {
+- c := NewClient(nil)
+- dir := "/queue"
+- defer func() {
+- c.DeleteDir(dir)
+- }()
-
--// Get: Returns the specified ForwardingRule resource.
--func (r *GlobalForwardingRulesService) Get(project string, forwardingRule string) *GlobalForwardingRulesGetCall {
-- c := &GlobalForwardingRulesGetCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.forwardingRule = forwardingRule
-- return c
--}
+- var firstKey, secondKey string
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *GlobalForwardingRulesGetCall) Fields(s ...googleapi.Field) *GlobalForwardingRulesGetCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
--}
+- resp, err := c.CreateInOrder(dir, "1", 5)
+- if err != nil {
+- t.Fatal(err)
+- }
-
--func (c *GlobalForwardingRulesGetCall) Do() (*ForwardingRule, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+- if !(resp.Action == "create" && resp.Node.Value == "1" && resp.Node.TTL == 5) {
+- t.Fatalf("Create 1 failed: %#v", resp)
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/forwardingRules/{forwardingRule}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "forwardingRule": c.forwardingRule,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+-
+- firstKey = resp.Node.Key
+-
+- resp, err = c.CreateInOrder(dir, "2", 5)
- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- t.Fatal(err)
- }
-- var ret *ForwardingRule
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-
+- if !(resp.Action == "create" && resp.Node.Value == "2" && resp.Node.TTL == 5) {
+- t.Fatalf("Create 2 failed: %#v", resp)
- }
-- return ret, nil
-- // {
-- // "description": "Returns the specified ForwardingRule resource.",
-- // "httpMethod": "GET",
-- // "id": "compute.globalForwardingRules.get",
-- // "parameterOrder": [
-- // "project",
-- // "forwardingRule"
-- // ],
-- // "parameters": {
-- // "forwardingRule": {
-- // "description": "Name of the ForwardingRule resource to return.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/forwardingRules/{forwardingRule}",
-- // "response": {
-- // "$ref": "ForwardingRule"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
-
+- secondKey = resp.Node.Key
+-
+- if firstKey >= secondKey {
+- t.Fatalf("Expected first key to be greater than second key, but %s is not greater than %s",
+- firstKey, secondKey)
+- }
-}
-
--// method id "compute.globalForwardingRules.insert":
+-func TestSetDir(t *testing.T) {
+- c := NewClient(nil)
+- defer func() {
+- c.Delete("foo", true)
+- c.Delete("fooDir", true)
+- }()
-
--type GlobalForwardingRulesInsertCall struct {
-- s *Service
-- project string
-- forwardingrule *ForwardingRule
-- opt_ map[string]interface{}
--}
+- resp, err := c.CreateDir("fooDir", 5)
+- if err != nil {
+- t.Fatal(err)
+- }
+- if !(resp.Node.Key == "/fooDir" && resp.Node.Value == "" && resp.Node.TTL == 5) {
+- t.Fatalf("SetDir 1 failed: %#v", resp)
+- }
+- if resp.PrevNode != nil {
+- t.Fatalf("SetDir 1 PrevNode failed: %#v", resp)
+- }
-
--// Insert: Creates a ForwardingRule resource in the specified project
--// and region using the data included in the request.
--func (r *GlobalForwardingRulesService) Insert(project string, forwardingrule *ForwardingRule) *GlobalForwardingRulesInsertCall {
-- c := &GlobalForwardingRulesInsertCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.forwardingrule = forwardingrule
-- return c
--}
+- // This should fail because /fooDir already points to a directory
+- resp, err = c.CreateDir("/fooDir", 5)
+- if err == nil {
+- t.Fatalf("fooDir already points to a directory, so SetDir should have failed."+
+- "The response was: %#v", resp)
+- }
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *GlobalForwardingRulesInsertCall) Fields(s ...googleapi.Field) *GlobalForwardingRulesInsertCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
--}
+- _, err = c.Set("foo", "bar", 5)
+- if err != nil {
+- t.Fatal(err)
+- }
-
--func (c *GlobalForwardingRulesInsertCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.forwardingrule)
+- // This should succeed
+- // It should replace the key
+- resp, err = c.SetDir("foo", 5)
- if err != nil {
-- return nil, err
+- t.Fatal(err)
- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+- if !(resp.Node.Key == "/foo" && resp.Node.Value == "" && resp.Node.TTL == 5) {
+- t.Fatalf("SetDir 2 failed: %#v", resp)
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/forwardingRules")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+- if !(resp.PrevNode.Key == "/foo" && resp.PrevNode.Value == "bar" && resp.PrevNode.TTL == 5) {
+- t.Fatalf("SetDir 2 failed: %#v", resp)
+- }
+-}
+-
+-func TestUpdateDir(t *testing.T) {
+- c := NewClient(nil)
+- defer func() {
+- c.Delete("fooDir", true)
+- }()
+-
+- resp, err := c.CreateDir("fooDir", 5)
- if err != nil {
-- return nil, err
+- t.Fatal(err)
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+-
+- // This should succeed.
+- resp, err = c.UpdateDir("fooDir", 5)
+- if err != nil {
+- t.Fatal(err)
- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-
+- if !(resp.Action == "update" && resp.Node.Key == "/fooDir" &&
+- resp.Node.Value == "" && resp.Node.TTL == 5) {
+- t.Fatalf("UpdateDir 1 failed: %#v", resp)
+- }
+- if !(resp.PrevNode.Key == "/fooDir" && resp.PrevNode.Dir == true && resp.PrevNode.TTL == 5) {
+- t.Fatalf("UpdateDir 1 PrevNode failed: %#v", resp)
- }
-- return ret, nil
-- // {
-- // "description": "Creates a ForwardingRule resource in the specified project and region using the data included in the request.",
-- // "httpMethod": "POST",
-- // "id": "compute.globalForwardingRules.insert",
-- // "parameterOrder": [
-- // "project"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/forwardingRules",
-- // "request": {
-- // "$ref": "ForwardingRule"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
-
+- // This should fail because the key does not exist.
+- resp, err = c.UpdateDir("nonexistentDir", 5)
+- if err == nil {
+- t.Fatalf("The key %v did not exist, so the update should have failed."+
+- "The response was: %#v", resp.Node.Key, resp)
+- }
-}
-
--// method id "compute.globalForwardingRules.list":
+-func TestCreateDir(t *testing.T) {
+- c := NewClient(nil)
+- defer func() {
+- c.Delete("fooDir", true)
+- }()
-
--type GlobalForwardingRulesListCall struct {
-- s *Service
-- project string
-- opt_ map[string]interface{}
--}
+- // This should succeed
+- resp, err := c.CreateDir("fooDir", 5)
+- if err != nil {
+- t.Fatal(err)
+- }
-
--// List: Retrieves the list of ForwardingRule resources available to the
--// specified project.
--func (r *GlobalForwardingRulesService) List(project string) *GlobalForwardingRulesListCall {
-- c := &GlobalForwardingRulesListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- return c
--}
+- if !(resp.Action == "create" && resp.Node.Key == "/fooDir" &&
+- resp.Node.Value == "" && resp.Node.TTL == 5) {
+- t.Fatalf("CreateDir 1 failed: %#v", resp)
+- }
+- if resp.PrevNode != nil {
+- t.Fatalf("CreateDir 1 PrevNode failed: %#v", resp)
+- }
-
--// Filter sets the optional parameter "filter": Filter expression for
--// filtering listed resources.
--func (c *GlobalForwardingRulesListCall) Filter(filter string) *GlobalForwardingRulesListCall {
-- c.opt_["filter"] = filter
-- return c
+- // This should fail, because the key is already there
+- resp, err = c.CreateDir("fooDir", 5)
+- if err == nil {
+- t.Fatalf("The key %v did exist, so the creation should have failed."+
+- "The response was: %#v", resp.Node.Key, resp)
+- }
-}
+diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/version.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/version.go
+deleted file mode 100644
+index b3d05df..0000000
+--- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/version.go
++++ /dev/null
+@@ -1,3 +0,0 @@
+-package etcd
-
--// MaxResults sets the optional parameter "maxResults": Maximum count of
--// results to be returned. Maximum value is 500 and default value is
--// 500.
--func (c *GlobalForwardingRulesListCall) MaxResults(maxResults int64) *GlobalForwardingRulesListCall {
-- c.opt_["maxResults"] = maxResults
-- return c
--}
+-const version = "v2"
+diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/watch.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/watch.go
+deleted file mode 100644
+index aa8d3df..0000000
+--- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/watch.go
++++ /dev/null
+@@ -1,103 +0,0 @@
+-package etcd
-
--// PageToken sets the optional parameter "pageToken": Tag returned by a
--// previous list request truncated by maxResults. Used to continue a
--// previous list request.
--func (c *GlobalForwardingRulesListCall) PageToken(pageToken string) *GlobalForwardingRulesListCall {
-- c.opt_["pageToken"] = pageToken
-- return c
--}
+-import (
+- "errors"
+-)
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *GlobalForwardingRulesListCall) Fields(s ...googleapi.Field) *GlobalForwardingRulesListCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
--}
+-// Errors introduced by the Watch command.
+-var (
+- ErrWatchStoppedByUser = errors.New("Watch stopped by the user via stop channel")
+-)
-
--func (c *GlobalForwardingRulesListCall) Do() (*ForwardingRuleList, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["filter"]; ok {
-- params.Set("filter", fmt.Sprintf("%v", v))
+-// If recursive is set to true the watch returns the first change under the given
+-// prefix since the given index.
+-//
+-// If recursive is set to false the watch returns the first change to the given key
+-// since the given index.
+-//
+-// To watch for the latest change, set waitIndex = 0.
+-//
+-// If a receiver channel is given, it will be a long-term watch. Watch will block at the
+-//channel. After someone receives the channel, it will go on to watch that
+-// prefix. If a stop channel is given, the client can close long-term watch using
+-// the stop channel.
+-func (c *Client) Watch(prefix string, waitIndex uint64, recursive bool,
+- receiver chan *Response, stop chan bool) (*Response, error) {
+- logger.Debugf("watch %s [%s]", prefix, c.cluster.Leader)
+- if receiver == nil {
+- raw, err := c.watchOnce(prefix, waitIndex, recursive, stop)
+-
+- if err != nil {
+- return nil, err
+- }
+-
+- return raw.Unmarshal()
- }
-- if v, ok := c.opt_["maxResults"]; ok {
-- params.Set("maxResults", fmt.Sprintf("%v", v))
+- defer close(receiver)
+-
+- for {
+- raw, err := c.watchOnce(prefix, waitIndex, recursive, stop)
+-
+- if err != nil {
+- return nil, err
+- }
+-
+- resp, err := raw.Unmarshal()
+-
+- if err != nil {
+- return nil, err
+- }
+-
+- waitIndex = resp.Node.ModifiedIndex + 1
+- receiver <- resp
- }
-- if v, ok := c.opt_["pageToken"]; ok {
-- params.Set("pageToken", fmt.Sprintf("%v", v))
+-}
+-
+-func (c *Client) RawWatch(prefix string, waitIndex uint64, recursive bool,
+- receiver chan *RawResponse, stop chan bool) (*RawResponse, error) {
+-
+- logger.Debugf("rawWatch %s [%s]", prefix, c.cluster.Leader)
+- if receiver == nil {
+- return c.watchOnce(prefix, waitIndex, recursive, stop)
- }
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+-
+- for {
+- raw, err := c.watchOnce(prefix, waitIndex, recursive, stop)
+-
+- if err != nil {
+- return nil, err
+- }
+-
+- resp, err := raw.Unmarshal()
+-
+- if err != nil {
+- return nil, err
+- }
+-
+- waitIndex = resp.Node.ModifiedIndex + 1
+- receiver <- raw
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/forwardingRules")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
+-}
+-
+-// helper func
+-// return when there is change under the given prefix
+-func (c *Client) watchOnce(key string, waitIndex uint64, recursive bool, stop chan bool) (*RawResponse, error) {
+-
+- options := Options{
+- "wait": true,
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- if waitIndex > 0 {
+- options["waitIndex"] = waitIndex
- }
-- var ret *ForwardingRuleList
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- if recursive {
+- options["recursive"] = true
- }
-- return ret, nil
-- // {
-- // "description": "Retrieves the list of ForwardingRule resources available to the specified project.",
-- // "httpMethod": "GET",
-- // "id": "compute.globalForwardingRules.list",
-- // "parameterOrder": [
-- // "project"
-- // ],
-- // "parameters": {
-- // "filter": {
-- // "description": "Optional. Filter expression for filtering listed resources.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "maxResults": {
-- // "default": "500",
-- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
-- // "format": "uint32",
-- // "location": "query",
-- // "maximum": "500",
-- // "minimum": "0",
-- // "type": "integer"
-- // },
-- // "pageToken": {
-- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/forwardingRules",
-- // "response": {
-- // "$ref": "ForwardingRuleList"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
-
--}
+- resp, err := c.getCancelable(key, options, stop)
-
--// method id "compute.globalForwardingRules.setTarget":
+- if err == ErrRequestCancelled {
+- return nil, ErrWatchStoppedByUser
+- }
-
--type GlobalForwardingRulesSetTargetCall struct {
-- s *Service
-- project string
-- forwardingRule string
-- targetreference *TargetReference
-- opt_ map[string]interface{}
+- return resp, err
-}
+diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/watch_test.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/watch_test.go
+deleted file mode 100644
+index 43e1dfe..0000000
+--- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/watch_test.go
++++ /dev/null
+@@ -1,119 +0,0 @@
+-package etcd
+-
+-import (
+- "fmt"
+- "runtime"
+- "testing"
+- "time"
+-)
-
--// SetTarget: Changes target url for forwarding rule.
--func (r *GlobalForwardingRulesService) SetTarget(project string, forwardingRule string, targetreference *TargetReference) *GlobalForwardingRulesSetTargetCall {
-- c := &GlobalForwardingRulesSetTargetCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.forwardingRule = forwardingRule
-- c.targetreference = targetreference
-- return c
--}
+-func TestWatch(t *testing.T) {
+- c := NewClient(nil)
+- defer func() {
+- c.Delete("watch_foo", true)
+- }()
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *GlobalForwardingRulesSetTargetCall) Fields(s ...googleapi.Field) *GlobalForwardingRulesSetTargetCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
--}
+- go setHelper("watch_foo", "bar", c)
-
--func (c *GlobalForwardingRulesSetTargetCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.targetreference)
+- resp, err := c.Watch("watch_foo", 0, false, nil, nil)
- if err != nil {
-- return nil, err
+- t.Fatal(err)
- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+- if !(resp.Node.Key == "/watch_foo" && resp.Node.Value == "bar") {
+- t.Fatalf("Watch 1 failed: %#v", resp)
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/forwardingRules/{forwardingRule}/setTarget")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "forwardingRule": c.forwardingRule,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+-
+- go setHelper("watch_foo", "bar", c)
+-
+- resp, err = c.Watch("watch_foo", resp.Node.ModifiedIndex+1, false, nil, nil)
- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- t.Fatal(err)
- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- if !(resp.Node.Key == "/watch_foo" && resp.Node.Value == "bar") {
+- t.Fatalf("Watch 2 failed: %#v", resp)
- }
-- return ret, nil
-- // {
-- // "description": "Changes target url for forwarding rule.",
-- // "httpMethod": "POST",
-- // "id": "compute.globalForwardingRules.setTarget",
-- // "parameterOrder": [
-- // "project",
-- // "forwardingRule"
-- // ],
-- // "parameters": {
-- // "forwardingRule": {
-- // "description": "Name of the ForwardingRule resource in which target is to be set.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/forwardingRules/{forwardingRule}/setTarget",
-- // "request": {
-- // "$ref": "TargetReference"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
-
--}
+- routineNum := runtime.NumGoroutine()
-
--// method id "compute.globalOperations.aggregatedList":
+- ch := make(chan *Response, 10)
+- stop := make(chan bool, 1)
-
--type GlobalOperationsAggregatedListCall struct {
-- s *Service
-- project string
-- opt_ map[string]interface{}
--}
+- go setLoop("watch_foo", "bar", c)
-
--// AggregatedList: Retrieves the list of all operations grouped by
--// scope.
--func (r *GlobalOperationsService) AggregatedList(project string) *GlobalOperationsAggregatedListCall {
-- c := &GlobalOperationsAggregatedListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- return c
--}
+- go receiver(ch, stop)
-
--// Filter sets the optional parameter "filter": Filter expression for
--// filtering listed resources.
--func (c *GlobalOperationsAggregatedListCall) Filter(filter string) *GlobalOperationsAggregatedListCall {
-- c.opt_["filter"] = filter
-- return c
--}
+- _, err = c.Watch("watch_foo", 0, false, ch, stop)
+- if err != ErrWatchStoppedByUser {
+- t.Fatalf("Watch returned a non-user stop error")
+- }
-
--// MaxResults sets the optional parameter "maxResults": Maximum count of
--// results to be returned. Maximum value is 500 and default value is
--// 500.
--func (c *GlobalOperationsAggregatedListCall) MaxResults(maxResults int64) *GlobalOperationsAggregatedListCall {
-- c.opt_["maxResults"] = maxResults
-- return c
+- if newRoutineNum := runtime.NumGoroutine(); newRoutineNum != routineNum {
+- t.Fatalf("Routine numbers differ after watch stop: %v, %v", routineNum, newRoutineNum)
+- }
-}
-
--// PageToken sets the optional parameter "pageToken": Tag returned by a
--// previous list request truncated by maxResults. Used to continue a
--// previous list request.
--func (c *GlobalOperationsAggregatedListCall) PageToken(pageToken string) *GlobalOperationsAggregatedListCall {
-- c.opt_["pageToken"] = pageToken
-- return c
--}
+-func TestWatchAll(t *testing.T) {
+- c := NewClient(nil)
+- defer func() {
+- c.Delete("watch_foo", true)
+- }()
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *GlobalOperationsAggregatedListCall) Fields(s ...googleapi.Field) *GlobalOperationsAggregatedListCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
--}
+- go setHelper("watch_foo/foo", "bar", c)
-
--func (c *GlobalOperationsAggregatedListCall) Do() (*OperationAggregatedList, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["filter"]; ok {
-- params.Set("filter", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["maxResults"]; ok {
-- params.Set("maxResults", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["pageToken"]; ok {
-- params.Set("pageToken", fmt.Sprintf("%v", v))
+- resp, err := c.Watch("watch_foo", 0, true, nil, nil)
+- if err != nil {
+- t.Fatal(err)
- }
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+- if !(resp.Node.Key == "/watch_foo/foo" && resp.Node.Value == "bar") {
+- t.Fatalf("WatchAll 1 failed: %#v", resp)
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/aggregated/operations")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+-
+- go setHelper("watch_foo/foo", "bar", c)
+-
+- resp, err = c.Watch("watch_foo", resp.Node.ModifiedIndex+1, true, nil, nil)
- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- t.Fatal(err)
- }
-- var ret *OperationAggregatedList
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- if !(resp.Node.Key == "/watch_foo/foo" && resp.Node.Value == "bar") {
+- t.Fatalf("WatchAll 2 failed: %#v", resp)
- }
-- return ret, nil
-- // {
-- // "description": "Retrieves the list of all operations grouped by scope.",
-- // "httpMethod": "GET",
-- // "id": "compute.globalOperations.aggregatedList",
-- // "parameterOrder": [
-- // "project"
-- // ],
-- // "parameters": {
-- // "filter": {
-- // "description": "Optional. Filter expression for filtering listed resources.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "maxResults": {
-- // "default": "500",
-- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
-- // "format": "uint32",
-- // "location": "query",
-- // "maximum": "500",
-- // "minimum": "0",
-- // "type": "integer"
-- // },
-- // "pageToken": {
-- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/aggregated/operations",
-- // "response": {
-- // "$ref": "OperationAggregatedList"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
-
--}
+- ch := make(chan *Response, 10)
+- stop := make(chan bool, 1)
-
--// method id "compute.globalOperations.delete":
+- routineNum := runtime.NumGoroutine()
-
--type GlobalOperationsDeleteCall struct {
-- s *Service
-- project string
-- operation string
-- opt_ map[string]interface{}
--}
+- go setLoop("watch_foo/foo", "bar", c)
-
--// Delete: Deletes the specified operation resource.
--func (r *GlobalOperationsService) Delete(project string, operation string) *GlobalOperationsDeleteCall {
-- c := &GlobalOperationsDeleteCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.operation = operation
-- return c
+- go receiver(ch, stop)
+-
+- _, err = c.Watch("watch_foo", 0, true, ch, stop)
+- if err != ErrWatchStoppedByUser {
+- t.Fatalf("Watch returned a non-user stop error")
+- }
+-
+- if newRoutineNum := runtime.NumGoroutine(); newRoutineNum != routineNum {
+- t.Fatalf("Routine numbers differ after watch stop: %v, %v", routineNum, newRoutineNum)
+- }
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *GlobalOperationsDeleteCall) Fields(s ...googleapi.Field) *GlobalOperationsDeleteCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func setHelper(key, value string, c *Client) {
+- time.Sleep(time.Second)
+- c.Set(key, value, 100)
-}
-
--func (c *GlobalOperationsDeleteCall) Do() error {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/operations/{operation}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("DELETE", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "operation": c.operation,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return err
+-func setLoop(key, value string, c *Client) {
+- time.Sleep(time.Second)
+- for i := 0; i < 10; i++ {
+- newValue := fmt.Sprintf("%s_%v", value, i)
+- c.Set(key, newValue, 100)
+- time.Sleep(time.Second / 10)
- }
-- return nil
-- // {
-- // "description": "Deletes the specified operation resource.",
-- // "httpMethod": "DELETE",
-- // "id": "compute.globalOperations.delete",
-- // "parameterOrder": [
-- // "project",
-- // "operation"
-- // ],
-- // "parameters": {
-- // "operation": {
-- // "description": "Name of the operation resource to delete.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/operations/{operation}",
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
+-}
-
+-func receiver(c chan *Response, stop chan bool) {
+- for i := 0; i < 10; i++ {
+- <-c
+- }
+- stop <- true
-}
+diff --git a/Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/LICENSE b/Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/LICENSE
+deleted file mode 100644
+index 5782c72..0000000
+--- a/Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/LICENSE
++++ /dev/null
+@@ -1,23 +0,0 @@
+-Copyright (c) 2014, Elazar Leibovich
+-All rights reserved.
-
--// method id "compute.globalOperations.get":
+-Redistribution and use in source and binary forms, with or without
+-modification, are permitted provided that the following conditions are met:
-
--type GlobalOperationsGetCall struct {
-- s *Service
-- project string
-- operation string
-- opt_ map[string]interface{}
--}
+-* Redistributions of source code must retain the above copyright notice, this
+- list of conditions and the following disclaimer.
-
--// Get: Retrieves the specified operation resource.
--func (r *GlobalOperationsService) Get(project string, operation string) *GlobalOperationsGetCall {
-- c := &GlobalOperationsGetCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.operation = operation
-- return c
+-* Redistributions in binary form must reproduce the above copyright notice,
+- this list of conditions and the following disclaimer in the documentation
+- and/or other materials provided with the distribution.
+-
+-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+diff --git a/Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/README.md b/Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/README.md
+deleted file mode 100644
+index a3929a8..0000000
+--- a/Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/README.md
++++ /dev/null
+@@ -1,18 +0,0 @@
+-go-bindata-http
+-===============
+-
+-Serve embedded files from [jteeuwen/go-bindata](https://github.com/jteeuwen/go-bindata) with `net/http`.
+-
+-[GoDoc](http://godoc.org/github.com/elazarl/go-bindata-assetfs)
+-
+-After running
+-
+- $ go-bindata data/...
+-
+-Use
+-
+- http.Handle("/",
+- http.FileServer(
+- &assetfs.AssetFS{Asset: Asset, AssetDir: AssetDir, Prefix: "data"}))
+-
+-to serve files embedded from the `data` directory.
+diff --git a/Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/assetfs.go b/Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/assetfs.go
+deleted file mode 100644
+index 83cd94d..0000000
+--- a/Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/assetfs.go
++++ /dev/null
+@@ -1,141 +0,0 @@
+-package assetfs
+-
+-import (
+- "bytes"
+- "errors"
+- "fmt"
+- "io"
+- "io/ioutil"
+- "net/http"
+- "os"
+- "path"
+- "path/filepath"
+- "time"
+-)
+-
+-// FakeFile implements os.FileInfo interface for a given path and size
+-type FakeFile struct {
+- // Path is the path of this file
+- Path string
+- // Dir marks of the path is a directory
+- Dir bool
+- // Len is the length of the fake file, zero if it is a directory
+- Len int64
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *GlobalOperationsGetCall) Fields(s ...googleapi.Field) *GlobalOperationsGetCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func (f *FakeFile) Name() string {
+- _, name := filepath.Split(f.Path)
+- return name
-}
-
--func (c *GlobalOperationsGetCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/operations/{operation}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "operation": c.operation,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-func (f *FakeFile) Mode() os.FileMode {
+- mode := os.FileMode(0644)
+- if f.Dir {
+- return mode | os.ModeDir
- }
-- return ret, nil
-- // {
-- // "description": "Retrieves the specified operation resource.",
-- // "httpMethod": "GET",
-- // "id": "compute.globalOperations.get",
-- // "parameterOrder": [
-- // "project",
-- // "operation"
-- // ],
-- // "parameters": {
-- // "operation": {
-- // "description": "Name of the operation resource to return.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/operations/{operation}",
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
+- return mode
+-}
+-
+-func (f *FakeFile) ModTime() time.Time {
+- return time.Unix(0, 0)
+-}
-
+-func (f *FakeFile) Size() int64 {
+- return f.Len
-}
-
--// method id "compute.globalOperations.list":
+-func (f *FakeFile) IsDir() bool {
+- return f.Mode().IsDir()
+-}
-
--type GlobalOperationsListCall struct {
-- s *Service
-- project string
-- opt_ map[string]interface{}
+-func (f *FakeFile) Sys() interface{} {
+- return nil
-}
-
--// List: Retrieves the list of operation resources contained within the
--// specified project.
--func (r *GlobalOperationsService) List(project string) *GlobalOperationsListCall {
-- c := &GlobalOperationsListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- return c
+-// AssetFile implements http.File interface for a no-directory file with content
+-type AssetFile struct {
+- *bytes.Reader
+- io.Closer
+- FakeFile
-}
-
--// Filter sets the optional parameter "filter": Filter expression for
--// filtering listed resources.
--func (c *GlobalOperationsListCall) Filter(filter string) *GlobalOperationsListCall {
-- c.opt_["filter"] = filter
-- return c
+-func NewAssetFile(name string, content []byte) *AssetFile {
+- return &AssetFile{
+- bytes.NewReader(content),
+- ioutil.NopCloser(nil),
+- FakeFile{name, false, int64(len(content))}}
-}
-
--// MaxResults sets the optional parameter "maxResults": Maximum count of
--// results to be returned. Maximum value is 500 and default value is
--// 500.
--func (c *GlobalOperationsListCall) MaxResults(maxResults int64) *GlobalOperationsListCall {
-- c.opt_["maxResults"] = maxResults
-- return c
+-func (f *AssetFile) Readdir(count int) ([]os.FileInfo, error) {
+- return nil, errors.New("not a directory")
-}
-
--// PageToken sets the optional parameter "pageToken": Tag returned by a
--// previous list request truncated by maxResults. Used to continue a
--// previous list request.
--func (c *GlobalOperationsListCall) PageToken(pageToken string) *GlobalOperationsListCall {
-- c.opt_["pageToken"] = pageToken
-- return c
+-func (f *AssetFile) Stat() (os.FileInfo, error) {
+- return f, nil
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *GlobalOperationsListCall) Fields(s ...googleapi.Field) *GlobalOperationsListCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-// AssetDirectory implements http.File interface for a directory
+-type AssetDirectory struct {
+- AssetFile
+- ChildrenRead int
+- Children []os.FileInfo
-}
-
--func (c *GlobalOperationsListCall) Do() (*OperationList, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["filter"]; ok {
-- params.Set("filter", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["maxResults"]; ok {
-- params.Set("maxResults", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["pageToken"]; ok {
-- params.Set("pageToken", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/operations")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *OperationList
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-func NewAssetDirectory(name string, children []string, fs *AssetFS) *AssetDirectory {
+- fileinfos := make([]os.FileInfo, 0, len(children))
+- for _, child := range children {
+- _, err := fs.AssetDir(filepath.Join(name, child))
+- fileinfos = append(fileinfos, &FakeFile{child, err == nil, 0})
- }
-- return ret, nil
-- // {
-- // "description": "Retrieves the list of operation resources contained within the specified project.",
-- // "httpMethod": "GET",
-- // "id": "compute.globalOperations.list",
-- // "parameterOrder": [
-- // "project"
-- // ],
-- // "parameters": {
-- // "filter": {
-- // "description": "Optional. Filter expression for filtering listed resources.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "maxResults": {
-- // "default": "500",
-- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
-- // "format": "uint32",
-- // "location": "query",
-- // "maximum": "500",
-- // "minimum": "0",
-- // "type": "integer"
-- // },
-- // "pageToken": {
-- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/operations",
-- // "response": {
-- // "$ref": "OperationList"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
--
+- return &AssetDirectory{
+- AssetFile{
+- bytes.NewReader(nil),
+- ioutil.NopCloser(nil),
+- FakeFile{name, true, 0},
+- },
+- 0,
+- fileinfos}
-}
-
--// method id "compute.httpHealthChecks.delete":
--
--type HttpHealthChecksDeleteCall struct {
-- s *Service
-- project string
-- httpHealthCheck string
-- opt_ map[string]interface{}
+-func (f *AssetDirectory) Readdir(count int) ([]os.FileInfo, error) {
+- fmt.Println(f, count)
+- if count <= 0 {
+- return f.Children, nil
+- }
+- if f.ChildrenRead+count > len(f.Children) {
+- count = len(f.Children) - f.ChildrenRead
+- }
+- rv := f.Children[f.ChildrenRead : f.ChildrenRead+count]
+- f.ChildrenRead += count
+- return rv, nil
-}
-
--// Delete: Deletes the specified HttpHealthCheck resource.
--func (r *HttpHealthChecksService) Delete(project string, httpHealthCheck string) *HttpHealthChecksDeleteCall {
-- c := &HttpHealthChecksDeleteCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.httpHealthCheck = httpHealthCheck
-- return c
+-func (f *AssetDirectory) Stat() (os.FileInfo, error) {
+- return f, nil
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *HttpHealthChecksDeleteCall) Fields(s ...googleapi.Field) *HttpHealthChecksDeleteCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-// AssetFS implements http.FileSystem, allowing
+-// embedded files to be served from net/http package.
+-type AssetFS struct {
+- // Asset should return content of file in path if exists
+- Asset func(path string) ([]byte, error)
+- // AssetDir should return list of files in the path
+- AssetDir func(path string) ([]string, error)
+- // Prefix would be prepended to http requests
+- Prefix string
-}
-
--func (c *HttpHealthChecksDeleteCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/httpHealthChecks/{httpHealthCheck}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("DELETE", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "httpHealthCheck": c.httpHealthCheck,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
+-func (fs *AssetFS) Open(name string) (http.File, error) {
+- name = path.Join(fs.Prefix, name)
+- if len(name) > 0 && name[0] == '/' {
+- name = name[1:]
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- if children, err := fs.AssetDir(name); err == nil {
+- return NewAssetDirectory(name, children, fs), nil
- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- b, err := fs.Asset(name)
+- if err != nil {
- return nil, err
- }
-- return ret, nil
-- // {
-- // "description": "Deletes the specified HttpHealthCheck resource.",
-- // "httpMethod": "DELETE",
-- // "id": "compute.httpHealthChecks.delete",
-- // "parameterOrder": [
-- // "project",
-- // "httpHealthCheck"
-- // ],
-- // "parameters": {
-- // "httpHealthCheck": {
-- // "description": "Name of the HttpHealthCheck resource to delete.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/httpHealthChecks/{httpHealthCheck}",
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
--
+- return NewAssetFile(name, b), nil
-}
+diff --git a/Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/doc.go b/Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/doc.go
+deleted file mode 100644
+index a664249..0000000
+--- a/Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/doc.go
++++ /dev/null
+@@ -1,13 +0,0 @@
+-// assetfs allows packages to serve static content embedded
+-// with the go-bindata tool with the standard net/http package.
+-//
+-// See https://github.com/jteeuwen/go-bindata for more information
+-// about embedding binary data with go-bindata.
+-//
+-// Usage example, after running
+-// $ go-bindata data/...
+-// use:
+-// http.Handle("/",
+-// http.FileServer(
+-// &assetfs.AssetFS{Asset: Asset, AssetDir: AssetDir, Prefix: "data"}))
+-package assetfs
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/.gitignore b/Godeps/_workspace/src/github.com/emicklei/go-restful/.gitignore
+deleted file mode 100644
+index cece7be..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/.gitignore
++++ /dev/null
+@@ -1,70 +0,0 @@
+-# Compiled Object files, Static and Dynamic libs (Shared Objects)
+-*.o
+-*.a
+-*.so
-
--// method id "compute.httpHealthChecks.get":
+-# Folders
+-_obj
+-_test
-
--type HttpHealthChecksGetCall struct {
-- s *Service
-- project string
-- httpHealthCheck string
-- opt_ map[string]interface{}
--}
+-# Architecture specific extensions/prefixes
+-*.[568vq]
+-[568vq].out
-
--// Get: Returns the specified HttpHealthCheck resource.
--func (r *HttpHealthChecksService) Get(project string, httpHealthCheck string) *HttpHealthChecksGetCall {
-- c := &HttpHealthChecksGetCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.httpHealthCheck = httpHealthCheck
-- return c
--}
+-*.cgo1.go
+-*.cgo2.c
+-_cgo_defun.c
+-_cgo_gotypes.go
+-_cgo_export.*
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *HttpHealthChecksGetCall) Fields(s ...googleapi.Field) *HttpHealthChecksGetCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
--}
+-_testmain.go
-
--func (c *HttpHealthChecksGetCall) Do() (*HttpHealthCheck, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/httpHealthChecks/{httpHealthCheck}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "httpHealthCheck": c.httpHealthCheck,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *HttpHealthCheck
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Returns the specified HttpHealthCheck resource.",
-- // "httpMethod": "GET",
-- // "id": "compute.httpHealthChecks.get",
-- // "parameterOrder": [
-- // "project",
-- // "httpHealthCheck"
-- // ],
-- // "parameters": {
-- // "httpHealthCheck": {
-- // "description": "Name of the HttpHealthCheck resource to return.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/httpHealthChecks/{httpHealthCheck}",
-- // "response": {
-- // "$ref": "HttpHealthCheck"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
+-*.exe
+-
+-restful.html
+-
+-*.out
+-
+-tmp.prof
+-
+-go-restful.test
+-
+-examples/restful-basic-authentication
+-
+-examples/restful-encoding-filter
+-
+-examples/restful-filters
+-
+-examples/restful-hello-world
+-
+-examples/restful-resource-functions
+-
+-examples/restful-serve-static
+-
+-examples/restful-user-service
+-
+-*.DS_Store
+-examples/restful-user-resource
+-
+-examples/restful-multi-containers
+-
+-examples/restful-form-handling
+-
+-examples/restful-CORS-filter
+-
+-examples/restful-options-filter
+-
+-examples/restful-curly-router
+-
+-examples/restful-cpuprofiler-service
+-
+-examples/restful-pre-post-filters
+-
+-curly.prof
+-
+-examples/restful-NCSA-logging
+-
+-examples/restful-html-template
+-
+-s.html
+-restful-path-tail
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/CHANGES.md b/Godeps/_workspace/src/github.com/emicklei/go-restful/CHANGES.md
+deleted file mode 100644
+index 4855402..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/CHANGES.md
++++ /dev/null
+@@ -1,127 +0,0 @@
+-Change history of go-restful
+-=
+-2014-11-12
+-- (api add) ApiVersion(.) for documentation in Swagger UI
+-
+-2014-11-10
+-- (api change) struct fields tagged with "description" show up in Swagger UI
+-
+-2014-10-31
+-- (api change) ReturnsError -> Returns
+-- (api add) RouteBuilder.Do(aBuilder) for DRY use of RouteBuilder
+-- fix swagger nested structs
+-- sort Swagger response messages by code
+-
+-2014-10-23
+-- (api add) ReturnsError allows you to document Http codes in swagger
+-- fixed problem with greedy CurlyRouter
+-- (api add) Access-Control-Max-Age in CORS
+-- add tracing functionality (injectable) for debugging purposes
+-- support JSON parse 64bit int
+-- fix empty parameters for swagger
+-- WebServicesUrl is now optional for swagger
+-- fixed duplicate AccessControlAllowOrigin in CORS
+-- (api change) expose ServeMux in container
+-- (api add) added AllowedDomains in CORS
+-- (api add) ParameterNamed for detailed documentation
+-
+-2014-04-16
+-- (api add) expose constructor of Request for testing.
+-
+-2014-06-27
+-- (api add) ParameterNamed gives access to a Parameter definition and its data (for further specification).
+-- (api add) SetCacheReadEntity allow scontrol over whether or not the request body is being cached (default true for compatibility reasons).
+-
+-2014-07-03
+-- (api add) CORS can be configured with a list of allowed domains
+-
+-2014-03-12
+-- (api add) Route path parameters can use wildcard or regular expressions. (requires CurlyRouter)
+-
+-2014-02-26
+-- (api add) Request now provides information about the matched Route, see method SelectedRoutePath
+-
+-2014-02-17
+-- (api change) renamed parameter constants (go-lint checks)
+-
+-2014-01-10
+- - (api add) support for CloseNotify, see http://golang.org/pkg/net/http/#CloseNotifier
+-
+-2014-01-07
+- - (api change) Write* methods in Response now return the error or nil.
+- - added example of serving HTML from a Go template.
+- - fixed comparing Allowed headers in CORS (is now case-insensitive)
+-
+-2013-11-13
+- - (api add) Response knows how many bytes are written to the response body.
+-
+-2013-10-29
+- - (api add) RecoverHandler(handler RecoverHandleFunction) to change how panic recovery is handled. Default behavior is to log and return a stacktrace. This may be a security issue as it exposes sourcecode information.
+-
+-2013-10-04
+- - (api add) Response knows what HTTP status has been written
+- - (api add) Request can have attributes (map of string->interface, also called request-scoped variables
+-
+-2013-09-12
+- - (api change) Router interface simplified
+- - Implemented CurlyRouter, a Router that does not use|allow regular expressions in paths
+-
+-2013-08-05
+- - add OPTIONS support
+- - add CORS support
+-
+-2013-08-27
+- - fixed some reported issues (see github)
+- - (api change) deprecated use of WriteError; use WriteErrorString instead
+-
+-2014-04-15
+- - (fix) v1.0.1 tag: fix Issue 111: WriteErrorString
+-
+-2013-08-08
+- - (api add) Added implementation Container: a WebServices collection with its own http.ServeMux allowing multiple endpoints per program. Existing uses of go-restful will register their services to the DefaultContainer.
+- - (api add) the swagger package has be extended to have a UI per container.
+- - if panic is detected then a small stack trace is printed (thanks to runner-mei)
+- - (api add) WriteErrorString to Response
-
--}
+-Important API changes:
-
--// method id "compute.httpHealthChecks.insert":
+- - (api remove) package variable DoNotRecover no longer works ; use restful.DefaultContainer.DoNotRecover(true) instead.
+- - (api remove) package variable EnableContentEncoding no longer works ; use restful.DefaultContainer.EnableContentEncoding(true) instead.
+-
+-
+-2013-07-06
-
--type HttpHealthChecksInsertCall struct {
-- s *Service
-- project string
-- httphealthcheck *HttpHealthCheck
-- opt_ map[string]interface{}
--}
+- - (api add) Added support for response encoding (gzip and deflate(zlib)). This feature is disabled on default (for backwards compatibility). Use restful.EnableContentEncoding = true in your initialization to enable this feature.
-
--// Insert: Creates a HttpHealthCheck resource in the specified project
--// using the data included in the request.
--func (r *HttpHealthChecksService) Insert(project string, httphealthcheck *HttpHealthCheck) *HttpHealthChecksInsertCall {
-- c := &HttpHealthChecksInsertCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.httphealthcheck = httphealthcheck
-- return c
--}
+-2013-06-19
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *HttpHealthChecksInsertCall) Fields(s ...googleapi.Field) *HttpHealthChecksInsertCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
--}
+- - (improve) DoNotRecover option, moved request body closer, improved ReadEntity
-
--func (c *HttpHealthChecksInsertCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.httphealthcheck)
-- if err != nil {
-- return nil, err
-- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/httpHealthChecks")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Creates a HttpHealthCheck resource in the specified project using the data included in the request.",
-- // "httpMethod": "POST",
-- // "id": "compute.httpHealthChecks.insert",
-- // "parameterOrder": [
-- // "project"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/httpHealthChecks",
-- // "request": {
-- // "$ref": "HttpHealthCheck"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
+-2013-06-03
-
--}
+- - (api change) removed Dispatcher interface, hide PathExpression
+- - changed receiver names of type functions to be more idiomatic Go
-
--// method id "compute.httpHealthChecks.list":
+-2013-06-02
-
--type HttpHealthChecksListCall struct {
-- s *Service
-- project string
-- opt_ map[string]interface{}
--}
+- - (optimize) Cache the RegExp compilation of Paths.
-
--// List: Retrieves the list of HttpHealthCheck resources available to
--// the specified project.
--func (r *HttpHealthChecksService) List(project string) *HttpHealthChecksListCall {
-- c := &HttpHealthChecksListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- return c
--}
+-2013-05-22
+-
+- - (api add) Added support for request/response filter functions
-
--// Filter sets the optional parameter "filter": Filter expression for
--// filtering listed resources.
--func (c *HttpHealthChecksListCall) Filter(filter string) *HttpHealthChecksListCall {
-- c.opt_["filter"] = filter
-- return c
--}
+-2013-05-18
-
--// MaxResults sets the optional parameter "maxResults": Maximum count of
--// results to be returned. Maximum value is 500 and default value is
--// 500.
--func (c *HttpHealthChecksListCall) MaxResults(maxResults int64) *HttpHealthChecksListCall {
-- c.opt_["maxResults"] = maxResults
-- return c
--}
-
--// PageToken sets the optional parameter "pageToken": Tag returned by a
--// previous list request truncated by maxResults. Used to continue a
--// previous list request.
--func (c *HttpHealthChecksListCall) PageToken(pageToken string) *HttpHealthChecksListCall {
-- c.opt_["pageToken"] = pageToken
-- return c
--}
+- - (api add) Added feature to change the default Http Request Dispatch function (travis cline)
+- - (api change) Moved Swagger Webservice to swagger package (see example restful-user)
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *HttpHealthChecksListCall) Fields(s ...googleapi.Field) *HttpHealthChecksListCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
--}
+-[2012-11-14 .. 2013-05-18>
+-
+- - See https://github.com/emicklei/go-restful/commits
-
--func (c *HttpHealthChecksListCall) Do() (*HttpHealthCheckList, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["filter"]; ok {
-- params.Set("filter", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["maxResults"]; ok {
-- params.Set("maxResults", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["pageToken"]; ok {
-- params.Set("pageToken", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/httpHealthChecks")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *HttpHealthCheckList
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Retrieves the list of HttpHealthCheck resources available to the specified project.",
-- // "httpMethod": "GET",
-- // "id": "compute.httpHealthChecks.list",
-- // "parameterOrder": [
-- // "project"
-- // ],
-- // "parameters": {
-- // "filter": {
-- // "description": "Optional. Filter expression for filtering listed resources.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "maxResults": {
-- // "default": "500",
-- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
-- // "format": "uint32",
-- // "location": "query",
-- // "maximum": "500",
-- // "minimum": "0",
-- // "type": "integer"
-- // },
-- // "pageToken": {
-- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/httpHealthChecks",
-- // "response": {
-- // "$ref": "HttpHealthCheckList"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
+-2012-11-14
-
--}
+- - Initial commit
-
--// method id "compute.httpHealthChecks.patch":
-
--type HttpHealthChecksPatchCall struct {
-- s *Service
-- project string
-- httpHealthCheck string
-- httphealthcheck *HttpHealthCheck
-- opt_ map[string]interface{}
--}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/LICENSE b/Godeps/_workspace/src/github.com/emicklei/go-restful/LICENSE
+deleted file mode 100644
+index ece7ec6..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/LICENSE
++++ /dev/null
+@@ -1,22 +0,0 @@
+-Copyright (c) 2012,2013 Ernest Micklei
-
--// Patch: Updates a HttpHealthCheck resource in the specified project
--// using the data included in the request. This method supports patch
--// semantics.
--func (r *HttpHealthChecksService) Patch(project string, httpHealthCheck string, httphealthcheck *HttpHealthCheck) *HttpHealthChecksPatchCall {
-- c := &HttpHealthChecksPatchCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.httpHealthCheck = httpHealthCheck
-- c.httphealthcheck = httphealthcheck
-- return c
--}
+-MIT License
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *HttpHealthChecksPatchCall) Fields(s ...googleapi.Field) *HttpHealthChecksPatchCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
--}
+-Permission is hereby granted, free of charge, to any person obtaining
+-a copy of this software and associated documentation files (the
+-"Software"), to deal in the Software without restriction, including
+-without limitation the rights to use, copy, modify, merge, publish,
+-distribute, sublicense, and/or sell copies of the Software, and to
+-permit persons to whom the Software is furnished to do so, subject to
+-the following conditions:
-
--func (c *HttpHealthChecksPatchCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.httphealthcheck)
-- if err != nil {
-- return nil, err
-- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/httpHealthChecks/{httpHealthCheck}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("PATCH", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "httpHealthCheck": c.httpHealthCheck,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Updates a HttpHealthCheck resource in the specified project using the data included in the request. This method supports patch semantics.",
-- // "httpMethod": "PATCH",
-- // "id": "compute.httpHealthChecks.patch",
-- // "parameterOrder": [
-- // "project",
-- // "httpHealthCheck"
-- // ],
-- // "parameters": {
-- // "httpHealthCheck": {
-- // "description": "Name of the HttpHealthCheck resource to update.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/httpHealthChecks/{httpHealthCheck}",
-- // "request": {
-- // "$ref": "HttpHealthCheck"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
+-The above copyright notice and this permission notice shall be
+-included in all copies or substantial portions of the Software.
-
--}
+-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+\ No newline at end of file
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/README.md b/Godeps/_workspace/src/github.com/emicklei/go-restful/README.md
+deleted file mode 100644
+index 8af137d..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/README.md
++++ /dev/null
+@@ -1,70 +0,0 @@
+-go-restful
+-==========
-
--// method id "compute.httpHealthChecks.update":
+-package for building REST-style Web Services using Google Go
-
--type HttpHealthChecksUpdateCall struct {
-- s *Service
-- project string
-- httpHealthCheck string
-- httphealthcheck *HttpHealthCheck
-- opt_ map[string]interface{}
--}
+-REST asks developers to use HTTP methods explicitly and in a way that's consistent with the protocol definition. This basic REST design principle establishes a one-to-one mapping between create, read, update, and delete (CRUD) operations and HTTP methods. According to this mapping:
-
--// Update: Updates a HttpHealthCheck resource in the specified project
--// using the data included in the request.
--func (r *HttpHealthChecksService) Update(project string, httpHealthCheck string, httphealthcheck *HttpHealthCheck) *HttpHealthChecksUpdateCall {
-- c := &HttpHealthChecksUpdateCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.httpHealthCheck = httpHealthCheck
-- c.httphealthcheck = httphealthcheck
-- return c
--}
+-- GET = Retrieve a representation of a resource
+-- POST = Create if you are sending content to the server to create a subordinate of the specified resource collection, using some server-side algorithm.
+-- PUT = Create if you are sending the full content of the specified resource (URI).
+-- PUT = Update if you are updating the full content of the specified resource.
+-- DELETE = Delete if you are requesting the server to delete the resource
+-- PATCH = Update partial content of a resource
+-- OPTIONS = Get information about the communication options for the request URI
+-
+-### Example
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *HttpHealthChecksUpdateCall) Fields(s ...googleapi.Field) *HttpHealthChecksUpdateCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-```Go
+-ws := new(restful.WebService)
+-ws.
+- Path("/users").
+- Consumes(restful.MIME_XML, restful.MIME_JSON).
+- Produces(restful.MIME_JSON, restful.MIME_XML)
+-
+-ws.Route(ws.GET("/{user-id}").To(u.findUser).
+- Doc("get a user").
+- Param(ws.PathParameter("user-id", "identifier of the user").DataType("string")).
+- Writes(User{}))
+-...
+-
+-func (u UserResource) findUser(request *restful.Request, response *restful.Response) {
+- id := request.PathParameter("user-id")
+- ...
-}
+-```
+-
+-[Full API of a UserResource](https://github.com/emicklei/go-restful/tree/master/examples/restful-user-resource.go)
+-
+-### Features
-
--func (c *HttpHealthChecksUpdateCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.httphealthcheck)
-- if err != nil {
-- return nil, err
-- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/httpHealthChecks/{httpHealthCheck}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("PUT", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "httpHealthCheck": c.httpHealthCheck,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Updates a HttpHealthCheck resource in the specified project using the data included in the request.",
-- // "httpMethod": "PUT",
-- // "id": "compute.httpHealthChecks.update",
-- // "parameterOrder": [
-- // "project",
-- // "httpHealthCheck"
-- // ],
-- // "parameters": {
-- // "httpHealthCheck": {
-- // "description": "Name of the HttpHealthCheck resource to update.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/httpHealthChecks/{httpHealthCheck}",
-- // "request": {
-- // "$ref": "HttpHealthCheck"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
+-- Routes for request → function mapping with path parameter (e.g. {id}) support
+-- Configurable router:
+- - Routing algorithm after [JSR311](http://jsr311.java.net/nonav/releases/1.1/spec/spec.html) that is implemented using (but doest **not** accept) regular expressions (See RouterJSR311 which is used by default)
+- - Fast routing algorithm that allows static elements, regular expressions and dynamic parameters in the URL path (e.g. /meetings/{id} or /static/{subpath:*}, See CurlyRouter)
+-- Request API for reading structs from JSON/XML and accesing parameters (path,query,header)
+-- Response API for writing structs to JSON/XML and setting headers
+-- Filters for intercepting the request → response flow on Service or Route level
+-- Request-scoped variables using attributes
+-- Containers for WebServices on different HTTP endpoints
+-- Content encoding (gzip,deflate) of responses
+-- Automatic responses on OPTIONS (using a filter)
+-- Automatic CORS request handling (using a filter)
+-- API declaration for Swagger UI (see swagger package)
+-- Panic recovery to produce HTTP 500, customizable using RecoverHandler(...)
+-
+-### Resources
-
--}
+-- [Documentation on godoc.org](http://godoc.org/github.com/emicklei/go-restful)
+-- [Code examples](https://github.com/emicklei/go-restful/tree/master/examples)
+-- [Example posted on blog](http://ernestmicklei.com/2012/11/24/go-restful-first-working-example/)
+-- [Design explained on blog](http://ernestmicklei.com/2012/11/11/go-restful-api-design/)
+-- [sourcegraph](https://sourcegraph.com/github.com/emicklei/go-restful)
+-- [gopkg.in](https://gopkg.in/emicklei/go-restful.v1)
+-- [showcase: Mora - MongoDB REST Api server](https://github.com/emicklei/mora)
+-
+-[](https://drone.io/github.com/emicklei/go-restful/latest)[](https://sourcegraph.com/github.com/emicklei/go-restful) [](https://sourcegraph.com/github.com/emicklei/go-restful) [](https://sourcegraph.com/github.com/emicklei/go-restful)
-
--// method id "compute.images.delete":
+-(c) 2012 - 2014, http://ernestmicklei.com. MIT License
-
--type ImagesDeleteCall struct {
-- s *Service
-- project string
-- image string
-- opt_ map[string]interface{}
--}
+-Type ```git shortlog -s``` for a full list of contributors.
+\ No newline at end of file
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/Srcfile b/Godeps/_workspace/src/github.com/emicklei/go-restful/Srcfile
+deleted file mode 100644
+index 16fd186..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/Srcfile
++++ /dev/null
+@@ -1 +0,0 @@
+-{"SkipDirs": ["examples"]}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/bench_curly_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/bench_curly_test.go
+deleted file mode 100644
+index db6a1a7..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/bench_curly_test.go
++++ /dev/null
+@@ -1,51 +0,0 @@
+-package restful
-
--// Delete: Deletes the specified image resource.
--func (r *ImagesService) Delete(project string, image string) *ImagesDeleteCall {
-- c := &ImagesDeleteCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.image = image
-- return c
--}
+-import (
+- "fmt"
+- "net/http"
+- "net/http/httptest"
+- "testing"
+-)
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *ImagesDeleteCall) Fields(s ...googleapi.Field) *ImagesDeleteCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
--}
+-func setupCurly(container *Container) []string {
+- wsCount := 26
+- rtCount := 26
+- urisCurly := []string{}
-
--func (c *ImagesDeleteCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/images/{image}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("DELETE", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "image": c.image,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- container.Router(CurlyRouter{})
+- for i := 0; i < wsCount; i++ {
+- root := fmt.Sprintf("/%s/{%s}/", string(i+97), string(i+97))
+- ws := new(WebService).Path(root)
+- for j := 0; j < rtCount; j++ {
+- sub := fmt.Sprintf("/%s2/{%s2}", string(j+97), string(j+97))
+- ws.Route(ws.GET(sub).Consumes("application/xml").Produces("application/xml").To(echoCurly))
+- }
+- container.Add(ws)
+- for _, each := range ws.Routes() {
+- urisCurly = append(urisCurly, "http://bench.com"+each.Path)
+- }
- }
-- return ret, nil
-- // {
-- // "description": "Deletes the specified image resource.",
-- // "httpMethod": "DELETE",
-- // "id": "compute.images.delete",
-- // "parameterOrder": [
-- // "project",
-- // "image"
-- // ],
-- // "parameters": {
-- // "image": {
-- // "description": "Name of the image resource to delete.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/images/{image}",
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
--
+- return urisCurly
-}
-
--// method id "compute.images.deprecate":
--
--type ImagesDeprecateCall struct {
-- s *Service
-- project string
-- image string
-- deprecationstatus *DeprecationStatus
-- opt_ map[string]interface{}
--}
+-func echoCurly(req *Request, resp *Response) {}
-
--// Deprecate: Sets the deprecation status of an image. If no message
--// body is given, clears the deprecation status instead.
--func (r *ImagesService) Deprecate(project string, image string, deprecationstatus *DeprecationStatus) *ImagesDeprecateCall {
-- c := &ImagesDeprecateCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.image = image
-- c.deprecationstatus = deprecationstatus
-- return c
+-func BenchmarkManyCurly(b *testing.B) {
+- container := NewContainer()
+- urisCurly := setupCurly(container)
+- b.ResetTimer()
+- for t := 0; t < b.N; t++ {
+- for r := 0; r < 1000; r++ {
+- for _, each := range urisCurly {
+- sendNoReturnTo(each, container, t)
+- }
+- }
+- }
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *ImagesDeprecateCall) Fields(s ...googleapi.Field) *ImagesDeprecateCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func sendNoReturnTo(address string, container *Container, t int) {
+- httpRequest, _ := http.NewRequest("GET", address, nil)
+- httpRequest.Header.Set("Accept", "application/xml")
+- httpWriter := httptest.NewRecorder()
+- container.dispatch(httpWriter, httpRequest)
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/bench_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/bench_test.go
+deleted file mode 100644
+index 3e77c2d..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/bench_test.go
++++ /dev/null
+@@ -1,43 +0,0 @@
+-package restful
-
--func (c *ImagesDeprecateCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.deprecationstatus)
-- if err != nil {
-- return nil, err
-- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/images/{image}/deprecate")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "image": c.image,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Sets the deprecation status of an image. If no message body is given, clears the deprecation status instead.",
-- // "httpMethod": "POST",
-- // "id": "compute.images.deprecate",
-- // "parameterOrder": [
-- // "project",
-- // "image"
-- // ],
-- // "parameters": {
-- // "image": {
-- // "description": "Image name.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/images/{image}/deprecate",
-- // "request": {
-- // "$ref": "DeprecationStatus"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
+-import (
+- "fmt"
+- "io"
+- "testing"
+-)
-
--}
+-var uris = []string{}
-
--// method id "compute.images.get":
+-func setup(container *Container) {
+- wsCount := 26
+- rtCount := 26
-
--type ImagesGetCall struct {
-- s *Service
-- project string
-- image string
-- opt_ map[string]interface{}
+- for i := 0; i < wsCount; i++ {
+- root := fmt.Sprintf("/%s/{%s}/", string(i+97), string(i+97))
+- ws := new(WebService).Path(root)
+- for j := 0; j < rtCount; j++ {
+- sub := fmt.Sprintf("/%s2/{%s2}", string(j+97), string(j+97))
+- ws.Route(ws.GET(sub).To(echo))
+- }
+- container.Add(ws)
+- for _, each := range ws.Routes() {
+- uris = append(uris, "http://bench.com"+each.Path)
+- }
+- }
-}
-
--// Get: Returns the specified image resource.
--func (r *ImagesService) Get(project string, image string) *ImagesGetCall {
-- c := &ImagesGetCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.image = image
-- return c
+-func echo(req *Request, resp *Response) {
+- io.WriteString(resp.ResponseWriter, "echo")
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *ImagesGetCall) Fields(s ...googleapi.Field) *ImagesGetCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func BenchmarkMany(b *testing.B) {
+- container := NewContainer()
+- setup(container)
+- b.ResetTimer()
+- for t := 0; t < b.N; t++ {
+- for _, each := range uris {
+- // println(each)
+- sendItTo(each, container)
+- }
+- }
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/bench_test.sh b/Godeps/_workspace/src/github.com/emicklei/go-restful/bench_test.sh
+deleted file mode 100644
+index 47ffbe4..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/bench_test.sh
++++ /dev/null
+@@ -1,10 +0,0 @@
+-#go test -run=none -file bench_test.go -test.bench . -cpuprofile=bench_test.out
-
--func (c *ImagesGetCall) Do() (*Image, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/images/{image}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "image": c.image,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Image
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Returns the specified image resource.",
-- // "httpMethod": "GET",
-- // "id": "compute.images.get",
-- // "parameterOrder": [
-- // "project",
-- // "image"
-- // ],
-- // "parameters": {
-- // "image": {
-- // "description": "Name of the image resource to return.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/images/{image}",
-- // "response": {
-- // "$ref": "Image"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
+-go test -c
+-./go-restful.test -test.run=none -test.cpuprofile=tmp.prof -test.bench=BenchmarkMany
+-./go-restful.test -test.run=none -test.cpuprofile=curly.prof -test.bench=BenchmarkManyCurly
-
--}
+-#go tool pprof go-restful.test tmp.prof
+-go tool pprof go-restful.test curly.prof
-
--// method id "compute.images.insert":
-
--type ImagesInsertCall struct {
-- s *Service
-- project string
-- image *Image
-- opt_ map[string]interface{}
--}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/compress.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/compress.go
+deleted file mode 100644
+index c4dcca0..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/compress.go
++++ /dev/null
+@@ -1,89 +0,0 @@
+-package restful
-
--// Insert: Creates an image resource in the specified project using the
--// data included in the request.
--func (r *ImagesService) Insert(project string, image *Image) *ImagesInsertCall {
-- c := &ImagesInsertCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.image = image
-- return c
--}
+-// Copyright 2013 Ernest Micklei. All rights reserved.
+-// Use of this source code is governed by a license
+-// that can be found in the LICENSE file.
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *ImagesInsertCall) Fields(s ...googleapi.Field) *ImagesInsertCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
--}
+-import (
+- "compress/gzip"
+- "compress/zlib"
+- "errors"
+- "io"
+- "net/http"
+- "strings"
+-)
-
--func (c *ImagesInsertCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.image)
-- if err != nil {
-- return nil, err
-- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/images")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Creates an image resource in the specified project using the data included in the request.",
-- // "httpMethod": "POST",
-- // "id": "compute.images.insert",
-- // "parameterOrder": [
-- // "project"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/images",
-- // "request": {
-- // "$ref": "Image"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/devstorage.full_control",
-- // "https://www.googleapis.com/auth/devstorage.read_only",
-- // "https://www.googleapis.com/auth/devstorage.read_write"
-- // ]
-- // }
+-// OBSOLETE : use restful.DefaultContainer.EnableContentEncoding(true) to change this setting.
+-var EnableContentEncoding = false
-
+-// CompressingResponseWriter is a http.ResponseWriter that can perform content encoding (gzip and zlib)
+-type CompressingResponseWriter struct {
+- writer http.ResponseWriter
+- compressor io.WriteCloser
-}
-
--// method id "compute.images.list":
+-// Header is part of http.ResponseWriter interface
+-func (c *CompressingResponseWriter) Header() http.Header {
+- return c.writer.Header()
+-}
-
--type ImagesListCall struct {
-- s *Service
-- project string
-- opt_ map[string]interface{}
+-// WriteHeader is part of http.ResponseWriter interface
+-func (c *CompressingResponseWriter) WriteHeader(status int) {
+- c.writer.WriteHeader(status)
-}
-
--// List: Retrieves the list of image resources available to the
--// specified project.
--func (r *ImagesService) List(project string) *ImagesListCall {
-- c := &ImagesListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- return c
+-// Write is part of http.ResponseWriter interface
+-// It is passed through the compressor
+-func (c *CompressingResponseWriter) Write(bytes []byte) (int, error) {
+- return c.compressor.Write(bytes)
-}
-
--// Filter sets the optional parameter "filter": Filter expression for
--// filtering listed resources.
--func (c *ImagesListCall) Filter(filter string) *ImagesListCall {
-- c.opt_["filter"] = filter
-- return c
+-// CloseNotify is part of http.CloseNotifier interface
+-func (c *CompressingResponseWriter) CloseNotify() <-chan bool {
+- return c.writer.(http.CloseNotifier).CloseNotify()
-}
-
--// MaxResults sets the optional parameter "maxResults": Maximum count of
--// results to be returned. Maximum value is 500 and default value is
--// 500.
--func (c *ImagesListCall) MaxResults(maxResults int64) *ImagesListCall {
-- c.opt_["maxResults"] = maxResults
-- return c
+-// Close the underlying compressor
+-func (c *CompressingResponseWriter) Close() {
+- c.compressor.Close()
-}
-
--// PageToken sets the optional parameter "pageToken": Tag returned by a
--// previous list request truncated by maxResults. Used to continue a
--// previous list request.
--func (c *ImagesListCall) PageToken(pageToken string) *ImagesListCall {
-- c.opt_["pageToken"] = pageToken
-- return c
+-// WantsCompressedResponse reads the Accept-Encoding header to see if and which encoding is requested.
+-func wantsCompressedResponse(httpRequest *http.Request) (bool, string) {
+- header := httpRequest.Header.Get(HEADER_AcceptEncoding)
+- gi := strings.Index(header, ENCODING_GZIP)
+- zi := strings.Index(header, ENCODING_DEFLATE)
+- // use in order of appearance
+- if gi == -1 {
+- return zi != -1, ENCODING_DEFLATE
+- } else if zi == -1 {
+- return gi != -1, ENCODING_GZIP
+- } else {
+- if gi < zi {
+- return true, ENCODING_GZIP
+- }
+- return true, ENCODING_DEFLATE
+- }
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *ImagesListCall) Fields(s ...googleapi.Field) *ImagesListCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-// NewCompressingResponseWriter create a CompressingResponseWriter for a known encoding = {gzip,deflate}
+-func NewCompressingResponseWriter(httpWriter http.ResponseWriter, encoding string) (*CompressingResponseWriter, error) {
+- httpWriter.Header().Set(HEADER_ContentEncoding, encoding)
+- c := new(CompressingResponseWriter)
+- c.writer = httpWriter
+- var err error
+- if ENCODING_GZIP == encoding {
+- c.compressor, err = gzip.NewWriterLevel(httpWriter, gzip.BestSpeed)
+- if err != nil {
+- return nil, err
+- }
+- } else if ENCODING_DEFLATE == encoding {
+- c.compressor, err = zlib.NewWriterLevel(httpWriter, zlib.BestSpeed)
+- if err != nil {
+- return nil, err
+- }
+- } else {
+- return nil, errors.New("Unknown encoding:" + encoding)
+- }
+- return c, err
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/compress_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/compress_test.go
+deleted file mode 100644
+index 332fb22..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/compress_test.go
++++ /dev/null
+@@ -1,53 +0,0 @@
+-package restful
-
--func (c *ImagesListCall) Do() (*ImageList, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["filter"]; ok {
-- params.Set("filter", fmt.Sprintf("%v", v))
+-import (
+- "net/http"
+- "net/http/httptest"
+- "testing"
+-)
+-
+-func TestGzip(t *testing.T) {
+- EnableContentEncoding = true
+- httpRequest, _ := http.NewRequest("GET", "/test", nil)
+- httpRequest.Header.Set("Accept-Encoding", "gzip,deflate")
+- httpWriter := httptest.NewRecorder()
+- wanted, encoding := wantsCompressedResponse(httpRequest)
+- if !wanted {
+- t.Fatal("should accept gzip")
- }
-- if v, ok := c.opt_["maxResults"]; ok {
-- params.Set("maxResults", fmt.Sprintf("%v", v))
+- if encoding != "gzip" {
+- t.Fatal("expected gzip")
- }
-- if v, ok := c.opt_["pageToken"]; ok {
-- params.Set("pageToken", fmt.Sprintf("%v", v))
+- c, err := NewCompressingResponseWriter(httpWriter, encoding)
+- if err != nil {
+- t.Fatal(err.Error())
- }
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+- c.Write([]byte("Hello World"))
+- c.Close()
+- if httpWriter.Header().Get("Content-Encoding") != "gzip" {
+- t.Fatal("Missing gzip header")
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/images")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
+-}
+-
+-func TestDeflate(t *testing.T) {
+- EnableContentEncoding = true
+- httpRequest, _ := http.NewRequest("GET", "/test", nil)
+- httpRequest.Header.Set("Accept-Encoding", "deflate,gzip")
+- httpWriter := httptest.NewRecorder()
+- wanted, encoding := wantsCompressedResponse(httpRequest)
+- if !wanted {
+- t.Fatal("should accept deflate")
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- if encoding != "deflate" {
+- t.Fatal("expected deflate")
- }
-- var ret *ImageList
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- c, err := NewCompressingResponseWriter(httpWriter, encoding)
+- if err != nil {
+- t.Fatal(err.Error())
+- }
+- c.Write([]byte("Hello World"))
+- c.Close()
+- if httpWriter.Header().Get("Content-Encoding") != "deflate" {
+- t.Fatal("Missing deflate header")
- }
-- return ret, nil
-- // {
-- // "description": "Retrieves the list of image resources available to the specified project.",
-- // "httpMethod": "GET",
-- // "id": "compute.images.list",
-- // "parameterOrder": [
-- // "project"
-- // ],
-- // "parameters": {
-- // "filter": {
-- // "description": "Optional. Filter expression for filtering listed resources.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "maxResults": {
-- // "default": "500",
-- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
-- // "format": "uint32",
-- // "location": "query",
-- // "maximum": "500",
-- // "minimum": "0",
-- // "type": "integer"
-- // },
-- // "pageToken": {
-- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/images",
-- // "response": {
-- // "$ref": "ImageList"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
--
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/constants.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/constants.go
+deleted file mode 100644
+index 5e564d0..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/constants.go
++++ /dev/null
+@@ -1,29 +0,0 @@
+-package restful
-
--// method id "compute.instanceTemplates.delete":
--
--type InstanceTemplatesDeleteCall struct {
-- s *Service
-- project string
-- instanceTemplate string
-- opt_ map[string]interface{}
--}
+-// Copyright 2013 Ernest Micklei. All rights reserved.
+-// Use of this source code is governed by a license
+-// that can be found in the LICENSE file.
-
--// Delete: Deletes the specified instance template resource.
--func (r *InstanceTemplatesService) Delete(project string, instanceTemplate string) *InstanceTemplatesDeleteCall {
-- c := &InstanceTemplatesDeleteCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.instanceTemplate = instanceTemplate
-- return c
--}
+-const (
+- MIME_XML = "application/xml" // Accept or Content-Type used in Consumes() and/or Produces()
+- MIME_JSON = "application/json" // Accept or Content-Type used in Consumes() and/or Produces()
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *InstanceTemplatesDeleteCall) Fields(s ...googleapi.Field) *InstanceTemplatesDeleteCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
--}
+- HEADER_Allow = "Allow"
+- HEADER_Accept = "Accept"
+- HEADER_Origin = "Origin"
+- HEADER_ContentType = "Content-Type"
+- HEADER_LastModified = "Last-Modified"
+- HEADER_AcceptEncoding = "Accept-Encoding"
+- HEADER_ContentEncoding = "Content-Encoding"
+- HEADER_AccessControlExposeHeaders = "Access-Control-Expose-Headers"
+- HEADER_AccessControlRequestMethod = "Access-Control-Request-Method"
+- HEADER_AccessControlRequestHeaders = "Access-Control-Request-Headers"
+- HEADER_AccessControlAllowMethods = "Access-Control-Allow-Methods"
+- HEADER_AccessControlAllowOrigin = "Access-Control-Allow-Origin"
+- HEADER_AccessControlAllowCredentials = "Access-Control-Allow-Credentials"
+- HEADER_AccessControlAllowHeaders = "Access-Control-Allow-Headers"
+- HEADER_AccessControlMaxAge = "Access-Control-Max-Age"
-
--func (c *InstanceTemplatesDeleteCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/instanceTemplates/{instanceTemplate}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("DELETE", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "instanceTemplate": c.instanceTemplate,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Deletes the specified instance template resource.",
-- // "httpMethod": "DELETE",
-- // "id": "compute.instanceTemplates.delete",
-- // "parameterOrder": [
-- // "project",
-- // "instanceTemplate"
-- // ],
-- // "parameters": {
-- // "instanceTemplate": {
-- // "description": "Name of the instance template resource to delete.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/instanceTemplates/{instanceTemplate}",
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
+- ENCODING_GZIP = "gzip"
+- ENCODING_DEFLATE = "deflate"
+-)
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/container.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/container.go
+deleted file mode 100644
+index b5b5b2d..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/container.go
++++ /dev/null
+@@ -1,257 +0,0 @@
+-package restful
-
--}
+-// Copyright 2013 Ernest Micklei. All rights reserved.
+-// Use of this source code is governed by a license
+-// that can be found in the LICENSE file.
-
--// method id "compute.instanceTemplates.get":
+-import (
+- "bytes"
+- "fmt"
+- "log"
+- "net/http"
+- "runtime"
+- "strings"
+-)
-
--type InstanceTemplatesGetCall struct {
-- s *Service
-- project string
-- instanceTemplate string
-- opt_ map[string]interface{}
+-// Container holds a collection of WebServices and a http.ServeMux to dispatch http requests.
+-// The requests are further dispatched to routes of WebServices using a RouteSelector
+-type Container struct {
+- webServices []*WebService
+- ServeMux *http.ServeMux
+- isRegisteredOnRoot bool
+- containerFilters []FilterFunction
+- doNotRecover bool // default is false
+- recoverHandleFunc RecoverHandleFunction
+- router RouteSelector // default is a RouterJSR311, CurlyRouter is the faster alternative
+- contentEncodingEnabled bool // default is false
-}
-
--// Get: Returns the specified instance template resource.
--func (r *InstanceTemplatesService) Get(project string, instanceTemplate string) *InstanceTemplatesGetCall {
-- c := &InstanceTemplatesGetCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.instanceTemplate = instanceTemplate
-- return c
+-// NewContainer creates a new Container using a new ServeMux and default router (RouterJSR311)
+-func NewContainer() *Container {
+- return &Container{
+- webServices: []*WebService{},
+- ServeMux: http.NewServeMux(),
+- isRegisteredOnRoot: false,
+- containerFilters: []FilterFunction{},
+- doNotRecover: false,
+- recoverHandleFunc: logStackOnRecover,
+- router: RouterJSR311{},
+- contentEncodingEnabled: false}
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *InstanceTemplatesGetCall) Fields(s ...googleapi.Field) *InstanceTemplatesGetCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
--}
+-// RecoverHandleFunction declares functions that can be used to handle a panic situation.
+-// The first argument is what recover() returns. The second must be used to communicate an error response.
+-type RecoverHandleFunction func(interface{}, http.ResponseWriter)
-
--func (c *InstanceTemplatesGetCall) Do() (*InstanceTemplate, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/instanceTemplates/{instanceTemplate}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "instanceTemplate": c.instanceTemplate,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *InstanceTemplate
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Returns the specified instance template resource.",
-- // "httpMethod": "GET",
-- // "id": "compute.instanceTemplates.get",
-- // "parameterOrder": [
-- // "project",
-- // "instanceTemplate"
-- // ],
-- // "parameters": {
-- // "instanceTemplate": {
-- // "description": "Name of the instance template resource to return.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/instanceTemplates/{instanceTemplate}",
-- // "response": {
-- // "$ref": "InstanceTemplate"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
+-// RecoverHandler changes the default function (logStackOnRecover) to be called
+-// when a panic is detected. DoNotRecover must be have its default value (=false).
+-func (c *Container) RecoverHandler(handler RecoverHandleFunction) {
+- c.recoverHandleFunc = handler
+-}
-
+-// DoNotRecover controls whether panics will be caught to return HTTP 500.
+-// If set to true, Route functions are responsible for handling any error situation.
+-// Default value is false = recover from panics. This has performance implications.
+-func (c *Container) DoNotRecover(doNot bool) {
+- c.doNotRecover = doNot
-}
-
--// method id "compute.instanceTemplates.insert":
+-// Router changes the default Router (currently RouterJSR311)
+-func (c *Container) Router(aRouter RouteSelector) {
+- c.router = aRouter
+-}
-
--type InstanceTemplatesInsertCall struct {
-- s *Service
-- project string
-- instancetemplate *InstanceTemplate
-- opt_ map[string]interface{}
+-// EnableContentEncoding (default=false) allows for GZIP or DEFLATE encoding of responses.
+-func (c *Container) EnableContentEncoding(enabled bool) {
+- c.contentEncodingEnabled = enabled
-}
-
--// Insert: Creates an instance template resource in the specified
--// project using the data included in the request.
--func (r *InstanceTemplatesService) Insert(project string, instancetemplate *InstanceTemplate) *InstanceTemplatesInsertCall {
-- c := &InstanceTemplatesInsertCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.instancetemplate = instancetemplate
+-// Add a WebService to the Container. It will detect duplicate root paths and panic in that case.
+-func (c *Container) Add(service *WebService) *Container {
+- // If registered on root then no additional specific mapping is needed
+- if !c.isRegisteredOnRoot {
+- pattern := c.fixedPrefixPath(service.RootPath())
+- // check if root path registration is needed
+- if "/" == pattern || "" == pattern {
+- c.ServeMux.HandleFunc("/", c.dispatch)
+- c.isRegisteredOnRoot = true
+- } else {
+- // detect if registration already exists
+- alreadyMapped := false
+- for _, each := range c.webServices {
+- if each.RootPath() == service.RootPath() {
+- alreadyMapped = true
+- break
+- }
+- }
+- if !alreadyMapped {
+- c.ServeMux.HandleFunc(pattern, c.dispatch)
+- if !strings.HasSuffix(pattern, "/") {
+- c.ServeMux.HandleFunc(pattern+"/", c.dispatch)
+- }
+- }
+- }
+- }
+- // cannot have duplicate root paths
+- for _, each := range c.webServices {
+- if each.RootPath() == service.RootPath() {
+- log.Fatalf("[restful] WebService with duplicate root path detected:['%v']", each)
+- }
+- }
+- c.webServices = append(c.webServices, service)
- return c
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *InstanceTemplatesInsertCall) Fields(s ...googleapi.Field) *InstanceTemplatesInsertCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-// logStackOnRecover is the default RecoverHandleFunction and is called
+-// when DoNotRecover is false and the recoverHandleFunc is not set for the container.
+-// Default implementation logs the stacktrace and writes the stacktrace on the response.
+-// This may be a security issue as it exposes sourcecode information.
+-func logStackOnRecover(panicReason interface{}, httpWriter http.ResponseWriter) {
+- var buffer bytes.Buffer
+- buffer.WriteString(fmt.Sprintf("[restful] recover from panic situation: - %v\r\n", panicReason))
+- for i := 2; ; i += 1 {
+- _, file, line, ok := runtime.Caller(i)
+- if !ok {
+- break
+- }
+- buffer.WriteString(fmt.Sprintf(" %s:%d\r\n", file, line))
+- }
+- log.Println(buffer.String())
+- httpWriter.WriteHeader(http.StatusInternalServerError)
+- httpWriter.Write(buffer.Bytes())
-}
-
--func (c *InstanceTemplatesInsertCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.instancetemplate)
-- if err != nil {
-- return nil, err
-- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+-// Dispatch the incoming Http Request to a matching WebService.
+-func (c *Container) dispatch(httpWriter http.ResponseWriter, httpRequest *http.Request) {
+- // Instal panic recovery unless told otherwise
+- if !c.doNotRecover { // catch all for 500 response
+- defer func() {
+- if r := recover(); r != nil {
+- c.recoverHandleFunc(r, httpWriter)
+- return
+- }
+- }()
+- }
+- // Install closing the request body (if any)
+- defer func() {
+- if nil != httpRequest.Body {
+- httpRequest.Body.Close()
+- }
+- }()
+-
+- // Detect if compression is needed
+- // assume without compression, test for override
+- writer := httpWriter
+- if c.contentEncodingEnabled {
+- doCompress, encoding := wantsCompressedResponse(httpRequest)
+- if doCompress {
+- var err error
+- writer, err = NewCompressingResponseWriter(httpWriter, encoding)
+- if err != nil {
+- log.Println("[restful] unable to install compressor:", err)
+- httpWriter.WriteHeader(http.StatusInternalServerError)
+- return
+- }
+- defer func() {
+- writer.(*CompressingResponseWriter).Close()
+- }()
+- }
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/instanceTemplates")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+- // Find best match Route ; err is non nil if no match was found
+- webService, route, err := c.router.SelectRoute(
+- c.webServices,
+- httpRequest)
- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- // a non-200 response has already been written
+- // run container filters anyway ; they should not touch the response...
+- chain := FilterChain{Filters: c.containerFilters, Target: func(req *Request, resp *Response) {
+- switch err.(type) {
+- case ServiceError:
+- ser := err.(ServiceError)
+- resp.WriteErrorString(ser.Code, ser.Message)
+- }
+- // TODO
+- }}
+- chain.ProcessFilter(NewRequest(httpRequest), NewResponse(writer))
+- return
- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- wrappedRequest, wrappedResponse := route.wrapRequestResponse(writer, httpRequest)
+- // pass through filters (if any)
+- if len(c.containerFilters)+len(webService.filters)+len(route.Filters) > 0 {
+- // compose filter chain
+- allFilters := []FilterFunction{}
+- allFilters = append(allFilters, c.containerFilters...)
+- allFilters = append(allFilters, webService.filters...)
+- allFilters = append(allFilters, route.Filters...)
+- chain := FilterChain{Filters: allFilters, Target: func(req *Request, resp *Response) {
+- // handle request by route after passing all filters
+- route.Function(wrappedRequest, wrappedResponse)
+- }}
+- chain.ProcessFilter(wrappedRequest, wrappedResponse)
+- } else {
+- // no filters, handle request by route
+- route.Function(wrappedRequest, wrappedResponse)
- }
-- return ret, nil
-- // {
-- // "description": "Creates an instance template resource in the specified project using the data included in the request.",
-- // "httpMethod": "POST",
-- // "id": "compute.instanceTemplates.insert",
-- // "parameterOrder": [
-- // "project"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/instanceTemplates",
-- // "request": {
-- // "$ref": "InstanceTemplate"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
+-}
-
+-// fixedPrefixPath returns the fixed part of the partspec ; it may include template vars {}
+-func (c Container) fixedPrefixPath(pathspec string) string {
+- varBegin := strings.Index(pathspec, "{")
+- if -1 == varBegin {
+- return pathspec
+- }
+- return pathspec[:varBegin]
-}
-
--// method id "compute.instanceTemplates.list":
+-// ServeHTTP implements net/http.Handler therefore a Container can be a Handler in a http.Server
+-func (c Container) ServeHTTP(httpwriter http.ResponseWriter, httpRequest *http.Request) {
+- c.ServeMux.ServeHTTP(httpwriter, httpRequest)
+-}
-
--type InstanceTemplatesListCall struct {
-- s *Service
-- project string
-- opt_ map[string]interface{}
+-// Handle registers the handler for the given pattern. If a handler already exists for pattern, Handle panics.
+-func (c Container) Handle(pattern string, handler http.Handler) {
+- c.ServeMux.Handle(pattern, handler)
-}
-
--// List: Retrieves the list of instance template resources contained
--// within the specified project.
--func (r *InstanceTemplatesService) List(project string) *InstanceTemplatesListCall {
-- c := &InstanceTemplatesListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- return c
+-// Filter appends a container FilterFunction. These are called before dispatching
+-// a http.Request to a WebService from the container
+-func (c *Container) Filter(filter FilterFunction) {
+- c.containerFilters = append(c.containerFilters, filter)
-}
-
--// Filter sets the optional parameter "filter": Filter expression for
--// filtering listed resources.
--func (c *InstanceTemplatesListCall) Filter(filter string) *InstanceTemplatesListCall {
-- c.opt_["filter"] = filter
-- return c
+-// RegisteredWebServices returns the collections of added WebServices
+-func (c Container) RegisteredWebServices() []*WebService {
+- return c.webServices
-}
-
--// MaxResults sets the optional parameter "maxResults": Maximum count of
--// results to be returned. Maximum value is 500 and default value is
--// 500.
--func (c *InstanceTemplatesListCall) MaxResults(maxResults int64) *InstanceTemplatesListCall {
-- c.opt_["maxResults"] = maxResults
-- return c
+-// computeAllowedMethods returns a list of HTTP methods that are valid for a Request
+-func (c Container) computeAllowedMethods(req *Request) []string {
+- // Go through all RegisteredWebServices() and all its Routes to collect the options
+- methods := []string{}
+- requestPath := req.Request.URL.Path
+- for _, ws := range c.RegisteredWebServices() {
+- matches := ws.compiledPathExpression().Matcher.FindStringSubmatch(requestPath)
+- if matches != nil {
+- finalMatch := matches[len(matches)-1]
+- for _, rt := range ws.Routes() {
+- matches := rt.pathExpr.Matcher.FindStringSubmatch(finalMatch)
+- if matches != nil {
+- lastMatch := matches[len(matches)-1]
+- if lastMatch == "" || lastMatch == "/" { // do not include if value is neither empty nor ‘/’.
+- methods = append(methods, rt.Method)
+- }
+- }
+- }
+- }
+- }
+- // methods = append(methods, "OPTIONS") not sure about this
+- return methods
-}
-
--// PageToken sets the optional parameter "pageToken": Tag returned by a
--// previous list request truncated by maxResults. Used to continue a
--// previous list request.
--func (c *InstanceTemplatesListCall) PageToken(pageToken string) *InstanceTemplatesListCall {
-- c.opt_["pageToken"] = pageToken
-- return c
+-// newBasicRequestResponse creates a pair of Request,Response from its http versions.
+-// It is basic because no parameter or (produces) content-type information is given.
+-func newBasicRequestResponse(httpWriter http.ResponseWriter, httpRequest *http.Request) (*Request, *Response) {
+- resp := NewResponse(httpWriter)
+- resp.requestAccept = httpRequest.Header.Get(HEADER_Accept)
+- return NewRequest(httpRequest), resp
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/cors_filter.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/cors_filter.go
+deleted file mode 100644
+index ae166b6..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/cors_filter.go
++++ /dev/null
+@@ -1,170 +0,0 @@
+-package restful
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *InstanceTemplatesListCall) Fields(s ...googleapi.Field) *InstanceTemplatesListCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-// Copyright 2013 Ernest Micklei. All rights reserved.
+-// Use of this source code is governed by a license
+-// that can be found in the LICENSE file.
+-
+-import (
+- "strconv"
+- "strings"
+-)
+-
+-// CrossOriginResourceSharing is used to create a Container Filter that implements CORS.
+-// Cross-origin resource sharing (CORS) is a mechanism that allows JavaScript on a web page
+-// to make XMLHttpRequests to another domain, not the domain the JavaScript originated from.
+-//
+-// http://en.wikipedia.org/wiki/Cross-origin_resource_sharing
+-// http://enable-cors.org/server.html
+-// http://www.html5rocks.com/en/tutorials/cors/#toc-handling-a-not-so-simple-request
+-type CrossOriginResourceSharing struct {
+- ExposeHeaders []string // list of Header names
+- AllowedHeaders []string // list of Header names
+- AllowedDomains []string // list of allowed values for Http Origin. If empty all are allowed.
+- AllowedMethods []string
+- MaxAge int // number of seconds before requiring new Options request
+- CookiesAllowed bool
+- Container *Container
-}
-
--func (c *InstanceTemplatesListCall) Do() (*InstanceTemplateList, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["filter"]; ok {
-- params.Set("filter", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["maxResults"]; ok {
-- params.Set("maxResults", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["pageToken"]; ok {
-- params.Set("pageToken", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+-// Filter is a filter function that implements the CORS flow as documented on http://enable-cors.org/server.html
+-// and http://www.html5rocks.com/static/images/cors_server_flowchart.png
+-func (c CrossOriginResourceSharing) Filter(req *Request, resp *Response, chain *FilterChain) {
+- origin := req.Request.Header.Get(HEADER_Origin)
+- if len(origin) == 0 {
+- if trace {
+- traceLogger.Println("no Http header Origin set")
+- }
+- chain.ProcessFilter(req, resp)
+- return
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/instanceTemplates")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
+- if len(c.AllowedDomains) > 0 { // if provided then origin must be included
+- included := false
+- for _, each := range c.AllowedDomains {
+- if each == origin {
+- included = true
+- break
+- }
+- }
+- if !included {
+- if trace {
+- traceLogger.Println("HTTP Origin:%s is not part of %v", origin, c.AllowedDomains)
+- }
+- chain.ProcessFilter(req, resp)
+- return
+- }
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- if req.Request.Method != "OPTIONS" {
+- c.doActualRequest(req, resp)
+- chain.ProcessFilter(req, resp)
+- return
- }
-- var ret *InstanceTemplateList
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- if acrm := req.Request.Header.Get(HEADER_AccessControlRequestMethod); acrm != "" {
+- c.doPreflightRequest(req, resp)
+- } else {
+- c.doActualRequest(req, resp)
- }
-- return ret, nil
-- // {
-- // "description": "Retrieves the list of instance template resources contained within the specified project.",
-- // "httpMethod": "GET",
-- // "id": "compute.instanceTemplates.list",
-- // "parameterOrder": [
-- // "project"
-- // ],
-- // "parameters": {
-- // "filter": {
-- // "description": "Optional. Filter expression for filtering listed resources.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "maxResults": {
-- // "default": "500",
-- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
-- // "format": "uint32",
-- // "location": "query",
-- // "maximum": "500",
-- // "minimum": "0",
-- // "type": "integer"
-- // },
-- // "pageToken": {
-- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/instanceTemplates",
-- // "response": {
-- // "$ref": "InstanceTemplateList"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
+-}
-
+-func (c CrossOriginResourceSharing) doActualRequest(req *Request, resp *Response) {
+- c.setOptionsHeaders(req, resp)
+- // continue processing the response
-}
-
--// method id "compute.instances.addAccessConfig":
+-func (c CrossOriginResourceSharing) doPreflightRequest(req *Request, resp *Response) {
+- if len(c.AllowedMethods) == 0 {
+- c.AllowedMethods = c.Container.computeAllowedMethods(req)
+- }
-
--type InstancesAddAccessConfigCall struct {
-- s *Service
-- project string
-- zone string
-- instance string
-- networkInterface string
-- accessconfig *AccessConfig
-- opt_ map[string]interface{}
--}
+- acrm := req.Request.Header.Get(HEADER_AccessControlRequestMethod)
+- if !c.isValidAccessControlRequestMethod(acrm, c.AllowedMethods) {
+- if trace {
+- traceLogger.Printf("Http header %s:%s is not in %v",
+- HEADER_AccessControlRequestMethod,
+- acrm,
+- c.AllowedMethods)
+- }
+- return
+- }
+- acrhs := req.Request.Header.Get(HEADER_AccessControlRequestHeaders)
+- if len(acrhs) > 0 {
+- for _, each := range strings.Split(acrhs, ",") {
+- if !c.isValidAccessControlRequestHeader(strings.Trim(each, " ")) {
+- if trace {
+- traceLogger.Printf("Http header %s:%s is not in %v",
+- HEADER_AccessControlRequestHeaders,
+- acrhs,
+- c.AllowedHeaders)
+- }
+- return
+- }
+- }
+- }
+- resp.AddHeader(HEADER_AccessControlAllowMethods, strings.Join(c.AllowedMethods, ","))
+- resp.AddHeader(HEADER_AccessControlAllowHeaders, acrhs)
+- c.setOptionsHeaders(req, resp)
-
--// AddAccessConfig: Adds an access config to an instance's network
--// interface.
--func (r *InstancesService) AddAccessConfig(project string, zone string, instance string, networkInterface string, accessconfig *AccessConfig) *InstancesAddAccessConfigCall {
-- c := &InstancesAddAccessConfigCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.zone = zone
-- c.instance = instance
-- c.networkInterface = networkInterface
-- c.accessconfig = accessconfig
-- return c
+- // return http 200 response, no body
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *InstancesAddAccessConfigCall) Fields(s ...googleapi.Field) *InstancesAddAccessConfigCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func (c CrossOriginResourceSharing) setOptionsHeaders(req *Request, resp *Response) {
+- c.checkAndSetExposeHeaders(resp)
+- c.setAllowOriginHeader(req, resp)
+- c.checkAndSetAllowCredentials(resp)
+- if c.MaxAge > 0 {
+- resp.AddHeader(HEADER_AccessControlMaxAge, strconv.Itoa(c.MaxAge))
+- }
-}
-
--func (c *InstancesAddAccessConfigCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.accessconfig)
-- if err != nil {
-- return nil, err
-- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- params.Set("networkInterface", fmt.Sprintf("%v", c.networkInterface))
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/instances/{instance}/addAccessConfig")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "zone": c.zone,
-- "instance": c.instance,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
+-func (c CrossOriginResourceSharing) isOriginAllowed(origin string) bool {
+- if len(origin) == 0 {
+- return false
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- if len(c.AllowedDomains) == 0 {
+- return true
- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- allowed := false
+- for _, each := range c.AllowedDomains {
+- if each == origin {
+- allowed = true
+- break
+- }
- }
-- return ret, nil
-- // {
-- // "description": "Adds an access config to an instance's network interface.",
-- // "httpMethod": "POST",
-- // "id": "compute.instances.addAccessConfig",
-- // "parameterOrder": [
-- // "project",
-- // "zone",
-- // "instance",
-- // "networkInterface"
-- // ],
-- // "parameters": {
-- // "instance": {
-- // "description": "Instance name.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "networkInterface": {
-- // "description": "Network interface name.",
-- // "location": "query",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Project name.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "zone": {
-- // "description": "Name of the zone scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/zones/{zone}/instances/{instance}/addAccessConfig",
-- // "request": {
-- // "$ref": "AccessConfig"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
--
--}
--
--// method id "compute.instances.aggregatedList":
--
--type InstancesAggregatedListCall struct {
-- s *Service
-- project string
-- opt_ map[string]interface{}
+- return allowed
-}
-
--// AggregatedList:
--func (r *InstancesService) AggregatedList(project string) *InstancesAggregatedListCall {
-- c := &InstancesAggregatedListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- return c
+-func (c CrossOriginResourceSharing) setAllowOriginHeader(req *Request, resp *Response) {
+- origin := req.Request.Header.Get(HEADER_Origin)
+- if c.isOriginAllowed(origin) {
+- resp.AddHeader(HEADER_AccessControlAllowOrigin, origin)
+- }
-}
-
--// Filter sets the optional parameter "filter": Filter expression for
--// filtering listed resources.
--func (c *InstancesAggregatedListCall) Filter(filter string) *InstancesAggregatedListCall {
-- c.opt_["filter"] = filter
-- return c
+-func (c CrossOriginResourceSharing) checkAndSetExposeHeaders(resp *Response) {
+- if len(c.ExposeHeaders) > 0 {
+- resp.AddHeader(HEADER_AccessControlExposeHeaders, strings.Join(c.ExposeHeaders, ","))
+- }
-}
-
--// MaxResults sets the optional parameter "maxResults": Maximum count of
--// results to be returned. Maximum value is 500 and default value is
--// 500.
--func (c *InstancesAggregatedListCall) MaxResults(maxResults int64) *InstancesAggregatedListCall {
-- c.opt_["maxResults"] = maxResults
-- return c
+-func (c CrossOriginResourceSharing) checkAndSetAllowCredentials(resp *Response) {
+- if c.CookiesAllowed {
+- resp.AddHeader(HEADER_AccessControlAllowCredentials, "true")
+- }
-}
-
--// PageToken sets the optional parameter "pageToken": Tag returned by a
--// previous list request truncated by maxResults. Used to continue a
--// previous list request.
--func (c *InstancesAggregatedListCall) PageToken(pageToken string) *InstancesAggregatedListCall {
-- c.opt_["pageToken"] = pageToken
-- return c
+-func (c CrossOriginResourceSharing) isValidAccessControlRequestMethod(method string, allowedMethods []string) bool {
+- for _, each := range allowedMethods {
+- if each == method {
+- return true
+- }
+- }
+- return false
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *InstancesAggregatedListCall) Fields(s ...googleapi.Field) *InstancesAggregatedListCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func (c CrossOriginResourceSharing) isValidAccessControlRequestHeader(header string) bool {
+- for _, each := range c.AllowedHeaders {
+- if strings.ToLower(each) == strings.ToLower(header) {
+- return true
+- }
+- }
+- return false
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/cors_filter_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/cors_filter_test.go
+deleted file mode 100644
+index 9b47230..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/cors_filter_test.go
++++ /dev/null
+@@ -1,125 +0,0 @@
+-package restful
-
--func (c *InstancesAggregatedListCall) Do() (*InstanceAggregatedList, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["filter"]; ok {
-- params.Set("filter", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["maxResults"]; ok {
-- params.Set("maxResults", fmt.Sprintf("%v", v))
+-import (
+- "net/http"
+- "net/http/httptest"
+- "testing"
+-)
+-
+-// go test -v -test.run TestCORSFilter_Preflight ...restful
+-// http://www.html5rocks.com/en/tutorials/cors/#toc-handling-a-not-so-simple-request
+-func TestCORSFilter_Preflight(t *testing.T) {
+- tearDown()
+- ws := new(WebService)
+- ws.Route(ws.PUT("/cors").To(dummy))
+- Add(ws)
+-
+- cors := CrossOriginResourceSharing{
+- ExposeHeaders: []string{"X-Custom-Header"},
+- AllowedHeaders: []string{"X-Custom-Header", "X-Additional-Header"},
+- CookiesAllowed: true,
+- Container: DefaultContainer}
+- Filter(cors.Filter)
+-
+- // Preflight
+- httpRequest, _ := http.NewRequest("OPTIONS", "http://api.alice.com/cors", nil)
+- httpRequest.Method = "OPTIONS"
+- httpRequest.Header.Set(HEADER_Origin, "http://api.bob.com")
+- httpRequest.Header.Set(HEADER_AccessControlRequestMethod, "PUT")
+- httpRequest.Header.Set(HEADER_AccessControlRequestHeaders, "X-Custom-Header, X-Additional-Header")
+-
+- httpWriter := httptest.NewRecorder()
+- DefaultContainer.dispatch(httpWriter, httpRequest)
+-
+- actual := httpWriter.Header().Get(HEADER_AccessControlAllowOrigin)
+- if "http://api.bob.com" != actual {
+- t.Fatal("expected: http://api.bob.com but got:" + actual)
- }
-- if v, ok := c.opt_["pageToken"]; ok {
-- params.Set("pageToken", fmt.Sprintf("%v", v))
+- actual = httpWriter.Header().Get(HEADER_AccessControlAllowMethods)
+- if "PUT" != actual {
+- t.Fatal("expected: PUT but got:" + actual)
- }
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+- actual = httpWriter.Header().Get(HEADER_AccessControlAllowHeaders)
+- if "X-Custom-Header, X-Additional-Header" != actual {
+- t.Fatal("expected: X-Custom-Header, X-Additional-Header but got:" + actual)
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/aggregated/instances")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
+-
+- if !cors.isOriginAllowed("somewhere") {
+- t.Fatal("origin expected to be allowed")
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- cors.AllowedDomains = []string{"overthere.com"}
+- if cors.isOriginAllowed("somewhere") {
+- t.Fatal("origin [somewhere] expected NOT to be allowed")
- }
-- var ret *InstanceAggregatedList
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- if !cors.isOriginAllowed("overthere.com") {
+- t.Fatal("origin [overthere] expected to be allowed")
- }
-- return ret, nil
-- // {
-- // "httpMethod": "GET",
-- // "id": "compute.instances.aggregatedList",
-- // "parameterOrder": [
-- // "project"
-- // ],
-- // "parameters": {
-- // "filter": {
-- // "description": "Optional. Filter expression for filtering listed resources.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "maxResults": {
-- // "default": "500",
-- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
-- // "format": "uint32",
-- // "location": "query",
-- // "maximum": "500",
-- // "minimum": "0",
-- // "type": "integer"
-- // },
-- // "pageToken": {
-- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/aggregated/instances",
-- // "response": {
-- // "$ref": "InstanceAggregatedList"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
-
-}
-
--// method id "compute.instances.attachDisk":
--
--type InstancesAttachDiskCall struct {
-- s *Service
-- project string
-- zone string
-- instance string
-- attacheddisk *AttachedDisk
-- opt_ map[string]interface{}
--}
+-// go test -v -test.run TestCORSFilter_Actual ...restful
+-// http://www.html5rocks.com/en/tutorials/cors/#toc-handling-a-not-so-simple-request
+-func TestCORSFilter_Actual(t *testing.T) {
+- tearDown()
+- ws := new(WebService)
+- ws.Route(ws.PUT("/cors").To(dummy))
+- Add(ws)
-
--// AttachDisk: Attaches a disk resource to an instance.
--func (r *InstancesService) AttachDisk(project string, zone string, instance string, attacheddisk *AttachedDisk) *InstancesAttachDiskCall {
-- c := &InstancesAttachDiskCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.zone = zone
-- c.instance = instance
-- c.attacheddisk = attacheddisk
-- return c
--}
+- cors := CrossOriginResourceSharing{
+- ExposeHeaders: []string{"X-Custom-Header"},
+- AllowedHeaders: []string{"X-Custom-Header", "X-Additional-Header"},
+- CookiesAllowed: true,
+- Container: DefaultContainer}
+- Filter(cors.Filter)
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *InstancesAttachDiskCall) Fields(s ...googleapi.Field) *InstancesAttachDiskCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
--}
+- // Actual
+- httpRequest, _ := http.NewRequest("PUT", "http://api.alice.com/cors", nil)
+- httpRequest.Header.Set(HEADER_Origin, "http://api.bob.com")
+- httpRequest.Header.Set("X-Custom-Header", "value")
-
--func (c *InstancesAttachDiskCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.attacheddisk)
-- if err != nil {
-- return nil, err
-- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/instances/{instance}/attachDisk")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "zone": c.zone,
-- "instance": c.instance,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- httpWriter := httptest.NewRecorder()
+- DefaultContainer.dispatch(httpWriter, httpRequest)
+- actual := httpWriter.Header().Get(HEADER_AccessControlAllowOrigin)
+- if "http://api.bob.com" != actual {
+- t.Fatal("expected: http://api.bob.com but got:" + actual)
- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- if httpWriter.Body.String() != "dummy" {
+- t.Fatal("expected: dummy but got:" + httpWriter.Body.String())
- }
-- return ret, nil
-- // {
-- // "description": "Attaches a disk resource to an instance.",
-- // "httpMethod": "POST",
-- // "id": "compute.instances.attachDisk",
-- // "parameterOrder": [
-- // "project",
-- // "zone",
-- // "instance"
-- // ],
-- // "parameters": {
-- // "instance": {
-- // "description": "Instance name.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Project name.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "zone": {
-- // "description": "Name of the zone scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/zones/{zone}/instances/{instance}/attachDisk",
-- // "request": {
-- // "$ref": "AttachedDisk"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
+-}
-
+-var allowedDomainInput = []struct {
+- domains []string
+- origin string
+- accepted bool
+-}{
+- {[]string{}, "http://anything.com", true},
-}
-
--// method id "compute.instances.delete":
+-// go test -v -test.run TestCORSFilter_AllowedDomains ...restful
+-func TestCORSFilter_AllowedDomains(t *testing.T) {
+- for _, each := range allowedDomainInput {
+- tearDown()
+- ws := new(WebService)
+- ws.Route(ws.PUT("/cors").To(dummy))
+- Add(ws)
-
--type InstancesDeleteCall struct {
-- s *Service
-- project string
-- zone string
-- instance string
-- opt_ map[string]interface{}
--}
+- cors := CrossOriginResourceSharing{
+- AllowedDomains: each.domains,
+- CookiesAllowed: true,
+- Container: DefaultContainer}
+- Filter(cors.Filter)
-
--// Delete: Deletes the specified instance resource.
--func (r *InstancesService) Delete(project string, zone string, instance string) *InstancesDeleteCall {
-- c := &InstancesDeleteCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.zone = zone
-- c.instance = instance
-- return c
+- httpRequest, _ := http.NewRequest("PUT", "http://api.his.com/cors", nil)
+- httpRequest.Header.Set(HEADER_Origin, each.origin)
+- httpWriter := httptest.NewRecorder()
+- DefaultContainer.dispatch(httpWriter, httpRequest)
+- actual := httpWriter.Header().Get(HEADER_AccessControlAllowOrigin)
+- if actual != each.origin && each.accepted {
+- t.Fatal("expected to be accepted")
+- }
+- if actual == each.origin && !each.accepted {
+- t.Fatal("did not expect to be accepted")
+- }
+- }
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/coverage.sh b/Godeps/_workspace/src/github.com/emicklei/go-restful/coverage.sh
+deleted file mode 100644
+index e27dbf1..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/coverage.sh
++++ /dev/null
+@@ -1,2 +0,0 @@
+-go test -coverprofile=coverage.out
+-go tool cover -html=coverage.out
+\ No newline at end of file
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/curly.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/curly.go
+deleted file mode 100644
+index 1a29826..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/curly.go
++++ /dev/null
+@@ -1,162 +0,0 @@
+-package restful
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *InstancesDeleteCall) Fields(s ...googleapi.Field) *InstancesDeleteCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
--}
+-// Copyright 2013 Ernest Micklei. All rights reserved.
+-// Use of this source code is governed by a license
+-// that can be found in the LICENSE file.
-
--func (c *InstancesDeleteCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+-import (
+- "net/http"
+- "regexp"
+- "sort"
+- "strings"
+-)
+-
+-// CurlyRouter expects Routes with paths that contain zero or more parameters in curly brackets.
+-type CurlyRouter struct{}
+-
+-// SelectRoute is part of the Router interface and returns the best match
+-// for the WebService and its Route for the given Request.
+-func (c CurlyRouter) SelectRoute(
+- webServices []*WebService,
+- httpRequest *http.Request) (selectedService *WebService, selected *Route, err error) {
+-
+- requestTokens := tokenizePath(httpRequest.URL.Path)
+-
+- detectedService := c.detectWebService(requestTokens, webServices)
+- if detectedService == nil {
+- if trace {
+- traceLogger.Printf("no WebService was found to match URL path:%s\n", httpRequest.URL.Path)
+- }
+- return nil, nil, NewError(http.StatusNotFound, "404: Page Not Found")
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/instances/{instance}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("DELETE", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "zone": c.zone,
-- "instance": c.instance,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
+- candidateRoutes := c.selectRoutes(detectedService, requestTokens)
+- if len(candidateRoutes) == 0 {
+- if trace {
+- traceLogger.Printf("no Route in WebService with path %s was found to match URL path:%s\n", detectedService.rootPath, httpRequest.URL.Path)
+- }
+- return detectedService, nil, NewError(http.StatusNotFound, "404: Page Not Found")
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- selectedRoute, err := c.detectRoute(candidateRoutes, httpRequest)
+- if selectedRoute == nil {
+- return detectedService, nil, err
- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- return detectedService, selectedRoute, nil
+-}
+-
+-// selectRoutes return a collection of Route from a WebService that matches the path tokens from the request.
+-func (c CurlyRouter) selectRoutes(ws *WebService, requestTokens []string) []Route {
+- candidates := &sortableCurlyRoutes{[]*curlyRoute{}}
+- for _, each := range ws.routes {
+- matches, paramCount, staticCount := c.matchesRouteByPathTokens(each.pathParts, requestTokens)
+- if matches {
+- candidates.add(&curlyRoute{each, paramCount, staticCount}) // TODO make sure Routes() return pointers?
+- }
- }
-- return ret, nil
-- // {
-- // "description": "Deletes the specified instance resource.",
-- // "httpMethod": "DELETE",
-- // "id": "compute.instances.delete",
-- // "parameterOrder": [
-- // "project",
-- // "zone",
-- // "instance"
-- // ],
-- // "parameters": {
-- // "instance": {
-- // "description": "Name of the instance resource to delete.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "zone": {
-- // "description": "Name of the zone scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/zones/{zone}/instances/{instance}",
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
+- sort.Sort(sort.Reverse(candidates))
+- return candidates.routes()
+-}
-
+-// matchesRouteByPathTokens computes whether it matches, howmany parameters do match and what the number of static path elements are.
+-func (c CurlyRouter) matchesRouteByPathTokens(routeTokens, requestTokens []string) (matches bool, paramCount int, staticCount int) {
+- if len(routeTokens) < len(requestTokens) {
+- // proceed in matching only if last routeToken is wildcard
+- count := len(routeTokens)
+- if count == 0 || !strings.HasSuffix(routeTokens[count-1], "*}") {
+- return false, 0, 0
+- }
+- // proceed
+- }
+- for i, routeToken := range routeTokens {
+- if i == len(requestTokens) {
+- // reached end of request path
+- return false, 0, 0
+- }
+- requestToken := requestTokens[i]
+- if strings.HasPrefix(routeToken, "{") {
+- paramCount++
+- if colon := strings.Index(routeToken, ":"); colon != -1 {
+- // match by regex
+- matchesToken, matchesRemainder := c.regularMatchesPathToken(routeToken, colon, requestToken)
+- if !matchesToken {
+- return false, 0, 0
+- }
+- if matchesRemainder {
+- break
+- }
+- }
+- } else { // no { prefix
+- if requestToken != routeToken {
+- return false, 0, 0
+- }
+- staticCount++
+- }
+- }
+- return true, paramCount, staticCount
-}
-
--// method id "compute.instances.deleteAccessConfig":
--
--type InstancesDeleteAccessConfigCall struct {
-- s *Service
-- project string
-- zone string
-- instance string
-- accessConfig string
-- networkInterface string
-- opt_ map[string]interface{}
+-// regularMatchesPathToken tests whether the regular expression part of routeToken matches the requestToken or all remaining tokens
+-// format routeToken is {someVar:someExpression}, e.g. {zipcode:[\d][\d][\d][\d][A-Z][A-Z]}
+-func (c CurlyRouter) regularMatchesPathToken(routeToken string, colon int, requestToken string) (matchesToken bool, matchesRemainder bool) {
+- regPart := routeToken[colon+1 : len(routeToken)-1]
+- if regPart == "*" {
+- if trace {
+- traceLogger.Printf("wildcard parameter detected in route token %s that matches %s\n", routeToken, requestToken)
+- }
+- return true, true
+- }
+- matched, err := regexp.MatchString(regPart, requestToken)
+- return (matched && err == nil), false
-}
-
--// DeleteAccessConfig: Deletes an access config from an instance's
--// network interface.
--func (r *InstancesService) DeleteAccessConfig(project string, zone string, instance string, accessConfig string, networkInterface string) *InstancesDeleteAccessConfigCall {
-- c := &InstancesDeleteAccessConfigCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.zone = zone
-- c.instance = instance
-- c.accessConfig = accessConfig
-- c.networkInterface = networkInterface
-- return c
+-// detectRoute selectes from a list of Route the first match by inspecting both the Accept and Content-Type
+-// headers of the Request. See also RouterJSR311 in jsr311.go
+-func (c CurlyRouter) detectRoute(candidateRoutes []Route, httpRequest *http.Request) (*Route, error) {
+- // tracing is done inside detectRoute
+- return RouterJSR311{}.detectRoute(candidateRoutes, httpRequest)
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *InstancesDeleteAccessConfigCall) Fields(s ...googleapi.Field) *InstancesDeleteAccessConfigCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-// detectWebService returns the best matching webService given the list of path tokens.
+-// see also computeWebserviceScore
+-func (c CurlyRouter) detectWebService(requestTokens []string, webServices []*WebService) *WebService {
+- var best *WebService
+- score := -1
+- for _, each := range webServices {
+- matches, eachScore := c.computeWebserviceScore(requestTokens, each.compiledPathExpression().tokens)
+- if matches && (eachScore > score) {
+- best = each
+- score = eachScore
+- }
+- }
+- return best
-}
-
--func (c *InstancesDeleteAccessConfigCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- params.Set("accessConfig", fmt.Sprintf("%v", c.accessConfig))
-- params.Set("networkInterface", fmt.Sprintf("%v", c.networkInterface))
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/instances/{instance}/deleteAccessConfig")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "zone": c.zone,
-- "instance": c.instance,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+-// computeWebserviceScore returns whether tokens match and
+-// the weighted score of the longest matching consecutive tokens from the beginning.
+-func (c CurlyRouter) computeWebserviceScore(requestTokens []string, tokens []string) (bool, int) {
+- if len(tokens) > len(requestTokens) {
+- return false, 0
- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- score := 0
+- for i := 0; i < len(tokens); i++ {
+- each := requestTokens[i]
+- other := tokens[i]
+- if len(each) == 0 && len(other) == 0 {
+- score++
+- continue
+- }
+- if len(other) > 0 && strings.HasPrefix(other, "{") {
+- // no empty match
+- if len(each) == 0 {
+- return false, score
+- }
+- score += 1
+- } else {
+- // not a parameter
+- if each != other {
+- return false, score
+- }
+- score += (len(tokens) - i) * 10 //fuzzy
+- }
- }
-- return ret, nil
-- // {
-- // "description": "Deletes an access config from an instance's network interface.",
-- // "httpMethod": "POST",
-- // "id": "compute.instances.deleteAccessConfig",
-- // "parameterOrder": [
-- // "project",
-- // "zone",
-- // "instance",
-- // "accessConfig",
-- // "networkInterface"
-- // ],
-- // "parameters": {
-- // "accessConfig": {
-- // "description": "Access config name.",
-- // "location": "query",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "instance": {
-- // "description": "Instance name.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "networkInterface": {
-- // "description": "Network interface name.",
-- // "location": "query",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Project name.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "zone": {
-- // "description": "Name of the zone scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/zones/{zone}/instances/{instance}/deleteAccessConfig",
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
+- return true, score
+-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/curly_route.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/curly_route.go
+deleted file mode 100644
+index 3edab72..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/curly_route.go
++++ /dev/null
+@@ -1,54 +0,0 @@
+-package restful
+-
+-// Copyright 2013 Ernest Micklei. All rights reserved.
+-// Use of this source code is governed by a license
+-// that can be found in the LICENSE file.
-
+-// curlyRoute exits for sorting Routes by the CurlyRouter based on number of parameters and number of static path elements.
+-type curlyRoute struct {
+- route Route
+- paramCount int
+- staticCount int
-}
-
--// method id "compute.instances.detachDisk":
+-type sortableCurlyRoutes struct {
+- candidates []*curlyRoute
+-}
-
--type InstancesDetachDiskCall struct {
-- s *Service
-- project string
-- zone string
-- instance string
-- deviceName string
-- opt_ map[string]interface{}
+-func (s *sortableCurlyRoutes) add(route *curlyRoute) {
+- s.candidates = append(s.candidates, route)
-}
-
--// DetachDisk: Detaches a disk from an instance.
--func (r *InstancesService) DetachDisk(project string, zone string, instance string, deviceName string) *InstancesDetachDiskCall {
-- c := &InstancesDetachDiskCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.zone = zone
-- c.instance = instance
-- c.deviceName = deviceName
-- return c
+-func (s *sortableCurlyRoutes) routes() (routes []Route) {
+- for _, each := range s.candidates {
+- routes = append(routes, each.route) // TODO change return type
+- }
+- return routes
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *InstancesDetachDiskCall) Fields(s ...googleapi.Field) *InstancesDetachDiskCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func (s *sortableCurlyRoutes) Len() int {
+- return len(s.candidates)
-}
+-func (s *sortableCurlyRoutes) Swap(i, j int) {
+- s.candidates[i], s.candidates[j] = s.candidates[j], s.candidates[i]
+-}
+-func (s *sortableCurlyRoutes) Less(i, j int) bool {
+- ci := s.candidates[i]
+- cj := s.candidates[j]
-
--func (c *InstancesDetachDiskCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- params.Set("deviceName", fmt.Sprintf("%v", c.deviceName))
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+- // primary key
+- if ci.staticCount < cj.staticCount {
+- return true
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/instances/{instance}/detachDisk")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "zone": c.zone,
-- "instance": c.instance,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
+- if ci.staticCount > cj.staticCount {
+- return false
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- // secundary key
+- if ci.paramCount < cj.paramCount {
+- return true
- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- if ci.paramCount > cj.paramCount {
+- return false
- }
-- return ret, nil
-- // {
-- // "description": "Detaches a disk from an instance.",
-- // "httpMethod": "POST",
-- // "id": "compute.instances.detachDisk",
-- // "parameterOrder": [
-- // "project",
-- // "zone",
-- // "instance",
-- // "deviceName"
-- // ],
-- // "parameters": {
-- // "deviceName": {
-- // "description": "Disk device name to detach.",
-- // "location": "query",
-- // "pattern": "\\w[\\w.-]{0,254}",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "instance": {
-- // "description": "Instance name.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Project name.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "zone": {
-- // "description": "Name of the zone scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/zones/{zone}/instances/{instance}/detachDisk",
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
--
+- return ci.route.Path < cj.route.Path
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/curly_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/curly_test.go
+deleted file mode 100644
+index 4291825..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/curly_test.go
++++ /dev/null
+@@ -1,228 +0,0 @@
+-package restful
-
--// method id "compute.instances.get":
--
--type InstancesGetCall struct {
-- s *Service
-- project string
-- zone string
-- instance string
-- opt_ map[string]interface{}
--}
+-import (
+- "io"
+- "net/http"
+- "testing"
+-)
-
--// Get: Returns the specified instance resource.
--func (r *InstancesService) Get(project string, zone string, instance string) *InstancesGetCall {
-- c := &InstancesGetCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.zone = zone
-- c.instance = instance
-- return c
+-var requestPaths = []struct {
+- // url with path (1) is handled by service with root (2) and remainder has value final (3)
+- path, root string
+-}{
+- {"/", "/"},
+- {"/p", "/p"},
+- {"/p/x", "/p/{q}"},
+- {"/q/x", "/q"},
+- {"/p/x/", "/p/{q}"},
+- {"/p/x/y", "/p/{q}"},
+- {"/q/x/y", "/q"},
+- {"/z/q", "/{p}/q"},
+- {"/a/b/c/q", "/"},
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *InstancesGetCall) Fields(s ...googleapi.Field) *InstancesGetCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
--}
+-// go test -v -test.run TestCurlyDetectWebService ...restful
+-func TestCurlyDetectWebService(t *testing.T) {
+- ws1 := new(WebService).Path("/")
+- ws2 := new(WebService).Path("/p")
+- ws3 := new(WebService).Path("/q")
+- ws4 := new(WebService).Path("/p/q")
+- ws5 := new(WebService).Path("/p/{q}")
+- ws7 := new(WebService).Path("/{p}/q")
+- var wss = []*WebService{ws1, ws2, ws3, ws4, ws5, ws7}
-
--func (c *InstancesGetCall) Do() (*Instance, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+- for _, each := range wss {
+- t.Logf("path=%s,toks=%v\n", each.compiledPathExpression().Source, each.compiledPathExpression().tokens)
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/instances/{instance}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "zone": c.zone,
-- "instance": c.instance,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
+-
+- router := CurlyRouter{}
+-
+- ok := true
+- for i, fixture := range requestPaths {
+- requestTokens := tokenizePath(fixture.path)
+- who := router.detectWebService(requestTokens, wss)
+- if who != nil && who.RootPath() != fixture.root {
+- t.Logf("[line:%v] Unexpected dispatcher, expected:%v, actual:%v", i, fixture.root, who.RootPath())
+- ok = false
+- }
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- if !ok {
+- t.Fail()
- }
-- var ret *Instance
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-}
+-
+-var serviceDetects = []struct {
+- path string
+- found bool
+- root string
+-}{
+- {"/a/b", true, "/{p}/{q}/{r}"},
+- {"/p/q", true, "/p/q"},
+- {"/q/p", true, "/q"},
+- {"/", true, "/"},
+- {"/p/q/r", true, "/p/q"},
+-}
+-
+-// go test -v -test.run Test_detectWebService ...restful
+-func Test_detectWebService(t *testing.T) {
+- router := CurlyRouter{}
+- ws1 := new(WebService).Path("/")
+- ws2 := new(WebService).Path("/p")
+- ws3 := new(WebService).Path("/q")
+- ws4 := new(WebService).Path("/p/q")
+- ws5 := new(WebService).Path("/p/{q}")
+- ws6 := new(WebService).Path("/p/{q}/")
+- ws7 := new(WebService).Path("/{p}/q")
+- ws8 := new(WebService).Path("/{p}/{q}/{r}")
+- var wss = []*WebService{ws8, ws7, ws6, ws5, ws4, ws3, ws2, ws1}
+- for _, fix := range serviceDetects {
+- requestPath := fix.path
+- requestTokens := tokenizePath(requestPath)
+- for _, ws := range wss {
+- serviceTokens := ws.compiledPathExpression().tokens
+- matches, score := router.computeWebserviceScore(requestTokens, serviceTokens)
+- t.Logf("req=%s,toks:%v,ws=%s,toks:%v,score=%d,matches=%v", requestPath, requestTokens, ws.RootPath(), serviceTokens, score, matches)
+- }
+- best := router.detectWebService(requestTokens, wss)
+- if best != nil {
+- if fix.found {
+- t.Logf("best=%s", best.RootPath())
+- } else {
+- t.Fatalf("should have found:%s", fix.root)
+- }
+- }
- }
-- return ret, nil
-- // {
-- // "description": "Returns the specified instance resource.",
-- // "httpMethod": "GET",
-- // "id": "compute.instances.get",
-- // "parameterOrder": [
-- // "project",
-- // "zone",
-- // "instance"
-- // ],
-- // "parameters": {
-- // "instance": {
-- // "description": "Name of the instance resource to return.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "zone": {
-- // "description": "Name of the zone scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/zones/{zone}/instances/{instance}",
-- // "response": {
-- // "$ref": "Instance"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
+-}
-
+-var routeMatchers = []struct {
+- route string
+- path string
+- matches bool
+- paramCount int
+- staticCount int
+-}{
+- // route, request-path
+- {"/a", "/a", true, 0, 1},
+- {"/a", "/b", false, 0, 0},
+- {"/a", "/b", false, 0, 0},
+- {"/a/{b}/c/", "/a/2/c", true, 1, 2},
+- {"/{a}/{b}/{c}/", "/a/b", false, 0, 0},
+- {"/{x:*}", "/", false, 0, 0},
+- {"/{x:*}", "/a", true, 1, 0},
+- {"/{x:*}", "/a/b", true, 1, 0},
+- {"/a/{x:*}", "/a/b", true, 1, 1},
+- {"/a/{x:[A-Z][A-Z]}", "/a/ZX", true, 1, 1},
+- {"/basepath/{resource:*}", "/basepath/some/other/location/test.xml", true, 1, 1},
-}
-
--// method id "compute.instances.getSerialPortOutput":
+-// clear && go test -v -test.run Test_matchesRouteByPathTokens ...restful
+-func Test_matchesRouteByPathTokens(t *testing.T) {
+- router := CurlyRouter{}
+- for i, each := range routeMatchers {
+- routeToks := tokenizePath(each.route)
+- reqToks := tokenizePath(each.path)
+- matches, pCount, sCount := router.matchesRouteByPathTokens(routeToks, reqToks)
+- if matches != each.matches {
+- t.Fatalf("[%d] unexpected matches outcome route:%s, path:%s, matches:%v", i, each.route, each.path, matches)
+- }
+- if pCount != each.paramCount {
+- t.Fatalf("[%d] unexpected paramCount got:%d want:%d ", i, pCount, each.paramCount)
+- }
+- if sCount != each.staticCount {
+- t.Fatalf("[%d] unexpected staticCount got:%d want:%d ", i, sCount, each.staticCount)
+- }
+- }
+-}
-
--type InstancesGetSerialPortOutputCall struct {
-- s *Service
-- project string
-- zone string
-- instance string
-- opt_ map[string]interface{}
+-// clear && go test -v -test.run TestExtractParameters_Wildcard1 ...restful
+-func TestExtractParameters_Wildcard1(t *testing.T) {
+- params := doExtractParams("/fixed/{var:*}", 2, "/fixed/remainder", t)
+- if params["var"] != "remainder" {
+- t.Errorf("parameter mismatch var: %s", params["var"])
+- }
-}
-
--// GetSerialPortOutput: Returns the specified instance's serial port
--// output.
--func (r *InstancesService) GetSerialPortOutput(project string, zone string, instance string) *InstancesGetSerialPortOutputCall {
-- c := &InstancesGetSerialPortOutputCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.zone = zone
-- c.instance = instance
-- return c
+-// clear && go test -v -test.run TestExtractParameters_Wildcard2 ...restful
+-func TestExtractParameters_Wildcard2(t *testing.T) {
+- params := doExtractParams("/fixed/{var:*}", 2, "/fixed/remain/der", t)
+- if params["var"] != "remain/der" {
+- t.Errorf("parameter mismatch var: %s", params["var"])
+- }
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *InstancesGetSerialPortOutputCall) Fields(s ...googleapi.Field) *InstancesGetSerialPortOutputCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-// clear && go test -v -test.run TestExtractParameters_Wildcard3 ...restful
+-func TestExtractParameters_Wildcard3(t *testing.T) {
+- params := doExtractParams("/static/{var:*}", 2, "/static/test/sub/hi.html", t)
+- if params["var"] != "test/sub/hi.html" {
+- t.Errorf("parameter mismatch var: %s", params["var"])
+- }
-}
-
--func (c *InstancesGetSerialPortOutputCall) Do() (*SerialPortOutput, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+-// clear && go test -v -test.run TestCurly_ISSUE_34 ...restful
+-func TestCurly_ISSUE_34(t *testing.T) {
+- ws1 := new(WebService).Path("/")
+- ws1.Route(ws1.GET("/{type}/{id}").To(curlyDummy))
+- ws1.Route(ws1.GET("/network/{id}").To(curlyDummy))
+- routes := CurlyRouter{}.selectRoutes(ws1, tokenizePath("/network/12"))
+- if len(routes) != 2 {
+- t.Fatal("expected 2 routes")
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/instances/{instance}/serialPort")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "zone": c.zone,
-- "instance": c.instance,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
+- if routes[0].Path != "/network/{id}" {
+- t.Error("first is", routes[0].Path)
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+-}
+-
+-// clear && go test -v -test.run TestCurly_ISSUE_34_2 ...restful
+-func TestCurly_ISSUE_34_2(t *testing.T) {
+- ws1 := new(WebService)
+- ws1.Route(ws1.GET("/network/{id}").To(curlyDummy))
+- ws1.Route(ws1.GET("/{type}/{id}").To(curlyDummy))
+- routes := CurlyRouter{}.selectRoutes(ws1, tokenizePath("/network/12"))
+- if len(routes) != 2 {
+- t.Fatal("expected 2 routes")
- }
-- var ret *SerialPortOutput
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- if routes[0].Path != "/network/{id}" {
+- t.Error("first is", routes[0].Path)
- }
-- return ret, nil
-- // {
-- // "description": "Returns the specified instance's serial port output.",
-- // "httpMethod": "GET",
-- // "id": "compute.instances.getSerialPortOutput",
-- // "parameterOrder": [
-- // "project",
-- // "zone",
-- // "instance"
-- // ],
-- // "parameters": {
-- // "instance": {
-- // "description": "Name of the instance scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "zone": {
-- // "description": "Name of the zone scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/zones/{zone}/instances/{instance}/serialPort",
-- // "response": {
-- // "$ref": "SerialPortOutput"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
--
-}
-
--// method id "compute.instances.insert":
--
--type InstancesInsertCall struct {
-- s *Service
-- project string
-- zone string
-- instance *Instance
-- opt_ map[string]interface{}
+-// clear && go test -v -test.run TestCurly_JsonHtml ...restful
+-func TestCurly_JsonHtml(t *testing.T) {
+- ws1 := new(WebService)
+- ws1.Route(ws1.GET("/some.html").To(curlyDummy).Consumes("*/*").Produces("text/html"))
+- req, _ := http.NewRequest("GET", "/some.html", nil)
+- req.Header.Set("Accept", "application/json")
+- _, route, err := CurlyRouter{}.SelectRoute([]*WebService{ws1}, req)
+- if err == nil {
+- t.Error("error expected")
+- }
+- if route != nil {
+- t.Error("no route expected")
+- }
-}
-
--// Insert: Creates an instance resource in the specified project using
--// the data included in the request.
--func (r *InstancesService) Insert(project string, zone string, instance *Instance) *InstancesInsertCall {
-- c := &InstancesInsertCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.zone = zone
-- c.instance = instance
-- return c
+-// go test -v -test.run TestCurly_ISSUE_137 ...restful
+-func TestCurly_ISSUE_137(t *testing.T) {
+- ws1 := new(WebService)
+- ws1.Route(ws1.GET("/hello").To(curlyDummy))
+- req, _ := http.NewRequest("GET", "/", nil)
+- _, route, _ := CurlyRouter{}.SelectRoute([]*WebService{ws1}, req)
+- t.Log(route)
+- if route != nil {
+- t.Error("no route expected")
+- }
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *InstancesInsertCall) Fields(s ...googleapi.Field) *InstancesInsertCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-// go test -v -test.run TestCurly_ISSUE_137_2 ...restful
+-func TestCurly_ISSUE_137_2(t *testing.T) {
+- ws1 := new(WebService)
+- ws1.Route(ws1.GET("/hello").To(curlyDummy))
+- req, _ := http.NewRequest("GET", "/hello/bob", nil)
+- _, route, _ := CurlyRouter{}.SelectRoute([]*WebService{ws1}, req)
+- t.Log(route)
+- if route != nil {
+- t.Errorf("no route expected, got %v", route)
+- }
-}
-
--func (c *InstancesInsertCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.instance)
-- if err != nil {
-- return nil, err
-- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/instances")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "zone": c.zone,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-func curlyDummy(req *Request, resp *Response) { io.WriteString(resp.ResponseWriter, "curlyDummy") }
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/doc.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/doc.go
+deleted file mode 100644
+index c095566..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/doc.go
++++ /dev/null
+@@ -1,184 +0,0 @@
+-/*
+-Package restful, a lean package for creating REST-style WebServices without magic.
+-
+-WebServices and Routes
+-
+-A WebService has a collection of Route objects that dispatch incoming Http Requests to a function calls.
+-Typically, a WebService has a root path (e.g. /users) and defines common MIME types for its routes.
+-WebServices must be added to a container (see below) in order to handler Http requests from a server.
+-
+-A Route is defined by a HTTP method, an URL path and (optionally) the MIME types it consumes (Content-Type) and produces (Accept).
+-This package has the logic to find the best matching Route and if found, call its Function.
+-
+- ws := new(restful.WebService)
+- ws.
+- Path("/users").
+- Consumes(restful.MIME_JSON, restful.MIME_XML).
+- Produces(restful.MIME_JSON, restful.MIME_XML)
+-
+- ws.Route(ws.GET("/{user-id}").To(u.findUser)) // u is a UserResource
+-
+- ...
+-
+- // GET http://localhost:8080/users/1
+- func (u UserResource) findUser(request *restful.Request, response *restful.Response) {
+- id := request.PathParameter("user-id")
+- ...
- }
-- return ret, nil
-- // {
-- // "description": "Creates an instance resource in the specified project using the data included in the request.",
-- // "httpMethod": "POST",
-- // "id": "compute.instances.insert",
-- // "parameterOrder": [
-- // "project",
-- // "zone"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "zone": {
-- // "description": "Name of the zone scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/zones/{zone}/instances",
-- // "request": {
-- // "$ref": "Instance"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
-
--}
+-The (*Request, *Response) arguments provide functions for reading information from the request and writing information back to the response.
-
--// method id "compute.instances.list":
+-See the example https://github.com/emicklei/go-restful/blob/master/examples/restful-user-resource.go with a full implementation.
-
--type InstancesListCall struct {
-- s *Service
-- project string
-- zone string
-- opt_ map[string]interface{}
--}
+-Regular expression matching Routes
-
--// List: Retrieves the list of instance resources contained within the
--// specified zone.
--func (r *InstancesService) List(project string, zone string) *InstancesListCall {
-- c := &InstancesListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.zone = zone
-- return c
--}
+-A Route parameter can be specified using the format "uri/{var[:regexp]}" or the special version "uri/{var:*}" for matching the tail of the path.
+-For example, /persons/{name:[A-Z][A-Z]} can be used to restrict values for the parameter "name" to only contain capital alphabetic characters.
+-Regular expressions must use the standard Go syntax as described in the regexp package. (https://code.google.com/p/re2/wiki/Syntax)
+-This feature requires the use of a CurlyRouter.
-
--// Filter sets the optional parameter "filter": Filter expression for
--// filtering listed resources.
--func (c *InstancesListCall) Filter(filter string) *InstancesListCall {
-- c.opt_["filter"] = filter
-- return c
--}
+-Containers
-
--// MaxResults sets the optional parameter "maxResults": Maximum count of
--// results to be returned. Maximum value is 500 and default value is
--// 500.
--func (c *InstancesListCall) MaxResults(maxResults int64) *InstancesListCall {
-- c.opt_["maxResults"] = maxResults
-- return c
--}
+-A Container holds a collection of WebServices, Filters and a http.ServeMux for multiplexing http requests.
+-Using the statements "restful.Add(...) and restful.Filter(...)" will register WebServices and Filters to the Default Container.
+-The Default container of go-restful uses the http.DefaultServeMux.
+-You can create your own Container and create a new http.Server for that particular container.
-
--// PageToken sets the optional parameter "pageToken": Tag returned by a
--// previous list request truncated by maxResults. Used to continue a
--// previous list request.
--func (c *InstancesListCall) PageToken(pageToken string) *InstancesListCall {
-- c.opt_["pageToken"] = pageToken
-- return c
--}
+- container := restful.NewContainer()
+- server := &http.Server{Addr: ":8081", Handler: container}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *InstancesListCall) Fields(s ...googleapi.Field) *InstancesListCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
--}
+-Filters
-
--func (c *InstancesListCall) Do() (*InstanceList, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["filter"]; ok {
-- params.Set("filter", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["maxResults"]; ok {
-- params.Set("maxResults", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["pageToken"]; ok {
-- params.Set("pageToken", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/instances")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "zone": c.zone,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *InstanceList
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Retrieves the list of instance resources contained within the specified zone.",
-- // "httpMethod": "GET",
-- // "id": "compute.instances.list",
-- // "parameterOrder": [
-- // "project",
-- // "zone"
-- // ],
-- // "parameters": {
-- // "filter": {
-- // "description": "Optional. Filter expression for filtering listed resources.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "maxResults": {
-- // "default": "500",
-- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
-- // "format": "uint32",
-- // "location": "query",
-- // "maximum": "500",
-- // "minimum": "0",
-- // "type": "integer"
-- // },
-- // "pageToken": {
-- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "zone": {
-- // "description": "Name of the zone scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/zones/{zone}/instances",
-- // "response": {
-- // "$ref": "InstanceList"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
+-A filter dynamically intercepts requests and responses to transform or use the information contained in the requests or responses.
+-You can use filters to perform generic logging, measurement, authentication, redirect, set response headers etc.
+-In the restful package there are three hooks into the request,response flow where filters can be added.
+-Each filter must define a FilterFunction:
+-
+- func (req *restful.Request, resp *restful.Response, chain *restful.FilterChain)
+-
+-Use the following statement to pass the request,response pair to the next filter or RouteFunction
+-
+- chain.ProcessFilter(req, resp)
+-
+-Container Filters
+-
+-These are processed before any registered WebService.
+-
+- // install a (global) filter for the default container (processed before any webservice)
+- restful.Filter(globalLogging)
+-
+-WebService Filters
+-
+-These are processed before any Route of a WebService.
+-
+- // install a webservice filter (processed before any route)
+- ws.Filter(webserviceLogging).Filter(measureTime)
+-
+-
+-Route Filters
+-
+-These are processed before calling the function associated with the Route.
+-
+- // install 2 chained route filters (processed before calling findUser)
+- ws.Route(ws.GET("/{user-id}").Filter(routeLogging).Filter(NewCountFilter().routeCounter).To(findUser))
+-
+-See the example https://github.com/emicklei/go-restful/blob/master/examples/restful-filters.go with full implementations.
+-
+-Response Encoding
+-
+-Two encodings are supported: gzip and deflate. To enable this for all responses:
+-
+- restful.DefaultContainer.EnableContentEncoding(true)
+-
+-If a Http request includes the Accept-Encoding header then the response content will be compressed using the specified encoding.
+-Alternatively, you can create a Filter that performs the encoding and install it per WebService or Route.
+-
+-See the example https://github.com/emicklei/go-restful/blob/master/examples/restful-encoding-filter.go
+-
+-OPTIONS support
+-
+-By installing a pre-defined container filter, your Webservice(s) can respond to the OPTIONS Http request.
+-
+- Filter(OPTIONSFilter())
+-
+-CORS
+-
+-By installing the filter of a CrossOriginResourceSharing (CORS), your WebService(s) can handle CORS requests.
+-
+- cors := CrossOriginResourceSharing{ExposeHeaders: []string{"X-My-Header"}, CookiesAllowed: false, Container: DefaultContainer}
+- Filter(cors.Filter)
+-
+-Error Handling
-
--}
+-Unexpected things happen. If a request cannot be processed because of a failure, your service needs to tell via the response what happened and why.
+-For this reason HTTP status codes exist and it is important to use the correct code in every exceptional situation.
-
--// method id "compute.instances.reset":
+- 400: Bad Request
-
--type InstancesResetCall struct {
-- s *Service
-- project string
-- zone string
-- instance string
-- opt_ map[string]interface{}
--}
+-If path or query parameters are not valid (content or type) then use http.StatusBadRequest.
-
--// Reset: Performs a hard reset on the instance.
--func (r *InstancesService) Reset(project string, zone string, instance string) *InstancesResetCall {
-- c := &InstancesResetCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.zone = zone
-- c.instance = instance
-- return c
--}
+- 404: Not Found
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *InstancesResetCall) Fields(s ...googleapi.Field) *InstancesResetCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
--}
+-Despite a valid URI, the resource requested may not be available
-
--func (c *InstancesResetCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/instances/{instance}/reset")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "zone": c.zone,
-- "instance": c.instance,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Performs a hard reset on the instance.",
-- // "httpMethod": "POST",
-- // "id": "compute.instances.reset",
-- // "parameterOrder": [
-- // "project",
-- // "zone",
-- // "instance"
-- // ],
-- // "parameters": {
-- // "instance": {
-- // "description": "Name of the instance scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "zone": {
-- // "description": "Name of the zone scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/zones/{zone}/instances/{instance}/reset",
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
+- 500: Internal Server Error
-
--}
+-If the application logic could not process the request (or write the response) then use http.StatusInternalServerError.
-
--// method id "compute.instances.setDiskAutoDelete":
+- 405: Method Not Allowed
-
--type InstancesSetDiskAutoDeleteCall struct {
-- s *Service
-- project string
-- zone string
-- instance string
-- autoDelete bool
-- deviceName string
-- opt_ map[string]interface{}
--}
+-The request has a valid URL but the method (GET,PUT,POST,...) is not allowed.
-
--// SetDiskAutoDelete: Sets the auto-delete flag for a disk attached to
--// an instance
--func (r *InstancesService) SetDiskAutoDelete(project string, zone string, instance string, autoDelete bool, deviceName string) *InstancesSetDiskAutoDeleteCall {
-- c := &InstancesSetDiskAutoDeleteCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.zone = zone
-- c.instance = instance
-- c.autoDelete = autoDelete
-- c.deviceName = deviceName
-- return c
--}
+- 406: Not Acceptable
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *InstancesSetDiskAutoDeleteCall) Fields(s ...googleapi.Field) *InstancesSetDiskAutoDeleteCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
--}
+-The request does not have or has an unknown Accept Header set for this operation.
-
--func (c *InstancesSetDiskAutoDeleteCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- params.Set("autoDelete", fmt.Sprintf("%v", c.autoDelete))
-- params.Set("deviceName", fmt.Sprintf("%v", c.deviceName))
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/instances/{instance}/setDiskAutoDelete")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "zone": c.zone,
-- "instance": c.instance,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Sets the auto-delete flag for a disk attached to an instance",
-- // "httpMethod": "POST",
-- // "id": "compute.instances.setDiskAutoDelete",
-- // "parameterOrder": [
-- // "project",
-- // "zone",
-- // "instance",
-- // "autoDelete",
-- // "deviceName"
-- // ],
-- // "parameters": {
-- // "autoDelete": {
-- // "description": "Whether to auto-delete the disk when the instance is deleted.",
-- // "location": "query",
-- // "required": true,
-- // "type": "boolean"
-- // },
-- // "deviceName": {
-- // "description": "Disk device name to modify.",
-- // "location": "query",
-- // "pattern": "\\w[\\w.-]{0,254}",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "instance": {
-- // "description": "Instance name.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Project name.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "zone": {
-- // "description": "Name of the zone scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/zones/{zone}/instances/{instance}/setDiskAutoDelete",
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
+- 415: Unsupported Media Type
+-
+-The request does not have or has an unknown Content-Type Header set for this operation.
+-
+-ServiceError
+-
+-In addition to setting the correct (error) Http status code, you can choose to write a ServiceError message on the response.
+-
+-Performance options
+-
+-This package has several options that affect the performance of your service. It is important to understand them and how you can change it.
+-
+- restful.DefaultContainer.Router(CurlyRouter{})
+-
+-The default router is the RouterJSR311 which is an implementation of its spec (http://jsr311.java.net/nonav/releases/1.1/spec/spec.html).
+-However, it uses regular expressions for all its routes which, depending on your usecase, may consume a significant amount of time.
+-The CurlyRouter implementation is more lightweight that also allows you to use wildcards and expressions, but only if needed.
+-
+- restful.DefaultContainer.DoNotRecover(true)
+-
+-DoNotRecover controls whether panics will be caught to return HTTP 500.
+-If set to true, Route functions are responsible for handling any error situation.
+-Default value is false; it will recover from panics. This has performance implications.
+-
+- restful.SetCacheReadEntity(false)
+-
+-SetCacheReadEntity controls whether the response data ([]byte) is cached such that ReadEntity is repeatable.
+-If you expect to read large amounts of payload data, and you do not use this feature, you should set it to false.
+-
+-Trouble shooting
+-
+-This package has the means to produce detail logging of the complete Http request matching process and filter invocation.
+-Enabling this feature requires you to set a log.Logger instance such as:
+-
+- restful.TraceLogger(log.New(os.Stdout, "[restful] ", log.LstdFlags|log.Lshortfile))
-
+-Resources
+-
+-[project]: https://github.com/emicklei/go-restful
+-
+-[examples]: https://github.com/emicklei/go-restful/blob/master/examples
+-
+-[design]: http://ernestmicklei.com/2012/11/11/go-restful-api-design/
+-
+-[showcases]: https://github.com/emicklei/mora, https://github.com/emicklei/landskape
+-
+-(c) 2012-2014, http://ernestmicklei.com. MIT License
+-*/
+-package restful
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/doc_examples_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/doc_examples_test.go
+deleted file mode 100644
+index e1a2f3b..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/doc_examples_test.go
++++ /dev/null
+@@ -1,35 +0,0 @@
+-package restful
+-
+-import "net/http"
+-
+-func ExampleOPTIONSFilter() {
+- // Install the OPTIONS filter on the default Container
+- Filter(OPTIONSFilter())
+-}
+-func ExampleContainer_OPTIONSFilter() {
+- // Install the OPTIONS filter on a Container
+- myContainer := new(Container)
+- myContainer.Filter(myContainer.OPTIONSFilter)
-}
-
--// method id "compute.instances.setMetadata":
+-func ExampleContainer() {
+- // The Default container of go-restful uses the http.DefaultServeMux.
+- // You can create your own Container using restful.NewContainer() and create a new http.Server for that particular container
-
--type InstancesSetMetadataCall struct {
-- s *Service
-- project string
-- zone string
-- instance string
-- metadata *Metadata
-- opt_ map[string]interface{}
+- ws := new(WebService)
+- wsContainer := NewContainer()
+- wsContainer.Add(ws)
+- server := &http.Server{Addr: ":8080", Handler: wsContainer}
+- server.ListenAndServe()
-}
-
--// SetMetadata: Sets metadata for the specified instance to the data
--// included in the request.
--func (r *InstancesService) SetMetadata(project string, zone string, instance string, metadata *Metadata) *InstancesSetMetadataCall {
-- c := &InstancesSetMetadataCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.zone = zone
-- c.instance = instance
-- c.metadata = metadata
-- return c
+-func ExampleCrossOriginResourceSharing() {
+- // To install this filter on the Default Container use:
+- cors := CrossOriginResourceSharing{ExposeHeaders: []string{"X-My-Header"}, CookiesAllowed: false, Container: DefaultContainer}
+- Filter(cors.Filter)
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *InstancesSetMetadataCall) Fields(s ...googleapi.Field) *InstancesSetMetadataCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func ExampleServiceError() {
+- resp := new(Response)
+- resp.WriteEntity(NewError(http.StatusBadRequest, "Non-integer {id} path parameter"))
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/.goconvey b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/.goconvey
+deleted file mode 100644
+index 8485e98..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/.goconvey
++++ /dev/null
+@@ -1 +0,0 @@
+-ignore
+\ No newline at end of file
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/.goconvey b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/.goconvey
+deleted file mode 100644
+index 8485e98..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/.goconvey
++++ /dev/null
+@@ -1 +0,0 @@
+-ignore
+\ No newline at end of file
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/app.yaml b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/app.yaml
+deleted file mode 100644
+index 362db6b..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/app.yaml
++++ /dev/null
+@@ -1,20 +0,0 @@
+-#
+-# Include your application ID here
+-#
+-application: <your_app_id>
+-version: 1
+-runtime: go
+-api_version: go1
-
--func (c *InstancesSetMetadataCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.metadata)
-- if err != nil {
-- return nil, err
-- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/instances/{instance}/setMetadata")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "zone": c.zone,
-- "instance": c.instance,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Sets metadata for the specified instance to the data included in the request.",
-- // "httpMethod": "POST",
-- // "id": "compute.instances.setMetadata",
-- // "parameterOrder": [
-- // "project",
-- // "zone",
-- // "instance"
-- // ],
-- // "parameters": {
-- // "instance": {
-- // "description": "Name of the instance scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "zone": {
-- // "description": "Name of the zone scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/zones/{zone}/instances/{instance}/setMetadata",
-- // "request": {
-- // "$ref": "Metadata"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
+-handlers:
+-#
+-# Regex for all swagger files to make as static content.
+-# You should create the folder static/swagger and copy
+-# swagger-ui into it.
+-#
+-- url: /apidocs/(.*?)/(.*\.(js|html|css))
+- static_files: static/swagger/\1/\2
+- upload: static/swagger/(.*?)/(.*\.(js|html|css))
-
--}
+-- url: /.*
+- script: _go_app
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/datastore/.goconvey b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/datastore/.goconvey
+deleted file mode 100644
+index 8485e98..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/datastore/.goconvey
++++ /dev/null
+@@ -1 +0,0 @@
+-ignore
+\ No newline at end of file
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/datastore/app.yaml b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/datastore/app.yaml
+deleted file mode 100644
+index 33883d1..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/datastore/app.yaml
++++ /dev/null
+@@ -1,18 +0,0 @@
+-application: datastore-example
+-version: 1
+-runtime: go
+-api_version: go1
-
--// method id "compute.instances.setScheduling":
+-handlers:
+-# Regex for all swagger files to make as static content.
+-# You should create the folder static/swagger and copy
+-# swagger-ui into it.
+-#
+-- url: /apidocs/(.*?)/(.*\.(js|html|css))
+- static_files: static/swagger/\1/\2
+- upload: static/swagger/(.*?)/(.*\.(js|html|css))
-
--type InstancesSetSchedulingCall struct {
-- s *Service
-- project string
-- zone string
-- instance string
-- scheduling *Scheduling
-- opt_ map[string]interface{}
--}
+-# Catch all.
+-- url: /.*
+- script: _go_app
+- login: required
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/datastore/main.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/datastore/main.go
+deleted file mode 100644
+index cf832ef..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/datastore/main.go
++++ /dev/null
+@@ -1,266 +0,0 @@
+-package main
-
--// SetScheduling: Sets an instance's scheduling options.
--func (r *InstancesService) SetScheduling(project string, zone string, instance string, scheduling *Scheduling) *InstancesSetSchedulingCall {
-- c := &InstancesSetSchedulingCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.zone = zone
-- c.instance = instance
-- c.scheduling = scheduling
-- return c
+-import (
+- "appengine"
+- "appengine/datastore"
+- "appengine/user"
+- "github.com/emicklei/go-restful"
+- "github.com/emicklei/go-restful/swagger"
+- "net/http"
+- "time"
+-)
+-
+-// This example demonstrates a reasonably complete suite of RESTful operations backed
+-// by DataStore on Google App Engine.
+-
+-// Our simple example struct.
+-type Profile struct {
+- LastModified time.Time `json:"-" xml:"-"`
+- Email string `json:"-" xml:"-"`
+- FirstName string `json:"first_name" xml:"first-name"`
+- NickName string `json:"nick_name" xml:"nick-name"`
+- LastName string `json:"last_name" xml:"last-name"`
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *InstancesSetSchedulingCall) Fields(s ...googleapi.Field) *InstancesSetSchedulingCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-type ProfileApi struct {
+- Path string
-}
-
--func (c *InstancesSetSchedulingCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.scheduling)
-- if err != nil {
-- return nil, err
-- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/instances/{instance}/setScheduling")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "zone": c.zone,
-- "instance": c.instance,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-func gaeUrl() string {
+- if appengine.IsDevAppServer() {
+- return "http://localhost:8080"
+- } else {
+- // Include your URL on App Engine here.
+- // I found no way to get AppID without appengine.Context and this always
+- // based on a http.Request.
+- return "http://federatedservices.appspot.com"
- }
-- return ret, nil
-- // {
-- // "description": "Sets an instance's scheduling options.",
-- // "httpMethod": "POST",
-- // "id": "compute.instances.setScheduling",
-- // "parameterOrder": [
-- // "project",
-- // "zone",
-- // "instance"
-- // ],
-- // "parameters": {
-- // "instance": {
-- // "description": "Instance name.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Project name.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "zone": {
-- // "description": "Name of the zone scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/zones/{zone}/instances/{instance}/setScheduling",
-- // "request": {
-- // "$ref": "Scheduling"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
--
-}
-
--// method id "compute.instances.setTags":
+-func init() {
+- u := ProfileApi{Path: "/profiles"}
+- u.register()
-
--type InstancesSetTagsCall struct {
-- s *Service
-- project string
-- zone string
-- instance string
-- tags *Tags
-- opt_ map[string]interface{}
--}
+- // Optionally, you can install the Swagger Service which provides a nice Web UI on your REST API
+- // You need to download the Swagger HTML5 assets and change the FilePath location in the config below.
+- // Open <your_app_id>.appspot.com/apidocs and enter
+- // Place the Swagger UI files into a folder called static/swagger if you wish to use Swagger
+- // http://<your_app_id>.appspot.com/apidocs.json in the api input field.
+- // For testing, you can use http://localhost:8080/apidocs.json
+- config := swagger.Config{
+- // You control what services are visible
+- WebServices: restful.RegisteredWebServices(),
+- WebServicesUrl: gaeUrl(),
+- ApiPath: "/apidocs.json",
-
--// SetTags: Sets tags for the specified instance to the data included in
--// the request.
--func (r *InstancesService) SetTags(project string, zone string, instance string, tags *Tags) *InstancesSetTagsCall {
-- c := &InstancesSetTagsCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.zone = zone
-- c.instance = instance
-- c.tags = tags
-- return c
--}
+- // Optionally, specifiy where the UI is located
+- SwaggerPath: "/apidocs/",
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *InstancesSetTagsCall) Fields(s ...googleapi.Field) *InstancesSetTagsCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+- // GAE support static content which is configured in your app.yaml.
+- // This example expect the swagger-ui in static/swagger so you should place it there :)
+- SwaggerFilePath: "static/swagger"}
+- swagger.InstallSwaggerService(config)
-}
-
--func (c *InstancesSetTagsCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.tags)
-- if err != nil {
-- return nil, err
-- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/instances/{instance}/setTags")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "zone": c.zone,
-- "instance": c.instance,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Sets tags for the specified instance to the data included in the request.",
-- // "httpMethod": "POST",
-- // "id": "compute.instances.setTags",
-- // "parameterOrder": [
-- // "project",
-- // "zone",
-- // "instance"
-- // ],
-- // "parameters": {
-- // "instance": {
-- // "description": "Name of the instance scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "zone": {
-- // "description": "Name of the zone scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/zones/{zone}/instances/{instance}/setTags",
-- // "request": {
-- // "$ref": "Tags"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
+-func (u ProfileApi) register() {
+- ws := new(restful.WebService)
-
--}
+- ws.
+- Path(u.Path).
+- // You can specify consumes and produces per route as well.
+- Consumes(restful.MIME_JSON, restful.MIME_XML).
+- Produces(restful.MIME_JSON, restful.MIME_XML)
-
--// method id "compute.licenses.get":
+- ws.Route(ws.POST("").To(u.insert).
+- // Swagger documentation.
+- Doc("insert a new profile").
+- Param(ws.BodyParameter("Profile", "representation of a profile").DataType("main.Profile")).
+- Reads(Profile{}))
-
--type LicensesGetCall struct {
-- s *Service
-- project string
-- license string
-- opt_ map[string]interface{}
--}
+- ws.Route(ws.GET("/{profile-id}").To(u.read).
+- // Swagger documentation.
+- Doc("read a profile").
+- Param(ws.PathParameter("profile-id", "identifier for a profile").DataType("string")).
+- Writes(Profile{}))
-
--// Get: Returns the specified license resource.
--func (r *LicensesService) Get(project string, license string) *LicensesGetCall {
-- c := &LicensesGetCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.license = license
-- return c
--}
+- ws.Route(ws.PUT("/{profile-id}").To(u.update).
+- // Swagger documentation.
+- Doc("update an existing profile").
+- Param(ws.PathParameter("profile-id", "identifier for a profile").DataType("string")).
+- Param(ws.BodyParameter("Profile", "representation of a profile").DataType("main.Profile")).
+- Reads(Profile{}))
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *LicensesGetCall) Fields(s ...googleapi.Field) *LicensesGetCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+- ws.Route(ws.DELETE("/{profile-id}").To(u.remove).
+- // Swagger documentation.
+- Doc("remove a profile").
+- Param(ws.PathParameter("profile-id", "identifier for a profile").DataType("string")))
+-
+- restful.Add(ws)
-}
-
--func (c *LicensesGetCall) Do() (*License, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/licenses/{license}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "license": c.license,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+-// POST http://localhost:8080/profiles
+-// {"first_name": "Ivan", "nick_name": "Socks", "last_name": "Hawkes"}
+-//
+-func (u *ProfileApi) insert(r *restful.Request, w *restful.Response) {
+- c := appengine.NewContext(r.Request)
+-
+- // Marshall the entity from the request into a struct.
+- p := new(Profile)
+- err := r.ReadEntity(&p)
- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *License
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- w.WriteError(http.StatusNotAcceptable, err)
+- return
- }
-- return ret, nil
-- // {
-- // "description": "Returns the specified license resource.",
-- // "httpMethod": "GET",
-- // "id": "compute.licenses.get",
-- // "parameterOrder": [
-- // "project",
-- // "license"
-- // ],
-- // "parameters": {
-- // "license": {
-- // "description": "Name of the license resource to return.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/licenses/{license}",
-- // "response": {
-- // "$ref": "License"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
--
--}
--
--// method id "compute.machineTypes.aggregatedList":
-
--type MachineTypesAggregatedListCall struct {
-- s *Service
-- project string
-- opt_ map[string]interface{}
--}
+- // Ensure we start with a sensible value for this field.
+- p.LastModified = time.Now()
-
--// AggregatedList: Retrieves the list of machine type resources grouped
--// by scope.
--func (r *MachineTypesService) AggregatedList(project string) *MachineTypesAggregatedListCall {
-- c := &MachineTypesAggregatedListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- return c
--}
+- // The profile belongs to this user.
+- p.Email = user.Current(c).String()
-
--// Filter sets the optional parameter "filter": Filter expression for
--// filtering listed resources.
--func (c *MachineTypesAggregatedListCall) Filter(filter string) *MachineTypesAggregatedListCall {
-- c.opt_["filter"] = filter
-- return c
--}
+- k, err := datastore.Put(c, datastore.NewIncompleteKey(c, "profiles", nil), p)
+- if err != nil {
+- http.Error(w, err.Error(), http.StatusInternalServerError)
+- return
+- }
-
--// MaxResults sets the optional parameter "maxResults": Maximum count of
--// results to be returned. Maximum value is 500 and default value is
--// 500.
--func (c *MachineTypesAggregatedListCall) MaxResults(maxResults int64) *MachineTypesAggregatedListCall {
-- c.opt_["maxResults"] = maxResults
-- return c
--}
+- // Let them know the location of the newly created resource.
+- // TODO: Use a safe Url path append function.
+- w.AddHeader("Location", u.Path+"/"+k.Encode())
-
--// PageToken sets the optional parameter "pageToken": Tag returned by a
--// previous list request truncated by maxResults. Used to continue a
--// previous list request.
--func (c *MachineTypesAggregatedListCall) PageToken(pageToken string) *MachineTypesAggregatedListCall {
-- c.opt_["pageToken"] = pageToken
-- return c
+- // Return the resultant entity.
+- w.WriteHeader(http.StatusCreated)
+- w.WriteEntity(p)
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *MachineTypesAggregatedListCall) Fields(s ...googleapi.Field) *MachineTypesAggregatedListCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
--}
+-// GET http://localhost:8080/profiles/ahdkZXZ-ZmVkZXJhdGlvbi1zZXJ2aWNlc3IVCxIIcHJvZmlsZXMYgICAgICAgAoM
+-//
+-func (u ProfileApi) read(r *restful.Request, w *restful.Response) {
+- c := appengine.NewContext(r.Request)
-
--func (c *MachineTypesAggregatedListCall) Do() (*MachineTypeAggregatedList, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["filter"]; ok {
-- params.Set("filter", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["maxResults"]; ok {
-- params.Set("maxResults", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["pageToken"]; ok {
-- params.Set("pageToken", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/aggregated/machineTypes")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+- // Decode the request parameter to determine the key for the entity.
+- k, err := datastore.DecodeKey(r.PathParameter("profile-id"))
- if err != nil {
-- return nil, err
+- http.Error(w, err.Error(), http.StatusBadRequest)
+- return
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+-
+- // Retrieve the entity from the datastore.
+- p := Profile{}
+- if err := datastore.Get(c, k, &p); err != nil {
+- if err.Error() == "datastore: no such entity" {
+- http.Error(w, err.Error(), http.StatusNotFound)
+- } else {
+- http.Error(w, err.Error(), http.StatusInternalServerError)
+- }
+- return
- }
-- var ret *MachineTypeAggregatedList
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-
+- // Check we own the profile before allowing them to view it.
+- // Optionally, return a 404 instead to help prevent guessing ids.
+- // TODO: Allow admins access.
+- if p.Email != user.Current(c).String() {
+- http.Error(w, "You do not have access to this resource", http.StatusForbidden)
+- return
+- }
+-
+- w.WriteEntity(p)
+-}
+-
+-// PUT http://localhost:8080/profiles/ahdkZXZ-ZmVkZXJhdGlvbi1zZXJ2aWNlc3IVCxIIcHJvZmlsZXMYgICAgICAgAoM
+-// {"first_name": "Ivan", "nick_name": "Socks", "last_name": "Hawkes"}
+-//
+-func (u *ProfileApi) update(r *restful.Request, w *restful.Response) {
+- c := appengine.NewContext(r.Request)
+-
+- // Decode the request parameter to determine the key for the entity.
+- k, err := datastore.DecodeKey(r.PathParameter("profile-id"))
+- if err != nil {
+- http.Error(w, err.Error(), http.StatusBadRequest)
+- return
- }
-- return ret, nil
-- // {
-- // "description": "Retrieves the list of machine type resources grouped by scope.",
-- // "httpMethod": "GET",
-- // "id": "compute.machineTypes.aggregatedList",
-- // "parameterOrder": [
-- // "project"
-- // ],
-- // "parameters": {
-- // "filter": {
-- // "description": "Optional. Filter expression for filtering listed resources.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "maxResults": {
-- // "default": "500",
-- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
-- // "format": "uint32",
-- // "location": "query",
-- // "maximum": "500",
-- // "minimum": "0",
-- // "type": "integer"
-- // },
-- // "pageToken": {
-- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/aggregated/machineTypes",
-- // "response": {
-- // "$ref": "MachineTypeAggregatedList"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
-
--}
+- // Marshall the entity from the request into a struct.
+- p := new(Profile)
+- err = r.ReadEntity(&p)
+- if err != nil {
+- w.WriteError(http.StatusNotAcceptable, err)
+- return
+- }
-
--// method id "compute.machineTypes.get":
+- // Retrieve the old entity from the datastore.
+- old := Profile{}
+- if err := datastore.Get(c, k, &old); err != nil {
+- if err.Error() == "datastore: no such entity" {
+- http.Error(w, err.Error(), http.StatusNotFound)
+- } else {
+- http.Error(w, err.Error(), http.StatusInternalServerError)
+- }
+- return
+- }
-
--type MachineTypesGetCall struct {
-- s *Service
-- project string
-- zone string
-- machineType string
-- opt_ map[string]interface{}
--}
+- // Check we own the profile before allowing them to update it.
+- // Optionally, return a 404 instead to help prevent guessing ids.
+- // TODO: Allow admins access.
+- if old.Email != user.Current(c).String() {
+- http.Error(w, "You do not have access to this resource", http.StatusForbidden)
+- return
+- }
-
--// Get: Returns the specified machine type resource.
--func (r *MachineTypesService) Get(project string, zone string, machineType string) *MachineTypesGetCall {
-- c := &MachineTypesGetCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.zone = zone
-- c.machineType = machineType
-- return c
--}
+- // Since the whole entity is re-written, we need to assign any invariant fields again
+- // e.g. the owner of the entity.
+- p.Email = user.Current(c).String()
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *MachineTypesGetCall) Fields(s ...googleapi.Field) *MachineTypesGetCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
--}
+- // Keep track of the last modification date.
+- p.LastModified = time.Now()
-
--func (c *MachineTypesGetCall) Do() (*MachineType, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+- // Attempt to overwrite the old entity.
+- _, err = datastore.Put(c, k, p)
+- if err != nil {
+- http.Error(w, err.Error(), http.StatusInternalServerError)
+- return
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/machineTypes/{machineType}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "zone": c.zone,
-- "machineType": c.machineType,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+-
+- // Let them know it succeeded.
+- w.WriteHeader(http.StatusNoContent)
+-}
+-
+-// DELETE http://localhost:8080/profiles/ahdkZXZ-ZmVkZXJhdGlvbi1zZXJ2aWNlc3IVCxIIcHJvZmlsZXMYgICAgICAgAoM
+-//
+-func (u *ProfileApi) remove(r *restful.Request, w *restful.Response) {
+- c := appengine.NewContext(r.Request)
+-
+- // Decode the request parameter to determine the key for the entity.
+- k, err := datastore.DecodeKey(r.PathParameter("profile-id"))
- if err != nil {
-- return nil, err
+- http.Error(w, err.Error(), http.StatusBadRequest)
+- return
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+-
+- // Retrieve the old entity from the datastore.
+- old := Profile{}
+- if err := datastore.Get(c, k, &old); err != nil {
+- if err.Error() == "datastore: no such entity" {
+- http.Error(w, err.Error(), http.StatusNotFound)
+- } else {
+- http.Error(w, err.Error(), http.StatusInternalServerError)
+- }
+- return
- }
-- var ret *MachineType
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-
+- // Check we own the profile before allowing them to delete it.
+- // Optionally, return a 404 instead to help prevent guessing ids.
+- // TODO: Allow admins access.
+- if old.Email != user.Current(c).String() {
+- http.Error(w, "You do not have access to this resource", http.StatusForbidden)
+- return
+- }
+-
+- // Delete the entity.
+- if err := datastore.Delete(c, k); err != nil {
+- http.Error(w, err.Error(), http.StatusInternalServerError)
- }
-- return ret, nil
-- // {
-- // "description": "Returns the specified machine type resource.",
-- // "httpMethod": "GET",
-- // "id": "compute.machineTypes.get",
-- // "parameterOrder": [
-- // "project",
-- // "zone",
-- // "machineType"
-- // ],
-- // "parameters": {
-- // "machineType": {
-- // "description": "Name of the machine type resource to return.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "zone": {
-- // "description": "Name of the zone scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/zones/{zone}/machineTypes/{machineType}",
-- // "response": {
-- // "$ref": "MachineType"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
-
+- // Success notification.
+- w.WriteHeader(http.StatusNoContent)
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/restful-appstats-integration.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/restful-appstats-integration.go
+deleted file mode 100644
+index b3261ee..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/restful-appstats-integration.go
++++ /dev/null
+@@ -1,13 +0,0 @@
+-package main
-
--// method id "compute.machineTypes.list":
+-import (
+- "github.com/mjibson/appstats"
+-)
-
--type MachineTypesListCall struct {
-- s *Service
-- project string
-- zone string
-- opt_ map[string]interface{}
--}
-
--// List: Retrieves the list of machine type resources available to the
--// specified project.
--func (r *MachineTypesService) List(project string, zone string) *MachineTypesListCall {
-- c := &MachineTypesListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.zone = zone
-- return c
+-func stats(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
+- c := appstats.NewContext(req.Request)
+- chain.ProcessFilter(req, resp)
+- c.Stats.Status = resp.StatusCode()
+- c.Save()
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/restful-user-service.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/restful-user-service.go
+deleted file mode 100644
+index e97ba2e..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/restful-user-service.go
++++ /dev/null
+@@ -1,161 +0,0 @@
+-package main
-
--// Filter sets the optional parameter "filter": Filter expression for
--// filtering listed resources.
--func (c *MachineTypesListCall) Filter(filter string) *MachineTypesListCall {
-- c.opt_["filter"] = filter
-- return c
--}
+-import (
+- "appengine"
+- "appengine/memcache"
+- "github.com/emicklei/go-restful"
+- "github.com/emicklei/go-restful/swagger"
+- "net/http"
+-)
-
--// MaxResults sets the optional parameter "maxResults": Maximum count of
--// results to be returned. Maximum value is 500 and default value is
--// 500.
--func (c *MachineTypesListCall) MaxResults(maxResults int64) *MachineTypesListCall {
-- c.opt_["maxResults"] = maxResults
-- return c
+-// This example is functionally the same as ../restful-user-service.go
+-// but it`s supposed to run on Goole App Engine (GAE)
+-//
+-// contributed by ivanhawkes
+-
+-type User struct {
+- Id, Name string
-}
-
--// PageToken sets the optional parameter "pageToken": Tag returned by a
--// previous list request truncated by maxResults. Used to continue a
--// previous list request.
--func (c *MachineTypesListCall) PageToken(pageToken string) *MachineTypesListCall {
-- c.opt_["pageToken"] = pageToken
-- return c
+-type UserService struct {
+- // normally one would use DAO (data access object)
+- // but in this example we simple use memcache.
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *MachineTypesListCall) Fields(s ...googleapi.Field) *MachineTypesListCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func (u UserService) Register() {
+- ws := new(restful.WebService)
+-
+- ws.
+- Path("/users").
+- Consumes(restful.MIME_XML, restful.MIME_JSON).
+- Produces(restful.MIME_JSON, restful.MIME_XML) // you can specify this per route as well
+-
+- ws.Route(ws.GET("/{user-id}").To(u.findUser).
+- // docs
+- Doc("get a user").
+- Param(ws.PathParameter("user-id", "identifier of the user").DataType("string")).
+- Writes(User{})) // on the response
+-
+- ws.Route(ws.PATCH("").To(u.updateUser).
+- // docs
+- Doc("update a user").
+- Reads(User{})) // from the request
+-
+- ws.Route(ws.PUT("/{user-id}").To(u.createUser).
+- // docs
+- Doc("create a user").
+- Param(ws.PathParameter("user-id", "identifier of the user").DataType("string")).
+- Reads(User{})) // from the request
+-
+- ws.Route(ws.DELETE("/{user-id}").To(u.removeUser).
+- // docs
+- Doc("delete a user").
+- Param(ws.PathParameter("user-id", "identifier of the user").DataType("string")))
+-
+- restful.Add(ws)
-}
-
--func (c *MachineTypesListCall) Do() (*MachineTypeList, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["filter"]; ok {
-- params.Set("filter", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["maxResults"]; ok {
-- params.Set("maxResults", fmt.Sprintf("%v", v))
+-// GET http://localhost:8080/users/1
+-//
+-func (u UserService) findUser(request *restful.Request, response *restful.Response) {
+- c := appengine.NewContext(request.Request)
+- id := request.PathParameter("user-id")
+- usr := new(User)
+- _, err := memcache.Gob.Get(c, id, &usr)
+- if err != nil || len(usr.Id) == 0 {
+- response.WriteErrorString(http.StatusNotFound, "User could not be found.")
+- } else {
+- response.WriteEntity(usr)
- }
-- if v, ok := c.opt_["pageToken"]; ok {
-- params.Set("pageToken", fmt.Sprintf("%v", v))
+-}
+-
+-// PATCH http://localhost:8080/users
+-// <User><Id>1</Id><Name>Melissa Raspberry</Name></User>
+-//
+-func (u *UserService) updateUser(request *restful.Request, response *restful.Response) {
+- c := appengine.NewContext(request.Request)
+- usr := new(User)
+- err := request.ReadEntity(&usr)
+- if err == nil {
+- item := &memcache.Item{
+- Key: usr.Id,
+- Object: &usr,
+- }
+- err = memcache.Gob.Set(c, item)
+- if err != nil {
+- response.WriteError(http.StatusInternalServerError, err)
+- return
+- }
+- response.WriteEntity(usr)
+- } else {
+- response.WriteError(http.StatusInternalServerError, err)
- }
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+-}
+-
+-// PUT http://localhost:8080/users/1
+-// <User><Id>1</Id><Name>Melissa</Name></User>
+-//
+-func (u *UserService) createUser(request *restful.Request, response *restful.Response) {
+- c := appengine.NewContext(request.Request)
+- usr := User{Id: request.PathParameter("user-id")}
+- err := request.ReadEntity(&usr)
+- if err == nil {
+- item := &memcache.Item{
+- Key: usr.Id,
+- Object: &usr,
+- }
+- err = memcache.Gob.Add(c, item)
+- if err != nil {
+- response.WriteError(http.StatusInternalServerError, err)
+- return
+- }
+- response.WriteHeader(http.StatusCreated)
+- response.WriteEntity(usr)
+- } else {
+- response.WriteError(http.StatusInternalServerError, err)
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/machineTypes")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "zone": c.zone,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+-}
+-
+-// DELETE http://localhost:8080/users/1
+-//
+-func (u *UserService) removeUser(request *restful.Request, response *restful.Response) {
+- c := appengine.NewContext(request.Request)
+- id := request.PathParameter("user-id")
+- err := memcache.Delete(c, id)
- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *MachineTypeList
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- response.WriteError(http.StatusInternalServerError, err)
- }
-- return ret, nil
-- // {
-- // "description": "Retrieves the list of machine type resources available to the specified project.",
-- // "httpMethod": "GET",
-- // "id": "compute.machineTypes.list",
-- // "parameterOrder": [
-- // "project",
-- // "zone"
-- // ],
-- // "parameters": {
-- // "filter": {
-- // "description": "Optional. Filter expression for filtering listed resources.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "maxResults": {
-- // "default": "500",
-- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
-- // "format": "uint32",
-- // "location": "query",
-- // "maximum": "500",
-- // "minimum": "0",
-- // "type": "integer"
-- // },
-- // "pageToken": {
-- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "zone": {
-- // "description": "Name of the zone scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/zones/{zone}/machineTypes",
-- // "response": {
-- // "$ref": "MachineTypeList"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
+-}
-
+-func getGaeURL() string {
+- if appengine.IsDevAppServer() {
+- return "http://localhost:8080"
+- } else {
+- /**
+- * Include your URL on App Engine here.
+- * I found no way to get AppID without appengine.Context and this always
+- * based on a http.Request.
+- */
+- return "http://<your_app_id>.appspot.com"
+- }
-}
-
--// method id "compute.networks.delete":
+-func init() {
+- u := UserService{}
+- u.Register()
-
--type NetworksDeleteCall struct {
-- s *Service
-- project string
-- network string
-- opt_ map[string]interface{}
+- // Optionally, you can install the Swagger Service which provides a nice Web UI on your REST API
+- // You need to download the Swagger HTML5 assets and change the FilePath location in the config below.
+- // Open <your_app_id>.appspot.com/apidocs and enter http://<your_app_id>.appspot.com/apidocs.json in the api input field.
+- config := swagger.Config{
+- WebServices: restful.RegisteredWebServices(), // you control what services are visible
+- WebServicesUrl: getGaeURL(),
+- ApiPath: "/apidocs.json",
+-
+- // Optionally, specifiy where the UI is located
+- SwaggerPath: "/apidocs/",
+- // GAE support static content which is configured in your app.yaml.
+- // This example expect the swagger-ui in static/swagger so you should place it there :)
+- SwaggerFilePath: "static/swagger"}
+- swagger.InstallSwaggerService(config)
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/home.html b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/home.html
+deleted file mode 100644
+index e5d49b4..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/home.html
++++ /dev/null
+@@ -1,7 +0,0 @@
+-<!DOCTYPE html>
+-
+-<html>
+-<body>
+- <h1>{{.Text}}</h1>
+-</body>
+-</html>
+\ No newline at end of file
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-CORS-filter.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-CORS-filter.go
+deleted file mode 100644
+index aacaa3d..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-CORS-filter.go
++++ /dev/null
+@@ -1,67 +0,0 @@
+-package main
+-
+-import (
+- "io"
+- "log"
+- "net/http"
+-
+- "github.com/emicklei/go-restful"
+-)
+-
+-// Cross-origin resource sharing (CORS) is a mechanism that allows JavaScript on a web page
+-// to make XMLHttpRequests to another domain, not the domain the JavaScript originated from.
+-//
+-// http://en.wikipedia.org/wiki/Cross-origin_resource_sharing
+-// http://enable-cors.org/server.html
+-//
+-// GET http://localhost:8080/users
+-//
+-// GET http://localhost:8080/users/1
+-//
+-// PUT http://localhost:8080/users/1
+-//
+-// DELETE http://localhost:8080/users/1
+-//
+-// OPTIONS http://localhost:8080/users/1 with Header "Origin" set to some domain and
+-
+-type UserResource struct{}
+-
+-func (u UserResource) RegisterTo(container *restful.Container) {
+- ws := new(restful.WebService)
+- ws.
+- Path("/users").
+- Consumes("*/*").
+- Produces("*/*")
-
--// Delete: Deletes the specified network resource.
--func (r *NetworksService) Delete(project string, network string) *NetworksDeleteCall {
-- c := &NetworksDeleteCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.network = network
-- return c
--}
+- ws.Route(ws.GET("/{user-id}").To(u.nop))
+- ws.Route(ws.POST("").To(u.nop))
+- ws.Route(ws.PUT("/{user-id}").To(u.nop))
+- ws.Route(ws.DELETE("/{user-id}").To(u.nop))
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *NetworksDeleteCall) Fields(s ...googleapi.Field) *NetworksDeleteCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+- container.Add(ws)
-}
-
--func (c *NetworksDeleteCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/networks/{network}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("DELETE", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "network": c.network,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Deletes the specified network resource.",
-- // "httpMethod": "DELETE",
-- // "id": "compute.networks.delete",
-- // "parameterOrder": [
-- // "project",
-- // "network"
-- // ],
-- // "parameters": {
-- // "network": {
-- // "description": "Name of the network resource to delete.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/networks/{network}",
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
--
+-func (u UserResource) nop(request *restful.Request, response *restful.Response) {
+- io.WriteString(response.ResponseWriter, "this would be a normal response")
-}
-
--// method id "compute.networks.get":
+-func main() {
+- wsContainer := restful.NewContainer()
+- u := UserResource{}
+- u.RegisterTo(wsContainer)
-
--type NetworksGetCall struct {
-- s *Service
-- project string
-- network string
-- opt_ map[string]interface{}
--}
+- // Add container filter to enable CORS
+- cors := restful.CrossOriginResourceSharing{
+- ExposeHeaders: []string{"X-My-Header"},
+- AllowedHeaders: []string{"Content-Type"},
+- CookiesAllowed: false,
+- Container: wsContainer}
+- wsContainer.Filter(cors.Filter)
-
--// Get: Returns the specified network resource.
--func (r *NetworksService) Get(project string, network string) *NetworksGetCall {
-- c := &NetworksGetCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.network = network
-- return c
--}
+- // Add container filter to respond to OPTIONS
+- wsContainer.Filter(wsContainer.OPTIONSFilter)
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *NetworksGetCall) Fields(s ...googleapi.Field) *NetworksGetCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+- log.Printf("start listening on localhost:8080")
+- server := &http.Server{Addr: ":8080", Handler: wsContainer}
+- log.Fatal(server.ListenAndServe())
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-NCSA-logging.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-NCSA-logging.go
+deleted file mode 100644
+index 0cda50d..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-NCSA-logging.go
++++ /dev/null
+@@ -1,54 +0,0 @@
+-package main
-
--func (c *NetworksGetCall) Do() (*Network, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/networks/{network}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "network": c.network,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Network
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Returns the specified network resource.",
-- // "httpMethod": "GET",
-- // "id": "compute.networks.get",
-- // "parameterOrder": [
-- // "project",
-- // "network"
-- // ],
-- // "parameters": {
-- // "network": {
-- // "description": "Name of the network resource to return.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/networks/{network}",
-- // "response": {
-- // "$ref": "Network"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
+-import (
+- "github.com/emicklei/go-restful"
+- "io"
+- "log"
+- "net/http"
+- "os"
+- "strings"
+- "time"
+-)
-
--}
+-// This example shows how to create a filter that produces log lines
+-// according to the Common Log Format, also known as the NCSA standard.
+-//
+-// kindly contributed by leehambley
+-//
+-// GET http://localhost:8080/ping
-
--// method id "compute.networks.insert":
+-var logger *log.Logger = log.New(os.Stdout, "", 0)
-
--type NetworksInsertCall struct {
-- s *Service
-- project string
-- network *Network
-- opt_ map[string]interface{}
+-func NCSACommonLogFormatLogger() restful.FilterFunction {
+- return func(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
+- var username = "-"
+- if req.Request.URL.User != nil {
+- if name := req.Request.URL.User.Username(); name != "" {
+- username = name
+- }
+- }
+- chain.ProcessFilter(req, resp)
+- logger.Printf("%s - %s [%s] \"%s %s %s\" %d %d",
+- strings.Split(req.Request.RemoteAddr, ":")[0],
+- username,
+- time.Now().Format("02/Jan/2006:15:04:05 -0700"),
+- req.Request.Method,
+- req.Request.URL.RequestURI(),
+- req.Request.Proto,
+- resp.StatusCode(),
+- resp.ContentLength(),
+- )
+- }
-}
-
--// Insert: Creates a network resource in the specified project using the
--// data included in the request.
--func (r *NetworksService) Insert(project string, network *Network) *NetworksInsertCall {
-- c := &NetworksInsertCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.network = network
-- return c
+-func main() {
+- ws := new(restful.WebService)
+- ws.Filter(NCSACommonLogFormatLogger())
+- ws.Route(ws.GET("/ping").To(hello))
+- restful.Add(ws)
+- http.ListenAndServe(":8080", nil)
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *NetworksInsertCall) Fields(s ...googleapi.Field) *NetworksInsertCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func hello(req *restful.Request, resp *restful.Response) {
+- io.WriteString(resp, "pong")
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-basic-authentication.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-basic-authentication.go
+deleted file mode 100644
+index 5dd3067..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-basic-authentication.go
++++ /dev/null
+@@ -1,35 +0,0 @@
+-package main
-
--func (c *NetworksInsertCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.network)
-- if err != nil {
-- return nil, err
-- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/networks")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Creates a network resource in the specified project using the data included in the request.",
-- // "httpMethod": "POST",
-- // "id": "compute.networks.insert",
-- // "parameterOrder": [
-- // "project"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/networks",
-- // "request": {
-- // "$ref": "Network"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
--
--}
+-import (
+- "github.com/emicklei/go-restful"
+- "io"
+- "net/http"
+-)
-
--// method id "compute.networks.list":
+-// This example shows how to create a (Route) Filter that performs Basic Authentication on the Http request.
+-//
+-// GET http://localhost:8080/secret
+-// and use admin,admin for the credentials
-
--type NetworksListCall struct {
-- s *Service
-- project string
-- opt_ map[string]interface{}
+-func main() {
+- ws := new(restful.WebService)
+- ws.Route(ws.GET("/secret").Filter(basicAuthenticate).To(secret))
+- restful.Add(ws)
+- http.ListenAndServe(":8080", nil)
-}
-
--// List: Retrieves the list of network resources available to the
--// specified project.
--func (r *NetworksService) List(project string) *NetworksListCall {
-- c := &NetworksListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- return c
+-func basicAuthenticate(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
+- encoded := req.Request.Header.Get("Authorization")
+- // usr/pwd = admin/admin
+- // real code does some decoding
+- if len(encoded) == 0 || "Basic YWRtaW46YWRtaW4=" != encoded {
+- resp.AddHeader("WWW-Authenticate", "Basic realm=Protected Area")
+- resp.WriteErrorString(401, "401: Not Authorized")
+- return
+- }
+- chain.ProcessFilter(req, resp)
-}
-
--// Filter sets the optional parameter "filter": Filter expression for
--// filtering listed resources.
--func (c *NetworksListCall) Filter(filter string) *NetworksListCall {
-- c.opt_["filter"] = filter
-- return c
+-func secret(req *restful.Request, resp *restful.Response) {
+- io.WriteString(resp, "42")
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-cpuprofiler-service.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-cpuprofiler-service.go
+deleted file mode 100644
+index 9148213..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-cpuprofiler-service.go
++++ /dev/null
+@@ -1,65 +0,0 @@
+-package main
-
--// MaxResults sets the optional parameter "maxResults": Maximum count of
--// results to be returned. Maximum value is 500 and default value is
--// 500.
--func (c *NetworksListCall) MaxResults(maxResults int64) *NetworksListCall {
-- c.opt_["maxResults"] = maxResults
-- return c
+-import (
+- "github.com/emicklei/go-restful"
+- "io"
+- "log"
+- "os"
+- "runtime/pprof"
+-)
+-
+-// ProfilingService is a WebService that can start/stop a CPU profile and write results to a file
+-// GET /{rootPath}/start will activate CPU profiling
+-// GET /{rootPath}/stop will stop profiling
+-//
+-// NewProfileService("/profiler", "ace.prof").AddWebServiceTo(restful.DefaultContainer)
+-//
+-type ProfilingService struct {
+- rootPath string // the base (root) of the service, e.g. /profiler
+- cpuprofile string // the output filename to write profile results, e.g. myservice.prof
+- cpufile *os.File // if not nil, then profiling is active
-}
-
--// PageToken sets the optional parameter "pageToken": Tag returned by a
--// previous list request truncated by maxResults. Used to continue a
--// previous list request.
--func (c *NetworksListCall) PageToken(pageToken string) *NetworksListCall {
-- c.opt_["pageToken"] = pageToken
-- return c
+-func NewProfileService(rootPath string, outputFilename string) *ProfilingService {
+- ps := new(ProfilingService)
+- ps.rootPath = rootPath
+- ps.cpuprofile = outputFilename
+- return ps
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *NetworksListCall) Fields(s ...googleapi.Field) *NetworksListCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-// Add this ProfileService to a restful Container
+-func (p ProfilingService) AddWebServiceTo(container *restful.Container) {
+- ws := new(restful.WebService)
+- ws.Path(p.rootPath).Consumes("*/*").Produces(restful.MIME_JSON)
+- ws.Route(ws.GET("/start").To(p.startProfiler))
+- ws.Route(ws.GET("/stop").To(p.stopProfiler))
+- container.Add(ws)
-}
-
--func (c *NetworksListCall) Do() (*NetworkList, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["filter"]; ok {
-- params.Set("filter", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["maxResults"]; ok {
-- params.Set("maxResults", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["pageToken"]; ok {
-- params.Set("pageToken", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+-func (p *ProfilingService) startProfiler(req *restful.Request, resp *restful.Response) {
+- if p.cpufile != nil {
+- io.WriteString(resp.ResponseWriter, "[restful] CPU profiling already running")
+- return // error?
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/networks")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+- cpufile, err := os.Create(p.cpuprofile)
- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *NetworkList
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- log.Fatal(err)
- }
-- return ret, nil
-- // {
-- // "description": "Retrieves the list of network resources available to the specified project.",
-- // "httpMethod": "GET",
-- // "id": "compute.networks.list",
-- // "parameterOrder": [
-- // "project"
-- // ],
-- // "parameters": {
-- // "filter": {
-- // "description": "Optional. Filter expression for filtering listed resources.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "maxResults": {
-- // "default": "500",
-- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
-- // "format": "uint32",
-- // "location": "query",
-- // "maximum": "500",
-- // "minimum": "0",
-- // "type": "integer"
-- // },
-- // "pageToken": {
-- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/networks",
-- // "response": {
-- // "$ref": "NetworkList"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
+- // remember for close
+- p.cpufile = cpufile
+- pprof.StartCPUProfile(cpufile)
+- io.WriteString(resp.ResponseWriter, "[restful] CPU profiling started, writing on:"+p.cpuprofile)
+-}
-
+-func (p *ProfilingService) stopProfiler(req *restful.Request, resp *restful.Response) {
+- if p.cpufile == nil {
+- io.WriteString(resp.ResponseWriter, "[restful] CPU profiling not active")
+- return // error?
+- }
+- pprof.StopCPUProfile()
+- p.cpufile.Close()
+- p.cpufile = nil
+- io.WriteString(resp.ResponseWriter, "[restful] CPU profiling stopped, closing:"+p.cpuprofile)
-}
-
--// method id "compute.projects.get":
+-func main() {} // exists for example compilation only
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-curly-router.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-curly-router.go
+deleted file mode 100644
+index 1b95dd0..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-curly-router.go
++++ /dev/null
+@@ -1,107 +0,0 @@
+-package main
-
--type ProjectsGetCall struct {
-- s *Service
-- project string
-- opt_ map[string]interface{}
+-import (
+- "github.com/emicklei/go-restful"
+- "log"
+- "net/http"
+-)
+-
+-// This example has the same service definition as restful-user-resource
+-// but uses a different router (CurlyRouter) that does not use regular expressions
+-//
+-// POST http://localhost:8080/users
+-// <User><Id>1</Id><Name>Melissa Raspberry</Name></User>
+-//
+-// GET http://localhost:8080/users/1
+-//
+-// PUT http://localhost:8080/users/1
+-// <User><Id>1</Id><Name>Melissa</Name></User>
+-//
+-// DELETE http://localhost:8080/users/1
+-//
+-
+-type User struct {
+- Id, Name string
-}
-
--// Get: Returns the specified project resource.
--func (r *ProjectsService) Get(project string) *ProjectsGetCall {
-- c := &ProjectsGetCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- return c
+-type UserResource struct {
+- // normally one would use DAO (data access object)
+- users map[string]User
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *ProjectsGetCall) Fields(s ...googleapi.Field) *ProjectsGetCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func (u UserResource) Register(container *restful.Container) {
+- ws := new(restful.WebService)
+- ws.
+- Path("/users").
+- Consumes(restful.MIME_XML, restful.MIME_JSON).
+- Produces(restful.MIME_JSON, restful.MIME_XML) // you can specify this per route as well
+-
+- ws.Route(ws.GET("/{user-id}").To(u.findUser))
+- ws.Route(ws.POST("").To(u.updateUser))
+- ws.Route(ws.PUT("/{user-id}").To(u.createUser))
+- ws.Route(ws.DELETE("/{user-id}").To(u.removeUser))
+-
+- container.Add(ws)
-}
-
--func (c *ProjectsGetCall) Do() (*Project, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
+-// GET http://localhost:8080/users/1
+-//
+-func (u UserResource) findUser(request *restful.Request, response *restful.Response) {
+- id := request.PathParameter("user-id")
+- usr := u.users[id]
+- if len(usr.Id) == 0 {
+- response.AddHeader("Content-Type", "text/plain")
+- response.WriteErrorString(http.StatusNotFound, "User could not be found.")
+- } else {
+- response.WriteEntity(usr)
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+-}
+-
+-// POST http://localhost:8080/users
+-// <User><Id>1</Id><Name>Melissa Raspberry</Name></User>
+-//
+-func (u *UserResource) updateUser(request *restful.Request, response *restful.Response) {
+- usr := new(User)
+- err := request.ReadEntity(&usr)
+- if err == nil {
+- u.users[usr.Id] = *usr
+- response.WriteEntity(usr)
+- } else {
+- response.AddHeader("Content-Type", "text/plain")
+- response.WriteErrorString(http.StatusInternalServerError, err.Error())
- }
-- var ret *Project
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-}
+-
+-// PUT http://localhost:8080/users/1
+-// <User><Id>1</Id><Name>Melissa</Name></User>
+-//
+-func (u *UserResource) createUser(request *restful.Request, response *restful.Response) {
+- usr := User{Id: request.PathParameter("user-id")}
+- err := request.ReadEntity(&usr)
+- if err == nil {
+- u.users[usr.Id] = usr
+- response.WriteHeader(http.StatusCreated)
+- response.WriteEntity(usr)
+- } else {
+- response.AddHeader("Content-Type", "text/plain")
+- response.WriteErrorString(http.StatusInternalServerError, err.Error())
- }
-- return ret, nil
-- // {
-- // "description": "Returns the specified project resource.",
-- // "httpMethod": "GET",
-- // "id": "compute.projects.get",
-- // "parameterOrder": [
-- // "project"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project resource to retrieve.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}",
-- // "response": {
-- // "$ref": "Project"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
+-}
-
+-// DELETE http://localhost:8080/users/1
+-//
+-func (u *UserResource) removeUser(request *restful.Request, response *restful.Response) {
+- id := request.PathParameter("user-id")
+- delete(u.users, id)
-}
-
--// method id "compute.projects.setCommonInstanceMetadata":
+-func main() {
+- wsContainer := restful.NewContainer()
+- wsContainer.Router(restful.CurlyRouter{})
+- u := UserResource{map[string]User{}}
+- u.Register(wsContainer)
-
--type ProjectsSetCommonInstanceMetadataCall struct {
-- s *Service
-- project string
-- metadata *Metadata
-- opt_ map[string]interface{}
+- log.Printf("start listening on localhost:8080")
+- server := &http.Server{Addr: ":8080", Handler: wsContainer}
+- log.Fatal(server.ListenAndServe())
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-encoding-filter.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-encoding-filter.go
+deleted file mode 100644
+index 6094c49..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-encoding-filter.go
++++ /dev/null
+@@ -1,61 +0,0 @@
+-package main
-
--// SetCommonInstanceMetadata: Sets metadata common to all instances
--// within the specified project using the data included in the request.
--func (r *ProjectsService) SetCommonInstanceMetadata(project string, metadata *Metadata) *ProjectsSetCommonInstanceMetadataCall {
-- c := &ProjectsSetCommonInstanceMetadataCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.metadata = metadata
-- return c
+-import (
+- "github.com/emicklei/go-restful"
+- "log"
+- "net/http"
+-)
+-
+-type User struct {
+- Id, Name string
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *ProjectsSetCommonInstanceMetadataCall) Fields(s ...googleapi.Field) *ProjectsSetCommonInstanceMetadataCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-type UserList struct {
+- Users []User
-}
-
--func (c *ProjectsSetCommonInstanceMetadataCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.metadata)
-- if err != nil {
-- return nil, err
-- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/setCommonInstanceMetadata")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Sets metadata common to all instances within the specified project using the data included in the request.",
-- // "httpMethod": "POST",
-- // "id": "compute.projects.setCommonInstanceMetadata",
-- // "parameterOrder": [
-- // "project"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/setCommonInstanceMetadata",
-- // "request": {
-- // "$ref": "Metadata"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
+-//
+-// This example shows how to use the CompressingResponseWriter by a Filter
+-// such that encoding can be enabled per WebService or per Route (instead of per container)
+-// Using restful.DefaultContainer.EnableContentEncoding(true) will encode all responses served by WebServices in the DefaultContainer.
+-//
+-// Set Accept-Encoding to gzip or deflate
+-// GET http://localhost:8080/users/42
+-// and look at the response headers
-
+-func main() {
+- restful.Add(NewUserService())
+- log.Printf("start listening on localhost:8080")
+- log.Fatal(http.ListenAndServe(":8080", nil))
-}
-
--// method id "compute.projects.setUsageExportBucket":
+-func NewUserService() *restful.WebService {
+- ws := new(restful.WebService)
+- ws.
+- Path("/users").
+- Consumes(restful.MIME_XML, restful.MIME_JSON).
+- Produces(restful.MIME_JSON, restful.MIME_XML)
-
--type ProjectsSetUsageExportBucketCall struct {
-- s *Service
-- project string
-- usageexportlocation *UsageExportLocation
-- opt_ map[string]interface{}
+- // install a response encoding filter
+- ws.Route(ws.GET("/{user-id}").Filter(encodingFilter).To(findUser))
+- return ws
-}
-
--// SetUsageExportBucket: Sets usage export location
--func (r *ProjectsService) SetUsageExportBucket(project string, usageexportlocation *UsageExportLocation) *ProjectsSetUsageExportBucketCall {
-- c := &ProjectsSetUsageExportBucketCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.usageexportlocation = usageexportlocation
-- return c
+-// Route Filter (defines FilterFunction)
+-func encodingFilter(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
+- log.Printf("[encoding-filter] %s,%s\n", req.Request.Method, req.Request.URL)
+- // wrap responseWriter into a compressing one
+- compress, _ := restful.NewCompressingResponseWriter(resp.ResponseWriter, restful.ENCODING_GZIP)
+- resp.ResponseWriter = compress
+- defer func() {
+- compress.Close()
+- }()
+- chain.ProcessFilter(req, resp)
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *ProjectsSetUsageExportBucketCall) Fields(s ...googleapi.Field) *ProjectsSetUsageExportBucketCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-// GET http://localhost:8080/users/42
+-//
+-func findUser(request *restful.Request, response *restful.Response) {
+- log.Printf("findUser")
+- response.WriteEntity(User{"42", "Gandalf"})
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-filters.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-filters.go
+deleted file mode 100644
+index 47e1146..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-filters.go
++++ /dev/null
+@@ -1,114 +0,0 @@
+-package main
-
--func (c *ProjectsSetUsageExportBucketCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.usageexportlocation)
-- if err != nil {
-- return nil, err
-- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/setUsageExportBucket")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Sets usage export location",
-- // "httpMethod": "POST",
-- // "id": "compute.projects.setUsageExportBucket",
-- // "parameterOrder": [
-- // "project"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/setUsageExportBucket",
-- // "request": {
-- // "$ref": "UsageExportLocation"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/devstorage.full_control",
-- // "https://www.googleapis.com/auth/devstorage.read_only",
-- // "https://www.googleapis.com/auth/devstorage.read_write"
-- // ]
-- // }
+-import (
+- "github.com/emicklei/go-restful"
+- "log"
+- "net/http"
+- "time"
+-)
-
+-type User struct {
+- Id, Name string
-}
-
--// method id "compute.regionOperations.delete":
+-type UserList struct {
+- Users []User
+-}
-
--type RegionOperationsDeleteCall struct {
-- s *Service
-- project string
-- region string
-- operation string
-- opt_ map[string]interface{}
+-// This example show how to create and use the three different Filters (Container,WebService and Route)
+-// When applied to the restful.DefaultContainer, we refer to them as a global filter.
+-//
+-// GET http://locahost:8080/users/42
+-// and see the logging per filter (try repeating this request)
+-
+-func main() {
+- // install a global (=DefaultContainer) filter (processed before any webservice in the DefaultContainer)
+- restful.Filter(globalLogging)
+-
+- restful.Add(NewUserService())
+- log.Printf("start listening on localhost:8080")
+- log.Fatal(http.ListenAndServe(":8080", nil))
-}
-
--// Delete: Deletes the specified region-specific operation resource.
--func (r *RegionOperationsService) Delete(project string, region string, operation string) *RegionOperationsDeleteCall {
-- c := &RegionOperationsDeleteCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.region = region
-- c.operation = operation
-- return c
+-func NewUserService() *restful.WebService {
+- ws := new(restful.WebService)
+- ws.
+- Path("/users").
+- Consumes(restful.MIME_XML, restful.MIME_JSON).
+- Produces(restful.MIME_JSON, restful.MIME_XML)
+-
+- // install a webservice filter (processed before any route)
+- ws.Filter(webserviceLogging).Filter(measureTime)
+-
+- // install a counter filter
+- ws.Route(ws.GET("").Filter(NewCountFilter().routeCounter).To(getAllUsers))
+-
+- // install 2 chained route filters (processed before calling findUser)
+- ws.Route(ws.GET("/{user-id}").Filter(routeLogging).Filter(NewCountFilter().routeCounter).To(findUser))
+- return ws
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *RegionOperationsDeleteCall) Fields(s ...googleapi.Field) *RegionOperationsDeleteCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-// Global Filter
+-func globalLogging(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
+- log.Printf("[global-filter (logger)] %s,%s\n", req.Request.Method, req.Request.URL)
+- chain.ProcessFilter(req, resp)
-}
-
--func (c *RegionOperationsDeleteCall) Do() error {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/operations/{operation}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("DELETE", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "region": c.region,
-- "operation": c.operation,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return err
-- }
-- return nil
-- // {
-- // "description": "Deletes the specified region-specific operation resource.",
-- // "httpMethod": "DELETE",
-- // "id": "compute.regionOperations.delete",
-- // "parameterOrder": [
-- // "project",
-- // "region",
-- // "operation"
-- // ],
-- // "parameters": {
-- // "operation": {
-- // "description": "Name of the operation resource to delete.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "region": {
-- // "description": "Name of the region scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/regions/{region}/operations/{operation}",
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
+-// WebService Filter
+-func webserviceLogging(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
+- log.Printf("[webservice-filter (logger)] %s,%s\n", req.Request.Method, req.Request.URL)
+- chain.ProcessFilter(req, resp)
+-}
-
+-// WebService (post-process) Filter (as a struct that defines a FilterFunction)
+-func measureTime(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
+- now := time.Now()
+- chain.ProcessFilter(req, resp)
+- log.Printf("[webservice-filter (timer)] %v\n", time.Now().Sub(now))
-}
-
--// method id "compute.regionOperations.get":
+-// Route Filter (defines FilterFunction)
+-func routeLogging(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
+- log.Printf("[route-filter (logger)] %s,%s\n", req.Request.Method, req.Request.URL)
+- chain.ProcessFilter(req, resp)
+-}
-
--type RegionOperationsGetCall struct {
-- s *Service
-- project string
-- region string
-- operation string
-- opt_ map[string]interface{}
+-// Route Filter (as a struct that defines a FilterFunction)
+-// CountFilter implements a FilterFunction for counting requests.
+-type CountFilter struct {
+- count int
+- counter chan int // for go-routine safe count increments
-}
-
--// Get: Retrieves the specified region-specific operation resource.
--func (r *RegionOperationsService) Get(project string, region string, operation string) *RegionOperationsGetCall {
-- c := &RegionOperationsGetCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.region = region
-- c.operation = operation
+-// NewCountFilter creates and initializes a new CountFilter.
+-func NewCountFilter() *CountFilter {
+- c := new(CountFilter)
+- c.counter = make(chan int)
+- go func() {
+- for {
+- c.count += <-c.counter
+- }
+- }()
- return c
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *RegionOperationsGetCall) Fields(s ...googleapi.Field) *RegionOperationsGetCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-// routeCounter increments the count of the filter (through a channel)
+-func (c *CountFilter) routeCounter(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
+- c.counter <- 1
+- log.Printf("[route-filter (counter)] count:%d", c.count)
+- chain.ProcessFilter(req, resp)
-}
-
--func (c *RegionOperationsGetCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/operations/{operation}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "region": c.region,
-- "operation": c.operation,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+-// GET http://localhost:8080/users
+-//
+-func getAllUsers(request *restful.Request, response *restful.Response) {
+- log.Printf("getAllUsers")
+- response.WriteEntity(UserList{[]User{User{"42", "Gandalf"}, User{"3.14", "Pi"}}})
+-}
+-
+-// GET http://localhost:8080/users/42
+-//
+-func findUser(request *restful.Request, response *restful.Response) {
+- log.Printf("findUser")
+- response.WriteEntity(User{"42", "Gandalf"})
+-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-form-handling.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-form-handling.go
+deleted file mode 100644
+index a83db44..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-form-handling.go
++++ /dev/null
+@@ -1,62 +0,0 @@
+-package main
+-
+-import (
+- "fmt"
+- "github.com/emicklei/go-restful"
+- "github.com/gorilla/schema"
+- "io"
+- "net/http"
+-)
+-
+-// This example shows how to handle a POST of a HTML form that uses the standard x-www-form-urlencoded content-type.
+-// It uses the gorilla web tool kit schema package to decode the form data into a struct.
+-//
+-// GET http://localhost:8080/profiles
+-//
+-
+-type Profile struct {
+- Name string
+- Age int
+-}
+-
+-var decoder *schema.Decoder
+-
+-func main() {
+- decoder = schema.NewDecoder()
+- ws := new(restful.WebService)
+- ws.Route(ws.POST("/profiles").Consumes("application/x-www-form-urlencoded").To(postAdddress))
+- ws.Route(ws.GET("/profiles").To(addresssForm))
+- restful.Add(ws)
+- http.ListenAndServe(":8080", nil)
+-}
+-
+-func postAdddress(req *restful.Request, resp *restful.Response) {
+- err := req.Request.ParseForm()
- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- resp.WriteErrorString(http.StatusBadRequest, err.Error())
+- return
- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- p := new(Profile)
+- err = decoder.Decode(p, req.Request.PostForm)
+- if err != nil {
+- resp.WriteErrorString(http.StatusBadRequest, err.Error())
+- return
- }
-- return ret, nil
-- // {
-- // "description": "Retrieves the specified region-specific operation resource.",
-- // "httpMethod": "GET",
-- // "id": "compute.regionOperations.get",
-- // "parameterOrder": [
-- // "project",
-- // "region",
-- // "operation"
-- // ],
-- // "parameters": {
-- // "operation": {
-- // "description": "Name of the operation resource to return.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "region": {
-- // "description": "Name of the zone scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/regions/{region}/operations/{operation}",
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
+- io.WriteString(resp.ResponseWriter, fmt.Sprintf("<html><body>Name=%s, Age=%d</body></html>", p.Name, p.Age))
+-}
-
+-func addresssForm(req *restful.Request, resp *restful.Response) {
+- io.WriteString(resp.ResponseWriter,
+- `<html>
+- <body>
+- <h1>Enter Profile</h1>
+- <form method="post">
+- <label>Name:</label>
+- <input type="text" name="Name"/>
+- <label>Age:</label>
+- <input type="text" name="Age"/>
+- <input type="Submit" />
+- </form>
+- </body>
+- </html>`)
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-hello-world.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-hello-world.go
+deleted file mode 100644
+index a21c2a6..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-hello-world.go
++++ /dev/null
+@@ -1,22 +0,0 @@
+-package main
-
--// method id "compute.regionOperations.list":
+-import (
+- "github.com/emicklei/go-restful"
+- "io"
+- "net/http"
+-)
-
--type RegionOperationsListCall struct {
-- s *Service
-- project string
-- region string
-- opt_ map[string]interface{}
--}
+-// This example shows the minimal code needed to get a restful.WebService working.
+-//
+-// GET http://localhost:8080/hello
-
--// List: Retrieves the list of operation resources contained within the
--// specified region.
--func (r *RegionOperationsService) List(project string, region string) *RegionOperationsListCall {
-- c := &RegionOperationsListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.region = region
-- return c
+-func main() {
+- ws := new(restful.WebService)
+- ws.Route(ws.GET("/hello").To(hello))
+- restful.Add(ws)
+- http.ListenAndServe(":8080", nil)
-}
-
--// Filter sets the optional parameter "filter": Filter expression for
--// filtering listed resources.
--func (c *RegionOperationsListCall) Filter(filter string) *RegionOperationsListCall {
-- c.opt_["filter"] = filter
-- return c
+-func hello(req *restful.Request, resp *restful.Response) {
+- io.WriteString(resp, "world")
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-html-template.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-html-template.go
+deleted file mode 100644
+index de51c59..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-html-template.go
++++ /dev/null
+@@ -1,35 +0,0 @@
+-package main
-
--// MaxResults sets the optional parameter "maxResults": Maximum count of
--// results to be returned. Maximum value is 500 and default value is
--// 500.
--func (c *RegionOperationsListCall) MaxResults(maxResults int64) *RegionOperationsListCall {
-- c.opt_["maxResults"] = maxResults
-- return c
--}
+-import (
+- "log"
+- "net/http"
+- "text/template"
-
--// PageToken sets the optional parameter "pageToken": Tag returned by a
--// previous list request truncated by maxResults. Used to continue a
--// previous list request.
--func (c *RegionOperationsListCall) PageToken(pageToken string) *RegionOperationsListCall {
-- c.opt_["pageToken"] = pageToken
-- return c
+- "github.com/emicklei/go-restful"
+-)
+-
+-// This example shows how to serve a HTML page using the standard Go template engine.
+-//
+-// GET http://localhost:8080/
+-
+-func main() {
+- ws := new(restful.WebService)
+- ws.Route(ws.GET("/").To(home))
+- restful.Add(ws)
+- print("open browser on http://localhost:8080/\n")
+- http.ListenAndServe(":8080", nil)
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *RegionOperationsListCall) Fields(s ...googleapi.Field) *RegionOperationsListCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-type Message struct {
+- Text string
-}
-
--func (c *RegionOperationsListCall) Do() (*OperationList, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["filter"]; ok {
-- params.Set("filter", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["maxResults"]; ok {
-- params.Set("maxResults", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["pageToken"]; ok {
-- params.Set("pageToken", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/operations")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "region": c.region,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+-func home(req *restful.Request, resp *restful.Response) {
+- p := &Message{"restful-html-template demo"}
+- // you might want to cache compiled templates
+- t, err := template.ParseFiles("home.html")
- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *OperationList
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- log.Fatalf("Template gave: %s", err)
- }
-- return ret, nil
-- // {
-- // "description": "Retrieves the list of operation resources contained within the specified region.",
-- // "httpMethod": "GET",
-- // "id": "compute.regionOperations.list",
-- // "parameterOrder": [
-- // "project",
-- // "region"
-- // ],
-- // "parameters": {
-- // "filter": {
-- // "description": "Optional. Filter expression for filtering listed resources.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "maxResults": {
-- // "default": "500",
-- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
-- // "format": "uint32",
-- // "location": "query",
-- // "maximum": "500",
-- // "minimum": "0",
-- // "type": "integer"
-- // },
-- // "pageToken": {
-- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "region": {
-- // "description": "Name of the region scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/regions/{region}/operations",
-- // "response": {
-- // "$ref": "OperationList"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
--
+- t.Execute(resp.ResponseWriter, p)
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-multi-containers.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-multi-containers.go
+deleted file mode 100644
+index 3f1650b..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-multi-containers.go
++++ /dev/null
+@@ -1,43 +0,0 @@
+-package main
-
--// method id "compute.regions.get":
+-import (
+- "github.com/emicklei/go-restful"
+- "io"
+- "log"
+- "net/http"
+-)
-
--type RegionsGetCall struct {
-- s *Service
-- project string
-- region string
-- opt_ map[string]interface{}
+-// This example shows how to have a program with 2 WebServices containers
+-// each having a http server listening on its own port.
+-//
+-// The first "hello" is added to the restful.DefaultContainer (and uses DefaultServeMux)
+-// For the second "hello", a new container and ServeMux is created
+-// and requires a new http.Server with the container being the Handler.
+-// This first server is spawn in its own go-routine such that the program proceeds to create the second.
+-//
+-// GET http://localhost:8080/hello
+-// GET http://localhost:8081/hello
+-
+-func main() {
+- ws := new(restful.WebService)
+- ws.Route(ws.GET("/hello").To(hello))
+- restful.Add(ws)
+- go func() {
+- http.ListenAndServe(":8080", nil)
+- }()
+-
+- container2 := restful.NewContainer()
+- ws2 := new(restful.WebService)
+- ws2.Route(ws2.GET("/hello").To(hello2))
+- container2.Add(ws2)
+- server := &http.Server{Addr: ":8081", Handler: container2}
+- log.Fatal(server.ListenAndServe())
-}
-
--// Get: Returns the specified region resource.
--func (r *RegionsService) Get(project string, region string) *RegionsGetCall {
-- c := &RegionsGetCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.region = region
-- return c
+-func hello(req *restful.Request, resp *restful.Response) {
+- io.WriteString(resp, "default world")
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *RegionsGetCall) Fields(s ...googleapi.Field) *RegionsGetCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func hello2(req *restful.Request, resp *restful.Response) {
+- io.WriteString(resp, "second world")
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-options-filter.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-options-filter.go
+deleted file mode 100644
+index 73dc3cf..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-options-filter.go
++++ /dev/null
+@@ -1,51 +0,0 @@
+-package main
-
--func (c *RegionsGetCall) Do() (*Region, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "region": c.region,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Region
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Returns the specified region resource.",
-- // "httpMethod": "GET",
-- // "id": "compute.regions.get",
-- // "parameterOrder": [
-- // "project",
-- // "region"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "region": {
-- // "description": "Name of the region resource to return.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/regions/{region}",
-- // "response": {
-- // "$ref": "Region"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
+-import (
+- "github.com/emicklei/go-restful"
+- "io"
+- "log"
+- "net/http"
+-)
+-
+-// This example shows how to use the OPTIONSFilter on a Container
+-//
+-// OPTIONS http://localhost:8080/users
+-//
+-// OPTIONS http://localhost:8080/users/1
-
--}
+-type UserResource struct{}
-
--// method id "compute.regions.list":
+-func (u UserResource) RegisterTo(container *restful.Container) {
+- ws := new(restful.WebService)
+- ws.
+- Path("/users").
+- Consumes("*/*").
+- Produces("*/*")
-
--type RegionsListCall struct {
-- s *Service
-- project string
-- opt_ map[string]interface{}
--}
+- ws.Route(ws.GET("/{user-id}").To(u.nop))
+- ws.Route(ws.POST("").To(u.nop))
+- ws.Route(ws.PUT("/{user-id}").To(u.nop))
+- ws.Route(ws.DELETE("/{user-id}").To(u.nop))
-
--// List: Retrieves the list of region resources available to the
--// specified project.
--func (r *RegionsService) List(project string) *RegionsListCall {
-- c := &RegionsListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- return c
+- container.Add(ws)
-}
-
--// Filter sets the optional parameter "filter": Filter expression for
--// filtering listed resources.
--func (c *RegionsListCall) Filter(filter string) *RegionsListCall {
-- c.opt_["filter"] = filter
-- return c
+-func (u UserResource) nop(request *restful.Request, response *restful.Response) {
+- io.WriteString(response.ResponseWriter, "this would be a normal response")
-}
-
--// MaxResults sets the optional parameter "maxResults": Maximum count of
--// results to be returned. Maximum value is 500 and default value is
--// 500.
--func (c *RegionsListCall) MaxResults(maxResults int64) *RegionsListCall {
-- c.opt_["maxResults"] = maxResults
-- return c
--}
+-func main() {
+- wsContainer := restful.NewContainer()
+- u := UserResource{}
+- u.RegisterTo(wsContainer)
-
--// PageToken sets the optional parameter "pageToken": Tag returned by a
--// previous list request truncated by maxResults. Used to continue a
--// previous list request.
--func (c *RegionsListCall) PageToken(pageToken string) *RegionsListCall {
-- c.opt_["pageToken"] = pageToken
-- return c
--}
+- // Add container filter to respond to OPTIONS
+- wsContainer.Filter(wsContainer.OPTIONSFilter)
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *RegionsListCall) Fields(s ...googleapi.Field) *RegionsListCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+- // For use on the default container, you can write
+- // restful.Filter(restful.OPTIONSFilter())
+-
+- log.Printf("start listening on localhost:8080")
+- server := &http.Server{Addr: ":8080", Handler: wsContainer}
+- log.Fatal(server.ListenAndServe())
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-path-tail.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-path-tail.go
+deleted file mode 100644
+index 8488a23..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-path-tail.go
++++ /dev/null
+@@ -1,26 +0,0 @@
+-package main
-
--func (c *RegionsListCall) Do() (*RegionList, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["filter"]; ok {
-- params.Set("filter", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["maxResults"]; ok {
-- params.Set("maxResults", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["pageToken"]; ok {
-- params.Set("pageToken", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *RegionList
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Retrieves the list of region resources available to the specified project.",
-- // "httpMethod": "GET",
-- // "id": "compute.regions.list",
-- // "parameterOrder": [
-- // "project"
-- // ],
-- // "parameters": {
-- // "filter": {
-- // "description": "Optional. Filter expression for filtering listed resources.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "maxResults": {
-- // "default": "500",
-- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
-- // "format": "uint32",
-- // "location": "query",
-- // "maximum": "500",
-- // "minimum": "0",
-- // "type": "integer"
-- // },
-- // "pageToken": {
-- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/regions",
-- // "response": {
-- // "$ref": "RegionList"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
+-import (
+- "io"
+- "net/http"
+- . "github.com/emicklei/go-restful"
+-)
-
--}
+-// This example shows how to a Route that matches the "tail" of a path.
+-// Requires the use of a CurlyRouter and the star "*" path parameter pattern.
+-//
+-// GET http://localhost:8080/basepath/some/other/location/test.xml
-
--// method id "compute.routes.delete":
+-func main() {
+- DefaultContainer.Router(CurlyRouter{})
+- ws := new(WebService)
+- ws.Route(ws.GET("/basepath/{resource:*}").To(staticFromPathParam))
+- Add(ws)
-
--type RoutesDeleteCall struct {
-- s *Service
-- project string
-- route string
-- opt_ map[string]interface{}
+- println("[go-restful] serve path tails from http://localhost:8080/basepath")
+- http.ListenAndServe(":8080", nil)
-}
-
--// Delete: Deletes the specified route resource.
--func (r *RoutesService) Delete(project string, route string) *RoutesDeleteCall {
-- c := &RoutesDeleteCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.route = route
-- return c
+-func staticFromPathParam(req *Request, resp *Response) {
+- io.WriteString(resp, "Tail="+req.PathParameter("resource"))
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-pre-post-filters.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-pre-post-filters.go
+deleted file mode 100644
+index 0b55f14..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-pre-post-filters.go
++++ /dev/null
+@@ -1,98 +0,0 @@
+-package main
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *RoutesDeleteCall) Fields(s ...googleapi.Field) *RoutesDeleteCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
--}
+-import (
+- "github.com/emicklei/go-restful"
+- "io"
+- "log"
+- "net/http"
+-)
-
--func (c *RoutesDeleteCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/routes/{route}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("DELETE", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "route": c.route,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Deletes the specified route resource.",
-- // "httpMethod": "DELETE",
-- // "id": "compute.routes.delete",
-- // "parameterOrder": [
-- // "project",
-- // "route"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "route": {
-- // "description": "Name of the route resource to delete.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/routes/{route}",
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
+-// This example shows how the different types of filters are called in the request-response flow.
+-// The call chain is logged on the console when sending an http request.
+-//
+-// GET http://localhost:8080/1
+-// GET http://localhost:8080/2
+-
+-var indentLevel int
-
+-func container_filter_A(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
+- log.Printf("url path:%v\n", req.Request.URL)
+- trace("container_filter_A: before", 1)
+- chain.ProcessFilter(req, resp)
+- trace("container_filter_A: after", -1)
-}
-
--// method id "compute.routes.get":
+-func container_filter_B(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
+- trace("container_filter_B: before", 1)
+- chain.ProcessFilter(req, resp)
+- trace("container_filter_B: after", -1)
+-}
-
--type RoutesGetCall struct {
-- s *Service
-- project string
-- route string
-- opt_ map[string]interface{}
+-func service_filter_A(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
+- trace("service_filter_A: before", 1)
+- chain.ProcessFilter(req, resp)
+- trace("service_filter_A: after", -1)
-}
-
--// Get: Returns the specified route resource.
--func (r *RoutesService) Get(project string, route string) *RoutesGetCall {
-- c := &RoutesGetCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.route = route
-- return c
+-func service_filter_B(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
+- trace("service_filter_B: before", 1)
+- chain.ProcessFilter(req, resp)
+- trace("service_filter_B: after", -1)
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *RoutesGetCall) Fields(s ...googleapi.Field) *RoutesGetCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func route_filter_A(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
+- trace("route_filter_A: before", 1)
+- chain.ProcessFilter(req, resp)
+- trace("route_filter_A: after", -1)
-}
-
--func (c *RoutesGetCall) Do() (*Route, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/routes/{route}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "route": c.route,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
+-func route_filter_B(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
+- trace("route_filter_B: before", 1)
+- chain.ProcessFilter(req, resp)
+- trace("route_filter_B: after", -1)
+-}
+-
+-func trace(what string, delta int) {
+- indented := what
+- if delta < 0 {
+- indentLevel += delta
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- for t := 0; t < indentLevel; t++ {
+- indented = "." + indented
- }
-- var ret *Route
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- log.Printf("%s", indented)
+- if delta > 0 {
+- indentLevel += delta
- }
-- return ret, nil
-- // {
-- // "description": "Returns the specified route resource.",
-- // "httpMethod": "GET",
-- // "id": "compute.routes.get",
-- // "parameterOrder": [
-- // "project",
-- // "route"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "route": {
-- // "description": "Name of the route resource to return.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/routes/{route}",
-- // "response": {
-- // "$ref": "Route"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
--
-}
-
--// method id "compute.routes.insert":
+-func main() {
+- restful.Filter(container_filter_A)
+- restful.Filter(container_filter_B)
-
--type RoutesInsertCall struct {
-- s *Service
-- project string
-- route *Route
-- opt_ map[string]interface{}
+- ws1 := new(restful.WebService)
+- ws1.Path("/1")
+- ws1.Filter(service_filter_A)
+- ws1.Filter(service_filter_B)
+- ws1.Route(ws1.GET("").To(doit1).Filter(route_filter_A).Filter(route_filter_B))
+-
+- ws2 := new(restful.WebService)
+- ws2.Path("/2")
+- ws2.Filter(service_filter_A)
+- ws2.Filter(service_filter_B)
+- ws2.Route(ws2.GET("").To(doit2).Filter(route_filter_A).Filter(route_filter_B))
+-
+- restful.Add(ws1)
+- restful.Add(ws2)
+-
+- log.Print("go-restful example listing on http://localhost:8080/1 and http://localhost:8080/2")
+- log.Fatal(http.ListenAndServe(":8080", nil))
-}
-
--// Insert: Creates a route resource in the specified project using the
--// data included in the request.
--func (r *RoutesService) Insert(project string, route *Route) *RoutesInsertCall {
-- c := &RoutesInsertCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.route = route
-- return c
+-func doit1(req *restful.Request, resp *restful.Response) {
+- io.WriteString(resp, "nothing to see in 1")
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *RoutesInsertCall) Fields(s ...googleapi.Field) *RoutesInsertCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func doit2(req *restful.Request, resp *restful.Response) {
+- io.WriteString(resp, "nothing to see in 2")
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-resource-functions.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-resource-functions.go
+deleted file mode 100644
+index fb1012a..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-resource-functions.go
++++ /dev/null
+@@ -1,63 +0,0 @@
+-package main
-
--func (c *RoutesInsertCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.route)
-- if err != nil {
-- return nil, err
-- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/routes")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Creates a route resource in the specified project using the data included in the request.",
-- // "httpMethod": "POST",
-- // "id": "compute.routes.insert",
-- // "parameterOrder": [
-- // "project"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/routes",
-- // "request": {
-- // "$ref": "Route"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
+-import (
+- "github.com/emicklei/go-restful"
+- "log"
+- "net/http"
+-)
+-
+-// This example shows how to use methods as RouteFunctions for WebServices.
+-// The ProductResource has a Register() method that creates and initializes
+-// a WebService to expose its methods as REST operations.
+-// The WebService is added to the restful.DefaultContainer.
+-// A ProductResource is typically created using some data access object.
+-//
+-// GET http://localhost:8080/products/1
+-// POST http://localhost:8080/products
+-// <Product><Id>1</Id><Title>The First</Title></Product>
+-
+-type Product struct {
+- Id, Title string
+-}
-
+-type ProductResource struct {
+- // typically reference a DAO (data-access-object)
-}
-
--// method id "compute.routes.list":
+-func (p ProductResource) getOne(req *restful.Request, resp *restful.Response) {
+- id := req.PathParameter("id")
+- log.Println("getting product with id:" + id)
+- resp.WriteEntity(Product{Id: id, Title: "test"})
+-}
-
--type RoutesListCall struct {
-- s *Service
-- project string
-- opt_ map[string]interface{}
+-func (p ProductResource) postOne(req *restful.Request, resp *restful.Response) {
+- updatedProduct := new(Product)
+- err := req.ReadEntity(updatedProduct)
+- if err != nil { // bad request
+- resp.WriteErrorString(http.StatusBadRequest, err.Error())
+- return
+- }
+- log.Println("updating product with id:" + updatedProduct.Id)
-}
-
--// List: Retrieves the list of route resources available to the
--// specified project.
--func (r *RoutesService) List(project string) *RoutesListCall {
-- c := &RoutesListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- return c
+-func (p ProductResource) Register() {
+- ws := new(restful.WebService)
+- ws.Path("/products")
+- ws.Consumes(restful.MIME_XML)
+- ws.Produces(restful.MIME_XML)
+-
+- ws.Route(ws.GET("/{id}").To(p.getOne).
+- Doc("get the product by its id").
+- Param(ws.PathParameter("id", "identifier of the product").DataType("string")))
+-
+- ws.Route(ws.POST("").To(p.postOne).
+- Doc("update or create a product").
+- Param(ws.BodyParameter("Product", "a Product (XML)").DataType("main.Product")))
+-
+- restful.Add(ws)
-}
-
--// Filter sets the optional parameter "filter": Filter expression for
--// filtering listed resources.
--func (c *RoutesListCall) Filter(filter string) *RoutesListCall {
-- c.opt_["filter"] = filter
-- return c
+-func main() {
+- ProductResource{}.Register()
+- http.ListenAndServe(":8080", nil)
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-route_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-route_test.go
+deleted file mode 100644
+index 20c366b..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-route_test.go
++++ /dev/null
+@@ -1,39 +0,0 @@
+-package main
-
--// MaxResults sets the optional parameter "maxResults": Maximum count of
--// results to be returned. Maximum value is 500 and default value is
--// 500.
--func (c *RoutesListCall) MaxResults(maxResults int64) *RoutesListCall {
-- c.opt_["maxResults"] = maxResults
-- return c
+-import (
+- "net/http"
+- "net/http/httptest"
+- "strings"
+- "testing"
+-
+- "github.com/emicklei/go-restful"
+-)
+-
+-var (
+- Result string
+-)
+-
+-func TestRouteExtractParameter(t *testing.T) {
+- // setup service
+- ws := new(restful.WebService)
+- ws.Consumes(restful.MIME_XML)
+- ws.Route(ws.GET("/test/{param}").To(DummyHandler))
+- restful.Add(ws)
+-
+- // setup request + writer
+- bodyReader := strings.NewReader("<Sample><Value>42</Value></Sample>")
+- httpRequest, _ := http.NewRequest("GET", "/test/THIS", bodyReader)
+- httpRequest.Header.Set("Content-Type", restful.MIME_XML)
+- httpWriter := httptest.NewRecorder()
+-
+- // run
+- restful.DefaultContainer.ServeHTTP(httpWriter, httpRequest)
+-
+- if Result != "THIS" {
+- t.Fatalf("Result is actually: %s", Result)
+- }
-}
-
--// PageToken sets the optional parameter "pageToken": Tag returned by a
--// previous list request truncated by maxResults. Used to continue a
--// previous list request.
--func (c *RoutesListCall) PageToken(pageToken string) *RoutesListCall {
-- c.opt_["pageToken"] = pageToken
-- return c
+-func DummyHandler(rq *restful.Request, rp *restful.Response) {
+- Result = rq.PathParameter("param")
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-routefunction_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-routefunction_test.go
+deleted file mode 100644
+index 6d61c5c..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-routefunction_test.go
++++ /dev/null
+@@ -1,29 +0,0 @@
+-package main
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *RoutesListCall) Fields(s ...googleapi.Field) *RoutesListCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-import (
+- "net/http"
+- "net/http/httptest"
+- "testing"
+-
+- "github.com/emicklei/go-restful"
+-)
+-
+-// This example show how to test one particular RouteFunction (getIt)
+-// It uses the httptest.ResponseRecorder to capture output
+-
+-func getIt(req *restful.Request, resp *restful.Response) {
+- resp.WriteHeader(404)
-}
-
--func (c *RoutesListCall) Do() (*RouteList, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["filter"]; ok {
-- params.Set("filter", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["maxResults"]; ok {
-- params.Set("maxResults", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["pageToken"]; ok {
-- params.Set("pageToken", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/routes")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *RouteList
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Retrieves the list of route resources available to the specified project.",
-- // "httpMethod": "GET",
-- // "id": "compute.routes.list",
-- // "parameterOrder": [
-- // "project"
-- // ],
-- // "parameters": {
-- // "filter": {
-- // "description": "Optional. Filter expression for filtering listed resources.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "maxResults": {
-- // "default": "500",
-- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
-- // "format": "uint32",
-- // "location": "query",
-- // "maximum": "500",
-- // "minimum": "0",
-- // "type": "integer"
-- // },
-- // "pageToken": {
-- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/routes",
-- // "response": {
-- // "$ref": "RouteList"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
+-func TestCallFunction(t *testing.T) {
+- httpReq, _ := http.NewRequest("GET", "/", nil)
+- req := restful.NewRequest(httpReq)
+-
+- recorder := new(httptest.ResponseRecorder)
+- resp := restful.NewResponse(recoder)
-
+- getIt(req, resp)
+- if recorder.Code != 404 {
+- t.Logf("Missing or wrong status code:%d", recorder.Code)
+- }
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-serve-static.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-serve-static.go
+deleted file mode 100644
+index 8cb7848..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-serve-static.go
++++ /dev/null
+@@ -1,47 +0,0 @@
+-package main
-
--// method id "compute.snapshots.delete":
+-import (
+- "fmt"
+- "net/http"
+- "path"
-
--type SnapshotsDeleteCall struct {
-- s *Service
-- project string
-- snapshot string
-- opt_ map[string]interface{}
+- "github.com/emicklei/go-restful"
+-)
+-
+-// This example shows how to define methods that serve static files
+-// It uses the standard http.ServeFile method
+-//
+-// GET http://localhost:8080/static/test.xml
+-// GET http://localhost:8080/static/
+-//
+-// GET http://localhost:8080/static?resource=subdir/test.xml
+-
+-var rootdir = "/tmp"
+-
+-func main() {
+- restful.DefaultContainer.Router(restful.CurlyRouter{})
+-
+- ws := new(restful.WebService)
+- ws.Route(ws.GET("/static/{subpath:*}").To(staticFromPathParam))
+- ws.Route(ws.GET("/static").To(staticFromQueryParam))
+- restful.Add(ws)
+-
+- println("[go-restful] serving files on http://localhost:8080/static from local /tmp")
+- http.ListenAndServe(":8080", nil)
-}
-
--// Delete: Deletes the specified persistent disk snapshot resource.
--func (r *SnapshotsService) Delete(project string, snapshot string) *SnapshotsDeleteCall {
-- c := &SnapshotsDeleteCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.snapshot = snapshot
-- return c
+-func staticFromPathParam(req *restful.Request, resp *restful.Response) {
+- actual := path.Join(rootdir, req.PathParameter("subpath"))
+- fmt.Printf("serving %s ... (from %s)\n", actual, req.PathParameter("subpath"))
+- http.ServeFile(
+- resp.ResponseWriter,
+- req.Request,
+- actual)
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *SnapshotsDeleteCall) Fields(s ...googleapi.Field) *SnapshotsDeleteCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func staticFromQueryParam(req *restful.Request, resp *restful.Response) {
+- http.ServeFile(
+- resp.ResponseWriter,
+- req.Request,
+- path.Join(rootdir, req.QueryParameter("resource")))
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-user-resource.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-user-resource.go
+deleted file mode 100644
+index f6ec988..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-user-resource.go
++++ /dev/null
+@@ -1,153 +0,0 @@
+-package main
-
--func (c *SnapshotsDeleteCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/snapshots/{snapshot}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("DELETE", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "snapshot": c.snapshot,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Deletes the specified persistent disk snapshot resource.",
-- // "httpMethod": "DELETE",
-- // "id": "compute.snapshots.delete",
-- // "parameterOrder": [
-- // "project",
-- // "snapshot"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "snapshot": {
-- // "description": "Name of the persistent disk snapshot resource to delete.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/snapshots/{snapshot}",
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
+-import (
+- "log"
+- "net/http"
+- "strconv"
-
--}
+- "github.com/emicklei/go-restful"
+- "github.com/emicklei/go-restful/swagger"
+-)
-
--// method id "compute.snapshots.get":
+-// This example show a complete (GET,PUT,POST,DELETE) conventional example of
+-// a REST Resource including documentation to be served by e.g. a Swagger UI
+-// It is recommended to create a Resource struct (UserResource) that can encapsulate
+-// an object that provide domain access (a DAO)
+-// It has a Register method including the complete Route mapping to methods together
+-// with all the appropriate documentation
+-//
+-// POST http://localhost:8080/users
+-// <User><Id>1</Id><Name>Melissa Raspberry</Name></User>
+-//
+-// GET http://localhost:8080/users/1
+-//
+-// PUT http://localhost:8080/users/1
+-// <User><Id>1</Id><Name>Melissa</Name></User>
+-//
+-// DELETE http://localhost:8080/users/1
+-//
-
--type SnapshotsGetCall struct {
-- s *Service
-- project string
-- snapshot string
-- opt_ map[string]interface{}
+-type User struct {
+- Id, Name string
-}
-
--// Get: Returns the specified persistent disk snapshot resource.
--func (r *SnapshotsService) Get(project string, snapshot string) *SnapshotsGetCall {
-- c := &SnapshotsGetCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.snapshot = snapshot
-- return c
+-type UserResource struct {
+- // normally one would use DAO (data access object)
+- users map[string]User
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *SnapshotsGetCall) Fields(s ...googleapi.Field) *SnapshotsGetCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func (u UserResource) Register(container *restful.Container) {
+- ws := new(restful.WebService)
+- ws.
+- Path("/users").
+- Doc("Manage Users").
+- Consumes(restful.MIME_XML, restful.MIME_JSON).
+- Produces(restful.MIME_JSON, restful.MIME_XML) // you can specify this per route as well
+-
+- ws.Route(ws.GET("/{user-id}").To(u.findUser).
+- // docs
+- Doc("get a user").
+- Operation("findUser").
+- Param(ws.PathParameter("user-id", "identifier of the user").DataType("string")).
+- Writes(User{})) // on the response
+-
+- ws.Route(ws.PUT("/{user-id}").To(u.updateUser).
+- // docs
+- Doc("update a user").
+- Operation("updateUser").
+- Param(ws.PathParameter("user-id", "identifier of the user").DataType("string")).
+- ReturnsError(409, "duplicate user-id", nil).
+- Reads(User{})) // from the request
+-
+- ws.Route(ws.POST("").To(u.createUser).
+- // docs
+- Doc("create a user").
+- Operation("createUser").
+- Reads(User{})) // from the request
+-
+- ws.Route(ws.DELETE("/{user-id}").To(u.removeUser).
+- // docs
+- Doc("delete a user").
+- Operation("removeUser").
+- Param(ws.PathParameter("user-id", "identifier of the user").DataType("string")))
+-
+- container.Add(ws)
-}
-
--func (c *SnapshotsGetCall) Do() (*Snapshot, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/snapshots/{snapshot}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "snapshot": c.snapshot,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Snapshot
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-// GET http://localhost:8080/users/1
+-//
+-func (u UserResource) findUser(request *restful.Request, response *restful.Response) {
+- id := request.PathParameter("user-id")
+- usr := u.users[id]
+- if len(usr.Id) == 0 {
+- response.AddHeader("Content-Type", "text/plain")
+- response.WriteErrorString(http.StatusNotFound, "404: User could not be found.")
+- return
- }
-- return ret, nil
-- // {
-- // "description": "Returns the specified persistent disk snapshot resource.",
-- // "httpMethod": "GET",
-- // "id": "compute.snapshots.get",
-- // "parameterOrder": [
-- // "project",
-- // "snapshot"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "snapshot": {
-- // "description": "Name of the persistent disk snapshot resource to return.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/snapshots/{snapshot}",
-- // "response": {
-- // "$ref": "Snapshot"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
+- response.WriteEntity(usr)
+-}
-
+-// POST http://localhost:8080/users
+-// <User><Name>Melissa</Name></User>
+-//
+-func (u *UserResource) createUser(request *restful.Request, response *restful.Response) {
+- usr := new(User)
+- err := request.ReadEntity(usr)
+- if err != nil {
+- response.AddHeader("Content-Type", "text/plain")
+- response.WriteErrorString(http.StatusInternalServerError, err.Error())
+- return
+- }
+- usr.Id = strconv.Itoa(len(u.users) + 1) // simple id generation
+- u.users[usr.Id] = *usr
+- response.WriteHeader(http.StatusCreated)
+- response.WriteEntity(usr)
-}
-
--// method id "compute.snapshots.list":
--
--type SnapshotsListCall struct {
-- s *Service
-- project string
-- opt_ map[string]interface{}
+-// PUT http://localhost:8080/users/1
+-// <User><Id>1</Id><Name>Melissa Raspberry</Name></User>
+-//
+-func (u *UserResource) updateUser(request *restful.Request, response *restful.Response) {
+- usr := new(User)
+- err := request.ReadEntity(&usr)
+- if err != nil {
+- response.AddHeader("Content-Type", "text/plain")
+- response.WriteErrorString(http.StatusInternalServerError, err.Error())
+- return
+- }
+- u.users[usr.Id] = *usr
+- response.WriteEntity(usr)
-}
-
--// List: Retrieves the list of persistent disk snapshot resources
--// contained within the specified project.
--func (r *SnapshotsService) List(project string) *SnapshotsListCall {
-- c := &SnapshotsListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- return c
+-// DELETE http://localhost:8080/users/1
+-//
+-func (u *UserResource) removeUser(request *restful.Request, response *restful.Response) {
+- id := request.PathParameter("user-id")
+- delete(u.users, id)
-}
-
--// Filter sets the optional parameter "filter": Filter expression for
--// filtering listed resources.
--func (c *SnapshotsListCall) Filter(filter string) *SnapshotsListCall {
-- c.opt_["filter"] = filter
-- return c
--}
+-func main() {
+- // to see what happens in the package, uncomment the following
+- //restful.TraceLogger(log.New(os.Stdout, "[restful] ", log.LstdFlags|log.Lshortfile))
-
--// MaxResults sets the optional parameter "maxResults": Maximum count of
--// results to be returned. Maximum value is 500 and default value is
--// 500.
--func (c *SnapshotsListCall) MaxResults(maxResults int64) *SnapshotsListCall {
-- c.opt_["maxResults"] = maxResults
-- return c
+- wsContainer := restful.NewContainer()
+- u := UserResource{map[string]User{}}
+- u.Register(wsContainer)
+-
+- // Optionally, you can install the Swagger Service which provides a nice Web UI on your REST API
+- // You need to download the Swagger HTML5 assets and change the FilePath location in the config below.
+- // Open http://localhost:8080/apidocs and enter http://localhost:8080/apidocs.json in the api input field.
+- config := swagger.Config{
+- WebServices: wsContainer.RegisteredWebServices(), // you control what services are visible
+- WebServicesUrl: "http://localhost:8080",
+- ApiPath: "/apidocs.json",
+-
+- // Optionally, specifiy where the UI is located
+- SwaggerPath: "/apidocs/",
+- SwaggerFilePath: "/Users/emicklei/xProjects/swagger-ui/dist"}
+- swagger.RegisterSwaggerService(config, wsContainer)
+-
+- log.Printf("start listening on localhost:8080")
+- server := &http.Server{Addr: ":8080", Handler: wsContainer}
+- log.Fatal(server.ListenAndServe())
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-user-service.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-user-service.go
+deleted file mode 100644
+index d0d9872..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-user-service.go
++++ /dev/null
+@@ -1,138 +0,0 @@
+-package main
-
--// PageToken sets the optional parameter "pageToken": Tag returned by a
--// previous list request truncated by maxResults. Used to continue a
--// previous list request.
--func (c *SnapshotsListCall) PageToken(pageToken string) *SnapshotsListCall {
-- c.opt_["pageToken"] = pageToken
-- return c
+-import (
+- "log"
+- "net/http"
+-
+- "github.com/emicklei/go-restful"
+- "github.com/emicklei/go-restful/swagger"
+-)
+-
+-// This example is functionally the same as the example in restful-user-resource.go
+-// with the only difference that is served using the restful.DefaultContainer
+-
+-type User struct {
+- Id, Name string
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *SnapshotsListCall) Fields(s ...googleapi.Field) *SnapshotsListCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-type UserService struct {
+- // normally one would use DAO (data access object)
+- users map[string]User
-}
-
--func (c *SnapshotsListCall) Do() (*SnapshotList, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["filter"]; ok {
-- params.Set("filter", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["maxResults"]; ok {
-- params.Set("maxResults", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["pageToken"]; ok {
-- params.Set("pageToken", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/snapshots")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *SnapshotList
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Retrieves the list of persistent disk snapshot resources contained within the specified project.",
-- // "httpMethod": "GET",
-- // "id": "compute.snapshots.list",
-- // "parameterOrder": [
-- // "project"
-- // ],
-- // "parameters": {
-- // "filter": {
-- // "description": "Optional. Filter expression for filtering listed resources.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "maxResults": {
-- // "default": "500",
-- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
-- // "format": "uint32",
-- // "location": "query",
-- // "maximum": "500",
-- // "minimum": "0",
-- // "type": "integer"
-- // },
-- // "pageToken": {
-- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/snapshots",
-- // "response": {
-- // "$ref": "SnapshotList"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
+-func (u UserService) Register() {
+- ws := new(restful.WebService)
+- ws.
+- Path("/users").
+- Consumes(restful.MIME_XML, restful.MIME_JSON).
+- Produces(restful.MIME_JSON, restful.MIME_XML) // you can specify this per route as well
-
--}
+- ws.Route(ws.GET("/").To(u.findAllUsers).
+- // docs
+- Doc("get all users").
+- Operation("findAllUsers").
+- Returns(200, "OK", []User{}))
-
--// method id "compute.targetHttpProxies.delete":
+- ws.Route(ws.GET("/{user-id}").To(u.findUser).
+- // docs
+- Doc("get a user").
+- Operation("findUser").
+- Param(ws.PathParameter("user-id", "identifier of the user").DataType("string")).
+- Writes(User{})) // on the response
-
--type TargetHttpProxiesDeleteCall struct {
-- s *Service
-- project string
-- targetHttpProxy string
-- opt_ map[string]interface{}
--}
+- ws.Route(ws.PUT("/{user-id}").To(u.updateUser).
+- // docs
+- Doc("update a user").
+- Operation("updateUser").
+- Param(ws.PathParameter("user-id", "identifier of the user").DataType("string")).
+- Reads(User{})) // from the request
-
--// Delete: Deletes the specified TargetHttpProxy resource.
--func (r *TargetHttpProxiesService) Delete(project string, targetHttpProxy string) *TargetHttpProxiesDeleteCall {
-- c := &TargetHttpProxiesDeleteCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.targetHttpProxy = targetHttpProxy
-- return c
+- ws.Route(ws.PUT("").To(u.createUser).
+- // docs
+- Doc("create a user").
+- Operation("createUser").
+- Reads(User{})) // from the request
+-
+- ws.Route(ws.DELETE("/{user-id}").To(u.removeUser).
+- // docs
+- Doc("delete a user").
+- Operation("removeUser").
+- Param(ws.PathParameter("user-id", "identifier of the user").DataType("string")))
+-
+- restful.Add(ws)
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *TargetHttpProxiesDeleteCall) Fields(s ...googleapi.Field) *TargetHttpProxiesDeleteCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-// GET http://localhost:8080/users
+-//
+-func (u UserService) findAllUsers(request *restful.Request, response *restful.Response) {
+- response.WriteEntity(u.users)
-}
-
--func (c *TargetHttpProxiesDeleteCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/targetHttpProxies/{targetHttpProxy}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("DELETE", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "targetHttpProxy": c.targetHttpProxy,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
+-// GET http://localhost:8080/users/1
+-//
+-func (u UserService) findUser(request *restful.Request, response *restful.Response) {
+- id := request.PathParameter("user-id")
+- usr := u.users[id]
+- if len(usr.Id) == 0 {
+- response.WriteErrorString(http.StatusNotFound, "User could not be found.")
+- } else {
+- response.WriteEntity(usr)
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+-}
+-
+-// PUT http://localhost:8080/users/1
+-// <User><Id>1</Id><Name>Melissa Raspberry</Name></User>
+-//
+-func (u *UserService) updateUser(request *restful.Request, response *restful.Response) {
+- usr := new(User)
+- err := request.ReadEntity(&usr)
+- if err == nil {
+- u.users[usr.Id] = *usr
+- response.WriteEntity(usr)
+- } else {
+- response.WriteError(http.StatusInternalServerError, err)
- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-}
+-
+-// PUT http://localhost:8080/users/1
+-// <User><Id>1</Id><Name>Melissa</Name></User>
+-//
+-func (u *UserService) createUser(request *restful.Request, response *restful.Response) {
+- usr := User{Id: request.PathParameter("user-id")}
+- err := request.ReadEntity(&usr)
+- if err == nil {
+- u.users[usr.Id] = usr
+- response.WriteHeader(http.StatusCreated)
+- response.WriteEntity(usr)
+- } else {
+- response.WriteError(http.StatusInternalServerError, err)
- }
-- return ret, nil
-- // {
-- // "description": "Deletes the specified TargetHttpProxy resource.",
-- // "httpMethod": "DELETE",
-- // "id": "compute.targetHttpProxies.delete",
-- // "parameterOrder": [
-- // "project",
-- // "targetHttpProxy"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "targetHttpProxy": {
-- // "description": "Name of the TargetHttpProxy resource to delete.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/targetHttpProxies/{targetHttpProxy}",
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
+-}
-
+-// DELETE http://localhost:8080/users/1
+-//
+-func (u *UserService) removeUser(request *restful.Request, response *restful.Response) {
+- id := request.PathParameter("user-id")
+- delete(u.users, id)
-}
-
--// method id "compute.targetHttpProxies.get":
+-func main() {
+- u := UserService{map[string]User{}}
+- u.Register()
-
--type TargetHttpProxiesGetCall struct {
-- s *Service
-- project string
-- targetHttpProxy string
-- opt_ map[string]interface{}
--}
+- // Optionally, you can install the Swagger Service which provides a nice Web UI on your REST API
+- // You need to download the Swagger HTML5 assets and change the FilePath location in the config below.
+- // Open http://localhost:8080/apidocs and enter http://localhost:8080/apidocs.json in the api input field.
+- config := swagger.Config{
+- WebServices: restful.RegisteredWebServices(), // you control what services are visible
+- WebServicesUrl: "http://localhost:8080",
+- ApiPath: "/apidocs.json",
-
--// Get: Returns the specified TargetHttpProxy resource.
--func (r *TargetHttpProxiesService) Get(project string, targetHttpProxy string) *TargetHttpProxiesGetCall {
-- c := &TargetHttpProxiesGetCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.targetHttpProxy = targetHttpProxy
-- return c
+- // Optionally, specifiy where the UI is located
+- SwaggerPath: "/apidocs/",
+- SwaggerFilePath: "/Users/emicklei/Projects/swagger-ui/dist"}
+- swagger.InstallSwaggerService(config)
+-
+- log.Printf("start listening on localhost:8080")
+- log.Fatal(http.ListenAndServe(":8080", nil))
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/filter.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/filter.go
+deleted file mode 100644
+index 4b86656..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/filter.go
++++ /dev/null
+@@ -1,26 +0,0 @@
+-package restful
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *TargetHttpProxiesGetCall) Fields(s ...googleapi.Field) *TargetHttpProxiesGetCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-// Copyright 2013 Ernest Micklei. All rights reserved.
+-// Use of this source code is governed by a license
+-// that can be found in the LICENSE file.
+-
+-// FilterChain is a request scoped object to process one or more filters before calling the target RouteFunction.
+-type FilterChain struct {
+- Filters []FilterFunction // ordered list of FilterFunction
+- Index int // index into filters that is currently in progress
+- Target RouteFunction // function to call after passing all filters
-}
-
--func (c *TargetHttpProxiesGetCall) Do() (*TargetHttpProxy, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/targetHttpProxies/{targetHttpProxy}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "targetHttpProxy": c.targetHttpProxy,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *TargetHttpProxy
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-// ProcessFilter passes the request,response pair through the next of Filters.
+-// Each filter can decide to proceed to the next Filter or handle the Response itself.
+-func (f *FilterChain) ProcessFilter(request *Request, response *Response) {
+- if f.Index < len(f.Filters) {
+- f.Index++
+- f.Filters[f.Index-1](request, response, f)
+- } else {
+- f.Target(request, response)
- }
-- return ret, nil
-- // {
-- // "description": "Returns the specified TargetHttpProxy resource.",
-- // "httpMethod": "GET",
-- // "id": "compute.targetHttpProxies.get",
-- // "parameterOrder": [
-- // "project",
-- // "targetHttpProxy"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "targetHttpProxy": {
-- // "description": "Name of the TargetHttpProxy resource to return.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/targetHttpProxies/{targetHttpProxy}",
-- // "response": {
-- // "$ref": "TargetHttpProxy"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
--
-}
-
--// method id "compute.targetHttpProxies.insert":
+-// FilterFunction definitions must call ProcessFilter on the FilterChain to pass on the control and eventually call the RouteFunction
+-type FilterFunction func(*Request, *Response, *FilterChain)
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/filter_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/filter_test.go
+deleted file mode 100644
+index fadfb57..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/filter_test.go
++++ /dev/null
+@@ -1,141 +0,0 @@
+-package restful
-
--type TargetHttpProxiesInsertCall struct {
-- s *Service
-- project string
-- targethttpproxy *TargetHttpProxy
-- opt_ map[string]interface{}
--}
+-import (
+- "io"
+- "net/http"
+- "net/http/httptest"
+- "testing"
+-)
-
--// Insert: Creates a TargetHttpProxy resource in the specified project
--// using the data included in the request.
--func (r *TargetHttpProxiesService) Insert(project string, targethttpproxy *TargetHttpProxy) *TargetHttpProxiesInsertCall {
-- c := &TargetHttpProxiesInsertCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.targethttpproxy = targethttpproxy
-- return c
+-func setupServices(addGlobalFilter bool, addServiceFilter bool, addRouteFilter bool) {
+- if addGlobalFilter {
+- Filter(globalFilter)
+- }
+- Add(newTestService(addServiceFilter, addRouteFilter))
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *TargetHttpProxiesInsertCall) Fields(s ...googleapi.Field) *TargetHttpProxiesInsertCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func tearDown() {
+- DefaultContainer.webServices = []*WebService{}
+- DefaultContainer.isRegisteredOnRoot = true // this allows for setupServices multiple times
+- DefaultContainer.containerFilters = []FilterFunction{}
-}
-
--func (c *TargetHttpProxiesInsertCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.targethttpproxy)
-- if err != nil {
-- return nil, err
-- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/targetHttpProxies")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+-func newTestService(addServiceFilter bool, addRouteFilter bool) *WebService {
+- ws := new(WebService).Path("")
+- if addServiceFilter {
+- ws.Filter(serviceFilter)
- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- rb := ws.GET("/foo").To(foo)
+- if addRouteFilter {
+- rb.Filter(routeFilter)
- }
-- return ret, nil
-- // {
-- // "description": "Creates a TargetHttpProxy resource in the specified project using the data included in the request.",
-- // "httpMethod": "POST",
-- // "id": "compute.targetHttpProxies.insert",
-- // "parameterOrder": [
-- // "project"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/targetHttpProxies",
-- // "request": {
-- // "$ref": "TargetHttpProxy"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
--
+- ws.Route(rb)
+- ws.Route(ws.GET("/bar").To(bar))
+- return ws
-}
-
--// method id "compute.targetHttpProxies.list":
--
--type TargetHttpProxiesListCall struct {
-- s *Service
-- project string
-- opt_ map[string]interface{}
+-func foo(req *Request, resp *Response) {
+- io.WriteString(resp.ResponseWriter, "foo")
-}
-
--// List: Retrieves the list of TargetHttpProxy resources available to
--// the specified project.
--func (r *TargetHttpProxiesService) List(project string) *TargetHttpProxiesListCall {
-- c := &TargetHttpProxiesListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- return c
+-func bar(req *Request, resp *Response) {
+- io.WriteString(resp.ResponseWriter, "bar")
-}
-
--// Filter sets the optional parameter "filter": Filter expression for
--// filtering listed resources.
--func (c *TargetHttpProxiesListCall) Filter(filter string) *TargetHttpProxiesListCall {
-- c.opt_["filter"] = filter
-- return c
+-func fail(req *Request, resp *Response) {
+- http.Error(resp.ResponseWriter, "something failed", http.StatusInternalServerError)
-}
-
--// MaxResults sets the optional parameter "maxResults": Maximum count of
--// results to be returned. Maximum value is 500 and default value is
--// 500.
--func (c *TargetHttpProxiesListCall) MaxResults(maxResults int64) *TargetHttpProxiesListCall {
-- c.opt_["maxResults"] = maxResults
-- return c
+-func globalFilter(req *Request, resp *Response, chain *FilterChain) {
+- io.WriteString(resp.ResponseWriter, "global-")
+- chain.ProcessFilter(req, resp)
-}
-
--// PageToken sets the optional parameter "pageToken": Tag returned by a
--// previous list request truncated by maxResults. Used to continue a
--// previous list request.
--func (c *TargetHttpProxiesListCall) PageToken(pageToken string) *TargetHttpProxiesListCall {
-- c.opt_["pageToken"] = pageToken
-- return c
+-func serviceFilter(req *Request, resp *Response, chain *FilterChain) {
+- io.WriteString(resp.ResponseWriter, "service-")
+- chain.ProcessFilter(req, resp)
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *TargetHttpProxiesListCall) Fields(s ...googleapi.Field) *TargetHttpProxiesListCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func routeFilter(req *Request, resp *Response, chain *FilterChain) {
+- io.WriteString(resp.ResponseWriter, "route-")
+- chain.ProcessFilter(req, resp)
-}
-
--func (c *TargetHttpProxiesListCall) Do() (*TargetHttpProxyList, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["filter"]; ok {
-- params.Set("filter", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["maxResults"]; ok {
-- params.Set("maxResults", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["pageToken"]; ok {
-- params.Set("pageToken", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+-func TestNoFilter(t *testing.T) {
+- tearDown()
+- setupServices(false, false, false)
+- actual := sendIt("http://example.com/foo")
+- if "foo" != actual {
+- t.Fatal("expected: foo but got:" + actual)
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/targetHttpProxies")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
+-}
+-
+-func TestGlobalFilter(t *testing.T) {
+- tearDown()
+- setupServices(true, false, false)
+- actual := sendIt("http://example.com/foo")
+- if "global-foo" != actual {
+- t.Fatal("expected: global-foo but got:" + actual)
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+-}
+-
+-func TestWebServiceFilter(t *testing.T) {
+- tearDown()
+- setupServices(true, true, false)
+- actual := sendIt("http://example.com/foo")
+- if "global-service-foo" != actual {
+- t.Fatal("expected: global-service-foo but got:" + actual)
- }
-- var ret *TargetHttpProxyList
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-}
+-
+-func TestRouteFilter(t *testing.T) {
+- tearDown()
+- setupServices(true, true, true)
+- actual := sendIt("http://example.com/foo")
+- if "global-service-route-foo" != actual {
+- t.Fatal("expected: global-service-route-foo but got:" + actual)
- }
-- return ret, nil
-- // {
-- // "description": "Retrieves the list of TargetHttpProxy resources available to the specified project.",
-- // "httpMethod": "GET",
-- // "id": "compute.targetHttpProxies.list",
-- // "parameterOrder": [
-- // "project"
-- // ],
-- // "parameters": {
-- // "filter": {
-- // "description": "Optional. Filter expression for filtering listed resources.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "maxResults": {
-- // "default": "500",
-- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
-- // "format": "uint32",
-- // "location": "query",
-- // "maximum": "500",
-- // "minimum": "0",
-- // "type": "integer"
-- // },
-- // "pageToken": {
-- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/targetHttpProxies",
-- // "response": {
-- // "$ref": "TargetHttpProxyList"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
+-}
-
+-func TestRouteFilterOnly(t *testing.T) {
+- tearDown()
+- setupServices(false, false, true)
+- actual := sendIt("http://example.com/foo")
+- if "route-foo" != actual {
+- t.Fatal("expected: route-foo but got:" + actual)
+- }
-}
-
--// method id "compute.targetHttpProxies.setUrlMap":
+-func TestBar(t *testing.T) {
+- tearDown()
+- setupServices(false, true, false)
+- actual := sendIt("http://example.com/bar")
+- if "service-bar" != actual {
+- t.Fatal("expected: service-bar but got:" + actual)
+- }
+-}
-
--type TargetHttpProxiesSetUrlMapCall struct {
-- s *Service
-- project string
-- targetHttpProxy string
-- urlmapreference *UrlMapReference
-- opt_ map[string]interface{}
+-func TestAllFiltersBar(t *testing.T) {
+- tearDown()
+- setupServices(true, true, true)
+- actual := sendIt("http://example.com/bar")
+- if "global-service-bar" != actual {
+- t.Fatal("expected: global-service-bar but got:" + actual)
+- }
-}
-
--// SetUrlMap: Changes the URL map for TargetHttpProxy.
--func (r *TargetHttpProxiesService) SetUrlMap(project string, targetHttpProxy string, urlmapreference *UrlMapReference) *TargetHttpProxiesSetUrlMapCall {
-- c := &TargetHttpProxiesSetUrlMapCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.targetHttpProxy = targetHttpProxy
-- c.urlmapreference = urlmapreference
-- return c
+-func sendIt(address string) string {
+- httpRequest, _ := http.NewRequest("GET", address, nil)
+- httpRequest.Header.Set("Accept", "*/*")
+- httpWriter := httptest.NewRecorder()
+- DefaultContainer.dispatch(httpWriter, httpRequest)
+- return httpWriter.Body.String()
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *TargetHttpProxiesSetUrlMapCall) Fields(s ...googleapi.Field) *TargetHttpProxiesSetUrlMapCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func sendItTo(address string, container *Container) string {
+- httpRequest, _ := http.NewRequest("GET", address, nil)
+- httpRequest.Header.Set("Accept", "*/*")
+- httpWriter := httptest.NewRecorder()
+- container.dispatch(httpWriter, httpRequest)
+- return httpWriter.Body.String()
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/install.sh b/Godeps/_workspace/src/github.com/emicklei/go-restful/install.sh
+deleted file mode 100644
+index b5de8a2..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/install.sh
++++ /dev/null
+@@ -1,9 +0,0 @@
+-cd examples
+- ls *.go | xargs -I {} go build {}
+- cd ..
+-go fmt ...swagger && \
+-go test -test.v ...swagger && \
+-go install ...swagger && \
+-go fmt ...restful && \
+-go test -test.v ...restful && \
+-go install ...restful
+\ No newline at end of file
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/jsr311.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/jsr311.go
+deleted file mode 100644
+index affeee7..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/jsr311.go
++++ /dev/null
+@@ -1,248 +0,0 @@
+-package restful
-
--func (c *TargetHttpProxiesSetUrlMapCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.urlmapreference)
+-// Copyright 2013 Ernest Micklei. All rights reserved.
+-// Use of this source code is governed by a license
+-// that can be found in the LICENSE file.
+-
+-import (
+- "errors"
+- "fmt"
+- "net/http"
+- "sort"
+-)
+-
+-// RouterJSR311 implements the flow for matching Requests to Routes (and consequently Resource Functions)
+-// as specified by the JSR311 http://jsr311.java.net/nonav/releases/1.1/spec/spec.html.
+-// RouterJSR311 implements the Router interface.
+-// Concept of locators is not implemented.
+-type RouterJSR311 struct{}
+-
+-// SelectRoute is part of the Router interface and returns the best match
+-// for the WebService and its Route for the given Request.
+-func (r RouterJSR311) SelectRoute(
+- webServices []*WebService,
+- httpRequest *http.Request) (selectedService *WebService, selectedRoute *Route, err error) {
+-
+- // Identify the root resource class (WebService)
+- dispatcher, finalMatch, err := r.detectDispatcher(httpRequest.URL.Path, webServices)
- if err != nil {
-- return nil, err
+- return nil, nil, NewError(http.StatusNotFound, "")
- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+- // Obtain the set of candidate methods (Routes)
+- routes := r.selectRoutes(dispatcher, finalMatch)
+- if len(routes) == 0 {
+- return dispatcher, nil, NewError(http.StatusNotFound, "404: Page Not Found")
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/targetHttpProxies/{targetHttpProxy}/setUrlMap")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "targetHttpProxy": c.targetHttpProxy,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
+-
+- // Identify the method (Route) that will handle the request
+- route, ok := r.detectRoute(routes, httpRequest)
+- return dispatcher, route, ok
+-}
+-
+-// http://jsr311.java.net/nonav/releases/1.1/spec/spec3.html#x3-360003.7.2
+-func (r RouterJSR311) detectRoute(routes []Route, httpRequest *http.Request) (*Route, error) {
+- // http method
+- methodOk := []Route{}
+- for _, each := range routes {
+- if httpRequest.Method == each.Method {
+- methodOk = append(methodOk, each)
+- }
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- if len(methodOk) == 0 {
+- if trace {
+- traceLogger.Printf("no Route found (in %d routes) that matches HTTP method %s\n", len(routes), httpRequest.Method)
+- }
+- return nil, NewError(http.StatusMethodNotAllowed, "405: Method Not Allowed")
- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- inputMediaOk := methodOk
+- // content-type
+- contentType := httpRequest.Header.Get(HEADER_ContentType)
+- if httpRequest.ContentLength > 0 {
+- inputMediaOk = []Route{}
+- for _, each := range methodOk {
+- if each.matchesContentType(contentType) {
+- inputMediaOk = append(inputMediaOk, each)
+- }
+- }
+- if len(inputMediaOk) == 0 {
+- if trace {
+- traceLogger.Printf("no Route found (from %d) that matches HTTP Content-Type: %s\n", len(methodOk), contentType)
+- }
+- return nil, NewError(http.StatusUnsupportedMediaType, "415: Unsupported Media Type")
+- }
- }
-- return ret, nil
-- // {
-- // "description": "Changes the URL map for TargetHttpProxy.",
-- // "httpMethod": "POST",
-- // "id": "compute.targetHttpProxies.setUrlMap",
-- // "parameterOrder": [
-- // "project",
-- // "targetHttpProxy"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "targetHttpProxy": {
-- // "description": "Name of the TargetHttpProxy resource whose URL map is to be set.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/targetHttpProxies/{targetHttpProxy}/setUrlMap",
-- // "request": {
-- // "$ref": "UrlMapReference"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
+- // accept
+- outputMediaOk := []Route{}
+- accept := httpRequest.Header.Get(HEADER_Accept)
+- if accept == "" {
+- accept = "*/*"
+- }
+- for _, each := range inputMediaOk {
+- if each.matchesAccept(accept) {
+- outputMediaOk = append(outputMediaOk, each)
+- }
+- }
+- if len(outputMediaOk) == 0 {
+- if trace {
+- traceLogger.Printf("no Route found (from %d) that matches HTTP Accept: %s\n", len(inputMediaOk), accept)
+- }
+- return nil, NewError(http.StatusNotAcceptable, "406: Not Acceptable")
+- }
+- return r.bestMatchByMedia(outputMediaOk, contentType, accept), nil
+-}
-
+-// http://jsr311.java.net/nonav/releases/1.1/spec/spec3.html#x3-360003.7.2
+-// n/m > n/* > */*
+-func (r RouterJSR311) bestMatchByMedia(routes []Route, contentType string, accept string) *Route {
+- // TODO
+- return &routes[0]
-}
-
--// method id "compute.targetInstances.aggregatedList":
+-// http://jsr311.java.net/nonav/releases/1.1/spec/spec3.html#x3-360003.7.2 (step 2)
+-func (r RouterJSR311) selectRoutes(dispatcher *WebService, pathRemainder string) []Route {
+- filtered := &sortableRouteCandidates{}
+- for _, each := range dispatcher.Routes() {
+- pathExpr := each.pathExpr
+- matches := pathExpr.Matcher.FindStringSubmatch(pathRemainder)
+- if matches != nil {
+- lastMatch := matches[len(matches)-1]
+- if len(lastMatch) == 0 || lastMatch == "/" { // do not include if value is neither empty nor ‘/’.
+- filtered.candidates = append(filtered.candidates,
+- routeCandidate{each, len(matches) - 1, pathExpr.LiteralCount, pathExpr.VarCount})
+- }
+- }
+- }
+- if len(filtered.candidates) == 0 {
+- if trace {
+- traceLogger.Printf("WebService on path %s has no routes that match URL path remainder:%s\n", dispatcher.rootPath, pathRemainder)
+- }
+- return []Route{}
+- }
+- sort.Sort(sort.Reverse(filtered))
-
--type TargetInstancesAggregatedListCall struct {
-- s *Service
-- project string
-- opt_ map[string]interface{}
+- // select other routes from candidates whoes expression matches rmatch
+- matchingRoutes := []Route{filtered.candidates[0].route}
+- for c := 1; c < len(filtered.candidates); c++ {
+- each := filtered.candidates[c]
+- if each.route.pathExpr.Matcher.MatchString(pathRemainder) {
+- matchingRoutes = append(matchingRoutes, each.route)
+- }
+- }
+- return matchingRoutes
-}
-
--// AggregatedList: Retrieves the list of target instances grouped by
--// scope.
--func (r *TargetInstancesService) AggregatedList(project string) *TargetInstancesAggregatedListCall {
-- c := &TargetInstancesAggregatedListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- return c
+-// http://jsr311.java.net/nonav/releases/1.1/spec/spec3.html#x3-360003.7.2 (step 1)
+-func (r RouterJSR311) detectDispatcher(requestPath string, dispatchers []*WebService) (*WebService, string, error) {
+- filtered := &sortableDispatcherCandidates{}
+- for _, each := range dispatchers {
+- pathExpr := each.compiledPathExpression()
+- matches := pathExpr.Matcher.FindStringSubmatch(requestPath)
+- if matches != nil {
+- filtered.candidates = append(filtered.candidates,
+- dispatcherCandidate{each, matches[len(matches)-1], len(matches), pathExpr.LiteralCount, pathExpr.VarCount})
+- }
+- }
+- if len(filtered.candidates) == 0 {
+- if trace {
+- traceLogger.Printf("no WebService was found to match URL path:%s\n", requestPath)
+- }
+- return nil, "", errors.New("not found")
+- }
+- sort.Sort(sort.Reverse(filtered))
+- return filtered.candidates[0].dispatcher, filtered.candidates[0].finalMatch, nil
-}
-
--// Filter sets the optional parameter "filter": Filter expression for
--// filtering listed resources.
--func (c *TargetInstancesAggregatedListCall) Filter(filter string) *TargetInstancesAggregatedListCall {
-- c.opt_["filter"] = filter
-- return c
+-// Types and functions to support the sorting of Routes
+-
+-type routeCandidate struct {
+- route Route
+- matchesCount int // the number of capturing groups
+- literalCount int // the number of literal characters (means those not resulting from template variable substitution)
+- nonDefaultCount int // the number of capturing groups with non-default regular expressions (i.e. not ‘([^ /]+?)’)
-}
-
--// MaxResults sets the optional parameter "maxResults": Maximum count of
--// results to be returned. Maximum value is 500 and default value is
--// 500.
--func (c *TargetInstancesAggregatedListCall) MaxResults(maxResults int64) *TargetInstancesAggregatedListCall {
-- c.opt_["maxResults"] = maxResults
-- return c
+-func (r routeCandidate) expressionToMatch() string {
+- return r.route.pathExpr.Source
-}
-
--// PageToken sets the optional parameter "pageToken": Tag returned by a
--// previous list request truncated by maxResults. Used to continue a
--// previous list request.
--func (c *TargetInstancesAggregatedListCall) PageToken(pageToken string) *TargetInstancesAggregatedListCall {
-- c.opt_["pageToken"] = pageToken
-- return c
+-func (r routeCandidate) String() string {
+- return fmt.Sprintf("(m=%d,l=%d,n=%d)", r.matchesCount, r.literalCount, r.nonDefaultCount)
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *TargetInstancesAggregatedListCall) Fields(s ...googleapi.Field) *TargetInstancesAggregatedListCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-type sortableRouteCandidates struct {
+- candidates []routeCandidate
-}
-
--func (c *TargetInstancesAggregatedListCall) Do() (*TargetInstanceAggregatedList, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["filter"]; ok {
-- params.Set("filter", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["maxResults"]; ok {
-- params.Set("maxResults", fmt.Sprintf("%v", v))
+-func (rcs *sortableRouteCandidates) Len() int {
+- return len(rcs.candidates)
+-}
+-func (rcs *sortableRouteCandidates) Swap(i, j int) {
+- rcs.candidates[i], rcs.candidates[j] = rcs.candidates[j], rcs.candidates[i]
+-}
+-func (rcs *sortableRouteCandidates) Less(i, j int) bool {
+- ci := rcs.candidates[i]
+- cj := rcs.candidates[j]
+- // primary key
+- if ci.literalCount < cj.literalCount {
+- return true
- }
-- if v, ok := c.opt_["pageToken"]; ok {
-- params.Set("pageToken", fmt.Sprintf("%v", v))
+- if ci.literalCount > cj.literalCount {
+- return false
- }
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+- // secundary key
+- if ci.matchesCount < cj.matchesCount {
+- return true
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/aggregated/targetInstances")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
+- if ci.matchesCount > cj.matchesCount {
+- return false
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- // tertiary key
+- if ci.nonDefaultCount < cj.nonDefaultCount {
+- return true
- }
-- var ret *TargetInstanceAggregatedList
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- if ci.nonDefaultCount > cj.nonDefaultCount {
+- return false
- }
-- return ret, nil
-- // {
-- // "description": "Retrieves the list of target instances grouped by scope.",
-- // "httpMethod": "GET",
-- // "id": "compute.targetInstances.aggregatedList",
-- // "parameterOrder": [
-- // "project"
-- // ],
-- // "parameters": {
-- // "filter": {
-- // "description": "Optional. Filter expression for filtering listed resources.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "maxResults": {
-- // "default": "500",
-- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
-- // "format": "uint32",
-- // "location": "query",
-- // "maximum": "500",
-- // "minimum": "0",
-- // "type": "integer"
-- // },
-- // "pageToken": {
-- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/aggregated/targetInstances",
-- // "response": {
-- // "$ref": "TargetInstanceAggregatedList"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
--
+- // quaternary key ("source" is interpreted as Path)
+- return ci.route.Path < cj.route.Path
-}
-
--// method id "compute.targetInstances.delete":
+-// Types and functions to support the sorting of Dispatchers
-
--type TargetInstancesDeleteCall struct {
-- s *Service
-- project string
-- zone string
-- targetInstance string
-- opt_ map[string]interface{}
+-type dispatcherCandidate struct {
+- dispatcher *WebService
+- finalMatch string
+- matchesCount int // the number of capturing groups
+- literalCount int // the number of literal characters (means those not resulting from template variable substitution)
+- nonDefaultCount int // the number of capturing groups with non-default regular expressions (i.e. not ‘([^ /]+?)’)
-}
--
--// Delete: Deletes the specified TargetInstance resource.
--func (r *TargetInstancesService) Delete(project string, zone string, targetInstance string) *TargetInstancesDeleteCall {
-- c := &TargetInstancesDeleteCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.zone = zone
-- c.targetInstance = targetInstance
-- return c
+-type sortableDispatcherCandidates struct {
+- candidates []dispatcherCandidate
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *TargetInstancesDeleteCall) Fields(s ...googleapi.Field) *TargetInstancesDeleteCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func (dc *sortableDispatcherCandidates) Len() int {
+- return len(dc.candidates)
-}
--
--func (c *TargetInstancesDeleteCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+-func (dc *sortableDispatcherCandidates) Swap(i, j int) {
+- dc.candidates[i], dc.candidates[j] = dc.candidates[j], dc.candidates[i]
+-}
+-func (dc *sortableDispatcherCandidates) Less(i, j int) bool {
+- ci := dc.candidates[i]
+- cj := dc.candidates[j]
+- // primary key
+- if ci.matchesCount < cj.matchesCount {
+- return true
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/targetInstances/{targetInstance}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("DELETE", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "zone": c.zone,
-- "targetInstance": c.targetInstance,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
+- if ci.matchesCount > cj.matchesCount {
+- return false
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- // secundary key
+- if ci.literalCount < cj.literalCount {
+- return true
- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- if ci.literalCount > cj.literalCount {
+- return false
- }
-- return ret, nil
-- // {
-- // "description": "Deletes the specified TargetInstance resource.",
-- // "httpMethod": "DELETE",
-- // "id": "compute.targetInstances.delete",
-- // "parameterOrder": [
-- // "project",
-- // "zone",
-- // "targetInstance"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "targetInstance": {
-- // "description": "Name of the TargetInstance resource to delete.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "zone": {
-- // "description": "Name of the zone scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/zones/{zone}/targetInstances/{targetInstance}",
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
--
+- // tertiary key
+- return ci.nonDefaultCount < cj.nonDefaultCount
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/jsr311_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/jsr311_test.go
+deleted file mode 100644
+index 8d54ed9..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/jsr311_test.go
++++ /dev/null
+@@ -1,231 +0,0 @@
+-package restful
-
--// method id "compute.targetInstances.get":
+-import (
+- "io"
+- "sort"
+- "testing"
+-)
-
--type TargetInstancesGetCall struct {
-- s *Service
-- project string
-- zone string
-- targetInstance string
-- opt_ map[string]interface{}
+-//
+-// Step 1 tests
+-//
+-var paths = []struct {
+- // url with path (1) is handled by service with root (2) and last capturing group has value final (3)
+- path, root, final string
+-}{
+- {"/", "/", "/"},
+- {"/p", "/p", ""},
+- {"/p/x", "/p/{q}", ""},
+- {"/q/x", "/q", "/x"},
+- {"/p/x/", "/p/{q}", "/"},
+- {"/p/x/y", "/p/{q}", "/y"},
+- {"/q/x/y", "/q", "/x/y"},
+- {"/z/q", "/{p}/q", ""},
+- {"/a/b/c/q", "/", "/a/b/c/q"},
-}
-
--// Get: Returns the specified TargetInstance resource.
--func (r *TargetInstancesService) Get(project string, zone string, targetInstance string) *TargetInstancesGetCall {
-- c := &TargetInstancesGetCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.zone = zone
-- c.targetInstance = targetInstance
-- return c
--}
+-func TestDetectDispatcher(t *testing.T) {
+- ws1 := new(WebService).Path("/")
+- ws2 := new(WebService).Path("/p")
+- ws3 := new(WebService).Path("/q")
+- ws4 := new(WebService).Path("/p/q")
+- ws5 := new(WebService).Path("/p/{q}")
+- ws6 := new(WebService).Path("/p/{q}/")
+- ws7 := new(WebService).Path("/{p}/q")
+- var dispatchers = []*WebService{ws1, ws2, ws3, ws4, ws5, ws6, ws7}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *TargetInstancesGetCall) Fields(s ...googleapi.Field) *TargetInstancesGetCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+- router := RouterJSR311{}
+-
+- ok := true
+- for i, fixture := range paths {
+- who, final, err := router.detectDispatcher(fixture.path, dispatchers)
+- if err != nil {
+- t.Logf("error in detection:%v", err)
+- ok = false
+- }
+- if who.RootPath() != fixture.root {
+- t.Logf("[line:%v] Unexpected dispatcher, expected:%v, actual:%v", i, fixture.root, who.RootPath())
+- ok = false
+- }
+- if final != fixture.final {
+- t.Logf("[line:%v] Unexpected final, expected:%v, actual:%v", i, fixture.final, final)
+- ok = false
+- }
+- }
+- if !ok {
+- t.Fail()
+- }
-}
-
--func (c *TargetInstancesGetCall) Do() (*TargetInstance, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+-//
+-// Step 2 tests
+-//
+-
+-// go test -v -test.run TestISSUE_30 ...restful
+-func TestISSUE_30(t *testing.T) {
+- ws1 := new(WebService).Path("/users")
+- ws1.Route(ws1.GET("/{id}").To(dummy))
+- ws1.Route(ws1.POST("/login").To(dummy))
+- routes := RouterJSR311{}.selectRoutes(ws1, "/login")
+- if len(routes) != 2 {
+- t.Fatal("expected 2 routes")
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/targetInstances/{targetInstance}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "zone": c.zone,
-- "targetInstance": c.targetInstance,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
+- if routes[0].Path != "/users/login" {
+- t.Error("first is", routes[0].Path)
+- t.Logf("routes:%v", routes)
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+-}
+-
+-// go test -v -test.run TestISSUE_34 ...restful
+-func TestISSUE_34(t *testing.T) {
+- ws1 := new(WebService).Path("/")
+- ws1.Route(ws1.GET("/{type}/{id}").To(dummy))
+- ws1.Route(ws1.GET("/network/{id}").To(dummy))
+- routes := RouterJSR311{}.selectRoutes(ws1, "/network/12")
+- if len(routes) != 2 {
+- t.Fatal("expected 2 routes")
- }
-- var ret *TargetInstance
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- if routes[0].Path != "/network/{id}" {
+- t.Error("first is", routes[0].Path)
+- t.Logf("routes:%v", routes)
- }
-- return ret, nil
-- // {
-- // "description": "Returns the specified TargetInstance resource.",
-- // "httpMethod": "GET",
-- // "id": "compute.targetInstances.get",
-- // "parameterOrder": [
-- // "project",
-- // "zone",
-- // "targetInstance"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "targetInstance": {
-- // "description": "Name of the TargetInstance resource to return.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "zone": {
-- // "description": "Name of the zone scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/zones/{zone}/targetInstances/{targetInstance}",
-- // "response": {
-- // "$ref": "TargetInstance"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
+-}
-
+-// go test -v -test.run TestISSUE_34_2 ...restful
+-func TestISSUE_34_2(t *testing.T) {
+- ws1 := new(WebService).Path("/")
+- // change the registration order
+- ws1.Route(ws1.GET("/network/{id}").To(dummy))
+- ws1.Route(ws1.GET("/{type}/{id}").To(dummy))
+- routes := RouterJSR311{}.selectRoutes(ws1, "/network/12")
+- if len(routes) != 2 {
+- t.Fatal("expected 2 routes")
+- }
+- if routes[0].Path != "/network/{id}" {
+- t.Error("first is", routes[0].Path)
+- }
-}
-
--// method id "compute.targetInstances.insert":
+-// go test -v -test.run TestISSUE_137 ...restful
+-func TestISSUE_137(t *testing.T) {
+- ws1 := new(WebService)
+- ws1.Route(ws1.GET("/hello").To(dummy))
+- routes := RouterJSR311{}.selectRoutes(ws1, "/")
+- t.Log(routes)
+- if len(routes) > 0 {
+- t.Error("no route expected")
+- }
+-}
-
--type TargetInstancesInsertCall struct {
-- s *Service
-- project string
-- zone string
-- targetinstance *TargetInstance
-- opt_ map[string]interface{}
+-func TestSelectRoutesSlash(t *testing.T) {
+- ws1 := new(WebService).Path("/")
+- ws1.Route(ws1.GET("").To(dummy))
+- ws1.Route(ws1.GET("/").To(dummy))
+- ws1.Route(ws1.GET("/u").To(dummy))
+- ws1.Route(ws1.POST("/u").To(dummy))
+- ws1.Route(ws1.POST("/u/v").To(dummy))
+- ws1.Route(ws1.POST("/u/{w}").To(dummy))
+- ws1.Route(ws1.POST("/u/{w}/z").To(dummy))
+- routes := RouterJSR311{}.selectRoutes(ws1, "/u")
+- checkRoutesContains(routes, "/u", t)
+- checkRoutesContainsNo(routes, "/u/v", t)
+- checkRoutesContainsNo(routes, "/", t)
+- checkRoutesContainsNo(routes, "/u/{w}/z", t)
+-}
+-func TestSelectRoutesU(t *testing.T) {
+- ws1 := new(WebService).Path("/u")
+- ws1.Route(ws1.GET("").To(dummy))
+- ws1.Route(ws1.GET("/").To(dummy))
+- ws1.Route(ws1.GET("/v").To(dummy))
+- ws1.Route(ws1.POST("/{w}").To(dummy))
+- ws1.Route(ws1.POST("/{w}/z").To(dummy)) // so full path = /u/{w}/z
+- routes := RouterJSR311{}.selectRoutes(ws1, "/v") // test against /u/v
+- checkRoutesContains(routes, "/u/{w}", t)
-}
-
--// Insert: Creates a TargetInstance resource in the specified project
--// and zone using the data included in the request.
--func (r *TargetInstancesService) Insert(project string, zone string, targetinstance *TargetInstance) *TargetInstancesInsertCall {
-- c := &TargetInstancesInsertCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.zone = zone
-- c.targetinstance = targetinstance
-- return c
+-func TestSelectRoutesUsers1(t *testing.T) {
+- ws1 := new(WebService).Path("/users")
+- ws1.Route(ws1.POST("").To(dummy))
+- ws1.Route(ws1.POST("/").To(dummy))
+- ws1.Route(ws1.PUT("/{id}").To(dummy))
+- routes := RouterJSR311{}.selectRoutes(ws1, "/1")
+- checkRoutesContains(routes, "/users/{id}", t)
+-}
+-func checkRoutesContains(routes []Route, path string, t *testing.T) {
+- if !containsRoutePath(routes, path, t) {
+- for _, r := range routes {
+- t.Logf("route %v %v", r.Method, r.Path)
+- }
+- t.Fatalf("routes should include [%v]:", path)
+- }
+-}
+-func checkRoutesContainsNo(routes []Route, path string, t *testing.T) {
+- if containsRoutePath(routes, path, t) {
+- for _, r := range routes {
+- t.Logf("route %v %v", r.Method, r.Path)
+- }
+- t.Fatalf("routes should not include [%v]:", path)
+- }
+-}
+-func containsRoutePath(routes []Route, path string, t *testing.T) bool {
+- for _, each := range routes {
+- if each.Path == path {
+- return true
+- }
+- }
+- return false
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *TargetInstancesInsertCall) Fields(s ...googleapi.Field) *TargetInstancesInsertCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-var tempregexs = []struct {
+- template, regex string
+- literalCount, varCount int
+-}{
+- {"", "^(/.*)?$", 0, 0},
+- {"/a/{b}/c/", "^/a/([^/]+?)/c(/.*)?$", 2, 1},
+- {"/{a}/{b}/{c-d-e}/", "^/([^/]+?)/([^/]+?)/([^/]+?)(/.*)?$", 0, 3},
+- {"/{p}/abcde", "^/([^/]+?)/abcde(/.*)?$", 5, 1},
-}
-
--func (c *TargetInstancesInsertCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.targetinstance)
-- if err != nil {
-- return nil, err
-- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+-func TestTemplateToRegularExpression(t *testing.T) {
+- ok := true
+- for i, fixture := range tempregexs {
+- actual, lCount, vCount, _ := templateToRegularExpression(fixture.template)
+- if actual != fixture.regex {
+- t.Logf("regex mismatch, expected:%v , actual:%v, line:%v\n", fixture.regex, actual, i) // 11 = where the data starts
+- ok = false
+- }
+- if lCount != fixture.literalCount {
+- t.Logf("literal count mismatch, expected:%v , actual:%v, line:%v\n", fixture.literalCount, lCount, i)
+- ok = false
+- }
+- if vCount != fixture.varCount {
+- t.Logf("variable count mismatch, expected:%v , actual:%v, line:%v\n", fixture.varCount, vCount, i)
+- ok = false
+- }
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/targetInstances")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "zone": c.zone,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
+- if !ok {
+- t.Fatal("one or more expression did not match")
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+-}
+-
+-// go test -v -test.run TestSortableRouteCandidates ...restful
+-func TestSortableRouteCandidates(t *testing.T) {
+- fixture := &sortableRouteCandidates{}
+- r1 := routeCandidate{matchesCount: 0, literalCount: 0, nonDefaultCount: 0}
+- r2 := routeCandidate{matchesCount: 0, literalCount: 0, nonDefaultCount: 1}
+- r3 := routeCandidate{matchesCount: 0, literalCount: 1, nonDefaultCount: 1}
+- r4 := routeCandidate{matchesCount: 1, literalCount: 1, nonDefaultCount: 0}
+- r5 := routeCandidate{matchesCount: 1, literalCount: 0, nonDefaultCount: 0}
+- fixture.candidates = append(fixture.candidates, r5, r4, r3, r2, r1)
+- sort.Sort(sort.Reverse(fixture))
+- first := fixture.candidates[0]
+- if first.matchesCount != 1 && first.literalCount != 1 && first.nonDefaultCount != 0 {
+- t.Fatal("expected r4")
- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- last := fixture.candidates[len(fixture.candidates)-1]
+- if last.matchesCount != 0 && last.literalCount != 0 && last.nonDefaultCount != 0 {
+- t.Fatal("expected r1")
- }
-- return ret, nil
-- // {
-- // "description": "Creates a TargetInstance resource in the specified project and zone using the data included in the request.",
-- // "httpMethod": "POST",
-- // "id": "compute.targetInstances.insert",
-- // "parameterOrder": [
-- // "project",
-- // "zone"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "zone": {
-- // "description": "Name of the zone scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/zones/{zone}/targetInstances",
-- // "request": {
-- // "$ref": "TargetInstance"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
--
-}
-
--// method id "compute.targetInstances.list":
+-func dummy(req *Request, resp *Response) { io.WriteString(resp.ResponseWriter, "dummy") }
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/logger.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/logger.go
+deleted file mode 100644
+index 25d6a8e..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/logger.go
++++ /dev/null
+@@ -1,16 +0,0 @@
+-package restful
-
--type TargetInstancesListCall struct {
-- s *Service
-- project string
-- zone string
-- opt_ map[string]interface{}
--}
+-import "log"
-
--// List: Retrieves the list of TargetInstance resources available to the
--// specified project and zone.
--func (r *TargetInstancesService) List(project string, zone string) *TargetInstancesListCall {
-- c := &TargetInstancesListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.zone = zone
-- return c
--}
+-// Copyright 2014 Ernest Micklei. All rights reserved.
+-// Use of this source code is governed by a license
+-// that can be found in the LICENSE file.
-
--// Filter sets the optional parameter "filter": Filter expression for
--// filtering listed resources.
--func (c *TargetInstancesListCall) Filter(filter string) *TargetInstancesListCall {
-- c.opt_["filter"] = filter
-- return c
--}
+-var trace bool = false
+-var traceLogger *log.Logger
-
--// MaxResults sets the optional parameter "maxResults": Maximum count of
--// results to be returned. Maximum value is 500 and default value is
--// 500.
--func (c *TargetInstancesListCall) MaxResults(maxResults int64) *TargetInstancesListCall {
-- c.opt_["maxResults"] = maxResults
-- return c
+-// TraceLogger enables detailed logging of Http request matching and filter invocation. Default no logger is set.
+-func TraceLogger(logger *log.Logger) {
+- traceLogger = logger
+- trace = logger != nil
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/options_filter.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/options_filter.go
+deleted file mode 100644
+index bd5d0c2..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/options_filter.go
++++ /dev/null
+@@ -1,24 +0,0 @@
+-package restful
-
--// PageToken sets the optional parameter "pageToken": Tag returned by a
--// previous list request truncated by maxResults. Used to continue a
--// previous list request.
--func (c *TargetInstancesListCall) PageToken(pageToken string) *TargetInstancesListCall {
-- c.opt_["pageToken"] = pageToken
-- return c
+-import "strings"
+-
+-// Copyright 2013 Ernest Micklei. All rights reserved.
+-// Use of this source code is governed by a license
+-// that can be found in the LICENSE file.
+-
+-// OPTIONSFilter is a filter function that inspects the Http Request for the OPTIONS method
+-// and provides the response with a set of allowed methods for the request URL Path.
+-// As for any filter, you can also install it for a particular WebService within a Container
+-func (c Container) OPTIONSFilter(req *Request, resp *Response, chain *FilterChain) {
+- if "OPTIONS" != req.Request.Method {
+- chain.ProcessFilter(req, resp)
+- return
+- }
+- resp.AddHeader(HEADER_Allow, strings.Join(c.computeAllowedMethods(req), ","))
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *TargetInstancesListCall) Fields(s ...googleapi.Field) *TargetInstancesListCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-// OPTIONSFilter is a filter function that inspects the Http Request for the OPTIONS method
+-// and provides the response with a set of allowed methods for the request URL Path.
+-func OPTIONSFilter() FilterFunction {
+- return DefaultContainer.OPTIONSFilter
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/options_filter_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/options_filter_test.go
+deleted file mode 100644
+index f0fceb8..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/options_filter_test.go
++++ /dev/null
+@@ -1,34 +0,0 @@
+-package restful
-
--func (c *TargetInstancesListCall) Do() (*TargetInstanceList, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["filter"]; ok {
-- params.Set("filter", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["maxResults"]; ok {
-- params.Set("maxResults", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["pageToken"]; ok {
-- params.Set("pageToken", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/targetInstances")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "zone": c.zone,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+-import (
+- "net/http"
+- "net/http/httptest"
+- "testing"
+-)
+-
+-// go test -v -test.run TestOptionsFilter ...restful
+-func TestOptionsFilter(t *testing.T) {
+- tearDown()
+- ws := new(WebService)
+- ws.Route(ws.GET("/candy/{kind}").To(dummy))
+- ws.Route(ws.DELETE("/candy/{kind}").To(dummy))
+- ws.Route(ws.POST("/candies").To(dummy))
+- Add(ws)
+- Filter(OPTIONSFilter())
+-
+- httpRequest, _ := http.NewRequest("OPTIONS", "http://here.io/candy/gum", nil)
+- httpWriter := httptest.NewRecorder()
+- DefaultContainer.dispatch(httpWriter, httpRequest)
+- actual := httpWriter.Header().Get(HEADER_Allow)
+- if "GET,DELETE" != actual {
+- t.Fatal("expected: GET,DELETE but got:" + actual)
- }
-- var ret *TargetInstanceList
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-
+- httpRequest, _ = http.NewRequest("OPTIONS", "http://here.io/candies", nil)
+- httpWriter = httptest.NewRecorder()
+- DefaultContainer.dispatch(httpWriter, httpRequest)
+- actual = httpWriter.Header().Get(HEADER_Allow)
+- if "POST" != actual {
+- t.Fatal("expected: POST but got:" + actual)
- }
-- return ret, nil
-- // {
-- // "description": "Retrieves the list of TargetInstance resources available to the specified project and zone.",
-- // "httpMethod": "GET",
-- // "id": "compute.targetInstances.list",
-- // "parameterOrder": [
-- // "project",
-- // "zone"
-- // ],
-- // "parameters": {
-- // "filter": {
-- // "description": "Optional. Filter expression for filtering listed resources.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "maxResults": {
-- // "default": "500",
-- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
-- // "format": "uint32",
-- // "location": "query",
-- // "maximum": "500",
-- // "minimum": "0",
-- // "type": "integer"
-- // },
-- // "pageToken": {
-- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "zone": {
-- // "description": "Name of the zone scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/zones/{zone}/targetInstances",
-- // "response": {
-- // "$ref": "TargetInstanceList"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
+-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/parameter.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/parameter.go
+deleted file mode 100644
+index 7f38a0a..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/parameter.go
++++ /dev/null
+@@ -1,95 +0,0 @@
+-package restful
+-
+-// Copyright 2013 Ernest Micklei. All rights reserved.
+-// Use of this source code is governed by a license
+-// that can be found in the LICENSE file.
+-
+-const (
+- // PathParameterKind = indicator of Request parameter type "path"
+- PathParameterKind = iota
+-
+- // QueryParameterKind = indicator of Request parameter type "query"
+- QueryParameterKind
+-
+- // BodyParameterKind = indicator of Request parameter type "body"
+- BodyParameterKind
+-
+- // HeaderParameterKind = indicator of Request parameter type "header"
+- HeaderParameterKind
-
+- // FormParameterKind = indicator of Request parameter type "form"
+- FormParameterKind
+-)
+-
+-// Parameter is for documententing the parameter used in a Http Request
+-// ParameterData kinds are Path,Query and Body
+-type Parameter struct {
+- data *ParameterData
-}
-
--// method id "compute.targetPools.addHealthCheck":
+-// ParameterData represents the state of a Parameter.
+-// It is made public to make it accessible to e.g. the Swagger package.
+-type ParameterData struct {
+- Name, Description, DataType string
+- Kind int
+- Required bool
+- AllowableValues map[string]string
+- AllowMultiple bool
+-}
-
--type TargetPoolsAddHealthCheckCall struct {
-- s *Service
-- project string
-- region string
-- targetPool string
-- targetpoolsaddhealthcheckrequest *TargetPoolsAddHealthCheckRequest
-- opt_ map[string]interface{}
+-// Data returns the state of the Parameter
+-func (p *Parameter) Data() ParameterData {
+- return *p.data
-}
-
--// AddHealthCheck: Adds health check URL to targetPool.
--func (r *TargetPoolsService) AddHealthCheck(project string, region string, targetPool string, targetpoolsaddhealthcheckrequest *TargetPoolsAddHealthCheckRequest) *TargetPoolsAddHealthCheckCall {
-- c := &TargetPoolsAddHealthCheckCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.region = region
-- c.targetPool = targetPool
-- c.targetpoolsaddhealthcheckrequest = targetpoolsaddhealthcheckrequest
-- return c
+-// Kind returns the parameter type indicator (see const for valid values)
+-func (p *Parameter) Kind() int {
+- return p.data.Kind
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *TargetPoolsAddHealthCheckCall) Fields(s ...googleapi.Field) *TargetPoolsAddHealthCheckCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func (p *Parameter) bePath() *Parameter {
+- p.data.Kind = PathParameterKind
+- return p
+-}
+-func (p *Parameter) beQuery() *Parameter {
+- p.data.Kind = QueryParameterKind
+- return p
+-}
+-func (p *Parameter) beBody() *Parameter {
+- p.data.Kind = BodyParameterKind
+- return p
-}
-
--func (c *TargetPoolsAddHealthCheckCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.targetpoolsaddhealthcheckrequest)
-- if err != nil {
-- return nil, err
-- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/targetPools/{targetPool}/addHealthCheck")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "region": c.region,
-- "targetPool": c.targetPool,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Adds health check URL to targetPool.",
-- // "httpMethod": "POST",
-- // "id": "compute.targetPools.addHealthCheck",
-- // "parameterOrder": [
-- // "project",
-- // "region",
-- // "targetPool"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "region": {
-- // "description": "Name of the region scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "targetPool": {
-- // "description": "Name of the TargetPool resource to which health_check_url is to be added.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/regions/{region}/targetPools/{targetPool}/addHealthCheck",
-- // "request": {
-- // "$ref": "TargetPoolsAddHealthCheckRequest"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
+-func (p *Parameter) beHeader() *Parameter {
+- p.data.Kind = HeaderParameterKind
+- return p
+-}
-
+-func (p *Parameter) beForm() *Parameter {
+- p.data.Kind = FormParameterKind
+- return p
-}
-
--// method id "compute.targetPools.addInstance":
+-// Required sets the required field and return the receiver
+-func (p *Parameter) Required(required bool) *Parameter {
+- p.data.Required = required
+- return p
+-}
+-
+-// AllowMultiple sets the allowMultiple field and return the receiver
+-func (p *Parameter) AllowMultiple(multiple bool) *Parameter {
+- p.data.AllowMultiple = multiple
+- return p
+-}
-
--type TargetPoolsAddInstanceCall struct {
-- s *Service
-- project string
-- region string
-- targetPool string
-- targetpoolsaddinstancerequest *TargetPoolsAddInstanceRequest
-- opt_ map[string]interface{}
+-// AllowableValues sets the allowableValues field and return the receiver
+-func (p *Parameter) AllowableValues(values map[string]string) *Parameter {
+- p.data.AllowableValues = values
+- return p
-}
-
--// AddInstance: Adds instance url to targetPool.
--func (r *TargetPoolsService) AddInstance(project string, region string, targetPool string, targetpoolsaddinstancerequest *TargetPoolsAddInstanceRequest) *TargetPoolsAddInstanceCall {
-- c := &TargetPoolsAddInstanceCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.region = region
-- c.targetPool = targetPool
-- c.targetpoolsaddinstancerequest = targetpoolsaddinstancerequest
-- return c
+-// DataType sets the dataType field and return the receiver
+-func (p *Parameter) DataType(typeName string) *Parameter {
+- p.data.DataType = typeName
+- return p
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/path_expression.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/path_expression.go
+deleted file mode 100644
+index 8749cb5..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/path_expression.go
++++ /dev/null
+@@ -1,56 +0,0 @@
+-package restful
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *TargetPoolsAddInstanceCall) Fields(s ...googleapi.Field) *TargetPoolsAddInstanceCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-// Copyright 2013 Ernest Micklei. All rights reserved.
+-// Use of this source code is governed by a license
+-// that can be found in the LICENSE file.
+-
+-import (
+- "bytes"
+- "regexp"
+- "strings"
+-)
+-
+-// PathExpression holds a compiled path expression (RegExp) needed to match against
+-// Http request paths and to extract path parameter values.
+-type pathExpression struct {
+- LiteralCount int // the number of literal characters (means those not resulting from template variable substitution)
+- VarCount int // the number of named parameters (enclosed by {}) in the path
+- Matcher *regexp.Regexp
+- Source string // Path as defined by the RouteBuilder
+- tokens []string
-}
-
--func (c *TargetPoolsAddInstanceCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.targetpoolsaddinstancerequest)
-- if err != nil {
-- return nil, err
-- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/targetPools/{targetPool}/addInstance")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "region": c.region,
-- "targetPool": c.targetPool,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+-// NewPathExpression creates a PathExpression from the input URL path.
+-// Returns an error if the path is invalid.
+-func newPathExpression(path string) (*pathExpression, error) {
+- expression, literalCount, varCount, tokens := templateToRegularExpression(path)
+- compiled, err := regexp.Compile(expression)
- if err != nil {
- return nil, err
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Adds instance url to targetPool.",
-- // "httpMethod": "POST",
-- // "id": "compute.targetPools.addInstance",
-- // "parameterOrder": [
-- // "project",
-- // "region",
-- // "targetPool"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "region": {
-- // "description": "Name of the region scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "targetPool": {
-- // "description": "Name of the TargetPool resource to which instance_url is to be added.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/regions/{region}/targetPools/{targetPool}/addInstance",
-- // "request": {
-- // "$ref": "TargetPoolsAddInstanceRequest"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
+- return &pathExpression{literalCount, varCount, compiled, expression, tokens}, nil
+-}
-
+-// http://jsr311.java.net/nonav/releases/1.1/spec/spec3.html#x3-370003.7.3
+-func templateToRegularExpression(template string) (expression string, literalCount int, varCount int, tokens []string) {
+- var buffer bytes.Buffer
+- buffer.WriteString("^")
+- //tokens = strings.Split(template, "/")
+- tokens = tokenizePath(template)
+- for _, each := range tokens {
+- if each == "" {
+- continue
+- }
+- buffer.WriteString("/")
+- if strings.HasPrefix(each, "{") {
+- // ignore var spec
+- varCount += 1
+- buffer.WriteString("([^/]+?)")
+- } else {
+- literalCount += len(each)
+- encoded := each // TODO URI encode
+- buffer.WriteString(regexp.QuoteMeta(encoded))
+- }
+- }
+- return strings.TrimRight(buffer.String(), "/") + "(/.*)?$", literalCount, varCount, tokens
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/request.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/request.go
+deleted file mode 100644
+index 00a069f..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/request.go
++++ /dev/null
+@@ -1,135 +0,0 @@
+-package restful
-
--// method id "compute.targetPools.aggregatedList":
+-// Copyright 2013 Ernest Micklei. All rights reserved.
+-// Use of this source code is governed by a license
+-// that can be found in the LICENSE file.
-
--type TargetPoolsAggregatedListCall struct {
-- s *Service
-- project string
-- opt_ map[string]interface{}
+-import (
+- "bytes"
+- "encoding/json"
+- "encoding/xml"
+- "io"
+- "io/ioutil"
+- "net/http"
+- "strings"
+-)
+-
+-var defaultRequestContentType string
+-
+-var doCacheReadEntityBytes = true
+-
+-// Request is a wrapper for a http Request that provides convenience methods
+-type Request struct {
+- Request *http.Request
+- bodyContent *[]byte // to cache the request body for multiple reads of ReadEntity
+- pathParameters map[string]string
+- attributes map[string]interface{} // for storing request-scoped values
+- selectedRoutePath string // root path + route path that matched the request, e.g. /meetings/{id}/attendees
-}
-
--// AggregatedList: Retrieves the list of target pools grouped by scope.
--func (r *TargetPoolsService) AggregatedList(project string) *TargetPoolsAggregatedListCall {
-- c := &TargetPoolsAggregatedListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- return c
+-func NewRequest(httpRequest *http.Request) *Request {
+- return &Request{
+- Request: httpRequest,
+- pathParameters: map[string]string{},
+- attributes: map[string]interface{}{},
+- } // empty parameters, attributes
-}
-
--// Filter sets the optional parameter "filter": Filter expression for
--// filtering listed resources.
--func (c *TargetPoolsAggregatedListCall) Filter(filter string) *TargetPoolsAggregatedListCall {
-- c.opt_["filter"] = filter
-- return c
+-// If ContentType is missing or */* is given then fall back to this type, otherwise
+-// a "Unable to unmarshal content of type:" response is returned.
+-// Valid values are restful.MIME_JSON and restful.MIME_XML
+-// Example:
+-// restful.DefaultRequestContentType(restful.MIME_JSON)
+-func DefaultRequestContentType(mime string) {
+- defaultRequestContentType = mime
-}
-
--// MaxResults sets the optional parameter "maxResults": Maximum count of
--// results to be returned. Maximum value is 500 and default value is
--// 500.
--func (c *TargetPoolsAggregatedListCall) MaxResults(maxResults int64) *TargetPoolsAggregatedListCall {
-- c.opt_["maxResults"] = maxResults
-- return c
+-// SetCacheReadEntity controls whether the response data ([]byte) is cached such that ReadEntity is repeatable.
+-// Default is true (due to backwardcompatibility). For better performance, you should set it to false if you don't need it.
+-func SetCacheReadEntity(doCache bool) {
+- doCacheReadEntityBytes = doCache
-}
-
--// PageToken sets the optional parameter "pageToken": Tag returned by a
--// previous list request truncated by maxResults. Used to continue a
--// previous list request.
--func (c *TargetPoolsAggregatedListCall) PageToken(pageToken string) *TargetPoolsAggregatedListCall {
-- c.opt_["pageToken"] = pageToken
-- return c
+-// PathParameter accesses the Path parameter value by its name
+-func (r *Request) PathParameter(name string) string {
+- return r.pathParameters[name]
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *TargetPoolsAggregatedListCall) Fields(s ...googleapi.Field) *TargetPoolsAggregatedListCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-// PathParameters accesses the Path parameter values
+-func (r *Request) PathParameters() map[string]string {
+- return r.pathParameters
-}
-
--func (c *TargetPoolsAggregatedListCall) Do() (*TargetPoolAggregatedList, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["filter"]; ok {
-- params.Set("filter", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["maxResults"]; ok {
-- params.Set("maxResults", fmt.Sprintf("%v", v))
+-// QueryParameter returns the (first) Query parameter value by its name
+-func (r *Request) QueryParameter(name string) string {
+- return r.Request.FormValue(name)
+-}
+-
+-// BodyParameter parses the body of the request (once for typically a POST or a PUT) and returns the value of the given name or an error.
+-func (r *Request) BodyParameter(name string) (string, error) {
+- err := r.Request.ParseForm()
+- if err != nil {
+- return "", err
- }
-- if v, ok := c.opt_["pageToken"]; ok {
-- params.Set("pageToken", fmt.Sprintf("%v", v))
+- return r.Request.PostFormValue(name), nil
+-}
+-
+-// HeaderParameter returns the HTTP Header value of a Header name or empty if missing
+-func (r *Request) HeaderParameter(name string) string {
+- return r.Request.Header.Get(name)
+-}
+-
+-// ReadEntity checks the Accept header and reads the content into the entityPointer
+-// May be called multiple times in the request-response flow
+-func (r *Request) ReadEntity(entityPointer interface{}) (err error) {
+- contentType := r.Request.Header.Get(HEADER_ContentType)
+- if doCacheReadEntityBytes {
+- return r.cachingReadEntity(contentType, entityPointer)
- }
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+- // unmarshall directly from request Body
+- return r.decodeEntity(r.Request.Body, contentType, entityPointer)
+-}
+-
+-func (r *Request) cachingReadEntity(contentType string, entityPointer interface{}) (err error) {
+- var buffer []byte
+- if r.bodyContent != nil {
+- buffer = *r.bodyContent
+- } else {
+- buffer, err = ioutil.ReadAll(r.Request.Body)
+- if err != nil {
+- return err
+- }
+- r.bodyContent = &buffer
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/aggregated/targetPools")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
+- return r.decodeEntity(bytes.NewReader(buffer), contentType, entityPointer)
+-}
+-
+-func (r *Request) decodeEntity(reader io.Reader, contentType string, entityPointer interface{}) (err error) {
+- if strings.Contains(contentType, MIME_XML) {
+- return xml.NewDecoder(reader).Decode(entityPointer)
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- if strings.Contains(contentType, MIME_JSON) || MIME_JSON == defaultRequestContentType {
+- decoder := json.NewDecoder(reader)
+- decoder.UseNumber()
+- return decoder.Decode(entityPointer)
- }
-- var ret *TargetPoolAggregatedList
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- if MIME_XML == defaultRequestContentType {
+- return xml.NewDecoder(reader).Decode(entityPointer)
- }
-- return ret, nil
-- // {
-- // "description": "Retrieves the list of target pools grouped by scope.",
-- // "httpMethod": "GET",
-- // "id": "compute.targetPools.aggregatedList",
-- // "parameterOrder": [
-- // "project"
-- // ],
-- // "parameters": {
-- // "filter": {
-- // "description": "Optional. Filter expression for filtering listed resources.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "maxResults": {
-- // "default": "500",
-- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
-- // "format": "uint32",
-- // "location": "query",
-- // "maximum": "500",
-- // "minimum": "0",
-- // "type": "integer"
-- // },
-- // "pageToken": {
-- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/aggregated/targetPools",
-- // "response": {
-- // "$ref": "TargetPoolAggregatedList"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
+- return NewError(400, "Unable to unmarshal content of type:"+contentType)
+-}
-
+-// SetAttribute adds or replaces the attribute with the given value.
+-func (r *Request) SetAttribute(name string, value interface{}) {
+- r.attributes[name] = value
-}
-
--// method id "compute.targetPools.delete":
+-// Attribute returns the value associated to the given name. Returns nil if absent.
+-func (r Request) Attribute(name string) interface{} {
+- return r.attributes[name]
+-}
-
--type TargetPoolsDeleteCall struct {
-- s *Service
-- project string
-- region string
-- targetPool string
-- opt_ map[string]interface{}
+-// SelectedRoutePath root path + route path that matched the request, e.g. /meetings/{id}/attendees
+-func (r Request) SelectedRoutePath() string {
+- return r.selectedRoutePath
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/request_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/request_test.go
+deleted file mode 100644
+index 6e7c55b..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/request_test.go
++++ /dev/null
+@@ -1,204 +0,0 @@
+-package restful
-
--// Delete: Deletes the specified TargetPool resource.
--func (r *TargetPoolsService) Delete(project string, region string, targetPool string) *TargetPoolsDeleteCall {
-- c := &TargetPoolsDeleteCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.region = region
-- c.targetPool = targetPool
-- return c
+-import (
+- "encoding/json"
+- "net/http"
+- "net/url"
+- "strconv"
+- "strings"
+- "testing"
+-)
+-
+-func TestQueryParameter(t *testing.T) {
+- hreq := http.Request{Method: "GET"}
+- hreq.URL, _ = url.Parse("http://www.google.com/search?q=foo&q=bar")
+- rreq := Request{Request: &hreq}
+- if rreq.QueryParameter("q") != "foo" {
+- t.Errorf("q!=foo %#v", rreq)
+- }
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *TargetPoolsDeleteCall) Fields(s ...googleapi.Field) *TargetPoolsDeleteCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-type Anything map[string]interface{}
+-
+-type Number struct {
+- ValueFloat float64
+- ValueInt int64
-}
-
--func (c *TargetPoolsDeleteCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/targetPools/{targetPool}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("DELETE", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "region": c.region,
-- "targetPool": c.targetPool,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Deletes the specified TargetPool resource.",
-- // "httpMethod": "DELETE",
-- // "id": "compute.targetPools.delete",
-- // "parameterOrder": [
-- // "project",
-- // "region",
-- // "targetPool"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "region": {
-- // "description": "Name of the region scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "targetPool": {
-- // "description": "Name of the TargetPool resource to delete.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/regions/{region}/targetPools/{targetPool}",
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
+-type Sample struct {
+- Value string
+-}
-
+-func TestReadEntityXml(t *testing.T) {
+- SetCacheReadEntity(true)
+- bodyReader := strings.NewReader("<Sample><Value>42</Value></Sample>")
+- httpRequest, _ := http.NewRequest("GET", "/test", bodyReader)
+- httpRequest.Header.Set("Content-Type", "application/xml")
+- request := &Request{Request: httpRequest}
+- sam := new(Sample)
+- request.ReadEntity(sam)
+- if sam.Value != "42" {
+- t.Fatal("read failed")
+- }
+- if request.bodyContent == nil {
+- t.Fatal("no expected cached bytes found")
+- }
-}
-
--// method id "compute.targetPools.get":
--
--type TargetPoolsGetCall struct {
-- s *Service
-- project string
-- region string
-- targetPool string
-- opt_ map[string]interface{}
+-func TestReadEntityXmlNonCached(t *testing.T) {
+- SetCacheReadEntity(false)
+- bodyReader := strings.NewReader("<Sample><Value>42</Value></Sample>")
+- httpRequest, _ := http.NewRequest("GET", "/test", bodyReader)
+- httpRequest.Header.Set("Content-Type", "application/xml")
+- request := &Request{Request: httpRequest}
+- sam := new(Sample)
+- request.ReadEntity(sam)
+- if sam.Value != "42" {
+- t.Fatal("read failed")
+- }
+- if request.bodyContent != nil {
+- t.Fatal("unexpected cached bytes found")
+- }
-}
-
--// Get: Returns the specified TargetPool resource.
--func (r *TargetPoolsService) Get(project string, region string, targetPool string) *TargetPoolsGetCall {
-- c := &TargetPoolsGetCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.region = region
-- c.targetPool = targetPool
-- return c
+-func TestReadEntityJson(t *testing.T) {
+- bodyReader := strings.NewReader(`{"Value" : "42"}`)
+- httpRequest, _ := http.NewRequest("GET", "/test", bodyReader)
+- httpRequest.Header.Set("Content-Type", "application/json")
+- request := &Request{Request: httpRequest}
+- sam := new(Sample)
+- request.ReadEntity(sam)
+- if sam.Value != "42" {
+- t.Fatal("read failed")
+- }
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *TargetPoolsGetCall) Fields(s ...googleapi.Field) *TargetPoolsGetCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func TestReadEntityJsonCharset(t *testing.T) {
+- bodyReader := strings.NewReader(`{"Value" : "42"}`)
+- httpRequest, _ := http.NewRequest("GET", "/test", bodyReader)
+- httpRequest.Header.Set("Content-Type", "application/json; charset=UTF-8")
+- request := NewRequest(httpRequest)
+- sam := new(Sample)
+- request.ReadEntity(sam)
+- if sam.Value != "42" {
+- t.Fatal("read failed")
+- }
-}
-
--func (c *TargetPoolsGetCall) Do() (*TargetPool, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+-func TestReadEntityJsonNumber(t *testing.T) {
+- SetCacheReadEntity(true)
+- bodyReader := strings.NewReader(`{"Value" : 4899710515899924123}`)
+- httpRequest, _ := http.NewRequest("GET", "/test", bodyReader)
+- httpRequest.Header.Set("Content-Type", "application/json")
+- request := &Request{Request: httpRequest}
+- any := make(Anything)
+- request.ReadEntity(&any)
+- number, ok := any["Value"].(json.Number)
+- if !ok {
+- t.Fatal("read failed")
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/targetPools/{targetPool}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "region": c.region,
-- "targetPool": c.targetPool,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+- vint, err := number.Int64()
- if err != nil {
-- return nil, err
+- t.Fatal("convert failed")
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- if vint != 4899710515899924123 {
+- t.Fatal("read failed")
- }
-- var ret *TargetPool
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- vfloat, err := number.Float64()
+- if err != nil {
+- t.Fatal("convert failed")
+- }
+- // match the default behaviour
+- vstring := strconv.FormatFloat(vfloat, 'e', 15, 64)
+- if vstring != "4.899710515899924e+18" {
+- t.Fatal("convert float64 failed")
- }
-- return ret, nil
-- // {
-- // "description": "Returns the specified TargetPool resource.",
-- // "httpMethod": "GET",
-- // "id": "compute.targetPools.get",
-- // "parameterOrder": [
-- // "project",
-- // "region",
-- // "targetPool"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "region": {
-- // "description": "Name of the region scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "targetPool": {
-- // "description": "Name of the TargetPool resource to return.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/regions/{region}/targetPools/{targetPool}",
-- // "response": {
-- // "$ref": "TargetPool"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
--
--}
--
--// method id "compute.targetPools.getHealth":
--
--type TargetPoolsGetHealthCall struct {
-- s *Service
-- project string
-- region string
-- targetPool string
-- instancereference *InstanceReference
-- opt_ map[string]interface{}
-}
-
--// GetHealth: Gets the most recent health check results for each IP for
--// the given instance that is referenced by given TargetPool.
--func (r *TargetPoolsService) GetHealth(project string, region string, targetPool string, instancereference *InstanceReference) *TargetPoolsGetHealthCall {
-- c := &TargetPoolsGetHealthCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.region = region
-- c.targetPool = targetPool
-- c.instancereference = instancereference
-- return c
+-func TestReadEntityJsonNumberNonCached(t *testing.T) {
+- SetCacheReadEntity(false)
+- bodyReader := strings.NewReader(`{"Value" : 4899710515899924123}`)
+- httpRequest, _ := http.NewRequest("GET", "/test", bodyReader)
+- httpRequest.Header.Set("Content-Type", "application/json")
+- request := &Request{Request: httpRequest}
+- any := make(Anything)
+- request.ReadEntity(&any)
+- number, ok := any["Value"].(json.Number)
+- if !ok {
+- t.Fatal("read failed")
+- }
+- vint, err := number.Int64()
+- if err != nil {
+- t.Fatal("convert failed")
+- }
+- if vint != 4899710515899924123 {
+- t.Fatal("read failed")
+- }
+- vfloat, err := number.Float64()
+- if err != nil {
+- t.Fatal("convert failed")
+- }
+- // match the default behaviour
+- vstring := strconv.FormatFloat(vfloat, 'e', 15, 64)
+- if vstring != "4.899710515899924e+18" {
+- t.Fatal("convert float64 failed")
+- }
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *TargetPoolsGetHealthCall) Fields(s ...googleapi.Field) *TargetPoolsGetHealthCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func TestReadEntityJsonLong(t *testing.T) {
+- bodyReader := strings.NewReader(`{"ValueFloat" : 4899710515899924123, "ValueInt": 4899710515899924123}`)
+- httpRequest, _ := http.NewRequest("GET", "/test", bodyReader)
+- httpRequest.Header.Set("Content-Type", "application/json")
+- request := &Request{Request: httpRequest}
+- number := new(Number)
+- request.ReadEntity(&number)
+- if number.ValueInt != 4899710515899924123 {
+- t.Fatal("read failed")
+- }
+- // match the default behaviour
+- vstring := strconv.FormatFloat(number.ValueFloat, 'e', 15, 64)
+- if vstring != "4.899710515899924e+18" {
+- t.Fatal("convert float64 failed")
+- }
-}
-
--func (c *TargetPoolsGetHealthCall) Do() (*TargetPoolInstanceHealth, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.instancereference)
+-func TestBodyParameter(t *testing.T) {
+- bodyReader := strings.NewReader(`value1=42&value2=43`)
+- httpRequest, _ := http.NewRequest("POST", "/test?value1=44", bodyReader) // POST and PUT body parameters take precedence over URL query string
+- httpRequest.Header.Set("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8")
+- request := NewRequest(httpRequest)
+- v1, err := request.BodyParameter("value1")
- if err != nil {
-- return nil, err
-- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+- t.Error(err)
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/targetPools/{targetPool}/getHealth")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "region": c.region,
-- "targetPool": c.targetPool,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+- v2, err := request.BodyParameter("value2")
- if err != nil {
-- return nil, err
+- t.Error(err)
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- if v1 != "42" || v2 != "43" {
+- t.Fatal("read failed")
- }
-- var ret *TargetPoolInstanceHealth
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-}
+-
+-func TestReadEntityUnkown(t *testing.T) {
+- bodyReader := strings.NewReader("?")
+- httpRequest, _ := http.NewRequest("GET", "/test", bodyReader)
+- httpRequest.Header.Set("Content-Type", "application/rubbish")
+- request := NewRequest(httpRequest)
+- sam := new(Sample)
+- err := request.ReadEntity(sam)
+- if err == nil {
+- t.Fatal("read should be in error")
- }
-- return ret, nil
-- // {
-- // "description": "Gets the most recent health check results for each IP for the given instance that is referenced by given TargetPool.",
-- // "httpMethod": "POST",
-- // "id": "compute.targetPools.getHealth",
-- // "parameterOrder": [
-- // "project",
-- // "region",
-- // "targetPool"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "region": {
-- // "description": "Name of the region scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "targetPool": {
-- // "description": "Name of the TargetPool resource to which the queried instance belongs.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/regions/{region}/targetPools/{targetPool}/getHealth",
-- // "request": {
-- // "$ref": "InstanceReference"
-- // },
-- // "response": {
-- // "$ref": "TargetPoolInstanceHealth"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
+-}
-
+-func TestSetAttribute(t *testing.T) {
+- bodyReader := strings.NewReader("?")
+- httpRequest, _ := http.NewRequest("GET", "/test", bodyReader)
+- request := NewRequest(httpRequest)
+- request.SetAttribute("go", "there")
+- there := request.Attribute("go")
+- if there != "there" {
+- t.Fatalf("missing request attribute:%v", there)
+- }
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/response.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/response.go
+deleted file mode 100644
+index 2b6d762..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/response.go
++++ /dev/null
+@@ -1,233 +0,0 @@
+-package restful
-
--// method id "compute.targetPools.insert":
+-// Copyright 2013 Ernest Micklei. All rights reserved.
+-// Use of this source code is governed by a license
+-// that can be found in the LICENSE file.
-
--type TargetPoolsInsertCall struct {
-- s *Service
-- project string
-- region string
-- targetpool *TargetPool
-- opt_ map[string]interface{}
--}
+-import (
+- "encoding/json"
+- "encoding/xml"
+- "net/http"
+- "strings"
+-)
-
--// Insert: Creates a TargetPool resource in the specified project and
--// region using the data included in the request.
--func (r *TargetPoolsService) Insert(project string, region string, targetpool *TargetPool) *TargetPoolsInsertCall {
-- c := &TargetPoolsInsertCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.region = region
-- c.targetpool = targetpool
-- return c
+-// DEPRECATED, use DefaultResponseContentType(mime)
+-var DefaultResponseMimeType string
+-
+-//PrettyPrintResponses controls the indentation feature of XML and JSON
+-//serialization in the response methods WriteEntity, WriteAsJson, and
+-//WriteAsXml.
+-var PrettyPrintResponses = true
+-
+-// Response is a wrapper on the actual http ResponseWriter
+-// It provides several convenience methods to prepare and write response content.
+-type Response struct {
+- http.ResponseWriter
+- requestAccept string // mime-type what the Http Request says it wants to receive
+- routeProduces []string // mime-types what the Route says it can produce
+- statusCode int // HTTP status code that has been written explicity (if zero then net/http has written 200)
+- contentLength int // number of bytes written for the response body
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *TargetPoolsInsertCall) Fields(s ...googleapi.Field) *TargetPoolsInsertCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-// Creates a new response based on a http ResponseWriter.
+-func NewResponse(httpWriter http.ResponseWriter) *Response {
+- return &Response{httpWriter, "", []string{}, http.StatusOK, 0} // empty content-types
-}
-
--func (c *TargetPoolsInsertCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.targetpool)
-- if err != nil {
-- return nil, err
-- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/targetPools")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "region": c.region,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Creates a TargetPool resource in the specified project and region using the data included in the request.",
-- // "httpMethod": "POST",
-- // "id": "compute.targetPools.insert",
-- // "parameterOrder": [
-- // "project",
-- // "region"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "region": {
-- // "description": "Name of the region scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/regions/{region}/targetPools",
-- // "request": {
-- // "$ref": "TargetPool"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
+-// If Accept header matching fails, fall back to this type, otherwise
+-// a "406: Not Acceptable" response is returned.
+-// Valid values are restful.MIME_JSON and restful.MIME_XML
+-// Example:
+-// restful.DefaultResponseContentType(restful.MIME_JSON)
+-func DefaultResponseContentType(mime string) {
+- DefaultResponseMimeType = mime
+-}
-
+-// InternalServerError writes the StatusInternalServerError header.
+-// DEPRECATED, use WriteErrorString(http.StatusInternalServerError,reason)
+-func (r Response) InternalServerError() Response {
+- r.WriteHeader(http.StatusInternalServerError)
+- return r
-}
-
--// method id "compute.targetPools.list":
+-// AddHeader is a shortcut for .Header().Add(header,value)
+-func (r Response) AddHeader(header string, value string) Response {
+- r.Header().Add(header, value)
+- return r
+-}
-
--type TargetPoolsListCall struct {
-- s *Service
-- project string
-- region string
-- opt_ map[string]interface{}
+-// SetRequestAccepts tells the response what Mime-type(s) the HTTP request said it wants to accept. Exposed for testing.
+-func (r *Response) SetRequestAccepts(mime string) {
+- r.requestAccept = mime
-}
-
--// List: Retrieves the list of TargetPool resources available to the
--// specified project and region.
--func (r *TargetPoolsService) List(project string, region string) *TargetPoolsListCall {
-- c := &TargetPoolsListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.region = region
-- return c
+-// WriteEntity marshals the value using the representation denoted by the Accept Header (XML or JSON)
+-// If no Accept header is specified (or */*) then return the Content-Type as specified by the first in the Route.Produces.
+-// If an Accept header is specified then return the Content-Type as specified by the first in the Route.Produces that is matched with the Accept header.
+-// If the value is nil then nothing is written. You may want to call WriteHeader(http.StatusNotFound) instead.
+-// Current implementation ignores any q-parameters in the Accept Header.
+-func (r *Response) WriteEntity(value interface{}) error {
+- if value == nil { // do not write a nil representation
+- return nil
+- }
+- for _, qualifiedMime := range strings.Split(r.requestAccept, ",") {
+- mime := strings.Trim(strings.Split(qualifiedMime, ";")[0], " ")
+- if 0 == len(mime) || mime == "*/*" {
+- for _, each := range r.routeProduces {
+- if MIME_JSON == each {
+- return r.WriteAsJson(value)
+- }
+- if MIME_XML == each {
+- return r.WriteAsXml(value)
+- }
+- }
+- } else { // mime is not blank; see if we have a match in Produces
+- for _, each := range r.routeProduces {
+- if mime == each {
+- if MIME_JSON == each {
+- return r.WriteAsJson(value)
+- }
+- if MIME_XML == each {
+- return r.WriteAsXml(value)
+- }
+- }
+- }
+- }
+- }
+- if DefaultResponseMimeType == MIME_JSON {
+- return r.WriteAsJson(value)
+- } else if DefaultResponseMimeType == MIME_XML {
+- return r.WriteAsXml(value)
+- } else {
+- if trace {
+- traceLogger.Printf("mismatch in mime-types and no defaults; (http)Accept=%v,(route)Produces=%v\n", r.requestAccept, r.routeProduces)
+- }
+- r.WriteHeader(http.StatusNotAcceptable) // for recording only
+- r.ResponseWriter.WriteHeader(http.StatusNotAcceptable)
+- if _, err := r.Write([]byte("406: Not Acceptable")); err != nil {
+- return err
+- }
+- }
+- return nil
-}
-
--// Filter sets the optional parameter "filter": Filter expression for
--// filtering listed resources.
--func (c *TargetPoolsListCall) Filter(filter string) *TargetPoolsListCall {
-- c.opt_["filter"] = filter
-- return c
--}
+-// WriteAsXml is a convenience method for writing a value in xml (requires Xml tags on the value)
+-func (r *Response) WriteAsXml(value interface{}) error {
+- var output []byte
+- var err error
-
--// MaxResults sets the optional parameter "maxResults": Maximum count of
--// results to be returned. Maximum value is 500 and default value is
--// 500.
--func (c *TargetPoolsListCall) MaxResults(maxResults int64) *TargetPoolsListCall {
-- c.opt_["maxResults"] = maxResults
-- return c
--}
+- if value == nil { // do not write a nil representation
+- return nil
+- }
+- if PrettyPrintResponses {
+- output, err = xml.MarshalIndent(value, " ", " ")
+- } else {
+- output, err = xml.Marshal(value)
+- }
-
--// PageToken sets the optional parameter "pageToken": Tag returned by a
--// previous list request truncated by maxResults. Used to continue a
--// previous list request.
--func (c *TargetPoolsListCall) PageToken(pageToken string) *TargetPoolsListCall {
-- c.opt_["pageToken"] = pageToken
-- return c
+- if err != nil {
+- return r.WriteError(http.StatusInternalServerError, err)
+- }
+- r.Header().Set(HEADER_ContentType, MIME_XML)
+- if r.statusCode > 0 { // a WriteHeader was intercepted
+- r.ResponseWriter.WriteHeader(r.statusCode)
+- }
+- _, err = r.Write([]byte(xml.Header))
+- if err != nil {
+- return err
+- }
+- if _, err = r.Write(output); err != nil {
+- return err
+- }
+- return nil
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *TargetPoolsListCall) Fields(s ...googleapi.Field) *TargetPoolsListCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
--}
+-// WriteAsJson is a convenience method for writing a value in json
+-func (r *Response) WriteAsJson(value interface{}) error {
+- var output []byte
+- var err error
-
--func (c *TargetPoolsListCall) Do() (*TargetPoolList, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["filter"]; ok {
-- params.Set("filter", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["maxResults"]; ok {
-- params.Set("maxResults", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["pageToken"]; ok {
-- params.Set("pageToken", fmt.Sprintf("%v", v))
+- if value == nil { // do not write a nil representation
+- return nil
- }
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+- if PrettyPrintResponses {
+- output, err = json.MarshalIndent(value, " ", " ")
+- } else {
+- output, err = json.Marshal(value)
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/targetPools")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "region": c.region,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+-
- if err != nil {
-- return nil, err
+- return r.WriteErrorString(http.StatusInternalServerError, err.Error())
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- r.Header().Set(HEADER_ContentType, MIME_JSON)
+- if r.statusCode > 0 { // a WriteHeader was intercepted
+- r.ResponseWriter.WriteHeader(r.statusCode)
- }
-- var ret *TargetPoolList
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- if _, err = r.Write(output); err != nil {
+- return err
- }
-- return ret, nil
-- // {
-- // "description": "Retrieves the list of TargetPool resources available to the specified project and region.",
-- // "httpMethod": "GET",
-- // "id": "compute.targetPools.list",
-- // "parameterOrder": [
-- // "project",
-- // "region"
-- // ],
-- // "parameters": {
-- // "filter": {
-- // "description": "Optional. Filter expression for filtering listed resources.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "maxResults": {
-- // "default": "500",
-- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
-- // "format": "uint32",
-- // "location": "query",
-- // "maximum": "500",
-- // "minimum": "0",
-- // "type": "integer"
-- // },
-- // "pageToken": {
-- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "region": {
-- // "description": "Name of the region scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/regions/{region}/targetPools",
-- // "response": {
-- // "$ref": "TargetPoolList"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
--
+- return nil
-}
-
--// method id "compute.targetPools.removeHealthCheck":
--
--type TargetPoolsRemoveHealthCheckCall struct {
-- s *Service
-- project string
-- region string
-- targetPool string
-- targetpoolsremovehealthcheckrequest *TargetPoolsRemoveHealthCheckRequest
-- opt_ map[string]interface{}
+-// WriteError write the http status and the error string on the response.
+-func (r *Response) WriteError(httpStatus int, err error) error {
+- return r.WriteErrorString(httpStatus, err.Error())
-}
-
--// RemoveHealthCheck: Removes health check URL from targetPool.
--func (r *TargetPoolsService) RemoveHealthCheck(project string, region string, targetPool string, targetpoolsremovehealthcheckrequest *TargetPoolsRemoveHealthCheckRequest) *TargetPoolsRemoveHealthCheckCall {
-- c := &TargetPoolsRemoveHealthCheckCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.region = region
-- c.targetPool = targetPool
-- c.targetpoolsremovehealthcheckrequest = targetpoolsremovehealthcheckrequest
-- return c
+-// WriteServiceError is a convenience method for a responding with a ServiceError and a status
+-func (r *Response) WriteServiceError(httpStatus int, err ServiceError) error {
+- r.WriteHeader(httpStatus) // for recording only
+- return r.WriteEntity(err)
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *TargetPoolsRemoveHealthCheckCall) Fields(s ...googleapi.Field) *TargetPoolsRemoveHealthCheckCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-// WriteErrorString is a convenience method for an error status with the actual error
+-func (r *Response) WriteErrorString(status int, errorReason string) error {
+- r.statusCode = status // for recording only
+- r.ResponseWriter.WriteHeader(status)
+- if _, err := r.Write([]byte(errorReason)); err != nil {
+- return err
+- }
+- return nil
-}
-
--func (c *TargetPoolsRemoveHealthCheckCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.targetpoolsremovehealthcheckrequest)
-- if err != nil {
-- return nil, err
-- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/targetPools/{targetPool}/removeHealthCheck")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "region": c.region,
-- "targetPool": c.targetPool,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+-// WriteHeader is overridden to remember the Status Code that has been written.
+-// Note that using this method, the status value is only written when
+-// - calling WriteEntity
+-// - or directly WriteAsXml,WriteAsJson.
+-// - or if the status is 204 (http.StatusNoContent)
+-func (r *Response) WriteHeader(httpStatus int) {
+- r.statusCode = httpStatus
+- // if 204 then WriteEntity will not be called so we need to pass this code
+- if http.StatusNoContent == httpStatus {
+- r.ResponseWriter.WriteHeader(httpStatus)
- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-}
+-
+-// StatusCode returns the code that has been written using WriteHeader.
+-func (r Response) StatusCode() int {
+- if 0 == r.statusCode {
+- // no status code has been written yet; assume OK
+- return http.StatusOK
- }
-- return ret, nil
-- // {
-- // "description": "Removes health check URL from targetPool.",
-- // "httpMethod": "POST",
-- // "id": "compute.targetPools.removeHealthCheck",
-- // "parameterOrder": [
-- // "project",
-- // "region",
-- // "targetPool"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "region": {
-- // "description": "Name of the region scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "targetPool": {
-- // "description": "Name of the TargetPool resource to which health_check_url is to be removed.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/regions/{region}/targetPools/{targetPool}/removeHealthCheck",
-- // "request": {
-- // "$ref": "TargetPoolsRemoveHealthCheckRequest"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
+- return r.statusCode
+-}
-
+-// Write writes the data to the connection as part of an HTTP reply.
+-// Write is part of http.ResponseWriter interface.
+-func (r *Response) Write(bytes []byte) (int, error) {
+- written, err := r.ResponseWriter.Write(bytes)
+- r.contentLength += written
+- return written, err
-}
-
--// method id "compute.targetPools.removeInstance":
+-// ContentLength returns the number of bytes written for the response content.
+-// Note that this value is only correct if all data is written through the Response using its Write* methods.
+-// Data written directly using the underlying http.ResponseWriter is not accounted for.
+-func (r Response) ContentLength() int {
+- return r.contentLength
+-}
-
--type TargetPoolsRemoveInstanceCall struct {
-- s *Service
-- project string
-- region string
-- targetPool string
-- targetpoolsremoveinstancerequest *TargetPoolsRemoveInstanceRequest
-- opt_ map[string]interface{}
+-// CloseNotify is part of http.CloseNotifier interface
+-func (r Response) CloseNotify() <-chan bool {
+- return r.ResponseWriter.(http.CloseNotifier).CloseNotify()
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/response_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/response_test.go
+deleted file mode 100644
+index 314a95a..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/response_test.go
++++ /dev/null
+@@ -1,137 +0,0 @@
+-package restful
-
--// RemoveInstance: Removes instance URL from targetPool.
--func (r *TargetPoolsService) RemoveInstance(project string, region string, targetPool string, targetpoolsremoveinstancerequest *TargetPoolsRemoveInstanceRequest) *TargetPoolsRemoveInstanceCall {
-- c := &TargetPoolsRemoveInstanceCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.region = region
-- c.targetPool = targetPool
-- c.targetpoolsremoveinstancerequest = targetpoolsremoveinstancerequest
-- return c
+-import (
+- "errors"
+- "net/http"
+- "net/http/httptest"
+- "testing"
+-)
+-
+-func TestWriteHeader(t *testing.T) {
+- httpWriter := httptest.NewRecorder()
+- resp := Response{httpWriter, "*/*", []string{"*/*"}, 0, 0}
+- resp.WriteHeader(123)
+- if resp.StatusCode() != 123 {
+- t.Errorf("Unexpected status code:%d", resp.StatusCode())
+- }
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *TargetPoolsRemoveInstanceCall) Fields(s ...googleapi.Field) *TargetPoolsRemoveInstanceCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func TestNoWriteHeader(t *testing.T) {
+- httpWriter := httptest.NewRecorder()
+- resp := Response{httpWriter, "*/*", []string{"*/*"}, 0, 0}
+- if resp.StatusCode() != http.StatusOK {
+- t.Errorf("Unexpected status code:%d", resp.StatusCode())
+- }
-}
-
--func (c *TargetPoolsRemoveInstanceCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.targetpoolsremoveinstancerequest)
-- if err != nil {
-- return nil, err
+-type food struct {
+- Kind string
+-}
+-
+-// go test -v -test.run TestMeasureContentLengthXml ...restful
+-func TestMeasureContentLengthXml(t *testing.T) {
+- httpWriter := httptest.NewRecorder()
+- resp := Response{httpWriter, "*/*", []string{"*/*"}, 0, 0}
+- resp.WriteAsXml(food{"apple"})
+- if resp.ContentLength() != 76 {
+- t.Errorf("Incorrect measured length:%d", resp.ContentLength())
- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+-}
+-
+-// go test -v -test.run TestMeasureContentLengthJson ...restful
+-func TestMeasureContentLengthJson(t *testing.T) {
+- httpWriter := httptest.NewRecorder()
+- resp := Response{httpWriter, "*/*", []string{"*/*"}, 0, 0}
+- resp.WriteAsJson(food{"apple"})
+- if resp.ContentLength() != 22 {
+- t.Errorf("Incorrect measured length:%d", resp.ContentLength())
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/targetPools/{targetPool}/removeInstance")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "region": c.region,
-- "targetPool": c.targetPool,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
+-}
+-
+-// go test -v -test.run TestMeasureContentLengthWriteErrorString ...restful
+-func TestMeasureContentLengthWriteErrorString(t *testing.T) {
+- httpWriter := httptest.NewRecorder()
+- resp := Response{httpWriter, "*/*", []string{"*/*"}, 0, 0}
+- resp.WriteErrorString(404, "Invalid")
+- if resp.ContentLength() != len("Invalid") {
+- t.Errorf("Incorrect measured length:%d", resp.ContentLength())
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+-}
+-
+-// go test -v -test.run TestStatusCreatedAndContentTypeJson_Issue54 ...restful
+-func TestStatusCreatedAndContentTypeJson_Issue54(t *testing.T) {
+- httpWriter := httptest.NewRecorder()
+- resp := Response{httpWriter, "application/json", []string{"application/json"}, 0, 0}
+- resp.WriteHeader(201)
+- resp.WriteAsJson(food{"Juicy"})
+- if httpWriter.HeaderMap.Get("Content-Type") != "application/json" {
+- t.Errorf("Expected content type json but got:%d", httpWriter.HeaderMap.Get("Content-Type"))
- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- if httpWriter.Code != 201 {
+- t.Errorf("Expected status 201 but got:%d", httpWriter.Code)
- }
-- return ret, nil
-- // {
-- // "description": "Removes instance URL from targetPool.",
-- // "httpMethod": "POST",
-- // "id": "compute.targetPools.removeInstance",
-- // "parameterOrder": [
-- // "project",
-- // "region",
-- // "targetPool"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "region": {
-- // "description": "Name of the region scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "targetPool": {
-- // "description": "Name of the TargetPool resource to which instance_url is to be removed.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/regions/{region}/targetPools/{targetPool}/removeInstance",
-- // "request": {
-- // "$ref": "TargetPoolsRemoveInstanceRequest"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
+-}
-
+-type errorOnWriteRecorder struct {
+- *httptest.ResponseRecorder
-}
-
--// method id "compute.targetPools.setBackup":
+-func (e errorOnWriteRecorder) Write(bytes []byte) (int, error) {
+- return 0, errors.New("fail")
+-}
-
--type TargetPoolsSetBackupCall struct {
-- s *Service
-- project string
-- region string
-- targetPool string
-- targetreference *TargetReference
-- opt_ map[string]interface{}
+-// go test -v -test.run TestLastWriteErrorCaught ...restful
+-func TestLastWriteErrorCaught(t *testing.T) {
+- httpWriter := errorOnWriteRecorder{httptest.NewRecorder()}
+- resp := Response{httpWriter, "application/json", []string{"application/json"}, 0, 0}
+- err := resp.WriteAsJson(food{"Juicy"})
+- if err.Error() != "fail" {
+- t.Errorf("Unexpected error message:%v", err)
+- }
+-}
+-
+-// go test -v -test.run TestAcceptStarStar_Issue83 ...restful
+-func TestAcceptStarStar_Issue83(t *testing.T) {
+- httpWriter := httptest.NewRecorder()
+- // Accept Produces
+- resp := Response{httpWriter, "application/bogus,*/*;q=0.8", []string{"application/json"}, 0, 0}
+- resp.WriteEntity(food{"Juicy"})
+- ct := httpWriter.Header().Get("Content-Type")
+- if "application/json" != ct {
+- t.Errorf("Unexpected content type:%s", ct)
+- }
-}
-
--// SetBackup: Changes backup pool configurations.
--func (r *TargetPoolsService) SetBackup(project string, region string, targetPool string, targetreference *TargetReference) *TargetPoolsSetBackupCall {
-- c := &TargetPoolsSetBackupCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.region = region
-- c.targetPool = targetPool
-- c.targetreference = targetreference
-- return c
+-// go test -v -test.run TestAcceptSkipStarStar_Issue83 ...restful
+-func TestAcceptSkipStarStar_Issue83(t *testing.T) {
+- httpWriter := httptest.NewRecorder()
+- // Accept Produces
+- resp := Response{httpWriter, " application/xml ,*/* ; q=0.8", []string{"application/json", "application/xml"}, 0, 0}
+- resp.WriteEntity(food{"Juicy"})
+- ct := httpWriter.Header().Get("Content-Type")
+- if "application/xml" != ct {
+- t.Errorf("Unexpected content type:%s", ct)
+- }
-}
-
--// FailoverRatio sets the optional parameter "failoverRatio": New
--// failoverRatio value for the containing target pool.
--func (c *TargetPoolsSetBackupCall) FailoverRatio(failoverRatio float64) *TargetPoolsSetBackupCall {
-- c.opt_["failoverRatio"] = failoverRatio
-- return c
+-// go test -v -test.run TestAcceptXmlBeforeStarStar_Issue83 ...restful
+-func TestAcceptXmlBeforeStarStar_Issue83(t *testing.T) {
+- httpWriter := httptest.NewRecorder()
+- // Accept Produces
+- resp := Response{httpWriter, "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8", []string{"application/json"}, 0, 0}
+- resp.WriteEntity(food{"Juicy"})
+- ct := httpWriter.Header().Get("Content-Type")
+- if "application/json" != ct {
+- t.Errorf("Unexpected content type:%s", ct)
+- }
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *TargetPoolsSetBackupCall) Fields(s ...googleapi.Field) *TargetPoolsSetBackupCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-// go test -v -test.run TestWriteHeaderNoContent_Issue124 ...restful
+-func TestWriteHeaderNoContent_Issue124(t *testing.T) {
+- httpWriter := httptest.NewRecorder()
+- resp := Response{httpWriter, "text/plain", []string{"text/plain"}, 0, 0}
+- resp.WriteHeader(http.StatusNoContent)
+- if httpWriter.Code != http.StatusNoContent {
+- t.Errorf("got %d want %d", httpWriter.Code, http.StatusNoContent)
+- }
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/route.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/route.go
+deleted file mode 100644
+index 59d6e23..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/route.go
++++ /dev/null
+@@ -1,166 +0,0 @@
+-package restful
-
--func (c *TargetPoolsSetBackupCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.targetreference)
-- if err != nil {
-- return nil, err
-- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["failoverRatio"]; ok {
-- params.Set("failoverRatio", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/regions/{region}/targetPools/{targetPool}/setBackup")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "region": c.region,
-- "targetPool": c.targetPool,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Changes backup pool configurations.",
-- // "httpMethod": "POST",
-- // "id": "compute.targetPools.setBackup",
-- // "parameterOrder": [
-- // "project",
-- // "region",
-- // "targetPool"
-- // ],
-- // "parameters": {
-- // "failoverRatio": {
-- // "description": "New failoverRatio value for the containing target pool.",
-- // "format": "float",
-- // "location": "query",
-- // "type": "number"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "region": {
-- // "description": "Name of the region scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "targetPool": {
-- // "description": "Name of the TargetPool resource for which the backup is to be set.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/regions/{region}/targetPools/{targetPool}/setBackup",
-- // "request": {
-- // "$ref": "TargetReference"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
+-// Copyright 2013 Ernest Micklei. All rights reserved.
+-// Use of this source code is governed by a license
+-// that can be found in the LICENSE file.
+-
+-import (
+- "bytes"
+- "net/http"
+- "strings"
+-)
+-
+-// RouteFunction declares the signature of a function that can be bound to a Route.
+-type RouteFunction func(*Request, *Response)
+-
+-// Route binds a HTTP Method,Path,Consumes combination to a RouteFunction.
+-type Route struct {
+- Method string
+- Produces []string
+- Consumes []string
+- Path string // webservice root path + described path
+- Function RouteFunction
+- Filters []FilterFunction
+-
+- // cached values for dispatching
+- relativePath string
+- pathParts []string
+- pathExpr *pathExpression // cached compilation of relativePath as RegExp
-
+- // documentation
+- Doc string
+- Operation string
+- ParameterDocs []*Parameter
+- ResponseErrors map[int]ResponseError
+- ReadSample, WriteSample interface{} // structs that model an example request or response payload
-}
-
--// method id "compute.urlMaps.delete":
+-// Initialize for Route
+-func (r *Route) postBuild() {
+- r.pathParts = tokenizePath(r.Path)
+-}
-
--type UrlMapsDeleteCall struct {
-- s *Service
-- project string
-- urlMap string
-- opt_ map[string]interface{}
+-// Create Request and Response from their http versions
+-func (r *Route) wrapRequestResponse(httpWriter http.ResponseWriter, httpRequest *http.Request) (*Request, *Response) {
+- params := r.extractParameters(httpRequest.URL.Path)
+- wrappedRequest := NewRequest(httpRequest)
+- wrappedRequest.pathParameters = params
+- wrappedRequest.selectedRoutePath = r.Path
+- wrappedResponse := NewResponse(httpWriter)
+- wrappedResponse.requestAccept = httpRequest.Header.Get(HEADER_Accept)
+- wrappedResponse.routeProduces = r.Produces
+- return wrappedRequest, wrappedResponse
-}
-
--// Delete: Deletes the specified UrlMap resource.
--func (r *UrlMapsService) Delete(project string, urlMap string) *UrlMapsDeleteCall {
-- c := &UrlMapsDeleteCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.urlMap = urlMap
-- return c
+-// dispatchWithFilters call the function after passing through its own filters
+-func (r *Route) dispatchWithFilters(wrappedRequest *Request, wrappedResponse *Response) {
+- if len(r.Filters) > 0 {
+- chain := FilterChain{Filters: r.Filters, Target: r.Function}
+- chain.ProcessFilter(wrappedRequest, wrappedResponse)
+- } else {
+- // unfiltered
+- r.Function(wrappedRequest, wrappedResponse)
+- }
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *UrlMapsDeleteCall) Fields(s ...googleapi.Field) *UrlMapsDeleteCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-// Return whether the mimeType matches to what this Route can produce.
+-func (r Route) matchesAccept(mimeTypesWithQuality string) bool {
+- parts := strings.Split(mimeTypesWithQuality, ",")
+- for _, each := range parts {
+- var withoutQuality string
+- if strings.Contains(each, ";") {
+- withoutQuality = strings.Split(each, ";")[0]
+- } else {
+- withoutQuality = each
+- }
+- // trim before compare
+- withoutQuality = strings.Trim(withoutQuality, " ")
+- if withoutQuality == "*/*" {
+- return true
+- }
+- for _, other := range r.Produces {
+- if other == withoutQuality {
+- return true
+- }
+- }
+- }
+- return false
-}
-
--func (c *UrlMapsDeleteCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+-// Return whether the mimeType matches to what this Route can consume.
+-func (r Route) matchesContentType(mimeTypes string) bool {
+- parts := strings.Split(mimeTypes, ",")
+- for _, each := range parts {
+- var contentType string
+- if strings.Contains(each, ";") {
+- contentType = strings.Split(each, ";")[0]
+- } else {
+- contentType = each
+- }
+- // trim before compare
+- contentType = strings.Trim(contentType, " ")
+- for _, other := range r.Consumes {
+- if other == "*/*" || other == contentType {
+- return true
+- }
+- }
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/urlMaps/{urlMap}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("DELETE", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "urlMap": c.urlMap,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
+- return false
+-}
+-
+-// Extract the parameters from the request url path
+-func (r Route) extractParameters(urlPath string) map[string]string {
+- urlParts := tokenizePath(urlPath)
+- pathParameters := map[string]string{}
+- for i, key := range r.pathParts {
+- var value string
+- if i >= len(urlParts) {
+- value = ""
+- } else {
+- value = urlParts[i]
+- }
+- if strings.HasPrefix(key, "{") { // path-parameter
+- if colon := strings.Index(key, ":"); colon != -1 {
+- // extract by regex
+- regPart := key[colon+1 : len(key)-1]
+- keyPart := key[1:colon]
+- if regPart == "*" {
+- pathParameters[keyPart] = untokenizePath(i, urlParts)
+- break
+- } else {
+- pathParameters[keyPart] = value
+- }
+- } else {
+- // without enclosing {}
+- pathParameters[key[1:len(key)-1]] = value
+- }
+- }
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- return pathParameters
+-}
+-
+-// Untokenize back into an URL path using the slash separator
+-func untokenizePath(offset int, parts []string) string {
+- var buffer bytes.Buffer
+- for p := offset; p < len(parts); p++ {
+- buffer.WriteString(parts[p])
+- // do not end
+- if p < len(parts)-1 {
+- buffer.WriteString("/")
+- }
- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- return buffer.String()
+-}
+-
+-// Tokenize an URL path using the slash separator ; the result does not have empty tokens
+-func tokenizePath(path string) []string {
+- if "/" == path {
+- return []string{}
- }
-- return ret, nil
-- // {
-- // "description": "Deletes the specified UrlMap resource.",
-- // "httpMethod": "DELETE",
-- // "id": "compute.urlMaps.delete",
-- // "parameterOrder": [
-- // "project",
-- // "urlMap"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "urlMap": {
-- // "description": "Name of the UrlMap resource to delete.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/urlMaps/{urlMap}",
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
+- return strings.Split(strings.Trim(path, "/"), "/")
+-}
-
+-// for debugging
+-func (r Route) String() string {
+- return r.Method + " " + r.Path
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/route_builder.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/route_builder.go
+deleted file mode 100644
+index 0046afb..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/route_builder.go
++++ /dev/null
+@@ -1,208 +0,0 @@
+-package restful
-
--// method id "compute.urlMaps.get":
+-// Copyright 2013 Ernest Micklei. All rights reserved.
+-// Use of this source code is governed by a license
+-// that can be found in the LICENSE file.
-
--type UrlMapsGetCall struct {
-- s *Service
-- project string
-- urlMap string
-- opt_ map[string]interface{}
+-import (
+- "log"
+- "reflect"
+- "strings"
+-)
+-
+-// RouteBuilder is a helper to construct Routes.
+-type RouteBuilder struct {
+- rootPath string
+- currentPath string
+- produces []string
+- consumes []string
+- httpMethod string // required
+- function RouteFunction // required
+- filters []FilterFunction
+- // documentation
+- doc string
+- operation string
+- readSample, writeSample interface{}
+- parameters []*Parameter
+- errorMap map[int]ResponseError
-}
-
--// Get: Returns the specified UrlMap resource.
--func (r *UrlMapsService) Get(project string, urlMap string) *UrlMapsGetCall {
-- c := &UrlMapsGetCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.urlMap = urlMap
-- return c
+-// Do evaluates each argument with the RouteBuilder itself.
+-// This allows you to follow DRY principles without breaking the fluent programming style.
+-// Example:
+-// ws.Route(ws.DELETE("/{name}").To(t.deletePerson).Do(Returns200, Returns500))
+-//
+-// func Returns500(b *RouteBuilder) {
+-// b.Returns(500, "Internal Server Error", restful.ServiceError{})
+-// }
+-func (b *RouteBuilder) Do(oneArgBlocks ...func(*RouteBuilder)) *RouteBuilder {
+- for _, each := range oneArgBlocks {
+- each(b)
+- }
+- return b
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *UrlMapsGetCall) Fields(s ...googleapi.Field) *UrlMapsGetCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-// To bind the route to a function.
+-// If this route is matched with the incoming Http Request then call this function with the *Request,*Response pair. Required.
+-func (b *RouteBuilder) To(function RouteFunction) *RouteBuilder {
+- b.function = function
+- return b
-}
-
--func (c *UrlMapsGetCall) Do() (*UrlMap, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/urlMaps/{urlMap}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "urlMap": c.urlMap,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *UrlMap
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Returns the specified UrlMap resource.",
-- // "httpMethod": "GET",
-- // "id": "compute.urlMaps.get",
-- // "parameterOrder": [
-- // "project",
-- // "urlMap"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "urlMap": {
-- // "description": "Name of the UrlMap resource to return.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/urlMaps/{urlMap}",
-- // "response": {
-- // "$ref": "UrlMap"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
+-// Method specifies what HTTP method to match. Required.
+-func (b *RouteBuilder) Method(method string) *RouteBuilder {
+- b.httpMethod = method
+- return b
+-}
-
+-// Produces specifies what MIME types can be produced ; the matched one will appear in the Content-Type Http header.
+-func (b *RouteBuilder) Produces(mimeTypes ...string) *RouteBuilder {
+- b.produces = mimeTypes
+- return b
-}
-
--// method id "compute.urlMaps.insert":
+-// Consumes specifies what MIME types can be consumes ; the Accept Http header must matched any of these
+-func (b *RouteBuilder) Consumes(mimeTypes ...string) *RouteBuilder {
+- b.consumes = mimeTypes
+- return b
+-}
-
--type UrlMapsInsertCall struct {
-- s *Service
-- project string
-- urlmap *UrlMap
-- opt_ map[string]interface{}
+-// Path specifies the relative (w.r.t WebService root path) URL path to match. Default is "/".
+-func (b *RouteBuilder) Path(subPath string) *RouteBuilder {
+- b.currentPath = subPath
+- return b
-}
-
--// Insert: Creates a UrlMap resource in the specified project using the
--// data included in the request.
--func (r *UrlMapsService) Insert(project string, urlmap *UrlMap) *UrlMapsInsertCall {
-- c := &UrlMapsInsertCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.urlmap = urlmap
-- return c
+-// Doc tells what this route is all about. Optional.
+-func (b *RouteBuilder) Doc(documentation string) *RouteBuilder {
+- b.doc = documentation
+- return b
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *UrlMapsInsertCall) Fields(s ...googleapi.Field) *UrlMapsInsertCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-// Reads tells what resource type will be read from the request payload. Optional.
+-// A parameter of type "body" is added ,required is set to true and the dataType is set to the qualified name of the sample's type.
+-func (b *RouteBuilder) Reads(sample interface{}) *RouteBuilder {
+- b.readSample = sample
+- typeAsName := reflect.TypeOf(sample).String()
+- bodyParameter := &Parameter{&ParameterData{Name: typeAsName}}
+- bodyParameter.beBody()
+- bodyParameter.Required(true)
+- bodyParameter.DataType(typeAsName)
+- b.Param(bodyParameter)
+- return b
-}
-
--func (c *UrlMapsInsertCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.urlmap)
-- if err != nil {
-- return nil, err
-- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/urlMaps")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-// ParameterNamed returns a Parameter already known to the RouteBuilder. Returns nil if not.
+-// Use this to modify or extend information for the Parameter (through its Data()).
+-func (b RouteBuilder) ParameterNamed(name string) (p *Parameter) {
+- for _, each := range b.parameters {
+- if each.Data().Name == name {
+- return each
+- }
- }
-- return ret, nil
-- // {
-- // "description": "Creates a UrlMap resource in the specified project using the data included in the request.",
-- // "httpMethod": "POST",
-- // "id": "compute.urlMaps.insert",
-- // "parameterOrder": [
-- // "project"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/urlMaps",
-- // "request": {
-- // "$ref": "UrlMap"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
+- return p
+-}
-
+-// Writes tells what resource type will be written as the response payload. Optional.
+-func (b *RouteBuilder) Writes(sample interface{}) *RouteBuilder {
+- b.writeSample = sample
+- return b
-}
-
--// method id "compute.urlMaps.list":
+-// Param allows you to document the parameters of the Route. It adds a new Parameter (does not check for duplicates).
+-func (b *RouteBuilder) Param(parameter *Parameter) *RouteBuilder {
+- if b.parameters == nil {
+- b.parameters = []*Parameter{}
+- }
+- b.parameters = append(b.parameters, parameter)
+- return b
+-}
-
--type UrlMapsListCall struct {
-- s *Service
-- project string
-- opt_ map[string]interface{}
+-// Operation allows you to document what the acutal method/function call is of the Route.
+-func (b *RouteBuilder) Operation(name string) *RouteBuilder {
+- b.operation = name
+- return b
-}
-
--// List: Retrieves the list of UrlMap resources available to the
--// specified project.
--func (r *UrlMapsService) List(project string) *UrlMapsListCall {
-- c := &UrlMapsListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- return c
+-// ReturnsError is deprecated, use Returns instead.
+-func (b *RouteBuilder) ReturnsError(code int, message string, model interface{}) *RouteBuilder {
+- log.Println("ReturnsError is deprecated, use Returns instead.")
+- return b.Returns(code, message, model)
-}
-
--// Filter sets the optional parameter "filter": Filter expression for
--// filtering listed resources.
--func (c *UrlMapsListCall) Filter(filter string) *UrlMapsListCall {
-- c.opt_["filter"] = filter
-- return c
+-// Returns allows you to document what responses (errors or regular) can be expected.
+-// The model parameter is optional ; either pass a struct instance or use nil if not applicable.
+-func (b *RouteBuilder) Returns(code int, message string, model interface{}) *RouteBuilder {
+- err := ResponseError{
+- Code: code,
+- Message: message,
+- Model: model,
+- }
+- // lazy init because there is no NewRouteBuilder (yet)
+- if b.errorMap == nil {
+- b.errorMap = map[int]ResponseError{}
+- }
+- b.errorMap[code] = err
+- return b
-}
-
--// MaxResults sets the optional parameter "maxResults": Maximum count of
--// results to be returned. Maximum value is 500 and default value is
--// 500.
--func (c *UrlMapsListCall) MaxResults(maxResults int64) *UrlMapsListCall {
-- c.opt_["maxResults"] = maxResults
-- return c
+-type ResponseError struct {
+- Code int
+- Message string
+- Model interface{}
-}
-
--// PageToken sets the optional parameter "pageToken": Tag returned by a
--// previous list request truncated by maxResults. Used to continue a
--// previous list request.
--func (c *UrlMapsListCall) PageToken(pageToken string) *UrlMapsListCall {
-- c.opt_["pageToken"] = pageToken
-- return c
+-func (b *RouteBuilder) servicePath(path string) *RouteBuilder {
+- b.rootPath = path
+- return b
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *UrlMapsListCall) Fields(s ...googleapi.Field) *UrlMapsListCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-// Filter appends a FilterFunction to the end of filters for this Route to build.
+-func (b *RouteBuilder) Filter(filter FilterFunction) *RouteBuilder {
+- b.filters = append(b.filters, filter)
+- return b
-}
-
--func (c *UrlMapsListCall) Do() (*UrlMapList, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["filter"]; ok {
-- params.Set("filter", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["maxResults"]; ok {
-- params.Set("maxResults", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["pageToken"]; ok {
-- params.Set("pageToken", fmt.Sprintf("%v", v))
+-// If no specific Route path then set to rootPath
+-// If no specific Produces then set to rootProduces
+-// If no specific Consumes then set to rootConsumes
+-func (b *RouteBuilder) copyDefaults(rootProduces, rootConsumes []string) {
+- if len(b.produces) == 0 {
+- b.produces = rootProduces
- }
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+- if len(b.consumes) == 0 {
+- b.consumes = rootConsumes
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/urlMaps")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+-}
+-
+-// Build creates a new Route using the specification details collected by the RouteBuilder
+-func (b *RouteBuilder) Build() Route {
+- pathExpr, err := newPathExpression(b.currentPath)
- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- log.Fatalf("[restful] Invalid path:%s because:%v", b.currentPath, err)
- }
-- var ret *UrlMapList
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- if b.function == nil {
+- log.Fatalf("[restful] No function specified for route:" + b.currentPath)
- }
-- return ret, nil
-- // {
-- // "description": "Retrieves the list of UrlMap resources available to the specified project.",
-- // "httpMethod": "GET",
-- // "id": "compute.urlMaps.list",
-- // "parameterOrder": [
-- // "project"
-- // ],
-- // "parameters": {
-- // "filter": {
-- // "description": "Optional. Filter expression for filtering listed resources.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "maxResults": {
-- // "default": "500",
-- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
-- // "format": "uint32",
-- // "location": "query",
-- // "maximum": "500",
-- // "minimum": "0",
-- // "type": "integer"
-- // },
-- // "pageToken": {
-- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/urlMaps",
-- // "response": {
-- // "$ref": "UrlMapList"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
--
+- route := Route{
+- Method: b.httpMethod,
+- Path: concatPath(b.rootPath, b.currentPath),
+- Produces: b.produces,
+- Consumes: b.consumes,
+- Function: b.function,
+- Filters: b.filters,
+- relativePath: b.currentPath,
+- pathExpr: pathExpr,
+- Doc: b.doc,
+- Operation: b.operation,
+- ParameterDocs: b.parameters,
+- ResponseErrors: b.errorMap,
+- ReadSample: b.readSample,
+- WriteSample: b.writeSample}
+- route.postBuild()
+- return route
-}
-
--// method id "compute.urlMaps.patch":
--
--type UrlMapsPatchCall struct {
-- s *Service
-- project string
-- urlMap string
-- urlmap *UrlMap
-- opt_ map[string]interface{}
+-func concatPath(path1, path2 string) string {
+- return strings.TrimRight(path1, "/") + "/" + strings.TrimLeft(path2, "/")
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/route_builder_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/route_builder_test.go
+deleted file mode 100644
+index 42ec689..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/route_builder_test.go
++++ /dev/null
+@@ -1,55 +0,0 @@
+-package restful
-
--// Patch: Update the entire content of the UrlMap resource. This method
--// supports patch semantics.
--func (r *UrlMapsService) Patch(project string, urlMap string, urlmap *UrlMap) *UrlMapsPatchCall {
-- c := &UrlMapsPatchCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.urlMap = urlMap
-- c.urlmap = urlmap
-- return c
--}
+-import (
+- "testing"
+-)
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *UrlMapsPatchCall) Fields(s ...googleapi.Field) *UrlMapsPatchCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
--}
+-func TestRouteBuilder_PathParameter(t *testing.T) {
+- p := &Parameter{&ParameterData{Name: "name", Description: "desc"}}
+- p.AllowMultiple(true)
+- p.DataType("int")
+- p.Required(true)
+- values := map[string]string{"a": "b"}
+- p.AllowableValues(values)
+- p.bePath()
-
--func (c *UrlMapsPatchCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.urlmap)
-- if err != nil {
-- return nil, err
+- b := new(RouteBuilder)
+- b.function = dummy
+- b.Param(p)
+- r := b.Build()
+- if !r.ParameterDocs[0].Data().AllowMultiple {
+- t.Error("AllowMultiple invalid")
- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+- if r.ParameterDocs[0].Data().DataType != "int" {
+- t.Error("dataType invalid")
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/urlMaps/{urlMap}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("PATCH", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "urlMap": c.urlMap,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
+- if !r.ParameterDocs[0].Data().Required {
+- t.Error("required invalid")
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- if r.ParameterDocs[0].Data().Kind != PathParameterKind {
+- t.Error("kind invalid")
- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- if r.ParameterDocs[0].Data().AllowableValues["a"] != "b" {
+- t.Error("allowableValues invalid")
+- }
+- if b.ParameterNamed("name") == nil {
+- t.Error("access to parameter failed")
- }
-- return ret, nil
-- // {
-- // "description": "Update the entire content of the UrlMap resource. This method supports patch semantics.",
-- // "httpMethod": "PATCH",
-- // "id": "compute.urlMaps.patch",
-- // "parameterOrder": [
-- // "project",
-- // "urlMap"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "urlMap": {
-- // "description": "Name of the UrlMap resource to update.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/urlMaps/{urlMap}",
-- // "request": {
-- // "$ref": "UrlMap"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
--
-}
-
--// method id "compute.urlMaps.update":
--
--type UrlMapsUpdateCall struct {
-- s *Service
-- project string
-- urlMap string
-- urlmap *UrlMap
-- opt_ map[string]interface{}
+-func TestRouteBuilder(t *testing.T) {
+- json := "application/json"
+- b := new(RouteBuilder)
+- b.To(dummy)
+- b.Path("/routes").Method("HEAD").Consumes(json).Produces(json)
+- r := b.Build()
+- if r.Path != "/routes" {
+- t.Error("path invalid")
+- }
+- if r.Produces[0] != json {
+- t.Error("produces invalid")
+- }
+- if r.Consumes[0] != json {
+- t.Error("consumes invalid")
+- }
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/route_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/route_test.go
+deleted file mode 100644
+index a416576..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/route_test.go
++++ /dev/null
+@@ -1,108 +0,0 @@
+-package restful
-
--// Update: Update the entire content of the UrlMap resource.
--func (r *UrlMapsService) Update(project string, urlMap string, urlmap *UrlMap) *UrlMapsUpdateCall {
-- c := &UrlMapsUpdateCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.urlMap = urlMap
-- c.urlmap = urlmap
-- return c
--}
+-import (
+- "testing"
+-)
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *UrlMapsUpdateCall) Fields(s ...googleapi.Field) *UrlMapsUpdateCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-// accept should match produces
+-func TestMatchesAcceptStar(t *testing.T) {
+- r := Route{Produces: []string{"application/xml"}}
+- if !r.matchesAccept("*/*") {
+- t.Errorf("accept should match star")
+- }
-}
-
--func (c *UrlMapsUpdateCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.urlmap)
-- if err != nil {
-- return nil, err
+-// accept should match produces
+-func TestMatchesAcceptIE(t *testing.T) {
+- r := Route{Produces: []string{"application/xml"}}
+- if !r.matchesAccept("text/html, application/xhtml+xml, */*") {
+- t.Errorf("accept should match star")
- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+-}
+-
+-// accept should match produces
+-func TestMatchesAcceptXml(t *testing.T) {
+- r := Route{Produces: []string{"application/xml"}}
+- if r.matchesAccept("application/json") {
+- t.Errorf("accept should not match json")
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/urlMaps/{urlMap}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("PUT", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "urlMap": c.urlMap,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
+- if !r.matchesAccept("application/xml") {
+- t.Errorf("accept should match xml")
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+-}
+-
+-// content type should match consumes
+-func TestMatchesContentTypeXml(t *testing.T) {
+- r := Route{Consumes: []string{"application/xml"}}
+- if r.matchesContentType("application/json") {
+- t.Errorf("accept should not match json")
- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- if !r.matchesContentType("application/xml") {
+- t.Errorf("accept should match xml")
- }
-- return ret, nil
-- // {
-- // "description": "Update the entire content of the UrlMap resource.",
-- // "httpMethod": "PUT",
-- // "id": "compute.urlMaps.update",
-- // "parameterOrder": [
-- // "project",
-- // "urlMap"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "urlMap": {
-- // "description": "Name of the UrlMap resource to update.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/urlMaps/{urlMap}",
-- // "request": {
-- // "$ref": "UrlMap"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
--
-}
-
--// method id "compute.urlMaps.validate":
+-// content type should match consumes
+-func TestMatchesContentTypeCharsetInformation(t *testing.T) {
+- r := Route{Consumes: []string{"application/json"}}
+- if !r.matchesContentType("application/json; charset=UTF-8") {
+- t.Errorf("matchesContentType should ignore charset information")
+- }
+-}
-
--type UrlMapsValidateCall struct {
-- s *Service
-- project string
-- urlMap string
-- urlmapsvalidaterequest *UrlMapsValidateRequest
-- opt_ map[string]interface{}
+-func TestMatchesPath_OneParam(t *testing.T) {
+- params := doExtractParams("/from/{source}", 2, "/from/here", t)
+- if params["source"] != "here" {
+- t.Errorf("parameter mismatch here")
+- }
-}
-
--// Validate: Run static validation for the UrlMap. In particular, the
--// tests of the provided UrlMap will be run. Calling this method does
--// NOT create the UrlMap.
--func (r *UrlMapsService) Validate(project string, urlMap string, urlmapsvalidaterequest *UrlMapsValidateRequest) *UrlMapsValidateCall {
-- c := &UrlMapsValidateCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.urlMap = urlMap
-- c.urlmapsvalidaterequest = urlmapsvalidaterequest
-- return c
+-func TestMatchesPath_Slash(t *testing.T) {
+- params := doExtractParams("/", 0, "/", t)
+- if len(params) != 0 {
+- t.Errorf("expected empty parameters")
+- }
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *UrlMapsValidateCall) Fields(s ...googleapi.Field) *UrlMapsValidateCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func TestMatchesPath_SlashNonVar(t *testing.T) {
+- params := doExtractParams("/any", 1, "/any", t)
+- if len(params) != 0 {
+- t.Errorf("expected empty parameters")
+- }
-}
-
--func (c *UrlMapsValidateCall) Do() (*UrlMapsValidateResponse, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.urlmapsvalidaterequest)
-- if err != nil {
-- return nil, err
+-func TestMatchesPath_TwoVars(t *testing.T) {
+- params := doExtractParams("/from/{source}/to/{destination}", 4, "/from/AMS/to/NY", t)
+- if params["source"] != "AMS" {
+- t.Errorf("parameter mismatch AMS")
- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+-}
+-
+-func TestMatchesPath_VarOnFront(t *testing.T) {
+- params := doExtractParams("{what}/from/{source}/", 3, "who/from/SOS/", t)
+- if params["source"] != "SOS" {
+- t.Errorf("parameter mismatch SOS")
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/global/urlMaps/{urlMap}/validate")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "urlMap": c.urlMap,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
+-}
+-
+-func TestExtractParameters_EmptyValue(t *testing.T) {
+- params := doExtractParams("/fixed/{var}", 2, "/fixed/", t)
+- if params["var"] != "" {
+- t.Errorf("parameter mismatch var")
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+-}
+-
+-func TestTokenizePath(t *testing.T) {
+- if len(tokenizePath("/")) != 0 {
+- t.Errorf("not empty path tokens")
- }
-- var ret *UrlMapsValidateResponse
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-}
+-
+-func doExtractParams(routePath string, size int, urlPath string, t *testing.T) map[string]string {
+- r := Route{Path: routePath}
+- r.postBuild()
+- if len(r.pathParts) != size {
+- t.Fatalf("len not %v %v, but %v", size, r.pathParts, len(r.pathParts))
- }
-- return ret, nil
-- // {
-- // "description": "Run static validation for the UrlMap. In particular, the tests of the provided UrlMap will be run. Calling this method does NOT create the UrlMap.",
-- // "httpMethod": "POST",
-- // "id": "compute.urlMaps.validate",
-- // "parameterOrder": [
-- // "project",
-- // "urlMap"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "urlMap": {
-- // "description": "Name of the UrlMap resource to be validated as.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/global/urlMaps/{urlMap}/validate",
-- // "request": {
-- // "$ref": "UrlMapsValidateRequest"
-- // },
-- // "response": {
-- // "$ref": "UrlMapsValidateResponse"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
+- return r.extractParameters(urlPath)
+-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/router.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/router.go
+deleted file mode 100644
+index 9b32fb6..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/router.go
++++ /dev/null
+@@ -1,18 +0,0 @@
+-package restful
+-
+-// Copyright 2013 Ernest Micklei. All rights reserved.
+-// Use of this source code is governed by a license
+-// that can be found in the LICENSE file.
-
+-import "net/http"
+-
+-// A RouteSelector finds the best matching Route given the input HTTP Request
+-type RouteSelector interface {
+-
+- // SelectRoute finds a Route given the input HTTP Request and a list of WebServices.
+- // It returns a selected Route and its containing WebService or an error indicating
+- // a problem.
+- SelectRoute(
+- webServices []*WebService,
+- httpRequest *http.Request) (selectedService *WebService, selected *Route, err error)
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/service_error.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/service_error.go
+deleted file mode 100644
+index 62d1108..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/service_error.go
++++ /dev/null
+@@ -1,23 +0,0 @@
+-package restful
-
--// method id "compute.zoneOperations.delete":
+-// Copyright 2013 Ernest Micklei. All rights reserved.
+-// Use of this source code is governed by a license
+-// that can be found in the LICENSE file.
-
--type ZoneOperationsDeleteCall struct {
-- s *Service
-- project string
-- zone string
-- operation string
-- opt_ map[string]interface{}
+-import "fmt"
+-
+-// ServiceError is a transport object to pass information about a non-Http error occurred in a WebService while processing a request.
+-type ServiceError struct {
+- Code int
+- Message string
-}
-
--// Delete: Deletes the specified zone-specific operation resource.
--func (r *ZoneOperationsService) Delete(project string, zone string, operation string) *ZoneOperationsDeleteCall {
-- c := &ZoneOperationsDeleteCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.zone = zone
-- c.operation = operation
-- return c
+-// NewError returns a ServiceError using the code and reason
+-func NewError(code int, message string) ServiceError {
+- return ServiceError{Code: code, Message: message}
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *ZoneOperationsDeleteCall) Fields(s ...googleapi.Field) *ZoneOperationsDeleteCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-// Error returns a text representation of the service error
+-func (s ServiceError) Error() string {
+- return fmt.Sprintf("[ServiceError:%v] %v", s.Code, s.Message)
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/CHANGES.md b/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/CHANGES.md
+deleted file mode 100644
+index 9980f2f..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/CHANGES.md
++++ /dev/null
+@@ -1,27 +0,0 @@
+-Change history of swagger
+-=
-
--func (c *ZoneOperationsDeleteCall) Do() error {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+-2014-11-14
+-- operation parameters are now sorted using ordering path,query,form,header,body
+-
+-2014-11-12
+-- respect omitempty tag value for embedded structs
+-- expose ApiVersion of WebService to Swagger ApiDeclaration
+-
+-2014-05-29
+-- (api add) Ability to define custom http.Handler to serve swagger-ui static files
+-
+-2014-05-04
+-- (fix) include model for array element type of response
+-
+-2014-01-03
+-- (fix) do not add primitive type to the Api models
+-
+-2013-11-27
+-- (fix) make Swagger work for WebServices with root ("/" or "") paths
+-
+-2013-10-29
+-- (api add) package variable LogInfo to customize logging function
+-
+-2013-10-15
+-- upgraded to spec version 1.2 (https://github.com/wordnik/swagger-core/wiki/1.2-transition)
+\ No newline at end of file
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/README.md b/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/README.md
+deleted file mode 100644
+index 2efe8f3..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/README.md
++++ /dev/null
+@@ -1,28 +0,0 @@
+-How to use Swagger UI with go-restful
+-=
+-
+-Get the Swagger UI sources (version 1.2 only)
+-
+- git clone https://github.com/wordnik/swagger-ui.git
+-
+-The project contains a "dist" folder.
+-Its contents has all the Swagger UI files you need.
+-
+-The `index.html` has an `url` set to `http://petstore.swagger.wordnik.com/api/api-docs`.
+-You need to change that to match your WebService JSON endpoint e.g. `http://localhost:8080/apidocs.json`
+-
+-Now, you can install the Swagger WebService for serving the Swagger specification in JSON.
+-
+- config := swagger.Config{
+- WebServices: restful.RegisteredWebServices(),
+- ApiPath: "/apidocs.json",
+- SwaggerPath: "/apidocs/",
+- SwaggerFilePath: "/Users/emicklei/Projects/swagger-ui/dist"}
+- swagger.InstallSwaggerService(config)
+-
+-
+-Notes
+---
+-- Use RouteBuilder.Operation(..) to set the Nickname field of the API spec
+-- The WebServices field of swagger.Config can be used to control which service you want to expose and document ; you can have multiple configs and therefore multiple endpoints.
+-- Use tag "description" to annotate a struct field with a description to show in the UI
+\ No newline at end of file
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/config.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/config.go
+deleted file mode 100644
+index 4fca0fa..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/config.go
++++ /dev/null
+@@ -1,25 +0,0 @@
+-package swagger
+-
+-import (
+- "net/http"
+-
+- "github.com/emicklei/go-restful"
+-)
+-
+-type Config struct {
+- // url where the services are available, e.g. http://localhost:8080
+- // if left empty then the basePath of Swagger is taken from the actual request
+- WebServicesUrl string
+- // path where the JSON api is avaiable , e.g. /apidocs
+- ApiPath string
+- // [optional] path where the swagger UI will be served, e.g. /swagger
+- SwaggerPath string
+- // [optional] location of folder containing Swagger HTML5 application index.html
+- SwaggerFilePath string
+- // api listing is constructed from this list of restful WebServices.
+- WebServices []*restful.WebService
+- // will serve all static content (scripts,pages,images)
+- StaticHandler http.Handler
+- // [optional] on default CORS (Cross-Origin-Resource-Sharing) is enabled.
+- DisableCORS bool
+-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/model_builder.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/model_builder.go
+deleted file mode 100644
+index 68524ec..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/model_builder.go
++++ /dev/null
+@@ -1,277 +0,0 @@
+-package swagger
+-
+-import (
+- "encoding/json"
+- "reflect"
+- "strings"
+-)
+-
+-type modelBuilder struct {
+- Models map[string]Model
+-}
+-
+-func (b modelBuilder) addModel(st reflect.Type, nameOverride string) {
+- modelName := b.keyFrom(st)
+- if nameOverride != "" {
+- modelName = nameOverride
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/operations/{operation}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("DELETE", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "zone": c.zone,
-- "operation": c.operation,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return err
+- // no models needed for primitive types
+- if b.isPrimitiveType(modelName) {
+- return
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return err
+- // see if we already have visited this model
+- if _, ok := b.Models[modelName]; ok {
+- return
- }
-- return nil
-- // {
-- // "description": "Deletes the specified zone-specific operation resource.",
-- // "httpMethod": "DELETE",
-- // "id": "compute.zoneOperations.delete",
-- // "parameterOrder": [
-- // "project",
-- // "zone",
-- // "operation"
-- // ],
-- // "parameters": {
-- // "operation": {
-- // "description": "Name of the operation resource to delete.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "zone": {
-- // "description": "Name of the zone scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/zones/{zone}/operations/{operation}",
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute"
-- // ]
-- // }
+- sm := Model{
+- Id: modelName,
+- Required: []string{},
+- Properties: map[string]ModelProperty{}}
-
--}
+- // reference the model before further initializing (enables recursive structs)
+- b.Models[modelName] = sm
-
--// method id "compute.zoneOperations.get":
+- // check for slice or array
+- if st.Kind() == reflect.Slice || st.Kind() == reflect.Array {
+- b.addModel(st.Elem(), "")
+- return
+- }
+- // check for structure or primitive type
+- if st.Kind() != reflect.Struct {
+- return
+- }
+- for i := 0; i < st.NumField(); i++ {
+- field := st.Field(i)
+- jsonName, prop := b.buildProperty(field, &sm, modelName)
+- if descTag := field.Tag.Get("description"); descTag != "" {
+- prop.Description = descTag
+- }
+- // add if not ommitted
+- if len(jsonName) != 0 {
+- // update Required
+- if b.isPropertyRequired(field) {
+- sm.Required = append(sm.Required, jsonName)
+- }
+- sm.Properties[jsonName] = prop
+- }
+- }
-
--type ZoneOperationsGetCall struct {
-- s *Service
-- project string
-- zone string
-- operation string
-- opt_ map[string]interface{}
+- // update model builder with completed model
+- b.Models[modelName] = sm
-}
-
--// Get: Retrieves the specified zone-specific operation resource.
--func (r *ZoneOperationsService) Get(project string, zone string, operation string) *ZoneOperationsGetCall {
-- c := &ZoneOperationsGetCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.zone = zone
-- c.operation = operation
-- return c
+-func (b modelBuilder) isPropertyRequired(field reflect.StructField) bool {
+- required := true
+- if jsonTag := field.Tag.Get("json"); jsonTag != "" {
+- s := strings.Split(jsonTag, ",")
+- if len(s) > 1 && s[1] == "omitempty" {
+- return false
+- }
+- }
+- return required
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *ZoneOperationsGetCall) Fields(s ...googleapi.Field) *ZoneOperationsGetCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
--}
+-func (b modelBuilder) buildProperty(field reflect.StructField, model *Model, modelName string) (jsonName string, prop ModelProperty) {
+- jsonName = b.jsonNameOfField(field)
+- if len(jsonName) == 0 {
+- // empty name signals skip property
+- return "", prop
+- }
+- fieldType := field.Type
+- fieldKind := fieldType.Kind()
-
--func (c *ZoneOperationsGetCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+- if jsonTag := field.Tag.Get("json"); jsonTag != "" {
+- s := strings.Split(jsonTag, ",")
+- if len(s) > 1 && s[1] == "string" {
+- fieldType = reflect.TypeOf("")
+- }
+- }
+-
+- var pType = b.jsonSchemaType(fieldType.String()) // may include pkg path
+- prop.Type = &pType
+- if b.isPrimitiveType(fieldType.String()) {
+- prop.Format = b.jsonSchemaFormat(fieldType.String())
+- return jsonName, prop
+- }
+-
+- marshalerType := reflect.TypeOf((*json.Marshaler)(nil)).Elem()
+- if fieldType.Implements(marshalerType) {
+- var pType = "string"
+- prop.Type = &pType
+- return jsonName, prop
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/operations/{operation}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "zone": c.zone,
-- "operation": c.operation,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
+-
+- if fieldKind == reflect.Struct {
+- return b.buildStructTypeProperty(field, jsonName, model)
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+-
+- if fieldKind == reflect.Slice || fieldKind == reflect.Array {
+- return b.buildArrayTypeProperty(field, jsonName, modelName)
- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-
+- if fieldKind == reflect.Ptr {
+- return b.buildPointerTypeProperty(field, jsonName, modelName)
- }
-- return ret, nil
-- // {
-- // "description": "Retrieves the specified zone-specific operation resource.",
-- // "httpMethod": "GET",
-- // "id": "compute.zoneOperations.get",
-- // "parameterOrder": [
-- // "project",
-- // "zone",
-- // "operation"
-- // ],
-- // "parameters": {
-- // "operation": {
-- // "description": "Name of the operation resource to return.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "zone": {
-- // "description": "Name of the zone scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/zones/{zone}/operations/{operation}",
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
-
+- if fieldType.Name() == "" { // override type of anonymous structs
+- nestedTypeName := modelName + "." + jsonName
+- var pType = nestedTypeName
+- prop.Type = &pType
+- b.addModel(fieldType, nestedTypeName)
+- }
+- return jsonName, prop
-}
-
--// method id "compute.zoneOperations.list":
--
--type ZoneOperationsListCall struct {
-- s *Service
-- project string
-- zone string
-- opt_ map[string]interface{}
+-func (b modelBuilder) buildStructTypeProperty(field reflect.StructField, jsonName string, model *Model) (nameJson string, prop ModelProperty) {
+- fieldType := field.Type
+- // check for anonymous
+- if len(fieldType.Name()) == 0 {
+- // anonymous
+- anonType := model.Id + "." + jsonName
+- b.addModel(fieldType, anonType)
+- prop.Type = &anonType
+- return jsonName, prop
+- }
+- if field.Name == fieldType.Name() && field.Anonymous {
+- // embedded struct
+- sub := modelBuilder{map[string]Model{}}
+- sub.addModel(fieldType, "")
+- subKey := sub.keyFrom(fieldType)
+- // merge properties from sub
+- subModel := sub.Models[subKey]
+- for k, v := range subModel.Properties {
+- model.Properties[k] = v
+- // if subModel says this property is required then include it
+- required := false
+- for _, each := range subModel.Required {
+- if k == each {
+- required = true
+- break
+- }
+- }
+- if required {
+- model.Required = append(model.Required, k)
+- }
+- }
+- // empty name signals skip property
+- return "", prop
+- }
+- // simple struct
+- b.addModel(fieldType, "")
+- var pType = fieldType.String()
+- prop.Type = &pType
+- return jsonName, prop
-}
-
--// List: Retrieves the list of operation resources contained within the
--// specified zone.
--func (r *ZoneOperationsService) List(project string, zone string) *ZoneOperationsListCall {
-- c := &ZoneOperationsListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.zone = zone
-- return c
+-func (b modelBuilder) buildArrayTypeProperty(field reflect.StructField, jsonName, modelName string) (nameJson string, prop ModelProperty) {
+- fieldType := field.Type
+- var pType = "array"
+- prop.Type = &pType
+- elemName := b.getElementTypeName(modelName, jsonName, fieldType.Elem())
+- prop.Items = []Item{Item{Ref: &elemName}}
+- // add|overwrite model for element type
+- b.addModel(fieldType.Elem(), elemName)
+- return jsonName, prop
-}
-
--// Filter sets the optional parameter "filter": Filter expression for
--// filtering listed resources.
--func (c *ZoneOperationsListCall) Filter(filter string) *ZoneOperationsListCall {
-- c.opt_["filter"] = filter
-- return c
+-func (b modelBuilder) buildPointerTypeProperty(field reflect.StructField, jsonName, modelName string) (nameJson string, prop ModelProperty) {
+- fieldType := field.Type
+-
+- // override type of pointer to list-likes
+- if fieldType.Elem().Kind() == reflect.Slice || fieldType.Elem().Kind() == reflect.Array {
+- var pType = "array"
+- prop.Type = &pType
+- elemName := b.getElementTypeName(modelName, jsonName, fieldType.Elem().Elem())
+- prop.Items = []Item{Item{Ref: &elemName}}
+- // add|overwrite model for element type
+- b.addModel(fieldType.Elem().Elem(), elemName)
+- } else {
+- // non-array, pointer type
+- var pType = fieldType.String()[1:] // no star, include pkg path
+- prop.Type = &pType
+- elemName := ""
+- if fieldType.Elem().Name() == "" {
+- elemName = modelName + "." + jsonName
+- prop.Type = &elemName
+- }
+- b.addModel(fieldType.Elem(), elemName)
+- }
+- return jsonName, prop
-}
-
--// MaxResults sets the optional parameter "maxResults": Maximum count of
--// results to be returned. Maximum value is 500 and default value is
--// 500.
--func (c *ZoneOperationsListCall) MaxResults(maxResults int64) *ZoneOperationsListCall {
-- c.opt_["maxResults"] = maxResults
-- return c
+-func (b modelBuilder) getElementTypeName(modelName, jsonName string, t reflect.Type) string {
+- if t.Name() == "" {
+- return modelName + "." + jsonName
+- }
+- if b.isPrimitiveType(t.Name()) {
+- return b.jsonSchemaType(t.Name())
+- }
+- return b.keyFrom(t)
-}
-
--// PageToken sets the optional parameter "pageToken": Tag returned by a
--// previous list request truncated by maxResults. Used to continue a
--// previous list request.
--func (c *ZoneOperationsListCall) PageToken(pageToken string) *ZoneOperationsListCall {
-- c.opt_["pageToken"] = pageToken
-- return c
+-func (b modelBuilder) keyFrom(st reflect.Type) string {
+- key := st.String()
+- if len(st.Name()) == 0 { // unnamed type
+- // Swagger UI has special meaning for [
+- key = strings.Replace(key, "[]", "||", -1)
+- }
+- return key
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *ZoneOperationsListCall) Fields(s ...googleapi.Field) *ZoneOperationsListCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func (b modelBuilder) isPrimitiveType(modelName string) bool {
+- return strings.Contains("uint8 int int32 int64 float32 float64 bool string byte time.Time", modelName)
-}
-
--func (c *ZoneOperationsListCall) Do() (*OperationList, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["filter"]; ok {
-- params.Set("filter", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["maxResults"]; ok {
-- params.Set("maxResults", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["pageToken"]; ok {
-- params.Set("pageToken", fmt.Sprintf("%v", v))
+-// jsonNameOfField returns the name of the field as it should appear in JSON format
+-// An empty string indicates that this field is not part of the JSON representation
+-func (b modelBuilder) jsonNameOfField(field reflect.StructField) string {
+- if jsonTag := field.Tag.Get("json"); jsonTag != "" {
+- s := strings.Split(jsonTag, ",")
+- if s[0] == "-" {
+- // empty name signals skip property
+- return ""
+- } else if s[0] != "" {
+- return s[0]
+- }
- }
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+- return field.Name
+-}
+-
+-func (b modelBuilder) jsonSchemaType(modelName string) string {
+- schemaMap := map[string]string{
+- "uint8": "integer",
+- "int": "integer",
+- "int32": "integer",
+- "int64": "integer",
+- "byte": "string",
+- "float64": "number",
+- "float32": "number",
+- "bool": "boolean",
+- "time.Time": "string",
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}/operations")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "zone": c.zone,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
+- mapped, ok := schemaMap[modelName]
+- if ok {
+- return mapped
+- } else {
+- return modelName // use as is (custom or struct)
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+-}
+-
+-func (b modelBuilder) jsonSchemaFormat(modelName string) string {
+- schemaMap := map[string]string{
+- "int": "int32",
+- "int32": "int32",
+- "int64": "int64",
+- "byte": "byte",
+- "uint8": "byte",
+- "float64": "double",
+- "float32": "float",
+- "time.Time": "date-time",
- }
-- var ret *OperationList
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- mapped, ok := schemaMap[modelName]
+- if ok {
+- return mapped
+- } else {
+- return "" // no format
- }
-- return ret, nil
-- // {
-- // "description": "Retrieves the list of operation resources contained within the specified zone.",
-- // "httpMethod": "GET",
-- // "id": "compute.zoneOperations.list",
-- // "parameterOrder": [
-- // "project",
-- // "zone"
-- // ],
-- // "parameters": {
-- // "filter": {
-- // "description": "Optional. Filter expression for filtering listed resources.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "maxResults": {
-- // "default": "500",
-- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
-- // "format": "uint32",
-- // "location": "query",
-- // "maximum": "500",
-- // "minimum": "0",
-- // "type": "integer"
-- // },
-- // "pageToken": {
-- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "zone": {
-- // "description": "Name of the zone scoping this request.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/zones/{zone}/operations",
-- // "response": {
-- // "$ref": "OperationList"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
--
-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/model_builder_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/model_builder_test.go
+deleted file mode 100644
+index dd966bd..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/model_builder_test.go
++++ /dev/null
+@@ -1,729 +0,0 @@
+-package swagger
-
--// method id "compute.zones.get":
+-import (
+- "testing"
+- "time"
+-)
-
--type ZonesGetCall struct {
-- s *Service
-- project string
-- zone string
-- opt_ map[string]interface{}
--}
+-type YesNo bool
-
--// Get: Returns the specified zone resource.
--func (r *ZonesService) Get(project string, zone string) *ZonesGetCall {
-- c := &ZonesGetCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- c.zone = zone
-- return c
+-func (y YesNo) MarshalJSON() ([]byte, error) {
+- if y {
+- return []byte("yes"), nil
+- }
+- return []byte("no"), nil
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *ZonesGetCall) Fields(s ...googleapi.Field) *ZonesGetCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-// clear && go test -v -test.run TestCustomMarshaller_Issue96 ...swagger
+-func TestCustomMarshaller_Issue96(t *testing.T) {
+- type Vote struct {
+- What YesNo
+- }
+- testJsonFromStruct(t, Vote{}, `{
+- "swagger.Vote": {
+- "id": "swagger.Vote",
+- "required": [
+- "What"
+- ],
+- "properties": {
+- "What": {
+- "type": "string"
+- }
+- }
+- }
+- }`)
-}
-
--func (c *ZonesGetCall) Do() (*Zone, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones/{zone}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- "zone": c.zone,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Zone
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-// clear && go test -v -test.run TestPrimitiveTypes ...swagger
+-func TestPrimitiveTypes(t *testing.T) {
+- type Prims struct {
+- f float64
+- t time.Time
- }
-- return ret, nil
-- // {
-- // "description": "Returns the specified zone resource.",
-- // "httpMethod": "GET",
-- // "id": "compute.zones.get",
-- // "parameterOrder": [
-- // "project",
-- // "zone"
-- // ],
-- // "parameters": {
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "zone": {
-- // "description": "Name of the zone resource to return.",
-- // "location": "path",
-- // "pattern": "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/zones/{zone}",
-- // "response": {
-- // "$ref": "Zone"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
--
+- testJsonFromStruct(t, Prims{}, `{
+- "swagger.Prims": {
+- "id": "swagger.Prims",
+- "required": [
+- "f",
+- "t"
+- ],
+- "properties": {
+- "f": {
+- "type": "number",
+- "format": "double"
+- },
+- "t": {
+- "type": "string",
+- "format": "date-time"
+- }
+- }
+- }
+- }`)
-}
-
--// method id "compute.zones.list":
--
--type ZonesListCall struct {
-- s *Service
-- project string
-- opt_ map[string]interface{}
+-// clear && go test -v -test.run TestS1 ...swagger
+-func TestS1(t *testing.T) {
+- type S1 struct {
+- Id string
+- }
+- testJsonFromStruct(t, S1{}, `{
+- "swagger.S1": {
+- "id": "swagger.S1",
+- "required": [
+- "Id"
+- ],
+- "properties": {
+- "Id": {
+- "type": "string"
+- }
+- }
+- }
+- }`)
-}
-
--// List: Retrieves the list of zone resources available to the specified
--// project.
--func (r *ZonesService) List(project string) *ZonesListCall {
-- c := &ZonesListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.project = project
-- return c
+-// clear && go test -v -test.run TestS2 ...swagger
+-func TestS2(t *testing.T) {
+- type S2 struct {
+- Ids []string
+- }
+- testJsonFromStruct(t, S2{}, `{
+- "swagger.S2": {
+- "id": "swagger.S2",
+- "required": [
+- "Ids"
+- ],
+- "properties": {
+- "Ids": {
+- "type": "array",
+- "items": [
+- {
+- "$ref": "string"
+- }
+- ]
+- }
+- }
+- }
+- }`)
-}
-
--// Filter sets the optional parameter "filter": Filter expression for
--// filtering listed resources.
--func (c *ZonesListCall) Filter(filter string) *ZonesListCall {
-- c.opt_["filter"] = filter
-- return c
+-// clear && go test -v -test.run TestS3 ...swagger
+-func TestS3(t *testing.T) {
+- type NestedS3 struct {
+- Id string
+- }
+- type S3 struct {
+- Nested NestedS3
+- }
+- testJsonFromStruct(t, S3{}, `{
+- "swagger.NestedS3": {
+- "id": "swagger.NestedS3",
+- "required": [
+- "Id"
+- ],
+- "properties": {
+- "Id": {
+- "type": "string"
+- }
+- }
+- },
+- "swagger.S3": {
+- "id": "swagger.S3",
+- "required": [
+- "Nested"
+- ],
+- "properties": {
+- "Nested": {
+- "type": "swagger.NestedS3"
+- }
+- }
+- }
+- }`)
-}
-
--// MaxResults sets the optional parameter "maxResults": Maximum count of
--// results to be returned. Maximum value is 500 and default value is
--// 500.
--func (c *ZonesListCall) MaxResults(maxResults int64) *ZonesListCall {
-- c.opt_["maxResults"] = maxResults
-- return c
+-type sample struct {
+- id string `swagger:"required"` // TODO
+- items []item
+- rootItem item `json:"root" description:"root desc"`
-}
-
--// PageToken sets the optional parameter "pageToken": Tag returned by a
--// previous list request truncated by maxResults. Used to continue a
--// previous list request.
--func (c *ZonesListCall) PageToken(pageToken string) *ZonesListCall {
-- c.opt_["pageToken"] = pageToken
-- return c
+-type item struct {
+- itemName string `json:"name"`
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *ZonesListCall) Fields(s ...googleapi.Field) *ZonesListCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-// clear && go test -v -test.run TestSampleToModelAsJson ...swagger
+-func TestSampleToModelAsJson(t *testing.T) {
+- testJsonFromStruct(t, sample{items: []item{}}, `{
+- "swagger.item": {
+- "id": "swagger.item",
+- "required": [
+- "name"
+- ],
+- "properties": {
+- "name": {
+- "type": "string"
+- }
+- }
+- },
+- "swagger.sample": {
+- "id": "swagger.sample",
+- "required": [
+- "id",
+- "items",
+- "root"
+- ],
+- "properties": {
+- "id": {
+- "type": "string"
+- },
+- "items": {
+- "type": "array",
+- "items": [
+- {
+- "$ref": "swagger.item"
+- }
+- ]
+- },
+- "root": {
+- "type": "swagger.item",
+- "description": "root desc"
+- }
+- }
+- }
+- }`)
-}
-
--func (c *ZonesListCall) Do() (*ZoneList, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["filter"]; ok {
-- params.Set("filter", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["maxResults"]; ok {
-- params.Set("maxResults", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["pageToken"]; ok {
-- params.Set("pageToken", fmt.Sprintf("%v", v))
-- }
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/zones")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "project": c.project,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *ZoneList
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-func TestJsonTags(t *testing.T) {
+- type X struct {
+- A string
+- B string `json:"-"`
+- C int `json:",string"`
+- D int `json:","`
- }
-- return ret, nil
-- // {
-- // "description": "Retrieves the list of zone resources available to the specified project.",
-- // "httpMethod": "GET",
-- // "id": "compute.zones.list",
-- // "parameterOrder": [
-- // "project"
-- // ],
-- // "parameters": {
-- // "filter": {
-- // "description": "Optional. Filter expression for filtering listed resources.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "maxResults": {
-- // "default": "500",
-- // "description": "Optional. Maximum count of results to be returned. Maximum value is 500 and default value is 500.",
-- // "format": "uint32",
-- // "location": "query",
-- // "maximum": "500",
-- // "minimum": "0",
-- // "type": "integer"
-- // },
-- // "pageToken": {
-- // "description": "Optional. Tag returned by a previous list request truncated by maxResults. Used to continue a previous list request.",
-- // "location": "query",
-- // "type": "string"
-- // },
-- // "project": {
-- // "description": "Name of the project scoping this request.",
-- // "location": "path",
-- // "pattern": "(?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{project}/zones",
-- // "response": {
-- // "$ref": "ZoneList"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/compute",
-- // "https://www.googleapis.com/auth/compute.readonly"
-- // ]
-- // }
-
--}
-diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/container/v1beta1/container-api.json b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/container/v1beta1/container-api.json
-deleted file mode 100644
-index bca5a31..0000000
---- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/container/v1beta1/container-api.json
-+++ /dev/null
-@@ -1,579 +0,0 @@
--{
-- "kind": "discovery#restDescription",
-- "etag": "\"l66ggWbucbkBw9Lpos72oziyefE/ZrZBeDfQYPqAxFURJt0IhCOLUHQ\"",
-- "discoveryVersion": "v1",
-- "id": "container:v1beta1",
-- "name": "container",
-- "version": "v1beta1",
-- "revision": "20141103",
-- "title": "Google Container Engine API",
-- "description": "The Google Container Engine API is used for building and managing container based applications, powered by the open source Kubernetes technology.",
-- "ownerDomain": "google.com",
-- "ownerName": "Google",
-- "icons": {
-- "x16": "http://www.google.com/images/icons/product/search-16.gif",
-- "x32": "http://www.google.com/images/icons/product/search-32.gif"
-- },
-- "protocol": "rest",
-- "baseUrl": "https://www.googleapis.com/container/v1beta1/projects/",
-- "basePath": "/container/v1beta1/projects/",
-- "rootUrl": "https://www.googleapis.com/",
-- "servicePath": "container/v1beta1/projects/",
-- "batchPath": "batch",
-- "parameters": {
-- "alt": {
-- "type": "string",
-- "description": "Data format for the response.",
-- "default": "json",
-- "enum": [
-- "json"
-- ],
-- "enumDescriptions": [
-- "Responses with Content-Type of application/json"
+- expected := `{
+- "swagger.X": {
+- "id": "swagger.X",
+- "required": [
+- "A",
+- "C",
+- "D"
- ],
-- "location": "query"
-- },
-- "fields": {
-- "type": "string",
-- "description": "Selector specifying which fields to include in a partial response.",
-- "location": "query"
-- },
-- "key": {
-- "type": "string",
-- "description": "API key. Your API key identifies your project and provides you with API access, quota, and reports. Required unless you provide an OAuth 2.0 token.",
-- "location": "query"
-- },
-- "oauth_token": {
-- "type": "string",
-- "description": "OAuth 2.0 token for the current user.",
-- "location": "query"
-- },
-- "prettyPrint": {
-- "type": "boolean",
-- "description": "Returns response with indentations and line breaks.",
-- "default": "true",
-- "location": "query"
-- },
-- "quotaUser": {
-- "type": "string",
-- "description": "Available to use for quota purposes for server-side applications. Can be any arbitrary string assigned to a user, but should not exceed 40 characters. Overrides userIp if both are provided.",
-- "location": "query"
-- },
-- "userIp": {
-- "type": "string",
-- "description": "IP address of the site where the request originates. Use this if you want to enforce per-user limits.",
-- "location": "query"
-- }
-- },
-- "auth": {
-- "oauth2": {
-- "scopes": {
-- "https://www.googleapis.com/auth/cloud-platform": {
-- "description": "View and manage your data across Google Cloud Platform services"
+- "properties": {
+- "A": {
+- "type": "string"
+- },
+- "C": {
+- "type": "string"
+- },
+- "D": {
+- "type": "integer",
+- "format": "int32"
- }
- }
- }
-- },
-- "schemas": {
-- "Cluster": {
-- "id": "Cluster",
-- "type": "object",
-- "externalTypeName": "container.v1beta1.Cluster",
+- }`
+-
+- testJsonFromStruct(t, X{}, expected)
+-}
+-
+-func TestJsonTagOmitempty(t *testing.T) {
+- type X struct {
+- A int `json:",omitempty"`
+- B int `json:"C,omitempty"`
+- }
+-
+- expected := `{
+- "swagger.X": {
+- "id": "swagger.X",
- "properties": {
-- "clusterApiVersion": {
-- "type": "string",
-- "description": "The API version of the Kubernetes master and kubelets running in this cluster. Allowed value is 0.4.2, or leave blank to pick up the latest stable release."
-- },
-- "containerIpv4Cidr": {
-- "type": "string",
-- "description": "[Output only] The IP addresses of the container pods in this cluster, in CIDR notation (e.g. 1.2.3.4/29)."
-- },
-- "creationTimestamp": {
-- "type": "string",
-- "description": "[Output only] The time the cluster was created, in RFC3339 text format."
-- },
-- "description": {
-- "type": "string",
-- "description": "An optional description of this cluster."
-- },
-- "endpoint": {
-- "type": "string",
-- "description": "[Output only] The IP address of this cluster's Kubernetes master. The endpoint can be accessed from the internet at https://username:password@endpoint/.\n\nSee the masterAuth property of this resource for username and password information."
-- },
-- "masterAuth": {
-- "$ref": "MasterAuth",
-- "description": "The HTTP basic authentication information for accessing the master. Because the master endpoint is open to the internet, you should create a strong password."
-- },
-- "name": {
-- "type": "string",
-- "description": "The name of this cluster. The name must be unique within this project and zone, and can be up to 40 characters with the following restrictions: \n- Lowercase letters, numbers, and hyphens only.\n- Must start with a letter.\n- Must end with a number or a letter."
-- },
-- "nodeConfig": {
-- "$ref": "NodeConfig",
-- "description": "The machine type and image to use for all nodes in this cluster. See the descriptions of the child properties of nodeConfig."
-- },
-- "nodeRoutingPrefixSize": {
+- "A": {
- "type": "integer",
-- "description": "[Output only] The size of the address space on each node for hosting containers.",
- "format": "int32"
- },
-- "numNodes": {
+- "C": {
- "type": "integer",
-- "description": "The number of nodes to create in this cluster. You must ensure that your Compute Engine resource quota is sufficient for this number of instances plus one (to include the master). You must also have available firewall and routes quota.",
- "format": "int32"
-- },
-- "servicesIpv4Cidr": {
-- "type": "string",
-- "description": "[Output only] The IP addresses of the Kubernetes services in this cluster, in CIDR notation (e.g. 1.2.3.4/29). Service addresses are always in the 10.0.0.0/16 range."
-- },
-- "status": {
-- "type": "string",
-- "description": "[Output only] The current status of this cluster.",
-- "enum": [
-- "error",
-- "provisioning",
-- "running",
-- "stopping"
-- ],
-- "enumDescriptions": [
-- "",
-- "",
-- "",
-- ""
-- ]
-- },
-- "statusMessage": {
-- "type": "string",
-- "description": "[Output only] Additional information about the current status of this cluster, if available."
-- },
-- "zone": {
-- "type": "string",
-- "description": "[Output only] The name of the Google Compute Engine zone in which the cluster resides."
+- }
+- }
+- }
+- }`
+-
+- testJsonFromStruct(t, X{}, expected)
+-}
+-
+-func TestJsonTagName(t *testing.T) {
+- type X struct {
+- A string `json:"B"`
+- }
+-
+- expected := `{
+- "swagger.X": {
+- "id": "swagger.X",
+- "required": [
+- "B"
+- ],
+- "properties": {
+- "B": {
+- "type": "string"
+- }
+- }
+- }
+- }`
+-
+- testJsonFromStruct(t, X{}, expected)
+-}
+-
+-func TestAnonymousStruct(t *testing.T) {
+- type X struct {
+- A struct {
+- B int
+- }
+- }
+-
+- expected := `{
+- "swagger.X": {
+- "id": "swagger.X",
+- "required": [
+- "A"
+- ],
+- "properties": {
+- "A": {
+- "type": "swagger.X.A"
- }
- }
- },
-- "CreateClusterRequest": {
-- "id": "CreateClusterRequest",
-- "type": "object",
-- "externalTypeName": "container.v1beta1.CreateClusterRequest",
+- "swagger.X.A": {
+- "id": "swagger.X.A",
+- "required": [
+- "B"
+- ],
- "properties": {
-- "cluster": {
-- "$ref": "Cluster",
-- "description": "A cluster resource."
+- "B": {
+- "type": "integer",
+- "format": "int32"
+- }
+- }
+- }
+- }`
+-
+- testJsonFromStruct(t, X{}, expected)
+-}
+-
+-func TestAnonymousPtrStruct(t *testing.T) {
+- type X struct {
+- A *struct {
+- B int
+- }
+- }
+-
+- expected := `{
+- "swagger.X": {
+- "id": "swagger.X",
+- "required": [
+- "A"
+- ],
+- "properties": {
+- "A": {
+- "type": "swagger.X.A"
- }
- }
- },
-- "ListAggregatedClustersResponse": {
-- "id": "ListAggregatedClustersResponse",
-- "type": "object",
-- "externalTypeName": "container.v1beta1.ListAggregatedClustersResponse",
+- "swagger.X.A": {
+- "id": "swagger.X.A",
+- "required": [
+- "B"
+- ],
- "properties": {
-- "clusters": {
+- "B": {
+- "type": "integer",
+- "format": "int32"
+- }
+- }
+- }
+- }`
+-
+- testJsonFromStruct(t, X{}, expected)
+-}
+-
+-func TestAnonymousArrayStruct(t *testing.T) {
+- type X struct {
+- A []struct {
+- B int
+- }
+- }
+-
+- expected := `{
+- "swagger.X": {
+- "id": "swagger.X",
+- "required": [
+- "A"
+- ],
+- "properties": {
+- "A": {
- "type": "array",
-- "description": "A list of clusters in the project, across all zones.",
-- "items": {
-- "$ref": "Cluster"
-- }
+- "items": [
+- {
+- "$ref": "swagger.X.A"
+- }
+- ]
+- }
+- }
+- },
+- "swagger.X.A": {
+- "id": "swagger.X.A",
+- "required": [
+- "B"
+- ],
+- "properties": {
+- "B": {
+- "type": "integer",
+- "format": "int32"
- }
- }
-- },
-- "ListAggregatedOperationsResponse": {
-- "id": "ListAggregatedOperationsResponse",
-- "type": "object",
-- "externalTypeName": "container.v1beta1.ListAggregatedOperationsResponse",
+- }
+- }`
+-
+- testJsonFromStruct(t, X{}, expected)
+-}
+-
+-func TestAnonymousPtrArrayStruct(t *testing.T) {
+- type X struct {
+- A *[]struct {
+- B int
+- }
+- }
+-
+- expected := `{
+- "swagger.X": {
+- "id": "swagger.X",
+- "required": [
+- "A"
+- ],
- "properties": {
-- "operations": {
+- "A": {
- "type": "array",
-- "description": "A list of operations in the project, across all zones.",
-- "items": {
-- "$ref": "Operation"
-- }
+- "items": [
+- {
+- "$ref": "swagger.X.A"
+- }
+- ]
- }
- }
- },
-- "ListClustersResponse": {
-- "id": "ListClustersResponse",
-- "type": "object",
-- "externalTypeName": "container.v1beta1.ListClustersResponse",
+- "swagger.X.A": {
+- "id": "swagger.X.A",
+- "required": [
+- "B"
+- ],
- "properties": {
-- "clusters": {
-- "type": "array",
-- "description": "A list of clusters in the project in the specified zone.",
-- "items": {
-- "$ref": "Cluster"
-- }
+- "B": {
+- "type": "integer",
+- "format": "int32"
- }
- }
-- },
-- "ListOperationsResponse": {
-- "id": "ListOperationsResponse",
-- "type": "object",
-- "externalTypeName": "container.v1beta1.ListOperationsResponse",
+- }
+- }`
+-
+- testJsonFromStruct(t, X{}, expected)
+-}
+-
+-// go test -v -test.run TestEmbeddedStruct_Issue98 ...swagger
+-func TestEmbeddedStruct_Issue98(t *testing.T) {
+- type Y struct {
+- A int
+- }
+- type X struct {
+- Y
+- }
+- testJsonFromStruct(t, X{}, `{
+- "swagger.X": {
+- "id": "swagger.X",
+- "required": [
+- "A"
+- ],
- "properties": {
-- "operations": {
-- "type": "array",
-- "description": "A list of operations in the project in the specified zone.",
-- "items": {
-- "$ref": "Operation"
-- }
+- "A": {
+- "type": "integer",
+- "format": "int32"
- }
- }
-- },
-- "MasterAuth": {
-- "id": "MasterAuth",
-- "type": "object",
-- "externalTypeName": "container.v1beta1.MasterAuth",
+- }
+- }`)
+-}
+-
+-type Dataset struct {
+- Names []string
+-}
+-
+-// clear && go test -v -test.run TestIssue85 ...swagger
+-func TestIssue85(t *testing.T) {
+- anon := struct{ Datasets []Dataset }{}
+- testJsonFromStruct(t, anon, `{
+- "struct { Datasets ||swagger.Dataset }": {
+- "id": "struct { Datasets ||swagger.Dataset }",
+- "required": [
+- "Datasets"
+- ],
- "properties": {
-- "password": {
-- "type": "string",
-- "description": "The password to use when accessing the Kubernetes master endpoint."
-- },
-- "user": {
-- "type": "string",
-- "description": "The username to use when accessing the Kubernetes master endpoint."
+- "Datasets": {
+- "type": "array",
+- "items": [
+- {
+- "$ref": "swagger.Dataset"
+- }
+- ]
- }
- }
- },
-- "NodeConfig": {
-- "id": "NodeConfig",
-- "type": "object",
-- "externalTypeName": "container.v1beta1.NodeConfig",
+- "swagger.Dataset": {
+- "id": "swagger.Dataset",
+- "required": [
+- "Names"
+- ],
- "properties": {
-- "machineType": {
-- "type": "string",
-- "description": "The name of a Google Compute Engine machine type (e.g. n1-standard-1).\n\nIf unspecified, the default machine type is n1-standard-1."
-- },
-- "sourceImage": {
-- "type": "string",
-- "description": "The fully-specified name of a Google Compute Engine image. For example: https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/backports-debian-7-wheezy-vYYYYMMDD (where YYYMMDD is the version date).\n\nIf specifying an image, you are responsible for ensuring its compatibility with the Debian 7 backports image. We recommend leaving this field blank to accept the default backports-debian-7-wheezy value."
+- "Names": {
+- "type": "array",
+- "items": [
+- {
+- "$ref": "string"
+- }
+- ]
- }
- }
-- },
-- "Operation": {
-- "id": "Operation",
-- "type": "object",
-- "description": "Defines the operation resource. All fields are output only.",
-- "externalTypeName": "container.v1beta1.Operation",
+- }
+- }`)
+-}
+-
+-type File struct {
+- History []File
+- HistoryPtrs []*File
+-}
+-
+-// go test -v -test.run TestRecursiveStructure ...swagger
+-func TestRecursiveStructure(t *testing.T) {
+- testJsonFromStruct(t, File{}, `{
+- "swagger.File": {
+- "id": "swagger.File",
+- "required": [
+- "History",
+- "HistoryPtrs"
+- ],
- "properties": {
-- "errorMessage": {
-- "type": "string",
-- "description": "If an error has occurred, a textual description of the error."
-- },
-- "name": {
-- "type": "string",
-- "description": "The server-assigned ID for this operation. If the operation is fulfilled upfront, it may not have a resource name."
-- },
-- "operationType": {
-- "type": "string",
-- "description": "The operation type.",
-- "enum": [
-- "createCluster",
-- "deleteCluster"
-- ],
-- "enumDescriptions": [
-- "",
-- ""
+- "History": {
+- "type": "array",
+- "items": [
+- {
+- "$ref": "swagger.File"
+- }
- ]
- },
-- "status": {
-- "type": "string",
-- "description": "The current status of the operation.",
-- "enum": [
-- "done",
-- "pending",
-- "running"
-- ],
-- "enumDescriptions": [
-- "",
-- "",
-- ""
+- "HistoryPtrs": {
+- "type": "array",
+- "items": [
+- {
+- "$ref": "swagger.File.HistoryPtrs"
+- }
- ]
-- },
-- "target": {
-- "type": "string",
-- "description": "[Optional] The URL of the cluster resource that this operation is associated with."
-- },
-- "zone": {
-- "type": "string",
-- "description": "The name of the Google Compute Engine zone in which the operation is taking place."
- }
- }
+- },
+- "swagger.File.HistoryPtrs": {
+- "id": "swagger.File.HistoryPtrs",
+- "properties": {}
- }
-- },
-- "resources": {
-- "projects": {
-- "resources": {
-- "clusters": {
-- "methods": {
-- "list": {
-- "id": "container.projects.clusters.list",
-- "path": "{projectId}/clusters",
-- "httpMethod": "GET",
-- "description": "Lists all clusters owned by a project across all zones.",
-- "parameters": {
-- "projectId": {
-- "type": "string",
-- "description": "The Google Developers Console project ID or project number.",
-- "required": true,
-- "location": "path"
-- }
-- },
-- "parameterOrder": [
-- "projectId"
-- ],
-- "response": {
-- "$ref": "ListAggregatedClustersResponse"
-- },
-- "scopes": [
-- "https://www.googleapis.com/auth/cloud-platform"
-- ]
-- }
-- }
-- },
-- "operations": {
-- "methods": {
-- "list": {
-- "id": "container.projects.operations.list",
-- "path": "{projectId}/operations",
-- "httpMethod": "GET",
-- "description": "Lists all operations in a project, across all zones.",
-- "parameters": {
-- "projectId": {
-- "type": "string",
-- "description": "The Google Developers Console project ID or project number.",
-- "required": true,
-- "location": "path"
-- }
-- },
-- "parameterOrder": [
-- "projectId"
-- ],
-- "response": {
-- "$ref": "ListAggregatedOperationsResponse"
-- },
-- "scopes": [
-- "https://www.googleapis.com/auth/cloud-platform"
-- ]
-- }
-- }
-- },
-- "zones": {
-- "resources": {
-- "clusters": {
-- "methods": {
-- "create": {
-- "id": "container.projects.zones.clusters.create",
-- "path": "{projectId}/zones/{zoneId}/clusters",
-- "httpMethod": "POST",
-- "description": "Creates a cluster, consisting of the specified number and type of Google Compute Engine instances, plus a Kubernetes master instance.\n\nThe cluster is created in the project's default network.\n\nA firewall is added that allows traffic into port 443 on the master, which enables HTTPS. A firewall and a route is added for each node to allow the containers on that node to communicate with all other instances in the cluster.\n\nFinally, a route named k8s-iproute-10-xx-0-0 is created to track that the cluster's 10.xx.0.0/16 CIDR has been assigned.",
-- "parameters": {
-- "projectId": {
-- "type": "string",
-- "description": "The Google Developers Console project ID or project number.",
-- "required": true,
-- "location": "path"
-- },
-- "zoneId": {
-- "type": "string",
-- "description": "The name of the Google Compute Engine zone in which the cluster resides.",
-- "required": true,
-- "location": "path"
-- }
-- },
-- "parameterOrder": [
-- "projectId",
-- "zoneId"
-- ],
-- "request": {
-- "$ref": "CreateClusterRequest"
-- },
-- "response": {
-- "$ref": "Operation"
-- },
-- "scopes": [
-- "https://www.googleapis.com/auth/cloud-platform"
-- ]
-- },
-- "delete": {
-- "id": "container.projects.zones.clusters.delete",
-- "path": "{projectId}/zones/{zoneId}/clusters/{clusterId}",
-- "httpMethod": "DELETE",
-- "description": "Deletes the cluster, including the Kubernetes master and all worker nodes.\n\nFirewalls and routes that were configured at cluster creation are also deleted.",
-- "parameters": {
-- "clusterId": {
-- "type": "string",
-- "description": "The name of the cluster to delete.",
-- "required": true,
-- "location": "path"
-- },
-- "projectId": {
-- "type": "string",
-- "description": "The Google Developers Console project ID or project number.",
-- "required": true,
-- "location": "path"
-- },
-- "zoneId": {
-- "type": "string",
-- "description": "The name of the Google Compute Engine zone in which the cluster resides.",
-- "required": true,
-- "location": "path"
-- }
-- },
-- "parameterOrder": [
-- "projectId",
-- "zoneId",
-- "clusterId"
-- ],
-- "response": {
-- "$ref": "Operation"
-- },
-- "scopes": [
-- "https://www.googleapis.com/auth/cloud-platform"
-- ]
-- },
-- "get": {
-- "id": "container.projects.zones.clusters.get",
-- "path": "{projectId}/zones/{zoneId}/clusters/{clusterId}",
-- "httpMethod": "GET",
-- "description": "Gets a specific cluster.",
-- "parameters": {
-- "clusterId": {
-- "type": "string",
-- "description": "The name of the cluster to retrieve.",
-- "required": true,
-- "location": "path"
-- },
-- "projectId": {
-- "type": "string",
-- "description": "The Google Developers Console project ID or project number.",
-- "required": true,
-- "location": "path"
-- },
-- "zoneId": {
-- "type": "string",
-- "description": "The name of the Google Compute Engine zone in which the cluster resides.",
-- "required": true,
-- "location": "path"
-- }
-- },
-- "parameterOrder": [
-- "projectId",
-- "zoneId",
-- "clusterId"
-- ],
-- "response": {
-- "$ref": "Cluster"
-- },
-- "scopes": [
-- "https://www.googleapis.com/auth/cloud-platform"
-- ]
-- },
-- "list": {
-- "id": "container.projects.zones.clusters.list",
-- "path": "{projectId}/zones/{zoneId}/clusters",
-- "httpMethod": "GET",
-- "description": "Lists all clusters owned by a project in the specified zone.",
-- "parameters": {
-- "projectId": {
-- "type": "string",
-- "description": "The Google Developers Console project ID or project number.",
-- "required": true,
-- "location": "path"
-- },
-- "zoneId": {
-- "type": "string",
-- "description": "The name of the Google Compute Engine zone in which the cluster resides.",
-- "required": true,
-- "location": "path"
-- }
-- },
-- "parameterOrder": [
-- "projectId",
-- "zoneId"
-- ],
-- "response": {
-- "$ref": "ListClustersResponse"
-- },
-- "scopes": [
-- "https://www.googleapis.com/auth/cloud-platform"
-- ]
-- }
-- }
-- },
-- "operations": {
-- "methods": {
-- "get": {
-- "id": "container.projects.zones.operations.get",
-- "path": "{projectId}/zones/{zoneId}/operations/{operationId}",
-- "httpMethod": "GET",
-- "description": "Gets the specified operation.",
-- "parameters": {
-- "operationId": {
-- "type": "string",
-- "description": "The server-assigned name of the operation.",
-- "required": true,
-- "location": "path"
-- },
-- "projectId": {
-- "type": "string",
-- "description": "The Google Developers Console project ID or project number.",
-- "required": true,
-- "location": "path"
-- },
-- "zoneId": {
-- "type": "string",
-- "description": "The name of the Google Compute Engine zone in which the operation resides. This is always the same zone as the cluster with which the operation is associated.",
-- "required": true,
-- "location": "path"
-- }
-- },
-- "parameterOrder": [
-- "projectId",
-- "zoneId",
-- "operationId"
-- ],
-- "response": {
-- "$ref": "Operation"
-- },
-- "scopes": [
-- "https://www.googleapis.com/auth/cloud-platform"
-- ]
-- },
-- "list": {
-- "id": "container.projects.zones.operations.list",
-- "path": "{projectId}/zones/{zoneId}/operations",
-- "httpMethod": "GET",
-- "description": "Lists all operations in a project in a specific zone.",
-- "parameters": {
-- "projectId": {
-- "type": "string",
-- "description": "The Google Developers Console project ID or project number.",
-- "required": true,
-- "location": "path"
-- },
-- "zoneId": {
-- "type": "string",
-- "description": "The name of the Google Compute Engine zone to return operations for.",
-- "required": true,
-- "location": "path"
-- }
-- },
-- "parameterOrder": [
-- "projectId",
-- "zoneId"
-- ],
-- "response": {
-- "$ref": "ListOperationsResponse"
-- },
-- "scopes": [
-- "https://www.googleapis.com/auth/cloud-platform"
-- ]
+- }`)
+-}
+-
+-type A1 struct {
+- B struct {
+- Id int
+- Comment string `json:"comment,omitempty"`
+- }
+-}
+-
+-// go test -v -test.run TestEmbeddedStructA1 ...swagger
+-func TestEmbeddedStructA1(t *testing.T) {
+- testJsonFromStruct(t, A1{}, `{
+- "swagger.A1": {
+- "id": "swagger.A1",
+- "required": [
+- "B"
+- ],
+- "properties": {
+- "B": {
+- "type": "swagger.A1.B"
+- }
+- }
+- },
+- "swagger.A1.B": {
+- "id": "swagger.A1.B",
+- "required": [
+- "Id"
+- ],
+- "properties": {
+- "Id": {
+- "type": "integer",
+- "format": "int32"
+- },
+- "comment": {
+- "type": "string"
+- }
+- }
+- }
+- }`)
+-}
+-
+-type A2 struct {
+- C
+-}
+-type C struct {
+- Id int `json:"B"`
+- Comment string `json:"comment,omitempty"`
+- Secure bool `json:"secure"`
+-}
+-
+-// go test -v -test.run TestEmbeddedStructA2 ...swagger
+-func TestEmbeddedStructA2(t *testing.T) {
+- testJsonFromStruct(t, A2{}, `{
+- "swagger.A2": {
+- "id": "swagger.A2",
+- "required": [
+- "B",
+- "secure"
+- ],
+- "properties": {
+- "B": {
+- "type": "integer",
+- "format": "int32"
+- },
+- "comment": {
+- "type": "string"
+- },
+- "secure": {
+- "type": "boolean"
+- }
+- }
+- }
+- }`)
+-}
+-
+-type A3 struct {
+- B D
+-}
+-
+-type D struct {
+- Id int
+-}
+-
+-// clear && go test -v -test.run TestStructA3 ...swagger
+-func TestStructA3(t *testing.T) {
+- testJsonFromStruct(t, A3{}, `{
+- "swagger.A3": {
+- "id": "swagger.A3",
+- "required": [
+- "B"
+- ],
+- "properties": {
+- "B": {
+- "type": "swagger.D"
+- }
+- }
+- },
+- "swagger.D": {
+- "id": "swagger.D",
+- "required": [
+- "Id"
+- ],
+- "properties": {
+- "Id": {
+- "type": "integer",
+- "format": "int32"
+- }
+- }
+- }
+- }`)
+-}
+-
+-type ObjectId []byte
+-
+-type Region struct {
+- Id ObjectId `bson:"_id" json:"id"`
+- Name string `bson:"name" json:"name"`
+- Type string `bson:"type" json:"type"`
+-}
+-
+-// clear && go test -v -test.run TestRegion_Issue113 ...swagger
+-func TestRegion_Issue113(t *testing.T) {
+- testJsonFromStruct(t, []Region{}, `{
+- "integer": {
+- "id": "integer",
+- "properties": {}
+- },
+- "swagger.Region": {
+- "id": "swagger.Region",
+- "required": [
+- "id",
+- "name",
+- "type"
+- ],
+- "properties": {
+- "id": {
+- "type": "array",
+- "items": [
+- {
+- "$ref": "integer"
+- }
+- ]
+- },
+- "name": {
+- "type": "string"
+- },
+- "type": {
+- "type": "string"
+- }
+- }
+- },
+- "||swagger.Region": {
+- "id": "||swagger.Region",
+- "properties": {}
+- }
+- }`)
+-}
+-
+-// clear && go test -v -test.run TestIssue158 ...swagger
+-func TestIssue158(t *testing.T) {
+- type Address struct {
+- Country string `json:"country,omitempty"`
+- }
+-
+- type Customer struct {
+- Name string `json:"name"`
+- Address Address `json:"address"`
+- }
+- expected := `{
+- "swagger.Address": {
+- "id": "swagger.Address",
+- "properties": {
+- "country": {
+- "type": "string"
+- }
+- }
+- },
+- "swagger.Customer": {
+- "id": "swagger.Customer",
+- "required": [
+- "name",
+- "address"
+- ],
+- "properties": {
+- "address": {
+- "type": "swagger.Address"
+- },
+- "name": {
+- "type": "string"
+- }
+- }
+- }
+- }`
+- testJsonFromStruct(t, Customer{}, expected)
+-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/param_sorter.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/param_sorter.go
+deleted file mode 100644
+index 813007b..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/param_sorter.go
++++ /dev/null
+@@ -1,29 +0,0 @@
+-package swagger
+-
+-// Copyright 2014 Ernest Micklei. All rights reserved.
+-// Use of this source code is governed by a license
+-// that can be found in the LICENSE file.
+-
+-type ParameterSorter []Parameter
+-
+-func (s ParameterSorter) Len() int {
+- return len(s)
+-}
+-func (s ParameterSorter) Swap(i, j int) {
+- s[i], s[j] = s[j], s[i]
+-}
+-
+-var typeToSortKey = map[string]string{
+- "path": "A",
+- "query": "B",
+- "form": "C",
+- "header": "D",
+- "body": "E",
+-}
+-
+-func (s ParameterSorter) Less(i, j int) bool {
+- // use ordering path,query,form,header,body
+- pi := s[i]
+- pj := s[j]
+- return typeToSortKey[pi.ParamType]+pi.Name < typeToSortKey[pj.ParamType]+pj.Name
+-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/param_sorter_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/param_sorter_test.go
+deleted file mode 100644
+index ef6d9eb..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/param_sorter_test.go
++++ /dev/null
+@@ -1,52 +0,0 @@
+-package swagger
+-
+-import (
+- "bytes"
+- "sort"
+- "testing"
+-)
+-
+-func TestSortParameters(t *testing.T) {
+- unsorted := []Parameter{
+- Parameter{
+- Name: "form2",
+- ParamType: "form",
+- },
+- Parameter{
+- Name: "header1",
+- ParamType: "header",
+- },
+- Parameter{
+- Name: "path2",
+- ParamType: "path",
+- },
+- Parameter{
+- Name: "body",
+- ParamType: "body",
+- },
+- Parameter{
+- Name: "path1",
+- ParamType: "path",
+- },
+- Parameter{
+- Name: "form1",
+- ParamType: "form",
+- },
+- Parameter{
+- Name: "query2",
+- ParamType: "query",
+- },
+- Parameter{
+- Name: "query1",
+- ParamType: "query",
+- },
+- }
+- sort.Sort(ParameterSorter(unsorted))
+- var b bytes.Buffer
+- for _, p := range unsorted {
+- b.WriteString(p.Name + ".")
+- }
+- if "path1.path2.query1.query2.form1.form2.header1.body." != b.String() {
+- t.Fatal("sorting has changed:" + b.String())
+- }
+-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/swagger.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/swagger.go
+deleted file mode 100644
+index 9f2fe4b..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/swagger.go
++++ /dev/null
+@@ -1,184 +0,0 @@
+-// Package swagger implements the structures of the Swagger
+-// https://github.com/wordnik/swagger-spec/blob/master/versions/1.2.md
+-package swagger
+-
+-const swaggerVersion = "1.2"
+-
+-// 4.3.3 Data Type Fields
+-type DataTypeFields struct {
+- Type *string `json:"type,omitempty"` // if Ref not used
+- Ref *string `json:"$ref,omitempty"` // if Type not used
+- Format string `json:"format,omitempty"`
+- DefaultValue Special `json:"defaultValue,omitempty"`
+- Enum []string `json:"enum,omitempty"`
+- Minimum string `json:"minimum,omitempty"`
+- Maximum string `json:"maximum,omitempty"`
+- Items []Item `json:"items,omitempty"`
+- UniqueItems *bool `json:"uniqueItems,omitempty"`
+-}
+-
+-type Special string
+-
+-// 4.3.4 Items Object
+-type Item struct {
+- Type *string `json:"type,omitempty"`
+- Ref *string `json:"$ref,omitempty"`
+- Format string `json:"format,omitempty"`
+-}
+-
+-// 5.1 Resource Listing
+-type ResourceListing struct {
+- SwaggerVersion string `json:"swaggerVersion"` // e.g 1.2
+- Apis []Resource `json:"apis"`
+- ApiVersion string `json:"apiVersion"`
+- Info Info `json:"info"`
+- Authorizations []Authorization `json:"authorizations,omitempty"`
+-}
+-
+-// 5.1.2 Resource Object
+-type Resource struct {
+- Path string `json:"path"` // relative or absolute, must start with /
+- Description string `json:"description"`
+-}
+-
+-// 5.1.3 Info Object
+-type Info struct {
+- Title string `json:"title"`
+- Description string `json:"description"`
+- TermsOfServiceUrl string `json:"termsOfServiceUrl,omitempty"`
+- Contact string `json:"contact,omitempty"`
+- License string `json:"license,omitempty"`
+- LicensUrl string `json:"licensUrl,omitempty"`
+-}
+-
+-// 5.1.5
+-type Authorization struct {
+- Type string `json:"type"`
+- PassAs string `json:"passAs"`
+- Keyname string `json:"keyname"`
+- Scopes []Scope `json:"scopes"`
+- GrantTypes []GrantType `json:"grandTypes"`
+-}
+-
+-// 5.1.6, 5.2.11
+-type Scope struct {
+- // Required. The name of the scope.
+- Scope string `json:"scope"`
+- // Recommended. A short description of the scope.
+- Description string `json:"description"`
+-}
+-
+-// 5.1.7
+-type GrantType struct {
+- Implicit Implicit `json:"implicit"`
+- AuthorizationCode AuthorizationCode `json:"authorization_code"`
+-}
+-
+-// 5.1.8 Implicit Object
+-type Implicit struct {
+- // Required. The login endpoint definition.
+- loginEndpoint LoginEndpoint `json:"loginEndpoint"`
+- // An optional alternative name to standard "access_token" OAuth2 parameter.
+- TokenName string `json:"tokenName"`
+-}
+-
+-// 5.1.9 Authorization Code Object
+-type AuthorizationCode struct {
+- TokenRequestEndpoint TokenRequestEndpoint `json:"tokenRequestEndpoint"`
+- TokenEndpoint TokenEndpoint `json:"tokenEndpoint"`
+-}
+-
+-// 5.1.10 Login Endpoint Object
+-type LoginEndpoint struct {
+- // Required. The URL of the authorization endpoint for the implicit grant flow. The value SHOULD be in a URL format.
+- Url string `json:"url"`
+-}
+-
+-// 5.1.11 Token Request Endpoint Object
+-type TokenRequestEndpoint struct {
+- // Required. The URL of the authorization endpoint for the authentication code grant flow. The value SHOULD be in a URL format.
+- Url string `json:"url"`
+- // An optional alternative name to standard "client_id" OAuth2 parameter.
+- ClientIdName string `json:"clientIdName"`
+- // An optional alternative name to the standard "client_secret" OAuth2 parameter.
+- ClientSecretName string `json:"clientSecretName"`
+-}
+-
+-// 5.1.12 Token Endpoint Object
+-type TokenEndpoint struct {
+- // Required. The URL of the token endpoint for the authentication code grant flow. The value SHOULD be in a URL format.
+- Url string `json:"url"`
+- // An optional alternative name to standard "access_token" OAuth2 parameter.
+- TokenName string `json:"tokenName"`
+-}
+-
+-// 5.2 API Declaration
+-type ApiDeclaration struct {
+- SwaggerVersion string `json:"swaggerVersion"`
+- ApiVersion string `json:"apiVersion"`
+- BasePath string `json:"basePath"`
+- ResourcePath string `json:"resourcePath"` // must start with /
+- Apis []Api `json:"apis,omitempty"`
+- Models map[string]Model `json:"models,omitempty"`
+- Produces []string `json:"produces,omitempty"`
+- Consumes []string `json:"consumes,omitempty"`
+- Authorizations []Authorization `json:"authorizations,omitempty"`
+-}
+-
+-// 5.2.2 API Object
+-type Api struct {
+- Path string `json:"path"` // relative or absolute, must start with /
+- Description string `json:"description"`
+- Operations []Operation `json:"operations,omitempty"`
+-}
+-
+-// 5.2.3 Operation Object
+-type Operation struct {
+- Type string `json:"type"`
+- Method string `json:"method"`
+- Summary string `json:"summary,omitempty"`
+- Notes string `json:"notes,omitempty"`
+- Nickname string `json:"nickname"`
+- Authorizations []Authorization `json:"authorizations,omitempty"`
+- Parameters []Parameter `json:"parameters"`
+- ResponseMessages []ResponseMessage `json:"responseMessages,omitempty"` // optional
+- Produces []string `json:"produces,omitempty"`
+- Consumes []string `json:"consumes,omitempty"`
+- Deprecated string `json:"deprecated,omitempty"`
+-}
+-
+-// 5.2.4 Parameter Object
+-type Parameter struct {
+- DataTypeFields
+- ParamType string `json:"paramType"` // path,query,body,header,form
+- Name string `json:"name"`
+- Description string `json:"description"`
+- Required bool `json:"required"`
+- AllowMultiple bool `json:"allowMultiple"`
+-}
+-
+-// 5.2.5 Response Message Object
+-type ResponseMessage struct {
+- Code int `json:"code"`
+- Message string `json:"message"`
+- ResponseModel string `json:"responseModel,omitempty"`
+-}
+-
+-// 5.2.6, 5.2.7 Models Object
+-type Model struct {
+- Id string `json:"id"`
+- Description string `json:"description,omitempty"`
+- Required []string `json:"required,omitempty"`
+- Properties map[string]ModelProperty `json:"properties"`
+- SubTypes []string `json:"subTypes,omitempty"`
+- Discriminator string `json:"discriminator,omitempty"`
+-}
+-
+-// 5.2.8 Properties Object
+-type ModelProperty struct {
+- DataTypeFields
+- Description string `json:"description,omitempty"`
+-}
+-
+-// 5.2.10
+-type Authorizations map[string]Authorization
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/swagger_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/swagger_test.go
+deleted file mode 100644
+index 81e72f6..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/swagger_test.go
++++ /dev/null
+@@ -1,116 +0,0 @@
+-package swagger
+-
+-import (
+- "encoding/json"
+- "fmt"
+- "testing"
+-
+- "github.com/emicklei/go-restful"
+-)
+-
+-// go test -v -test.run TestApi ...swagger
+-func TestApi(t *testing.T) {
+- value := Api{Path: "/", Description: "Some Path", Operations: []Operation{}}
+- compareJson(t, true, value, `{"path":"/","description":"Some Path"}`)
+-}
+-
+-// go test -v -test.run TestServiceToApi ...swagger
+-func TestServiceToApi(t *testing.T) {
+- ws := new(restful.WebService)
+- ws.Path("/tests")
+- ws.Consumes(restful.MIME_JSON)
+- ws.Produces(restful.MIME_XML)
+- ws.Route(ws.GET("/all").To(dummy).Writes(sample{}))
+- ws.ApiVersion("1.2.3")
+- cfg := Config{
+- WebServicesUrl: "http://here.com",
+- ApiPath: "/apipath",
+- WebServices: []*restful.WebService{ws}}
+- sws := newSwaggerService(cfg)
+- decl := sws.composeDeclaration(ws, "/tests")
+- data, err := json.MarshalIndent(decl, " ", " ")
+- if err != nil {
+- t.Fatal(err.Error())
+- }
+- // for visual inspection only
+- fmt.Println(string(data))
+-}
+-
+-func dummy(i *restful.Request, o *restful.Response) {}
+-
+-// go test -v -test.run TestIssue78 ...swagger
+-type Response struct {
+- Code int
+- Users *[]User
+- Items *[]TestItem
+-}
+-type User struct {
+- Id, Name string
+-}
+-type TestItem struct {
+- Id, Name string
+-}
+-
+-// clear && go test -v -test.run TestComposeResponseMessages ...swagger
+-func TestComposeResponseMessages(t *testing.T) {
+- responseErrors := map[int]restful.ResponseError{}
+- responseErrors[400] = restful.ResponseError{Code: 400, Message: "Bad Request", Model: TestItem{}}
+- route := restful.Route{ResponseErrors: responseErrors}
+- decl := new(ApiDeclaration)
+- decl.Models = map[string]Model{}
+- msgs := composeResponseMessages(route, decl)
+- if msgs[0].ResponseModel != "swagger.TestItem" {
+- t.Errorf("got %s want swagger.TestItem", msgs[0].ResponseModel)
+- }
+-}
+-
+-// clear && go test -v -test.run TestComposeResponseMessageArray ...swagger
+-func TestComposeResponseMessageArray(t *testing.T) {
+- responseErrors := map[int]restful.ResponseError{}
+- responseErrors[400] = restful.ResponseError{Code: 400, Message: "Bad Request", Model: []TestItem{}}
+- route := restful.Route{ResponseErrors: responseErrors}
+- decl := new(ApiDeclaration)
+- decl.Models = map[string]Model{}
+- msgs := composeResponseMessages(route, decl)
+- if msgs[0].ResponseModel != "array[swagger.TestItem]" {
+- t.Errorf("got %s want swagger.TestItem", msgs[0].ResponseModel)
+- }
+-}
+-
+-func TestIssue78(t *testing.T) {
+- sws := newSwaggerService(Config{})
+- models := map[string]Model{}
+- sws.addModelFromSampleTo(&Operation{}, true, Response{Items: &[]TestItem{}}, models)
+- model, ok := models["swagger.Response"]
+- if !ok {
+- t.Fatal("missing response model")
+- }
+- if "swagger.Response" != model.Id {
+- t.Fatal("wrong model id:" + model.Id)
+- }
+- code, ok := model.Properties["Code"]
+- if !ok {
+- t.Fatal("missing code")
+- }
+- if "integer" != *code.Type {
+- t.Fatal("wrong code type:" + *code.Type)
+- }
+- items, ok := model.Properties["Items"]
+- if !ok {
+- t.Fatal("missing items")
+- }
+- if "array" != *items.Type {
+- t.Fatal("wrong items type:" + *items.Type)
+- }
+- items_items := items.Items
+- if len(items_items) == 0 {
+- t.Fatal("missing items->items")
+- }
+- ref := items_items[0].Ref
+- if ref == nil {
+- t.Fatal("missing $ref")
+- }
+- if *ref != "swagger.TestItem" {
+- t.Fatal("wrong $ref:" + *ref)
+- }
+-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/swagger_webservice.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/swagger_webservice.go
+deleted file mode 100644
+index 04da0a1..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/swagger_webservice.go
++++ /dev/null
+@@ -1,353 +0,0 @@
+-package swagger
+-
+-import (
+- "fmt"
+- "github.com/emicklei/go-restful"
+- // "github.com/emicklei/hopwatch"
+- "log"
+- "net/http"
+- "reflect"
+- "sort"
+- "strings"
+-)
+-
+-type SwaggerService struct {
+- config Config
+- apiDeclarationMap map[string]ApiDeclaration
+-}
+-
+-func newSwaggerService(config Config) *SwaggerService {
+- return &SwaggerService{
+- config: config,
+- apiDeclarationMap: map[string]ApiDeclaration{}}
+-}
+-
+-// LogInfo is the function that is called when this package needs to log. It defaults to log.Printf
+-var LogInfo = log.Printf
+-
+-// InstallSwaggerService add the WebService that provides the API documentation of all services
+-// conform the Swagger documentation specifcation. (https://github.com/wordnik/swagger-core/wiki).
+-func InstallSwaggerService(aSwaggerConfig Config) {
+- RegisterSwaggerService(aSwaggerConfig, restful.DefaultContainer)
+-}
+-
+-// RegisterSwaggerService add the WebService that provides the API documentation of all services
+-// conform the Swagger documentation specifcation. (https://github.com/wordnik/swagger-core/wiki).
+-func RegisterSwaggerService(config Config, wsContainer *restful.Container) {
+- sws := newSwaggerService(config)
+- ws := new(restful.WebService)
+- ws.Path(config.ApiPath)
+- ws.Produces(restful.MIME_JSON)
+- if config.DisableCORS {
+- ws.Filter(enableCORS)
+- }
+- ws.Route(ws.GET("/").To(sws.getListing))
+- ws.Route(ws.GET("/{a}").To(sws.getDeclarations))
+- ws.Route(ws.GET("/{a}/{b}").To(sws.getDeclarations))
+- ws.Route(ws.GET("/{a}/{b}/{c}").To(sws.getDeclarations))
+- ws.Route(ws.GET("/{a}/{b}/{c}/{d}").To(sws.getDeclarations))
+- ws.Route(ws.GET("/{a}/{b}/{c}/{d}/{e}").To(sws.getDeclarations))
+- ws.Route(ws.GET("/{a}/{b}/{c}/{d}/{e}/{f}").To(sws.getDeclarations))
+- ws.Route(ws.GET("/{a}/{b}/{c}/{d}/{e}/{f}/{g}").To(sws.getDeclarations))
+- LogInfo("[restful/swagger] listing is available at %v%v", config.WebServicesUrl, config.ApiPath)
+- wsContainer.Add(ws)
+-
+- // Build all ApiDeclarations
+- for _, each := range config.WebServices {
+- rootPath := each.RootPath()
+- // skip the api service itself
+- if rootPath != config.ApiPath {
+- if rootPath == "" || rootPath == "/" {
+- // use routes
+- for _, route := range each.Routes() {
+- entry := staticPathFromRoute(route)
+- _, exists := sws.apiDeclarationMap[entry]
+- if !exists {
+- sws.apiDeclarationMap[entry] = sws.composeDeclaration(each, entry)
+- }
+- }
+- } else { // use root path
+- sws.apiDeclarationMap[each.RootPath()] = sws.composeDeclaration(each, each.RootPath())
+- }
+- }
+- }
+-
+- // Check paths for UI serving
+- if config.StaticHandler == nil && config.SwaggerFilePath != "" && config.SwaggerPath != "" {
+- swaggerPathSlash := config.SwaggerPath
+- // path must end with slash /
+- if "/" != config.SwaggerPath[len(config.SwaggerPath)-1:] {
+- LogInfo("[restful/swagger] use corrected SwaggerPath ; must end with slash (/)")
+- swaggerPathSlash += "/"
+- }
+-
+- LogInfo("[restful/swagger] %v%v is mapped to folder %v", config.WebServicesUrl, swaggerPathSlash, config.SwaggerFilePath)
+- wsContainer.Handle(swaggerPathSlash, http.StripPrefix(swaggerPathSlash, http.FileServer(http.Dir(config.SwaggerFilePath))))
+-
+- //if we define a custom static handler use it
+- } else if config.StaticHandler != nil && config.SwaggerPath != "" {
+- swaggerPathSlash := config.SwaggerPath
+- // path must end with slash /
+- if "/" != config.SwaggerPath[len(config.SwaggerPath)-1:] {
+- LogInfo("[restful/swagger] use corrected SwaggerFilePath ; must end with slash (/)")
+- swaggerPathSlash += "/"
+-
+- }
+- LogInfo("[restful/swagger] %v%v is mapped to custom Handler %T", config.WebServicesUrl, swaggerPathSlash, config.StaticHandler)
+- wsContainer.Handle(swaggerPathSlash, config.StaticHandler)
+-
+- } else {
+- LogInfo("[restful/swagger] Swagger(File)Path is empty ; no UI is served")
+- }
+-}
+-
+-func staticPathFromRoute(r restful.Route) string {
+- static := r.Path
+- bracket := strings.Index(static, "{")
+- if bracket <= 1 { // result cannot be empty
+- return static
+- }
+- if bracket != -1 {
+- static = r.Path[:bracket]
+- }
+- if strings.HasSuffix(static, "/") {
+- return static[:len(static)-1]
+- } else {
+- return static
+- }
+-}
+-
+-func enableCORS(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
+- if origin := req.HeaderParameter(restful.HEADER_Origin); origin != "" {
+- // prevent duplicate header
+- if len(resp.Header().Get(restful.HEADER_AccessControlAllowOrigin)) == 0 {
+- resp.AddHeader(restful.HEADER_AccessControlAllowOrigin, origin)
+- }
+- }
+- chain.ProcessFilter(req, resp)
+-}
+-
+-func (sws SwaggerService) getListing(req *restful.Request, resp *restful.Response) {
+- listing := ResourceListing{SwaggerVersion: swaggerVersion}
+- for k, v := range sws.apiDeclarationMap {
+- ref := Resource{Path: k}
+- if len(v.Apis) > 0 { // use description of first (could still be empty)
+- ref.Description = v.Apis[0].Description
+- }
+- listing.Apis = append(listing.Apis, ref)
+- }
+- resp.WriteAsJson(listing)
+-}
+-
+-func (sws SwaggerService) getDeclarations(req *restful.Request, resp *restful.Response) {
+- decl := sws.apiDeclarationMap[composeRootPath(req)]
+- // unless WebServicesUrl is given
+- if len(sws.config.WebServicesUrl) == 0 {
+- // update base path from the actual request
+- // TODO how to detect https? assume http for now
+- (&decl).BasePath = fmt.Sprintf("http://%s", req.Request.Host)
+- }
+- resp.WriteAsJson(decl)
+-}
+-
+-func (sws SwaggerService) composeDeclaration(ws *restful.WebService, pathPrefix string) ApiDeclaration {
+- decl := ApiDeclaration{
+- SwaggerVersion: swaggerVersion,
+- BasePath: sws.config.WebServicesUrl,
+- ResourcePath: ws.RootPath(),
+- Models: map[string]Model{},
+- ApiVersion: ws.Version()}
+-
+- // collect any path parameters
+- rootParams := []Parameter{}
+- for _, param := range ws.PathParameters() {
+- rootParams = append(rootParams, asSwaggerParameter(param.Data()))
+- }
+- // aggregate by path
+- pathToRoutes := map[string][]restful.Route{}
+- for _, other := range ws.Routes() {
+- if strings.HasPrefix(other.Path, pathPrefix) {
+- routes := pathToRoutes[other.Path]
+- pathToRoutes[other.Path] = append(routes, other)
+- }
+- }
+- for path, routes := range pathToRoutes {
+- api := Api{Path: strings.TrimSuffix(path, "/"), Description: ws.Documentation()}
+- for _, route := range routes {
+- operation := Operation{
+- Method: route.Method,
+- Summary: route.Doc,
+- Type: asDataType(route.WriteSample),
+- Parameters: []Parameter{},
+- Nickname: route.Operation,
+- ResponseMessages: composeResponseMessages(route, &decl)}
+-
+- operation.Consumes = route.Consumes
+- operation.Produces = route.Produces
+-
+- // share root params if any
+- for _, swparam := range rootParams {
+- operation.Parameters = append(operation.Parameters, swparam)
+- }
+- // route specific params
+- for _, param := range route.ParameterDocs {
+- operation.Parameters = append(operation.Parameters, asSwaggerParameter(param.Data()))
+- }
+- // sort parameters
+- sort.Sort(ParameterSorter(operation.Parameters))
+-
+- sws.addModelsFromRouteTo(&operation, route, &decl)
+- api.Operations = append(api.Operations, operation)
+- }
+- decl.Apis = append(decl.Apis, api)
+- }
+- return decl
+-}
+-
+-// composeResponseMessages takes the ResponseErrors (if any) and creates ResponseMessages from them.
+-func composeResponseMessages(route restful.Route, decl *ApiDeclaration) (messages []ResponseMessage) {
+- if route.ResponseErrors == nil {
+- return messages
+- }
+- // sort by code
+- codes := sort.IntSlice{}
+- for code, _ := range route.ResponseErrors {
+- codes = append(codes, code)
+- }
+- codes.Sort()
+- for _, code := range codes {
+- each := route.ResponseErrors[code]
+- message := ResponseMessage{
+- Code: code,
+- Message: each.Message,
+- }
+- if each.Model != nil {
+- st := reflect.TypeOf(each.Model)
+- isCollection, st := detectCollectionType(st)
+- modelName := modelBuilder{}.keyFrom(st)
+- if isCollection {
+- modelName = "array[" + modelName + "]"
+- }
+- modelBuilder{decl.Models}.addModel(st, "")
+- // reference the model
+- message.ResponseModel = modelName
+- }
+- messages = append(messages, message)
+- }
+- return
+-}
+-
+-// addModelsFromRoute takes any read or write sample from the Route and creates a Swagger model from it.
+-func (sws SwaggerService) addModelsFromRouteTo(operation *Operation, route restful.Route, decl *ApiDeclaration) {
+- if route.ReadSample != nil {
+- sws.addModelFromSampleTo(operation, false, route.ReadSample, decl.Models)
+- }
+- if route.WriteSample != nil {
+- sws.addModelFromSampleTo(operation, true, route.WriteSample, decl.Models)
+- }
+-}
+-
+-func detectCollectionType(st reflect.Type) (bool, reflect.Type) {
+- isCollection := false
+- if st.Kind() == reflect.Slice || st.Kind() == reflect.Array {
+- st = st.Elem()
+- isCollection = true
+- } else {
+- if st.Kind() == reflect.Ptr {
+- if st.Elem().Kind() == reflect.Slice || st.Elem().Kind() == reflect.Array {
+- st = st.Elem().Elem()
+- isCollection = true
+- }
+- }
+- }
+- return isCollection, st
+-}
+-
+-// addModelFromSample creates and adds (or overwrites) a Model from a sample resource
+-func (sws SwaggerService) addModelFromSampleTo(operation *Operation, isResponse bool, sample interface{}, models map[string]Model) {
+- st := reflect.TypeOf(sample)
+- isCollection, st := detectCollectionType(st)
+- modelName := modelBuilder{}.keyFrom(st)
+- if isResponse {
+- if isCollection {
+- modelName = "array[" + modelName + "]"
+- }
+- operation.Type = modelName
+- }
+- modelBuilder{models}.addModel(reflect.TypeOf(sample), "")
+-}
+-
+-func asSwaggerParameter(param restful.ParameterData) Parameter {
+- return Parameter{
+- DataTypeFields: DataTypeFields{
+- Type: ¶m.DataType,
+- Format: asFormat(param.DataType),
+- },
+- Name: param.Name,
+- Description: param.Description,
+- ParamType: asParamType(param.Kind),
+-
+- Required: param.Required}
+-}
+-
+-// Between 1..7 path parameters is supported
+-func composeRootPath(req *restful.Request) string {
+- path := "/" + req.PathParameter("a")
+- b := req.PathParameter("b")
+- if b == "" {
+- return path
+- }
+- path = path + "/" + b
+- c := req.PathParameter("c")
+- if c == "" {
+- return path
+- }
+- path = path + "/" + c
+- d := req.PathParameter("d")
+- if d == "" {
+- return path
+- }
+- path = path + "/" + d
+- e := req.PathParameter("e")
+- if e == "" {
+- return path
+- }
+- path = path + "/" + e
+- f := req.PathParameter("f")
+- if f == "" {
+- return path
+- }
+- path = path + "/" + f
+- g := req.PathParameter("g")
+- if g == "" {
+- return path
+- }
+- return path + "/" + g
+-}
+-
+-func asFormat(name string) string {
+- return "" // TODO
+-}
+-
+-func asParamType(kind int) string {
+- switch {
+- case kind == restful.PathParameterKind:
+- return "path"
+- case kind == restful.QueryParameterKind:
+- return "query"
+- case kind == restful.BodyParameterKind:
+- return "body"
+- case kind == restful.HeaderParameterKind:
+- return "header"
+- case kind == restful.FormParameterKind:
+- return "form"
+- }
+- return ""
+-}
+-
+-func asDataType(any interface{}) string {
+- if any == nil {
+- return "void"
+- }
+- return reflect.TypeOf(any).Name()
+-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/utils_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/utils_test.go
+deleted file mode 100644
+index 6127bd5..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/utils_test.go
++++ /dev/null
+@@ -1,70 +0,0 @@
+-package swagger
+-
+-import (
+- "bytes"
+- "encoding/json"
+- "fmt"
+- "reflect"
+- "strings"
+- "testing"
+-)
+-
+-func testJsonFromStruct(t *testing.T, sample interface{}, expectedJson string) {
+- compareJson(t, false, modelsFromStruct(sample), expectedJson)
+-}
+-
+-func modelsFromStruct(sample interface{}) map[string]Model {
+- models := map[string]Model{}
+- builder := modelBuilder{models}
+- builder.addModel(reflect.TypeOf(sample), "")
+- return models
+-}
+-
+-func compareJson(t *testing.T, flatCompare bool, value interface{}, expectedJsonAsString string) {
+- var output []byte
+- var err error
+- if flatCompare {
+- output, err = json.Marshal(value)
+- } else {
+- output, err = json.MarshalIndent(value, " ", " ")
+- }
+- if err != nil {
+- t.Error(err.Error())
+- return
+- }
+- actual := string(output)
+- if actual != expectedJsonAsString {
+- t.Errorf("First mismatch JSON doc at line:%d", indexOfNonMatchingLine(actual, expectedJsonAsString))
+- // Use simple fmt to create a pastable output :-)
+- fmt.Println("---- expected -----")
+- fmt.Println(withLineNumbers(expectedJsonAsString))
+- fmt.Println("---- actual -----")
+- fmt.Println(withLineNumbers(actual))
+- fmt.Println("---- raw -----")
+- fmt.Println(actual)
+- }
+-}
+-
+-func indexOfNonMatchingLine(actual, expected string) int {
+- a := strings.Split(actual, "\n")
+- e := strings.Split(expected, "\n")
+- size := len(a)
+- if len(e) < len(a) {
+- size = len(e)
+- }
+- for i := 0; i < size; i++ {
+- if a[i] != e[i] {
+- return i
+- }
+- }
+- return -1
+-}
+-
+-func withLineNumbers(content string) string {
+- var buffer bytes.Buffer
+- lines := strings.Split(content, "\n")
+- for i, each := range lines {
+- buffer.WriteString(fmt.Sprintf("%d:%s\n", i, each))
+- }
+- return buffer.String()
+-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/web_service.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/web_service.go
+deleted file mode 100644
+index 323676f..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/web_service.go
++++ /dev/null
+@@ -1,194 +0,0 @@
+-package restful
+-
+-// Copyright 2013 Ernest Micklei. All rights reserved.
+-// Use of this source code is governed by a license
+-// that can be found in the LICENSE file.
+-
+-import (
+- "log"
+-)
+-
+-// WebService holds a collection of Route values that bind a Http Method + URL Path to a function.
+-type WebService struct {
+- rootPath string
+- pathExpr *pathExpression // cached compilation of rootPath as RegExp
+- routes []Route
+- produces []string
+- consumes []string
+- pathParameters []*Parameter
+- filters []FilterFunction
+- documentation string
+- apiVersion string
+-}
+-
+-// compiledPathExpression ensures that the path is compiled into a RegEx for those routers that need it.
+-func (w *WebService) compiledPathExpression() *pathExpression {
+- if w.pathExpr == nil {
+- if len(w.rootPath) == 0 {
+- w.Path("/") // lazy initialize path
+- }
+- compiled, err := newPathExpression(w.rootPath)
+- if err != nil {
+- log.Fatalf("[restful] Invalid path:%s because:%v", w.rootPath, err)
+- }
+- w.pathExpr = compiled
+- }
+- return w.pathExpr
+-}
+-
+-// ApiVersion sets the API version for documentation purposes.
+-func (w *WebService) ApiVersion(apiVersion string) *WebService {
+- w.apiVersion = apiVersion
+- return w
+-}
+-
+-// Version returns the API version for documentation purposes.
+-func (w WebService) Version() string { return w.apiVersion }
+-
+-// Path specifies the root URL template path of the WebService.
+-// All Routes will be relative to this path.
+-func (w *WebService) Path(root string) *WebService {
+- w.rootPath = root
+- return w
+-}
+-
+-// Param adds a PathParameter to document parameters used in the root path.
+-func (w *WebService) Param(parameter *Parameter) *WebService {
+- if w.pathParameters == nil {
+- w.pathParameters = []*Parameter{}
+- }
+- w.pathParameters = append(w.pathParameters, parameter)
+- return w
+-}
+-
+-// PathParameter creates a new Parameter of kind Path for documentation purposes.
+-// It is initialized as required with string as its DataType.
+-func (w *WebService) PathParameter(name, description string) *Parameter {
+- p := &Parameter{&ParameterData{Name: name, Description: description, Required: true, DataType: "string"}}
+- p.bePath()
+- return p
+-}
+-
+-// QueryParameter creates a new Parameter of kind Query for documentation purposes.
+-// It is initialized as not required with string as its DataType.
+-func (w *WebService) QueryParameter(name, description string) *Parameter {
+- p := &Parameter{&ParameterData{Name: name, Description: description, Required: false, DataType: "string"}}
+- p.beQuery()
+- return p
+-}
+-
+-// BodyParameter creates a new Parameter of kind Body for documentation purposes.
+-// It is initialized as required without a DataType.
+-func (w *WebService) BodyParameter(name, description string) *Parameter {
+- p := &Parameter{&ParameterData{Name: name, Description: description, Required: true}}
+- p.beBody()
+- return p
+-}
+-
+-// HeaderParameter creates a new Parameter of kind (Http) Header for documentation purposes.
+-// It is initialized as not required with string as its DataType.
+-func (w *WebService) HeaderParameter(name, description string) *Parameter {
+- p := &Parameter{&ParameterData{Name: name, Description: description, Required: false, DataType: "string"}}
+- p.beHeader()
+- return p
+-}
+-
+-// FormParameter creates a new Parameter of kind Form (using application/x-www-form-urlencoded) for documentation purposes.
+-// It is initialized as required with string as its DataType.
+-func (w *WebService) FormParameter(name, description string) *Parameter {
+- p := &Parameter{&ParameterData{Name: name, Description: description, Required: false, DataType: "string"}}
+- p.beForm()
+- return p
+-}
+-
+-// Route creates a new Route using the RouteBuilder and add to the ordered list of Routes.
+-func (w *WebService) Route(builder *RouteBuilder) *WebService {
+- builder.copyDefaults(w.produces, w.consumes)
+- w.routes = append(w.routes, builder.Build())
+- return w
+-}
+-
+-// Method creates a new RouteBuilder and initialize its http method
+-func (w *WebService) Method(httpMethod string) *RouteBuilder {
+- return new(RouteBuilder).servicePath(w.rootPath).Method(httpMethod)
+-}
+-
+-// Produces specifies that this WebService can produce one or more MIME types.
+-// Http requests must have one of these values set for the Accept header.
+-func (w *WebService) Produces(contentTypes ...string) *WebService {
+- w.produces = contentTypes
+- return w
+-}
+-
+-// Consumes specifies that this WebService can consume one or more MIME types.
+-// Http requests must have one of these values set for the Content-Type header.
+-func (w *WebService) Consumes(accepts ...string) *WebService {
+- w.consumes = accepts
+- return w
+-}
+-
+-// Routes returns the Routes associated with this WebService
+-func (w WebService) Routes() []Route {
+- return w.routes
+-}
+-
+-// RootPath returns the RootPath associated with this WebService. Default "/"
+-func (w WebService) RootPath() string {
+- return w.rootPath
+-}
+-
+-// PathParameters return the path parameter names for (shared amoung its Routes)
+-func (w WebService) PathParameters() []*Parameter {
+- return w.pathParameters
+-}
+-
+-// Filter adds a filter function to the chain of filters applicable to all its Routes
+-func (w *WebService) Filter(filter FilterFunction) *WebService {
+- w.filters = append(w.filters, filter)
+- return w
+-}
+-
+-// Doc is used to set the documentation of this service.
+-func (w *WebService) Doc(plainText string) *WebService {
+- w.documentation = plainText
+- return w
+-}
+-
+-// Documentation returns it.
+-func (w WebService) Documentation() string {
+- return w.documentation
+-}
+-
+-/*
+- Convenience methods
+-*/
+-
+-// HEAD is a shortcut for .Method("HEAD").Path(subPath)
+-func (w *WebService) HEAD(subPath string) *RouteBuilder {
+- return new(RouteBuilder).servicePath(w.rootPath).Method("HEAD").Path(subPath)
+-}
+-
+-// GET is a shortcut for .Method("GET").Path(subPath)
+-func (w *WebService) GET(subPath string) *RouteBuilder {
+- return new(RouteBuilder).servicePath(w.rootPath).Method("GET").Path(subPath)
+-}
+-
+-// POST is a shortcut for .Method("POST").Path(subPath)
+-func (w *WebService) POST(subPath string) *RouteBuilder {
+- return new(RouteBuilder).servicePath(w.rootPath).Method("POST").Path(subPath)
+-}
+-
+-// PUT is a shortcut for .Method("PUT").Path(subPath)
+-func (w *WebService) PUT(subPath string) *RouteBuilder {
+- return new(RouteBuilder).servicePath(w.rootPath).Method("PUT").Path(subPath)
+-}
+-
+-// PATCH is a shortcut for .Method("PATCH").Path(subPath)
+-func (w *WebService) PATCH(subPath string) *RouteBuilder {
+- return new(RouteBuilder).servicePath(w.rootPath).Method("PATCH").Path(subPath)
+-}
+-
+-// DELETE is a shortcut for .Method("DELETE").Path(subPath)
+-func (w *WebService) DELETE(subPath string) *RouteBuilder {
+- return new(RouteBuilder).servicePath(w.rootPath).Method("DELETE").Path(subPath)
+-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/web_service_container.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/web_service_container.go
+deleted file mode 100644
+index c9d31b0..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/web_service_container.go
++++ /dev/null
+@@ -1,39 +0,0 @@
+-package restful
+-
+-// Copyright 2013 Ernest Micklei. All rights reserved.
+-// Use of this source code is governed by a license
+-// that can be found in the LICENSE file.
+-
+-import (
+- "net/http"
+-)
+-
+-// DefaultContainer is a restful.Container that uses http.DefaultServeMux
+-var DefaultContainer *Container
+-
+-func init() {
+- DefaultContainer = NewContainer()
+- DefaultContainer.ServeMux = http.DefaultServeMux
+-}
+-
+-// If set the true then panics will not be caught to return HTTP 500.
+-// In that case, Route functions are responsible for handling any error situation.
+-// Default value is false = recover from panics. This has performance implications.
+-// OBSOLETE ; use restful.DefaultContainer.DoNotRecover(true)
+-var DoNotRecover = false
+-
+-// Add registers a new WebService add it to the DefaultContainer.
+-func Add(service *WebService) {
+- DefaultContainer.Add(service)
+-}
+-
+-// Filter appends a container FilterFunction from the DefaultContainer.
+-// These are called before dispatching a http.Request to a WebService.
+-func Filter(filter FilterFunction) {
+- DefaultContainer.Filter(filter)
+-}
+-
+-// RegisteredWebServices returns the collections of WebServices from the DefaultContainer
+-func RegisteredWebServices() []*WebService {
+- return DefaultContainer.RegisteredWebServices()
+-}
+diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/web_service_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/web_service_test.go
+deleted file mode 100644
+index e200979..0000000
+--- a/Godeps/_workspace/src/github.com/emicklei/go-restful/web_service_test.go
++++ /dev/null
+@@ -1,115 +0,0 @@
+-package restful
+-
+-import (
+- "net/http"
+- "net/http/httptest"
+- "testing"
+-)
+-
+-const (
+- pathGetFriends = "/get/{userId}/friends"
+-)
+-
+-func TestParameter(t *testing.T) {
+- p := &Parameter{&ParameterData{Name: "name", Description: "desc"}}
+- p.AllowMultiple(true)
+- p.DataType("int")
+- p.Required(true)
+- values := map[string]string{"a": "b"}
+- p.AllowableValues(values)
+- p.bePath()
+-
+- ws := new(WebService)
+- ws.Param(p)
+- if ws.pathParameters[0].Data().Name != "name" {
+- t.Error("path parameter (or name) invalid")
+- }
+-}
+-func TestWebService_CanCreateParameterKinds(t *testing.T) {
+- ws := new(WebService)
+- if ws.BodyParameter("b", "b").Kind() != BodyParameterKind {
+- t.Error("body parameter expected")
+- }
+- if ws.PathParameter("p", "p").Kind() != PathParameterKind {
+- t.Error("path parameter expected")
+- }
+- if ws.QueryParameter("q", "q").Kind() != QueryParameterKind {
+- t.Error("query parameter expected")
+- }
+-}
+-
+-func TestCapturePanic(t *testing.T) {
+- tearDown()
+- Add(newPanicingService())
+- httpRequest, _ := http.NewRequest("GET", "http://here.com/fire", nil)
+- httpRequest.Header.Set("Accept", "*/*")
+- httpWriter := httptest.NewRecorder()
+- DefaultContainer.dispatch(httpWriter, httpRequest)
+- if 500 != httpWriter.Code {
+- t.Error("500 expected on fire")
+- }
+-}
+-
+-func TestNotFound(t *testing.T) {
+- tearDown()
+- httpRequest, _ := http.NewRequest("GET", "http://here.com/missing", nil)
+- httpRequest.Header.Set("Accept", "*/*")
+- httpWriter := httptest.NewRecorder()
+- DefaultContainer.dispatch(httpWriter, httpRequest)
+- if 404 != httpWriter.Code {
+- t.Error("404 expected on missing")
+- }
+-}
+-
+-func TestMethodNotAllowed(t *testing.T) {
+- tearDown()
+- Add(newGetOnlyService())
+- httpRequest, _ := http.NewRequest("POST", "http://here.com/get", nil)
+- httpRequest.Header.Set("Accept", "*/*")
+- httpWriter := httptest.NewRecorder()
+- DefaultContainer.dispatch(httpWriter, httpRequest)
+- if 405 != httpWriter.Code {
+- t.Error("405 expected method not allowed")
+- }
+-}
+-
+-func TestSelectedRoutePath_Issue100(t *testing.T) {
+- tearDown()
+- Add(newSelectedRouteTestingService())
+- httpRequest, _ := http.NewRequest("GET", "http://here.com/get/232452/friends", nil)
+- httpRequest.Header.Set("Accept", "*/*")
+- httpWriter := httptest.NewRecorder()
+- DefaultContainer.dispatch(httpWriter, httpRequest)
+- if http.StatusOK != httpWriter.Code {
+- t.Error(http.StatusOK, "expected,", httpWriter.Code, "received.")
+- }
+-}
+-
+-func newPanicingService() *WebService {
+- ws := new(WebService).Path("")
+- ws.Route(ws.GET("/fire").To(doPanic))
+- return ws
+-}
+-
+-func newGetOnlyService() *WebService {
+- ws := new(WebService).Path("")
+- ws.Route(ws.GET("/get").To(doPanic))
+- return ws
+-}
+-
+-func newSelectedRouteTestingService() *WebService {
+- ws := new(WebService).Path("")
+- ws.Route(ws.GET(pathGetFriends).To(selectedRouteChecker))
+- return ws
+-}
+-
+-func selectedRouteChecker(req *Request, resp *Response) {
+- if req.SelectedRoutePath() != pathGetFriends {
+- resp.InternalServerError()
+- }
+-}
+-
+-func doPanic(req *Request, resp *Response) {
+- println("lightning...")
+- panic("fire")
+-}
+diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/.travis.yml b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/.travis.yml
+deleted file mode 100644
+index ad1dff7..0000000
+--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/.travis.yml
++++ /dev/null
+@@ -1,13 +0,0 @@
+-language: go
+-go:
+- - 1.1.2
+- - 1.2.2
+- - 1.3.1
+- - tip
+-env:
+- - GOARCH=amd64
+- - GOARCH=386
+-install:
+- - go get -d ./...
+-script:
+- - go test ./...
+diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/AUTHORS b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/AUTHORS
+deleted file mode 100644
+index bb79881..0000000
+--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/AUTHORS
++++ /dev/null
+@@ -1,44 +0,0 @@
+-# This is the official list of go-dockerclient authors for copyright purposes.
+-
+-Aldrin Leal <aldrin at leal.eng.br>
+-Andreas Jaekle <andreas at jaekle.net>
+-Andrews Medina <andrewsmedina at gmail.com>
+-Andy Goldstein <andy.goldstein at redhat.com>
+-Ben McCann <benmccann.com>
+-Carlos Diaz-Padron <cpadron at mozilla.com>
+-Cezar Sa Espinola <cezar.sa at corp.globo.com>
+-Cheah Chu Yeow <chuyeow at gmail.com>
+-cheneydeng <cheneydeng at qq.com>
+-CMGS <ilskdw at gmail.com>
+-Daniel, Dao Quang Minh <dqminh89 at gmail.com>
+-David Huie <dahuie at gmail.com>
+-Ed <edrocksit at gmail.com>
+-Eric Anderson <anderson at copperegg.com>
+-Fabio Rehm <fgrehm at gmail.com>
+-Flavia Missi <flaviamissi at gmail.com>
+-Francisco Souza <f at souza.cc>
+-Jari Kolehmainen <jari.kolehmainen at digia.com>
+-Jason Wilder <jwilder at litl.com>
+-Jean-Baptiste Dalido <jeanbaptiste at appgratis.com>
+-Jeff Mitchell <jeffrey.mitchell at gmail.com>
+-Jeffrey Hulten <jhulten at gmail.com>
+-Johan Euphrosine <proppy at google.com>
+-Karan Misra <kidoman at gmail.com>
+-Kim, Hirokuni <hirokuni.kim at kvh.co.jp>
+-Lucas Clemente <lucas at clemente.io>
+-Omeid Matten <public at omeid.me>
+-Paul Morie <pmorie at gmail.com>
+-Peter Jihoon Kim <raingrove at gmail.com>
+-Philippe Lafoucrière <philippe.lafoucriere at tech-angels.com>
+-Rafe Colton <r.colton at modcloth.com>
+-Robert Williamson <williamson.robert at gmail.com>
+-Salvador Gironès <salvadorgirones at gmail.com>
+-Simon Eskildsen <sirup at sirupsen.com>
+-Simon Menke <simon.menke at gmail.com>
+-Skolos <skolos at gopherlab.com>
+-Soulou <leo at unbekandt.eu>
+-Sridhar Ratnakumar <sridharr at activestate.com>
+-Summer Mousa <smousa at zenoss.com>
+-Tarsis Azevedo <tarsis at corp.globo.com>
+-Tim Schindler <tim at catalyst-zero.com>
+-Wiliam Souza <wiliamsouza83 at gmail.com>
+diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/DOCKER-LICENSE b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/DOCKER-LICENSE
+deleted file mode 100644
+index f4130a5..0000000
+--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/DOCKER-LICENSE
++++ /dev/null
+@@ -1,6 +0,0 @@
+- Apache License
+- Version 2.0, January 2004
+- http://www.apache.org/licenses/
+-
+-You can find the Docker license int the following link:
+-https://raw2.github.com/dotcloud/docker/master/LICENSE
+diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/LICENSE b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/LICENSE
+deleted file mode 100644
+index 7a6d8bb..0000000
+--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/LICENSE
++++ /dev/null
+@@ -1,22 +0,0 @@
+-Copyright (c) 2014, go-dockerclient authors
+-All rights reserved.
+-
+-Redistribution and use in source and binary forms, with or without
+-modification, are permitted provided that the following conditions are met:
+-
+- * Redistributions of source code must retain the above copyright notice,
+-this list of conditions and the following disclaimer.
+- * Redistributions in binary form must reproduce the above copyright notice,
+-this list of conditions and the following disclaimer in the documentation
+-and/or other materials provided with the distribution.
+-
+-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/README.markdown b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/README.markdown
+deleted file mode 100644
+index 66cedca..0000000
+--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/README.markdown
++++ /dev/null
+@@ -1,42 +0,0 @@
+-#go-dockerclient
+-
+-[](https://drone.io/github.com/fsouza/go-dockerclient/latest)
+-[](https://travis-ci.org/fsouza/go-dockerclient)
+-
+-[](http://godoc.org/github.com/fsouza/go-dockerclient)
+-
+-This package presents a client for the Docker remote API.
+-
+-For more details, check the [remote API documentation](http://docs.docker.io/en/latest/reference/api/docker_remote_api/).
+-
+-## Example
+-
+-```go
+-package main
+-
+-import (
+- "fmt"
+- "github.com/fsouza/go-dockerclient"
+-)
+-
+-func main() {
+- endpoint := "unix:///var/run/docker.sock"
+- client, _ := docker.NewClient(endpoint)
+- imgs, _ := client.ListImages(true)
+- for _, img := range imgs {
+- fmt.Println("ID: ", img.ID)
+- fmt.Println("RepoTags: ", img.RepoTags)
+- fmt.Println("Created: ", img.Created)
+- fmt.Println("Size: ", img.Size)
+- fmt.Println("VirtualSize: ", img.VirtualSize)
+- fmt.Println("ParentId: ", img.ParentId)
- }
-- }
-- }
+-}
+-```
+-
+-## Developing
+-
+-You can run the tests with:
+-
+- go get -d ./...
+- go test ./...
+diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/change.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/change.go
+deleted file mode 100644
+index cafffad..0000000
+--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/change.go
++++ /dev/null
+@@ -1,36 +0,0 @@
+-// Copyright 2014 go-dockerclient authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-package docker
+-
+-import "fmt"
+-
+-type ChangeType int
+-
+-const (
+- ChangeModify ChangeType = iota
+- ChangeAdd
+- ChangeDelete
+-)
+-
+-// Change represents a change in a container.
+-//
+-// See http://goo.gl/QkW9sH for more details.
+-type Change struct {
+- Path string
+- Kind ChangeType
+-}
+-
+-func (change *Change) String() string {
+- var kind string
+- switch change.Kind {
+- case ChangeModify:
+- kind = "C"
+- case ChangeAdd:
+- kind = "A"
+- case ChangeDelete:
+- kind = "D"
+- }
+- return fmt.Sprintf("%s %s", kind, change.Path)
+-}
+diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/change_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/change_test.go
+deleted file mode 100644
+index 7c2ec30..0000000
+--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/change_test.go
++++ /dev/null
+@@ -1,26 +0,0 @@
+-// Copyright 2014 go-dockerclient authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-package docker
+-
+-import (
+- "testing"
+-)
+-
+-func TestChangeString(t *testing.T) {
+- var tests = []struct {
+- change Change
+- expected string
+- }{
+- {Change{"/etc/passwd", ChangeModify}, "C /etc/passwd"},
+- {Change{"/etc/passwd", ChangeAdd}, "A /etc/passwd"},
+- {Change{"/etc/passwd", ChangeDelete}, "D /etc/passwd"},
+- {Change{"/etc/passwd", 33}, " /etc/passwd"},
+- }
+- for _, tt := range tests {
+- if got := tt.change.String(); got != tt.expected {
+- t.Errorf("Change.String(): want %q. Got %q.", tt.expected, got)
+- }
+- }
+-}
+diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/client.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/client.go
+deleted file mode 100644
+index e68a9ef..0000000
+--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/client.go
++++ /dev/null
+@@ -1,546 +0,0 @@
+-// Copyright 2014 go-dockerclient authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-// Package docker provides a client for the Docker remote API.
+-//
+-// See http://goo.gl/G3plxW for more details on the remote API.
+-package docker
+-
+-import (
+- "bytes"
+- "encoding/json"
+- "errors"
+- "fmt"
+- "io"
+- "io/ioutil"
+- "net"
+- "net/http"
+- "net/http/httputil"
+- "net/url"
+- "reflect"
+- "strconv"
+- "strings"
+-)
+-
+-const userAgent = "go-dockerclient"
+-
+-var (
+- // ErrInvalidEndpoint is returned when the endpoint is not a valid HTTP URL.
+- ErrInvalidEndpoint = errors.New("invalid endpoint")
+-
+- // ErrConnectionRefused is returned when the client cannot connect to the given endpoint.
+- ErrConnectionRefused = errors.New("cannot connect to Docker endpoint")
+-
+- apiVersion_1_12, _ = NewApiVersion("1.12")
+-)
+-
+-// ApiVersion is an internal representation of a version of the Remote API.
+-type ApiVersion []int
+-
+-// NewApiVersion returns an instance of ApiVersion for the given string.
+-//
+-// The given string must be in the form <major>.<minor>.<patch>, where <major>,
+-// <minor> and <patch> are integer numbers.
+-func NewApiVersion(input string) (ApiVersion, error) {
+- if !strings.Contains(input, ".") {
+- return nil, fmt.Errorf("Unable to parse version %q", input)
+- }
+- arr := strings.Split(input, ".")
+- ret := make(ApiVersion, len(arr))
+- var err error
+- for i, val := range arr {
+- ret[i], err = strconv.Atoi(val)
+- if err != nil {
+- return nil, fmt.Errorf("Unable to parse version %q: %q is not an integer", input, val)
+- }
+- }
+- return ret, nil
+-}
+-
+-func (version ApiVersion) String() string {
+- var str string
+- for i, val := range version {
+- str += strconv.Itoa(val)
+- if i < len(version)-1 {
+- str += "."
+- }
+- }
+- return str
+-}
+-
+-func (version ApiVersion) LessThan(other ApiVersion) bool {
+- return version.compare(other) < 0
+-}
+-
+-func (version ApiVersion) LessThanOrEqualTo(other ApiVersion) bool {
+- return version.compare(other) <= 0
+-}
+-
+-func (version ApiVersion) GreaterThan(other ApiVersion) bool {
+- return version.compare(other) > 0
+-}
+-
+-func (version ApiVersion) GreaterThanOrEqualTo(other ApiVersion) bool {
+- return version.compare(other) >= 0
+-}
+-
+-func (version ApiVersion) compare(other ApiVersion) int {
+- for i, v := range version {
+- if i <= len(other)-1 {
+- otherVersion := other[i]
+-
+- if v < otherVersion {
+- return -1
+- } else if v > otherVersion {
+- return 1
+- }
+- }
+- }
+- if len(version) > len(other) {
+- return 1
+- }
+- if len(version) < len(other) {
+- return -1
+- }
+- return 0
+-}
+-
+-// Client is the basic type of this package. It provides methods for
+-// interaction with the API.
+-type Client struct {
+- SkipServerVersionCheck bool
+- HTTPClient *http.Client
+-
+- endpoint string
+- endpointURL *url.URL
+- eventMonitor *eventMonitoringState
+- requestedApiVersion ApiVersion
+- serverApiVersion ApiVersion
+- expectedApiVersion ApiVersion
+-}
+-
+-// NewClient returns a Client instance ready for communication with the given
+-// server endpoint. It will use the latest remote API version available in the
+-// server.
+-func NewClient(endpoint string) (*Client, error) {
+- client, err := NewVersionedClient(endpoint, "")
+- if err != nil {
+- return nil, err
+- }
+- client.SkipServerVersionCheck = true
+- return client, nil
+-}
+-
+-// NewVersionedClient returns a Client instance ready for communication with
+-// the given server endpoint, using a specific remote API version.
+-func NewVersionedClient(endpoint string, apiVersionString string) (*Client, error) {
+- u, err := parseEndpoint(endpoint)
+- if err != nil {
+- return nil, err
+- }
+- var requestedApiVersion ApiVersion
+- if strings.Contains(apiVersionString, ".") {
+- requestedApiVersion, err = NewApiVersion(apiVersionString)
+- if err != nil {
+- return nil, err
+- }
+- }
+- return &Client{
+- HTTPClient: http.DefaultClient,
+- endpoint: endpoint,
+- endpointURL: u,
+- eventMonitor: new(eventMonitoringState),
+- requestedApiVersion: requestedApiVersion,
+- }, nil
+-}
+-
+-func (c *Client) checkApiVersion() error {
+- serverApiVersionString, err := c.getServerApiVersionString()
+- if err != nil {
+- return err
+- }
+- c.serverApiVersion, err = NewApiVersion(serverApiVersionString)
+- if err != nil {
+- return err
+- }
+- if c.requestedApiVersion == nil {
+- c.expectedApiVersion = c.serverApiVersion
+- } else {
+- c.expectedApiVersion = c.requestedApiVersion
+- }
+- return nil
+-}
+-
+-// Ping pings the docker server
+-//
+-// See http://goo.gl/stJENm for more details.
+-func (c *Client) Ping() error {
+- path := "/_ping"
+- body, status, err := c.do("GET", path, nil)
+- if err != nil {
+- return err
+- }
+- if status != http.StatusOK {
+- return newError(status, body)
+- }
+- return nil
+-}
+-
+-func (c *Client) getServerApiVersionString() (version string, err error) {
+- body, status, err := c.do("GET", "/version", nil)
+- if err != nil {
+- return "", err
+- }
+- if status != http.StatusOK {
+- return "", fmt.Errorf("Received unexpected status %d while trying to retrieve the server version", status)
+- }
+- var versionResponse map[string]string
+- err = json.Unmarshal(body, &versionResponse)
+- if err != nil {
+- return "", err
+- }
+- version = versionResponse["ApiVersion"]
+- return version, nil
+-}
+-
+-func (c *Client) do(method, path string, data interface{}) ([]byte, int, error) {
+- var params io.Reader
+- if data != nil {
+- buf, err := json.Marshal(data)
+- if err != nil {
+- return nil, -1, err
+- }
+- params = bytes.NewBuffer(buf)
+- }
+- if path != "/version" && !c.SkipServerVersionCheck && c.expectedApiVersion == nil {
+- err := c.checkApiVersion()
+- if err != nil {
+- return nil, -1, err
+- }
+- }
+- req, err := http.NewRequest(method, c.getURL(path), params)
+- if err != nil {
+- return nil, -1, err
+- }
+- req.Header.Set("User-Agent", userAgent)
+- if data != nil {
+- req.Header.Set("Content-Type", "application/json")
+- } else if method == "POST" {
+- req.Header.Set("Content-Type", "plain/text")
+- }
+- var resp *http.Response
+- protocol := c.endpointURL.Scheme
+- address := c.endpointURL.Path
+- if protocol == "unix" {
+- dial, err := net.Dial(protocol, address)
+- if err != nil {
+- return nil, -1, err
+- }
+- defer dial.Close()
+- clientconn := httputil.NewClientConn(dial, nil)
+- resp, err = clientconn.Do(req)
+- if err != nil {
+- return nil, -1, err
+- }
+- defer clientconn.Close()
+- } else {
+- resp, err = c.HTTPClient.Do(req)
+- }
+- if err != nil {
+- if strings.Contains(err.Error(), "connection refused") {
+- return nil, -1, ErrConnectionRefused
+- }
+- return nil, -1, err
+- }
+- defer resp.Body.Close()
+- body, err := ioutil.ReadAll(resp.Body)
+- if err != nil {
+- return nil, -1, err
+- }
+- if resp.StatusCode < 200 || resp.StatusCode >= 400 {
+- return nil, resp.StatusCode, newError(resp.StatusCode, body)
+- }
+- return body, resp.StatusCode, nil
+-}
+-
+-func (c *Client) stream(method, path string, setRawTerminal, rawJSONStream bool, headers map[string]string, in io.Reader, stdout, stderr io.Writer) error {
+- if (method == "POST" || method == "PUT") && in == nil {
+- in = bytes.NewReader(nil)
+- }
+- if path != "/version" && !c.SkipServerVersionCheck && c.expectedApiVersion == nil {
+- err := c.checkApiVersion()
+- if err != nil {
+- return err
+- }
+- }
+- req, err := http.NewRequest(method, c.getURL(path), in)
+- if err != nil {
+- return err
+- }
+- req.Header.Set("User-Agent", userAgent)
+- if method == "POST" {
+- req.Header.Set("Content-Type", "plain/text")
+- }
+- for key, val := range headers {
+- req.Header.Set(key, val)
+- }
+- var resp *http.Response
+- protocol := c.endpointURL.Scheme
+- address := c.endpointURL.Path
+- if stdout == nil {
+- stdout = ioutil.Discard
+- }
+- if stderr == nil {
+- stderr = ioutil.Discard
+- }
+- if protocol == "unix" {
+- dial, err := net.Dial(protocol, address)
+- if err != nil {
+- return err
+- }
+- clientconn := httputil.NewClientConn(dial, nil)
+- resp, err = clientconn.Do(req)
+- defer clientconn.Close()
+- } else {
+- resp, err = c.HTTPClient.Do(req)
+- }
+- if err != nil {
+- if strings.Contains(err.Error(), "connection refused") {
+- return ErrConnectionRefused
+- }
+- return err
+- }
+- defer resp.Body.Close()
+- if resp.StatusCode < 200 || resp.StatusCode >= 400 {
+- body, err := ioutil.ReadAll(resp.Body)
+- if err != nil {
+- return err
+- }
+- return newError(resp.StatusCode, body)
+- }
+- if resp.Header.Get("Content-Type") == "application/json" {
+- // if we want to get raw json stream, just copy it back to output
+- // without decoding it
+- if rawJSONStream {
+- _, err = io.Copy(stdout, resp.Body)
+- return err
+- }
+- dec := json.NewDecoder(resp.Body)
+- for {
+- var m jsonMessage
+- if err := dec.Decode(&m); err == io.EOF {
+- break
+- } else if err != nil {
+- return err
+- }
+- if m.Stream != "" {
+- fmt.Fprint(stdout, m.Stream)
+- } else if m.Progress != "" {
+- fmt.Fprintf(stdout, "%s %s\r", m.Status, m.Progress)
+- } else if m.Error != "" {
+- return errors.New(m.Error)
+- }
+- if m.Status != "" {
+- fmt.Fprintln(stdout, m.Status)
+- }
+- }
+- } else {
+- if setRawTerminal {
+- _, err = io.Copy(stdout, resp.Body)
+- } else {
+- _, err = stdCopy(stdout, stderr, resp.Body)
+- }
+- return err
+- }
+- return nil
+-}
+-
+-func (c *Client) hijack(method, path string, success chan struct{}, setRawTerminal bool, in io.Reader, stderr, stdout io.Writer, data interface{}) error {
+- if path != "/version" && !c.SkipServerVersionCheck && c.expectedApiVersion == nil {
+- err := c.checkApiVersion()
+- if err != nil {
+- return err
+- }
+- }
+-
+- var params io.Reader
+- if data != nil {
+- buf, err := json.Marshal(data)
+- if err != nil {
+- return err
+- }
+- params = bytes.NewBuffer(buf)
+- }
+-
+- if stdout == nil {
+- stdout = ioutil.Discard
+- }
+- if stderr == nil {
+- stderr = ioutil.Discard
+- }
+- req, err := http.NewRequest(method, c.getURL(path), params)
+- if err != nil {
+- return err
+- }
+- req.Header.Set("Content-Type", "plain/text")
+- protocol := c.endpointURL.Scheme
+- address := c.endpointURL.Path
+- if protocol != "unix" {
+- protocol = "tcp"
+- address = c.endpointURL.Host
+- }
+- dial, err := net.Dial(protocol, address)
+- if err != nil {
+- return err
+- }
+- defer dial.Close()
+- clientconn := httputil.NewClientConn(dial, nil)
+- clientconn.Do(req)
+- if success != nil {
+- success <- struct{}{}
+- <-success
+- }
+- rwc, br := clientconn.Hijack()
+- errs := make(chan error, 2)
+- exit := make(chan bool)
+- go func() {
+- defer close(exit)
+- var err error
+- if setRawTerminal {
+- _, err = io.Copy(stdout, br)
+- } else {
+- _, err = stdCopy(stdout, stderr, br)
+- }
+- errs <- err
+- }()
+- go func() {
+- var err error
+- if in != nil {
+- _, err = io.Copy(rwc, in)
+- }
+- rwc.(interface {
+- CloseWrite() error
+- }).CloseWrite()
+- errs <- err
+- }()
+- <-exit
+- return <-errs
+-}
+-
+-func (c *Client) getURL(path string) string {
+- urlStr := strings.TrimRight(c.endpointURL.String(), "/")
+- if c.endpointURL.Scheme == "unix" {
+- urlStr = ""
+- }
+-
+- if c.requestedApiVersion != nil {
+- return fmt.Sprintf("%s/v%s%s", urlStr, c.requestedApiVersion, path)
+- } else {
+- return fmt.Sprintf("%s%s", urlStr, path)
+- }
+-}
+-
+-type jsonMessage struct {
+- Status string `json:"status,omitempty"`
+- Progress string `json:"progress,omitempty"`
+- Error string `json:"error,omitempty"`
+- Stream string `json:"stream,omitempty"`
+-}
+-
+-func queryString(opts interface{}) string {
+- if opts == nil {
+- return ""
+- }
+- value := reflect.ValueOf(opts)
+- if value.Kind() == reflect.Ptr {
+- value = value.Elem()
+- }
+- if value.Kind() != reflect.Struct {
+- return ""
+- }
+- items := url.Values(map[string][]string{})
+- for i := 0; i < value.NumField(); i++ {
+- field := value.Type().Field(i)
+- if field.PkgPath != "" {
+- continue
+- }
+- key := field.Tag.Get("qs")
+- if key == "" {
+- key = strings.ToLower(field.Name)
+- } else if key == "-" {
+- continue
+- }
+- v := value.Field(i)
+- switch v.Kind() {
+- case reflect.Bool:
+- if v.Bool() {
+- items.Add(key, "1")
+- }
+- case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+- if v.Int() > 0 {
+- items.Add(key, strconv.FormatInt(v.Int(), 10))
+- }
+- case reflect.Float32, reflect.Float64:
+- if v.Float() > 0 {
+- items.Add(key, strconv.FormatFloat(v.Float(), 'f', -1, 64))
+- }
+- case reflect.String:
+- if v.String() != "" {
+- items.Add(key, v.String())
+- }
+- case reflect.Ptr:
+- if !v.IsNil() {
+- if b, err := json.Marshal(v.Interface()); err == nil {
+- items.Add(key, string(b))
+- }
+- }
+- }
+- }
+- return items.Encode()
+-}
+-
+-// Error represents failures in the API. It represents a failure from the API.
+-type Error struct {
+- Status int
+- Message string
+-}
+-
+-func newError(status int, body []byte) *Error {
+- return &Error{Status: status, Message: string(body)}
+-}
+-
+-func (e *Error) Error() string {
+- return fmt.Sprintf("API error (%d): %s", e.Status, e.Message)
+-}
+-
+-func parseEndpoint(endpoint string) (*url.URL, error) {
+- u, err := url.Parse(endpoint)
+- if err != nil {
+- return nil, ErrInvalidEndpoint
+- }
+- if u.Scheme == "tcp" {
+- u.Scheme = "http"
+- }
+- if u.Scheme != "http" && u.Scheme != "https" && u.Scheme != "unix" {
+- return nil, ErrInvalidEndpoint
+- }
+- if u.Scheme != "unix" {
+- _, port, err := net.SplitHostPort(u.Host)
+- if err != nil {
+- if e, ok := err.(*net.AddrError); ok {
+- if e.Err == "missing port in address" {
+- return u, nil
+- }
+- }
+- return nil, ErrInvalidEndpoint
+- }
+- number, err := strconv.ParseInt(port, 10, 64)
+- if err == nil && number > 0 && number < 65536 {
+- return u, nil
+- }
+- } else {
+- return u, nil // we don't need port when using a unix socket
+- }
+- return nil, ErrInvalidEndpoint
+-}
+diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/client_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/client_test.go
+deleted file mode 100644
+index 9def171..0000000
+--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/client_test.go
++++ /dev/null
+@@ -1,290 +0,0 @@
+-// Copyright 2014 go-dockerclient authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-package docker
+-
+-import (
+- "fmt"
+- "io/ioutil"
+- "net/http"
+- "net/url"
+- "reflect"
+- "strconv"
+- "strings"
+- "testing"
+-)
+-
+-func TestNewAPIClient(t *testing.T) {
+- endpoint := "http://localhost:4243"
+- client, err := NewClient(endpoint)
+- if err != nil {
+- t.Fatal(err)
+- }
+- if client.endpoint != endpoint {
+- t.Errorf("Expected endpoint %s. Got %s.", endpoint, client.endpoint)
+- }
+- if client.HTTPClient != http.DefaultClient {
+- t.Errorf("Expected http.Client %#v. Got %#v.", http.DefaultClient, client.HTTPClient)
+- }
+- // test unix socket endpoints
+- endpoint = "unix:///var/run/docker.sock"
+- client, err = NewClient(endpoint)
+- if err != nil {
+- t.Fatal(err)
+- }
+- if client.endpoint != endpoint {
+- t.Errorf("Expected endpoint %s. Got %s.", endpoint, client.endpoint)
+- }
+- if !client.SkipServerVersionCheck {
+- t.Error("Expected SkipServerVersionCheck to be true, got false")
+- }
+- if client.requestedApiVersion != nil {
+- t.Errorf("Expected requestedApiVersion to be nil, got %#v.", client.requestedApiVersion)
+- }
+-}
+-
+-func TestNewVersionedClient(t *testing.T) {
+- endpoint := "http://localhost:4243"
+- client, err := NewVersionedClient(endpoint, "1.12")
+- if err != nil {
+- t.Fatal(err)
+- }
+- if client.endpoint != endpoint {
+- t.Errorf("Expected endpoint %s. Got %s.", endpoint, client.endpoint)
+- }
+- if client.HTTPClient != http.DefaultClient {
+- t.Errorf("Expected http.Client %#v. Got %#v.", http.DefaultClient, client.HTTPClient)
+- }
+- if reqVersion := client.requestedApiVersion.String(); reqVersion != "1.12" {
+- t.Errorf("Wrong requestApiVersion. Want %q. Got %q.", "1.12", reqVersion)
+- }
+- if client.SkipServerVersionCheck {
+- t.Error("Expected SkipServerVersionCheck to be false, got true")
+- }
+-}
+-
+-func TestNewClientInvalidEndpoint(t *testing.T) {
+- cases := []string{
+- "htp://localhost:3243", "http://localhost:a", "localhost:8080",
+- "", "localhost", "http://localhost:8080:8383", "http://localhost:65536",
+- "https://localhost:-20",
+- }
+- for _, c := range cases {
+- client, err := NewClient(c)
+- if client != nil {
+- t.Errorf("Want <nil> client for invalid endpoint, got %#v.", client)
+- }
+- if !reflect.DeepEqual(err, ErrInvalidEndpoint) {
+- t.Errorf("NewClient(%q): Got invalid error for invalid endpoint. Want %#v. Got %#v.", c, ErrInvalidEndpoint, err)
+- }
+- }
+-}
+-
+-func TestGetURL(t *testing.T) {
+- var tests = []struct {
+- endpoint string
+- path string
+- expected string
+- }{
+- {"http://localhost:4243/", "/", "http://localhost:4243/"},
+- {"http://localhost:4243", "/", "http://localhost:4243/"},
+- {"http://localhost:4243", "/containers/ps", "http://localhost:4243/containers/ps"},
+- {"tcp://localhost:4243", "/containers/ps", "http://localhost:4243/containers/ps"},
+- {"http://localhost:4243/////", "/", "http://localhost:4243/"},
+- {"unix:///var/run/docker.socket", "/containers", "/containers"},
+- }
+- for _, tt := range tests {
+- client, _ := NewClient(tt.endpoint)
+- client.endpoint = tt.endpoint
+- client.SkipServerVersionCheck = true
+- got := client.getURL(tt.path)
+- if got != tt.expected {
+- t.Errorf("getURL(%q): Got %s. Want %s.", tt.path, got, tt.expected)
+- }
+- }
+-}
+-
+-func TestError(t *testing.T) {
+- err := newError(400, []byte("bad parameter"))
+- expected := Error{Status: 400, Message: "bad parameter"}
+- if !reflect.DeepEqual(expected, *err) {
+- t.Errorf("Wrong error type. Want %#v. Got %#v.", expected, *err)
+- }
+- message := "API error (400): bad parameter"
+- if err.Error() != message {
+- t.Errorf("Wrong error message. Want %q. Got %q.", message, err.Error())
+- }
+-}
+-
+-func TestQueryString(t *testing.T) {
+- v := float32(2.4)
+- f32QueryString := fmt.Sprintf("w=%s&x=10&y=10.35", strconv.FormatFloat(float64(v), 'f', -1, 64))
+- jsonPerson := url.QueryEscape(`{"Name":"gopher","age":4}`)
+- var tests = []struct {
+- input interface{}
+- want string
+- }{
+- {&ListContainersOptions{All: true}, "all=1"},
+- {ListContainersOptions{All: true}, "all=1"},
+- {ListContainersOptions{Before: "something"}, "before=something"},
+- {ListContainersOptions{Before: "something", Since: "other"}, "before=something&since=other"},
+- {dumb{X: 10, Y: 10.35000}, "x=10&y=10.35"},
+- {dumb{W: v, X: 10, Y: 10.35000}, f32QueryString},
+- {dumb{X: 10, Y: 10.35000, Z: 10}, "x=10&y=10.35&zee=10"},
+- {dumb{v: 4, X: 10, Y: 10.35000}, "x=10&y=10.35"},
+- {dumb{T: 10, Y: 10.35000}, "y=10.35"},
+- {dumb{Person: &person{Name: "gopher", Age: 4}}, "p=" + jsonPerson},
+- {nil, ""},
+- {10, ""},
+- {"not_a_struct", ""},
+- }
+- for _, tt := range tests {
+- got := queryString(tt.input)
+- if got != tt.want {
+- t.Errorf("queryString(%v). Want %q. Got %q.", tt.input, tt.want, got)
+- }
+- }
+-}
+-
+-func TestNewApiVersionFailures(t *testing.T) {
+- var tests = []struct {
+- input string
+- expectedError string
+- }{
+- {"1-0", `Unable to parse version "1-0"`},
+- {"1.0-beta", `Unable to parse version "1.0-beta": "0-beta" is not an integer`},
+- }
+- for _, tt := range tests {
+- v, err := NewApiVersion(tt.input)
+- if v != nil {
+- t.Errorf("Expected <nil> version, got %v.", v)
+- }
+- if err.Error() != tt.expectedError {
+- t.Errorf("NewApiVersion(%q): wrong error. Want %q. Got %q", tt.input, tt.expectedError, err.Error())
+- }
+- }
+-}
+-
+-func TestApiVersions(t *testing.T) {
+- var tests = []struct {
+- a string
+- b string
+- expectedALessThanB bool
+- expectedALessThanOrEqualToB bool
+- expectedAGreaterThanB bool
+- expectedAGreaterThanOrEqualToB bool
+- }{
+- {"1.11", "1.11", false, true, false, true},
+- {"1.10", "1.11", true, true, false, false},
+- {"1.11", "1.10", false, false, true, true},
+-
+- {"1.9", "1.11", true, true, false, false},
+- {"1.11", "1.9", false, false, true, true},
+-
+- {"1.1.1", "1.1", false, false, true, true},
+- {"1.1", "1.1.1", true, true, false, false},
+-
+- {"2.1", "1.1.1", false, false, true, true},
+- {"2.1", "1.3.1", false, false, true, true},
+- {"1.1.1", "2.1", true, true, false, false},
+- {"1.3.1", "2.1", true, true, false, false},
+- }
+-
+- for _, tt := range tests {
+- a, _ := NewApiVersion(tt.a)
+- b, _ := NewApiVersion(tt.b)
+-
+- if tt.expectedALessThanB && !a.LessThan(b) {
+- t.Errorf("Expected %#v < %#v", a, b)
+- }
+- if tt.expectedALessThanOrEqualToB && !a.LessThanOrEqualTo(b) {
+- t.Errorf("Expected %#v <= %#v", a, b)
+- }
+- if tt.expectedAGreaterThanB && !a.GreaterThan(b) {
+- t.Errorf("Expected %#v > %#v", a, b)
+- }
+- if tt.expectedAGreaterThanOrEqualToB && !a.GreaterThanOrEqualTo(b) {
+- t.Errorf("Expected %#v >= %#v", a, b)
+- }
+- }
+-}
+-
+-func TestPing(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- err := client.Ping()
+- if err != nil {
+- t.Fatal(err)
+- }
+-}
+-
+-func TestPingFailing(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "", status: http.StatusInternalServerError}
+- client := newTestClient(fakeRT)
+- err := client.Ping()
+- if err == nil {
+- t.Fatal("Expected non nil error, got nil")
+- }
+- expectedErrMsg := "API error (500): "
+- if err.Error() != expectedErrMsg {
+- t.Fatalf("Expected error to be %q, got: %q", expectedErrMsg, err.Error())
+- }
+-}
+-
+-func TestPingFailingWrongStatus(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "", status: http.StatusAccepted}
+- client := newTestClient(fakeRT)
+- err := client.Ping()
+- if err == nil {
+- t.Fatal("Expected non nil error, got nil")
+- }
+- expectedErrMsg := "API error (202): "
+- if err.Error() != expectedErrMsg {
+- t.Fatalf("Expected error to be %q, got: %q", expectedErrMsg, err.Error())
+- }
+-}
+-
+-type FakeRoundTripper struct {
+- message string
+- status int
+- header map[string]string
+- requests []*http.Request
+-}
+-
+-func (rt *FakeRoundTripper) RoundTrip(r *http.Request) (*http.Response, error) {
+- body := strings.NewReader(rt.message)
+- rt.requests = append(rt.requests, r)
+- res := &http.Response{
+- StatusCode: rt.status,
+- Body: ioutil.NopCloser(body),
+- Header: make(http.Header),
+- }
+- for k, v := range rt.header {
+- res.Header.Set(k, v)
+- }
+- return res, nil
+-}
+-
+-func (rt *FakeRoundTripper) Reset() {
+- rt.requests = nil
+-}
+-
+-type person struct {
+- Name string
+- Age int `json:"age"`
+-}
+-
+-type dumb struct {
+- T int `qs:"-"`
+- v int
+- W float32
+- X int
+- Y float64
+- Z int `qs:"zee"`
+- Person *person `qs:"p"`
+-}
+-
+-type fakeEndpointURL struct {
+- Scheme string
+-}
+diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/container.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/container.go
+deleted file mode 100644
+index c649b5a..0000000
+--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/container.go
++++ /dev/null
+@@ -1,731 +0,0 @@
+-// Copyright 2014 go-dockerclient authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-package docker
+-
+-import (
+- "bytes"
+- "encoding/json"
+- "fmt"
+- "io"
+- "net/http"
+- "net/url"
+- "strconv"
+- "strings"
+- "time"
+-)
+-
+-// ListContainersOptions specify parameters to the ListContainers function.
+-//
+-// See http://goo.gl/XqtcyU for more details.
+-type ListContainersOptions struct {
+- All bool
+- Size bool
+- Limit int
+- Since string
+- Before string
+-}
+-
+-type APIPort struct {
+- PrivatePort int64 `json:"PrivatePort,omitempty" yaml:"PrivatePort,omitempty"`
+- PublicPort int64 `json:"PublicPort,omitempty" yaml:"PublicPort,omitempty"`
+- Type string `json:"Type,omitempty" yaml:"Type,omitempty"`
+- IP string `json:"IP,omitempty" yaml:"IP,omitempty"`
+-}
+-
+-// APIContainers represents a container.
+-//
+-// See http://goo.gl/QeFH7U for more details.
+-type APIContainers struct {
+- ID string `json:"Id" yaml:"Id"`
+- Image string `json:"Image,omitempty" yaml:"Image,omitempty"`
+- Command string `json:"Command,omitempty" yaml:"Command,omitempty"`
+- Created int64 `json:"Created,omitempty" yaml:"Created,omitempty"`
+- Status string `json:"Status,omitempty" yaml:"Status,omitempty"`
+- Ports []APIPort `json:"Ports,omitempty" yaml:"Ports,omitempty"`
+- SizeRw int64 `json:"SizeRw,omitempty" yaml:"SizeRw,omitempty"`
+- SizeRootFs int64 `json:"SizeRootFs,omitempty" yaml:"SizeRootFs,omitempty"`
+- Names []string `json:"Names,omitempty" yaml:"Names,omitempty"`
+-}
+-
+-// ListContainers returns a slice of containers matching the given criteria.
+-//
+-// See http://goo.gl/XqtcyU for more details.
+-func (c *Client) ListContainers(opts ListContainersOptions) ([]APIContainers, error) {
+- path := "/containers/json?" + queryString(opts)
+- body, _, err := c.do("GET", path, nil)
+- if err != nil {
+- return nil, err
+- }
+- var containers []APIContainers
+- err = json.Unmarshal(body, &containers)
+- if err != nil {
+- return nil, err
+- }
+- return containers, nil
+-}
+-
+-// Port represents the port number and the protocol, in the form
+-// <number>/<protocol>. For example: 80/tcp.
+-type Port string
+-
+-// Port returns the number of the port.
+-func (p Port) Port() string {
+- return strings.Split(string(p), "/")[0]
+-}
+-
+-// Proto returns the name of the protocol.
+-func (p Port) Proto() string {
+- parts := strings.Split(string(p), "/")
+- if len(parts) == 1 {
+- return "tcp"
+- }
+- return parts[1]
+-}
+-
+-// State represents the state of a container.
+-type State struct {
+- Running bool `json:"Running,omitempty" yaml:"Running,omitempty"`
+- Paused bool `json:"Paused,omitempty" yaml:"Paused,omitempty"`
+- Pid int `json:"Pid,omitempty" yaml:"Pid,omitempty"`
+- ExitCode int `json:"ExitCode,omitempty" yaml:"ExitCode,omitempty"`
+- StartedAt time.Time `json:"StartedAt,omitempty" yaml:"StartedAt,omitempty"`
+- FinishedAt time.Time `json:"FinishedAt,omitempty" yaml:"FinishedAt,omitempty"`
+-}
+-
+-// String returns the string representation of a state.
+-func (s *State) String() string {
+- if s.Running {
+- if s.Paused {
+- return "paused"
+- }
+- return fmt.Sprintf("Up %s", time.Now().UTC().Sub(s.StartedAt))
+- }
+- return fmt.Sprintf("Exit %d", s.ExitCode)
+-}
+-
+-type PortBinding struct {
+- HostIp string `json:"HostIP,omitempty" yaml:"HostIP,omitempty"`
+- HostPort string `json:"HostPort,omitempty" yaml:"HostPort,omitempty"`
+-}
+-
+-type PortMapping map[string]string
+-
+-type NetworkSettings struct {
+- IPAddress string `json:"IPAddress,omitempty" yaml:"IPAddress,omitempty"`
+- IPPrefixLen int `json:"IPPrefixLen,omitempty" yaml:"IPPrefixLen,omitempty"`
+- Gateway string `json:"Gateway,omitempty" yaml:"Gateway,omitempty"`
+- Bridge string `json:"Bridge,omitempty" yaml:"Bridge,omitempty"`
+- PortMapping map[string]PortMapping `json:"PortMapping,omitempty" yaml:"PortMapping,omitempty"`
+- Ports map[Port][]PortBinding `json:"Ports,omitempty" yaml:"Ports,omitempty"`
+-}
+-
+-func (settings *NetworkSettings) PortMappingAPI() []APIPort {
+- var mapping []APIPort
+- for port, bindings := range settings.Ports {
+- p, _ := parsePort(port.Port())
+- if len(bindings) == 0 {
+- mapping = append(mapping, APIPort{
+- PublicPort: int64(p),
+- Type: port.Proto(),
+- })
+- continue
+- }
+- for _, binding := range bindings {
+- p, _ := parsePort(port.Port())
+- h, _ := parsePort(binding.HostPort)
+- mapping = append(mapping, APIPort{
+- PrivatePort: int64(p),
+- PublicPort: int64(h),
+- Type: port.Proto(),
+- IP: binding.HostIp,
+- })
+- }
+- }
+- return mapping
+-}
+-
+-func parsePort(rawPort string) (int, error) {
+- port, err := strconv.ParseUint(rawPort, 10, 16)
+- if err != nil {
+- return 0, err
+- }
+- return int(port), nil
+-}
+-
+-type Config struct {
+- Hostname string `json:"Hostname,omitempty" yaml:"Hostname,omitempty"`
+- Domainname string `json:"Domainname,omitempty" yaml:"Domainname,omitempty"`
+- User string `json:"User,omitempty" yaml:"User,omitempty"`
+- Memory int64 `json:"Memory,omitempty" yaml:"Memory,omitempty"`
+- MemorySwap int64 `json:"MemorySwap,omitempty" yaml:"MemorySwap,omitempty"`
+- CpuShares int64 `json:"CpuShares,omitempty" yaml:"CpuShares,omitempty"`
+- CpuSet string `json:"CpuSet,omitempty" yaml:"CpuSet,omitempty"`
+- AttachStdin bool `json:"AttachStdin,omitempty" yaml:"AttachStdin,omitempty"`
+- AttachStdout bool `json:"AttachStdout,omitempty" yaml:"AttachStdout,omitempty"`
+- AttachStderr bool `json:"AttachStderr,omitempty" yaml:"AttachStderr,omitempty"`
+- PortSpecs []string `json:"PortSpecs,omitempty" yaml:"PortSpecs,omitempty"`
+- ExposedPorts map[Port]struct{} `json:"ExposedPorts,omitempty" yaml:"ExposedPorts,omitempty"`
+- Tty bool `json:"Tty,omitempty" yaml:"Tty,omitempty"`
+- OpenStdin bool `json:"OpenStdin,omitempty" yaml:"OpenStdin,omitempty"`
+- StdinOnce bool `json:"StdinOnce,omitempty" yaml:"StdinOnce,omitempty"`
+- Env []string `json:"Env,omitempty" yaml:"Env,omitempty"`
+- Cmd []string `json:"Cmd,omitempty" yaml:"Cmd,omitempty"`
+- Dns []string `json:"Dns,omitempty" yaml:"Dns,omitempty"` // For Docker API v1.9 and below only
+- Image string `json:"Image,omitempty" yaml:"Image,omitempty"`
+- Volumes map[string]struct{} `json:"Volumes,omitempty" yaml:"Volumes,omitempty"`
+- VolumesFrom string `json:"VolumesFrom,omitempty" yaml:"VolumesFrom,omitempty"`
+- WorkingDir string `json:"WorkingDir,omitempty" yaml:"WorkingDir,omitempty"`
+- Entrypoint []string `json:"Entrypoint,omitempty" yaml:"Entrypoint,omitempty"`
+- NetworkDisabled bool `json:"NetworkDisabled,omitempty" yaml:"NetworkDisabled,omitempty"`
+-}
+-
+-type Container struct {
+- ID string `json:"Id" yaml:"Id"`
+-
+- Created time.Time `json:"Created,omitempty" yaml:"Created,omitempty"`
+-
+- Path string `json:"Path,omitempty" yaml:"Path,omitempty"`
+- Args []string `json:"Args,omitempty" yaml:"Args,omitempty"`
+-
+- Config *Config `json:"Config,omitempty" yaml:"Config,omitempty"`
+- State State `json:"State,omitempty" yaml:"State,omitempty"`
+- Image string `json:"Image,omitempty" yaml:"Image,omitempty"`
+-
+- NetworkSettings *NetworkSettings `json:"NetworkSettings,omitempty" yaml:"NetworkSettings,omitempty"`
+-
+- SysInitPath string `json:"SysInitPath,omitempty" yaml:"SysInitPath,omitempty"`
+- ResolvConfPath string `json:"ResolvConfPath,omitempty" yaml:"ResolvConfPath,omitempty"`
+- HostnamePath string `json:"HostnamePath,omitempty" yaml:"HostnamePath,omitempty"`
+- HostsPath string `json:"HostsPath,omitempty" yaml:"HostsPath,omitempty"`
+- Name string `json:"Name,omitempty" yaml:"Name,omitempty"`
+- Driver string `json:"Driver,omitempty" yaml:"Driver,omitempty"`
+-
+- Volumes map[string]string `json:"Volumes,omitempty" yaml:"Volumes,omitempty"`
+- VolumesRW map[string]bool `json:"VolumesRW,omitempty" yaml:"VolumesRW,omitempty"`
+- HostConfig *HostConfig `json:"HostConfig,omitempty" yaml:"HostConfig,omitempty"`
+-}
+-
+-// InspectContainer returns information about a container by its ID.
+-//
+-// See http://goo.gl/CxVuJ5 for more details.
+-func (c *Client) InspectContainer(id string) (*Container, error) {
+- path := "/containers/" + id + "/json"
+- body, status, err := c.do("GET", path, nil)
+- if status == http.StatusNotFound {
+- return nil, &NoSuchContainer{ID: id}
+- }
+- if err != nil {
+- return nil, err
+- }
+- var container Container
+- err = json.Unmarshal(body, &container)
+- if err != nil {
+- return nil, err
+- }
+- return &container, nil
+-}
+-
+-// ContainerChanges returns changes in the filesystem of the given container.
+-//
+-// See http://goo.gl/QkW9sH for more details.
+-func (c *Client) ContainerChanges(id string) ([]Change, error) {
+- path := "/containers/" + id + "/changes"
+- body, status, err := c.do("GET", path, nil)
+- if status == http.StatusNotFound {
+- return nil, &NoSuchContainer{ID: id}
+- }
+- if err != nil {
+- return nil, err
+- }
+- var changes []Change
+- err = json.Unmarshal(body, &changes)
+- if err != nil {
+- return nil, err
+- }
+- return changes, nil
+-}
+-
+-// CreateContainerOptions specify parameters to the CreateContainer function.
+-//
+-// See http://goo.gl/mErxNp for more details.
+-type CreateContainerOptions struct {
+- Name string
+- Config *Config `qs:"-"`
+-}
+-
+-// CreateContainer creates a new container, returning the container instance,
+-// or an error in case of failure.
+-//
+-// See http://goo.gl/mErxNp for more details.
+-func (c *Client) CreateContainer(opts CreateContainerOptions) (*Container, error) {
+- path := "/containers/create?" + queryString(opts)
+- body, status, err := c.do("POST", path, opts.Config)
+- if status == http.StatusNotFound {
+- return nil, ErrNoSuchImage
+- }
+- if err != nil {
+- return nil, err
+- }
+- var container Container
+- err = json.Unmarshal(body, &container)
+- if err != nil {
+- return nil, err
+- }
+-
+- container.Name = opts.Name
+-
+- return &container, nil
+-}
+-
+-type KeyValuePair struct {
+- Key string `json:"Key,omitempty" yaml:"Key,omitempty"`
+- Value string `json:"Value,omitempty" yaml:"Value,omitempty"`
+-}
+-
+-// RestartPolicy represents the policy for automatically restarting a container.
+-//
+-// Possible values are:
+-//
+-// - always: the docker daemon will always restart the container
+-// - on-failure: the docker daemon will restart the container on failures, at
+-// most MaximumRetryCount times
+-// - no: the docker daemon will not restart the container automatically
+-type RestartPolicy struct {
+- Name string `json:"Name,omitempty" yaml:"Name,omitempty"`
+- MaximumRetryCount int `json:"MaximumRetryCount,omitempty" yaml:"MaximumRetryCount,omitempty"`
+-}
+-
+-// AlwaysRestart returns a restart policy that tells the Docker daemon to
+-// always restart the container.
+-func AlwaysRestart() RestartPolicy {
+- return RestartPolicy{Name: "always"}
+-}
+-
+-// RestartOnFailure returns a restart policy that tells the Docker daemon to
+-// restart the container on failures, trying at most maxRetry times.
+-func RestartOnFailure(maxRetry int) RestartPolicy {
+- return RestartPolicy{Name: "on-failure", MaximumRetryCount: maxRetry}
+-}
+-
+-// NeverRestart returns a restart policy that tells the Docker daemon to never
+-// restart the container on failures.
+-func NeverRestart() RestartPolicy {
+- return RestartPolicy{Name: "no"}
+-}
+-
+-type HostConfig struct {
+- Binds []string `json:"Binds,omitempty" yaml:"Binds,omitempty"`
+- CapAdd []string `json:"CapAdd,omitempty" yaml:"CapAdd,omitempty"`
+- CapDrop []string `json:"CapDrop,omitempty" yaml:"CapDrop,omitempty"`
+- ContainerIDFile string `json:"ContainerIDFile,omitempty" yaml:"ContainerIDFile,omitempty"`
+- LxcConf []KeyValuePair `json:"LxcConf,omitempty" yaml:"LxcConf,omitempty"`
+- Privileged bool `json:"Privileged,omitempty" yaml:"Privileged,omitempty"`
+- PortBindings map[Port][]PortBinding `json:"PortBindings,omitempty" yaml:"PortBindings,omitempty"`
+- Links []string `json:"Links,omitempty" yaml:"Links,omitempty"`
+- PublishAllPorts bool `json:"PublishAllPorts,omitempty" yaml:"PublishAllPorts,omitempty"`
+- Dns []string `json:"Dns,omitempty" yaml:"Dns,omitempty"` // For Docker API v1.10 and above only
+- DnsSearch []string `json:"DnsSearch,omitempty" yaml:"DnsSearch,omitempty"`
+- VolumesFrom []string `json:"VolumesFrom,omitempty" yaml:"VolumesFrom,omitempty"`
+- NetworkMode string `json:"NetworkMode,omitempty" yaml:"NetworkMode,omitempty"`
+- RestartPolicy RestartPolicy `json:"RestartPolicy,omitempty" yaml:"RestartPolicy,omitempty"`
+-}
+-
+-// StartContainer starts a container, returning an error in case of failure.
+-//
+-// See http://goo.gl/iM5GYs for more details.
+-func (c *Client) StartContainer(id string, hostConfig *HostConfig) error {
+- if hostConfig == nil {
+- hostConfig = &HostConfig{}
+- }
+- path := "/containers/" + id + "/start"
+- _, status, err := c.do("POST", path, hostConfig)
+- if status == http.StatusNotFound {
+- return &NoSuchContainer{ID: id}
+- }
+- if status == http.StatusNotModified {
+- return &ContainerAlreadyRunning{ID: id}
+- }
+- if err != nil {
+- return err
+- }
+- return nil
+-}
+-
+-// StopContainer stops a container, killing it after the given timeout (in
+-// seconds).
+-//
+-// See http://goo.gl/EbcpXt for more details.
+-func (c *Client) StopContainer(id string, timeout uint) error {
+- path := fmt.Sprintf("/containers/%s/stop?t=%d", id, timeout)
+- _, status, err := c.do("POST", path, nil)
+- if status == http.StatusNotFound {
+- return &NoSuchContainer{ID: id}
+- }
+- if status == http.StatusNotModified {
+- return &ContainerNotRunning{ID: id}
+- }
+- if err != nil {
+- return err
+- }
+- return nil
+-}
+-
+-// RestartContainer stops a container, killing it after the given timeout (in
+-// seconds), during the stop process.
+-//
+-// See http://goo.gl/VOzR2n for more details.
+-func (c *Client) RestartContainer(id string, timeout uint) error {
+- path := fmt.Sprintf("/containers/%s/restart?t=%d", id, timeout)
+- _, status, err := c.do("POST", path, nil)
+- if status == http.StatusNotFound {
+- return &NoSuchContainer{ID: id}
+- }
+- if err != nil {
+- return err
+- }
+- return nil
+-}
+-
+-// PauseContainer pauses the given container.
+-//
+-// See http://goo.gl/AM5t42 for more details.
+-func (c *Client) PauseContainer(id string) error {
+- path := fmt.Sprintf("/containers/%s/pause", id)
+- _, status, err := c.do("POST", path, nil)
+- if status == http.StatusNotFound {
+- return &NoSuchContainer{ID: id}
+- }
+- if err != nil {
+- return err
+- }
+- return nil
+-}
+-
+-// UnpauseContainer pauses the given container.
+-//
+-// See http://goo.gl/eBrNSL for more details.
+-func (c *Client) UnpauseContainer(id string) error {
+- path := fmt.Sprintf("/containers/%s/unpause", id)
+- _, status, err := c.do("POST", path, nil)
+- if status == http.StatusNotFound {
+- return &NoSuchContainer{ID: id}
+- }
+- if err != nil {
+- return err
+- }
+- return nil
+-}
+-
+-// TopResult represents the list of processes running in a container, as
+-// returned by /containers/<id>/top.
+-//
+-// See http://goo.gl/qu4gse for more details.
+-type TopResult struct {
+- Titles []string
+- Processes [][]string
+-}
+-
+-// TopContainer returns processes running inside a container
+-//
+-// See http://goo.gl/qu4gse for more details.
+-func (c *Client) TopContainer(id string, psArgs string) (TopResult, error) {
+- var args string
+- var result TopResult
+- if psArgs != "" {
+- args = fmt.Sprintf("?ps_args=%s", psArgs)
+- }
+- path := fmt.Sprintf("/containers/%s/top%s", id, args)
+- body, status, err := c.do("GET", path, nil)
+- if status == http.StatusNotFound {
+- return result, &NoSuchContainer{ID: id}
+- }
+- if err != nil {
+- return result, err
+- }
+- err = json.Unmarshal(body, &result)
+- if err != nil {
+- return result, err
+- }
+- return result, nil
+-}
+-
+-// KillContainerOptions represents the set of options that can be used in a
+-// call to KillContainer.
+-//
+-// See http://goo.gl/TFkECx for more details.
+-type KillContainerOptions struct {
+- // The ID of the container.
+- ID string `qs:"-"`
+-
+- // The signal to send to the container. When omitted, Docker server
+- // will assume SIGKILL.
+- Signal Signal
+-}
+-
+-// KillContainer kills a container, returning an error in case of failure.
+-//
+-// See http://goo.gl/TFkECx for more details.
+-func (c *Client) KillContainer(opts KillContainerOptions) error {
+- path := "/containers/" + opts.ID + "/kill" + "?" + queryString(opts)
+- _, status, err := c.do("POST", path, nil)
+- if status == http.StatusNotFound {
+- return &NoSuchContainer{ID: opts.ID}
+- }
+- if err != nil {
+- return err
+- }
+- return nil
+-}
+-
+-// RemoveContainerOptions encapsulates options to remove a container.
+-//
+-// See http://goo.gl/ZB83ji for more details.
+-type RemoveContainerOptions struct {
+- // The ID of the container.
+- ID string `qs:"-"`
+-
+- // A flag that indicates whether Docker should remove the volumes
+- // associated to the container.
+- RemoveVolumes bool `qs:"v"`
+-
+- // A flag that indicates whether Docker should remove the container
+- // even if it is currently running.
+- Force bool
+-}
+-
+-// RemoveContainer removes a container, returning an error in case of failure.
+-//
+-// See http://goo.gl/ZB83ji for more details.
+-func (c *Client) RemoveContainer(opts RemoveContainerOptions) error {
+- path := "/containers/" + opts.ID + "?" + queryString(opts)
+- _, status, err := c.do("DELETE", path, nil)
+- if status == http.StatusNotFound {
+- return &NoSuchContainer{ID: opts.ID}
+- }
+- if err != nil {
+- return err
+- }
+- return nil
+-}
+-
+-// CopyFromContainerOptions is the set of options that can be used when copying
+-// files or folders from a container.
+-//
+-// See http://goo.gl/rINMlw for more details.
+-type CopyFromContainerOptions struct {
+- OutputStream io.Writer `json:"-"`
+- Container string `json:"-"`
+- Resource string
+-}
+-
+-// CopyFromContainer copy files or folders from a container, using a given
+-// resource.
+-//
+-// See http://goo.gl/rINMlw for more details.
+-func (c *Client) CopyFromContainer(opts CopyFromContainerOptions) error {
+- if opts.Container == "" {
+- return &NoSuchContainer{ID: opts.Container}
+- }
+- url := fmt.Sprintf("/containers/%s/copy", opts.Container)
+- body, status, err := c.do("POST", url, opts)
+- if status == http.StatusNotFound {
+- return &NoSuchContainer{ID: opts.Container}
+- }
+- if err != nil {
+- return err
+- }
+- io.Copy(opts.OutputStream, bytes.NewBuffer(body))
+- return nil
+-}
+-
+-// WaitContainer blocks until the given container stops, return the exit code
+-// of the container status.
+-//
+-// See http://goo.gl/J88DHU for more details.
+-func (c *Client) WaitContainer(id string) (int, error) {
+- body, status, err := c.do("POST", "/containers/"+id+"/wait", nil)
+- if status == http.StatusNotFound {
+- return 0, &NoSuchContainer{ID: id}
+- }
+- if err != nil {
+- return 0, err
+- }
+- var r struct{ StatusCode int }
+- err = json.Unmarshal(body, &r)
+- if err != nil {
+- return 0, err
+- }
+- return r.StatusCode, nil
+-}
+-
+-// CommitContainerOptions aggregates parameters to the CommitContainer method.
+-//
+-// See http://goo.gl/Jn8pe8 for more details.
+-type CommitContainerOptions struct {
+- Container string
+- Repository string `qs:"repo"`
+- Tag string
+- Message string `qs:"m"`
+- Author string
+- Run *Config `qs:"-"`
+-}
+-
+-// CommitContainer creates a new image from a container's changes.
+-//
+-// See http://goo.gl/Jn8pe8 for more details.
+-func (c *Client) CommitContainer(opts CommitContainerOptions) (*Image, error) {
+- path := "/commit?" + queryString(opts)
+- body, status, err := c.do("POST", path, opts.Run)
+- if status == http.StatusNotFound {
+- return nil, &NoSuchContainer{ID: opts.Container}
+- }
+- if err != nil {
+- return nil, err
+- }
+- var image Image
+- err = json.Unmarshal(body, &image)
+- if err != nil {
+- return nil, err
+- }
+- return &image, nil
+-}
+-
+-// AttachToContainerOptions is the set of options that can be used when
+-// attaching to a container.
+-//
+-// See http://goo.gl/RRAhws for more details.
+-type AttachToContainerOptions struct {
+- Container string `qs:"-"`
+- InputStream io.Reader `qs:"-"`
+- OutputStream io.Writer `qs:"-"`
+- ErrorStream io.Writer `qs:"-"`
+-
+- // Get container logs, sending it to OutputStream.
+- Logs bool
+-
+- // Stream the response?
+- Stream bool
+-
+- // Attach to stdin, and use InputStream.
+- Stdin bool
+-
+- // Attach to stdout, and use OutputStream.
+- Stdout bool
+-
+- // Attach to stderr, and use ErrorStream.
+- Stderr bool
+-
+- // If set, after a successful connect, a sentinel will be sent and then the
+- // client will block on receive before continuing.
+- //
+- // It must be an unbuffered channel. Using a buffered channel can lead
+- // to unexpected behavior.
+- Success chan struct{}
+-
+- // Use raw terminal? Usually true when the container contains a TTY.
+- RawTerminal bool `qs:"-"`
+-}
+-
+-// AttachToContainer attaches to a container, using the given options.
+-//
+-// See http://goo.gl/RRAhws for more details.
+-func (c *Client) AttachToContainer(opts AttachToContainerOptions) error {
+- if opts.Container == "" {
+- return &NoSuchContainer{ID: opts.Container}
+- }
+- path := "/containers/" + opts.Container + "/attach?" + queryString(opts)
+- return c.hijack("POST", path, opts.Success, opts.RawTerminal, opts.InputStream, opts.ErrorStream, opts.OutputStream, nil)
+-}
+-
+-// LogsOptions represents the set of options used when getting logs from a
+-// container.
+-//
+-// See http://goo.gl/rLhKSU for more details.
+-type LogsOptions struct {
+- Container string `qs:"-"`
+- OutputStream io.Writer `qs:"-"`
+- ErrorStream io.Writer `qs:"-"`
+- Follow bool
+- Stdout bool
+- Stderr bool
+- Timestamps bool
+- Tail string
+-
+- // Use raw terminal? Usually true when the container contains a TTY.
+- RawTerminal bool `qs:"-"`
+-}
+-
+-// Logs gets stdout and stderr logs from the specified container.
+-//
+-// See http://goo.gl/rLhKSU for more details.
+-func (c *Client) Logs(opts LogsOptions) error {
+- if opts.Container == "" {
+- return &NoSuchContainer{ID: opts.Container}
+- }
+- if opts.Tail == "" {
+- opts.Tail = "all"
+- }
+- path := "/containers/" + opts.Container + "/logs?" + queryString(opts)
+- return c.stream("GET", path, opts.RawTerminal, false, nil, nil, opts.OutputStream, opts.ErrorStream)
+-}
+-
+-// ResizeContainerTTY resizes the terminal to the given height and width.
+-func (c *Client) ResizeContainerTTY(id string, height, width int) error {
+- params := make(url.Values)
+- params.Set("h", strconv.Itoa(height))
+- params.Set("w", strconv.Itoa(width))
+- _, _, err := c.do("POST", "/containers/"+id+"/resize?"+params.Encode(), nil)
+- return err
+-}
+-
+-// ExportContainerOptions is the set of parameters to the ExportContainer
+-// method.
+-//
+-// See http://goo.gl/hnzE62 for more details.
+-type ExportContainerOptions struct {
+- ID string
+- OutputStream io.Writer
+-}
+-
+-// ExportContainer export the contents of container id as tar archive
+-// and prints the exported contents to stdout.
+-//
+-// See http://goo.gl/hnzE62 for more details.
+-func (c *Client) ExportContainer(opts ExportContainerOptions) error {
+- if opts.ID == "" {
+- return &NoSuchContainer{ID: opts.ID}
+- }
+- url := fmt.Sprintf("/containers/%s/export", opts.ID)
+- return c.stream("GET", url, true, false, nil, nil, opts.OutputStream, nil)
+-}
+-
+-// NoSuchContainer is the error returned when a given container does not exist.
+-type NoSuchContainer struct {
+- ID string
+-}
+-
+-func (err *NoSuchContainer) Error() string {
+- return "No such container: " + err.ID
+-}
+-
+-// ContainerAlreadyRunning is the error returned when a given container is
+-// already running.
+-type ContainerAlreadyRunning struct {
+- ID string
+-}
+-
+-func (err *ContainerAlreadyRunning) Error() string {
+- return "Container already running: " + err.ID
+-}
+-
+-// ContainerNotRunning is the error returned when a given container is not
+-// running.
+-type ContainerNotRunning struct {
+- ID string
+-}
+-
+-func (err *ContainerNotRunning) Error() string {
+- return "Container not running: " + err.ID
+-}
+diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/container_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/container_test.go
+deleted file mode 100644
+index d80270b..0000000
+--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/container_test.go
++++ /dev/null
+@@ -1,1495 +0,0 @@
+-// Copyright 2014 go-dockerclient authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-package docker
+-
+-import (
+- "bytes"
+- "encoding/json"
+- "io/ioutil"
+- "net"
+- "net/http"
+- "net/http/httptest"
+- "net/url"
+- "os"
+- "reflect"
+- "regexp"
+- "runtime"
+- "strconv"
+- "strings"
+- "testing"
+- "time"
+-)
+-
+-func TestStateString(t *testing.T) {
+- started := time.Now().Add(-3 * time.Hour)
+- var tests = []struct {
+- input State
+- expected string
+- }{
+- {State{Running: true, Paused: true}, "^paused$"},
+- {State{Running: true, StartedAt: started}, "^Up 3h.*$"},
+- {State{Running: false, ExitCode: 7}, "^Exit 7$"},
+- }
+- for _, tt := range tests {
+- re := regexp.MustCompile(tt.expected)
+- if got := tt.input.String(); !re.MatchString(got) {
+- t.Errorf("State.String(): wrong result. Want %q. Got %q.", tt.expected, got)
+- }
+- }
+-}
+-
+-func TestListContainers(t *testing.T) {
+- jsonContainers := `[
+- {
+- "Id": "8dfafdbc3a40",
+- "Image": "base:latest",
+- "Command": "echo 1",
+- "Created": 1367854155,
+- "Ports":[{"PrivatePort": 2222, "PublicPort": 3333, "Type": "tcp"}],
+- "Status": "Exit 0"
+- },
+- {
+- "Id": "9cd87474be90",
+- "Image": "base:latest",
+- "Command": "echo 222222",
+- "Created": 1367854155,
+- "Ports":[{"PrivatePort": 2222, "PublicPort": 3333, "Type": "tcp"}],
+- "Status": "Exit 0"
+- },
+- {
+- "Id": "3176a2479c92",
+- "Image": "base:latest",
+- "Command": "echo 3333333333333333",
+- "Created": 1367854154,
+- "Ports":[{"PrivatePort": 2221, "PublicPort": 3331, "Type": "tcp"}],
+- "Status": "Exit 0"
+- },
+- {
+- "Id": "4cb07b47f9fb",
+- "Image": "base:latest",
+- "Command": "echo 444444444444444444444444444444444",
+- "Ports":[{"PrivatePort": 2223, "PublicPort": 3332, "Type": "tcp"}],
+- "Created": 1367854152,
+- "Status": "Exit 0"
- }
-- }
-- }
-- }
-- }
+-]`
+- var expected []APIContainers
+- err := json.Unmarshal([]byte(jsonContainers), &expected)
+- if err != nil {
+- t.Fatal(err)
+- }
+- client := newTestClient(&FakeRoundTripper{message: jsonContainers, status: http.StatusOK})
+- containers, err := client.ListContainers(ListContainersOptions{})
+- if err != nil {
+- t.Fatal(err)
+- }
+- if !reflect.DeepEqual(containers, expected) {
+- t.Errorf("ListContainers: Expected %#v. Got %#v.", expected, containers)
+- }
+-}
+-
+-func TestListContainersParams(t *testing.T) {
+- var tests = []struct {
+- input ListContainersOptions
+- params map[string][]string
+- }{
+- {ListContainersOptions{}, map[string][]string{}},
+- {ListContainersOptions{All: true}, map[string][]string{"all": {"1"}}},
+- {ListContainersOptions{All: true, Limit: 10}, map[string][]string{"all": {"1"}, "limit": {"10"}}},
+- {
+- ListContainersOptions{All: true, Limit: 10, Since: "adf9983", Before: "abdeef"},
+- map[string][]string{"all": {"1"}, "limit": {"10"}, "since": {"adf9983"}, "before": {"abdeef"}},
+- },
+- }
+- fakeRT := &FakeRoundTripper{message: "[]", status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- u, _ := url.Parse(client.getURL("/containers/json"))
+- for _, tt := range tests {
+- client.ListContainers(tt.input)
+- got := map[string][]string(fakeRT.requests[0].URL.Query())
+- if !reflect.DeepEqual(got, tt.params) {
+- t.Errorf("Expected %#v, got %#v.", tt.params, got)
+- }
+- if path := fakeRT.requests[0].URL.Path; path != u.Path {
+- t.Errorf("Wrong path on request. Want %q. Got %q.", u.Path, path)
+- }
+- if meth := fakeRT.requests[0].Method; meth != "GET" {
+- t.Errorf("Wrong HTTP method. Want GET. Got %s.", meth)
+- }
+- fakeRT.Reset()
+- }
+-}
+-
+-func TestListContainersFailure(t *testing.T) {
+- var tests = []struct {
+- status int
+- message string
+- }{
+- {400, "bad parameter"},
+- {500, "internal server error"},
+- }
+- for _, tt := range tests {
+- client := newTestClient(&FakeRoundTripper{message: tt.message, status: tt.status})
+- expected := Error{Status: tt.status, Message: tt.message}
+- containers, err := client.ListContainers(ListContainersOptions{})
+- if !reflect.DeepEqual(expected, *err.(*Error)) {
+- t.Errorf("Wrong error in ListContainers. Want %#v. Got %#v.", expected, err)
+- }
+- if len(containers) > 0 {
+- t.Errorf("ListContainers failure. Expected empty list. Got %#v.", containers)
+- }
+- }
+-}
+-
+-func TestInspectContainer(t *testing.T) {
+- jsonContainer := `{
+- "Id": "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2",
+- "Created": "2013-05-07T14:51:42.087658+02:00",
+- "Path": "date",
+- "Args": [],
+- "Config": {
+- "Hostname": "4fa6e0f0c678",
+- "User": "",
+- "Memory": 17179869184,
+- "MemorySwap": 34359738368,
+- "AttachStdin": false,
+- "AttachStdout": true,
+- "AttachStderr": true,
+- "PortSpecs": null,
+- "Tty": false,
+- "OpenStdin": false,
+- "StdinOnce": false,
+- "Env": null,
+- "Cmd": [
+- "date"
+- ],
+- "Image": "base",
+- "Volumes": {},
+- "VolumesFrom": ""
+- },
+- "State": {
+- "Running": false,
+- "Pid": 0,
+- "ExitCode": 0,
+- "StartedAt": "2013-05-07T14:51:42.087658+02:00",
+- "Ghost": false
+- },
+- "Image": "b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc",
+- "NetworkSettings": {
+- "IpAddress": "",
+- "IpPrefixLen": 0,
+- "Gateway": "",
+- "Bridge": "",
+- "PortMapping": null
+- },
+- "SysInitPath": "/home/kitty/go/src/github.com/dotcloud/docker/bin/docker",
+- "ResolvConfPath": "/etc/resolv.conf",
+- "Volumes": {},
+- "HostConfig": {
+- "Binds": null,
+- "ContainerIDFile": "",
+- "LxcConf": [],
+- "Privileged": false,
+- "PortBindings": {
+- "80/tcp": [
+- {
+- "HostIp": "0.0.0.0",
+- "HostPort": "49153"
+- }
+- ]
+- },
+- "Links": null,
+- "PublishAllPorts": false
+- }
+-}`
+- var expected Container
+- err := json.Unmarshal([]byte(jsonContainer), &expected)
+- if err != nil {
+- t.Fatal(err)
+- }
+- fakeRT := &FakeRoundTripper{message: jsonContainer, status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- id := "4fa6e0f0c678"
+- container, err := client.InspectContainer(id)
+- if err != nil {
+- t.Fatal(err)
+- }
+- if !reflect.DeepEqual(*container, expected) {
+- t.Errorf("InspectContainer(%q): Expected %#v. Got %#v.", id, expected, container)
+- }
+- expectedURL, _ := url.Parse(client.getURL("/containers/4fa6e0f0c678/json"))
+- if gotPath := fakeRT.requests[0].URL.Path; gotPath != expectedURL.Path {
+- t.Errorf("InspectContainer(%q): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
+- }
+-}
+-
+-func TestInspectContainerNegativeSwap(t *testing.T) {
+- jsonContainer := `{
+- "Id": "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2",
+- "Created": "2013-05-07T14:51:42.087658+02:00",
+- "Path": "date",
+- "Args": [],
+- "Config": {
+- "Hostname": "4fa6e0f0c678",
+- "User": "",
+- "Memory": 17179869184,
+- "MemorySwap": -1,
+- "AttachStdin": false,
+- "AttachStdout": true,
+- "AttachStderr": true,
+- "PortSpecs": null,
+- "Tty": false,
+- "OpenStdin": false,
+- "StdinOnce": false,
+- "Env": null,
+- "Cmd": [
+- "date"
+- ],
+- "Image": "base",
+- "Volumes": {},
+- "VolumesFrom": ""
+- },
+- "State": {
+- "Running": false,
+- "Pid": 0,
+- "ExitCode": 0,
+- "StartedAt": "2013-05-07T14:51:42.087658+02:00",
+- "Ghost": false
+- },
+- "Image": "b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc",
+- "NetworkSettings": {
+- "IpAddress": "",
+- "IpPrefixLen": 0,
+- "Gateway": "",
+- "Bridge": "",
+- "PortMapping": null
+- },
+- "SysInitPath": "/home/kitty/go/src/github.com/dotcloud/docker/bin/docker",
+- "ResolvConfPath": "/etc/resolv.conf",
+- "Volumes": {},
+- "HostConfig": {
+- "Binds": null,
+- "ContainerIDFile": "",
+- "LxcConf": [],
+- "Privileged": false,
+- "PortBindings": {
+- "80/tcp": [
+- {
+- "HostIp": "0.0.0.0",
+- "HostPort": "49153"
+- }
+- ]
+- },
+- "Links": null,
+- "PublishAllPorts": false
+- }
+-}`
+- var expected Container
+- err := json.Unmarshal([]byte(jsonContainer), &expected)
+- if err != nil {
+- t.Fatal(err)
+- }
+- fakeRT := &FakeRoundTripper{message: jsonContainer, status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- id := "4fa6e0f0c678"
+- container, err := client.InspectContainer(id)
+- if err != nil {
+- t.Fatal(err)
+- }
+- if !reflect.DeepEqual(*container, expected) {
+- t.Errorf("InspectContainer(%q): Expected %#v. Got %#v.", id, expected, container)
+- }
+- expectedURL, _ := url.Parse(client.getURL("/containers/4fa6e0f0c678/json"))
+- if gotPath := fakeRT.requests[0].URL.Path; gotPath != expectedURL.Path {
+- t.Errorf("InspectContainer(%q): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
+- }
+-}
+-
+-func TestInspectContainerFailure(t *testing.T) {
+- client := newTestClient(&FakeRoundTripper{message: "server error", status: 500})
+- expected := Error{Status: 500, Message: "server error"}
+- container, err := client.InspectContainer("abe033")
+- if container != nil {
+- t.Errorf("InspectContainer: Expected <nil> container, got %#v", container)
+- }
+- if !reflect.DeepEqual(expected, *err.(*Error)) {
+- t.Errorf("InspectContainer: Wrong error information. Want %#v. Got %#v.", expected, err)
+- }
+-}
+-
+-func TestInspectContainerNotFound(t *testing.T) {
+- client := newTestClient(&FakeRoundTripper{message: "no such container", status: 404})
+- container, err := client.InspectContainer("abe033")
+- if container != nil {
+- t.Errorf("InspectContainer: Expected <nil> container, got %#v", container)
+- }
+- expected := &NoSuchContainer{ID: "abe033"}
+- if !reflect.DeepEqual(err, expected) {
+- t.Errorf("InspectContainer: Wrong error information. Want %#v. Got %#v.", expected, err)
+- }
+-}
+-
+-func TestContainerChanges(t *testing.T) {
+- jsonChanges := `[
+- {
+- "Path":"/dev",
+- "Kind":0
+- },
+- {
+- "Path":"/dev/kmsg",
+- "Kind":1
+- },
+- {
+- "Path":"/test",
+- "Kind":1
+- }
+-]`
+- var expected []Change
+- err := json.Unmarshal([]byte(jsonChanges), &expected)
+- if err != nil {
+- t.Fatal(err)
+- }
+- fakeRT := &FakeRoundTripper{message: jsonChanges, status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- id := "4fa6e0f0c678"
+- changes, err := client.ContainerChanges(id)
+- if err != nil {
+- t.Fatal(err)
+- }
+- if !reflect.DeepEqual(changes, expected) {
+- t.Errorf("ContainerChanges(%q): Expected %#v. Got %#v.", id, expected, changes)
+- }
+- expectedURL, _ := url.Parse(client.getURL("/containers/4fa6e0f0c678/changes"))
+- if gotPath := fakeRT.requests[0].URL.Path; gotPath != expectedURL.Path {
+- t.Errorf("ContainerChanges(%q): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
+- }
+-}
+-
+-func TestContainerChangesFailure(t *testing.T) {
+- client := newTestClient(&FakeRoundTripper{message: "server error", status: 500})
+- expected := Error{Status: 500, Message: "server error"}
+- changes, err := client.ContainerChanges("abe033")
+- if changes != nil {
+- t.Errorf("ContainerChanges: Expected <nil> changes, got %#v", changes)
+- }
+- if !reflect.DeepEqual(expected, *err.(*Error)) {
+- t.Errorf("ContainerChanges: Wrong error information. Want %#v. Got %#v.", expected, err)
+- }
+-}
+-
+-func TestContainerChangesNotFound(t *testing.T) {
+- client := newTestClient(&FakeRoundTripper{message: "no such container", status: 404})
+- changes, err := client.ContainerChanges("abe033")
+- if changes != nil {
+- t.Errorf("ContainerChanges: Expected <nil> changes, got %#v", changes)
+- }
+- expected := &NoSuchContainer{ID: "abe033"}
+- if !reflect.DeepEqual(err, expected) {
+- t.Errorf("ContainerChanges: Wrong error information. Want %#v. Got %#v.", expected, err)
+- }
+-}
+-
+-func TestCreateContainer(t *testing.T) {
+- jsonContainer := `{
+- "Id": "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2",
+- "Warnings": []
+-}`
+- var expected Container
+- err := json.Unmarshal([]byte(jsonContainer), &expected)
+- if err != nil {
+- t.Fatal(err)
+- }
+- fakeRT := &FakeRoundTripper{message: jsonContainer, status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- config := Config{AttachStdout: true, AttachStdin: true}
+- opts := CreateContainerOptions{Name: "TestCreateContainer", Config: &config}
+- container, err := client.CreateContainer(opts)
+- if err != nil {
+- t.Fatal(err)
+- }
+- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
+- if container.ID != id {
+- t.Errorf("CreateContainer: wrong ID. Want %q. Got %q.", id, container.ID)
+- }
+- req := fakeRT.requests[0]
+- if req.Method != "POST" {
+- t.Errorf("CreateContainer: wrong HTTP method. Want %q. Got %q.", "POST", req.Method)
+- }
+- expectedURL, _ := url.Parse(client.getURL("/containers/create"))
+- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
+- t.Errorf("CreateContainer: Wrong path in request. Want %q. Got %q.", expectedURL.Path, gotPath)
+- }
+- var gotBody Config
+- err = json.NewDecoder(req.Body).Decode(&gotBody)
+- if err != nil {
+- t.Fatal(err)
+- }
+-}
+-
+-func TestCreateContainerImageNotFound(t *testing.T) {
+- client := newTestClient(&FakeRoundTripper{message: "No such image", status: http.StatusNotFound})
+- config := Config{AttachStdout: true, AttachStdin: true}
+- container, err := client.CreateContainer(CreateContainerOptions{Config: &config})
+- if container != nil {
+- t.Errorf("CreateContainer: expected <nil> container, got %#v.", container)
+- }
+- if !reflect.DeepEqual(err, ErrNoSuchImage) {
+- t.Errorf("CreateContainer: Wrong error type. Want %#v. Got %#v.", ErrNoSuchImage, err)
+- }
+-}
+-
+-func TestStartContainer(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
+- err := client.StartContainer(id, &HostConfig{})
+- if err != nil {
+- t.Fatal(err)
+- }
+- req := fakeRT.requests[0]
+- if req.Method != "POST" {
+- t.Errorf("StartContainer(%q): wrong HTTP method. Want %q. Got %q.", id, "POST", req.Method)
+- }
+- expectedURL, _ := url.Parse(client.getURL("/containers/" + id + "/start"))
+- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
+- t.Errorf("StartContainer(%q): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
+- }
+- expectedContentType := "application/json"
+- if contentType := req.Header.Get("Content-Type"); contentType != expectedContentType {
+- t.Errorf("StartContainer(%q): Wrong content-type in request. Want %q. Got %q.", id, expectedContentType, contentType)
+- }
+-}
+-
+-func TestStartContainerNilHostConfig(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
+- err := client.StartContainer(id, nil)
+- if err != nil {
+- t.Fatal(err)
+- }
+- req := fakeRT.requests[0]
+- if req.Method != "POST" {
+- t.Errorf("StartContainer(%q): wrong HTTP method. Want %q. Got %q.", id, "POST", req.Method)
+- }
+- expectedURL, _ := url.Parse(client.getURL("/containers/" + id + "/start"))
+- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
+- t.Errorf("StartContainer(%q): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
+- }
+- expectedContentType := "application/json"
+- if contentType := req.Header.Get("Content-Type"); contentType != expectedContentType {
+- t.Errorf("StartContainer(%q): Wrong content-type in request. Want %q. Got %q.", id, expectedContentType, contentType)
+- }
+-}
+-
+-func TestStartContainerNotFound(t *testing.T) {
+- client := newTestClient(&FakeRoundTripper{message: "no such container", status: http.StatusNotFound})
+- err := client.StartContainer("a2344", &HostConfig{})
+- expected := &NoSuchContainer{ID: "a2344"}
+- if !reflect.DeepEqual(err, expected) {
+- t.Errorf("StartContainer: Wrong error returned. Want %#v. Got %#v.", expected, err)
+- }
+-}
+-
+-func TestStartContainerAlreadyRunning(t *testing.T) {
+- client := newTestClient(&FakeRoundTripper{message: "container already running", status: http.StatusNotModified})
+- err := client.StartContainer("a2334", &HostConfig{})
+- expected := &ContainerAlreadyRunning{ID: "a2334"}
+- if !reflect.DeepEqual(err, expected) {
+- t.Errorf("StartContainer: Wrong error returned. Want %#v. Got %#v.", expected, err)
+- }
+-}
+-
+-func TestStopContainer(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "", status: http.StatusNoContent}
+- client := newTestClient(fakeRT)
+- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
+- err := client.StopContainer(id, 10)
+- if err != nil {
+- t.Fatal(err)
+- }
+- req := fakeRT.requests[0]
+- if req.Method != "POST" {
+- t.Errorf("StopContainer(%q, 10): wrong HTTP method. Want %q. Got %q.", id, "POST", req.Method)
+- }
+- expectedURL, _ := url.Parse(client.getURL("/containers/" + id + "/stop"))
+- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
+- t.Errorf("StopContainer(%q, 10): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
+- }
+-}
+-
+-func TestStopContainerNotFound(t *testing.T) {
+- client := newTestClient(&FakeRoundTripper{message: "no such container", status: http.StatusNotFound})
+- err := client.StopContainer("a2334", 10)
+- expected := &NoSuchContainer{ID: "a2334"}
+- if !reflect.DeepEqual(err, expected) {
+- t.Errorf("StopContainer: Wrong error returned. Want %#v. Got %#v.", expected, err)
+- }
+-}
+-
+-func TestStopContainerNotRunning(t *testing.T) {
+- client := newTestClient(&FakeRoundTripper{message: "container not running", status: http.StatusNotModified})
+- err := client.StopContainer("a2334", 10)
+- expected := &ContainerNotRunning{ID: "a2334"}
+- if !reflect.DeepEqual(err, expected) {
+- t.Errorf("StopContainer: Wrong error returned. Want %#v. Got %#v.", expected, err)
+- }
+-}
+-
+-func TestRestartContainer(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "", status: http.StatusNoContent}
+- client := newTestClient(fakeRT)
+- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
+- err := client.RestartContainer(id, 10)
+- if err != nil {
+- t.Fatal(err)
+- }
+- req := fakeRT.requests[0]
+- if req.Method != "POST" {
+- t.Errorf("RestartContainer(%q, 10): wrong HTTP method. Want %q. Got %q.", id, "POST", req.Method)
+- }
+- expectedURL, _ := url.Parse(client.getURL("/containers/" + id + "/restart"))
+- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
+- t.Errorf("RestartContainer(%q, 10): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
+- }
+-}
+-
+-func TestRestartContainerNotFound(t *testing.T) {
+- client := newTestClient(&FakeRoundTripper{message: "no such container", status: http.StatusNotFound})
+- err := client.RestartContainer("a2334", 10)
+- expected := &NoSuchContainer{ID: "a2334"}
+- if !reflect.DeepEqual(err, expected) {
+- t.Errorf("RestartContainer: Wrong error returned. Want %#v. Got %#v.", expected, err)
+- }
+-}
+-
+-func TestPauseContainer(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "", status: http.StatusNoContent}
+- client := newTestClient(fakeRT)
+- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
+- err := client.PauseContainer(id)
+- if err != nil {
+- t.Fatal(err)
+- }
+- req := fakeRT.requests[0]
+- if req.Method != "POST" {
+- t.Errorf("PauseContainer(%q): wrong HTTP method. Want %q. Got %q.", id, "POST", req.Method)
+- }
+- expectedURL, _ := url.Parse(client.getURL("/containers/" + id + "/pause"))
+- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
+- t.Errorf("PauseContainer(%q): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
+- }
+-}
+-
+-func TestPauseContainerNotFound(t *testing.T) {
+- client := newTestClient(&FakeRoundTripper{message: "no such container", status: http.StatusNotFound})
+- err := client.PauseContainer("a2334")
+- expected := &NoSuchContainer{ID: "a2334"}
+- if !reflect.DeepEqual(err, expected) {
+- t.Errorf("PauseContainer: Wrong error returned. Want %#v. Got %#v.", expected, err)
+- }
+-}
+-
+-func TestUnpauseContainer(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "", status: http.StatusNoContent}
+- client := newTestClient(fakeRT)
+- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
+- err := client.UnpauseContainer(id)
+- if err != nil {
+- t.Fatal(err)
+- }
+- req := fakeRT.requests[0]
+- if req.Method != "POST" {
+- t.Errorf("PauseContainer(%q): wrong HTTP method. Want %q. Got %q.", id, "POST", req.Method)
+- }
+- expectedURL, _ := url.Parse(client.getURL("/containers/" + id + "/unpause"))
+- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
+- t.Errorf("PauseContainer(%q): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
+- }
+-}
+-
+-func TestUnpauseContainerNotFound(t *testing.T) {
+- client := newTestClient(&FakeRoundTripper{message: "no such container", status: http.StatusNotFound})
+- err := client.UnpauseContainer("a2334")
+- expected := &NoSuchContainer{ID: "a2334"}
+- if !reflect.DeepEqual(err, expected) {
+- t.Errorf("PauseContainer: Wrong error returned. Want %#v. Got %#v.", expected, err)
+- }
+-}
+-
+-func TestKillContainer(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "", status: http.StatusNoContent}
+- client := newTestClient(fakeRT)
+- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
+- err := client.KillContainer(KillContainerOptions{ID: id})
+- if err != nil {
+- t.Fatal(err)
+- }
+- req := fakeRT.requests[0]
+- if req.Method != "POST" {
+- t.Errorf("KillContainer(%q): wrong HTTP method. Want %q. Got %q.", id, "POST", req.Method)
+- }
+- expectedURL, _ := url.Parse(client.getURL("/containers/" + id + "/kill"))
+- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
+- t.Errorf("KillContainer(%q): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
+- }
+-}
+-
+-func TestKillContainerSignal(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "", status: http.StatusNoContent}
+- client := newTestClient(fakeRT)
+- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
+- err := client.KillContainer(KillContainerOptions{ID: id, Signal: SIGTERM})
+- if err != nil {
+- t.Fatal(err)
+- }
+- req := fakeRT.requests[0]
+- if req.Method != "POST" {
+- t.Errorf("KillContainer(%q): wrong HTTP method. Want %q. Got %q.", id, "POST", req.Method)
+- }
+- if signal := req.URL.Query().Get("signal"); signal != "15" {
+- t.Errorf("KillContainer(%q): Wrong query string in request. Want %q. Got %q.", id, "15", signal)
+- }
+-}
+-
+-func TestKillContainerNotFound(t *testing.T) {
+- client := newTestClient(&FakeRoundTripper{message: "no such container", status: http.StatusNotFound})
+- err := client.KillContainer(KillContainerOptions{ID: "a2334"})
+- expected := &NoSuchContainer{ID: "a2334"}
+- if !reflect.DeepEqual(err, expected) {
+- t.Errorf("KillContainer: Wrong error returned. Want %#v. Got %#v.", expected, err)
+- }
+-}
+-
+-func TestRemoveContainer(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
+- opts := RemoveContainerOptions{ID: id}
+- err := client.RemoveContainer(opts)
+- if err != nil {
+- t.Fatal(err)
+- }
+- req := fakeRT.requests[0]
+- if req.Method != "DELETE" {
+- t.Errorf("RemoveContainer(%q): wrong HTTP method. Want %q. Got %q.", id, "DELETE", req.Method)
+- }
+- expectedURL, _ := url.Parse(client.getURL("/containers/" + id))
+- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
+- t.Errorf("RemoveContainer(%q): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
+- }
+-}
+-
+-func TestRemoveContainerRemoveVolumes(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
+- opts := RemoveContainerOptions{ID: id, RemoveVolumes: true}
+- err := client.RemoveContainer(opts)
+- if err != nil {
+- t.Fatal(err)
+- }
+- req := fakeRT.requests[0]
+- params := map[string][]string(req.URL.Query())
+- expected := map[string][]string{"v": {"1"}}
+- if !reflect.DeepEqual(params, expected) {
+- t.Errorf("RemoveContainer(%q): wrong parameters. Want %#v. Got %#v.", id, expected, params)
+- }
+-}
+-
+-func TestRemoveContainerNotFound(t *testing.T) {
+- client := newTestClient(&FakeRoundTripper{message: "no such container", status: http.StatusNotFound})
+- err := client.RemoveContainer(RemoveContainerOptions{ID: "a2334"})
+- expected := &NoSuchContainer{ID: "a2334"}
+- if !reflect.DeepEqual(err, expected) {
+- t.Errorf("RemoveContainer: Wrong error returned. Want %#v. Got %#v.", expected, err)
+- }
+-}
+-
+-func TestResizeContainerTTY(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
+- err := client.ResizeContainerTTY(id, 40, 80)
+- if err != nil {
+- t.Fatal(err)
+- }
+- req := fakeRT.requests[0]
+- if req.Method != "POST" {
+- t.Errorf("ResizeContainerTTY(%q): wrong HTTP method. Want %q. Got %q.", id, "POST", req.Method)
+- }
+- expectedURL, _ := url.Parse(client.getURL("/containers/" + id + "/resize"))
+- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
+- t.Errorf("ResizeContainerTTY(%q): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
+- }
+- got := map[string][]string(req.URL.Query())
+- expectedParams := map[string][]string{
+- "w": {"80"},
+- "h": {"40"},
+- }
+- if !reflect.DeepEqual(got, expectedParams) {
+- t.Errorf("Expected %#v, got %#v.", expectedParams, got)
+- }
+-}
+-
+-func TestWaitContainer(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: `{"StatusCode": 56}`, status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
+- status, err := client.WaitContainer(id)
+- if err != nil {
+- t.Fatal(err)
+- }
+- if status != 56 {
+- t.Errorf("WaitContainer(%q): wrong return. Want 56. Got %d.", id, status)
+- }
+- req := fakeRT.requests[0]
+- if req.Method != "POST" {
+- t.Errorf("WaitContainer(%q): wrong HTTP method. Want %q. Got %q.", id, "POST", req.Method)
+- }
+- expectedURL, _ := url.Parse(client.getURL("/containers/" + id + "/wait"))
+- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
+- t.Errorf("WaitContainer(%q): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
+- }
+-}
+-
+-func TestWaitContainerNotFound(t *testing.T) {
+- client := newTestClient(&FakeRoundTripper{message: "no such container", status: http.StatusNotFound})
+- _, err := client.WaitContainer("a2334")
+- expected := &NoSuchContainer{ID: "a2334"}
+- if !reflect.DeepEqual(err, expected) {
+- t.Errorf("WaitContainer: Wrong error returned. Want %#v. Got %#v.", expected, err)
+- }
+-}
+-
+-func TestCommitContainer(t *testing.T) {
+- response := `{"Id":"596069db4bf5"}`
+- client := newTestClient(&FakeRoundTripper{message: response, status: http.StatusOK})
+- id := "596069db4bf5"
+- image, err := client.CommitContainer(CommitContainerOptions{})
+- if err != nil {
+- t.Fatal(err)
+- }
+- if image.ID != id {
+- t.Errorf("CommitContainer: Wrong image id. Want %q. Got %q.", id, image.ID)
+- }
+-}
+-
+-func TestCommitContainerParams(t *testing.T) {
+- cfg := Config{Memory: 67108864}
+- json, _ := json.Marshal(&cfg)
+- var tests = []struct {
+- input CommitContainerOptions
+- params map[string][]string
+- body []byte
+- }{
+- {CommitContainerOptions{}, map[string][]string{}, nil},
+- {CommitContainerOptions{Container: "44c004db4b17"}, map[string][]string{"container": {"44c004db4b17"}}, nil},
+- {
+- CommitContainerOptions{Container: "44c004db4b17", Repository: "tsuru/python", Message: "something"},
+- map[string][]string{"container": {"44c004db4b17"}, "repo": {"tsuru/python"}, "m": {"something"}},
+- nil,
+- },
+- {
+- CommitContainerOptions{Container: "44c004db4b17", Run: &cfg},
+- map[string][]string{"container": {"44c004db4b17"}},
+- json,
+- },
+- }
+- fakeRT := &FakeRoundTripper{message: "[]", status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- u, _ := url.Parse(client.getURL("/commit"))
+- for _, tt := range tests {
+- client.CommitContainer(tt.input)
+- got := map[string][]string(fakeRT.requests[0].URL.Query())
+- if !reflect.DeepEqual(got, tt.params) {
+- t.Errorf("Expected %#v, got %#v.", tt.params, got)
+- }
+- if path := fakeRT.requests[0].URL.Path; path != u.Path {
+- t.Errorf("Wrong path on request. Want %q. Got %q.", u.Path, path)
+- }
+- if meth := fakeRT.requests[0].Method; meth != "POST" {
+- t.Errorf("Wrong HTTP method. Want POST. Got %s.", meth)
+- }
+- if tt.body != nil {
+- if requestBody, err := ioutil.ReadAll(fakeRT.requests[0].Body); err == nil {
+- if bytes.Compare(requestBody, tt.body) != 0 {
+- t.Errorf("Expected body %#v, got %#v", tt.body, requestBody)
+- }
+- } else {
+- t.Errorf("Error reading request body: %#v", err)
+- }
+- }
+- fakeRT.Reset()
+- }
+-}
+-
+-func TestCommitContainerFailure(t *testing.T) {
+- client := newTestClient(&FakeRoundTripper{message: "no such container", status: http.StatusInternalServerError})
+- _, err := client.CommitContainer(CommitContainerOptions{})
+- if err == nil {
+- t.Error("Expected non-nil error, got <nil>.")
+- }
+-}
+-
+-func TestCommitContainerNotFound(t *testing.T) {
+- client := newTestClient(&FakeRoundTripper{message: "no such container", status: http.StatusNotFound})
+- _, err := client.CommitContainer(CommitContainerOptions{})
+- expected := &NoSuchContainer{ID: ""}
+- if !reflect.DeepEqual(err, expected) {
+- t.Errorf("CommitContainer: Wrong error returned. Want %#v. Got %#v.", expected, err)
+- }
+-}
+-
+-func TestAttachToContainerLogs(t *testing.T) {
+- var req http.Request
+- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+- w.Write([]byte{1, 0, 0, 0, 0, 0, 0, 19})
+- w.Write([]byte("something happened!"))
+- req = *r
+- }))
+- defer server.Close()
+- client, _ := NewClient(server.URL)
+- client.SkipServerVersionCheck = true
+- var buf bytes.Buffer
+- opts := AttachToContainerOptions{
+- Container: "a123456",
+- OutputStream: &buf,
+- Stdout: true,
+- Stderr: true,
+- Logs: true,
+- }
+- err := client.AttachToContainer(opts)
+- if err != nil {
+- t.Fatal(err)
+- }
+- expected := "something happened!"
+- if buf.String() != expected {
+- t.Errorf("AttachToContainer for logs: wrong output. Want %q. Got %q.", expected, buf.String())
+- }
+- if req.Method != "POST" {
+- t.Errorf("AttachToContainer: wrong HTTP method. Want POST. Got %s.", req.Method)
+- }
+- u, _ := url.Parse(client.getURL("/containers/a123456/attach"))
+- if req.URL.Path != u.Path {
+- t.Errorf("AttachToContainer for logs: wrong HTTP path. Want %q. Got %q.", u.Path, req.URL.Path)
+- }
+- expectedQs := map[string][]string{
+- "logs": {"1"},
+- "stdout": {"1"},
+- "stderr": {"1"},
+- }
+- got := map[string][]string(req.URL.Query())
+- if !reflect.DeepEqual(got, expectedQs) {
+- t.Errorf("AttachToContainer: wrong query string. Want %#v. Got %#v.", expectedQs, got)
+- }
+-}
+-
+-func TestAttachToContainer(t *testing.T) {
+- var reader = strings.NewReader("send value")
+- var req http.Request
+- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+- w.Write([]byte{1, 0, 0, 0, 0, 0, 0, 5})
+- w.Write([]byte("hello"))
+- req = *r
+- }))
+- defer server.Close()
+- client, _ := NewClient(server.URL)
+- client.SkipServerVersionCheck = true
+- var stdout, stderr bytes.Buffer
+- opts := AttachToContainerOptions{
+- Container: "a123456",
+- OutputStream: &stdout,
+- ErrorStream: &stderr,
+- InputStream: reader,
+- Stdin: true,
+- Stdout: true,
+- Stderr: true,
+- Stream: true,
+- RawTerminal: true,
+- }
+- err := client.AttachToContainer(opts)
+- if err != nil {
+- t.Fatal(err)
+- }
+- expected := map[string][]string{
+- "stdin": {"1"},
+- "stdout": {"1"},
+- "stderr": {"1"},
+- "stream": {"1"},
+- }
+- got := map[string][]string(req.URL.Query())
+- if !reflect.DeepEqual(got, expected) {
+- t.Errorf("AttachToContainer: wrong query string. Want %#v. Got %#v.", expected, got)
+- }
+-}
+-
+-func TestAttachToContainerSentinel(t *testing.T) {
+- var reader = strings.NewReader("send value")
+- var req http.Request
+- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+- w.Write([]byte{1, 0, 0, 0, 0, 0, 0, 5})
+- w.Write([]byte("hello"))
+- req = *r
+- }))
+- defer server.Close()
+- client, _ := NewClient(server.URL)
+- client.SkipServerVersionCheck = true
+- var stdout, stderr bytes.Buffer
+- success := make(chan struct{})
+- opts := AttachToContainerOptions{
+- Container: "a123456",
+- OutputStream: &stdout,
+- ErrorStream: &stderr,
+- InputStream: reader,
+- Stdin: true,
+- Stdout: true,
+- Stderr: true,
+- Stream: true,
+- RawTerminal: true,
+- Success: success,
+- }
+- go client.AttachToContainer(opts)
+- success <- <-success
+-}
+-
+-func TestAttachToContainerNilStdout(t *testing.T) {
+- var reader = strings.NewReader("send value")
+- var req http.Request
+- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+- w.Write([]byte{1, 0, 0, 0, 0, 0, 0, 5})
+- w.Write([]byte("hello"))
+- req = *r
+- }))
+- defer server.Close()
+- client, _ := NewClient(server.URL)
+- client.SkipServerVersionCheck = true
+- var stderr bytes.Buffer
+- opts := AttachToContainerOptions{
+- Container: "a123456",
+- OutputStream: nil,
+- ErrorStream: &stderr,
+- InputStream: reader,
+- Stdin: true,
+- Stdout: true,
+- Stderr: true,
+- Stream: true,
+- RawTerminal: true,
+- }
+- err := client.AttachToContainer(opts)
+- if err != nil {
+- t.Fatal(err)
+- }
+-}
+-
+-func TestAttachToContainerNilStderr(t *testing.T) {
+- var reader = strings.NewReader("send value")
+- var req http.Request
+- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+- w.Write([]byte{1, 0, 0, 0, 0, 0, 0, 5})
+- w.Write([]byte("hello"))
+- req = *r
+- }))
+- defer server.Close()
+- client, _ := NewClient(server.URL)
+- client.SkipServerVersionCheck = true
+- var stdout bytes.Buffer
+- opts := AttachToContainerOptions{
+- Container: "a123456",
+- OutputStream: &stdout,
+- InputStream: reader,
+- Stdin: true,
+- Stdout: true,
+- Stderr: true,
+- Stream: true,
+- RawTerminal: true,
+- }
+- err := client.AttachToContainer(opts)
+- if err != nil {
+- t.Fatal(err)
+- }
+-}
+-
+-func TestAttachToContainerRawTerminalFalse(t *testing.T) {
+- input := strings.NewReader("send value")
+- var req http.Request
+- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+- prefix := []byte{1, 0, 0, 0, 0, 0, 0, 5}
+- w.Write(prefix)
+- w.Write([]byte("hello"))
+- req = *r
+- }))
+- defer server.Close()
+- client, _ := NewClient(server.URL)
+- client.SkipServerVersionCheck = true
+- var stdout, stderr bytes.Buffer
+- opts := AttachToContainerOptions{
+- Container: "a123456",
+- OutputStream: &stdout,
+- ErrorStream: &stderr,
+- InputStream: input,
+- Stdin: true,
+- Stdout: true,
+- Stderr: true,
+- Stream: true,
+- RawTerminal: false,
+- }
+- err := client.AttachToContainer(opts)
+- if err != nil {
+- t.Fatal(err)
+- }
+- expected := map[string][]string{
+- "stdin": {"1"},
+- "stdout": {"1"},
+- "stderr": {"1"},
+- "stream": {"1"},
+- }
+- got := map[string][]string(req.URL.Query())
+- if !reflect.DeepEqual(got, expected) {
+- t.Errorf("AttachToContainer: wrong query string. Want %#v. Got %#v.", expected, got)
+- }
+- t.Log(stderr.String())
+- t.Log(stdout.String())
+- if stdout.String() != "hello" {
+- t.Errorf("AttachToContainer: wrong content written to stdout. Want %q. Got %q.", "hello", stderr.String())
+- }
+-}
+-
+-func TestAttachToContainerWithoutContainer(t *testing.T) {
+- var client Client
+- err := client.AttachToContainer(AttachToContainerOptions{})
+- expected := &NoSuchContainer{ID: ""}
+- if !reflect.DeepEqual(err, expected) {
+- t.Errorf("AttachToContainer: wrong error. Want %#v. Got %#v.", expected, err)
+- }
+-}
+-
+-func TestLogs(t *testing.T) {
+- var req http.Request
+- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+- prefix := []byte{1, 0, 0, 0, 0, 0, 0, 19}
+- w.Write(prefix)
+- w.Write([]byte("something happened!"))
+- req = *r
+- }))
+- defer server.Close()
+- client, _ := NewClient(server.URL)
+- client.SkipServerVersionCheck = true
+- var buf bytes.Buffer
+- opts := LogsOptions{
+- Container: "a123456",
+- OutputStream: &buf,
+- Follow: true,
+- Stdout: true,
+- Stderr: true,
+- Timestamps: true,
+- }
+- err := client.Logs(opts)
+- if err != nil {
+- t.Fatal(err)
+- }
+- expected := "something happened!"
+- if buf.String() != expected {
+- t.Errorf("Logs: wrong output. Want %q. Got %q.", expected, buf.String())
+- }
+- if req.Method != "GET" {
+- t.Errorf("Logs: wrong HTTP method. Want GET. Got %s.", req.Method)
+- }
+- u, _ := url.Parse(client.getURL("/containers/a123456/logs"))
+- if req.URL.Path != u.Path {
+- t.Errorf("AttachToContainer for logs: wrong HTTP path. Want %q. Got %q.", u.Path, req.URL.Path)
+- }
+- expectedQs := map[string][]string{
+- "follow": {"1"},
+- "stdout": {"1"},
+- "stderr": {"1"},
+- "timestamps": {"1"},
+- "tail": {"all"},
+- }
+- got := map[string][]string(req.URL.Query())
+- if !reflect.DeepEqual(got, expectedQs) {
+- t.Errorf("Logs: wrong query string. Want %#v. Got %#v.", expectedQs, got)
+- }
+-}
+-
+-func TestLogsNilStdoutDoesntFail(t *testing.T) {
+- var req http.Request
+- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+- prefix := []byte{1, 0, 0, 0, 0, 0, 0, 19}
+- w.Write(prefix)
+- w.Write([]byte("something happened!"))
+- req = *r
+- }))
+- defer server.Close()
+- client, _ := NewClient(server.URL)
+- client.SkipServerVersionCheck = true
+- opts := LogsOptions{
+- Container: "a123456",
+- Follow: true,
+- Stdout: true,
+- Stderr: true,
+- Timestamps: true,
+- }
+- err := client.Logs(opts)
+- if err != nil {
+- t.Fatal(err)
+- }
+-}
+-
+-func TestLogsNilStderrDoesntFail(t *testing.T) {
+- var req http.Request
+- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+- prefix := []byte{2, 0, 0, 0, 0, 0, 0, 19}
+- w.Write(prefix)
+- w.Write([]byte("something happened!"))
+- req = *r
+- }))
+- defer server.Close()
+- client, _ := NewClient(server.URL)
+- client.SkipServerVersionCheck = true
+- opts := LogsOptions{
+- Container: "a123456",
+- Follow: true,
+- Stdout: true,
+- Stderr: true,
+- Timestamps: true,
+- }
+- err := client.Logs(opts)
+- if err != nil {
+- t.Fatal(err)
+- }
+-}
+-
+-func TestLogsSpecifyingTail(t *testing.T) {
+- var req http.Request
+- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+- prefix := []byte{1, 0, 0, 0, 0, 0, 0, 19}
+- w.Write(prefix)
+- w.Write([]byte("something happened!"))
+- req = *r
+- }))
+- defer server.Close()
+- client, _ := NewClient(server.URL)
+- client.SkipServerVersionCheck = true
+- var buf bytes.Buffer
+- opts := LogsOptions{
+- Container: "a123456",
+- OutputStream: &buf,
+- Follow: true,
+- Stdout: true,
+- Stderr: true,
+- Timestamps: true,
+- Tail: "100",
+- }
+- err := client.Logs(opts)
+- if err != nil {
+- t.Fatal(err)
+- }
+- expected := "something happened!"
+- if buf.String() != expected {
+- t.Errorf("Logs: wrong output. Want %q. Got %q.", expected, buf.String())
+- }
+- if req.Method != "GET" {
+- t.Errorf("Logs: wrong HTTP method. Want GET. Got %s.", req.Method)
+- }
+- u, _ := url.Parse(client.getURL("/containers/a123456/logs"))
+- if req.URL.Path != u.Path {
+- t.Errorf("AttachToContainer for logs: wrong HTTP path. Want %q. Got %q.", u.Path, req.URL.Path)
+- }
+- expectedQs := map[string][]string{
+- "follow": {"1"},
+- "stdout": {"1"},
+- "stderr": {"1"},
+- "timestamps": {"1"},
+- "tail": {"100"},
+- }
+- got := map[string][]string(req.URL.Query())
+- if !reflect.DeepEqual(got, expectedQs) {
+- t.Errorf("Logs: wrong query string. Want %#v. Got %#v.", expectedQs, got)
+- }
+-}
+-
+-func TestLogsRawTerminal(t *testing.T) {
+- var req http.Request
+- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+- w.Write([]byte("something happened!"))
+- req = *r
+- }))
+- defer server.Close()
+- client, _ := NewClient(server.URL)
+- client.SkipServerVersionCheck = true
+- var buf bytes.Buffer
+- opts := LogsOptions{
+- Container: "a123456",
+- OutputStream: &buf,
+- Follow: true,
+- RawTerminal: true,
+- Stdout: true,
+- Stderr: true,
+- Timestamps: true,
+- Tail: "100",
+- }
+- err := client.Logs(opts)
+- if err != nil {
+- t.Fatal(err)
+- }
+- expected := "something happened!"
+- if buf.String() != expected {
+- t.Errorf("Logs: wrong output. Want %q. Got %q.", expected, buf.String())
+- }
+-}
+-
+-func TestLogsNoContainer(t *testing.T) {
+- var client Client
+- err := client.Logs(LogsOptions{})
+- expected := &NoSuchContainer{ID: ""}
+- if !reflect.DeepEqual(err, expected) {
+- t.Errorf("AttachToContainer: wrong error. Want %#v. Got %#v.", expected, err)
+- }
+-}
+-
+-func TestNoSuchContainerError(t *testing.T) {
+- var err error = &NoSuchContainer{ID: "i345"}
+- expected := "No such container: i345"
+- if got := err.Error(); got != expected {
+- t.Errorf("NoSuchContainer: wrong message. Want %q. Got %q.", expected, got)
+- }
+-}
+-
+-func TestExportContainer(t *testing.T) {
+- content := "exported container tar content"
+- out := stdoutMock{bytes.NewBufferString(content)}
+- client := newTestClient(&FakeRoundTripper{status: http.StatusOK})
+- opts := ExportContainerOptions{ID: "4fa6e0f0c678", OutputStream: out}
+- err := client.ExportContainer(opts)
+- if err != nil {
+- t.Errorf("ExportContainer: caugh error %#v while exporting container, expected nil", err.Error())
+- }
+- if out.String() != content {
+- t.Errorf("ExportContainer: wrong stdout. Want %#v. Got %#v.", content, out.String())
+- }
+-}
+-
+-func TestExportContainerViaUnixSocket(t *testing.T) {
+- if runtime.GOOS != "darwin" {
+- t.Skip("skipping test on %q", runtime.GOOS)
+- }
+- content := "exported container tar content"
+- var buf []byte
+- out := bytes.NewBuffer(buf)
+- tempSocket := tempfile("export_socket")
+- defer os.Remove(tempSocket)
+- endpoint := "unix://" + tempSocket
+- u, _ := parseEndpoint(endpoint)
+- client := Client{
+- HTTPClient: http.DefaultClient,
+- endpoint: endpoint,
+- endpointURL: u,
+- SkipServerVersionCheck: true,
+- }
+- listening := make(chan string)
+- done := make(chan int)
+- go runStreamConnServer(t, "unix", tempSocket, listening, done)
+- <-listening // wait for server to start
+- opts := ExportContainerOptions{ID: "4fa6e0f0c678", OutputStream: out}
+- err := client.ExportContainer(opts)
+- <-done // make sure server stopped
+- if err != nil {
+- t.Errorf("ExportContainer: caugh error %#v while exporting container, expected nil", err.Error())
+- }
+- if out.String() != content {
+- t.Errorf("ExportContainer: wrong stdout. Want %#v. Got %#v.", content, out.String())
+- }
+-}
+-
+-func runStreamConnServer(t *testing.T, network, laddr string, listening chan<- string, done chan<- int) {
+- defer close(done)
+- l, err := net.Listen(network, laddr)
+- if err != nil {
+- t.Errorf("Listen(%q, %q) failed: %v", network, laddr, err)
+- listening <- "<nil>"
+- return
+- }
+- defer l.Close()
+- listening <- l.Addr().String()
+- c, err := l.Accept()
+- if err != nil {
+- t.Logf("Accept failed: %v", err)
+- return
+- }
+- c.Write([]byte("HTTP/1.1 200 OK\n\nexported container tar content"))
+- c.Close()
+-}
+-
+-func tempfile(filename string) string {
+- return os.TempDir() + "/" + filename + "." + strconv.Itoa(os.Getpid())
+-}
+-
+-func TestExportContainerNoId(t *testing.T) {
+- client := Client{}
+- out := stdoutMock{bytes.NewBufferString("")}
+- err := client.ExportContainer(ExportContainerOptions{OutputStream: out})
+- e, ok := err.(*NoSuchContainer)
+- if !ok {
+- t.Errorf("ExportContainer: wrong error. Want NoSuchContainer. Got %#v.", e)
+- }
+- if e.ID != "" {
+- t.Errorf("ExportContainer: wrong ID. Want %q. Got %q", "", e.ID)
+- }
+-}
+-
+-func TestCopyFromContainer(t *testing.T) {
+- content := "File content"
+- out := stdoutMock{bytes.NewBufferString(content)}
+- client := newTestClient(&FakeRoundTripper{status: http.StatusOK})
+- opts := CopyFromContainerOptions{
+- Container: "a123456",
+- OutputStream: out,
+- }
+- err := client.CopyFromContainer(opts)
+- if err != nil {
+- t.Errorf("CopyFromContainer: caugh error %#v while copying from container, expected nil", err.Error())
+- }
+- if out.String() != content {
+- t.Errorf("CopyFromContainer: wrong stdout. Want %#v. Got %#v.", content, out.String())
+- }
+-}
+-
+-func TestCopyFromContainerEmptyContainer(t *testing.T) {
+- client := newTestClient(&FakeRoundTripper{status: http.StatusOK})
+- err := client.CopyFromContainer(CopyFromContainerOptions{})
+- _, ok := err.(*NoSuchContainer)
+- if !ok {
+- t.Errorf("CopyFromContainer: invalid error returned. Want NoSuchContainer, got %#v.", err)
+- }
+-}
+-
+-func TestPassingNameOptToCreateContainerReturnsItInContainer(t *testing.T) {
+- jsonContainer := `{
+- "Id": "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2",
+- "Warnings": []
+-}`
+- fakeRT := &FakeRoundTripper{message: jsonContainer, status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- config := Config{AttachStdout: true, AttachStdin: true}
+- opts := CreateContainerOptions{Name: "TestCreateContainer", Config: &config}
+- container, err := client.CreateContainer(opts)
+- if err != nil {
+- t.Fatal(err)
+- }
+- if container.Name != "TestCreateContainer" {
+- t.Errorf("Container name expected to be TestCreateContainer, was %s", container.Name)
+- }
+-}
+-
+-func TestAlwaysRestart(t *testing.T) {
+- policy := AlwaysRestart()
+- if policy.Name != "always" {
+- t.Errorf("AlwaysRestart(): wrong policy name. Want %q. Got %q", "always", policy.Name)
+- }
+- if policy.MaximumRetryCount != 0 {
+- t.Errorf("AlwaysRestart(): wrong MaximumRetryCount. Want 0. Got %d", policy.MaximumRetryCount)
+- }
+-}
+-
+-func TestRestartOnFailure(t *testing.T) {
+- const retry = 5
+- policy := RestartOnFailure(retry)
+- if policy.Name != "on-failure" {
+- t.Errorf("RestartOnFailure(%d): wrong policy name. Want %q. Got %q", retry, "on-failure", policy.Name)
+- }
+- if policy.MaximumRetryCount != retry {
+- t.Errorf("RestartOnFailure(%d): wrong MaximumRetryCount. Want %d. Got %d", retry, retry, policy.MaximumRetryCount)
+- }
+-}
+-
+-func TestNeverRestart(t *testing.T) {
+- policy := NeverRestart()
+- if policy.Name != "no" {
+- t.Errorf("NeverRestart(): wrong policy name. Want %q. Got %q", "always", policy.Name)
+- }
+- if policy.MaximumRetryCount != 0 {
+- t.Errorf("NeverRestart(): wrong MaximumRetryCount. Want 0. Got %d", policy.MaximumRetryCount)
+- }
+-}
+-
+-func TestTopContainer(t *testing.T) {
+- jsonTop := `{
+- "Processes": [
+- [
+- "ubuntu",
+- "3087",
+- "815",
+- "0",
+- "01:44",
+- "?",
+- "00:00:00",
+- "cmd1"
+- ],
+- [
+- "root",
+- "3158",
+- "3087",
+- "0",
+- "01:44",
+- "?",
+- "00:00:01",
+- "cmd2"
+- ]
+- ],
+- "Titles": [
+- "UID",
+- "PID",
+- "PPID",
+- "C",
+- "STIME",
+- "TTY",
+- "TIME",
+- "CMD"
+- ]
+-}`
+- var expected TopResult
+- err := json.Unmarshal([]byte(jsonTop), &expected)
+- if err != nil {
+- t.Fatal(err)
+- }
+- id := "4fa6e0f0"
+- fakeRT := &FakeRoundTripper{message: jsonTop, status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- processes, err := client.TopContainer(id, "")
+- if err != nil {
+- t.Fatal(err)
+- }
+- if !reflect.DeepEqual(processes, expected) {
+- t.Errorf("TopContainer: Expected %#v. Got %#v.", expected, processes)
+- }
+- if len(processes.Processes) != 2 || len(processes.Processes[0]) != 8 ||
+- processes.Processes[0][7] != "cmd1" {
+- t.Errorf("TopContainer: Process list to include cmd1. Got %#v.", expected, processes)
+- }
+- expectedURI := "/containers/" + id + "/top"
+- if !strings.HasSuffix(fakeRT.requests[0].URL.String(), expectedURI) {
+- t.Errorf("TopContainer: Expected URI to have %q. Got %q.", expectedURI, fakeRT.requests[0].URL.String())
+- }
+-}
+-
+-func TestTopContainerNotFound(t *testing.T) {
+- client := newTestClient(&FakeRoundTripper{message: "no such container", status: http.StatusNotFound})
+- _, err := client.TopContainer("abef348", "")
+- expected := &NoSuchContainer{ID: "abef348"}
+- if !reflect.DeepEqual(err, expected) {
+- t.Errorf("StopContainer: Wrong error returned. Want %#v. Got %#v.", expected, err)
+- }
+-}
+-
+-func TestTopContainerWithPsArgs(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "no such container", status: http.StatusNotFound}
+- client := newTestClient(fakeRT)
+- client.TopContainer("abef348", "aux")
+- expectedURI := "/containers/abef348/top?ps_args=aux"
+- if !strings.HasSuffix(fakeRT.requests[0].URL.String(), expectedURI) {
+- t.Errorf("TopContainer: Expected URI to have %q. Got %q.", expectedURI, fakeRT.requests[0].URL.String())
+- }
+-}
+diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/env.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/env.go
+deleted file mode 100644
+index c54b0b0..0000000
+--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/env.go
++++ /dev/null
+@@ -1,168 +0,0 @@
+-// Copyright 2014 Docker authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the DOCKER-LICENSE file.
+-
+-package docker
+-
+-import (
+- "encoding/json"
+- "fmt"
+- "io"
+- "strconv"
+- "strings"
+-)
+-
+-// Env represents a list of key-pair represented in the form KEY=VALUE.
+-type Env []string
+-
+-// Get returns the string value of the given key.
+-func (env *Env) Get(key string) (value string) {
+- return env.Map()[key]
+-}
+-
+-// Exists checks whether the given key is defined in the internal Env
+-// representation.
+-func (env *Env) Exists(key string) bool {
+- _, exists := env.Map()[key]
+- return exists
+-}
+-
+-// GetBool returns a boolean representation of the given key. The key is false
+-// whenever its value if 0, no, false, none or an empty string. Any other value
+-// will be interpreted as true.
+-func (env *Env) GetBool(key string) (value bool) {
+- s := strings.ToLower(strings.Trim(env.Get(key), " \t"))
+- if s == "" || s == "0" || s == "no" || s == "false" || s == "none" {
+- return false
+- }
+- return true
+-}
+-
+-// SetBool defines a boolean value to the given key.
+-func (env *Env) SetBool(key string, value bool) {
+- if value {
+- env.Set(key, "1")
+- } else {
+- env.Set(key, "0")
+- }
+-}
+-
+-// GetInt returns the value of the provided key, converted to int.
+-//
+-// It the value cannot be represented as an integer, it returns -1.
+-func (env *Env) GetInt(key string) int {
+- return int(env.GetInt64(key))
+-}
+-
+-// SetInt defines an integer value to the given key.
+-func (env *Env) SetInt(key string, value int) {
+- env.Set(key, strconv.Itoa(value))
+-}
+-
+-// GetInt64 returns the value of the provided key, converted to int64.
+-//
+-// It the value cannot be represented as an integer, it returns -1.
+-func (env *Env) GetInt64(key string) int64 {
+- s := strings.Trim(env.Get(key), " \t")
+- val, err := strconv.ParseInt(s, 10, 64)
+- if err != nil {
+- return -1
+- }
+- return val
+-}
+-
+-// SetInt64 defines an integer (64-bit wide) value to the given key.
+-func (env *Env) SetInt64(key string, value int64) {
+- env.Set(key, strconv.FormatInt(value, 10))
+-}
+-
+-// GetJSON unmarshals the value of the provided key in the provided iface.
+-//
+-// iface is a value that can be provided to the json.Unmarshal function.
+-func (env *Env) GetJSON(key string, iface interface{}) error {
+- sval := env.Get(key)
+- if sval == "" {
+- return nil
+- }
+- return json.Unmarshal([]byte(sval), iface)
+-}
+-
+-// SetJSON marshals the given value to JSON format and stores it using the
+-// provided key.
+-func (env *Env) SetJSON(key string, value interface{}) error {
+- sval, err := json.Marshal(value)
+- if err != nil {
+- return err
+- }
+- env.Set(key, string(sval))
+- return nil
+-}
+-
+-// GetList returns a list of strings matching the provided key. It handles the
+-// list as a JSON representation of a list of strings.
+-//
+-// If the given key matches to a single string, it will return a list
+-// containing only the value that matches the key.
+-func (env *Env) GetList(key string) []string {
+- sval := env.Get(key)
+- if sval == "" {
+- return nil
+- }
+- var l []string
+- if err := json.Unmarshal([]byte(sval), &l); err != nil {
+- l = append(l, sval)
+- }
+- return l
+-}
+-
+-// SetList stores the given list in the provided key, after serializing it to
+-// JSON format.
+-func (env *Env) SetList(key string, value []string) error {
+- return env.SetJSON(key, value)
+-}
+-
+-// Set defines the value of a key to the given string.
+-func (env *Env) Set(key, value string) {
+- *env = append(*env, key+"="+value)
+-}
+-
+-// Decode decodes `src` as a json dictionary, and adds each decoded key-value
+-// pair to the environment.
+-//
+-// If `src` cannot be decoded as a json dictionary, an error is returned.
+-func (env *Env) Decode(src io.Reader) error {
+- m := make(map[string]interface{})
+- if err := json.NewDecoder(src).Decode(&m); err != nil {
+- return err
+- }
+- for k, v := range m {
+- env.SetAuto(k, v)
+- }
+- return nil
+-}
+-
+-// SetAuto will try to define the Set* method to call based on the given value.
+-func (env *Env) SetAuto(key string, value interface{}) {
+- if fval, ok := value.(float64); ok {
+- env.SetInt64(key, int64(fval))
+- } else if sval, ok := value.(string); ok {
+- env.Set(key, sval)
+- } else if val, err := json.Marshal(value); err == nil {
+- env.Set(key, string(val))
+- } else {
+- env.Set(key, fmt.Sprintf("%v", value))
+- }
+-}
+-
+-// Map returns the map representation of the env.
+-func (env *Env) Map() map[string]string {
+- if len(*env) == 0 {
+- return nil
+- }
+- m := make(map[string]string)
+- for _, kv := range *env {
+- parts := strings.SplitN(kv, "=", 2)
+- m[parts[0]] = parts[1]
+- }
+- return m
+-}
+diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/env_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/env_test.go
+deleted file mode 100644
+index 6d03d7b..0000000
+--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/env_test.go
++++ /dev/null
+@@ -1,349 +0,0 @@
+-// Copyright 2014 go-dockerclient authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the DOCKER-LICENSE file.
+-
+-package docker
+-
+-import (
+- "bytes"
+- "errors"
+- "reflect"
+- "sort"
+- "testing"
+-)
+-
+-func TestGet(t *testing.T) {
+- var tests = []struct {
+- input []string
+- query string
+- expected string
+- }{
+- {[]string{"PATH=/usr/bin:/bin", "PYTHONPATH=/usr/local"}, "PATH", "/usr/bin:/bin"},
+- {[]string{"PATH=/usr/bin:/bin", "PYTHONPATH=/usr/local"}, "PYTHONPATH", "/usr/local"},
+- {[]string{"PATH=/usr/bin:/bin", "PYTHONPATH=/usr/local"}, "PYTHONPATHI", ""},
+- {[]string{"WAT="}, "WAT", ""},
+- }
+- for _, tt := range tests {
+- env := Env(tt.input)
+- got := env.Get(tt.query)
+- if got != tt.expected {
+- t.Errorf("Env.Get(%q): wrong result. Want %q. Got %q", tt.query, tt.expected, got)
+- }
+- }
+-}
+-
+-func TestExists(t *testing.T) {
+- var tests = []struct {
+- input []string
+- query string
+- expected bool
+- }{
+- {[]string{"WAT=", "PYTHONPATH=/usr/local"}, "WAT", true},
+- {[]string{"PATH=/usr/bin:/bin", "PYTHONPATH=/usr/local"}, "PYTHONPATH", true},
+- {[]string{"PATH=/usr/bin:/bin", "PYTHONPATH=/usr/local"}, "PYTHONPATHI", false},
+- }
+- for _, tt := range tests {
+- env := Env(tt.input)
+- got := env.Exists(tt.query)
+- if got != tt.expected {
+- t.Errorf("Env.Exists(%q): wrong result. Want %v. Got %v", tt.query, tt.expected, got)
+- }
+- }
+-}
+-
+-func TestGetBool(t *testing.T) {
+- var tests = []struct {
+- input string
+- expected bool
+- }{
+- {"EMTPY_VAR", false}, {"ZERO_VAR", false}, {"NO_VAR", false},
+- {"FALSE_VAR", false}, {"NONE_VAR", false}, {"TRUE_VAR", true},
+- {"WAT", true}, {"PATH", true}, {"ONE_VAR", true}, {"NO_VAR_TAB", false},
+- }
+- env := Env([]string{
+- "EMPTY_VAR=", "ZERO_VAR=0", "NO_VAR=no", "FALSE_VAR=false",
+- "NONE_VAR=none", "TRUE_VAR=true", "WAT=wat", "PATH=/usr/bin:/bin",
+- "ONE_VAR=1", "NO_VAR_TAB=0 \t\t\t",
+- })
+- for _, tt := range tests {
+- got := env.GetBool(tt.input)
+- if got != tt.expected {
+- t.Errorf("Env.GetBool(%q): wrong result. Want %v. Got %v.", tt.input, tt.expected, got)
+- }
+- }
+-}
+-
+-func TestSetBool(t *testing.T) {
+- var tests = []struct {
+- input bool
+- expected string
+- }{
+- {true, "1"}, {false, "0"},
+- }
+- for _, tt := range tests {
+- var env Env
+- env.SetBool("SOME", tt.input)
+- if got := env.Get("SOME"); got != tt.expected {
+- t.Errorf("Env.SetBool(%v): wrong result. Want %q. Got %q", tt.input, tt.expected, got)
+- }
+- }
+-}
+-
+-func TestGetInt(t *testing.T) {
+- var tests = []struct {
+- input string
+- expected int
+- }{
+- {"NEGATIVE_INTEGER", -10}, {"NON_INTEGER", -1}, {"ONE", 1}, {"TWO", 2},
+- }
+- env := Env([]string{"NEGATIVE_INTEGER=-10", "NON_INTEGER=wat", "ONE=1", "TWO=2"})
+- for _, tt := range tests {
+- got := env.GetInt(tt.input)
+- if got != tt.expected {
+- t.Errorf("Env.GetInt(%q): wrong result. Want %d. Got %d", tt.input, tt.expected, got)
+- }
+- }
+-}
+-
+-func TestSetInt(t *testing.T) {
+- var tests = []struct {
+- input int
+- expected string
+- }{
+- {10, "10"}, {13, "13"}, {7, "7"}, {33, "33"},
+- {0, "0"}, {-34, "-34"},
+- }
+- for _, tt := range tests {
+- var env Env
+- env.SetInt("SOME", tt.input)
+- if got := env.Get("SOME"); got != tt.expected {
+- t.Errorf("Env.SetBool(%d): wrong result. Want %q. Got %q", tt.input, tt.expected, got)
+- }
+- }
+-}
+-
+-func TestGetInt64(t *testing.T) {
+- var tests = []struct {
+- input string
+- expected int64
+- }{
+- {"NEGATIVE_INTEGER", -10}, {"NON_INTEGER", -1}, {"ONE", 1}, {"TWO", 2},
+- }
+- env := Env([]string{"NEGATIVE_INTEGER=-10", "NON_INTEGER=wat", "ONE=1", "TWO=2"})
+- for _, tt := range tests {
+- got := env.GetInt64(tt.input)
+- if got != tt.expected {
+- t.Errorf("Env.GetInt64(%q): wrong result. Want %d. Got %d", tt.input, tt.expected, got)
+- }
+- }
+-}
+-
+-func TestSetInt64(t *testing.T) {
+- var tests = []struct {
+- input int64
+- expected string
+- }{
+- {10, "10"}, {13, "13"}, {7, "7"}, {33, "33"},
+- {0, "0"}, {-34, "-34"},
+- }
+- for _, tt := range tests {
+- var env Env
+- env.SetInt64("SOME", tt.input)
+- if got := env.Get("SOME"); got != tt.expected {
+- t.Errorf("Env.SetBool(%d): wrong result. Want %q. Got %q", tt.input, tt.expected, got)
+- }
+- }
+-}
+-
+-func TestGetJSON(t *testing.T) {
+- var p struct {
+- Name string `json:"name"`
+- Age int `json:"age"`
+- }
+- var env Env
+- env.Set("person", `{"name":"Gopher","age":5}`)
+- err := env.GetJSON("person", &p)
+- if err != nil {
+- t.Error(err)
+- }
+- if p.Name != "Gopher" {
+- t.Errorf("Env.GetJSON(%q): wrong name. Want %q. Got %q", "person", "Gopher", p.Name)
+- }
+- if p.Age != 5 {
+- t.Errorf("Env.GetJSON(%q): wrong age. Want %d. Got %d", "person", 5, p.Age)
+- }
+-}
+-
+-func TestGetJSONAbsent(t *testing.T) {
+- var l []string
+- var env Env
+- err := env.GetJSON("person", &l)
+- if err != nil {
+- t.Error(err)
+- }
+- if l != nil {
+- t.Errorf("Env.GetJSON(): get unexpected list %v", l)
+- }
+-}
+-
+-func TestGetJSONFailure(t *testing.T) {
+- var p []string
+- var env Env
+- env.Set("list-person", `{"name":"Gopher","age":5}`)
+- err := env.GetJSON("list-person", &p)
+- if err == nil {
+- t.Errorf("Env.GetJSON(%q): got unexpected <nil> error.", "list-person")
+- }
+-}
+-
+-func TestSetJSON(t *testing.T) {
+- var p1 = struct {
+- Name string `json:"name"`
+- Age int `json:"age"`
+- }{Name: "Gopher", Age: 5}
+- var env Env
+- err := env.SetJSON("person", p1)
+- if err != nil {
+- t.Error(err)
+- }
+- var p2 struct {
+- Name string `json:"name"`
+- Age int `json:"age"`
+- }
+- err = env.GetJSON("person", &p2)
+- if err != nil {
+- t.Error(err)
+- }
+- if !reflect.DeepEqual(p1, p2) {
+- t.Errorf("Env.SetJSON(%q): wrong result. Want %v. Got %v", "person", p1, p2)
+- }
+-}
+-
+-func TestSetJSONFailure(t *testing.T) {
+- var env Env
+- err := env.SetJSON("person", unmarshable{})
+- if err == nil {
+- t.Error("Env.SetJSON(): got unexpected <nil> error")
+- }
+- if env.Exists("person") {
+- t.Errorf("Env.SetJSON(): should not define the key %q, but did", "person")
+- }
+-}
+-
+-func TestGetList(t *testing.T) {
+- var tests = []struct {
+- input string
+- expected []string
+- }{
+- {"WAT=wat", []string{"wat"}},
+- {`WAT=["wat","wet","wit","wot","wut"]`, []string{"wat", "wet", "wit", "wot", "wut"}},
+- {"WAT=", nil},
+- }
+- for _, tt := range tests {
+- env := Env([]string{tt.input})
+- got := env.GetList("WAT")
+- if !reflect.DeepEqual(got, tt.expected) {
+- t.Errorf("Env.GetList(%q): wrong result. Want %v. Got %v", "WAT", tt.expected, got)
+- }
+- }
+-}
+-
+-func TestSetList(t *testing.T) {
+- list := []string{"a", "b", "c"}
+- var env Env
+- env.SetList("SOME", list)
+- if got := env.GetList("SOME"); !reflect.DeepEqual(got, list) {
+- t.Errorf("Env.SetList(%v): wrong result. Got %v", list, got)
+- }
+-}
+-
+-func TestSet(t *testing.T) {
+- var env Env
+- env.Set("PATH", "/home/bin:/bin")
+- env.Set("SOMETHING", "/usr/bin")
+- env.Set("PATH", "/bin")
+- if expected, got := "/usr/bin", env.Get("SOMETHING"); got != expected {
+- t.Errorf("Env.Set(%q): wrong result. Want %q. Got %q", expected, expected, got)
+- }
+- if expected, got := "/bin", env.Get("PATH"); got != expected {
+- t.Errorf("Env.Set(%q): wrong result. Want %q. Got %q", expected, expected, got)
+- }
+-}
+-
+-func TestDecode(t *testing.T) {
+- var tests = []struct {
+- input string
+- expectedOut []string
+- expectedErr string
+- }{
+- {
+- `{"PATH":"/usr/bin:/bin","containers":54,"wat":["123","345"]}`,
+- []string{"PATH=/usr/bin:/bin", "containers=54", `wat=["123","345"]`},
+- "",
+- },
+- {"}}", nil, "invalid character '}' looking for beginning of value"},
+- {`{}`, nil, ""},
+- }
+- for _, tt := range tests {
+- var env Env
+- err := env.Decode(bytes.NewBufferString(tt.input))
+- if tt.expectedErr == "" {
+- if err != nil {
+- t.Error(err)
+- }
+- } else if tt.expectedErr != err.Error() {
+- t.Errorf("Env.Decode(): invalid error. Want %q. Got %q.", tt.expectedErr, err)
+- }
+- got := []string(env)
+- sort.Strings(got)
+- sort.Strings(tt.expectedOut)
+- if !reflect.DeepEqual(got, tt.expectedOut) {
+- t.Errorf("Env.Decode(): wrong result. Want %v. Got %v.", tt.expectedOut, got)
+- }
+- }
+-}
+-
+-func TestSetAuto(t *testing.T) {
+- buf := bytes.NewBufferString("oi")
+- var tests = []struct {
+- input interface{}
+- expected string
+- }{
+- {10, "10"},
+- {10.3, "10"},
+- {"oi", "oi"},
+- {buf, "{}"},
+- {unmarshable{}, "{}"},
+- }
+- for _, tt := range tests {
+- var env Env
+- env.SetAuto("SOME", tt.input)
+- if got := env.Get("SOME"); got != tt.expected {
+- t.Errorf("Env.SetAuto(%v): wrong result. Want %q. Got %q", tt.input, tt.expected, got)
+- }
+- }
+-}
+-
+-func TestMap(t *testing.T) {
+- var tests = []struct {
+- input []string
+- expected map[string]string
+- }{
+- {[]string{"PATH=/usr/bin:/bin", "PYTHONPATH=/usr/local"}, map[string]string{"PATH": "/usr/bin:/bin", "PYTHONPATH": "/usr/local"}},
+- {nil, nil},
+- }
+- for _, tt := range tests {
+- env := Env(tt.input)
+- got := env.Map()
+- if !reflect.DeepEqual(got, tt.expected) {
+- t.Errorf("Env.Map(): wrong result. Want %v. Got %v", tt.expected, got)
+- }
+- }
+-}
+-
+-type unmarshable struct {
+-}
+-
+-func (unmarshable) MarshalJSON() ([]byte, error) {
+- return nil, errors.New("cannot marshal")
+-}
+diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/event.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/event.go
+deleted file mode 100644
+index 262d4ee..0000000
+--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/event.go
++++ /dev/null
+@@ -1,278 +0,0 @@
+-// Copyright 2014 go-dockerclient authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-package docker
+-
+-import (
+- "encoding/json"
+- "errors"
+- "fmt"
+- "io"
+- "math"
+- "net"
+- "net/http"
+- "net/http/httputil"
+- "sync"
+- "sync/atomic"
+- "time"
+-)
+-
+-// APIEvents represents an event returned by the API.
+-type APIEvents struct {
+- Status string `json:"Status,omitempty" yaml:"Status,omitempty"`
+- ID string `json:"ID,omitempty" yaml:"ID,omitempty"`
+- From string `json:"From,omitempty" yaml:"From,omitempty"`
+- Time int64 `json:"Time,omitempty" yaml:"Time,omitempty"`
+-}
+-
+-type eventMonitoringState struct {
+- sync.RWMutex
+- sync.WaitGroup
+- enabled bool
+- lastSeen *int64
+- C chan *APIEvents
+- errC chan error
+- listeners []chan<- *APIEvents
+-}
+-
+-const (
+- maxMonitorConnRetries = 5
+- retryInitialWaitTime = 10.
+-)
+-
+-var (
+- // ErrNoListeners is the error returned when no listeners are available
+- // to receive an event.
+- ErrNoListeners = errors.New("no listeners present to receive event")
+-
+- // ErrListenerAlreadyExists is the error returned when the listerner already
+- // exists.
+- ErrListenerAlreadyExists = errors.New("listener already exists for docker events")
+-)
+-
+-// AddEventListener adds a new listener to container events in the Docker API.
+-//
+-// The parameter is a channel through which events will be sent.
+-func (c *Client) AddEventListener(listener chan<- *APIEvents) error {
+- var err error
+- if !c.eventMonitor.isEnabled() {
+- err = c.eventMonitor.enableEventMonitoring(c)
+- if err != nil {
+- return err
+- }
+- }
+- err = c.eventMonitor.addListener(listener)
+- if err != nil {
+- return err
+- }
+- return nil
+-}
+-
+-// RemoveEventListener removes a listener from the monitor.
+-func (c *Client) RemoveEventListener(listener chan *APIEvents) error {
+- err := c.eventMonitor.removeListener(listener)
+- if err != nil {
+- return err
+- }
+- if len(c.eventMonitor.listeners) == 0 {
+- err = c.eventMonitor.disableEventMonitoring()
+- if err != nil {
+- return err
+- }
+- }
+- return nil
+-}
+-
+-func (eventState *eventMonitoringState) addListener(listener chan<- *APIEvents) error {
+- eventState.Lock()
+- defer eventState.Unlock()
+- if listenerExists(listener, &eventState.listeners) {
+- return ErrListenerAlreadyExists
+- }
+- eventState.Add(1)
+- eventState.listeners = append(eventState.listeners, listener)
+- return nil
+-}
+-
+-func (eventState *eventMonitoringState) removeListener(listener chan<- *APIEvents) error {
+- eventState.Lock()
+- defer eventState.Unlock()
+- if listenerExists(listener, &eventState.listeners) {
+- var newListeners []chan<- *APIEvents
+- for _, l := range eventState.listeners {
+- if l != listener {
+- newListeners = append(newListeners, l)
+- }
+- }
+- eventState.listeners = newListeners
+- eventState.Add(-1)
+- }
+- return nil
+-}
+-
+-func listenerExists(a chan<- *APIEvents, list *[]chan<- *APIEvents) bool {
+- for _, b := range *list {
+- if b == a {
+- return true
+- }
+- }
+- return false
+-}
+-
+-func (eventState *eventMonitoringState) enableEventMonitoring(c *Client) error {
+- eventState.Lock()
+- defer eventState.Unlock()
+- if !eventState.enabled {
+- eventState.enabled = true
+- var lastSeenDefault = int64(0)
+- eventState.lastSeen = &lastSeenDefault
+- eventState.C = make(chan *APIEvents, 100)
+- eventState.errC = make(chan error, 1)
+- go eventState.monitorEvents(c)
+- }
+- return nil
+-}
+-
+-func (eventState *eventMonitoringState) disableEventMonitoring() error {
+- eventState.Wait()
+- eventState.Lock()
+- defer eventState.Unlock()
+- if eventState.enabled {
+- eventState.enabled = false
+- close(eventState.C)
+- close(eventState.errC)
+- }
+- return nil
+-}
+-
+-func (eventState *eventMonitoringState) monitorEvents(c *Client) {
+- var err error
+- for eventState.noListeners() {
+- time.Sleep(10 * time.Millisecond)
+- }
+- if err = eventState.connectWithRetry(c); err != nil {
+- eventState.terminate(err)
+- }
+- for eventState.isEnabled() {
+- timeout := time.After(100 * time.Millisecond)
+- select {
+- case ev, ok := <-eventState.C:
+- if !ok {
+- return
+- }
+- go eventState.sendEvent(ev)
+- go eventState.updateLastSeen(ev)
+- case err = <-eventState.errC:
+- if err == ErrNoListeners {
+- eventState.terminate(nil)
+- return
+- } else if err != nil {
+- defer func() { go eventState.monitorEvents(c) }()
+- return
+- }
+- case <-timeout:
+- continue
+- }
+- }
+-}
+-
+-func (eventState *eventMonitoringState) connectWithRetry(c *Client) error {
+- var retries int
+- var err error
+- for err = c.eventHijack(atomic.LoadInt64(eventState.lastSeen), eventState.C, eventState.errC); err != nil && retries < maxMonitorConnRetries; retries++ {
+- waitTime := int64(retryInitialWaitTime * math.Pow(2, float64(retries)))
+- time.Sleep(time.Duration(waitTime) * time.Millisecond)
+- err = c.eventHijack(atomic.LoadInt64(eventState.lastSeen), eventState.C, eventState.errC)
+- }
+- return err
+-}
+-
+-func (eventState *eventMonitoringState) noListeners() bool {
+- eventState.RLock()
+- defer eventState.RUnlock()
+- return len(eventState.listeners) == 0
+-}
+-
+-func (eventState *eventMonitoringState) isEnabled() bool {
+- eventState.RLock()
+- defer eventState.RUnlock()
+- return eventState.enabled
+-}
+-
+-func (eventState *eventMonitoringState) sendEvent(event *APIEvents) {
+- eventState.RLock()
+- defer eventState.RUnlock()
+- eventState.Add(1)
+- defer eventState.Done()
+- if eventState.isEnabled() {
+- if eventState.noListeners() {
+- eventState.errC <- ErrNoListeners
+- return
+- }
+-
+- for _, listener := range eventState.listeners {
+- listener <- event
+- }
+- }
+-}
+-
+-func (eventState *eventMonitoringState) updateLastSeen(e *APIEvents) {
+- eventState.Lock()
+- defer eventState.Unlock()
+- if atomic.LoadInt64(eventState.lastSeen) < e.Time {
+- atomic.StoreInt64(eventState.lastSeen, e.Time)
+- }
+-}
+-
+-func (eventState *eventMonitoringState) terminate(err error) {
+- eventState.disableEventMonitoring()
+-}
+-
+-func (c *Client) eventHijack(startTime int64, eventChan chan *APIEvents, errChan chan error) error {
+- uri := "/events"
+- if startTime != 0 {
+- uri += fmt.Sprintf("?since=%d", startTime)
+- }
+- protocol := c.endpointURL.Scheme
+- address := c.endpointURL.Path
+- if protocol != "unix" {
+- protocol = "tcp"
+- address = c.endpointURL.Host
+- }
+- dial, err := net.Dial(protocol, address)
+- if err != nil {
+- return err
+- }
+- conn := httputil.NewClientConn(dial, nil)
+- req, err := http.NewRequest("GET", uri, nil)
+- if err != nil {
+- return err
+- }
+- res, err := conn.Do(req)
+- if err != nil {
+- return err
+- }
+- go func(res *http.Response, conn *httputil.ClientConn) {
+- defer conn.Close()
+- defer res.Body.Close()
+- decoder := json.NewDecoder(res.Body)
+- for {
+- var event APIEvents
+- if err = decoder.Decode(&event); err != nil {
+- if err == io.EOF || err == io.ErrUnexpectedEOF {
+- break
+- }
+- errChan <- err
+- }
+- if event.Time == 0 {
+- continue
+- }
+- if !c.eventMonitor.isEnabled() {
+- return
+- }
+- c.eventMonitor.C <- &event
+- }
+- }(res, conn)
+- return nil
+-}
+diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/event_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/event_test.go
+deleted file mode 100644
+index cb54f4a..0000000
+--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/event_test.go
++++ /dev/null
+@@ -1,93 +0,0 @@
+-// Copyright 2014 go-dockerclient authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-package docker
+-
+-import (
+- "bufio"
+- "fmt"
+- "net/http"
+- "net/http/httptest"
+- "strings"
+- "testing"
+- "time"
+-)
+-
+-func TestEventListeners(t *testing.T) {
+- response := `{"status":"create","id":"dfdf82bd3881","from":"base:latest","time":1374067924}
+-{"status":"start","id":"dfdf82bd3881","from":"base:latest","time":1374067924}
+-{"status":"stop","id":"dfdf82bd3881","from":"base:latest","time":1374067966}
+-{"status":"destroy","id":"dfdf82bd3881","from":"base:latest","time":1374067970}
+-`
+-
+- var req http.Request
+- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+- rsc := bufio.NewScanner(strings.NewReader(response))
+- for rsc.Scan() {
+- w.Write([]byte(rsc.Text()))
+- w.(http.Flusher).Flush()
+- time.Sleep(10 * time.Millisecond)
+- }
+- req = *r
+- }))
+- defer server.Close()
+-
+- client, err := NewClient(server.URL)
+- if err != nil {
+- t.Errorf("Failed to create client: %s", err)
+- }
+- client.SkipServerVersionCheck = true
+-
+- listener := make(chan *APIEvents, 10)
+- defer func() { time.Sleep(10 * time.Millisecond); client.RemoveEventListener(listener) }()
+-
+- err = client.AddEventListener(listener)
+- if err != nil {
+- t.Errorf("Failed to add event listener: %s", err)
+- }
+-
+- timeout := time.After(1 * time.Second)
+- var count int
+-
+- for {
+- select {
+- case msg := <-listener:
+- t.Logf("Recieved: %s", *msg)
+- count++
+- err = checkEvent(count, msg)
+- if err != nil {
+- t.Fatalf("Check event failed: %s", err)
+- }
+- if count == 4 {
+- return
+- }
+- case <-timeout:
+- t.Fatal("TestAddEventListener timed out waiting on events")
+- }
+- }
+-}
+-
+-func checkEvent(index int, event *APIEvents) error {
+- if event.ID != "dfdf82bd3881" {
+- return fmt.Errorf("event ID did not match. Expected dfdf82bd3881 got %s", event.ID)
+- }
+- if event.From != "base:latest" {
+- return fmt.Errorf("event from did not match. Expected base:latest got %s", event.From)
+- }
+- var status string
+- switch index {
+- case 1:
+- status = "create"
+- case 2:
+- status = "start"
+- case 3:
+- status = "stop"
+- case 4:
+- status = "destroy"
+- }
+- if event.Status != status {
+- return fmt.Errorf("event status did not match. Expected %s got %s", status, event.Status)
+- }
+- return nil
+-}
+diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/example_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/example_test.go
+deleted file mode 100644
+index 8c2c719..0000000
+--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/example_test.go
++++ /dev/null
+@@ -1,168 +0,0 @@
+-// Copyright 2014 go-dockerclient authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-package docker_test
+-
+-import (
+- "archive/tar"
+- "bytes"
+- "fmt"
+- "io"
+- "log"
+- "time"
+-
+- "github.com/fsouza/go-dockerclient"
+-)
+-
+-func ExampleClient_AttachToContainer() {
+- client, err := docker.NewClient("http://localhost:4243")
+- if err != nil {
+- log.Fatal(err)
+- }
+- client.SkipServerVersionCheck = true
+- // Reading logs from container a84849 and sending them to buf.
+- var buf bytes.Buffer
+- err = client.AttachToContainer(docker.AttachToContainerOptions{
+- Container: "a84849",
+- OutputStream: &buf,
+- Logs: true,
+- Stdout: true,
+- Stderr: true,
+- })
+- if err != nil {
+- log.Fatal(err)
+- }
+- log.Println(buf.String())
+- buf.Reset()
+- err = client.AttachToContainer(docker.AttachToContainerOptions{
+- Container: "a84849",
+- OutputStream: &buf,
+- Stdout: true,
+- Stream: true,
+- })
+- if err != nil {
+- log.Fatal(err)
+- }
+- log.Println(buf.String())
+-}
+-
+-func ExampleClient_CopyFromContainer() {
+- client, err := docker.NewClient("http://localhost:4243")
+- if err != nil {
+- log.Fatal(err)
+- }
+- cid := "a84849"
+- var buf bytes.Buffer
+- filename := "/tmp/output.txt"
+- err = client.CopyFromContainer(docker.CopyFromContainerOptions{
+- Container: cid,
+- Resource: filename,
+- OutputStream: &buf,
+- })
+- if err != nil {
+- log.Fatalf("Error while copying from %s: %s\n", cid, err)
+- }
+- content := new(bytes.Buffer)
+- r := bytes.NewReader(buf.Bytes())
+- tr := tar.NewReader(r)
+- tr.Next()
+- if err != nil && err != io.EOF {
+- log.Fatal(err)
+- }
+- if _, err := io.Copy(content, tr); err != nil {
+- log.Fatal(err)
+- }
+- log.Println(buf.String())
+-}
+-
+-func ExampleClient_BuildImage() {
+- client, err := docker.NewClient("http://localhost:4243")
+- if err != nil {
+- log.Fatal(err)
+- }
+-
+- t := time.Now()
+- inputbuf, outputbuf := bytes.NewBuffer(nil), bytes.NewBuffer(nil)
+- tr := tar.NewWriter(inputbuf)
+- tr.WriteHeader(&tar.Header{Name: "Dockerfile", Size: 10, ModTime: t, AccessTime: t, ChangeTime: t})
+- tr.Write([]byte("FROM base\n"))
+- tr.Close()
+- opts := docker.BuildImageOptions{
+- Name: "test",
+- InputStream: inputbuf,
+- OutputStream: outputbuf,
+- }
+- if err := client.BuildImage(opts); err != nil {
+- log.Fatal(err)
+- }
+-}
+-
+-func ExampleClient_ListenEvents() {
+- client, err := docker.NewClient("http://localhost:4243")
+- if err != nil {
+- log.Fatal(err)
+- }
+-
+- listener := make(chan *docker.APIEvents)
+- err = client.AddEventListener(listener)
+- if err != nil {
+- log.Fatal(err)
+- }
+-
+- defer func() {
+-
+- err = client.RemoveEventListener(listener)
+- if err != nil {
+- log.Fatal(err)
+- }
+-
+- }()
+-
+- timeout := time.After(1 * time.Second)
+-
+- for {
+- select {
+- case msg := <-listener:
+- log.Println(msg)
+- case <-timeout:
+- break
+- }
+- }
+-
+-}
+-
+-func ExampleEnv_Map() {
+- e := docker.Env([]string{"A=1", "B=2", "C=3"})
+- envs := e.Map()
+- for k, v := range envs {
+- fmt.Printf("%s=%q\n", k, v)
+- }
+-}
+-
+-func ExampleEnv_SetJSON() {
+- type Person struct {
+- Name string
+- Age int
+- }
+- p := Person{Name: "Gopher", Age: 4}
+- var e docker.Env
+- err := e.SetJSON("person", p)
+- if err != nil {
+- log.Fatal(err)
+- }
+-}
+-
+-func ExampleEnv_GetJSON() {
+- type Person struct {
+- Name string
+- Age int
+- }
+- p := Person{Name: "Gopher", Age: 4}
+- var e docker.Env
+- e.Set("person", `{"name":"Gopher","age":4}`)
+- err := e.GetJSON("person", &p)
+- if err != nil {
+- log.Fatal(err)
+- }
+-}
+diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/exec.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/exec.go
+deleted file mode 100644
+index 62a0a80..0000000
+--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/exec.go
++++ /dev/null
+@@ -1,126 +0,0 @@
+-// Copyright 2014 go-dockerclient authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-// Docs can currently be found at https://github.com/docker/docker/blob/master/docs/sources/reference/api/docker_remote_api_v1.15.md#exec-create
+-
+-package docker
+-
+-import (
+- "encoding/json"
+- "fmt"
+- "io"
+- "net/http"
+- "net/url"
+- "strconv"
+-)
+-
+-// CreateExecOptions specify parameters to the CreateExecContainer function.
+-//
+-// See http://goo.gl/8izrzI for more details
+-type CreateExecOptions struct {
+- AttachStdin bool `json:"AttachStdin,omitempty" yaml:"AttachStdin,omitempty"`
+- AttachStdout bool `json:"AttachStdout,omitempty" yaml:"AttachStdout,omitempty"`
+- AttachStderr bool `json:"AttachStderr,omitempty" yaml:"AttachStderr,omitempty"`
+- Tty bool `json:"Tty,omitempty" yaml:"Tty,omitempty"`
+- Cmd []string `json:"Cmd,omitempty" yaml:"Cmd,omitempty"`
+- Container string `json:"Container,omitempty" yaml:"Container,omitempty"`
+-}
+-
+-// StartExecOptions specify parameters to the StartExecContainer function.
+-//
+-// See http://goo.gl/JW8Lxl for more details
+-type StartExecOptions struct {
+- Detach bool `json:"Detach,omitempty" yaml:"Detach,omitempty"`
+-
+- Tty bool `json:"Tty,omitempty" yaml:"Tty,omitempty"`
+-
+- InputStream io.Reader `qs:"-"`
+- OutputStream io.Writer `qs:"-"`
+- ErrorStream io.Writer `qs:"-"`
+-
+- // Use raw terminal? Usually true when the container contains a TTY.
+- RawTerminal bool `qs:"-"`
+-
+- // If set, after a successful connect, a sentinel will be sent and then the
+- // client will block on receive before continuing.
+- //
+- // It must be an unbuffered channel. Using a buffered channel can lead
+- // to unexpected behavior.
+- Success chan struct{} `json:"-"`
+-}
+-
+-type Exec struct {
+- Id string `json:"Id,omitempty" yaml:"Id,omitempty"`
+-}
+-
+-// CreateExec sets up an exec instance in a running container `id`, returning the exec
+-// instance, or an error in case of failure.
+-//
+-// See http://goo.gl/8izrzI for more details
+-func (c *Client) CreateExec(opts CreateExecOptions) (*Exec, error) {
+- path := fmt.Sprintf("/containers/%s/exec", opts.Container)
+- body, status, err := c.do("POST", path, opts)
+- if status == http.StatusNotFound {
+- return nil, &NoSuchContainer{ID: opts.Container}
+- }
+- if err != nil {
+- return nil, err
+- }
+- var exec Exec
+- err = json.Unmarshal(body, &exec)
+- if err != nil {
+- return nil, err
+- }
+-
+- return &exec, nil
+-}
+-
+-// Starts a previously set up exec instance id. If opts.Detach is true, it returns
+-// after starting the exec command. Otherwise, it sets up an interactive session
+-// with the exec command.
+-//
+-// See http://goo.gl/JW8Lxl for more details
+-func (c *Client) StartExec(id string, opts StartExecOptions) error {
+- if id == "" {
+- return &NoSuchExec{ID: id}
+- }
+-
+- path := fmt.Sprintf("/exec/%s/start", id)
+-
+- if opts.Detach {
+- _, status, err := c.do("POST", path, opts)
+- if status == http.StatusNotFound {
+- return &NoSuchExec{ID: id}
+- }
+- if err != nil {
+- return err
+- }
+- return nil
+- }
+-
+- return c.hijack("POST", path, opts.Success, opts.RawTerminal, opts.InputStream, opts.ErrorStream, opts.OutputStream, opts)
+-}
+-
+-// Resizes the tty session used by the exec command id. This API is valid only
+-// if Tty was specified as part of creating and starting the exec command.
+-//
+-// See http://goo.gl/YDSx1f for more details
+-func (c *Client) ResizeExecTTY(id string, height, width int) error {
+- params := make(url.Values)
+- params.Set("h", strconv.Itoa(height))
+- params.Set("w", strconv.Itoa(width))
+-
+- path := fmt.Sprintf("/exec/%s/resize?%s", id, params.Encode())
+- _, _, err := c.do("POST", path, nil)
+- return err
+-}
+-
+-// NoSuchExec is the error returned when a given exec instance does not exist.
+-type NoSuchExec struct {
+- ID string
+-}
+-
+-func (err *NoSuchExec) Error() string {
+- return "No such exec instance: " + err.ID
+-}
+diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/exec_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/exec_test.go
+deleted file mode 100644
+index 70fa64b..0000000
+--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/exec_test.go
++++ /dev/null
+@@ -1,128 +0,0 @@
+-// Copyright 2014 go-dockerclient authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-package docker
+-
+-import (
+- "bytes"
+- "encoding/json"
+- "net/http"
+- "net/http/httptest"
+- "net/url"
+- "strings"
+- "testing"
+-)
+-
+-func TestExecCreate(t *testing.T) {
+- jsonContainer := `{"Id": "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"}`
+- var expected struct{ Id string }
+- err := json.Unmarshal([]byte(jsonContainer), &expected)
+- if err != nil {
+- t.Fatal(err)
+- }
+- fakeRT := &FakeRoundTripper{message: jsonContainer, status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- config := CreateExecOptions{
+- Container: "test",
+- AttachStdin: true,
+- AttachStdout: true,
+- AttachStderr: false,
+- Tty: false,
+- Cmd: []string{"touch", "/tmp/file"},
+- }
+- execObj, err := client.CreateExec(config)
+- if err != nil {
+- t.Fatal(err)
+- }
+- expectedId := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
+- if execObj.Id != expectedId {
+- t.Errorf("ExecCreate: wrong ID. Want %q. Got %q.", expectedId, execObj.Id)
+- }
+- req := fakeRT.requests[0]
+- if req.Method != "POST" {
+- t.Errorf("ExecCreate: wrong HTTP method. Want %q. Got %q.", "POST", req.Method)
+- }
+- expectedURL, _ := url.Parse(client.getURL("/containers/test/exec"))
+- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
+- t.Errorf("ExecCreate: Wrong path in request. Want %q. Got %q.", expectedURL.Path, gotPath)
+- }
+- var gotBody struct{ Id string }
+- err = json.NewDecoder(req.Body).Decode(&gotBody)
+- if err != nil {
+- t.Fatal(err)
+- }
+-}
+-
+-func TestExecStartDetached(t *testing.T) {
+- execId := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
+- fakeRT := &FakeRoundTripper{status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- config := StartExecOptions{
+- Detach: true,
+- }
+- err := client.StartExec(execId, config)
+- if err != nil {
+- t.Fatal(err)
+- }
+- req := fakeRT.requests[0]
+- if req.Method != "POST" {
+- t.Errorf("ExecStart: wrong HTTP method. Want %q. Got %q.", "POST", req.Method)
+- }
+- expectedURL, _ := url.Parse(client.getURL("/exec/" + execId + "/start"))
+- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
+- t.Errorf("ExecCreate: Wrong path in request. Want %q. Got %q.", expectedURL.Path, gotPath)
+- }
+- t.Log(req.Body)
+- var gotBody struct{ Detach bool }
+- err = json.NewDecoder(req.Body).Decode(&gotBody)
+- if err != nil {
+- t.Fatal(err)
+- }
+- if !gotBody.Detach {
+- t.Fatal("Expected Detach in StartExecOptions to be true")
+- }
+-}
+-
+-func TestExecStartAndAttach(t *testing.T) {
+- var reader = strings.NewReader("send value")
+- var req http.Request
+- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+- w.Write([]byte{1, 0, 0, 0, 0, 0, 0, 5})
+- w.Write([]byte("hello"))
+- req = *r
+- }))
+- defer server.Close()
+- client, _ := NewClient(server.URL)
+- client.SkipServerVersionCheck = true
+- var stdout, stderr bytes.Buffer
+- success := make(chan struct{})
+- execId := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
+- opts := StartExecOptions{
+- OutputStream: &stdout,
+- ErrorStream: &stderr,
+- InputStream: reader,
+- RawTerminal: true,
+- Success: success,
+- }
+- go client.StartExec(execId, opts)
+- <-success
+-}
+-
+-func TestExecResize(t *testing.T) {
+- execId := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
+- fakeRT := &FakeRoundTripper{status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- err := client.ResizeExecTTY(execId, 10, 20)
+- if err != nil {
+- t.Fatal(err)
+- }
+- req := fakeRT.requests[0]
+- if req.Method != "POST" {
+- t.Errorf("ExecStart: wrong HTTP method. Want %q. Got %q.", "POST", req.Method)
+- }
+- expectedURL, _ := url.Parse(client.getURL("/exec/" + execId + "/resize?h=10&w=20"))
+- if gotPath := req.URL.RequestURI(); gotPath != expectedURL.RequestURI() {
+- t.Errorf("ExecCreate: Wrong path in request. Want %q. Got %q.", expectedURL.Path, gotPath)
+- }
+-}
+diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/image.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/image.go
+deleted file mode 100644
+index e1fbb23..0000000
+--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/image.go
++++ /dev/null
+@@ -1,417 +0,0 @@
+-// Copyright 2014 go-dockerclient authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-package docker
+-
+-import (
+- "bytes"
+- "encoding/base64"
+- "encoding/json"
+- "errors"
+- "fmt"
+- "io"
+- "io/ioutil"
+- "net/http"
+- "net/url"
+- "os"
+- "time"
+-)
+-
+-// APIImages represent an image returned in the ListImages call.
+-type APIImages struct {
+- ID string `json:"Id" yaml:"Id"`
+- RepoTags []string `json:"RepoTags,omitempty" yaml:"RepoTags,omitempty"`
+- Created int64 `json:"Created,omitempty" yaml:"Created,omitempty"`
+- Size int64 `json:"Size,omitempty" yaml:"Size,omitempty"`
+- VirtualSize int64 `json:"VirtualSize,omitempty" yaml:"VirtualSize,omitempty"`
+- ParentId string `json:"ParentId,omitempty" yaml:"ParentId,omitempty"`
+-}
+-
+-type Image struct {
+- ID string `json:"Id" yaml:"Id"`
+- Parent string `json:"Parent,omitempty" yaml:"Parent,omitempty"`
+- Comment string `json:"Comment,omitempty" yaml:"Comment,omitempty"`
+- Created time.Time `json:"Created,omitempty" yaml:"Created,omitempty"`
+- Container string `json:"Container,omitempty" yaml:"Container,omitempty"`
+- ContainerConfig Config `json:"ContainerConfig,omitempty" yaml:"ContainerConfig,omitempty"`
+- DockerVersion string `json:"DockerVersion,omitempty" yaml:"DockerVersion,omitempty"`
+- Author string `json:"Author,omitempty" yaml:"Author,omitempty"`
+- Config *Config `json:"Config,omitempty" yaml:"Config,omitempty"`
+- Architecture string `json:"Architecture,omitempty" yaml:"Architecture,omitempty"`
+- Size int64 `json:"Size,omitempty" yaml:"Size,omitempty"`
+-}
+-
+-// ImageHistory represent a layer in an image's history returned by the
+-// ImageHistory call.
+-type ImageHistory struct {
+- ID string `json:"Id" yaml:"Id"`
+- Tags []string `json:"Tags,omitempty" yaml:"Tags,omitempty"`
+- Created int64 `json:"Created,omitempty" yaml:"Created,omitempty"`
+- CreatedBy string `json:"CreatedBy,omitempty" yaml:"CreatedBy,omitempty"`
+- Size int64 `json:"Size,omitempty" yaml:"Size,omitempty"`
+-}
+-
+-type ImagePre012 struct {
+- ID string `json:"id"`
+- Parent string `json:"parent,omitempty"`
+- Comment string `json:"comment,omitempty"`
+- Created time.Time `json:"created"`
+- Container string `json:"container,omitempty"`
+- ContainerConfig Config `json:"container_config,omitempty"`
+- DockerVersion string `json:"docker_version,omitempty"`
+- Author string `json:"author,omitempty"`
+- Config *Config `json:"config,omitempty"`
+- Architecture string `json:"architecture,omitempty"`
+- Size int64 `json:"size,omitempty"`
+-}
+-
+-var (
+- // ErrNoSuchImage is the error returned when the image does not exist.
+- ErrNoSuchImage = errors.New("no such image")
+-
+- // ErrMissingRepo is the error returned when the remote repository is
+- // missing.
+- ErrMissingRepo = errors.New("missing remote repository e.g. 'github.com/user/repo'")
+-
+- // ErrMissingOutputStream is the error returned when no output stream
+- // is provided to some calls, like BuildImage.
+- ErrMissingOutputStream = errors.New("missing output stream")
+-)
+-
+-// ListImages returns the list of available images in the server.
+-//
+-// See http://goo.gl/VmcR6v for more details.
+-func (c *Client) ListImages(all bool) ([]APIImages, error) {
+- path := "/images/json?all="
+- if all {
+- path += "1"
+- } else {
+- path += "0"
+- }
+- body, _, err := c.do("GET", path, nil)
+- if err != nil {
+- return nil, err
+- }
+- var images []APIImages
+- err = json.Unmarshal(body, &images)
+- if err != nil {
+- return nil, err
+- }
+- return images, nil
+-}
+-
+-// ImageHistory returns the history of the image by its name or ID.
+-//
+-// See http://goo.gl/2oJmNs for more details.
+-func (c *Client) ImageHistory(name string) ([]ImageHistory, error) {
+- body, status, err := c.do("GET", "/images/"+name+"/history", nil)
+- if status == http.StatusNotFound {
+- return nil, ErrNoSuchImage
+- }
+- if err != nil {
+- return nil, err
+- }
+- var history []ImageHistory
+- err = json.Unmarshal(body, &history)
+- if err != nil {
+- return nil, err
+- }
+- return history, nil
+-}
+-
+-// RemoveImage removes an image by its name or ID.
+-//
+-// See http://goo.gl/znj0wM for more details.
+-func (c *Client) RemoveImage(name string) error {
+- _, status, err := c.do("DELETE", "/images/"+name, nil)
+- if status == http.StatusNotFound {
+- return ErrNoSuchImage
+- }
+- return err
+-}
+-
+-// InspectImage returns an image by its name or ID.
+-//
+-// See http://goo.gl/Q112NY for more details.
+-func (c *Client) InspectImage(name string) (*Image, error) {
+- body, status, err := c.do("GET", "/images/"+name+"/json", nil)
+- if status == http.StatusNotFound {
+- return nil, ErrNoSuchImage
+- }
+- if err != nil {
+- return nil, err
+- }
+-
+- var image Image
+-
+- // if the caller elected to skip checking the server's version, assume it's the latest
+- if c.SkipServerVersionCheck || c.expectedApiVersion.GreaterThanOrEqualTo(apiVersion_1_12) {
+- err = json.Unmarshal(body, &image)
+- if err != nil {
+- return nil, err
+- }
+- } else {
+- var imagePre012 ImagePre012
+- err = json.Unmarshal(body, &imagePre012)
+- if err != nil {
+- return nil, err
+- }
+-
+- image.ID = imagePre012.ID
+- image.Parent = imagePre012.Parent
+- image.Comment = imagePre012.Comment
+- image.Created = imagePre012.Created
+- image.Container = imagePre012.Container
+- image.ContainerConfig = imagePre012.ContainerConfig
+- image.DockerVersion = imagePre012.DockerVersion
+- image.Author = imagePre012.Author
+- image.Config = imagePre012.Config
+- image.Architecture = imagePre012.Architecture
+- image.Size = imagePre012.Size
+- }
+-
+- return &image, nil
-}
-diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/container/v1beta1/container-gen.go b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/container/v1beta1/container-gen.go
-deleted file mode 100644
-index c9fce64..0000000
---- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/container/v1beta1/container-gen.go
-+++ /dev/null
-@@ -1,1007 +0,0 @@
--// Package container provides access to the Google Container Engine API.
+-
+-// PushImageOptions represents options to use in the PushImage method.
-//
--// Usage example:
+-// See http://goo.gl/pN8A3P for more details.
+-type PushImageOptions struct {
+- // Name of the image
+- Name string
+-
+- // Tag of the image
+- Tag string
+-
+- // Registry server to push the image
+- Registry string
+-
+- OutputStream io.Writer `qs:"-"`
+- RawJSONStream bool `qs:"-"`
+-}
+-
+-// AuthConfiguration represents authentication options to use in the PushImage
+-// method. It represents the authentication in the Docker index server.
+-type AuthConfiguration struct {
+- Username string `json:"username,omitempty"`
+- Password string `json:"password,omitempty"`
+- Email string `json:"email,omitempty"`
+-}
+-
+-// PushImage pushes an image to a remote registry, logging progress to w.
-//
--// import "code.google.com/p/google-api-go-client/container/v1beta1"
--// ...
--// containerService, err := container.New(oauthHttpClient)
--package container
+-// An empty instance of AuthConfiguration may be used for unauthenticated
+-// pushes.
+-//
+-// See http://goo.gl/pN8A3P for more details.
+-func (c *Client) PushImage(opts PushImageOptions, auth AuthConfiguration) error {
+- if opts.Name == "" {
+- return ErrNoSuchImage
+- }
+- name := opts.Name
+- opts.Name = ""
+- path := "/images/" + name + "/push?" + queryString(&opts)
+- var headers = make(map[string]string)
+- var buf bytes.Buffer
+- json.NewEncoder(&buf).Encode(auth)
+-
+- headers["X-Registry-Auth"] = base64.URLEncoding.EncodeToString(buf.Bytes())
+-
+- return c.stream("POST", path, true, opts.RawJSONStream, headers, nil, opts.OutputStream, nil)
+-}
+-
+-// PullImageOptions present the set of options available for pulling an image
+-// from a registry.
+-//
+-// See http://goo.gl/ACyYNS for more details.
+-type PullImageOptions struct {
+- Repository string `qs:"fromImage"`
+- Registry string
+- Tag string
+- OutputStream io.Writer `qs:"-"`
+- RawJSONStream bool `qs:"-"`
+-}
+-
+-// PullImage pulls an image from a remote registry, logging progress to w.
+-//
+-// See http://goo.gl/ACyYNS for more details.
+-func (c *Client) PullImage(opts PullImageOptions, auth AuthConfiguration) error {
+- if opts.Repository == "" {
+- return ErrNoSuchImage
+- }
+-
+- var headers = make(map[string]string)
+- var buf bytes.Buffer
+- json.NewEncoder(&buf).Encode(auth)
+- headers["X-Registry-Auth"] = base64.URLEncoding.EncodeToString(buf.Bytes())
+-
+- return c.createImage(queryString(&opts), headers, nil, opts.OutputStream, opts.RawJSONStream)
+-}
+-
+-func (c *Client) createImage(qs string, headers map[string]string, in io.Reader, w io.Writer, rawJSONStream bool) error {
+- path := "/images/create?" + qs
+- return c.stream("POST", path, true, rawJSONStream, headers, in, w, nil)
+-}
+-
+-// LoadImageOptions represents the options for LoadImage Docker API Call
+-//
+-// See http://goo.gl/Y8NNCq for more details.
+-type LoadImageOptions struct {
+- InputStream io.Reader
+-}
+-
+-// LoadImage imports a tarball docker image
+-//
+-// See http://goo.gl/Y8NNCq for more details.
+-func (c *Client) LoadImage(opts LoadImageOptions) error {
+- return c.stream("POST", "/images/load", true, false, nil, opts.InputStream, nil, nil)
+-}
+-
+-// ExportImageOptions represent the options for ExportImage Docker API call
+-//
+-// See http://goo.gl/mi6kvk for more details.
+-type ExportImageOptions struct {
+- Name string
+- OutputStream io.Writer
+-}
+-
+-// ExportImage exports an image (as a tar file) into the stream
+-//
+-// See http://goo.gl/mi6kvk for more details.
+-func (c *Client) ExportImage(opts ExportImageOptions) error {
+- return c.stream("GET", fmt.Sprintf("/images/%s/get", opts.Name), true, false, nil, nil, opts.OutputStream, nil)
+-}
+-
+-// ImportImageOptions present the set of informations available for importing
+-// an image from a source file or the stdin.
+-//
+-// See http://goo.gl/PhBKnS for more details.
+-type ImportImageOptions struct {
+- Repository string `qs:"repo"`
+- Source string `qs:"fromSrc"`
+- Tag string `qs:"tag"`
+-
+- InputStream io.Reader `qs:"-"`
+- OutputStream io.Writer `qs:"-"`
+-}
+-
+-// ImportImage imports an image from a url, a file or stdin
+-//
+-// See http://goo.gl/PhBKnS for more details.
+-func (c *Client) ImportImage(opts ImportImageOptions) error {
+- if opts.Repository == "" {
+- return ErrNoSuchImage
+- }
+- if opts.Source != "-" {
+- opts.InputStream = nil
+- }
+- if opts.Source != "-" && !isURL(opts.Source) {
+- f, err := os.Open(opts.Source)
+- if err != nil {
+- return err
+- }
+- b, err := ioutil.ReadAll(f)
+- opts.InputStream = bytes.NewBuffer(b)
+- opts.Source = "-"
+- }
+- return c.createImage(queryString(&opts), nil, opts.InputStream, opts.OutputStream, false)
+-}
+-
+-// BuildImageOptions present the set of informations available for building an
+-// image from a tarfile with a Dockerfile in it.
+-//
+-// For more details about the Docker building process, see
+-// http://goo.gl/tlPXPu.
+-type BuildImageOptions struct {
+- Name string `qs:"t"`
+- NoCache bool `qs:"nocache"`
+- SuppressOutput bool `qs:"q"`
+- RmTmpContainer bool `qs:"rm"`
+- ForceRmTmpContainer bool `qs:"forcerm"`
+- InputStream io.Reader `qs:"-"`
+- OutputStream io.Writer `qs:"-"`
+- RawJSONStream bool `qs:"-"`
+- Remote string `qs:"remote"`
+-}
+-
+-// BuildImage builds an image from a tarball's url or a Dockerfile in the input
+-// stream.
+-//
+-// See http://goo.gl/wRsW76 for more details.
+-func (c *Client) BuildImage(opts BuildImageOptions) error {
+- if opts.OutputStream == nil {
+- return ErrMissingOutputStream
+- }
+- var headers map[string]string
+- if opts.Remote != "" && opts.Name == "" {
+- opts.Name = opts.Remote
+- }
+- if opts.InputStream != nil {
+- headers = map[string]string{"Content-Type": "application/tar"}
+- } else if opts.Remote == "" {
+- return ErrMissingRepo
+- }
+- return c.stream("POST", fmt.Sprintf("/build?%s",
+- queryString(&opts)), true, opts.RawJSONStream, headers, opts.InputStream, opts.OutputStream, nil)
+-}
+-
+-// TagImageOptions present the set of options to tag an image.
+-//
+-// See http://goo.gl/5g6qFy for more details.
+-type TagImageOptions struct {
+- Repo string
+- Tag string
+- Force bool
+-}
+-
+-// TagImage adds a tag to the image identified by the given name.
+-//
+-// See http://goo.gl/5g6qFy for more details.
+-func (c *Client) TagImage(name string, opts TagImageOptions) error {
+- if name == "" {
+- return ErrNoSuchImage
+- }
+- _, status, err := c.do("POST", fmt.Sprintf("/images/"+name+"/tag?%s",
+- queryString(&opts)), nil)
+- if status == http.StatusNotFound {
+- return ErrNoSuchImage
+- }
+-
+- return err
+-}
+-
+-func isURL(u string) bool {
+- p, err := url.Parse(u)
+- if err != nil {
+- return false
+- }
+- return p.Scheme == "http" || p.Scheme == "https"
+-}
+-
+-// APIImageSearch reflect the result of a search on the dockerHub
+-//
+-// See http://goo.gl/xI5lLZ for more details.
+-type APIImageSearch struct {
+- Description string `json:"description,omitempty" yaml:"description,omitempty"`
+- IsOfficial bool `json:"is_official,omitempty" yaml:"is_official,omitempty"`
+- IsAutomated bool `json:"is_automated,omitempty" yaml:"is_automated,omitempty"`
+- Name string `json:"name,omitempty" yaml:"name,omitempty"`
+- StarCount int `json:"star_count,omitempty" yaml:"star_count,omitempty"`
+-}
+-
+-// SearchImages search the docker hub with a specific given term.
+-//
+-// See http://goo.gl/xI5lLZ for more details.
+-func (c *Client) SearchImages(term string) ([]APIImageSearch, error) {
+- body, _, err := c.do("GET", "/images/search?term="+term, nil)
+- if err != nil {
+- return nil, err
+- }
+- var searchResult []APIImageSearch
+- err = json.Unmarshal(body, &searchResult)
+- if err != nil {
+- return nil, err
+- }
+- return searchResult, nil
+-}
+diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/image_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/image_test.go
+deleted file mode 100644
+index 5a7b2de..0000000
+--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/image_test.go
++++ /dev/null
+@@ -1,861 +0,0 @@
+-// Copyright 2014 go-dockerclient authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-package docker
-
-import (
- "bytes"
-- "code.google.com/p/google-api-go-client/googleapi"
+- "encoding/base64"
- "encoding/json"
-- "errors"
-- "fmt"
-- "io"
+- "io/ioutil"
- "net/http"
- "net/url"
-- "strconv"
+- "os"
+- "reflect"
- "strings"
+- "testing"
-)
-
--// Always reference these packages, just in case the auto-generated code
--// below doesn't.
--var _ = bytes.NewBuffer
--var _ = strconv.Itoa
--var _ = fmt.Sprintf
--var _ = json.NewDecoder
--var _ = io.Copy
--var _ = url.Parse
--var _ = googleapi.Version
--var _ = errors.New
--var _ = strings.Replace
+-func newTestClient(rt *FakeRoundTripper) Client {
+- endpoint := "http://localhost:4243"
+- u, _ := parseEndpoint("http://localhost:4243")
+- client := Client{
+- HTTPClient: &http.Client{Transport: rt},
+- endpoint: endpoint,
+- endpointURL: u,
+- SkipServerVersionCheck: true,
+- }
+- return client
+-}
-
--const apiId = "container:v1beta1"
--const apiName = "container"
--const apiVersion = "v1beta1"
--const basePath = "https://www.googleapis.com/container/v1beta1/projects/"
+-type stdoutMock struct {
+- *bytes.Buffer
+-}
-
--// OAuth2 scopes used by this API.
--const (
-- // View and manage your data across Google Cloud Platform services
-- CloudPlatformScope = "https://www.googleapis.com/auth/cloud-platform"
--)
+-func (m stdoutMock) Close() error {
+- return nil
+-}
-
--func New(client *http.Client) (*Service, error) {
-- if client == nil {
-- return nil, errors.New("client is nil")
+-type stdinMock struct {
+- *bytes.Buffer
+-}
+-
+-func (m stdinMock) Close() error {
+- return nil
+-}
+-
+-func TestListImages(t *testing.T) {
+- body := `[
+- {
+- "Repository":"base",
+- "Tag":"ubuntu-12.10",
+- "Id":"b750fe79269d",
+- "Created":1364102658
+- },
+- {
+- "Repository":"base",
+- "Tag":"ubuntu-quantal",
+- "Id":"b750fe79269d",
+- "Created":1364102658
+- },
+- {
+- "RepoTag": [
+- "ubuntu:12.04",
+- "ubuntu:precise",
+- "ubuntu:latest"
+- ],
+- "Id": "8dbd9e392a964c",
+- "Created": 1365714795,
+- "Size": 131506275,
+- "VirtualSize": 131506275
+- },
+- {
+- "RepoTag": [
+- "ubuntu:12.10",
+- "ubuntu:quantal"
+- ],
+- "ParentId": "27cf784147099545",
+- "Id": "b750fe79269d2e",
+- "Created": 1364102658,
+- "Size": 24653,
+- "VirtualSize": 180116135
+- }
+-]`
+- var expected []APIImages
+- err := json.Unmarshal([]byte(body), &expected)
+- if err != nil {
+- t.Fatal(err)
+- }
+- client := newTestClient(&FakeRoundTripper{message: body, status: http.StatusOK})
+- images, err := client.ListImages(false)
+- if err != nil {
+- t.Error(err)
+- }
+- if !reflect.DeepEqual(images, expected) {
+- t.Errorf("ListImages: Wrong return value. Want %#v. Got %#v.", expected, images)
+- }
+-}
+-
+-func TestListImagesParameters(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "null", status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- _, err := client.ListImages(false)
+- if err != nil {
+- t.Fatal(err)
+- }
+- req := fakeRT.requests[0]
+- if req.Method != "GET" {
+- t.Errorf("ListImages(false: Wrong HTTP method. Want GET. Got %s.", req.Method)
+- }
+- if all := req.URL.Query().Get("all"); all != "0" {
+- t.Errorf("ListImages(false): Wrong parameter. Want all=0. Got all=%s", all)
+- }
+- fakeRT.Reset()
+- _, err = client.ListImages(true)
+- if err != nil {
+- t.Fatal(err)
+- }
+- req = fakeRT.requests[0]
+- if all := req.URL.Query().Get("all"); all != "1" {
+- t.Errorf("ListImages(true): Wrong parameter. Want all=1. Got all=%s", all)
+- }
+-}
+-
+-func TestImageHistory(t *testing.T) {
+- body := `[
+- {
+- "Id": "25daec02219d2d852f7526137213a9b199926b4b24e732eab5b8bc6c49bd470e",
+- "Tags": [
+- "debian:7.6",
+- "debian:latest",
+- "debian:7",
+- "debian:wheezy"
+- ],
+- "Created": 1409856216,
+- "CreatedBy": "/bin/sh -c #(nop) CMD [/bin/bash]"
+- },
+- {
+- "Id": "41026a5347fb5be6ed16115bf22df8569697139f246186de9ae8d4f67c335dce",
+- "Created": 1409856213,
+- "CreatedBy": "/bin/sh -c #(nop) ADD file:1ee9e97209d00e3416a4543b23574cc7259684741a46bbcbc755909b8a053a38 in /",
+- "Size": 85178663
+- },
+- {
+- "Id": "511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158",
+- "Tags": [
+- "scratch:latest"
+- ],
+- "Created": 1371157430
+- }
+-]`
+- var expected []ImageHistory
+- err := json.Unmarshal([]byte(body), &expected)
+- if err != nil {
+- t.Fatal(err)
+- }
+- client := newTestClient(&FakeRoundTripper{message: body, status: http.StatusOK})
+- history, err := client.ImageHistory("debian:latest")
+- if err != nil {
+- t.Error(err)
+- }
+- if !reflect.DeepEqual(history, expected) {
+- t.Errorf("ImageHistory: Wrong return value. Want %#v. Got %#v.", expected, history)
+- }
+-}
+-
+-func TestRemoveImage(t *testing.T) {
+- name := "test"
+- fakeRT := &FakeRoundTripper{message: "", status: http.StatusNoContent}
+- client := newTestClient(fakeRT)
+- err := client.RemoveImage(name)
+- if err != nil {
+- t.Fatal(err)
+- }
+- req := fakeRT.requests[0]
+- expectedMethod := "DELETE"
+- if req.Method != expectedMethod {
+- t.Errorf("RemoveImage(%q): Wrong HTTP method. Want %s. Got %s.", name, expectedMethod, req.Method)
+- }
+- u, _ := url.Parse(client.getURL("/images/" + name))
+- if req.URL.Path != u.Path {
+- t.Errorf("RemoveImage(%q): Wrong request path. Want %q. Got %q.", name, u.Path, req.URL.Path)
+- }
+-}
+-
+-func TestRemoveImageNotFound(t *testing.T) {
+- client := newTestClient(&FakeRoundTripper{message: "no such image", status: http.StatusNotFound})
+- err := client.RemoveImage("test:")
+- if err != ErrNoSuchImage {
+- t.Errorf("RemoveImage: wrong error. Want %#v. Got %#v.", ErrNoSuchImage, err)
+- }
+-}
+-
+-func TestInspectImage(t *testing.T) {
+- body := `{
+- "id":"b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc",
+- "parent":"27cf784147099545",
+- "created":"2013-03-23T22:24:18.818426-07:00",
+- "container":"3d67245a8d72ecf13f33dffac9f79dcdf70f75acb84d308770391510e0c23ad0",
+- "container_config":{"Memory":0}
+-}`
+- var expected Image
+- json.Unmarshal([]byte(body), &expected)
+- fakeRT := &FakeRoundTripper{message: body, status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- image, err := client.InspectImage(expected.ID)
+- if err != nil {
+- t.Fatal(err)
+- }
+- if !reflect.DeepEqual(*image, expected) {
+- t.Errorf("InspectImage(%q): Wrong image returned. Want %#v. Got %#v.", expected.ID, expected, *image)
+- }
+- req := fakeRT.requests[0]
+- if req.Method != "GET" {
+- t.Errorf("InspectImage(%q): Wrong HTTP method. Want GET. Got %s.", expected.ID, req.Method)
+- }
+- u, _ := url.Parse(client.getURL("/images/" + expected.ID + "/json"))
+- if req.URL.Path != u.Path {
+- t.Errorf("InspectImage(%q): Wrong request URL. Want %q. Got %q.", expected.ID, u.Path, req.URL.Path)
+- }
+-}
+-
+-func TestInspectImageNotFound(t *testing.T) {
+- client := newTestClient(&FakeRoundTripper{message: "no such image", status: http.StatusNotFound})
+- name := "test"
+- image, err := client.InspectImage(name)
+- if image != nil {
+- t.Errorf("InspectImage(%q): expected <nil> image, got %#v.", name, image)
+- }
+- if err != ErrNoSuchImage {
+- t.Errorf("InspectImage(%q): wrong error. Want %#v. Got %#v.", name, ErrNoSuchImage, err)
- }
-- s := &Service{client: client, BasePath: basePath}
-- s.Projects = NewProjectsService(s)
-- return s, nil
-}
-
--type Service struct {
-- client *http.Client
-- BasePath string // API endpoint base URL
+-func TestPushImage(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "Pushing 1/100", status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- var buf bytes.Buffer
+- err := client.PushImage(PushImageOptions{Name: "test", OutputStream: &buf}, AuthConfiguration{})
+- if err != nil {
+- t.Fatal(err)
+- }
+- expected := "Pushing 1/100"
+- if buf.String() != expected {
+- t.Errorf("PushImage: Wrong output. Want %q. Got %q.", expected, buf.String())
+- }
+- req := fakeRT.requests[0]
+- if req.Method != "POST" {
+- t.Errorf("PushImage: Wrong HTTP method. Want POST. Got %s.", req.Method)
+- }
+- u, _ := url.Parse(client.getURL("/images/test/push"))
+- if req.URL.Path != u.Path {
+- t.Errorf("PushImage: Wrong request path. Want %q. Got %q.", u.Path, req.URL.Path)
+- }
+- if query := req.URL.Query().Encode(); query != "" {
+- t.Errorf("PushImage: Wrong query string. Want no parameters, got %q.", query)
+- }
-
-- Projects *ProjectsService
+- auth, err := base64.URLEncoding.DecodeString(req.Header.Get("X-Registry-Auth"))
+- if err != nil {
+- t.Errorf("PushImage: caught error decoding auth. %#v", err.Error())
+- }
+- if strings.TrimSpace(string(auth)) != "{}" {
+- t.Errorf("PushImage: wrong body. Want %q. Got %q.",
+- base64.URLEncoding.EncodeToString([]byte("{}")), req.Header.Get("X-Registry-Auth"))
+- }
-}
-
--func NewProjectsService(s *Service) *ProjectsService {
-- rs := &ProjectsService{s: s}
-- rs.Clusters = NewProjectsClustersService(s)
-- rs.Operations = NewProjectsOperationsService(s)
-- rs.Zones = NewProjectsZonesService(s)
-- return rs
--}
+-func TestPushImageWithRawJSON(t *testing.T) {
+- body := `
+- {"status":"Pushing..."}
+- {"status":"Pushing", "progress":"1/? (n/a)", "progressDetail":{"current":1}}}
+- {"status":"Image successfully pushed"}
+- `
+- fakeRT := &FakeRoundTripper{
+- message: body,
+- status: http.StatusOK,
+- header: map[string]string{
+- "Content-Type": "application/json",
+- },
+- }
+- client := newTestClient(fakeRT)
+- var buf bytes.Buffer
-
--type ProjectsService struct {
-- s *Service
+- err := client.PushImage(PushImageOptions{
+- Name: "test",
+- OutputStream: &buf,
+- RawJSONStream: true,
+- }, AuthConfiguration{})
+- if err != nil {
+- t.Fatal(err)
+- }
+- if buf.String() != body {
+- t.Errorf("PushImage: Wrong raw output. Want %q. Got %q.", body, buf.String())
+- }
+-}
-
-- Clusters *ProjectsClustersService
+-func TestPushImageWithAuthentication(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "Pushing 1/100", status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- var buf bytes.Buffer
+- inputAuth := AuthConfiguration{
+- Username: "gopher",
+- Password: "gopher123",
+- Email: "gopher at tsuru.io",
+- }
+- err := client.PushImage(PushImageOptions{Name: "test", OutputStream: &buf}, inputAuth)
+- if err != nil {
+- t.Fatal(err)
+- }
+- req := fakeRT.requests[0]
+- var gotAuth AuthConfiguration
-
-- Operations *ProjectsOperationsService
+- auth, err := base64.URLEncoding.DecodeString(req.Header.Get("X-Registry-Auth"))
+- if err != nil {
+- t.Errorf("PushImage: caught error decoding auth. %#v", err.Error())
+- }
-
-- Zones *ProjectsZonesService
+- err = json.Unmarshal(auth, &gotAuth)
+- if err != nil {
+- t.Fatal(err)
+- }
+- if !reflect.DeepEqual(gotAuth, inputAuth) {
+- t.Errorf("PushImage: wrong auth configuration. Want %#v. Got %#v.", inputAuth, gotAuth)
+- }
-}
-
--func NewProjectsClustersService(s *Service) *ProjectsClustersService {
-- rs := &ProjectsClustersService{s: s}
-- return rs
+-func TestPushImageCustomRegistry(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "Pushing 1/100", status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- var authConfig AuthConfiguration
+- var buf bytes.Buffer
+- opts := PushImageOptions{
+- Name: "test", Registry: "docker.tsuru.io",
+- OutputStream: &buf,
+- }
+- err := client.PushImage(opts, authConfig)
+- if err != nil {
+- t.Fatal(err)
+- }
+- req := fakeRT.requests[0]
+- expectedQuery := "registry=docker.tsuru.io"
+- if query := req.URL.Query().Encode(); query != expectedQuery {
+- t.Errorf("PushImage: Wrong query string. Want %q. Got %q.", expectedQuery, query)
+- }
-}
-
--type ProjectsClustersService struct {
-- s *Service
+-func TestPushImageNoName(t *testing.T) {
+- client := Client{}
+- err := client.PushImage(PushImageOptions{}, AuthConfiguration{})
+- if err != ErrNoSuchImage {
+- t.Errorf("PushImage: got wrong error. Want %#v. Got %#v.", ErrNoSuchImage, err)
+- }
-}
-
--func NewProjectsOperationsService(s *Service) *ProjectsOperationsService {
-- rs := &ProjectsOperationsService{s: s}
-- return rs
+-func TestPullImage(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "Pulling 1/100", status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- var buf bytes.Buffer
+- err := client.PullImage(PullImageOptions{Repository: "base", OutputStream: &buf},
+- AuthConfiguration{})
+- if err != nil {
+- t.Fatal(err)
+- }
+- expected := "Pulling 1/100"
+- if buf.String() != expected {
+- t.Errorf("PullImage: Wrong output. Want %q. Got %q.", expected, buf.String())
+- }
+- req := fakeRT.requests[0]
+- if req.Method != "POST" {
+- t.Errorf("PullImage: Wrong HTTP method. Want POST. Got %s.", req.Method)
+- }
+- u, _ := url.Parse(client.getURL("/images/create"))
+- if req.URL.Path != u.Path {
+- t.Errorf("PullImage: Wrong request path. Want %q. Got %q.", u.Path, req.URL.Path)
+- }
+- expectedQuery := "fromImage=base"
+- if query := req.URL.Query().Encode(); query != expectedQuery {
+- t.Errorf("PullImage: Wrong query strin. Want %q. Got %q.", expectedQuery, query)
+- }
-}
-
--type ProjectsOperationsService struct {
-- s *Service
+-func TestPullImageWithRawJSON(t *testing.T) {
+- body := `
+- {"status":"Pulling..."}
+- {"status":"Pulling", "progress":"1 B/ 100 B", "progressDetail":{"current":1, "total":100}}
+- `
+- fakeRT := &FakeRoundTripper{
+- message: body,
+- status: http.StatusOK,
+- header: map[string]string{
+- "Content-Type": "application/json",
+- },
+- }
+- client := newTestClient(fakeRT)
+- var buf bytes.Buffer
+- err := client.PullImage(PullImageOptions{
+- Repository: "base",
+- OutputStream: &buf,
+- RawJSONStream: true,
+- }, AuthConfiguration{})
+- if err != nil {
+- t.Fatal(err)
+- }
+- if buf.String() != body {
+- t.Errorf("PullImage: Wrong raw output. Want %q. Got %q", body, buf.String())
+- }
-}
-
--func NewProjectsZonesService(s *Service) *ProjectsZonesService {
-- rs := &ProjectsZonesService{s: s}
-- rs.Clusters = NewProjectsZonesClustersService(s)
-- rs.Operations = NewProjectsZonesOperationsService(s)
-- return rs
+-func TestPullImageWithoutOutputStream(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "Pulling 1/100", status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- opts := PullImageOptions{
+- Repository: "base",
+- Registry: "docker.tsuru.io",
+- }
+- err := client.PullImage(opts, AuthConfiguration{})
+- if err != nil {
+- t.Fatal(err)
+- }
+- req := fakeRT.requests[0]
+- expected := map[string][]string{"fromImage": {"base"}, "registry": {"docker.tsuru.io"}}
+- got := map[string][]string(req.URL.Query())
+- if !reflect.DeepEqual(got, expected) {
+- t.Errorf("PullImage: wrong query string. Want %#v. Got %#v.", expected, got)
+- }
-}
-
--type ProjectsZonesService struct {
-- s *Service
--
-- Clusters *ProjectsZonesClustersService
--
-- Operations *ProjectsZonesOperationsService
+-func TestPullImageCustomRegistry(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "Pulling 1/100", status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- var buf bytes.Buffer
+- opts := PullImageOptions{
+- Repository: "base",
+- Registry: "docker.tsuru.io",
+- OutputStream: &buf,
+- }
+- err := client.PullImage(opts, AuthConfiguration{})
+- if err != nil {
+- t.Fatal(err)
+- }
+- req := fakeRT.requests[0]
+- expected := map[string][]string{"fromImage": {"base"}, "registry": {"docker.tsuru.io"}}
+- got := map[string][]string(req.URL.Query())
+- if !reflect.DeepEqual(got, expected) {
+- t.Errorf("PullImage: wrong query string. Want %#v. Got %#v.", expected, got)
+- }
-}
-
--func NewProjectsZonesClustersService(s *Service) *ProjectsZonesClustersService {
-- rs := &ProjectsZonesClustersService{s: s}
-- return rs
+-func TestPullImageTag(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "Pulling 1/100", status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- var buf bytes.Buffer
+- opts := PullImageOptions{
+- Repository: "base",
+- Registry: "docker.tsuru.io",
+- Tag: "latest",
+- OutputStream: &buf,
+- }
+- err := client.PullImage(opts, AuthConfiguration{})
+- if err != nil {
+- t.Fatal(err)
+- }
+- req := fakeRT.requests[0]
+- expected := map[string][]string{"fromImage": {"base"}, "registry": {"docker.tsuru.io"}, "tag": {"latest"}}
+- got := map[string][]string(req.URL.Query())
+- if !reflect.DeepEqual(got, expected) {
+- t.Errorf("PullImage: wrong query string. Want %#v. Got %#v.", expected, got)
+- }
-}
-
--type ProjectsZonesClustersService struct {
-- s *Service
+-func TestPullImageNoRepository(t *testing.T) {
+- var opts PullImageOptions
+- client := Client{}
+- err := client.PullImage(opts, AuthConfiguration{})
+- if err != ErrNoSuchImage {
+- t.Errorf("PullImage: got wrong error. Want %#v. Got %#v.", ErrNoSuchImage, err)
+- }
-}
-
--func NewProjectsZonesOperationsService(s *Service) *ProjectsZonesOperationsService {
-- rs := &ProjectsZonesOperationsService{s: s}
-- return rs
+-func TestImportImageFromUrl(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- var buf bytes.Buffer
+- opts := ImportImageOptions{
+- Source: "http://mycompany.com/file.tar",
+- Repository: "testimage",
+- Tag: "tag",
+- OutputStream: &buf,
+- }
+- err := client.ImportImage(opts)
+- if err != nil {
+- t.Fatal(err)
+- }
+- req := fakeRT.requests[0]
+- expected := map[string][]string{"fromSrc": {opts.Source}, "repo": {opts.Repository}, "tag": {opts.Tag}}
+- got := map[string][]string(req.URL.Query())
+- if !reflect.DeepEqual(got, expected) {
+- t.Errorf("ImportImage: wrong query string. Want %#v. Got %#v.", expected, got)
+- }
-}
-
--type ProjectsZonesOperationsService struct {
-- s *Service
+-func TestImportImageFromInput(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- in := bytes.NewBufferString("tar content")
+- var buf bytes.Buffer
+- opts := ImportImageOptions{
+- Source: "-", Repository: "testimage",
+- InputStream: in, OutputStream: &buf,
+- Tag: "tag",
+- }
+- err := client.ImportImage(opts)
+- if err != nil {
+- t.Fatal(err)
+- }
+- req := fakeRT.requests[0]
+- expected := map[string][]string{"fromSrc": {opts.Source}, "repo": {opts.Repository}, "tag": {opts.Tag}}
+- got := map[string][]string(req.URL.Query())
+- if !reflect.DeepEqual(got, expected) {
+- t.Errorf("ImportImage: wrong query string. Want %#v. Got %#v.", expected, got)
+- }
+- body, err := ioutil.ReadAll(req.Body)
+- if err != nil {
+- t.Errorf("ImportImage: caugth error while reading body %#v", err.Error())
+- }
+- e := "tar content"
+- if string(body) != e {
+- t.Errorf("ImportImage: wrong body. Want %#v. Got %#v.", e, string(body))
+- }
-}
-
--type Cluster struct {
-- // ClusterApiVersion: The API version of the Kubernetes master and
-- // kubelets running in this cluster. Allowed value is 0.4.2, or leave
-- // blank to pick up the latest stable release.
-- ClusterApiVersion string `json:"clusterApiVersion,omitempty"`
--
-- // ContainerIpv4Cidr: [Output only] The IP addresses of the container
-- // pods in this cluster, in CIDR notation (e.g. 1.2.3.4/29).
-- ContainerIpv4Cidr string `json:"containerIpv4Cidr,omitempty"`
--
-- // CreationTimestamp: [Output only] The time the cluster was created, in
-- // RFC3339 text format.
-- CreationTimestamp string `json:"creationTimestamp,omitempty"`
--
-- // Description: An optional description of this cluster.
-- Description string `json:"description,omitempty"`
--
-- // Endpoint: [Output only] The IP address of this cluster's Kubernetes
-- // master. The endpoint can be accessed from the internet at
-- // https://username:password@endpoint/.
-- //
-- // See the masterAuth property of
-- // this resource for username and password information.
-- Endpoint string `json:"endpoint,omitempty"`
--
-- // MasterAuth: The HTTP basic authentication information for accessing
-- // the master. Because the master endpoint is open to the internet, you
-- // should create a strong password.
-- MasterAuth *MasterAuth `json:"masterAuth,omitempty"`
--
-- // Name: The name of this cluster. The name must be unique within this
-- // project and zone, and can be up to 40 characters with the following
-- // restrictions:
-- // - Lowercase letters, numbers, and hyphens only.
-- // -
-- // Must start with a letter.
-- // - Must end with a number or a letter.
-- Name string `json:"name,omitempty"`
--
-- // NodeConfig: The machine type and image to use for all nodes in this
-- // cluster. See the descriptions of the child properties of nodeConfig.
-- NodeConfig *NodeConfig `json:"nodeConfig,omitempty"`
--
-- // NodeRoutingPrefixSize: [Output only] The size of the address space on
-- // each node for hosting containers.
-- NodeRoutingPrefixSize int64 `json:"nodeRoutingPrefixSize,omitempty"`
--
-- // NumNodes: The number of nodes to create in this cluster. You must
-- // ensure that your Compute Engine resource quota is sufficient for this
-- // number of instances plus one (to include the master). You must also
-- // have available firewall and routes quota.
-- NumNodes int64 `json:"numNodes,omitempty"`
--
-- // ServicesIpv4Cidr: [Output only] The IP addresses of the Kubernetes
-- // services in this cluster, in CIDR notation (e.g. 1.2.3.4/29).
-- // Service addresses are always in the 10.0.0.0/16 range.
-- ServicesIpv4Cidr string `json:"servicesIpv4Cidr,omitempty"`
--
-- // Status: [Output only] The current status of this cluster.
-- Status string `json:"status,omitempty"`
+-func TestImportImageDoesNotPassesInputIfSourceIsNotDash(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- var buf bytes.Buffer
+- in := bytes.NewBufferString("foo")
+- opts := ImportImageOptions{
+- Source: "http://test.com/container.tar", Repository: "testimage",
+- InputStream: in, OutputStream: &buf,
+- }
+- err := client.ImportImage(opts)
+- if err != nil {
+- t.Fatal(err)
+- }
+- req := fakeRT.requests[0]
+- expected := map[string][]string{"fromSrc": {opts.Source}, "repo": {opts.Repository}}
+- got := map[string][]string(req.URL.Query())
+- if !reflect.DeepEqual(got, expected) {
+- t.Errorf("ImportImage: wrong query string. Want %#v. Got %#v.", expected, got)
+- }
+- body, err := ioutil.ReadAll(req.Body)
+- if err != nil {
+- t.Errorf("ImportImage: caugth error while reading body %#v", err.Error())
+- }
+- if string(body) != "" {
+- t.Errorf("ImportImage: wrong body. Want nothing. Got %#v.", string(body))
+- }
+-}
-
-- // StatusMessage: [Output only] Additional information about the current
-- // status of this cluster, if available.
-- StatusMessage string `json:"statusMessage,omitempty"`
+-func TestImportImageShouldPassTarContentToBodyWhenSourceIsFilePath(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- var buf bytes.Buffer
+- tarPath := "testing/data/container.tar"
+- opts := ImportImageOptions{
+- Source: tarPath, Repository: "testimage",
+- OutputStream: &buf,
+- }
+- err := client.ImportImage(opts)
+- if err != nil {
+- t.Fatal(err)
+- }
+- tar, err := os.Open(tarPath)
+- if err != nil {
+- t.Fatal(err)
+- }
+- req := fakeRT.requests[0]
+- tarContent, err := ioutil.ReadAll(tar)
+- body, err := ioutil.ReadAll(req.Body)
+- if err != nil {
+- t.Fatal(err)
+- }
+- if !reflect.DeepEqual(tarContent, body) {
+- t.Errorf("ImportImage: wrong body. Want %#v content. Got %#v.", tarPath, body)
+- }
+-}
-
-- // Zone: [Output only] The name of the Google Compute Engine zone in
-- // which the cluster resides.
-- Zone string `json:"zone,omitempty"`
+-func TestImportImageShouldChangeSourceToDashWhenItsAFilePath(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- var buf bytes.Buffer
+- tarPath := "testing/data/container.tar"
+- opts := ImportImageOptions{
+- Source: tarPath, Repository: "testimage",
+- OutputStream: &buf,
+- }
+- err := client.ImportImage(opts)
+- if err != nil {
+- t.Fatal(err)
+- }
+- req := fakeRT.requests[0]
+- expected := map[string][]string{"fromSrc": {"-"}, "repo": {opts.Repository}}
+- got := map[string][]string(req.URL.Query())
+- if !reflect.DeepEqual(got, expected) {
+- t.Errorf("ImportImage: wrong query string. Want %#v. Got %#v.", expected, got)
+- }
-}
-
--type CreateClusterRequest struct {
-- // Cluster: A cluster resource.
-- Cluster *Cluster `json:"cluster,omitempty"`
+-func TestBuildImageParameters(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- var buf bytes.Buffer
+- opts := BuildImageOptions{
+- Name: "testImage",
+- NoCache: true,
+- SuppressOutput: true,
+- RmTmpContainer: true,
+- ForceRmTmpContainer: true,
+- InputStream: &buf,
+- OutputStream: &buf,
+- }
+- err := client.BuildImage(opts)
+- if err != nil && strings.Index(err.Error(), "build image fail") == -1 {
+- t.Fatal(err)
+- }
+- req := fakeRT.requests[0]
+- expected := map[string][]string{"t": {opts.Name}, "nocache": {"1"}, "q": {"1"}, "rm": {"1"}, "forcerm": {"1"}}
+- got := map[string][]string(req.URL.Query())
+- if !reflect.DeepEqual(got, expected) {
+- t.Errorf("BuildImage: wrong query string. Want %#v. Got %#v.", expected, got)
+- }
-}
-
--type ListAggregatedClustersResponse struct {
-- // Clusters: A list of clusters in the project, across all zones.
-- Clusters []*Cluster `json:"clusters,omitempty"`
+-func TestBuildImageParametersForRemoteBuild(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- var buf bytes.Buffer
+- opts := BuildImageOptions{
+- Name: "testImage",
+- Remote: "testing/data/container.tar",
+- SuppressOutput: true,
+- OutputStream: &buf,
+- }
+- err := client.BuildImage(opts)
+- if err != nil {
+- t.Fatal(err)
+- }
+- req := fakeRT.requests[0]
+- expected := map[string][]string{"t": {opts.Name}, "remote": {opts.Remote}, "q": {"1"}}
+- got := map[string][]string(req.URL.Query())
+- if !reflect.DeepEqual(got, expected) {
+- t.Errorf("BuildImage: wrong query string. Want %#v. Got %#v.", expected, got)
+- }
-}
-
--type ListAggregatedOperationsResponse struct {
-- // Operations: A list of operations in the project, across all zones.
-- Operations []*Operation `json:"operations,omitempty"`
+-func TestBuildImageMissingRepoAndNilInput(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- var buf bytes.Buffer
+- opts := BuildImageOptions{
+- Name: "testImage",
+- SuppressOutput: true,
+- OutputStream: &buf,
+- }
+- err := client.BuildImage(opts)
+- if err != ErrMissingRepo {
+- t.Errorf("BuildImage: wrong error returned. Want %#v. Got %#v.", ErrMissingRepo, err)
+- }
-}
-
--type ListClustersResponse struct {
-- // Clusters: A list of clusters in the project in the specified zone.
-- Clusters []*Cluster `json:"clusters,omitempty"`
+-func TestBuildImageMissingOutputStream(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- opts := BuildImageOptions{Name: "testImage"}
+- err := client.BuildImage(opts)
+- if err != ErrMissingOutputStream {
+- t.Errorf("BuildImage: wrong error returned. Want %#v. Got %#v.", ErrMissingOutputStream, err)
+- }
-}
-
--type ListOperationsResponse struct {
-- // Operations: A list of operations in the project in the specified
-- // zone.
-- Operations []*Operation `json:"operations,omitempty"`
+-func TestBuildImageWithRawJSON(t *testing.T) {
+- body := `
+- {"stream":"Step 0 : FROM ubuntu:latest\n"}
+- {"stream":" ---\u003e 4300eb9d3c8d\n"}
+- {"stream":"Step 1 : MAINTAINER docker <eng at docker.com>\n"}
+- {"stream":" ---\u003e Using cache\n"}
+- {"stream":" ---\u003e 3a3ed758c370\n"}
+- {"stream":"Step 2 : CMD /usr/bin/top\n"}
+- {"stream":" ---\u003e Running in 36b1479cc2e4\n"}
+- {"stream":" ---\u003e 4b6188aebe39\n"}
+- {"stream":"Removing intermediate container 36b1479cc2e4\n"}
+- {"stream":"Successfully built 4b6188aebe39\n"}
+- `
+- fakeRT := &FakeRoundTripper{
+- message: body,
+- status: http.StatusOK,
+- header: map[string]string{
+- "Content-Type": "application/json",
+- },
+- }
+- client := newTestClient(fakeRT)
+- var buf bytes.Buffer
+- opts := BuildImageOptions{
+- Name: "testImage",
+- RmTmpContainer: true,
+- InputStream: &buf,
+- OutputStream: &buf,
+- RawJSONStream: true,
+- }
+- err := client.BuildImage(opts)
+- if err != nil {
+- t.Fatal(err)
+- }
+- if buf.String() != body {
+- t.Errorf("BuildImage: Wrong raw output. Want %q. Got %q.", body, buf.String())
+- }
-}
-
--type MasterAuth struct {
-- // Password: The password to use when accessing the Kubernetes master
-- // endpoint.
-- Password string `json:"password,omitempty"`
--
-- // User: The username to use when accessing the Kubernetes master
-- // endpoint.
-- User string `json:"user,omitempty"`
+-func TestBuildImageRemoteWithoutName(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- var buf bytes.Buffer
+- opts := BuildImageOptions{
+- Remote: "testing/data/container.tar",
+- SuppressOutput: true,
+- OutputStream: &buf,
+- }
+- err := client.BuildImage(opts)
+- if err != nil {
+- t.Fatal(err)
+- }
+- req := fakeRT.requests[0]
+- expected := map[string][]string{"t": {opts.Remote}, "remote": {opts.Remote}, "q": {"1"}}
+- got := map[string][]string(req.URL.Query())
+- if !reflect.DeepEqual(got, expected) {
+- t.Errorf("BuildImage: wrong query string. Want %#v. Got %#v.", expected, got)
+- }
-}
-
--type NodeConfig struct {
-- // MachineType: The name of a Google Compute Engine machine type (e.g.
-- // n1-standard-1).
-- //
-- // If unspecified, the default machine type is
-- // n1-standard-1.
-- MachineType string `json:"machineType,omitempty"`
--
-- // SourceImage: The fully-specified name of a Google Compute Engine
-- // image. For example:
-- // https://www.googleapis.com/compute/v1/projects/debian-cloud/global/ima
-- // ges/backports-debian-7-wheezy-vYYYYMMDD (where YYYMMDD is the version
-- // date).
-- //
-- // If specifying an image, you are responsible for ensuring its
-- // compatibility with the Debian 7 backports image. We recommend leaving
-- // this field blank to accept the default backports-debian-7-wheezy
-- // value.
-- SourceImage string `json:"sourceImage,omitempty"`
+-func TestTagImageParameters(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- opts := TagImageOptions{Repo: "testImage"}
+- err := client.TagImage("base", opts)
+- if err != nil && strings.Index(err.Error(), "tag image fail") == -1 {
+- t.Fatal(err)
+- }
+- req := fakeRT.requests[0]
+- expected := "http://localhost:4243/images/base/tag?repo=testImage"
+- got := req.URL.String()
+- if !reflect.DeepEqual(got, expected) {
+- t.Errorf("TagImage: wrong query string. Want %#v. Got %#v.", expected, got)
+- }
-}
-
--type Operation struct {
-- // ErrorMessage: If an error has occurred, a textual description of the
-- // error.
-- ErrorMessage string `json:"errorMessage,omitempty"`
--
-- // Name: The server-assigned ID for this operation. If the operation is
-- // fulfilled upfront, it may not have a resource name.
-- Name string `json:"name,omitempty"`
--
-- // OperationType: The operation type.
-- OperationType string `json:"operationType,omitempty"`
--
-- // Status: The current status of the operation.
-- Status string `json:"status,omitempty"`
--
-- // Target: [Optional] The URL of the cluster resource that this
-- // operation is associated with.
-- Target string `json:"target,omitempty"`
--
-- // Zone: The name of the Google Compute Engine zone in which the
-- // operation is taking place.
-- Zone string `json:"zone,omitempty"`
+-func TestTagImageMissingRepo(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- opts := TagImageOptions{Repo: "testImage"}
+- err := client.TagImage("", opts)
+- if err != ErrNoSuchImage {
+- t.Errorf("TestTag: wrong error returned. Want %#v. Got %#v.",
+- ErrNoSuchImage, err)
+- }
-}
-
--// method id "container.projects.clusters.list":
--
--type ProjectsClustersListCall struct {
-- s *Service
-- projectId string
-- opt_ map[string]interface{}
+-func TestIsUrl(t *testing.T) {
+- url := "http://foo.bar/"
+- result := isURL(url)
+- if !result {
+- t.Errorf("isURL: wrong match. Expected %#v to be a url. Got %#v.", url, result)
+- }
+- url = "/foo/bar.tar"
+- result = isURL(url)
+- if result {
+- t.Errorf("isURL: wrong match. Expected %#v to not be a url. Got %#v", url, result)
+- }
-}
-
--// List: Lists all clusters owned by a project across all zones.
--func (r *ProjectsClustersService) List(projectId string) *ProjectsClustersListCall {
-- c := &ProjectsClustersListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.projectId = projectId
-- return c
+-func TestLoadImage(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- tar, err := os.Open("testing/data/container.tar")
+- if err != nil {
+- t.Fatal(err)
+- } else {
+- defer tar.Close()
+- }
+- opts := LoadImageOptions{InputStream: tar}
+- err = client.LoadImage(opts)
+- if nil != err {
+- t.Error(err)
+- }
+- req := fakeRT.requests[0]
+- if req.Method != "POST" {
+- t.Errorf("LoadImage: wrong method. Expected %q. Got %q.", "POST", req.Method)
+- }
+- if req.URL.Path != "/images/load" {
+- t.Errorf("LoadImage: wrong URL. Expected %q. Got %q.", "/images/load", req.URL.Path)
+- }
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *ProjectsClustersListCall) Fields(s ...googleapi.Field) *ProjectsClustersListCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func TestExportImage(t *testing.T) {
+- var buf bytes.Buffer
+- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
+- client := newTestClient(fakeRT)
+- opts := ExportImageOptions{Name: "testimage", OutputStream: &buf}
+- err := client.ExportImage(opts)
+- if nil != err {
+- t.Error(err)
+- }
+- req := fakeRT.requests[0]
+- if req.Method != "GET" {
+- t.Errorf("ExportImage: wrong method. Expected %q. Got %q.", "GET", req.Method)
+- }
+- expectedPath := "/images/testimage/get"
+- if req.URL.Path != expectedPath {
+- t.Errorf("ExportIMage: wrong path. Expected %q. Got %q.", expectedPath, req.URL.Path)
+- }
-}
-
--func (c *ProjectsClustersListCall) Do() (*ListAggregatedClustersResponse, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+-func TestSearchImages(t *testing.T) {
+- body := `[
+- {
+- "description":"A container with Cassandra 2.0.3",
+- "is_official":true,
+- "is_automated":true,
+- "name":"poklet/cassandra",
+- "star_count":17
+- },
+- {
+- "description":"A container with Cassandra 2.0.3",
+- "is_official":true,
+- "is_automated":false,
+- "name":"poklet/cassandra",
+- "star_count":17
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{projectId}/clusters")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "projectId": c.projectId,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+- ,
+- {
+- "description":"A container with Cassandra 2.0.3",
+- "is_official":false,
+- "is_automated":true,
+- "name":"poklet/cassandra",
+- "star_count":17
+- }
+-]`
+- var expected []APIImageSearch
+- err := json.Unmarshal([]byte(body), &expected)
- if err != nil {
-- return nil, err
+- t.Fatal(err)
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- client := newTestClient(&FakeRoundTripper{message: body, status: http.StatusOK})
+- result, err := client.SearchImages("cassandra")
+- if err != nil {
+- t.Error(err)
- }
-- var ret *ListAggregatedClustersResponse
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- if !reflect.DeepEqual(result, expected) {
+- t.Errorf("SearchImages: Wrong return value. Want %#v. Got %#v.", expected, result)
- }
-- return ret, nil
-- // {
-- // "description": "Lists all clusters owned by a project across all zones.",
-- // "httpMethod": "GET",
-- // "id": "container.projects.clusters.list",
-- // "parameterOrder": [
-- // "projectId"
-- // ],
-- // "parameters": {
-- // "projectId": {
-- // "description": "The Google Developers Console project ID or project number.",
-- // "location": "path",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{projectId}/clusters",
-- // "response": {
-- // "$ref": "ListAggregatedClustersResponse"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/cloud-platform"
-- // ]
-- // }
--
--}
--
--// method id "container.projects.operations.list":
--
--type ProjectsOperationsListCall struct {
-- s *Service
-- projectId string
-- opt_ map[string]interface{}
-}
+diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/misc.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/misc.go
+deleted file mode 100644
+index 2678ab5..0000000
+--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/misc.go
++++ /dev/null
+@@ -1,59 +0,0 @@
+-// Copyright 2014 go-dockerclient authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
--// List: Lists all operations in a project, across all zones.
--func (r *ProjectsOperationsService) List(projectId string) *ProjectsOperationsListCall {
-- c := &ProjectsOperationsListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.projectId = projectId
-- return c
--}
+-package docker
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *ProjectsOperationsListCall) Fields(s ...googleapi.Field) *ProjectsOperationsListCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
--}
+-import (
+- "bytes"
+- "strings"
+-)
-
--func (c *ProjectsOperationsListCall) Do() (*ListAggregatedOperationsResponse, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{projectId}/operations")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "projectId": c.projectId,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+-// Version returns version information about the docker server.
+-//
+-// See http://goo.gl/BOZrF5 for more details.
+-func (c *Client) Version() (*Env, error) {
+- body, _, err := c.do("GET", "/version", nil)
- if err != nil {
- return nil, err
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
+- var env Env
+- if err := env.Decode(bytes.NewReader(body)); err != nil {
- return nil, err
- }
-- var ret *ListAggregatedOperationsResponse
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+- return &env, nil
+-}
+-
+-// Info returns system-wide information about the Docker server.
+-//
+-// See http://goo.gl/wmqZsW for more details.
+-func (c *Client) Info() (*Env, error) {
+- body, _, err := c.do("GET", "/info", nil)
+- if err != nil {
- return nil, err
- }
-- return ret, nil
-- // {
-- // "description": "Lists all operations in a project, across all zones.",
-- // "httpMethod": "GET",
-- // "id": "container.projects.operations.list",
-- // "parameterOrder": [
-- // "projectId"
-- // ],
-- // "parameters": {
-- // "projectId": {
-- // "description": "The Google Developers Console project ID or project number.",
-- // "location": "path",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{projectId}/operations",
-- // "response": {
-- // "$ref": "ListAggregatedOperationsResponse"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/cloud-platform"
-- // ]
-- // }
+- var info Env
+- err = info.Decode(bytes.NewReader(body))
+- if err != nil {
+- return nil, err
+- }
+- return &info, nil
+-}
-
+-// ParseRepositoryTag gets the name of the repository and returns it splitted
+-// in two parts: the repository and the tag.
+-//
+-// Some examples:
+-//
+-// localhost.localdomain:5000/samalba/hipache:latest -> localhost.localdomain:5000/samalba/hipache, latest
+-// localhost.localdomain:5000/samalba/hipache -> localhost.localdomain:5000/samalba/hipache, ""
+-func ParseRepositoryTag(repoTag string) (repository string, tag string) {
+- n := strings.LastIndex(repoTag, ":")
+- if n < 0 {
+- return repoTag, ""
+- }
+- if tag := repoTag[n+1:]; !strings.Contains(tag, "/") {
+- return repoTag[:n], tag
+- }
+- return repoTag, ""
-}
+diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/misc_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/misc_test.go
+deleted file mode 100644
+index ceaf076..0000000
+--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/misc_test.go
++++ /dev/null
+@@ -1,159 +0,0 @@
+-// Copyright 2014 go-dockerclient authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
--// method id "container.projects.zones.clusters.create":
+-package docker
-
--type ProjectsZonesClustersCreateCall struct {
-- s *Service
-- projectId string
-- zoneId string
-- createclusterrequest *CreateClusterRequest
-- opt_ map[string]interface{}
+-import (
+- "net/http"
+- "net/url"
+- "reflect"
+- "sort"
+- "testing"
+-)
+-
+-type DockerVersion struct {
+- Version string
+- GitCommit string
+- GoVersion string
-}
-
--// Create: Creates a cluster, consisting of the specified number and
--// type of Google Compute Engine instances, plus a Kubernetes master
--// instance.
--//
--// The cluster is created in the project's default
--// network.
--//
--// A firewall is added that allows traffic into port 443 on
--// the master, which enables HTTPS. A firewall and a route is added for
--// each node to allow the containers on that node to communicate with
--// all other instances in the cluster.
--//
--// Finally, a route named
--// k8s-iproute-10-xx-0-0 is created to track that the cluster's
--// 10.xx.0.0/16 CIDR has been assigned.
--func (r *ProjectsZonesClustersService) Create(projectId string, zoneId string, createclusterrequest *CreateClusterRequest) *ProjectsZonesClustersCreateCall {
-- c := &ProjectsZonesClustersCreateCall{s: r.s, opt_: make(map[string]interface{})}
-- c.projectId = projectId
-- c.zoneId = zoneId
-- c.createclusterrequest = createclusterrequest
-- return c
+-func TestVersion(t *testing.T) {
+- body := `{
+- "Version":"0.2.2",
+- "GitCommit":"5a2a5cc+CHANGES",
+- "GoVersion":"go1.0.3"
+-}`
+- fakeRT := FakeRoundTripper{message: body, status: http.StatusOK}
+- client := newTestClient(&fakeRT)
+- expected := DockerVersion{
+- Version: "0.2.2",
+- GitCommit: "5a2a5cc+CHANGES",
+- GoVersion: "go1.0.3",
+- }
+- version, err := client.Version()
+- if err != nil {
+- t.Fatal(err)
+- }
+-
+- if result := version.Get("Version"); result != expected.Version {
+- t.Errorf("Version(): Wrong result. Want %#v. Got %#v.", expected.Version, version.Get("Version"))
+- }
+- if result := version.Get("GitCommit"); result != expected.GitCommit {
+- t.Errorf("GitCommit(): Wrong result. Want %#v. Got %#v.", expected.GitCommit, version.Get("GitCommit"))
+- }
+- if result := version.Get("GoVersion"); result != expected.GoVersion {
+- t.Errorf("GoVersion(): Wrong result. Want %#v. Got %#v.", expected.GoVersion, version.Get("GoVersion"))
+- }
+- req := fakeRT.requests[0]
+- if req.Method != "GET" {
+- t.Errorf("Version(): wrong request method. Want GET. Got %s.", req.Method)
+- }
+- u, _ := url.Parse(client.getURL("/version"))
+- if req.URL.Path != u.Path {
+- t.Errorf("Version(): wrong request path. Want %q. Got %q.", u.Path, req.URL.Path)
+- }
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *ProjectsZonesClustersCreateCall) Fields(s ...googleapi.Field) *ProjectsZonesClustersCreateCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func TestVersionError(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "internal error", status: http.StatusInternalServerError}
+- client := newTestClient(fakeRT)
+- version, err := client.Version()
+- if version != nil {
+- t.Errorf("Version(): expected <nil> value, got %#v.", version)
+- }
+- if err == nil {
+- t.Error("Version(): unexpected <nil> error")
+- }
-}
-
--func (c *ProjectsZonesClustersCreateCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- body, err := googleapi.WithoutDataWrapper.JSONReader(c.createclusterrequest)
+-func TestInfo(t *testing.T) {
+- body := `{
+- "Containers":11,
+- "Images":16,
+- "Debug":0,
+- "NFd":11,
+- "NGoroutines":21,
+- "MemoryLimit":1,
+- "SwapLimit":0
+-}`
+- fakeRT := FakeRoundTripper{message: body, status: http.StatusOK}
+- client := newTestClient(&fakeRT)
+- expected := Env{}
+- expected.SetInt("Containers", 11)
+- expected.SetInt("Images", 16)
+- expected.SetBool("Debug", false)
+- expected.SetInt("NFd", 11)
+- expected.SetInt("NGoroutines", 21)
+- expected.SetBool("MemoryLimit", true)
+- expected.SetBool("SwapLimit", false)
+- info, err := client.Info()
- if err != nil {
-- return nil, err
+- t.Fatal(err)
- }
-- ctype := "application/json"
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+- infoSlice := []string(*info)
+- expectedSlice := []string(expected)
+- sort.Strings(infoSlice)
+- sort.Strings(expectedSlice)
+- if !reflect.DeepEqual(expectedSlice, infoSlice) {
+- t.Errorf("Info(): Wrong result.\nWant %#v.\nGot %#v.", expected, *info)
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{projectId}/zones/{zoneId}/clusters")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("POST", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "projectId": c.projectId,
-- "zoneId": c.zoneId,
-- })
-- req.Header.Set("Content-Type", ctype)
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
+- req := fakeRT.requests[0]
+- if req.Method != "GET" {
+- t.Errorf("Info(): Wrong HTTP method. Want GET. Got %s.", req.Method)
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- u, _ := url.Parse(client.getURL("/info"))
+- if req.URL.Path != u.Path {
+- t.Errorf("Info(): Wrong request path. Want %q. Got %q.", u.Path, req.URL.Path)
- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+-}
+-
+-func TestInfoError(t *testing.T) {
+- fakeRT := &FakeRoundTripper{message: "internal error", status: http.StatusInternalServerError}
+- client := newTestClient(fakeRT)
+- version, err := client.Info()
+- if version != nil {
+- t.Errorf("Info(): expected <nil> value, got %#v.", version)
- }
-- return ret, nil
-- // {
-- // "description": "Creates a cluster, consisting of the specified number and type of Google Compute Engine instances, plus a Kubernetes master instance.\n\nThe cluster is created in the project's default network.\n\nA firewall is added that allows traffic into port 443 on the master, which enables HTTPS. A firewall and a route is added for each node to allow the containers on that node to communicate with all other instances in the cluster.\n\nFinally, a route named k8s-iproute-10-xx-0-0 is created to track that the cluster's 10.xx.0.0/16 CIDR has been assigned.",
-- // "httpMethod": "POST",
-- // "id": "container.projects.zones.clusters.create",
-- // "parameterOrder": [
-- // "projectId",
-- // "zoneId"
-- // ],
-- // "parameters": {
-- // "projectId": {
-- // "description": "The Google Developers Console project ID or project number.",
-- // "location": "path",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "zoneId": {
-- // "description": "The name of the Google Compute Engine zone in which the cluster resides.",
-- // "location": "path",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{projectId}/zones/{zoneId}/clusters",
-- // "request": {
-- // "$ref": "CreateClusterRequest"
-- // },
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/cloud-platform"
-- // ]
-- // }
+- if err == nil {
+- t.Error("Info(): unexpected <nil> error")
+- }
+-}
-
+-func TestParseRepositoryTag(t *testing.T) {
+- var tests = []struct {
+- input string
+- expectedRepo string
+- expectedTag string
+- }{
+- {
+- "localhost.localdomain:5000/samalba/hipache:latest",
+- "localhost.localdomain:5000/samalba/hipache",
+- "latest",
+- },
+- {
+- "localhost.localdomain:5000/samalba/hipache",
+- "localhost.localdomain:5000/samalba/hipache",
+- "",
+- },
+- {
+- "tsuru/python",
+- "tsuru/python",
+- "",
+- },
+- {
+- "tsuru/python:2.7",
+- "tsuru/python",
+- "2.7",
+- },
+- }
+- for _, tt := range tests {
+- repo, tag := ParseRepositoryTag(tt.input)
+- if repo != tt.expectedRepo {
+- t.Errorf("ParseRepositoryTag(%q): wrong repository. Want %q. Got %q", tt.input, tt.expectedRepo, repo)
+- }
+- if tag != tt.expectedTag {
+- t.Errorf("ParseRepositoryTag(%q): wrong tag. Want %q. Got %q", tt.input, tt.expectedTag, tag)
+- }
+- }
-}
+diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/signal.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/signal.go
+deleted file mode 100644
+index 16aa003..0000000
+--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/signal.go
++++ /dev/null
+@@ -1,49 +0,0 @@
+-// Copyright 2014 go-dockerclient authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
--// method id "container.projects.zones.clusters.delete":
+-package docker
-
--type ProjectsZonesClustersDeleteCall struct {
-- s *Service
-- projectId string
-- zoneId string
-- clusterId string
-- opt_ map[string]interface{}
--}
+-// Signal represents a signal that can be send to the container on
+-// KillContainer call.
+-type Signal int
-
--// Delete: Deletes the cluster, including the Kubernetes master and all
--// worker nodes.
--//
--// Firewalls and routes that were configured at cluster
--// creation are also deleted.
--func (r *ProjectsZonesClustersService) Delete(projectId string, zoneId string, clusterId string) *ProjectsZonesClustersDeleteCall {
-- c := &ProjectsZonesClustersDeleteCall{s: r.s, opt_: make(map[string]interface{})}
-- c.projectId = projectId
-- c.zoneId = zoneId
-- c.clusterId = clusterId
-- return c
--}
+-// These values represent all signals available on Linux, where containers will
+-// be running.
+-const (
+- SIGABRT = Signal(0x6)
+- SIGALRM = Signal(0xe)
+- SIGBUS = Signal(0x7)
+- SIGCHLD = Signal(0x11)
+- SIGCLD = Signal(0x11)
+- SIGCONT = Signal(0x12)
+- SIGFPE = Signal(0x8)
+- SIGHUP = Signal(0x1)
+- SIGILL = Signal(0x4)
+- SIGINT = Signal(0x2)
+- SIGIO = Signal(0x1d)
+- SIGIOT = Signal(0x6)
+- SIGKILL = Signal(0x9)
+- SIGPIPE = Signal(0xd)
+- SIGPOLL = Signal(0x1d)
+- SIGPROF = Signal(0x1b)
+- SIGPWR = Signal(0x1e)
+- SIGQUIT = Signal(0x3)
+- SIGSEGV = Signal(0xb)
+- SIGSTKFLT = Signal(0x10)
+- SIGSTOP = Signal(0x13)
+- SIGSYS = Signal(0x1f)
+- SIGTERM = Signal(0xf)
+- SIGTRAP = Signal(0x5)
+- SIGTSTP = Signal(0x14)
+- SIGTTIN = Signal(0x15)
+- SIGTTOU = Signal(0x16)
+- SIGUNUSED = Signal(0x1f)
+- SIGURG = Signal(0x17)
+- SIGUSR1 = Signal(0xa)
+- SIGUSR2 = Signal(0xc)
+- SIGVTALRM = Signal(0x1a)
+- SIGWINCH = Signal(0x1c)
+- SIGXCPU = Signal(0x18)
+- SIGXFSZ = Signal(0x19)
+-)
+diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/stdcopy.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/stdcopy.go
+deleted file mode 100644
+index 3782f3d..0000000
+--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/stdcopy.go
++++ /dev/null
+@@ -1,91 +0,0 @@
+-// Copyright 2014 Docker authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the DOCKER-LICENSE file.
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *ProjectsZonesClustersDeleteCall) Fields(s ...googleapi.Field) *ProjectsZonesClustersDeleteCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
--}
+-package docker
-
--func (c *ProjectsZonesClustersDeleteCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{projectId}/zones/{zoneId}/clusters/{clusterId}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("DELETE", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "projectId": c.projectId,
-- "zoneId": c.zoneId,
-- "clusterId": c.clusterId,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
-- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
-- }
-- return ret, nil
-- // {
-- // "description": "Deletes the cluster, including the Kubernetes master and all worker nodes.\n\nFirewalls and routes that were configured at cluster creation are also deleted.",
-- // "httpMethod": "DELETE",
-- // "id": "container.projects.zones.clusters.delete",
-- // "parameterOrder": [
-- // "projectId",
-- // "zoneId",
-- // "clusterId"
-- // ],
-- // "parameters": {
-- // "clusterId": {
-- // "description": "The name of the cluster to delete.",
-- // "location": "path",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "projectId": {
-- // "description": "The Google Developers Console project ID or project number.",
-- // "location": "path",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "zoneId": {
-- // "description": "The name of the Google Compute Engine zone in which the cluster resides.",
-- // "location": "path",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{projectId}/zones/{zoneId}/clusters/{clusterId}",
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/cloud-platform"
-- // ]
-- // }
+-import (
+- "encoding/binary"
+- "errors"
+- "io"
+-)
-
--}
+-const (
+- stdWriterPrefixLen = 8
+- stdWriterFdIndex = 0
+- stdWriterSizeIndex = 4
+-)
-
--// method id "container.projects.zones.clusters.get":
+-var errInvalidStdHeader = errors.New("Unrecognized input header")
-
--type ProjectsZonesClustersGetCall struct {
-- s *Service
-- projectId string
-- zoneId string
-- clusterId string
-- opt_ map[string]interface{}
+-func stdCopy(dstout, dsterr io.Writer, src io.Reader) (written int64, err error) {
+- var (
+- buf = make([]byte, 32*1024+stdWriterPrefixLen+1)
+- bufLen = len(buf)
+- nr, nw int
+- er, ew error
+- out io.Writer
+- frameSize int
+- )
+- for {
+- for nr < stdWriterPrefixLen {
+- var nr2 int
+- nr2, er = src.Read(buf[nr:])
+- if er == io.EOF {
+- if nr < stdWriterPrefixLen && nr2 < stdWriterPrefixLen {
+- return written, nil
+- }
+- nr += nr2
+- break
+- } else if er != nil {
+- return 0, er
+- }
+- nr += nr2
+- }
+- switch buf[stdWriterFdIndex] {
+- case 0:
+- fallthrough
+- case 1:
+- out = dstout
+- case 2:
+- out = dsterr
+- default:
+- return 0, errInvalidStdHeader
+- }
+- frameSize = int(binary.BigEndian.Uint32(buf[stdWriterSizeIndex : stdWriterSizeIndex+4]))
+- if frameSize+stdWriterPrefixLen > bufLen {
+- buf = append(buf, make([]byte, frameSize+stdWriterPrefixLen-len(buf)+1)...)
+- bufLen = len(buf)
+- }
+- for nr < frameSize+stdWriterPrefixLen {
+- var nr2 int
+- nr2, er = src.Read(buf[nr:])
+- if er == io.EOF {
+- if nr == 0 {
+- return written, nil
+- }
+- nr += nr2
+- break
+- } else if er != nil {
+- return 0, er
+- }
+- nr += nr2
+- }
+- bound := frameSize + stdWriterPrefixLen
+- if bound > nr {
+- bound = nr
+- }
+- nw, ew = out.Write(buf[stdWriterPrefixLen:bound])
+- if nw > 0 {
+- written += int64(nw)
+- }
+- if ew != nil {
+- return 0, ew
+- }
+- if nw != frameSize {
+- return written, io.ErrShortWrite
+- }
+- copy(buf, buf[frameSize+stdWriterPrefixLen:])
+- nr -= frameSize + stdWriterPrefixLen
+- }
-}
+diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/stdcopy_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/stdcopy_test.go
+deleted file mode 100644
+index 75b8922..0000000
+--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/stdcopy_test.go
++++ /dev/null
+@@ -1,255 +0,0 @@
+-// Copyright 2014 go-dockerclient authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the DOCKER-LICENSE file.
-
--// Get: Gets a specific cluster.
--func (r *ProjectsZonesClustersService) Get(projectId string, zoneId string, clusterId string) *ProjectsZonesClustersGetCall {
-- c := &ProjectsZonesClustersGetCall{s: r.s, opt_: make(map[string]interface{})}
-- c.projectId = projectId
-- c.zoneId = zoneId
-- c.clusterId = clusterId
-- return c
+-package docker
+-
+-import (
+- "bytes"
+- "encoding/binary"
+- "errors"
+- "io"
+- "strings"
+- "testing"
+- "testing/iotest"
+-)
+-
+-type errorWriter struct {
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *ProjectsZonesClustersGetCall) Fields(s ...googleapi.Field) *ProjectsZonesClustersGetCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func (errorWriter) Write([]byte) (int, error) {
+- return 0, errors.New("something went wrong")
-}
-
--func (c *ProjectsZonesClustersGetCall) Do() (*Cluster, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{projectId}/zones/{zoneId}/clusters/{clusterId}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "projectId": c.projectId,
-- "zoneId": c.zoneId,
-- "clusterId": c.clusterId,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
+-func TestStdCopy(t *testing.T) {
+- var input, stdout, stderr bytes.Buffer
+- input.Write([]byte{2, 0, 0, 0, 0, 0, 0, 19})
+- input.Write([]byte("something happened!"))
+- input.Write([]byte{1, 0, 0, 0, 0, 0, 0, 12})
+- input.Write([]byte("just kidding"))
+- input.Write([]byte{0, 0, 0, 0, 0, 0, 0, 6})
+- input.Write([]byte("\nyeah!"))
+- n, err := stdCopy(&stdout, &stderr, &input)
- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- t.Fatal(err)
- }
-- var ret *Cluster
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- if expected := int64(19 + 12 + 6); n != expected {
+- t.Errorf("Wrong number of bytes. Want %d. Got %d.", expected, n)
+- }
+- if got := stderr.String(); got != "something happened!" {
+- t.Errorf("stdCopy: wrong stderr. Want %q. Got %q.", "something happened!", got)
+- }
+- if got := stdout.String(); got != "just kidding\nyeah!" {
+- t.Errorf("stdCopy: wrong stdout. Want %q. Got %q.", "just kidding\nyeah!", got)
- }
-- return ret, nil
-- // {
-- // "description": "Gets a specific cluster.",
-- // "httpMethod": "GET",
-- // "id": "container.projects.zones.clusters.get",
-- // "parameterOrder": [
-- // "projectId",
-- // "zoneId",
-- // "clusterId"
-- // ],
-- // "parameters": {
-- // "clusterId": {
-- // "description": "The name of the cluster to retrieve.",
-- // "location": "path",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "projectId": {
-- // "description": "The Google Developers Console project ID or project number.",
-- // "location": "path",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "zoneId": {
-- // "description": "The name of the Google Compute Engine zone in which the cluster resides.",
-- // "location": "path",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{projectId}/zones/{zoneId}/clusters/{clusterId}",
-- // "response": {
-- // "$ref": "Cluster"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/cloud-platform"
-- // ]
-- // }
--
-}
-
--// method id "container.projects.zones.clusters.list":
--
--type ProjectsZonesClustersListCall struct {
-- s *Service
-- projectId string
-- zoneId string
-- opt_ map[string]interface{}
+-func TestStdCopyStress(t *testing.T) {
+- var input, stdout, stderr bytes.Buffer
+- value := strings.Repeat("something ", 4096)
+- writer := newStdWriter(&input, Stdout)
+- writer.Write([]byte(value))
+- n, err := stdCopy(&stdout, &stderr, &input)
+- if err != nil {
+- t.Fatal(err)
+- }
+- if n != 40960 {
+- t.Errorf("Wrong number of bytes. Want 40960. Got %d.", n)
+- }
+- if got := stderr.String(); got != "" {
+- t.Errorf("stdCopy: wrong stderr. Want empty string. Got %q", got)
+- }
+- if got := stdout.String(); got != value {
+- t.Errorf("stdCopy: wrong stdout. Want %q. Got %q", value, got)
+- }
-}
-
--// List: Lists all clusters owned by a project in the specified zone.
--func (r *ProjectsZonesClustersService) List(projectId string, zoneId string) *ProjectsZonesClustersListCall {
-- c := &ProjectsZonesClustersListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.projectId = projectId
-- c.zoneId = zoneId
-- return c
+-func TestStdCopyInvalidStdHeader(t *testing.T) {
+- var input, stdout, stderr bytes.Buffer
+- input.Write([]byte{3, 0, 0, 0, 0, 0, 0, 19})
+- n, err := stdCopy(&stdout, &stderr, &input)
+- if n != 0 {
+- t.Errorf("stdCopy: wrong number of bytes. Want 0. Got %d", n)
+- }
+- if err != errInvalidStdHeader {
+- t.Errorf("stdCopy: wrong error. Want ErrInvalidStdHeader. Got %#v", err)
+- }
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *ProjectsZonesClustersListCall) Fields(s ...googleapi.Field) *ProjectsZonesClustersListCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func TestStdCopyBigFrame(t *testing.T) {
+- var input, stdout, stderr bytes.Buffer
+- input.Write([]byte{2, 0, 0, 0, 0, 0, 0, 18})
+- input.Write([]byte("something happened!"))
+- n, err := stdCopy(&stdout, &stderr, &input)
+- if err != nil {
+- t.Fatal(err)
+- }
+- if expected := int64(18); n != expected {
+- t.Errorf("Wrong number of bytes. Want %d. Got %d.", expected, n)
+- }
+- if got := stderr.String(); got != "something happened" {
+- t.Errorf("stdCopy: wrong stderr. Want %q. Got %q.", "something happened", got)
+- }
+- if got := stdout.String(); got != "" {
+- t.Errorf("stdCopy: wrong stdout. Want %q. Got %q.", "", got)
+- }
-}
-
--func (c *ProjectsZonesClustersListCall) Do() (*ListClustersResponse, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+-func TestStdCopySmallFrame(t *testing.T) {
+- var input, stdout, stderr bytes.Buffer
+- input.Write([]byte{2, 0, 0, 0, 0, 0, 0, 20})
+- input.Write([]byte("something happened!"))
+- n, err := stdCopy(&stdout, &stderr, &input)
+- if err != io.ErrShortWrite {
+- t.Errorf("stdCopy: wrong error. Want ShortWrite. Got %#v", err)
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{projectId}/zones/{zoneId}/clusters")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "projectId": c.projectId,
-- "zoneId": c.zoneId,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
+- if expected := int64(19); n != expected {
+- t.Errorf("Wrong number of bytes. Want %d. Got %d.", expected, n)
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- if got := stderr.String(); got != "something happened!" {
+- t.Errorf("stdCopy: wrong stderr. Want %q. Got %q.", "something happened", got)
- }
-- var ret *ListClustersResponse
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- if got := stdout.String(); got != "" {
+- t.Errorf("stdCopy: wrong stdout. Want %q. Got %q.", "", got)
- }
-- return ret, nil
-- // {
-- // "description": "Lists all clusters owned by a project in the specified zone.",
-- // "httpMethod": "GET",
-- // "id": "container.projects.zones.clusters.list",
-- // "parameterOrder": [
-- // "projectId",
-- // "zoneId"
-- // ],
-- // "parameters": {
-- // "projectId": {
-- // "description": "The Google Developers Console project ID or project number.",
-- // "location": "path",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "zoneId": {
-- // "description": "The name of the Google Compute Engine zone in which the cluster resides.",
-- // "location": "path",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{projectId}/zones/{zoneId}/clusters",
-- // "response": {
-- // "$ref": "ListClustersResponse"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/cloud-platform"
-- // ]
-- // }
--
-}
-
--// method id "container.projects.zones.operations.get":
--
--type ProjectsZonesOperationsGetCall struct {
-- s *Service
-- projectId string
-- zoneId string
-- operationId string
-- opt_ map[string]interface{}
+-func TestStdCopyEmpty(t *testing.T) {
+- var input, stdout, stderr bytes.Buffer
+- n, err := stdCopy(&stdout, &stderr, &input)
+- if err != nil {
+- t.Fatal(err)
+- }
+- if n != 0 {
+- t.Errorf("stdCopy: wrong number of bytes. Want 0. Got %d.", n)
+- }
-}
-
--// Get: Gets the specified operation.
--func (r *ProjectsZonesOperationsService) Get(projectId string, zoneId string, operationId string) *ProjectsZonesOperationsGetCall {
-- c := &ProjectsZonesOperationsGetCall{s: r.s, opt_: make(map[string]interface{})}
-- c.projectId = projectId
-- c.zoneId = zoneId
-- c.operationId = operationId
-- return c
+-func TestStdCopyCorruptedHeader(t *testing.T) {
+- var input, stdout, stderr bytes.Buffer
+- input.Write([]byte{2, 0, 0, 0, 0})
+- n, err := stdCopy(&stdout, &stderr, &input)
+- if err != nil {
+- t.Fatal(err)
+- }
+- if n != 0 {
+- t.Errorf("stdCopy: wrong number of bytes. Want 0. Got %d.", n)
+- }
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *ProjectsZonesOperationsGetCall) Fields(s ...googleapi.Field) *ProjectsZonesOperationsGetCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-func TestStdCopyTruncateWriter(t *testing.T) {
+- var input, stdout, stderr bytes.Buffer
+- input.Write([]byte{2, 0, 0, 0, 0, 0, 0, 19})
+- input.Write([]byte("something happened!"))
+- n, err := stdCopy(&stdout, iotest.TruncateWriter(&stderr, 7), &input)
+- if err != nil {
+- t.Fatal(err)
+- }
+- if expected := int64(19); n != expected {
+- t.Errorf("Wrong number of bytes. Want %d. Got %d.", expected, n)
+- }
+- if got := stderr.String(); got != "somethi" {
+- t.Errorf("stdCopy: wrong stderr. Want %q. Got %q.", "somethi", got)
+- }
+- if got := stdout.String(); got != "" {
+- t.Errorf("stdCopy: wrong stdout. Want %q. Got %q.", "", got)
+- }
-}
-
--func (c *ProjectsZonesOperationsGetCall) Do() (*Operation, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
+-func TestStdCopyHeaderOnly(t *testing.T) {
+- var input, stdout, stderr bytes.Buffer
+- input.Write([]byte{2, 0, 0, 0, 0, 0, 0, 19})
+- n, err := stdCopy(&stdout, iotest.TruncateWriter(&stderr, 7), &input)
+- if err != io.ErrShortWrite {
+- t.Errorf("stdCopy: wrong error. Want ShortWrite. Got %#v", err)
- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{projectId}/zones/{zoneId}/operations/{operationId}")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "projectId": c.projectId,
-- "zoneId": c.zoneId,
-- "operationId": c.operationId,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
+- if n != 0 {
+- t.Errorf("Wrong number of bytes. Want 0. Got %d.", n)
- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+- if got := stderr.String(); got != "" {
+- t.Errorf("stdCopy: wrong stderr. Want %q. Got %q.", "", got)
- }
-- var ret *Operation
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- if got := stdout.String(); got != "" {
+- t.Errorf("stdCopy: wrong stdout. Want %q. Got %q.", "", got)
- }
-- return ret, nil
-- // {
-- // "description": "Gets the specified operation.",
-- // "httpMethod": "GET",
-- // "id": "container.projects.zones.operations.get",
-- // "parameterOrder": [
-- // "projectId",
-- // "zoneId",
-- // "operationId"
-- // ],
-- // "parameters": {
-- // "operationId": {
-- // "description": "The server-assigned name of the operation.",
-- // "location": "path",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "projectId": {
-- // "description": "The Google Developers Console project ID or project number.",
-- // "location": "path",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "zoneId": {
-- // "description": "The name of the Google Compute Engine zone in which the operation resides. This is always the same zone as the cluster with which the operation is associated.",
-- // "location": "path",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{projectId}/zones/{zoneId}/operations/{operationId}",
-- // "response": {
-- // "$ref": "Operation"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/cloud-platform"
-- // ]
-- // }
--
-}
-
--// method id "container.projects.zones.operations.list":
+-func TestStdCopyDataErrReader(t *testing.T) {
+- var input, stdout, stderr bytes.Buffer
+- input.Write([]byte{2, 0, 0, 0, 0, 0, 0, 19})
+- input.Write([]byte("something happened!"))
+- n, err := stdCopy(&stdout, &stderr, iotest.DataErrReader(&input))
+- if err != nil {
+- t.Fatal(err)
+- }
+- if expected := int64(19); n != expected {
+- t.Errorf("Wrong number of bytes. Want %d. Got %d.", expected, n)
+- }
+- if got := stderr.String(); got != "something happened!" {
+- t.Errorf("stdCopy: wrong stderr. Want %q. Got %q.", "something happened!", got)
+- }
+- if got := stdout.String(); got != "" {
+- t.Errorf("stdCopy: wrong stdout. Want %q. Got %q.", "", got)
+- }
+-}
-
--type ProjectsZonesOperationsListCall struct {
-- s *Service
-- projectId string
-- zoneId string
-- opt_ map[string]interface{}
+-func TestStdCopyTimeoutReader(t *testing.T) {
+- var input, stdout, stderr bytes.Buffer
+- input.Write([]byte{2, 0, 0, 0, 0, 0, 0, 19})
+- input.Write([]byte("something happened!"))
+- _, err := stdCopy(&stdout, &stderr, iotest.TimeoutReader(&input))
+- if err != iotest.ErrTimeout {
+- t.Errorf("stdCopy: wrong error. Want ErrTimeout. Got %#v.", err)
+- }
-}
-
--// List: Lists all operations in a project in a specific zone.
--func (r *ProjectsZonesOperationsService) List(projectId string, zoneId string) *ProjectsZonesOperationsListCall {
-- c := &ProjectsZonesOperationsListCall{s: r.s, opt_: make(map[string]interface{})}
-- c.projectId = projectId
-- c.zoneId = zoneId
-- return c
+-func TestStdCopyWriteError(t *testing.T) {
+- var input bytes.Buffer
+- input.Write([]byte{2, 0, 0, 0, 0, 0, 0, 19})
+- input.Write([]byte("something happened!"))
+- var stdout, stderr errorWriter
+- n, err := stdCopy(stdout, stderr, &input)
+- if err.Error() != "something went wrong" {
+- t.Errorf("stdCopy: wrong error. Want %q. Got %q", "something went wrong", err)
+- }
+- if n != 0 {
+- t.Errorf("stdCopy: wrong number of bytes. Want 0. Got %d.", n)
+- }
-}
-
--// Fields allows partial responses to be retrieved.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--// for more information.
--func (c *ProjectsZonesOperationsListCall) Fields(s ...googleapi.Field) *ProjectsZonesOperationsListCall {
-- c.opt_["fields"] = googleapi.CombineFields(s)
-- return c
+-type StdType [8]byte
+-
+-var (
+- Stdin = StdType{0: 0}
+- Stdout = StdType{0: 1}
+- Stderr = StdType{0: 2}
+-)
+-
+-type StdWriter struct {
+- io.Writer
+- prefix StdType
+- sizeBuf []byte
-}
-
--func (c *ProjectsZonesOperationsListCall) Do() (*ListOperationsResponse, error) {
-- var body io.Reader = nil
-- params := make(url.Values)
-- params.Set("alt", "json")
-- if v, ok := c.opt_["fields"]; ok {
-- params.Set("fields", fmt.Sprintf("%v", v))
-- }
-- urls := googleapi.ResolveRelative(c.s.BasePath, "{projectId}/zones/{zoneId}/operations")
-- urls += "?" + params.Encode()
-- req, _ := http.NewRequest("GET", urls, body)
-- googleapi.Expand(req.URL, map[string]string{
-- "projectId": c.projectId,
-- "zoneId": c.zoneId,
-- })
-- req.Header.Set("User-Agent", "google-api-go-client/0.5")
-- res, err := c.s.client.Do(req)
-- if err != nil {
-- return nil, err
-- }
-- defer googleapi.CloseBody(res)
-- if err := googleapi.CheckResponse(res); err != nil {
-- return nil, err
+-func (w *StdWriter) Write(buf []byte) (n int, err error) {
+- if w == nil || w.Writer == nil {
+- return 0, errors.New("Writer not instanciated")
- }
-- var ret *ListOperationsResponse
-- if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
-- return nil, err
+- binary.BigEndian.PutUint32(w.prefix[4:], uint32(len(buf)))
+- buf = append(w.prefix[:], buf...)
+-
+- n, err = w.Writer.Write(buf)
+- return n - 8, err
+-}
+-
+-func newStdWriter(w io.Writer, t StdType) *StdWriter {
+- if len(t) != 8 {
+- return nil
- }
-- return ret, nil
-- // {
-- // "description": "Lists all operations in a project in a specific zone.",
-- // "httpMethod": "GET",
-- // "id": "container.projects.zones.operations.list",
-- // "parameterOrder": [
-- // "projectId",
-- // "zoneId"
-- // ],
-- // "parameters": {
-- // "projectId": {
-- // "description": "The Google Developers Console project ID or project number.",
-- // "location": "path",
-- // "required": true,
-- // "type": "string"
-- // },
-- // "zoneId": {
-- // "description": "The name of the Google Compute Engine zone to return operations for.",
-- // "location": "path",
-- // "required": true,
-- // "type": "string"
-- // }
-- // },
-- // "path": "{projectId}/zones/{zoneId}/operations",
-- // "response": {
-- // "$ref": "ListOperationsResponse"
-- // },
-- // "scopes": [
-- // "https://www.googleapis.com/auth/cloud-platform"
-- // ]
-- // }
-
+- return &StdWriter{
+- Writer: w,
+- prefix: t,
+- sizeBuf: make([]byte, 4),
+- }
-}
-diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/googleapi.go b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/googleapi.go
+diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/Dockerfile b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/Dockerfile
deleted file mode 100644
-index d6e5cd8..0000000
---- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/googleapi.go
+index 0948dcf..0000000
+--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/Dockerfile
+++ /dev/null
-@@ -1,401 +0,0 @@
--// Copyright 2011 Google Inc. All rights reserved.
+@@ -1,15 +0,0 @@
+-# this file describes how to build tsuru python image
+-# to run it:
+-# 1- install docker
+-# 2- run: $ docker build -t tsuru/python https://raw.github.com/tsuru/basebuilder/master/python/Dockerfile
+-
+-from base:ubuntu-quantal
+-run apt-get install wget -y --force-yes
+-run wget http://github.com/tsuru/basebuilder/tarball/master -O basebuilder.tar.gz --no-check-certificate
+-run mkdir /var/lib/tsuru
+-run tar -xvf basebuilder.tar.gz -C /var/lib/tsuru --strip 1
+-run cp /var/lib/tsuru/python/deploy /var/lib/tsuru
+-run cp /var/lib/tsuru/base/restart /var/lib/tsuru
+-run cp /var/lib/tsuru/base/start /var/lib/tsuru
+-run /var/lib/tsuru/base/install
+-run /var/lib/tsuru/base/setup
+diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/container.tar b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/container.tar
+deleted file mode 100644
+index e4b066e3b6df8cb78ac445a34234f3780d164cf4..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 2048
+zcmeH_Q3``F42FH)DgF~kTC`qZ7s*`9%A^%r$Bu89Fp<6NMew1akmheFe?H>)Y5N#5
+z`(UT)m>?q4G^iwZ#(XmAwH8Ujv`|_rQd)Ig3sQ!(szArs+5bAH%#&Di1HU}iJx_zp
+z+3uU9k~Zgl)J<3?S%)LS_Hgc7e)t4AX&%Rz>>WAcX2Ec>82D}md=O1Y)p%bo=N_rJ
+OD+CIGLZA@%gTMmt=q{T8
+
+diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/dockerfile.tar b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/dockerfile.tar
+deleted file mode 100644
+index 32c9ce64704835cd096b85ac44c35b5087b5ccdd..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 2560
+zcmeHGy>8<$49;3V1%d0TNOs}`$a>xT46-c8LTt+?QB8ACf0XPiQll-<p+kUZFvXvb
+z{76$zR-LqKOs7{rc7zbS?G{!f_q$z^qL_3tiM%LE$cs&}-<R8RFF at p*a#OBA{1~IF
+z#KEI<M2)`Q_$$ZaN?}d2uwARM6CtMNqP&sw3$QgF;sQXey>h0~9$I?_v`_`p)qp;@
+z0OJK)JAmosQD=m*-~y?5ASGvD1{zS;L7n!AYz2z}2Y8%Kb25fgK0fDb5l4UE+{yF$
+zXs`{{TG^hbn!J);Cl1>2UV0=k!T8hL+GbhfZ2u5L51|SJ2KFb&fyiW3|3Qw(jvC+i
+zouk4oz*u9Q((Iyric9uLhPZsmgZ8ANMrS_2p5cn+n!M}dU&=mMrdq8|OlgOvF-oFN
+zh5A!%9Pk(EcxS4q(c~Z~u-BL7!+gIN2&&-GnGy1YRpY|{e@?X?J9}9;KY_$PxYO}H
+o;5QJT#=q||{Y*ZuNn-Gk-)jtGb|Y`+PV+v2`vmS2xaA4_1I+dVl>h($
+
+diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/server.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/server.go
+deleted file mode 100644
+index e2ca1d9..0000000
+--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/server.go
++++ /dev/null
+@@ -1,692 +0,0 @@
+-// Copyright 2014 go-dockerclient authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
--// Package googleapi contains the common code shared by all Google API
--// libraries.
--package googleapi
+-// Package testing provides a fake implementation of the Docker API, useful for
+-// testing purpose.
+-package testing
-
-import (
-- "bytes"
-- "encoding/json"
-- "fmt"
-- "io"
-- "io/ioutil"
-- "mime/multipart"
-- "net/http"
-- "net/textproto"
-- "net/url"
-- "os"
-- "strings"
--
-- "code.google.com/p/google-api-go-client/googleapi/internal/uritemplates"
--)
--
--// ContentTyper is an interface for Readers which know (or would like
--// to override) their Content-Type. If a media body doesn't implement
--// ContentTyper, the type is sniffed from the content using
--// http.DetectContentType.
--type ContentTyper interface {
-- ContentType() string
--}
--
--const Version = "0.5"
--
--// Error contains an error response from the server.
--type Error struct {
-- // Code is the HTTP response status code and will always be populated.
-- Code int `json:"code"`
-- // Message is the server response message and is only populated when
-- // explicitly referenced by the JSON server response.
-- Message string `json:"message"`
-- // Body is the raw response returned by the server.
-- // It is often but not always JSON, depending on how the request fails.
-- Body string
+- "archive/tar"
+- "crypto/rand"
+- "encoding/json"
+- "errors"
+- "fmt"
+- mathrand "math/rand"
+- "net"
+- "net/http"
+- "regexp"
+- "strconv"
+- "strings"
+- "sync"
+- "time"
-
-- Errors []ErrorItem
--}
+- "github.com/fsouza/go-dockerclient"
+- "github.com/gorilla/mux"
+-)
-
--// ErrorItem is a detailed error code & message from the Google API frontend.
--type ErrorItem struct {
-- // Reason is the typed error code. For example: "some_example".
-- Reason string `json:"reason"`
-- // Message is the human-readable description of the error.
-- Message string `json:"message"`
+-// DockerServer represents a programmable, concurrent (not much), HTTP server
+-// implementing a fake version of the Docker remote API.
+-//
+-// It can used in standalone mode, listening for connections or as an arbitrary
+-// HTTP handler.
+-//
+-// For more details on the remote API, check http://goo.gl/G3plxW.
+-type DockerServer struct {
+- containers []*docker.Container
+- cMut sync.RWMutex
+- images []docker.Image
+- iMut sync.RWMutex
+- imgIDs map[string]string
+- listener net.Listener
+- mux *mux.Router
+- hook func(*http.Request)
+- failures map[string]string
+- customHandlers map[string]http.Handler
+- handlerMutex sync.RWMutex
+- cChan chan<- *docker.Container
-}
-
--func (e *Error) Error() string {
-- if len(e.Errors) == 0 && e.Message == "" {
-- return fmt.Sprintf("googleapi: got HTTP response code %d with body: %v", e.Code, e.Body)
-- }
-- var buf bytes.Buffer
-- fmt.Fprintf(&buf, "googleapi: Error %d: ", e.Code)
-- if e.Message != "" {
-- fmt.Fprintf(&buf, "%s", e.Message)
-- }
-- if len(e.Errors) == 0 {
-- return strings.TrimSpace(buf.String())
+-// NewServer returns a new instance of the fake server, in standalone mode. Use
+-// the method URL to get the URL of the server.
+-//
+-// It receives the bind address (use 127.0.0.1:0 for getting an available port
+-// on the host), a channel of containers and a hook function, that will be
+-// called on every request.
+-//
+-// The fake server will send containers in the channel whenever the container
+-// changes its state, via the HTTP API (i.e.: create, start and stop). This
+-// channel may be nil, which means that the server won't notify on state
+-// changes.
+-func NewServer(bind string, containerChan chan<- *docker.Container, hook func(*http.Request)) (*DockerServer, error) {
+- listener, err := net.Listen("tcp", bind)
+- if err != nil {
+- return nil, err
- }
-- if len(e.Errors) == 1 && e.Errors[0].Message == e.Message {
-- fmt.Fprintf(&buf, ", %s", e.Errors[0].Reason)
-- return buf.String()
+- server := DockerServer{
+- listener: listener,
+- imgIDs: make(map[string]string),
+- hook: hook,
+- failures: make(map[string]string),
+- customHandlers: make(map[string]http.Handler),
+- cChan: containerChan,
- }
-- fmt.Fprintln(&buf, "\nMore details:")
-- for _, v := range e.Errors {
-- fmt.Fprintf(&buf, "Reason: %s, Message: %s\n", v.Reason, v.Message)
+- server.buildMuxer()
+- go http.Serve(listener, &server)
+- return &server, nil
+-}
+-
+-func (s *DockerServer) notify(container *docker.Container) {
+- if s.cChan != nil {
+- s.cChan <- container
- }
-- return buf.String()
-}
-
--type errorReply struct {
-- Error *Error `json:"error"`
+-func (s *DockerServer) buildMuxer() {
+- s.mux = mux.NewRouter()
+- s.mux.Path("/commit").Methods("POST").HandlerFunc(s.handlerWrapper(s.commitContainer))
+- s.mux.Path("/containers/json").Methods("GET").HandlerFunc(s.handlerWrapper(s.listContainers))
+- s.mux.Path("/containers/create").Methods("POST").HandlerFunc(s.handlerWrapper(s.createContainer))
+- s.mux.Path("/containers/{id:.*}/json").Methods("GET").HandlerFunc(s.handlerWrapper(s.inspectContainer))
+- s.mux.Path("/containers/{id:.*}/top").Methods("GET").HandlerFunc(s.handlerWrapper(s.topContainer))
+- s.mux.Path("/containers/{id:.*}/start").Methods("POST").HandlerFunc(s.handlerWrapper(s.startContainer))
+- s.mux.Path("/containers/{id:.*}/stop").Methods("POST").HandlerFunc(s.handlerWrapper(s.stopContainer))
+- s.mux.Path("/containers/{id:.*}/pause").Methods("POST").HandlerFunc(s.handlerWrapper(s.pauseContainer))
+- s.mux.Path("/containers/{id:.*}/unpause").Methods("POST").HandlerFunc(s.handlerWrapper(s.unpauseContainer))
+- s.mux.Path("/containers/{id:.*}/wait").Methods("POST").HandlerFunc(s.handlerWrapper(s.waitContainer))
+- s.mux.Path("/containers/{id:.*}/attach").Methods("POST").HandlerFunc(s.handlerWrapper(s.attachContainer))
+- s.mux.Path("/containers/{id:.*}").Methods("DELETE").HandlerFunc(s.handlerWrapper(s.removeContainer))
+- s.mux.Path("/images/create").Methods("POST").HandlerFunc(s.handlerWrapper(s.pullImage))
+- s.mux.Path("/build").Methods("POST").HandlerFunc(s.handlerWrapper(s.buildImage))
+- s.mux.Path("/images/json").Methods("GET").HandlerFunc(s.handlerWrapper(s.listImages))
+- s.mux.Path("/images/{id:.*}").Methods("DELETE").HandlerFunc(s.handlerWrapper(s.removeImage))
+- s.mux.Path("/images/{name:.*}/json").Methods("GET").HandlerFunc(s.handlerWrapper(s.inspectImage))
+- s.mux.Path("/images/{name:.*}/push").Methods("POST").HandlerFunc(s.handlerWrapper(s.pushImage))
+- s.mux.Path("/events").Methods("GET").HandlerFunc(s.listEvents)
+- s.mux.Path("/_ping").Methods("GET").HandlerFunc(s.handlerWrapper(s.pingDocker))
+- s.mux.Path("/images/load").Methods("POST").HandlerFunc(s.handlerWrapper(s.loadImage))
+- s.mux.Path("/images/{id:.*}/get").Methods("GET").HandlerFunc(s.handlerWrapper(s.getImage))
-}
-
--// CheckResponse returns an error (of type *Error) if the response
--// status code is not 2xx.
--func CheckResponse(res *http.Response) error {
-- if res.StatusCode >= 200 && res.StatusCode <= 299 {
-- return nil
-- }
-- slurp, err := ioutil.ReadAll(res.Body)
-- if err == nil {
-- jerr := new(errorReply)
-- err = json.Unmarshal(slurp, jerr)
-- if err == nil && jerr.Error != nil {
-- if jerr.Error.Code == 0 {
-- jerr.Error.Code = res.StatusCode
-- }
-- jerr.Error.Body = string(slurp)
-- return jerr.Error
-- }
-- }
-- return &Error{
-- Code: res.StatusCode,
-- Body: string(slurp),
-- }
+-// PrepareFailure adds a new expected failure based on a URL regexp it receives
+-// an id for the failure.
+-func (s *DockerServer) PrepareFailure(id string, urlRegexp string) {
+- s.failures[id] = urlRegexp
-}
-
--type MarshalStyle bool
+-// ResetFailure removes an expected failure identified by the given id.
+-func (s *DockerServer) ResetFailure(id string) {
+- delete(s.failures, id)
+-}
-
--var WithDataWrapper = MarshalStyle(true)
--var WithoutDataWrapper = MarshalStyle(false)
+-// CustomHandler registers a custom handler for a specific path.
+-//
+-// For example:
+-//
+-// server.CustomHandler("/containers/json", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+-// http.Error(w, "Something wrong is not right", http.StatusInternalServerError)
+-// }))
+-func (s *DockerServer) CustomHandler(path string, handler http.Handler) {
+- s.handlerMutex.Lock()
+- s.customHandlers[path] = handler
+- s.handlerMutex.Unlock()
+-}
-
--func (wrap MarshalStyle) JSONReader(v interface{}) (io.Reader, error) {
-- buf := new(bytes.Buffer)
-- if wrap {
-- buf.Write([]byte(`{"data": `))
-- }
-- err := json.NewEncoder(buf).Encode(v)
-- if err != nil {
-- return nil, err
-- }
-- if wrap {
-- buf.Write([]byte(`}`))
+-// MutateContainer changes the state of a container, returning an error if the
+-// given id does not match to any container "running" in the server.
+-func (s *DockerServer) MutateContainer(id string, state docker.State) error {
+- for _, container := range s.containers {
+- if container.ID == id {
+- container.State = state
+- return nil
+- }
- }
-- return buf, nil
+- return errors.New("container not found")
-}
-
--func getMediaType(media io.Reader) (io.Reader, string) {
-- if typer, ok := media.(ContentTyper); ok {
-- return media, typer.ContentType()
+-// Stop stops the server.
+-func (s *DockerServer) Stop() {
+- if s.listener != nil {
+- s.listener.Close()
- }
+-}
-
-- typ := "application/octet-stream"
-- buf := make([]byte, 1024)
-- n, err := media.Read(buf)
-- buf = buf[:n]
-- if err == nil {
-- typ = http.DetectContentType(buf)
+-// URL returns the HTTP URL of the server.
+-func (s *DockerServer) URL() string {
+- if s.listener == nil {
+- return ""
- }
-- return io.MultiReader(bytes.NewBuffer(buf), media), typ
+- return "http://" + s.listener.Addr().String() + "/"
-}
-
--type Lengther interface {
-- Len() int
+-// ServeHTTP handles HTTP requests sent to the server.
+-func (s *DockerServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+- s.handlerMutex.RLock()
+- defer s.handlerMutex.RUnlock()
+- if handler, ok := s.customHandlers[r.URL.Path]; ok {
+- handler.ServeHTTP(w, r)
+- return
+- }
+- s.mux.ServeHTTP(w, r)
+- if s.hook != nil {
+- s.hook(r)
+- }
-}
-
--// endingWithErrorReader from r until it returns an error. If the
--// final error from r is os.EOF and e is non-nil, e is used instead.
--type endingWithErrorReader struct {
-- r io.Reader
-- e error
+-// Returns default http.Handler mux, it allows customHandlers to call the
+-// default behavior if wanted.
+-func (s *DockerServer) DefaultHandler() http.Handler {
+- return s.mux
-}
-
--func (er endingWithErrorReader) Read(p []byte) (n int, err error) {
-- n, err = er.r.Read(p)
-- if err == io.EOF && er.e != nil {
-- err = er.e
+-func (s *DockerServer) handlerWrapper(f func(http.ResponseWriter, *http.Request)) func(http.ResponseWriter, *http.Request) {
+- return func(w http.ResponseWriter, r *http.Request) {
+- for errorID, urlRegexp := range s.failures {
+- matched, err := regexp.MatchString(urlRegexp, r.URL.Path)
+- if err != nil {
+- http.Error(w, err.Error(), http.StatusBadRequest)
+- return
+- }
+- if !matched {
+- continue
+- }
+- http.Error(w, errorID, http.StatusBadRequest)
+- return
+- }
+- f(w, r)
- }
-- return
-}
-
--func getReaderSize(r io.Reader) (io.Reader, int64) {
-- // Ideal case, the reader knows its own size.
-- if lr, ok := r.(Lengther); ok {
-- return r, int64(lr.Len())
-- }
--
-- // But maybe it's a seeker and we can seek to the end to find its size.
-- if s, ok := r.(io.Seeker); ok {
-- pos0, err := s.Seek(0, os.SEEK_CUR)
-- if err == nil {
-- posend, err := s.Seek(0, os.SEEK_END)
-- if err == nil {
-- _, err = s.Seek(pos0, os.SEEK_SET)
-- if err == nil {
-- return r, posend - pos0
-- } else {
-- // We moved it forward but can't restore it.
-- // Seems unlikely, but can't really restore now.
-- return endingWithErrorReader{strings.NewReader(""), err}, posend - pos0
-- }
+-func (s *DockerServer) listContainers(w http.ResponseWriter, r *http.Request) {
+- all := r.URL.Query().Get("all")
+- s.cMut.RLock()
+- result := make([]docker.APIContainers, len(s.containers))
+- for i, container := range s.containers {
+- if all == "1" || container.State.Running {
+- result[i] = docker.APIContainers{
+- ID: container.ID,
+- Image: container.Image,
+- Command: fmt.Sprintf("%s %s", container.Path, strings.Join(container.Args, " ")),
+- Created: container.Created.Unix(),
+- Status: container.State.String(),
+- Ports: container.NetworkSettings.PortMappingAPI(),
- }
- }
- }
--
-- // Otherwise we have to make a copy to calculate how big the reader is.
-- buf := new(bytes.Buffer)
-- // TODO(bradfitz): put a cap on this copy? spill to disk after
-- // a certain point?
-- _, err := io.Copy(buf, r)
-- return endingWithErrorReader{buf, err}, int64(buf.Len())
+- s.cMut.RUnlock()
+- w.Header().Set("Content-Type", "application/json")
+- w.WriteHeader(http.StatusOK)
+- json.NewEncoder(w).Encode(result)
-}
-
--func typeHeader(contentType string) textproto.MIMEHeader {
-- h := make(textproto.MIMEHeader)
-- h.Set("Content-Type", contentType)
-- return h
+-func (s *DockerServer) listImages(w http.ResponseWriter, r *http.Request) {
+- s.cMut.RLock()
+- result := make([]docker.APIImages, len(s.images))
+- for i, image := range s.images {
+- result[i] = docker.APIImages{
+- ID: image.ID,
+- Created: image.Created.Unix(),
+- }
+- for tag, id := range s.imgIDs {
+- if id == image.ID {
+- result[i].RepoTags = append(result[i].RepoTags, tag)
+- }
+- }
+- }
+- s.cMut.RUnlock()
+- w.Header().Set("Content-Type", "application/json")
+- w.WriteHeader(http.StatusOK)
+- json.NewEncoder(w).Encode(result)
-}
-
--// countingWriter counts the number of bytes it receives to write, but
--// discards them.
--type countingWriter struct {
-- n *int64
+-func (s *DockerServer) findImage(id string) (string, error) {
+- s.iMut.RLock()
+- defer s.iMut.RUnlock()
+- image, ok := s.imgIDs[id]
+- if ok {
+- return image, nil
+- }
+- image, _, err := s.findImageByID(id)
+- return image, err
-}
-
--func (w countingWriter) Write(p []byte) (int, error) {
-- *w.n += int64(len(p))
-- return len(p), nil
+-func (s *DockerServer) findImageByID(id string) (string, int, error) {
+- s.iMut.RLock()
+- defer s.iMut.RUnlock()
+- for i, image := range s.images {
+- if image.ID == id {
+- return image.ID, i, nil
+- }
+- }
+- return "", -1, errors.New("No such image")
-}
-
--// ConditionallyIncludeMedia does nothing if media is nil.
--//
--// bodyp is an in/out parameter. It should initially point to the
--// reader of the application/json (or whatever) payload to send in the
--// API request. It's updated to point to the multipart body reader.
--//
--// ctypep is an in/out parameter. It should initially point to the
--// content type of the bodyp, usually "application/json". It's updated
--// to the "multipart/related" content type, with random boundary.
--//
--// The return value is the content-length of the entire multpart body.
--func ConditionallyIncludeMedia(media io.Reader, bodyp *io.Reader, ctypep *string) (totalContentLength int64, ok bool) {
-- if media == nil {
+-func (s *DockerServer) createContainer(w http.ResponseWriter, r *http.Request) {
+- var config docker.Config
+- defer r.Body.Close()
+- err := json.NewDecoder(r.Body).Decode(&config)
+- if err != nil {
+- http.Error(w, err.Error(), http.StatusBadRequest)
- return
- }
-- // Get the media type and size. The type check might return a
-- // different reader instance, so do the size check first,
-- // which looks at the specific type of the io.Reader.
-- var mediaType string
-- if typer, ok := media.(ContentTyper); ok {
-- mediaType = typer.ContentType()
+- image, err := s.findImage(config.Image)
+- if err != nil {
+- http.Error(w, err.Error(), http.StatusNotFound)
+- return
- }
-- media, mediaSize := getReaderSize(media)
-- if mediaType == "" {
-- media, mediaType = getMediaType(media)
+- w.WriteHeader(http.StatusCreated)
+- ports := map[docker.Port][]docker.PortBinding{}
+- for port := range config.ExposedPorts {
+- ports[port] = []docker.PortBinding{{
+- HostIp: "0.0.0.0",
+- HostPort: strconv.Itoa(mathrand.Int() % 65536),
+- }}
- }
-- body, bodyType := *bodyp, *ctypep
-- body, bodySize := getReaderSize(body)
-
-- // Calculate how big the the multipart will be.
-- {
-- totalContentLength = bodySize + mediaSize
-- mpw := multipart.NewWriter(countingWriter{&totalContentLength})
-- mpw.CreatePart(typeHeader(bodyType))
-- mpw.CreatePart(typeHeader(mediaType))
-- mpw.Close()
+- //the container may not have cmd when using a Dockerfile
+- var path string
+- var args []string
+- if len(config.Cmd) == 1 {
+- path = config.Cmd[0]
+- } else if len(config.Cmd) > 1 {
+- path = config.Cmd[0]
+- args = config.Cmd[1:]
- }
-
-- pr, pw := io.Pipe()
-- mpw := multipart.NewWriter(pw)
-- *bodyp = pr
-- *ctypep = "multipart/related; boundary=" + mpw.Boundary()
-- go func() {
-- defer pw.Close()
-- defer mpw.Close()
--
-- w, err := mpw.CreatePart(typeHeader(bodyType))
-- if err != nil {
-- return
-- }
-- _, err = io.Copy(w, body)
-- if err != nil {
-- return
-- }
--
-- w, err = mpw.CreatePart(typeHeader(mediaType))
-- if err != nil {
-- return
-- }
-- _, err = io.Copy(w, media)
-- if err != nil {
-- return
-- }
-- }()
-- return totalContentLength, true
+- container := docker.Container{
+- ID: s.generateID(),
+- Created: time.Now(),
+- Path: path,
+- Args: args,
+- Config: &config,
+- State: docker.State{
+- Running: false,
+- Pid: mathrand.Int() % 50000,
+- ExitCode: 0,
+- StartedAt: time.Now(),
+- },
+- Image: image,
+- NetworkSettings: &docker.NetworkSettings{
+- IPAddress: fmt.Sprintf("172.16.42.%d", mathrand.Int()%250+2),
+- IPPrefixLen: 24,
+- Gateway: "172.16.42.1",
+- Bridge: "docker0",
+- Ports: ports,
+- },
+- }
+- s.cMut.Lock()
+- s.containers = append(s.containers, &container)
+- s.cMut.Unlock()
+- s.notify(&container)
+- var c = struct{ ID string }{ID: container.ID}
+- json.NewEncoder(w).Encode(c)
-}
-
--func ResolveRelative(basestr, relstr string) string {
-- u, _ := url.Parse(basestr)
-- rel, _ := url.Parse(relstr)
-- u = u.ResolveReference(rel)
-- us := u.String()
-- us = strings.Replace(us, "%7B", "{", -1)
-- us = strings.Replace(us, "%7D", "}", -1)
-- return us
+-func (s *DockerServer) generateID() string {
+- var buf [16]byte
+- rand.Read(buf[:])
+- return fmt.Sprintf("%x", buf)
-}
-
--// has4860Fix is whether this Go environment contains the fix for
--// http://golang.org/issue/4860
--var has4860Fix bool
--
--// init initializes has4860Fix by checking the behavior of the net/http package.
--func init() {
-- r := http.Request{
-- URL: &url.URL{
-- Scheme: "http",
-- Opaque: "//opaque",
-- },
+-func (s *DockerServer) inspectContainer(w http.ResponseWriter, r *http.Request) {
+- id := mux.Vars(r)["id"]
+- container, _, err := s.findContainer(id)
+- if err != nil {
+- http.Error(w, err.Error(), http.StatusNotFound)
+- return
- }
-- b := &bytes.Buffer{}
-- r.Write(b)
-- has4860Fix = bytes.HasPrefix(b.Bytes(), []byte("GET http"))
+- w.Header().Set("Content-Type", "application/json")
+- w.WriteHeader(http.StatusOK)
+- json.NewEncoder(w).Encode(container)
-}
-
--// SetOpaque sets u.Opaque from u.Path such that HTTP requests to it
--// don't alter any hex-escaped characters in u.Path.
--func SetOpaque(u *url.URL) {
-- u.Opaque = "//" + u.Host + u.Path
-- if !has4860Fix {
-- u.Opaque = u.Scheme + ":" + u.Opaque
+-func (s *DockerServer) topContainer(w http.ResponseWriter, r *http.Request) {
+- id := mux.Vars(r)["id"]
+- container, _, err := s.findContainer(id)
+- if err != nil {
+- http.Error(w, err.Error(), http.StatusNotFound)
+- return
- }
--}
--
--// Expand subsitutes any {encoded} strings in the URL passed in using
--// the map supplied.
--//
--// This calls SetOpaque to avoid encoding of the parameters in the URL path.
--func Expand(u *url.URL, expansions map[string]string) {
-- expanded, err := uritemplates.Expand(u.Path, expansions)
-- if err == nil {
-- u.Path = expanded
-- SetOpaque(u)
+- if !container.State.Running {
+- w.WriteHeader(http.StatusInternalServerError)
+- fmt.Fprintf(w, "Container %s is not running", id)
+- return
+- }
+- w.Header().Set("Content-Type", "application/json")
+- w.WriteHeader(http.StatusOK)
+- result := docker.TopResult{
+- Titles: []string{"UID", "PID", "PPID", "C", "STIME", "TTY", "TIME", "CMD"},
+- Processes: [][]string{
+- {"root", "7535", "7516", "0", "03:20", "?", "00:00:00", container.Path + " " + strings.Join(container.Args, " ")},
+- },
- }
+- json.NewEncoder(w).Encode(result)
-}
-
--// CloseBody is used to close res.Body.
--// Prior to calling Close, it also tries to Read a small amount to see an EOF.
--// Not seeing an EOF can prevent HTTP Transports from reusing connections.
--func CloseBody(res *http.Response) {
-- if res == nil || res.Body == nil {
+-func (s *DockerServer) startContainer(w http.ResponseWriter, r *http.Request) {
+- id := mux.Vars(r)["id"]
+- container, _, err := s.findContainer(id)
+- if err != nil {
+- http.Error(w, err.Error(), http.StatusNotFound)
- return
- }
-- // Justification for 3 byte reads: two for up to "\r\n" after
-- // a JSON/XML document, and then 1 to see EOF if we haven't yet.
-- // TODO(bradfitz): detect Go 1.3+ and skip these reads.
-- // See https://codereview.appspot.com/58240043
-- // and https://codereview.appspot.com/49570044
-- buf := make([]byte, 1)
-- for i := 0; i < 3; i++ {
-- _, err := res.Body.Read(buf)
-- if err != nil {
-- break
-- }
+- s.cMut.Lock()
+- defer s.cMut.Unlock()
+- if container.State.Running {
+- http.Error(w, "Container already running", http.StatusBadRequest)
+- return
- }
-- res.Body.Close()
--
--}
--
--// VariantType returns the type name of the given variant.
--// If the map doesn't contain the named key or the value is not a []interface{}, "" is returned.
--// This is used to support "variant" APIs that can return one of a number of different types.
--func VariantType(t map[string]interface{}) string {
-- s, _ := t["type"].(string)
-- return s
+- container.State.Running = true
+- s.notify(container)
-}
-
--// ConvertVariant uses the JSON encoder/decoder to fill in the struct 'dst' with the fields found in variant 'v'.
--// This is used to support "variant" APIs that can return one of a number of different types.
--// It reports whether the conversion was successful.
--func ConvertVariant(v map[string]interface{}, dst interface{}) bool {
-- var buf bytes.Buffer
-- err := json.NewEncoder(&buf).Encode(v)
+-func (s *DockerServer) stopContainer(w http.ResponseWriter, r *http.Request) {
+- id := mux.Vars(r)["id"]
+- container, _, err := s.findContainer(id)
- if err != nil {
-- return false
+- http.Error(w, err.Error(), http.StatusNotFound)
+- return
- }
-- return json.Unmarshal(buf.Bytes(), dst) == nil
+- s.cMut.Lock()
+- defer s.cMut.Unlock()
+- if !container.State.Running {
+- http.Error(w, "Container not running", http.StatusBadRequest)
+- return
+- }
+- w.WriteHeader(http.StatusNoContent)
+- container.State.Running = false
+- s.notify(container)
-}
-
--// A Field names a field to be retrieved with a partial response.
--// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
--//
--// Partial responses can dramatically reduce the amount of data that must be sent to your application.
--// In order to request partial responses, you can specify the full list of fields
--// that your application needs by adding the Fields option to your request.
--//
--// Field strings use camelCase with leading lower-case characters to identify fields within the response.
--//
--// For example, if your response has a "NextPageToken" and a slice of "Items" with "Id" fields,
--// you could request just those fields like this:
--//
--// svc.Events.List().Fields("nextPageToken", "items/id").Do()
--//
--// or if you were also interested in each Item's "Updated" field, you can combine them like this:
--//
--// svc.Events.List().Fields("nextPageToken", "items(id,updated)").Do()
--//
--// More information about field formatting can be found here:
--// https://developers.google.com/+/api/#fields-syntax
--//
--// Another way to find field names is through the Google API explorer:
--// https://developers.google.com/apis-explorer/#p/
--type Field string
--
--// CombineFields combines fields into a single string.
--func CombineFields(s []Field) string {
-- r := make([]string, len(s))
-- for i, v := range s {
-- r[i] = string(v)
+-func (s *DockerServer) pauseContainer(w http.ResponseWriter, r *http.Request) {
+- id := mux.Vars(r)["id"]
+- container, _, err := s.findContainer(id)
+- if err != nil {
+- http.Error(w, err.Error(), http.StatusNotFound)
+- return
- }
-- return strings.Join(r, ",")
+- s.cMut.Lock()
+- defer s.cMut.Unlock()
+- if container.State.Paused {
+- http.Error(w, "Container already paused", http.StatusBadRequest)
+- return
+- }
+- w.WriteHeader(http.StatusNoContent)
+- container.State.Paused = true
-}
-diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/googleapi_test.go b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/googleapi_test.go
-deleted file mode 100644
-index abc5185..0000000
---- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/googleapi_test.go
-+++ /dev/null
-@@ -1,361 +0,0 @@
--// Copyright 2011 Google Inc. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--package googleapi
--
--import (
-- "bytes"
-- "encoding/json"
-- "fmt"
-- "io/ioutil"
-- "net/http"
-- "net/url"
-- "reflect"
-- "strings"
-- "testing"
--)
-
--type SetOpaqueTest struct {
-- in *url.URL
-- wantRequestURI string
+-func (s *DockerServer) unpauseContainer(w http.ResponseWriter, r *http.Request) {
+- id := mux.Vars(r)["id"]
+- container, _, err := s.findContainer(id)
+- if err != nil {
+- http.Error(w, err.Error(), http.StatusNotFound)
+- return
+- }
+- s.cMut.Lock()
+- defer s.cMut.Unlock()
+- if !container.State.Paused {
+- http.Error(w, "Container not paused", http.StatusBadRequest)
+- return
+- }
+- w.WriteHeader(http.StatusNoContent)
+- container.State.Paused = false
-}
-
--var setOpaqueTests = []SetOpaqueTest{
-- // no path
-- {
-- &url.URL{
-- Scheme: "http",
-- Host: "www.golang.org",
-- },
-- "http://www.golang.org",
-- },
-- // path
-- {
-- &url.URL{
-- Scheme: "http",
-- Host: "www.golang.org",
-- Path: "/",
-- },
-- "http://www.golang.org/",
-- },
-- // file with hex escaping
-- {
-- &url.URL{
-- Scheme: "https",
-- Host: "www.golang.org",
-- Path: "/file%20one&two",
-- },
-- "https://www.golang.org/file%20one&two",
-- },
-- // query
-- {
-- &url.URL{
-- Scheme: "http",
-- Host: "www.golang.org",
-- Path: "/",
-- RawQuery: "q=go+language",
-- },
-- "http://www.golang.org/?q=go+language",
-- },
-- // file with hex escaping in path plus query
-- {
-- &url.URL{
-- Scheme: "https",
-- Host: "www.golang.org",
-- Path: "/file%20one&two",
-- RawQuery: "q=go+language",
-- },
-- "https://www.golang.org/file%20one&two?q=go+language",
-- },
-- // query with hex escaping
-- {
-- &url.URL{
-- Scheme: "http",
-- Host: "www.golang.org",
-- Path: "/",
-- RawQuery: "q=go%20language",
-- },
-- "http://www.golang.org/?q=go%20language",
-- },
+-func (s *DockerServer) attachContainer(w http.ResponseWriter, r *http.Request) {
+- id := mux.Vars(r)["id"]
+- container, _, err := s.findContainer(id)
+- if err != nil {
+- http.Error(w, err.Error(), http.StatusNotFound)
+- return
+- }
+- outStream := newStdWriter(w, stdout)
+- fmt.Fprintf(outStream, "HTTP/1.1 200 OK\r\nContent-Type: application/vnd.docker.raw-stream\r\n\r\n")
+- if container.State.Running {
+- fmt.Fprintf(outStream, "Container %q is running\n", container.ID)
+- } else {
+- fmt.Fprintf(outStream, "Container %q is not running\n", container.ID)
+- }
+- fmt.Fprintln(outStream, "What happened?")
+- fmt.Fprintln(outStream, "Something happened")
-}
-
--// prefixTmpl is a template for the expected prefix of the output of writing
--// an HTTP request.
--const prefixTmpl = "GET %v HTTP/1.1\r\nHost: %v\r\n"
--
--func TestSetOpaque(t *testing.T) {
-- for _, test := range setOpaqueTests {
-- u := *test.in
-- SetOpaque(&u)
--
-- w := &bytes.Buffer{}
-- r := &http.Request{URL: &u}
-- if err := r.Write(w); err != nil {
-- t.Errorf("write request: %v", err)
-- continue
-- }
--
-- prefix := fmt.Sprintf(prefixTmpl, test.wantRequestURI, test.in.Host)
-- if got := string(w.Bytes()); !strings.HasPrefix(got, prefix) {
-- t.Errorf("got %q expected prefix %q", got, prefix)
+-func (s *DockerServer) waitContainer(w http.ResponseWriter, r *http.Request) {
+- id := mux.Vars(r)["id"]
+- container, _, err := s.findContainer(id)
+- if err != nil {
+- http.Error(w, err.Error(), http.StatusNotFound)
+- return
+- }
+- for {
+- time.Sleep(1e6)
+- s.cMut.RLock()
+- if !container.State.Running {
+- s.cMut.RUnlock()
+- break
- }
+- s.cMut.RUnlock()
- }
+- result := map[string]int{"StatusCode": container.State.ExitCode}
+- json.NewEncoder(w).Encode(result)
-}
-
--type ExpandTest struct {
-- in string
-- expansions map[string]string
-- want string
--}
--
--var expandTests = []ExpandTest{
-- // no expansions
-- {
-- "http://www.golang.org/",
-- map[string]string{},
-- "http://www.golang.org/",
-- },
-- // one expansion, no escaping
-- {
-- "http://www.golang.org/{bucket}/delete",
-- map[string]string{
-- "bucket": "red",
-- },
-- "http://www.golang.org/red/delete",
-- },
-- // one expansion, with hex escapes
-- {
-- "http://www.golang.org/{bucket}/delete",
-- map[string]string{
-- "bucket": "red/blue",
-- },
-- "http://www.golang.org/red%2Fblue/delete",
-- },
-- // one expansion, with space
-- {
-- "http://www.golang.org/{bucket}/delete",
-- map[string]string{
-- "bucket": "red or blue",
-- },
-- "http://www.golang.org/red%20or%20blue/delete",
-- },
-- // expansion not found
-- {
-- "http://www.golang.org/{object}/delete",
-- map[string]string{
-- "bucket": "red or blue",
-- },
-- "http://www.golang.org//delete",
-- },
-- // multiple expansions
-- {
-- "http://www.golang.org/{one}/{two}/{three}/get",
-- map[string]string{
-- "one": "ONE",
-- "two": "TWO",
-- "three": "THREE",
-- },
-- "http://www.golang.org/ONE/TWO/THREE/get",
-- },
-- // utf-8 characters
-- {
-- "http://www.golang.org/{bucket}/get",
-- map[string]string{
-- "bucket": "£100",
-- },
-- "http://www.golang.org/%C2%A3100/get",
-- },
-- // punctuations
-- {
-- "http://www.golang.org/{bucket}/get",
-- map[string]string{
-- "bucket": `/\@:,.`,
-- },
-- "http://www.golang.org/%2F%5C%40%3A%2C./get",
-- },
-- // mis-matched brackets
-- {
-- "http://www.golang.org/{bucket/get",
-- map[string]string{
-- "bucket": "red",
-- },
-- "http://www.golang.org/{bucket/get",
-- },
-- // "+" prefix for suppressing escape
-- // See also: http://tools.ietf.org/html/rfc6570#section-3.2.3
-- {
-- "http://www.golang.org/{+topic}",
-- map[string]string{
-- "topic": "/topics/myproject/mytopic",
-- },
-- // The double slashes here look weird, but it's intentional
-- "http://www.golang.org//topics/myproject/mytopic",
-- },
+-func (s *DockerServer) removeContainer(w http.ResponseWriter, r *http.Request) {
+- id := mux.Vars(r)["id"]
+- _, index, err := s.findContainer(id)
+- if err != nil {
+- http.Error(w, err.Error(), http.StatusNotFound)
+- return
+- }
+- if s.containers[index].State.Running {
+- msg := "Error: API error (406): Impossible to remove a running container, please stop it first"
+- http.Error(w, msg, http.StatusInternalServerError)
+- return
+- }
+- w.WriteHeader(http.StatusNoContent)
+- s.cMut.Lock()
+- defer s.cMut.Unlock()
+- s.containers[index] = s.containers[len(s.containers)-1]
+- s.containers = s.containers[:len(s.containers)-1]
-}
-
--func TestExpand(t *testing.T) {
-- for i, test := range expandTests {
-- u := url.URL{
-- Path: test.in,
-- }
-- Expand(&u, test.expansions)
-- got := u.Path
-- if got != test.want {
-- t.Errorf("got %q expected %q in test %d", got, test.want, i+1)
+-func (s *DockerServer) commitContainer(w http.ResponseWriter, r *http.Request) {
+- id := r.URL.Query().Get("container")
+- container, _, err := s.findContainer(id)
+- if err != nil {
+- http.Error(w, err.Error(), http.StatusNotFound)
+- return
+- }
+- var config *docker.Config
+- runConfig := r.URL.Query().Get("run")
+- if runConfig != "" {
+- config = new(docker.Config)
+- err = json.Unmarshal([]byte(runConfig), config)
+- if err != nil {
+- http.Error(w, err.Error(), http.StatusBadRequest)
+- return
- }
- }
+- w.WriteHeader(http.StatusOK)
+- image := docker.Image{
+- ID: "img-" + container.ID,
+- Parent: container.Image,
+- Container: container.ID,
+- Comment: r.URL.Query().Get("m"),
+- Author: r.URL.Query().Get("author"),
+- Config: config,
+- }
+- repository := r.URL.Query().Get("repo")
+- s.iMut.Lock()
+- s.images = append(s.images, image)
+- if repository != "" {
+- s.imgIDs[repository] = image.ID
+- }
+- s.iMut.Unlock()
+- fmt.Fprintf(w, `{"ID":%q}`, image.ID)
-}
-
--type CheckResponseTest struct {
-- in *http.Response
-- bodyText string
-- want error
-- errText string
--}
--
--var checkResponseTests = []CheckResponseTest{
-- {
-- &http.Response{
-- StatusCode: http.StatusOK,
-- },
-- "",
-- nil,
-- "",
-- },
-- {
-- &http.Response{
-- StatusCode: http.StatusInternalServerError,
-- },
-- `{"error":{}}`,
-- &Error{
-- Code: http.StatusInternalServerError,
-- Body: `{"error":{}}`,
-- },
-- `googleapi: got HTTP response code 500 with body: {"error":{}}`,
-- },
-- {
-- &http.Response{
-- StatusCode: http.StatusNotFound,
-- },
-- `{"error":{"message":"Error message for StatusNotFound."}}`,
-- &Error{
-- Code: http.StatusNotFound,
-- Message: "Error message for StatusNotFound.",
-- Body: `{"error":{"message":"Error message for StatusNotFound."}}`,
-- },
-- "googleapi: Error 404: Error message for StatusNotFound.",
-- },
-- {
-- &http.Response{
-- StatusCode: http.StatusBadRequest,
-- },
-- `{"error":"invalid_token","error_description":"Invalid Value"}`,
-- &Error{
-- Code: http.StatusBadRequest,
-- Body: `{"error":"invalid_token","error_description":"Invalid Value"}`,
-- },
-- `googleapi: got HTTP response code 400 with body: {"error":"invalid_token","error_description":"Invalid Value"}`,
-- },
-- {
-- &http.Response{
-- StatusCode: http.StatusBadRequest,
-- },
-- `{"error":{"errors":[{"domain":"usageLimits","reason":"keyInvalid","message":"Bad Request"}],"code":400,"message":"Bad Request"}}`,
-- &Error{
-- Code: http.StatusBadRequest,
-- Errors: []ErrorItem{
-- {
-- Reason: "keyInvalid",
-- Message: "Bad Request",
-- },
-- },
-- Body: `{"error":{"errors":[{"domain":"usageLimits","reason":"keyInvalid","message":"Bad Request"}],"code":400,"message":"Bad Request"}}`,
-- Message: "Bad Request",
-- },
-- "googleapi: Error 400: Bad Request, keyInvalid",
-- },
+-func (s *DockerServer) findContainer(id string) (*docker.Container, int, error) {
+- s.cMut.RLock()
+- defer s.cMut.RUnlock()
+- for i, container := range s.containers {
+- if container.ID == id {
+- return container, i, nil
+- }
+- }
+- return nil, -1, errors.New("No such container")
-}
-
--func TestCheckResponse(t *testing.T) {
-- for _, test := range checkResponseTests {
-- res := test.in
-- if test.bodyText != "" {
-- res.Body = ioutil.NopCloser(strings.NewReader(test.bodyText))
-- }
-- g := CheckResponse(res)
-- if !reflect.DeepEqual(g, test.want) {
-- t.Errorf("CheckResponse: got %v, want %v", g, test.want)
-- gotJson, err := json.Marshal(g)
+-func (s *DockerServer) buildImage(w http.ResponseWriter, r *http.Request) {
+- if ct := r.Header.Get("Content-Type"); ct == "application/tar" {
+- gotDockerFile := false
+- tr := tar.NewReader(r.Body)
+- for {
+- header, err := tr.Next()
- if err != nil {
-- t.Error(err)
+- break
- }
-- wantJson, err := json.Marshal(test.want)
-- if err != nil {
-- t.Error(err)
+- if header.Name == "Dockerfile" {
+- gotDockerFile = true
- }
-- t.Errorf("json(got): %q\njson(want): %q", string(gotJson), string(wantJson))
- }
-- if g != nil && g.Error() != test.errText {
-- t.Errorf("CheckResponse: unexpected error message.\nGot: %q\nwant: %q", g, test.errText)
+- if !gotDockerFile {
+- w.WriteHeader(http.StatusBadRequest)
+- w.Write([]byte("miss Dockerfile"))
+- return
- }
- }
+- //we did not use that Dockerfile to build image cause we are a fake Docker daemon
+- image := docker.Image{
+- ID: s.generateID(),
+- }
+- query := r.URL.Query()
+- repository := image.ID
+- if t := query.Get("t"); t != "" {
+- repository = t
+- }
+- s.iMut.Lock()
+- s.images = append(s.images, image)
+- s.imgIDs[repository] = image.ID
+- s.iMut.Unlock()
+- w.Write([]byte(fmt.Sprintf("Successfully built %s", image.ID)))
-}
-
--type VariantPoint struct {
-- Type string
-- Coordinates []float64
+-func (s *DockerServer) pullImage(w http.ResponseWriter, r *http.Request) {
+- repository := r.URL.Query().Get("fromImage")
+- image := docker.Image{
+- ID: s.generateID(),
+- }
+- s.iMut.Lock()
+- s.images = append(s.images, image)
+- if repository != "" {
+- s.imgIDs[repository] = image.ID
+- }
+- s.iMut.Unlock()
-}
-
--type VariantTest struct {
-- in map[string]interface{}
-- result bool
-- want VariantPoint
+-func (s *DockerServer) pushImage(w http.ResponseWriter, r *http.Request) {
+- name := mux.Vars(r)["name"]
+- s.iMut.RLock()
+- if _, ok := s.imgIDs[name]; !ok {
+- s.iMut.RUnlock()
+- http.Error(w, "No such image", http.StatusNotFound)
+- return
+- }
+- s.iMut.RUnlock()
+- fmt.Fprintln(w, "Pushing...")
+- fmt.Fprintln(w, "Pushed")
-}
-
--var coords = []interface{}{1.0, 2.0}
--
--var variantTests = []VariantTest{
-- {
-- in: map[string]interface{}{
-- "type": "Point",
-- "coordinates": coords,
-- },
-- result: true,
-- want: VariantPoint{
-- Type: "Point",
-- Coordinates: []float64{1.0, 2.0},
-- },
-- },
-- {
-- in: map[string]interface{}{
-- "type": "Point",
-- "bogus": coords,
-- },
-- result: true,
-- want: VariantPoint{
-- Type: "Point",
-- },
-- },
+-func (s *DockerServer) removeImage(w http.ResponseWriter, r *http.Request) {
+- id := mux.Vars(r)["id"]
+- s.iMut.RLock()
+- var tag string
+- if img, ok := s.imgIDs[id]; ok {
+- id, tag = img, id
+- }
+- s.iMut.RUnlock()
+- _, index, err := s.findImageByID(id)
+- if err != nil {
+- http.Error(w, err.Error(), http.StatusNotFound)
+- return
+- }
+- w.WriteHeader(http.StatusNoContent)
+- s.iMut.Lock()
+- defer s.iMut.Unlock()
+- s.images[index] = s.images[len(s.images)-1]
+- s.images = s.images[:len(s.images)-1]
+- if tag != "" {
+- delete(s.imgIDs, tag)
+- }
-}
-
--func TestVariantType(t *testing.T) {
-- for _, test := range variantTests {
-- if g := VariantType(test.in); g != test.want.Type {
-- t.Errorf("VariantType(%v): got %v, want %v", test.in, g, test.want.Type)
+-func (s *DockerServer) inspectImage(w http.ResponseWriter, r *http.Request) {
+- name := mux.Vars(r)["name"]
+- if id, ok := s.imgIDs[name]; ok {
+- s.iMut.Lock()
+- defer s.iMut.Unlock()
+-
+- for _, img := range s.images {
+- if img.ID == id {
+- w.Header().Set("Content-Type", "application/json")
+- w.WriteHeader(http.StatusOK)
+- json.NewEncoder(w).Encode(img)
+- return
+- }
- }
- }
+- http.Error(w, "not found", http.StatusNotFound)
-}
-
--func TestConvertVariant(t *testing.T) {
-- for _, test := range variantTests {
-- g := VariantPoint{}
-- r := ConvertVariant(test.in, &g)
-- if r != test.result {
-- t.Errorf("ConvertVariant(%v): got %v, want %v", test.in, r, test.result)
-- }
-- if !reflect.DeepEqual(g, test.want) {
-- t.Errorf("ConvertVariant(%v): got %v, want %v", test.in, g, test.want)
+-func (s *DockerServer) listEvents(w http.ResponseWriter, r *http.Request) {
+- w.Header().Set("Content-Type", "application/json")
+- var events [][]byte
+- count := mathrand.Intn(20)
+- for i := 0; i < count; i++ {
+- data, err := json.Marshal(s.generateEvent())
+- if err != nil {
+- w.WriteHeader(http.StatusInternalServerError)
+- return
- }
+- events = append(events, data)
+- }
+- w.WriteHeader(http.StatusOK)
+- for _, d := range events {
+- fmt.Fprintln(w, d)
+- time.Sleep(time.Duration(mathrand.Intn(200)) * time.Millisecond)
- }
-}
-diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates/LICENSE b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates/LICENSE
-deleted file mode 100644
-index de9c88c..0000000
---- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates/LICENSE
-+++ /dev/null
-@@ -1,18 +0,0 @@
--Copyright (c) 2013 Joshua Tacoma
-
--Permission is hereby granted, free of charge, to any person obtaining a copy of
--this software and associated documentation files (the "Software"), to deal in
--the Software without restriction, including without limitation the rights to
--use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
--the Software, and to permit persons to whom the Software is furnished to do so,
--subject to the following conditions:
+-func (s *DockerServer) pingDocker(w http.ResponseWriter, r *http.Request) {
+- w.WriteHeader(http.StatusOK)
+-}
-
--The above copyright notice and this permission notice shall be included in all
--copies or substantial portions of the Software.
+-func (s *DockerServer) generateEvent() *docker.APIEvents {
+- var eventType string
+- switch mathrand.Intn(4) {
+- case 0:
+- eventType = "create"
+- case 1:
+- eventType = "start"
+- case 2:
+- eventType = "stop"
+- case 3:
+- eventType = "destroy"
+- }
+- return &docker.APIEvents{
+- ID: s.generateID(),
+- Status: eventType,
+- From: "mybase:latest",
+- Time: time.Now().Unix(),
+- }
+-}
-
--THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
--IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
--FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
--COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
--IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
--CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates/uritemplates.go b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates/uritemplates.go
+-func (s *DockerServer) loadImage(w http.ResponseWriter, r *http.Request) {
+- w.WriteHeader(http.StatusOK)
+-}
+-
+-func (s *DockerServer) getImage(w http.ResponseWriter, r *http.Request) {
+- w.WriteHeader(http.StatusOK)
+- w.Header().Set("Content-Type", "application/tar")
+-
+-}
+diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/server_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/server_test.go
deleted file mode 100644
-index 8a84813..0000000
---- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates/uritemplates.go
+index ad5ce7d..0000000
+--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/server_test.go
+++ /dev/null
-@@ -1,359 +0,0 @@
--// Copyright 2013 Joshua Tacoma. All rights reserved.
+@@ -1,1017 +0,0 @@
+-// Copyright 2014 go-dockerclient authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
--// Package uritemplates is a level 4 implementation of RFC 6570 (URI
--// Template, http://tools.ietf.org/html/rfc6570).
--//
--// To use uritemplates, parse a template string and expand it with a value
--// map:
--//
--// template, _ := uritemplates.Parse("https://api.github.com/repos{/user,repo}")
--// values := make(map[string]interface{})
--// values["user"] = "jtacoma"
--// values["repo"] = "uritemplates"
--// expanded, _ := template.ExpandString(values)
--// fmt.Printf(expanded)
--//
--package uritemplates
+-package testing
-
-import (
-- "bytes"
-- "errors"
+- "encoding/json"
- "fmt"
+- "math/rand"
+- "net"
+- "net/http"
+- "net/http/httptest"
+- "os"
- "reflect"
-- "regexp"
-- "strconv"
- "strings"
--)
+- "testing"
+- "time"
-
--var (
-- unreserved = regexp.MustCompile("[^A-Za-z0-9\\-._~]")
-- reserved = regexp.MustCompile("[^A-Za-z0-9\\-._~:/?#[\\]@!$&'()*+,;=]")
-- validname = regexp.MustCompile("^([A-Za-z0-9_\\.]|%[0-9A-Fa-f][0-9A-Fa-f])+$")
-- hex = []byte("0123456789ABCDEF")
+- "github.com/fsouza/go-dockerclient"
-)
-
--func pctEncode(src []byte) []byte {
-- dst := make([]byte, len(src)*3)
-- for i, b := range src {
-- buf := dst[i*3 : i*3+3]
-- buf[0] = 0x25
-- buf[1] = hex[b/16]
-- buf[2] = hex[b%16]
+-func TestNewServer(t *testing.T) {
+- server, err := NewServer("127.0.0.1:0", nil, nil)
+- if err != nil {
+- t.Fatal(err)
- }
-- return dst
+- defer server.listener.Close()
+- conn, err := net.Dial("tcp", server.listener.Addr().String())
+- if err != nil {
+- t.Fatal(err)
+- }
+- conn.Close()
-}
-
--func escape(s string, allowReserved bool) (escaped string) {
-- if allowReserved {
-- escaped = string(reserved.ReplaceAllFunc([]byte(s), pctEncode))
-- } else {
-- escaped = string(unreserved.ReplaceAllFunc([]byte(s), pctEncode))
+-func TestServerStop(t *testing.T) {
+- server, err := NewServer("127.0.0.1:0", nil, nil)
+- if err != nil {
+- t.Fatal(err)
+- }
+- server.Stop()
+- _, err = net.Dial("tcp", server.listener.Addr().String())
+- if err == nil {
+- t.Error("Unexpected <nil> error when dialing to stopped server")
- }
-- return escaped
-}
-
--// A UriTemplate is a parsed representation of a URI template.
--type UriTemplate struct {
-- raw string
-- parts []templatePart
+-func TestServerStopNoListener(t *testing.T) {
+- server := DockerServer{}
+- server.Stop()
-}
-
--// Parse parses a URI template string into a UriTemplate object.
--func Parse(rawtemplate string) (template *UriTemplate, err error) {
-- template = new(UriTemplate)
-- template.raw = rawtemplate
-- split := strings.Split(rawtemplate, "{")
-- template.parts = make([]templatePart, len(split)*2-1)
-- for i, s := range split {
-- if i == 0 {
-- if strings.Contains(s, "}") {
-- err = errors.New("unexpected }")
-- break
-- }
-- template.parts[i].raw = s
-- } else {
-- subsplit := strings.Split(s, "}")
-- if len(subsplit) != 2 {
-- err = errors.New("malformed template")
-- break
-- }
-- expression := subsplit[0]
-- template.parts[i*2-1], err = parseExpression(expression)
-- if err != nil {
-- break
-- }
-- template.parts[i*2].raw = subsplit[1]
+-func TestServerURL(t *testing.T) {
+- server, err := NewServer("127.0.0.1:0", nil, nil)
+- if err != nil {
+- t.Fatal(err)
+- }
+- defer server.Stop()
+- url := server.URL()
+- if expected := "http://" + server.listener.Addr().String() + "/"; url != expected {
+- t.Errorf("DockerServer.URL(): Want %q. Got %q.", expected, url)
+- }
+-}
+-
+-func TestServerURLNoListener(t *testing.T) {
+- server := DockerServer{}
+- url := server.URL()
+- if url != "" {
+- t.Errorf("DockerServer.URL(): Expected empty URL on handler mode, got %q.", url)
+- }
+-}
+-
+-func TestHandleWithHook(t *testing.T) {
+- var called bool
+- server, _ := NewServer("127.0.0.1:0", nil, func(*http.Request) { called = true })
+- defer server.Stop()
+- recorder := httptest.NewRecorder()
+- request, _ := http.NewRequest("GET", "/containers/json?all=1", nil)
+- server.ServeHTTP(recorder, request)
+- if !called {
+- t.Error("ServeHTTP did not call the hook function.")
+- }
+-}
+-
+-func TestCustomHandler(t *testing.T) {
+- var called bool
+- server, _ := NewServer("127.0.0.1:0", nil, nil)
+- addContainers(server, 2)
+- server.CustomHandler("/containers/json", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+- called = true
+- fmt.Fprint(w, "Hello world")
+- }))
+- recorder := httptest.NewRecorder()
+- request, _ := http.NewRequest("GET", "/containers/json?all=1", nil)
+- server.ServeHTTP(recorder, request)
+- if !called {
+- t.Error("Did not call the custom handler")
+- }
+- if got := recorder.Body.String(); got != "Hello world" {
+- t.Errorf("Wrong output for custom handler: want %q. Got %q.", "Hello world", got)
+- }
+-}
+-
+-func TestListContainers(t *testing.T) {
+- server := DockerServer{}
+- addContainers(&server, 2)
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- request, _ := http.NewRequest("GET", "/containers/json?all=1", nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusOK {
+- t.Errorf("ListContainers: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
+- }
+- expected := make([]docker.APIContainers, 2)
+- for i, container := range server.containers {
+- expected[i] = docker.APIContainers{
+- ID: container.ID,
+- Image: container.Image,
+- Command: strings.Join(container.Config.Cmd, " "),
+- Created: container.Created.Unix(),
+- Status: container.State.String(),
+- Ports: container.NetworkSettings.PortMappingAPI(),
- }
- }
+- var got []docker.APIContainers
+- err := json.NewDecoder(recorder.Body).Decode(&got)
- if err != nil {
-- template = nil
+- t.Fatal(err)
+- }
+- if !reflect.DeepEqual(got, expected) {
+- t.Errorf("ListContainers. Want %#v. Got %#v.", expected, got)
+- }
+-}
+-
+-func TestListRunningContainers(t *testing.T) {
+- server := DockerServer{}
+- addContainers(&server, 2)
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- request, _ := http.NewRequest("GET", "/containers/json?all=0", nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusOK {
+- t.Errorf("ListRunningContainers: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
+- }
+- var got []docker.APIContainers
+- err := json.NewDecoder(recorder.Body).Decode(&got)
+- if err != nil {
+- t.Fatal(err)
+- }
+- if len(got) == 0 {
+- t.Errorf("ListRunningContainers: Want 0. Got %d.", len(got))
+- }
+-}
+-
+-func TestCreateContainer(t *testing.T) {
+- server := DockerServer{}
+- server.imgIDs = map[string]string{"base": "a1234"}
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- body := `{"Hostname":"", "User":"", "Memory":0, "MemorySwap":0, "AttachStdin":false, "AttachStdout":true, "AttachStderr":true,
+-"PortSpecs":null, "Tty":false, "OpenStdin":false, "StdinOnce":false, "Env":null, "Cmd":["date"], "Image":"base", "Volumes":{}, "VolumesFrom":""}`
+- request, _ := http.NewRequest("POST", "/containers/create", strings.NewReader(body))
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusCreated {
+- t.Errorf("CreateContainer: wrong status. Want %d. Got %d.", http.StatusCreated, recorder.Code)
+- }
+- var returned docker.Container
+- err := json.NewDecoder(recorder.Body).Decode(&returned)
+- if err != nil {
+- t.Fatal(err)
+- }
+- stored := server.containers[0]
+- if returned.ID != stored.ID {
+- t.Errorf("CreateContainer: ID mismatch. Stored: %q. Returned: %q.", stored.ID, returned.ID)
+- }
+- if stored.State.Running {
+- t.Errorf("CreateContainer should not set container to running state.")
+- }
+-}
+-
+-func TestCreateContainerWithNotifyChannel(t *testing.T) {
+- ch := make(chan *docker.Container, 1)
+- server := DockerServer{}
+- server.imgIDs = map[string]string{"base": "a1234"}
+- server.cChan = ch
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- body := `{"Hostname":"", "User":"", "Memory":0, "MemorySwap":0, "AttachStdin":false, "AttachStdout":true, "AttachStderr":true,
+-"PortSpecs":null, "Tty":false, "OpenStdin":false, "StdinOnce":false, "Env":null, "Cmd":["date"], "Image":"base", "Volumes":{}, "VolumesFrom":""}`
+- request, _ := http.NewRequest("POST", "/containers/create", strings.NewReader(body))
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusCreated {
+- t.Errorf("CreateContainer: wrong status. Want %d. Got %d.", http.StatusCreated, recorder.Code)
+- }
+- if notified := <-ch; notified != server.containers[0] {
+- t.Errorf("CreateContainer: did not notify the proper container. Want %q. Got %q.", server.containers[0].ID, notified.ID)
+- }
+-}
+-
+-func TestCreateContainerInvalidBody(t *testing.T) {
+- server := DockerServer{}
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- request, _ := http.NewRequest("POST", "/containers/create", strings.NewReader("whaaaaaat---"))
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusBadRequest {
+- t.Errorf("CreateContainer: wrong status. Want %d. Got %d.", http.StatusBadRequest, recorder.Code)
+- }
+-}
+-
+-func TestCreateContainerImageNotFound(t *testing.T) {
+- server := DockerServer{}
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- body := `{"Hostname":"", "User":"", "Memory":0, "MemorySwap":0, "AttachStdin":false, "AttachStdout":true, "AttachStderr":true,
+-"PortSpecs":null, "Tty":false, "OpenStdin":false, "StdinOnce":false, "Env":null, "Cmd":["date"],
+-"Image":"base", "Volumes":{}, "VolumesFrom":""}`
+- request, _ := http.NewRequest("POST", "/containers/create", strings.NewReader(body))
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusNotFound {
+- t.Errorf("CreateContainer: wrong status. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
+- }
+-}
+-
+-func TestCommitContainer(t *testing.T) {
+- server := DockerServer{}
+- addContainers(&server, 2)
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- request, _ := http.NewRequest("POST", "/commit?container="+server.containers[0].ID, nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusOK {
+- t.Errorf("CommitContainer: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
+- }
+- expected := fmt.Sprintf(`{"ID":"%s"}`, server.images[0].ID)
+- if got := recorder.Body.String(); got != expected {
+- t.Errorf("CommitContainer: wrong response body. Want %q. Got %q.", expected, got)
+- }
+-}
+-
+-func TestCommitContainerComplete(t *testing.T) {
+- server := DockerServer{}
+- server.imgIDs = make(map[string]string)
+- addContainers(&server, 2)
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- queryString := "container=" + server.containers[0].ID + "&repo=tsuru/python&m=saving&author=developers"
+- queryString += `&run={"Cmd": ["cat", "/world"],"PortSpecs":["22"]}`
+- request, _ := http.NewRequest("POST", "/commit?"+queryString, nil)
+- server.ServeHTTP(recorder, request)
+- image := server.images[0]
+- if image.Parent != server.containers[0].Image {
+- t.Errorf("CommitContainer: wrong parent image. Want %q. Got %q.", server.containers[0].Image, image.Parent)
+- }
+- if image.Container != server.containers[0].ID {
+- t.Errorf("CommitContainer: wrong container. Want %q. Got %q.", server.containers[0].ID, image.Container)
+- }
+- message := "saving"
+- if image.Comment != message {
+- t.Errorf("CommitContainer: wrong comment (commit message). Want %q. Got %q.", message, image.Comment)
+- }
+- author := "developers"
+- if image.Author != author {
+- t.Errorf("CommitContainer: wrong author. Want %q. Got %q.", author, image.Author)
+- }
+- if id := server.imgIDs["tsuru/python"]; id != image.ID {
+- t.Errorf("CommitContainer: wrong ID saved for repository. Want %q. Got %q.", image.ID, id)
+- }
+- portSpecs := []string{"22"}
+- if !reflect.DeepEqual(image.Config.PortSpecs, portSpecs) {
+- t.Errorf("CommitContainer: wrong port spec in config. Want %#v. Got %#v.", portSpecs, image.Config.PortSpecs)
+- }
+- cmd := []string{"cat", "/world"}
+- if !reflect.DeepEqual(image.Config.Cmd, cmd) {
+- t.Errorf("CommitContainer: wrong cmd in config. Want %#v. Got %#v.", cmd, image.Config.Cmd)
- }
-- return template, err
-}
-
--type templatePart struct {
-- raw string
-- terms []templateTerm
-- first string
-- sep string
-- named bool
-- ifemp string
-- allowReserved bool
+-func TestCommitContainerInvalidRun(t *testing.T) {
+- server := DockerServer{}
+- addContainers(&server, 1)
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- request, _ := http.NewRequest("POST", "/commit?container="+server.containers[0].ID+"&run=abc---", nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusBadRequest {
+- t.Errorf("CommitContainer. Wrong status. Want %d. Got %d.", http.StatusBadRequest, recorder.Code)
+- }
-}
-
--type templateTerm struct {
-- name string
-- explode bool
-- truncate int
+-func TestCommitContainerNotFound(t *testing.T) {
+- server := DockerServer{}
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- request, _ := http.NewRequest("POST", "/commit?container=abc123", nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusNotFound {
+- t.Errorf("CommitContainer. Wrong status. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
+- }
-}
-
--func parseExpression(expression string) (result templatePart, err error) {
-- switch expression[0] {
-- case '+':
-- result.sep = ","
-- result.allowReserved = true
-- expression = expression[1:]
-- case '.':
-- result.first = "."
-- result.sep = "."
-- expression = expression[1:]
-- case '/':
-- result.first = "/"
-- result.sep = "/"
-- expression = expression[1:]
-- case ';':
-- result.first = ";"
-- result.sep = ";"
-- result.named = true
-- expression = expression[1:]
-- case '?':
-- result.first = "?"
-- result.sep = "&"
-- result.named = true
-- result.ifemp = "="
-- expression = expression[1:]
-- case '&':
-- result.first = "&"
-- result.sep = "&"
-- result.named = true
-- result.ifemp = "="
-- expression = expression[1:]
-- case '#':
-- result.first = "#"
-- result.sep = ","
-- result.allowReserved = true
-- expression = expression[1:]
-- default:
-- result.sep = ","
+-func TestInspectContainer(t *testing.T) {
+- server := DockerServer{}
+- addContainers(&server, 2)
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- path := fmt.Sprintf("/containers/%s/json", server.containers[0].ID)
+- request, _ := http.NewRequest("GET", path, nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusOK {
+- t.Errorf("InspectContainer: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
- }
-- rawterms := strings.Split(expression, ",")
-- result.terms = make([]templateTerm, len(rawterms))
-- for i, raw := range rawterms {
-- result.terms[i], err = parseTerm(raw)
-- if err != nil {
-- break
-- }
+- expected := server.containers[0]
+- var got docker.Container
+- err := json.NewDecoder(recorder.Body).Decode(&got)
+- if err != nil {
+- t.Fatal(err)
+- }
+- if !reflect.DeepEqual(got.Config, expected.Config) {
+- t.Errorf("InspectContainer: wrong value. Want %#v. Got %#v.", *expected, got)
+- }
+- if !reflect.DeepEqual(got.NetworkSettings, expected.NetworkSettings) {
+- t.Errorf("InspectContainer: wrong value. Want %#v. Got %#v.", *expected, got)
+- }
+- got.State.StartedAt = expected.State.StartedAt
+- got.State.FinishedAt = expected.State.FinishedAt
+- got.Config = expected.Config
+- got.Created = expected.Created
+- got.NetworkSettings = expected.NetworkSettings
+- if !reflect.DeepEqual(got, *expected) {
+- t.Errorf("InspectContainer: wrong value. Want %#v. Got %#v.", *expected, got)
- }
-- return result, err
-}
-
--func parseTerm(term string) (result templateTerm, err error) {
-- if strings.HasSuffix(term, "*") {
-- result.explode = true
-- term = term[:len(term)-1]
+-func TestInspectContainerNotFound(t *testing.T) {
+- server := DockerServer{}
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- request, _ := http.NewRequest("GET", "/containers/abc123/json", nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusNotFound {
+- t.Errorf("InspectContainer: wrong status code. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
- }
-- split := strings.Split(term, ":")
-- if len(split) == 1 {
-- result.name = term
-- } else if len(split) == 2 {
-- result.name = split[0]
-- var parsed int64
-- parsed, err = strconv.ParseInt(split[1], 10, 0)
-- result.truncate = int(parsed)
-- } else {
-- err = errors.New("multiple colons in same term")
+-}
+-
+-func TestTopContainer(t *testing.T) {
+- server := DockerServer{}
+- addContainers(&server, 1)
+- server.containers[0].State.Running = true
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- path := fmt.Sprintf("/containers/%s/top", server.containers[0].ID)
+- request, _ := http.NewRequest("GET", path, nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusOK {
+- t.Errorf("TopContainer: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
- }
-- if !validname.MatchString(result.name) {
-- err = errors.New("not a valid name: " + result.name)
+- var got docker.TopResult
+- err := json.NewDecoder(recorder.Body).Decode(&got)
+- if err != nil {
+- t.Fatal(err)
- }
-- if result.explode && result.truncate > 0 {
-- err = errors.New("both explode and prefix modifers on same term")
+- if !reflect.DeepEqual(got.Titles, []string{"UID", "PID", "PPID", "C", "STIME", "TTY", "TIME", "CMD"}) {
+- t.Fatalf("TopContainer: Unexpected titles, got: %#v", got.Titles)
+- }
+- if len(got.Processes) != 1 {
+- t.Fatalf("TopContainer: Unexpected process len, got: %d", len(got.Processes))
+- }
+- if got.Processes[0][len(got.Processes[0])-1] != "ls -la .." {
+- t.Fatalf("TopContainer: Unexpected command name, got: %s", got.Processes[0][len(got.Processes[0])-1])
- }
-- return result, err
-}
-
--// Expand expands a URI template with a set of values to produce a string.
--func (self *UriTemplate) Expand(value interface{}) (string, error) {
-- values, ismap := value.(map[string]interface{})
-- if !ismap {
-- if m, ismap := struct2map(value); !ismap {
-- return "", errors.New("expected map[string]interface{}, struct, or pointer to struct.")
-- } else {
-- return self.Expand(m)
-- }
+-func TestTopContainerNotFound(t *testing.T) {
+- server := DockerServer{}
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- request, _ := http.NewRequest("GET", "/containers/xyz/top", nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusNotFound {
+- t.Errorf("TopContainer: wrong status. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
- }
-- var buf bytes.Buffer
-- for _, p := range self.parts {
-- err := p.expand(&buf, values)
-- if err != nil {
-- return "", err
-- }
+-}
+-
+-func TestTopContainerStopped(t *testing.T) {
+- server := DockerServer{}
+- addContainers(&server, 1)
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- path := fmt.Sprintf("/containers/%s/top", server.containers[0].ID)
+- request, _ := http.NewRequest("GET", path, nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusInternalServerError {
+- t.Errorf("TopContainer: wrong status. Want %d. Got %d.", http.StatusInternalServerError, recorder.Code)
- }
-- return buf.String(), nil
-}
-
--func (self *templatePart) expand(buf *bytes.Buffer, values map[string]interface{}) error {
-- if len(self.raw) > 0 {
-- buf.WriteString(self.raw)
-- return nil
+-func TestStartContainer(t *testing.T) {
+- server := DockerServer{}
+- addContainers(&server, 1)
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- path := fmt.Sprintf("/containers/%s/start", server.containers[0].ID)
+- request, _ := http.NewRequest("POST", path, nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusOK {
+- t.Errorf("StartContainer: wrong status code. Want %d. Got %d.", http.StatusOK, recorder.Code)
- }
-- var zeroLen = buf.Len()
-- buf.WriteString(self.first)
-- var firstLen = buf.Len()
-- for _, term := range self.terms {
-- value, exists := values[term.name]
-- if !exists {
-- continue
-- }
-- if buf.Len() != firstLen {
-- buf.WriteString(self.sep)
-- }
-- switch v := value.(type) {
-- case string:
-- self.expandString(buf, term, v)
-- case []interface{}:
-- self.expandArray(buf, term, v)
-- case map[string]interface{}:
-- if term.truncate > 0 {
-- return errors.New("cannot truncate a map expansion")
-- }
-- self.expandMap(buf, term, v)
-- default:
-- if m, ismap := struct2map(value); ismap {
-- if term.truncate > 0 {
-- return errors.New("cannot truncate a map expansion")
-- }
-- self.expandMap(buf, term, m)
-- } else {
-- str := fmt.Sprintf("%v", value)
-- self.expandString(buf, term, str)
-- }
-- }
+- if !server.containers[0].State.Running {
+- t.Error("StartContainer: did not set the container to running state")
- }
-- if buf.Len() == firstLen {
-- original := buf.Bytes()[:zeroLen]
-- buf.Reset()
-- buf.Write(original)
+-}
+-
+-func TestStartContainerWithNotifyChannel(t *testing.T) {
+- ch := make(chan *docker.Container, 1)
+- server := DockerServer{}
+- server.cChan = ch
+- addContainers(&server, 1)
+- addContainers(&server, 1)
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- path := fmt.Sprintf("/containers/%s/start", server.containers[1].ID)
+- request, _ := http.NewRequest("POST", path, nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusOK {
+- t.Errorf("StartContainer: wrong status code. Want %d. Got %d.", http.StatusOK, recorder.Code)
+- }
+- if notified := <-ch; notified != server.containers[1] {
+- t.Errorf("StartContainer: did not notify the proper container. Want %q. Got %q.", server.containers[1].ID, notified.ID)
- }
-- return nil
-}
-
--func (self *templatePart) expandName(buf *bytes.Buffer, name string, empty bool) {
-- if self.named {
-- buf.WriteString(name)
-- if empty {
-- buf.WriteString(self.ifemp)
-- } else {
-- buf.WriteString("=")
-- }
+-func TestStartContainerNotFound(t *testing.T) {
+- server := DockerServer{}
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- path := "/containers/abc123/start"
+- request, _ := http.NewRequest("POST", path, nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusNotFound {
+- t.Errorf("StartContainer: wrong status code. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
- }
-}
-
--func (self *templatePart) expandString(buf *bytes.Buffer, t templateTerm, s string) {
-- if len(s) > t.truncate && t.truncate > 0 {
-- s = s[:t.truncate]
+-func TestStartContainerAlreadyRunning(t *testing.T) {
+- server := DockerServer{}
+- addContainers(&server, 1)
+- server.containers[0].State.Running = true
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- path := fmt.Sprintf("/containers/%s/start", server.containers[0].ID)
+- request, _ := http.NewRequest("POST", path, nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusBadRequest {
+- t.Errorf("StartContainer: wrong status code. Want %d. Got %d.", http.StatusBadRequest, recorder.Code)
- }
-- self.expandName(buf, t.name, len(s) == 0)
-- buf.WriteString(escape(s, self.allowReserved))
-}
-
--func (self *templatePart) expandArray(buf *bytes.Buffer, t templateTerm, a []interface{}) {
-- if len(a) == 0 {
-- return
-- } else if !t.explode {
-- self.expandName(buf, t.name, false)
+-func TestStopContainer(t *testing.T) {
+- server := DockerServer{}
+- addContainers(&server, 1)
+- server.containers[0].State.Running = true
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- path := fmt.Sprintf("/containers/%s/stop", server.containers[0].ID)
+- request, _ := http.NewRequest("POST", path, nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusNoContent {
+- t.Errorf("StopContainer: wrong status code. Want %d. Got %d.", http.StatusNoContent, recorder.Code)
- }
-- for i, value := range a {
-- if t.explode && i > 0 {
-- buf.WriteString(self.sep)
-- } else if i > 0 {
-- buf.WriteString(",")
-- }
-- var s string
-- switch v := value.(type) {
-- case string:
-- s = v
-- default:
-- s = fmt.Sprintf("%v", v)
-- }
-- if len(s) > t.truncate && t.truncate > 0 {
-- s = s[:t.truncate]
-- }
-- if self.named && t.explode {
-- self.expandName(buf, t.name, len(s) == 0)
-- }
-- buf.WriteString(escape(s, self.allowReserved))
+- if server.containers[0].State.Running {
+- t.Error("StopContainer: did not stop the container")
- }
-}
-
--func (self *templatePart) expandMap(buf *bytes.Buffer, t templateTerm, m map[string]interface{}) {
-- if len(m) == 0 {
-- return
+-func TestStopContainerWithNotifyChannel(t *testing.T) {
+- ch := make(chan *docker.Container, 1)
+- server := DockerServer{}
+- server.cChan = ch
+- addContainers(&server, 1)
+- addContainers(&server, 1)
+- server.containers[1].State.Running = true
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- path := fmt.Sprintf("/containers/%s/stop", server.containers[1].ID)
+- request, _ := http.NewRequest("POST", path, nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusNoContent {
+- t.Errorf("StopContainer: wrong status code. Want %d. Got %d.", http.StatusNoContent, recorder.Code)
- }
-- if !t.explode {
-- self.expandName(buf, t.name, len(m) == 0)
+- if notified := <-ch; notified != server.containers[1] {
+- t.Errorf("StopContainer: did not notify the proper container. Want %q. Got %q.", server.containers[1].ID, notified.ID)
- }
-- var firstLen = buf.Len()
-- for k, value := range m {
-- if firstLen != buf.Len() {
-- if t.explode {
-- buf.WriteString(self.sep)
-- } else {
-- buf.WriteString(",")
-- }
-- }
-- var s string
-- switch v := value.(type) {
-- case string:
-- s = v
-- default:
-- s = fmt.Sprintf("%v", v)
-- }
-- if t.explode {
-- buf.WriteString(escape(k, self.allowReserved))
-- buf.WriteRune('=')
-- buf.WriteString(escape(s, self.allowReserved))
-- } else {
-- buf.WriteString(escape(k, self.allowReserved))
-- buf.WriteRune(',')
-- buf.WriteString(escape(s, self.allowReserved))
-- }
+-}
+-
+-func TestStopContainerNotFound(t *testing.T) {
+- server := DockerServer{}
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- path := "/containers/abc123/stop"
+- request, _ := http.NewRequest("POST", path, nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusNotFound {
+- t.Errorf("StopContainer: wrong status code. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
- }
-}
-
--func struct2map(v interface{}) (map[string]interface{}, bool) {
-- value := reflect.ValueOf(v)
-- switch value.Type().Kind() {
-- case reflect.Ptr:
-- return struct2map(value.Elem().Interface())
-- case reflect.Struct:
-- m := make(map[string]interface{})
-- for i := 0; i < value.NumField(); i++ {
-- tag := value.Type().Field(i).Tag
-- var name string
-- if strings.Contains(string(tag), ":") {
-- name = tag.Get("uri")
-- } else {
-- name = strings.TrimSpace(string(tag))
-- }
-- if len(name) == 0 {
-- name = value.Type().Field(i).Name
-- }
-- m[name] = value.Field(i).Interface()
-- }
-- return m, true
+-func TestStopContainerNotRunning(t *testing.T) {
+- server := DockerServer{}
+- addContainers(&server, 1)
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- path := fmt.Sprintf("/containers/%s/stop", server.containers[0].ID)
+- request, _ := http.NewRequest("POST", path, nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusBadRequest {
+- t.Errorf("StopContainer: wrong status code. Want %d. Got %d.", http.StatusBadRequest, recorder.Code)
- }
-- return nil, false
-}
-diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates/utils.go b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates/utils.go
-deleted file mode 100644
-index 399ef46..0000000
---- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates/utils.go
-+++ /dev/null
-@@ -1,13 +0,0 @@
--package uritemplates
-
--func Expand(path string, expansions map[string]string) (string, error) {
-- template, err := Parse(path)
-- if err != nil {
-- return "", err
+-func TestPauseContainer(t *testing.T) {
+- server := DockerServer{}
+- addContainers(&server, 1)
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- path := fmt.Sprintf("/containers/%s/pause", server.containers[0].ID)
+- request, _ := http.NewRequest("POST", path, nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusNoContent {
+- t.Errorf("PauseContainer: wrong status code. Want %d. Got %d.", http.StatusNoContent, recorder.Code)
- }
-- values := make(map[string]interface{})
-- for k, v := range expansions {
-- values[k] = v
+- if !server.containers[0].State.Paused {
+- t.Error("PauseContainer: did not pause the container")
- }
-- return template.Expand(values)
-}
-diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/transport/apikey.go b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/transport/apikey.go
-deleted file mode 100644
-index eca1ea2..0000000
---- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/transport/apikey.go
-+++ /dev/null
-@@ -1,38 +0,0 @@
--// Copyright 2012 Google Inc. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--// Package transport contains HTTP transports used to make
--// authenticated API requests.
--package transport
-
--import (
-- "errors"
-- "net/http"
--)
+-func TestPauseContainerAlreadyPaused(t *testing.T) {
+- server := DockerServer{}
+- addContainers(&server, 1)
+- server.containers[0].State.Paused = true
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- path := fmt.Sprintf("/containers/%s/pause", server.containers[0].ID)
+- request, _ := http.NewRequest("POST", path, nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusBadRequest {
+- t.Errorf("PauseContainer: wrong status code. Want %d. Got %d.", http.StatusBadRequest, recorder.Code)
+- }
+-}
-
--// APIKey is an HTTP Transport which wraps an underlying transport and
--// appends an API Key "key" parameter to the URL of outgoing requests.
--type APIKey struct {
-- // Key is the API Key to set on requests.
-- Key string
+-func TestPauseContainerNotFound(t *testing.T) {
+- server := DockerServer{}
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- path := "/containers/abc123/pause"
+- request, _ := http.NewRequest("POST", path, nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusNotFound {
+- t.Errorf("PauseContainer: wrong status code. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
+- }
+-}
-
-- // Transport is the underlying HTTP transport.
-- // If nil, http.DefaultTransport is used.
-- Transport http.RoundTripper
+-func TestUnpauseContainer(t *testing.T) {
+- server := DockerServer{}
+- addContainers(&server, 1)
+- server.containers[0].State.Paused = true
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- path := fmt.Sprintf("/containers/%s/unpause", server.containers[0].ID)
+- request, _ := http.NewRequest("POST", path, nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusNoContent {
+- t.Errorf("UnpauseContainer: wrong status code. Want %d. Got %d.", http.StatusNoContent, recorder.Code)
+- }
+- if server.containers[0].State.Paused {
+- t.Error("UnpauseContainer: did not unpause the container")
+- }
-}
-
--func (t *APIKey) RoundTrip(req *http.Request) (*http.Response, error) {
-- rt := t.Transport
-- if rt == nil {
-- rt = http.DefaultTransport
-- if rt == nil {
-- return nil, errors.New("googleapi/transport: no Transport specified or available")
-- }
+-func TestUnpauseContainerNotPaused(t *testing.T) {
+- server := DockerServer{}
+- addContainers(&server, 1)
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- path := fmt.Sprintf("/containers/%s/unpause", server.containers[0].ID)
+- request, _ := http.NewRequest("POST", path, nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusBadRequest {
+- t.Errorf("UnpauseContainer: wrong status code. Want %d. Got %d.", http.StatusBadRequest, recorder.Code)
- }
-- newReq := *req
-- args := newReq.URL.Query()
-- args.Set("key", t.Key)
-- newReq.URL.RawQuery = args.Encode()
-- return rt.RoundTrip(&newReq)
-}
-diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/types.go b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/types.go
-deleted file mode 100644
-index 7ed7dd9..0000000
---- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/types.go
-+++ /dev/null
-@@ -1,150 +0,0 @@
--// Copyright 2013 Google Inc. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--package googleapi
--
--import (
-- "encoding/json"
-- "strconv"
--)
--
--// Int64s is a slice of int64s that marshal as quoted strings in JSON.
--type Int64s []int64
-
--func (q *Int64s) UnmarshalJSON(raw []byte) error {
-- *q = (*q)[:0]
-- var ss []string
-- if err := json.Unmarshal(raw, &ss); err != nil {
-- return err
-- }
-- for _, s := range ss {
-- v, err := strconv.ParseInt(s, 10, 64)
-- if err != nil {
-- return err
-- }
-- *q = append(*q, int64(v))
+-func TestUnpauseContainerNotFound(t *testing.T) {
+- server := DockerServer{}
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- path := "/containers/abc123/unpause"
+- request, _ := http.NewRequest("POST", path, nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusNotFound {
+- t.Errorf("UnpauseContainer: wrong status code. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
- }
-- return nil
-}
-
--// Int32s is a slice of int32s that marshal as quoted strings in JSON.
--type Int32s []int32
--
--func (q *Int32s) UnmarshalJSON(raw []byte) error {
-- *q = (*q)[:0]
-- var ss []string
-- if err := json.Unmarshal(raw, &ss); err != nil {
-- return err
+-func TestWaitContainer(t *testing.T) {
+- server := DockerServer{}
+- addContainers(&server, 1)
+- server.containers[0].State.Running = true
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- path := fmt.Sprintf("/containers/%s/wait", server.containers[0].ID)
+- request, _ := http.NewRequest("POST", path, nil)
+- go func() {
+- server.cMut.Lock()
+- server.containers[0].State.Running = false
+- server.cMut.Unlock()
+- }()
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusOK {
+- t.Errorf("WaitContainer: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
- }
-- for _, s := range ss {
-- v, err := strconv.ParseInt(s, 10, 32)
-- if err != nil {
-- return err
-- }
-- *q = append(*q, int32(v))
+- expected := `{"StatusCode":0}` + "\n"
+- if body := recorder.Body.String(); body != expected {
+- t.Errorf("WaitContainer: wrong body. Want %q. Got %q.", expected, body)
- }
-- return nil
-}
-
--// Uint64s is a slice of uint64s that marshal as quoted strings in JSON.
--type Uint64s []uint64
--
--func (q *Uint64s) UnmarshalJSON(raw []byte) error {
-- *q = (*q)[:0]
-- var ss []string
-- if err := json.Unmarshal(raw, &ss); err != nil {
-- return err
+-func TestWaitContainerStatus(t *testing.T) {
+- server := DockerServer{}
+- addContainers(&server, 1)
+- server.buildMuxer()
+- server.containers[0].State.ExitCode = 63
+- recorder := httptest.NewRecorder()
+- path := fmt.Sprintf("/containers/%s/wait", server.containers[0].ID)
+- request, _ := http.NewRequest("POST", path, nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusOK {
+- t.Errorf("WaitContainer: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
- }
-- for _, s := range ss {
-- v, err := strconv.ParseUint(s, 10, 64)
-- if err != nil {
-- return err
-- }
-- *q = append(*q, uint64(v))
+- expected := `{"StatusCode":63}` + "\n"
+- if body := recorder.Body.String(); body != expected {
+- t.Errorf("WaitContainer: wrong body. Want %q. Got %q.", expected, body)
- }
-- return nil
-}
-
--// Uint32s is a slice of uint32s that marshal as quoted strings in JSON.
--type Uint32s []uint32
+-func TestWaitContainerNotFound(t *testing.T) {
+- server := DockerServer{}
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- path := "/containers/abc123/wait"
+- request, _ := http.NewRequest("POST", path, nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusNotFound {
+- t.Errorf("WaitContainer: wrong status code. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
+- }
+-}
-
--func (q *Uint32s) UnmarshalJSON(raw []byte) error {
-- *q = (*q)[:0]
-- var ss []string
-- if err := json.Unmarshal(raw, &ss); err != nil {
-- return err
+-func TestAttachContainer(t *testing.T) {
+- server := DockerServer{}
+- addContainers(&server, 1)
+- server.containers[0].State.Running = true
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- path := fmt.Sprintf("/containers/%s/attach?logs=1", server.containers[0].ID)
+- request, _ := http.NewRequest("POST", path, nil)
+- server.ServeHTTP(recorder, request)
+- lines := []string{
+- fmt.Sprintf("\x01\x00\x00\x00\x03\x00\x00\x00Container %q is running", server.containers[0].ID),
+- "What happened?",
+- "Something happened",
- }
-- for _, s := range ss {
-- v, err := strconv.ParseUint(s, 10, 32)
-- if err != nil {
-- return err
-- }
-- *q = append(*q, uint32(v))
+- expected := strings.Join(lines, "\n") + "\n"
+- if body := recorder.Body.String(); body == expected {
+- t.Errorf("AttachContainer: wrong body. Want %q. Got %q.", expected, body)
- }
-- return nil
-}
-
--// Float64s is a slice of float64s that marshal as quoted strings in JSON.
--type Float64s []float64
+-func TestAttachContainerNotFound(t *testing.T) {
+- server := DockerServer{}
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- path := "/containers/abc123/attach?logs=1"
+- request, _ := http.NewRequest("POST", path, nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusNotFound {
+- t.Errorf("AttachContainer: wrong status. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
+- }
+-}
-
--func (q *Float64s) UnmarshalJSON(raw []byte) error {
-- *q = (*q)[:0]
-- var ss []string
-- if err := json.Unmarshal(raw, &ss); err != nil {
-- return err
+-func TestRemoveContainer(t *testing.T) {
+- server := DockerServer{}
+- addContainers(&server, 1)
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- path := fmt.Sprintf("/containers/%s", server.containers[0].ID)
+- request, _ := http.NewRequest("DELETE", path, nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusNoContent {
+- t.Errorf("RemoveContainer: wrong status. Want %d. Got %d.", http.StatusNoContent, recorder.Code)
- }
-- for _, s := range ss {
-- v, err := strconv.ParseFloat(s, 64)
-- if err != nil {
-- return err
-- }
-- *q = append(*q, float64(v))
+- if len(server.containers) > 0 {
+- t.Error("RemoveContainer: did not remove the container.")
- }
-- return nil
-}
-
--func quotedList(n int, fn func(dst []byte, i int) []byte) ([]byte, error) {
-- dst := make([]byte, 0, 2+n*10) // somewhat arbitrary
-- dst = append(dst, '[')
-- for i := 0; i < n; i++ {
-- if i > 0 {
-- dst = append(dst, ',')
-- }
-- dst = append(dst, '"')
-- dst = fn(dst, i)
-- dst = append(dst, '"')
+-func TestRemoveContainerNotFound(t *testing.T) {
+- server := DockerServer{}
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- path := fmt.Sprintf("/containers/abc123")
+- request, _ := http.NewRequest("DELETE", path, nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusNotFound {
+- t.Errorf("RemoveContainer: wrong status. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
- }
-- dst = append(dst, ']')
-- return dst, nil
-}
-
--func (s Int64s) MarshalJSON() ([]byte, error) {
-- return quotedList(len(s), func(dst []byte, i int) []byte {
-- return strconv.AppendInt(dst, s[i], 10)
-- })
+-func TestRemoveContainerRunning(t *testing.T) {
+- server := DockerServer{}
+- addContainers(&server, 1)
+- server.containers[0].State.Running = true
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- path := fmt.Sprintf("/containers/%s", server.containers[0].ID)
+- request, _ := http.NewRequest("DELETE", path, nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusInternalServerError {
+- t.Errorf("RemoveContainer: wrong status. Want %d. Got %d.", http.StatusInternalServerError, recorder.Code)
+- }
+- if len(server.containers) < 1 {
+- t.Error("RemoveContainer: should not remove the container.")
+- }
-}
-
--func (s Int32s) MarshalJSON() ([]byte, error) {
-- return quotedList(len(s), func(dst []byte, i int) []byte {
-- return strconv.AppendInt(dst, int64(s[i]), 10)
-- })
+-func TestPullImage(t *testing.T) {
+- server := DockerServer{imgIDs: make(map[string]string)}
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- request, _ := http.NewRequest("POST", "/images/create?fromImage=base", nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusOK {
+- t.Errorf("PullImage: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
+- }
+- if len(server.images) != 1 {
+- t.Errorf("PullImage: Want 1 image. Got %d.", len(server.images))
+- }
+- if _, ok := server.imgIDs["base"]; !ok {
+- t.Error("PullImage: Repository should not be empty.")
+- }
-}
-
--func (s Uint64s) MarshalJSON() ([]byte, error) {
-- return quotedList(len(s), func(dst []byte, i int) []byte {
-- return strconv.AppendUint(dst, s[i], 10)
-- })
+-func TestPushImage(t *testing.T) {
+- server := DockerServer{imgIDs: map[string]string{"tsuru/python": "a123"}}
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- request, _ := http.NewRequest("POST", "/images/tsuru/python/push", nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusOK {
+- t.Errorf("PushImage: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
+- }
-}
-
--func (s Uint32s) MarshalJSON() ([]byte, error) {
-- return quotedList(len(s), func(dst []byte, i int) []byte {
-- return strconv.AppendUint(dst, uint64(s[i]), 10)
-- })
+-func TestPushImageNotFound(t *testing.T) {
+- server := DockerServer{}
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- request, _ := http.NewRequest("POST", "/images/tsuru/python/push", nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusNotFound {
+- t.Errorf("PushImage: wrong status. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
+- }
-}
-
--func (s Float64s) MarshalJSON() ([]byte, error) {
-- return quotedList(len(s), func(dst []byte, i int) []byte {
-- return strconv.AppendFloat(dst, s[i], 'g', -1, 64)
-- })
+-func addContainers(server *DockerServer, n int) {
+- server.cMut.Lock()
+- defer server.cMut.Unlock()
+- for i := 0; i < n; i++ {
+- date := time.Now().Add(time.Duration((rand.Int() % (i + 1))) * time.Hour)
+- container := docker.Container{
+- ID: fmt.Sprintf("%x", rand.Int()%10000),
+- Created: date,
+- Path: "ls",
+- Args: []string{"-la", ".."},
+- Config: &docker.Config{
+- Hostname: fmt.Sprintf("docker-%d", i),
+- AttachStdout: true,
+- AttachStderr: true,
+- Env: []string{"ME=you", fmt.Sprintf("NUMBER=%d", i)},
+- Cmd: []string{"ls", "-la", ".."},
+- Image: "base",
+- },
+- State: docker.State{
+- Running: false,
+- Pid: 400 + i,
+- ExitCode: 0,
+- StartedAt: date,
+- },
+- Image: "b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc",
+- NetworkSettings: &docker.NetworkSettings{
+- IPAddress: fmt.Sprintf("10.10.10.%d", i+2),
+- IPPrefixLen: 24,
+- Gateway: "10.10.10.1",
+- Bridge: "docker0",
+- PortMapping: map[string]docker.PortMapping{
+- "Tcp": {"8888": fmt.Sprintf("%d", 49600+i)},
+- },
+- },
+- ResolvConfPath: "/etc/resolv.conf",
+- }
+- server.containers = append(server.containers, &container)
+- }
-}
-diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/types_test.go b/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/types_test.go
-deleted file mode 100644
-index a6b2045..0000000
---- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/types_test.go
-+++ /dev/null
-@@ -1,44 +0,0 @@
--// Copyright 2013 Google Inc. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
-
--package googleapi
--
--import (
-- "encoding/json"
-- "reflect"
-- "testing"
--)
+-func addImages(server *DockerServer, n int, repo bool) {
+- server.iMut.Lock()
+- defer server.iMut.Unlock()
+- if server.imgIDs == nil {
+- server.imgIDs = make(map[string]string)
+- }
+- for i := 0; i < n; i++ {
+- date := time.Now().Add(time.Duration((rand.Int() % (i + 1))) * time.Hour)
+- image := docker.Image{
+- ID: fmt.Sprintf("%x", rand.Int()%10000),
+- Created: date,
+- }
+- server.images = append(server.images, image)
+- if repo {
+- repo := "docker/python-" + image.ID
+- server.imgIDs[repo] = image.ID
+- }
+- }
+-}
-
--func TestTypes(t *testing.T) {
-- type T struct {
-- I32 Int32s
-- I64 Int64s
-- U32 Uint32s
-- U64 Uint64s
-- F64 Float64s
+-func TestListImages(t *testing.T) {
+- server := DockerServer{}
+- addImages(&server, 2, true)
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- request, _ := http.NewRequest("GET", "/images/json?all=1", nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusOK {
+- t.Errorf("ListImages: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
- }
-- v := &T{
-- I32: Int32s{-1, 2, 3},
-- I64: Int64s{-1, 2, 1 << 33},
-- U32: Uint32s{1, 2},
-- U64: Uint64s{1, 2, 1 << 33},
-- F64: Float64s{1.5, 3.33},
+- expected := make([]docker.APIImages, 2)
+- for i, image := range server.images {
+- expected[i] = docker.APIImages{
+- ID: image.ID,
+- Created: image.Created.Unix(),
+- RepoTags: []string{"docker/python-" + image.ID},
+- }
- }
-- got, err := json.Marshal(v)
+- var got []docker.APIImages
+- err := json.NewDecoder(recorder.Body).Decode(&got)
- if err != nil {
- t.Fatal(err)
- }
-- want := `{"I32":["-1","2","3"],"I64":["-1","2","8589934592"],"U32":["1","2"],"U64":["1","2","8589934592"],"F64":["1.5","3.33"]}`
-- if string(got) != want {
-- t.Fatalf("Marshal mismatch.\n got: %s\nwant: %s\n", got, want)
+- if !reflect.DeepEqual(got, expected) {
+- t.Errorf("ListImages. Want %#v. Got %#v.", expected, got)
- }
+-}
-
-- v2 := new(T)
-- if err := json.Unmarshal(got, v2); err != nil {
-- t.Fatalf("Unmarshal: %v", err)
+-func TestRemoveImage(t *testing.T) {
+- server := DockerServer{}
+- addImages(&server, 1, false)
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- path := fmt.Sprintf("/images/%s", server.images[0].ID)
+- request, _ := http.NewRequest("DELETE", path, nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusNoContent {
+- t.Errorf("RemoveImage: wrong status. Want %d. Got %d.", http.StatusNoContent, recorder.Code)
- }
-- if !reflect.DeepEqual(v, v2) {
-- t.Fatalf("Unmarshal didn't produce same results.\n got: %#v\nwant: %#v\n", v, v2)
+- if len(server.images) > 0 {
+- t.Error("RemoveImage: did not remove the image.")
- }
-}
-diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/add_child.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/add_child.go
-deleted file mode 100644
-index 7122be0..0000000
---- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/add_child.go
-+++ /dev/null
-@@ -1,23 +0,0 @@
--package etcd
--
--// Add a new directory with a random etcd-generated key under the given path.
--func (c *Client) AddChildDir(key string, ttl uint64) (*Response, error) {
-- raw, err := c.post(key, "", ttl)
-
-- if err != nil {
-- return nil, err
+-func TestRemoveImageByName(t *testing.T) {
+- server := DockerServer{}
+- addImages(&server, 1, true)
+- server.buildMuxer()
+- recorder := httptest.NewRecorder()
+- imgName := "docker/python-" + server.images[0].ID
+- path := "/images/" + imgName
+- request, _ := http.NewRequest("DELETE", path, nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusNoContent {
+- t.Errorf("RemoveImage: wrong status. Want %d. Got %d.", http.StatusNoContent, recorder.Code)
+- }
+- if len(server.images) > 0 {
+- t.Error("RemoveImage: did not remove the image.")
+- }
+- _, ok := server.imgIDs[imgName]
+- if ok {
+- t.Error("RemoveImage: did not remove image tag name.")
- }
--
-- return raw.Unmarshal()
-}
-
--// Add a new file with a random etcd-generated key under the given path.
--func (c *Client) AddChild(key string, value string, ttl uint64) (*Response, error) {
-- raw, err := c.post(key, value, ttl)
--
-- if err != nil {
-- return nil, err
+-func TestPrepareFailure(t *testing.T) {
+- server := DockerServer{failures: make(map[string]string)}
+- server.buildMuxer()
+- errorID := "my_error"
+- server.PrepareFailure(errorID, "containers/json")
+- recorder := httptest.NewRecorder()
+- request, _ := http.NewRequest("GET", "/containers/json?all=1", nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusBadRequest {
+- t.Errorf("PrepareFailure: wrong status. Want %d. Got %d.", http.StatusBadRequest, recorder.Code)
+- }
+- if recorder.Body.String() != errorID+"\n" {
+- t.Errorf("PrepareFailure: wrong message. Want %s. Got %s.", errorID, recorder.Body.String())
- }
--
-- return raw.Unmarshal()
-}
-diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/add_child_test.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/add_child_test.go
-deleted file mode 100644
-index 26223ff..0000000
---- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/add_child_test.go
-+++ /dev/null
-@@ -1,73 +0,0 @@
--package etcd
--
--import "testing"
--
--func TestAddChild(t *testing.T) {
-- c := NewClient(nil)
-- defer func() {
-- c.Delete("fooDir", true)
-- c.Delete("nonexistentDir", true)
-- }()
--
-- c.CreateDir("fooDir", 5)
-
-- _, err := c.AddChild("fooDir", "v0", 5)
-- if err != nil {
-- t.Fatal(err)
+-func TestRemoveFailure(t *testing.T) {
+- server := DockerServer{failures: make(map[string]string)}
+- server.buildMuxer()
+- errorID := "my_error"
+- server.PrepareFailure(errorID, "containers/json")
+- recorder := httptest.NewRecorder()
+- request, _ := http.NewRequest("GET", "/containers/json?all=1", nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusBadRequest {
+- t.Errorf("PrepareFailure: wrong status. Want %d. Got %d.", http.StatusBadRequest, recorder.Code)
+- }
+- server.ResetFailure(errorID)
+- recorder = httptest.NewRecorder()
+- request, _ = http.NewRequest("GET", "/containers/json?all=1", nil)
+- server.ServeHTTP(recorder, request)
+- if recorder.Code != http.StatusOK {
+- t.Errorf("RemoveFailure: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
- }
+-}
-
-- _, err = c.AddChild("fooDir", "v1", 5)
+-func TestMutateContainer(t *testing.T) {
+- server := DockerServer{failures: make(map[string]string)}
+- server.buildMuxer()
+- server.containers = append(server.containers, &docker.Container{ID: "id123"})
+- state := docker.State{Running: false, ExitCode: 1}
+- err := server.MutateContainer("id123", state)
- if err != nil {
- t.Fatal(err)
- }
--
-- resp, err := c.Get("fooDir", true, false)
-- // The child with v0 should proceed the child with v1 because it's added
-- // earlier, so it should have a lower key.
-- if !(len(resp.Node.Nodes) == 2 && (resp.Node.Nodes[0].Value == "v0" && resp.Node.Nodes[1].Value == "v1")) {
-- t.Fatalf("AddChild 1 failed. There should be two chlidren whose values are v0 and v1, respectively."+
-- " The response was: %#v", resp)
+- if !reflect.DeepEqual(server.containers[0].State, state) {
+- t.Errorf("Wrong state after mutation.\nWant %#v.\nGot %#v.",
+- state, server.containers[0].State)
- }
+-}
-
-- // Creating a child under a nonexistent directory should succeed.
-- // The directory should be created.
-- resp, err = c.AddChild("nonexistentDir", "foo", 5)
-- if err != nil {
-- t.Fatal(err)
+-func TestMutateContainerNotFound(t *testing.T) {
+- server := DockerServer{failures: make(map[string]string)}
+- server.buildMuxer()
+- state := docker.State{Running: false, ExitCode: 1}
+- err := server.MutateContainer("id123", state)
+- if err == nil {
+- t.Error("Unexpected <nil> error")
+- }
+- if err.Error() != "container not found" {
+- t.Errorf("wrong error message. Want %q. Got %q.", "container not found", err)
- }
-}
-
--func TestAddChildDir(t *testing.T) {
-- c := NewClient(nil)
-- defer func() {
-- c.Delete("fooDir", true)
-- c.Delete("nonexistentDir", true)
-- }()
--
-- c.CreateDir("fooDir", 5)
--
-- _, err := c.AddChildDir("fooDir", 5)
+-func TestBuildImageWithContentTypeTar(t *testing.T) {
+- server := DockerServer{imgIDs: make(map[string]string)}
+- imageName := "teste"
+- recorder := httptest.NewRecorder()
+- tarFile, err := os.Open("data/dockerfile.tar")
- if err != nil {
- t.Fatal(err)
- }
+- defer tarFile.Close()
+- request, _ := http.NewRequest("POST", "/build?t=teste", tarFile)
+- request.Header.Add("Content-Type", "application/tar")
+- server.buildImage(recorder, request)
+- if recorder.Body.String() == "miss Dockerfile" {
+- t.Errorf("BuildImage: miss Dockerfile")
+- return
+- }
+- if _, ok := server.imgIDs[imageName]; ok == false {
+- t.Errorf("BuildImage: image %s not builded", imageName)
+- }
+-}
-
-- _, err = c.AddChildDir("fooDir", 5)
-- if err != nil {
-- t.Fatal(err)
+-func TestBuildImageWithRemoteDockerfile(t *testing.T) {
+- server := DockerServer{imgIDs: make(map[string]string)}
+- imageName := "teste"
+- recorder := httptest.NewRecorder()
+- request, _ := http.NewRequest("POST", "/build?t=teste&remote=http://localhost/Dockerfile", nil)
+- server.buildImage(recorder, request)
+- if _, ok := server.imgIDs[imageName]; ok == false {
+- t.Errorf("BuildImage: image %s not builded", imageName)
- }
+-}
-
-- resp, err := c.Get("fooDir", true, false)
-- // The child with v0 should proceed the child with v1 because it's added
-- // earlier, so it should have a lower key.
-- if !(len(resp.Node.Nodes) == 2 && (len(resp.Node.Nodes[0].Nodes) == 0 && len(resp.Node.Nodes[1].Nodes) == 0)) {
-- t.Fatalf("AddChildDir 1 failed. There should be two chlidren whose values are v0 and v1, respectively."+
-- " The response was: %#v", resp)
+-func TestPing(t *testing.T) {
+- server := DockerServer{}
+- recorder := httptest.NewRecorder()
+- request, _ := http.NewRequest("GET", "/_ping", nil)
+- server.pingDocker(recorder, request)
+- if recorder.Body.String() != "" {
+- t.Errorf("Ping: Unexpected body: %s", recorder.Body.String())
+- }
+- if recorder.Code != http.StatusOK {
+- t.Errorf("Ping: Expected code %d, got: %d", http.StatusOK, recorder.Code)
- }
+-}
-
-- // Creating a child under a nonexistent directory should succeed.
-- // The directory should be created.
-- resp, err = c.AddChildDir("nonexistentDir", 5)
+-func TestDefaultHandler(t *testing.T) {
+- server, err := NewServer("127.0.0.1:0", nil, nil)
- if err != nil {
- t.Fatal(err)
- }
+- defer server.listener.Close()
+- if server.mux != server.DefaultHandler() {
+- t.Fatalf("DefaultHandler: Expected to return server.mux, got: %#v", server.DefaultHandler())
+- }
-}
-diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/client.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/client.go
+diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/writer.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/writer.go
deleted file mode 100644
-index f6ae548..0000000
---- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/client.go
+index 42752b0..0000000
+--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/writer.go
+++ /dev/null
-@@ -1,435 +0,0 @@
--package etcd
+@@ -1,43 +0,0 @@
+-// Copyright 2014 go-dockerclient authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-package testing
-
-import (
-- "crypto/tls"
-- "crypto/x509"
-- "encoding/json"
+- "encoding/binary"
- "errors"
- "io"
-- "io/ioutil"
-- "net"
-- "net/http"
-- "net/url"
-- "os"
-- "path"
-- "time"
-)
-
--// See SetConsistency for how to use these constants.
--const (
-- // Using strings rather than iota because the consistency level
-- // could be persisted to disk, so it'd be better to use
-- // human-readable values.
-- STRONG_CONSISTENCY = "STRONG"
-- WEAK_CONSISTENCY = "WEAK"
--)
+-type stdType [8]byte
-
--const (
-- defaultBufferSize = 10
+-var (
+- stdin stdType = stdType{0: 0}
+- stdout stdType = stdType{0: 1}
+- stderr stdType = stdType{0: 2}
-)
-
--type Config struct {
-- CertFile string `json:"certFile"`
-- KeyFile string `json:"keyFile"`
-- CaCertFile []string `json:"caCertFiles"`
-- DialTimeout time.Duration `json:"timeout"`
-- Consistency string `json:"consistency"`
--}
--
--type Client struct {
-- config Config `json:"config"`
-- cluster *Cluster `json:"cluster"`
-- httpClient *http.Client
-- persistence io.Writer
-- cURLch chan string
-- // CheckRetry can be used to control the policy for failed requests
-- // and modify the cluster if needed.
-- // The client calls it before sending requests again, and
-- // stops retrying if CheckRetry returns some error. The cases that
-- // this function needs to handle include no response and unexpected
-- // http status code of response.
-- // If CheckRetry is nil, client will call the default one
-- // `DefaultCheckRetry`.
-- // Argument cluster is the etcd.Cluster object that these requests have been made on.
-- // Argument numReqs is the number of http.Requests that have been made so far.
-- // Argument lastResp is the http.Responses from the last request.
-- // Argument err is the reason of the failure.
-- CheckRetry func(cluster *Cluster, numReqs int,
-- lastResp http.Response, err error) error
--}
--
--// NewClient create a basic client that is configured to be used
--// with the given machine list.
--func NewClient(machines []string) *Client {
-- config := Config{
-- // default timeout is one second
-- DialTimeout: time.Second,
-- // default consistency level is STRONG
-- Consistency: STRONG_CONSISTENCY,
-- }
--
-- client := &Client{
-- cluster: NewCluster(machines),
-- config: config,
-- }
--
-- client.initHTTPClient()
-- client.saveConfig()
--
-- return client
--}
--
--// NewTLSClient create a basic client with TLS configuration
--func NewTLSClient(machines []string, cert, key, caCert string) (*Client, error) {
-- // overwrite the default machine to use https
-- if len(machines) == 0 {
-- machines = []string{"https://127.0.0.1:4001"}
-- }
--
-- config := Config{
-- // default timeout is one second
-- DialTimeout: time.Second,
-- // default consistency level is STRONG
-- Consistency: STRONG_CONSISTENCY,
-- CertFile: cert,
-- KeyFile: key,
-- CaCertFile: make([]string, 0),
-- }
--
-- client := &Client{
-- cluster: NewCluster(machines),
-- config: config,
-- }
--
-- err := client.initHTTPSClient(cert, key)
-- if err != nil {
-- return nil, err
-- }
--
-- err = client.AddRootCA(caCert)
--
-- client.saveConfig()
--
-- return client, nil
--}
--
--// NewClientFromFile creates a client from a given file path.
--// The given file is expected to use the JSON format.
--func NewClientFromFile(fpath string) (*Client, error) {
-- fi, err := os.Open(fpath)
-- if err != nil {
-- return nil, err
-- }
--
-- defer func() {
-- if err := fi.Close(); err != nil {
-- panic(err)
-- }
-- }()
--
-- return NewClientFromReader(fi)
+-type stdWriter struct {
+- io.Writer
+- prefix stdType
+- sizeBuf []byte
-}
-
--// NewClientFromReader creates a Client configured from a given reader.
--// The configuration is expected to use the JSON format.
--func NewClientFromReader(reader io.Reader) (*Client, error) {
-- c := new(Client)
--
-- b, err := ioutil.ReadAll(reader)
-- if err != nil {
-- return nil, err
-- }
--
-- err = json.Unmarshal(b, c)
-- if err != nil {
-- return nil, err
-- }
-- if c.config.CertFile == "" {
-- c.initHTTPClient()
-- } else {
-- err = c.initHTTPSClient(c.config.CertFile, c.config.KeyFile)
-- }
--
-- if err != nil {
-- return nil, err
-- }
--
-- for _, caCert := range c.config.CaCertFile {
-- if err := c.AddRootCA(caCert); err != nil {
-- return nil, err
-- }
+-func (w *stdWriter) Write(buf []byte) (n int, err error) {
+- if w == nil || w.Writer == nil {
+- return 0, errors.New("Writer not instanciated")
- }
+- binary.BigEndian.PutUint32(w.prefix[4:], uint32(len(buf)))
+- buf = append(w.prefix[:], buf...)
-
-- return c, nil
--}
--
--// Override the Client's HTTP Transport object
--func (c *Client) SetTransport(tr *http.Transport) {
-- c.httpClient.Transport = tr
+- n, err = w.Writer.Write(buf)
+- return n - 8, err
-}
-
--// initHTTPClient initializes a HTTP client for etcd client
--func (c *Client) initHTTPClient() {
-- tr := &http.Transport{
-- Dial: c.dial,
-- TLSClientConfig: &tls.Config{
-- InsecureSkipVerify: true,
-- },
+-func newStdWriter(w io.Writer, t stdType) *stdWriter {
+- if len(t) != 8 {
+- return nil
- }
-- c.httpClient = &http.Client{Transport: tr}
+- return &stdWriter{Writer: w, prefix: t, sizeBuf: make([]byte, 4)}
-}
+diff --git a/Godeps/_workspace/src/github.com/golang/glog/LICENSE b/Godeps/_workspace/src/github.com/golang/glog/LICENSE
+deleted file mode 100644
+index 37ec93a..0000000
+--- a/Godeps/_workspace/src/github.com/golang/glog/LICENSE
++++ /dev/null
+@@ -1,191 +0,0 @@
+-Apache License
+-Version 2.0, January 2004
+-http://www.apache.org/licenses/
-
--// initHTTPClient initializes a HTTPS client for etcd client
--func (c *Client) initHTTPSClient(cert, key string) error {
-- if cert == "" || key == "" {
-- return errors.New("Require both cert and key path")
-- }
--
-- tlsCert, err := tls.LoadX509KeyPair(cert, key)
-- if err != nil {
-- return err
-- }
+-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-- tlsConfig := &tls.Config{
-- Certificates: []tls.Certificate{tlsCert},
-- InsecureSkipVerify: true,
-- }
+-1. Definitions.
-
-- tr := &http.Transport{
-- TLSClientConfig: tlsConfig,
-- Dial: c.dial,
-- }
+-"License" shall mean the terms and conditions for use, reproduction, and
+-distribution as defined by Sections 1 through 9 of this document.
-
-- c.httpClient = &http.Client{Transport: tr}
-- return nil
--}
+-"Licensor" shall mean the copyright owner or entity authorized by the copyright
+-owner that is granting the License.
-
--// SetPersistence sets a writer to which the config will be
--// written every time it's changed.
--func (c *Client) SetPersistence(writer io.Writer) {
-- c.persistence = writer
--}
+-"Legal Entity" shall mean the union of the acting entity and all other entities
+-that control, are controlled by, or are under common control with that entity.
+-For the purposes of this definition, "control" means (i) the power, direct or
+-indirect, to cause the direction or management of such entity, whether by
+-contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
+-outstanding shares, or (iii) beneficial ownership of such entity.
-
--// SetConsistency changes the consistency level of the client.
--//
--// When consistency is set to STRONG_CONSISTENCY, all requests,
--// including GET, are sent to the leader. This means that, assuming
--// the absence of leader failures, GET requests are guaranteed to see
--// the changes made by previous requests.
--//
--// When consistency is set to WEAK_CONSISTENCY, other requests
--// are still sent to the leader, but GET requests are sent to a
--// random server from the server pool. This reduces the read
--// load on the leader, but it's not guaranteed that the GET requests
--// will see changes made by previous requests (they might have not
--// yet been committed on non-leader servers).
--func (c *Client) SetConsistency(consistency string) error {
-- if !(consistency == STRONG_CONSISTENCY || consistency == WEAK_CONSISTENCY) {
-- return errors.New("The argument must be either STRONG_CONSISTENCY or WEAK_CONSISTENCY.")
-- }
-- c.config.Consistency = consistency
-- return nil
--}
+-"You" (or "Your") shall mean an individual or Legal Entity exercising
+-permissions granted by this License.
-
--// Sets the DialTimeout value
--func (c *Client) SetDialTimeout(d time.Duration) {
-- c.config.DialTimeout = d
--}
+-"Source" form shall mean the preferred form for making modifications, including
+-but not limited to software source code, documentation source, and configuration
+-files.
-
--// AddRootCA adds a root CA cert for the etcd client
--func (c *Client) AddRootCA(caCert string) error {
-- if c.httpClient == nil {
-- return errors.New("Client has not been initialized yet!")
-- }
+-"Object" form shall mean any form resulting from mechanical transformation or
+-translation of a Source form, including but not limited to compiled object code,
+-generated documentation, and conversions to other media types.
-
-- certBytes, err := ioutil.ReadFile(caCert)
-- if err != nil {
-- return err
-- }
+-"Work" shall mean the work of authorship, whether in Source or Object form, made
+-available under the License, as indicated by a copyright notice that is included
+-in or attached to the work (an example is provided in the Appendix below).
-
-- tr, ok := c.httpClient.Transport.(*http.Transport)
+-"Derivative Works" shall mean any work, whether in Source or Object form, that
+-is based on (or derived from) the Work and for which the editorial revisions,
+-annotations, elaborations, or other modifications represent, as a whole, an
+-original work of authorship. For the purposes of this License, Derivative Works
+-shall not include works that remain separable from, or merely link (or bind by
+-name) to the interfaces of, the Work and Derivative Works thereof.
-
-- if !ok {
-- panic("AddRootCA(): Transport type assert should not fail")
-- }
+-"Contribution" shall mean any work of authorship, including the original version
+-of the Work and any modifications or additions to that Work or Derivative Works
+-thereof, that is intentionally submitted to Licensor for inclusion in the Work
+-by the copyright owner or by an individual or Legal Entity authorized to submit
+-on behalf of the copyright owner. For the purposes of this definition,
+-"submitted" means any form of electronic, verbal, or written communication sent
+-to the Licensor or its representatives, including but not limited to
+-communication on electronic mailing lists, source code control systems, and
+-issue tracking systems that are managed by, or on behalf of, the Licensor for
+-the purpose of discussing and improving the Work, but excluding communication
+-that is conspicuously marked or otherwise designated in writing by the copyright
+-owner as "Not a Contribution."
-
-- if tr.TLSClientConfig.RootCAs == nil {
-- caCertPool := x509.NewCertPool()
-- ok = caCertPool.AppendCertsFromPEM(certBytes)
-- if ok {
-- tr.TLSClientConfig.RootCAs = caCertPool
-- }
-- tr.TLSClientConfig.InsecureSkipVerify = false
-- } else {
-- ok = tr.TLSClientConfig.RootCAs.AppendCertsFromPEM(certBytes)
-- }
+-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
+-of whom a Contribution has been received by Licensor and subsequently
+-incorporated within the Work.
-
-- if !ok {
-- err = errors.New("Unable to load caCert")
-- }
+-2. Grant of Copyright License.
-
-- c.config.CaCertFile = append(c.config.CaCertFile, caCert)
-- c.saveConfig()
+-Subject to the terms and conditions of this License, each Contributor hereby
+-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+-irrevocable copyright license to reproduce, prepare Derivative Works of,
+-publicly display, publicly perform, sublicense, and distribute the Work and such
+-Derivative Works in Source or Object form.
-
-- return err
--}
+-3. Grant of Patent License.
-
--// SetCluster updates cluster information using the given machine list.
--func (c *Client) SetCluster(machines []string) bool {
-- success := c.internalSyncCluster(machines)
-- return success
--}
+-Subject to the terms and conditions of this License, each Contributor hereby
+-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+-irrevocable (except as stated in this section) patent license to make, have
+-made, use, offer to sell, sell, import, and otherwise transfer the Work, where
+-such license applies only to those patent claims licensable by such Contributor
+-that are necessarily infringed by their Contribution(s) alone or by combination
+-of their Contribution(s) with the Work to which such Contribution(s) was
+-submitted. If You institute patent litigation against any entity (including a
+-cross-claim or counterclaim in a lawsuit) alleging that the Work or a
+-Contribution incorporated within the Work constitutes direct or contributory
+-patent infringement, then any patent licenses granted to You under this License
+-for that Work shall terminate as of the date such litigation is filed.
-
--func (c *Client) GetCluster() []string {
-- return c.cluster.Machines
--}
+-4. Redistribution.
-
--// SyncCluster updates the cluster information using the internal machine list.
--func (c *Client) SyncCluster() bool {
-- return c.internalSyncCluster(c.cluster.Machines)
--}
+-You may reproduce and distribute copies of the Work or Derivative Works thereof
+-in any medium, with or without modifications, and in Source or Object form,
+-provided that You meet the following conditions:
-
--// internalSyncCluster syncs cluster information using the given machine list.
--func (c *Client) internalSyncCluster(machines []string) bool {
-- for _, machine := range machines {
-- httpPath := c.createHttpPath(machine, path.Join(version, "machines"))
-- resp, err := c.httpClient.Get(httpPath)
-- if err != nil {
-- // try another machine in the cluster
-- continue
-- } else {
-- b, err := ioutil.ReadAll(resp.Body)
-- resp.Body.Close()
-- if err != nil {
-- // try another machine in the cluster
-- continue
-- }
+-You must give any other recipients of the Work or Derivative Works a copy of
+-this License; and
+-You must cause any modified files to carry prominent notices stating that You
+-changed the files; and
+-You must retain, in the Source form of any Derivative Works that You distribute,
+-all copyright, patent, trademark, and attribution notices from the Source form
+-of the Work, excluding those notices that do not pertain to any part of the
+-Derivative Works; and
+-If the Work includes a "NOTICE" text file as part of its distribution, then any
+-Derivative Works that You distribute must include a readable copy of the
+-attribution notices contained within such NOTICE file, excluding those notices
+-that do not pertain to any part of the Derivative Works, in at least one of the
+-following places: within a NOTICE text file distributed as part of the
+-Derivative Works; within the Source form or documentation, if provided along
+-with the Derivative Works; or, within a display generated by the Derivative
+-Works, if and wherever such third-party notices normally appear. The contents of
+-the NOTICE file are for informational purposes only and do not modify the
+-License. You may add Your own attribution notices within Derivative Works that
+-You distribute, alongside or as an addendum to the NOTICE text from the Work,
+-provided that such additional attribution notices cannot be construed as
+-modifying the License.
+-You may add Your own copyright statement to Your modifications and may provide
+-additional or different license terms and conditions for use, reproduction, or
+-distribution of Your modifications, or for any such Derivative Works as a whole,
+-provided Your use, reproduction, and distribution of the Work otherwise complies
+-with the conditions stated in this License.
-
-- // update Machines List
-- c.cluster.updateFromStr(string(b))
+-5. Submission of Contributions.
-
-- // update leader
-- // the first one in the machine list is the leader
-- c.cluster.switchLeader(0)
+-Unless You explicitly state otherwise, any Contribution intentionally submitted
+-for inclusion in the Work by You to the Licensor shall be under the terms and
+-conditions of this License, without any additional terms or conditions.
+-Notwithstanding the above, nothing herein shall supersede or modify the terms of
+-any separate license agreement you may have executed with Licensor regarding
+-such Contributions.
-
-- logger.Debug("sync.machines ", c.cluster.Machines)
-- c.saveConfig()
-- return true
-- }
-- }
-- return false
--}
+-6. Trademarks.
-
--// createHttpPath creates a complete HTTP URL.
--// serverName should contain both the host name and a port number, if any.
--func (c *Client) createHttpPath(serverName string, _path string) string {
-- u, err := url.Parse(serverName)
-- if err != nil {
-- panic(err)
-- }
+-This License does not grant permission to use the trade names, trademarks,
+-service marks, or product names of the Licensor, except as required for
+-reasonable and customary use in describing the origin of the Work and
+-reproducing the content of the NOTICE file.
-
-- u.Path = path.Join(u.Path, _path)
+-7. Disclaimer of Warranty.
-
-- if u.Scheme == "" {
-- u.Scheme = "http"
-- }
-- return u.String()
--}
+-Unless required by applicable law or agreed to in writing, Licensor provides the
+-Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
+-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
+-including, without limitation, any warranties or conditions of TITLE,
+-NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
+-solely responsible for determining the appropriateness of using or
+-redistributing the Work and assume any risks associated with Your exercise of
+-permissions under this License.
-
--// dial attempts to open a TCP connection to the provided address, explicitly
--// enabling keep-alives with a one-second interval.
--func (c *Client) dial(network, addr string) (net.Conn, error) {
-- conn, err := net.DialTimeout(network, addr, c.config.DialTimeout)
-- if err != nil {
-- return nil, err
-- }
+-8. Limitation of Liability.
-
-- tcpConn, ok := conn.(*net.TCPConn)
-- if !ok {
-- return nil, errors.New("Failed type-assertion of net.Conn as *net.TCPConn")
-- }
+-In no event and under no legal theory, whether in tort (including negligence),
+-contract, or otherwise, unless required by applicable law (such as deliberate
+-and grossly negligent acts) or agreed to in writing, shall any Contributor be
+-liable to You for damages, including any direct, indirect, special, incidental,
+-or consequential damages of any character arising as a result of this License or
+-out of the use or inability to use the Work (including but not limited to
+-damages for loss of goodwill, work stoppage, computer failure or malfunction, or
+-any and all other commercial damages or losses), even if such Contributor has
+-been advised of the possibility of such damages.
-
-- // Keep TCP alive to check whether or not the remote machine is down
-- if err = tcpConn.SetKeepAlive(true); err != nil {
-- return nil, err
-- }
+-9. Accepting Warranty or Additional Liability.
-
-- if err = tcpConn.SetKeepAlivePeriod(time.Second); err != nil {
-- return nil, err
-- }
+-While redistributing the Work or Derivative Works thereof, You may choose to
+-offer, and charge a fee for, acceptance of support, warranty, indemnity, or
+-other liability obligations and/or rights consistent with this License. However,
+-in accepting such obligations, You may act only on Your own behalf and on Your
+-sole responsibility, not on behalf of any other Contributor, and only if You
+-agree to indemnify, defend, and hold each Contributor harmless for any liability
+-incurred by, or claims asserted against, such Contributor by reason of your
+-accepting any such warranty or additional liability.
-
-- return tcpConn, nil
--}
+-END OF TERMS AND CONDITIONS
-
--func (c *Client) OpenCURL() {
-- c.cURLch = make(chan string, defaultBufferSize)
--}
+-APPENDIX: How to apply the Apache License to your work
-
--func (c *Client) CloseCURL() {
-- c.cURLch = nil
--}
+-To apply the Apache License to your work, attach the following boilerplate
+-notice, with the fields enclosed by brackets "[]" replaced with your own
+-identifying information. (Don't include the brackets!) The text should be
+-enclosed in the appropriate comment syntax for the file format. We also
+-recommend that a file or class name and description of purpose be included on
+-the same "printed page" as the copyright notice for easier identification within
+-third-party archives.
-
--func (c *Client) sendCURL(command string) {
-- go func() {
-- select {
-- case c.cURLch <- command:
-- default:
-- }
-- }()
--}
+- Copyright [yyyy] [name of copyright owner]
-
--func (c *Client) RecvCURL() string {
-- return <-c.cURLch
--}
+- Licensed under the Apache License, Version 2.0 (the "License");
+- you may not use this file except in compliance with the License.
+- You may obtain a copy of the License at
-
--// saveConfig saves the current config using c.persistence.
--func (c *Client) saveConfig() error {
-- if c.persistence != nil {
-- b, err := json.Marshal(c)
-- if err != nil {
-- return err
-- }
+- http://www.apache.org/licenses/LICENSE-2.0
-
-- _, err = c.persistence.Write(b)
-- if err != nil {
-- return err
-- }
-- }
+- Unless required by applicable law or agreed to in writing, software
+- distributed under the License is distributed on an "AS IS" BASIS,
+- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- See the License for the specific language governing permissions and
+- limitations under the License.
+diff --git a/Godeps/_workspace/src/github.com/golang/glog/README b/Godeps/_workspace/src/github.com/golang/glog/README
+deleted file mode 100644
+index 5f9c114..0000000
+--- a/Godeps/_workspace/src/github.com/golang/glog/README
++++ /dev/null
+@@ -1,44 +0,0 @@
+-glog
+-====
-
-- return nil
--}
+-Leveled execution logs for Go.
-
--// MarshalJSON implements the Marshaller interface
--// as defined by the standard JSON package.
--func (c *Client) MarshalJSON() ([]byte, error) {
-- b, err := json.Marshal(struct {
-- Config Config `json:"config"`
-- Cluster *Cluster `json:"cluster"`
-- }{
-- Config: c.config,
-- Cluster: c.cluster,
-- })
+-This is an efficient pure Go implementation of leveled logs in the
+-manner of the open source C++ package
+- http://code.google.com/p/google-glog
-
-- if err != nil {
-- return nil, err
-- }
+-By binding methods to booleans it is possible to use the log package
+-without paying the expense of evaluating the arguments to the log.
+-Through the -vmodule flag, the package also provides fine-grained
+-control over logging at the file level.
-
-- return b, nil
--}
+-The comment from glog.go introduces the ideas:
-
--// UnmarshalJSON implements the Unmarshaller interface
--// as defined by the standard JSON package.
--func (c *Client) UnmarshalJSON(b []byte) error {
-- temp := struct {
-- Config Config `json:"config"`
-- Cluster *Cluster `json:"cluster"`
-- }{}
-- err := json.Unmarshal(b, &temp)
-- if err != nil {
-- return err
-- }
+- Package glog implements logging analogous to the Google-internal
+- C++ INFO/ERROR/V setup. It provides functions Info, Warning,
+- Error, Fatal, plus formatting variants such as Infof. It
+- also provides V-style logging controlled by the -v and
+- -vmodule=file=2 flags.
+-
+- Basic examples:
+-
+- glog.Info("Prepare to repel boarders")
+-
+- glog.Fatalf("Initialization failed: %s", err)
+-
+- See the documentation for the V function for an explanation
+- of these examples:
+-
+- if glog.V(2) {
+- glog.Info("Starting transaction...")
+- }
+-
+- glog.V(2).Infoln("Processed", nItems, "elements")
-
-- c.cluster = temp.Cluster
-- c.config = temp.Config
-- return nil
--}
-diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/client_test.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/client_test.go
+-
+-The repository contains an open source version of the log package
+-used inside Google. The master copy of the source lives inside
+-Google, not here. The code in this repo is for export only and is not itself
+-under development. Feature requests will be ignored.
+-
+-Send bug reports to golang-nuts at googlegroups.com.
+diff --git a/Godeps/_workspace/src/github.com/golang/glog/glog.go b/Godeps/_workspace/src/github.com/golang/glog/glog.go
deleted file mode 100644
-index c245e47..0000000
---- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/client_test.go
+index 3e63fff..0000000
+--- a/Godeps/_workspace/src/github.com/golang/glog/glog.go
+++ /dev/null
-@@ -1,96 +0,0 @@
--package etcd
+@@ -1,1177 +0,0 @@
+-// Go support for leveled logs, analogous to https://code.google.com/p/google-glog/
+-//
+-// Copyright 2013 Google Inc. All Rights Reserved.
+-//
+-// Licensed under the Apache License, Version 2.0 (the "License");
+-// you may not use this file except in compliance with the License.
+-// You may obtain a copy of the License at
+-//
+-// http://www.apache.org/licenses/LICENSE-2.0
+-//
+-// Unless required by applicable law or agreed to in writing, software
+-// distributed under the License is distributed on an "AS IS" BASIS,
+-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-// See the License for the specific language governing permissions and
+-// limitations under the License.
+-
+-// Package glog implements logging analogous to the Google-internal C++ INFO/ERROR/V setup.
+-// It provides functions Info, Warning, Error, Fatal, plus formatting variants such as
+-// Infof. It also provides V-style logging controlled by the -v and -vmodule=file=2 flags.
+-//
+-// Basic examples:
+-//
+-// glog.Info("Prepare to repel boarders")
+-//
+-// glog.Fatalf("Initialization failed: %s", err)
+-//
+-// See the documentation for the V function for an explanation of these examples:
+-//
+-// if glog.V(2) {
+-// glog.Info("Starting transaction...")
+-// }
+-//
+-// glog.V(2).Infoln("Processed", nItems, "elements")
+-//
+-// Log output is buffered and written periodically using Flush. Programs
+-// should call Flush before exiting to guarantee all log output is written.
+-//
+-// By default, all log statements write to files in a temporary directory.
+-// This package provides several flags that modify this behavior.
+-// As a result, flag.Parse must be called before any logging is done.
+-//
+-// -logtostderr=false
+-// Logs are written to standard error instead of to files.
+-// -alsologtostderr=false
+-// Logs are written to standard error as well as to files.
+-// -stderrthreshold=ERROR
+-// Log events at or above this severity are logged to standard
+-// error as well as to files.
+-// -log_dir=""
+-// Log files will be written to this directory instead of the
+-// default temporary directory.
+-//
+-// Other flags provide aids to debugging.
+-//
+-// -log_backtrace_at=""
+-// When set to a file and line number holding a logging statement,
+-// such as
+-// -log_backtrace_at=gopherflakes.go:234
+-// a stack trace will be written to the Info log whenever execution
+-// hits that statement. (Unlike with -vmodule, the ".go" must be
+-// present.)
+-// -v=0
+-// Enable V-leveled logging at the specified level.
+-// -vmodule=""
+-// The syntax of the argument is a comma-separated list of pattern=N,
+-// where pattern is a literal file name (minus the ".go" suffix) or
+-// "glob" pattern and N is a V level. For instance,
+-// -vmodule=gopher*=3
+-// sets the V level to 3 in all Go files whose names begin "gopher".
+-//
+-package glog
-
-import (
-- "encoding/json"
+- "bufio"
+- "bytes"
+- "errors"
+- "flag"
- "fmt"
-- "net"
-- "net/url"
+- "io"
+- stdLog "log"
- "os"
-- "testing"
+- "path/filepath"
+- "runtime"
+- "strconv"
+- "strings"
+- "sync"
+- "sync/atomic"
+- "time"
-)
-
--// To pass this test, we need to create a cluster of 3 machines
--// The server should be listening on 127.0.0.1:4001, 4002, 4003
--func TestSync(t *testing.T) {
-- fmt.Println("Make sure there are three nodes at 0.0.0.0:4001-4003")
+-// severity identifies the sort of log: info, warning etc. It also implements
+-// the flag.Value interface. The -stderrthreshold flag is of type severity and
+-// should be modified only through the flag.Value interface. The values match
+-// the corresponding constants in C++.
+-type severity int32 // sync/atomic int32
-
-- // Explicit trailing slash to ensure this doesn't reproduce:
-- // https://github.com/coreos/go-etcd/issues/82
-- c := NewClient([]string{"http://127.0.0.1:4001/"})
+-// These constants identify the log levels in order of increasing severity.
+-// A message written to a high-severity log file is also written to each
+-// lower-severity log file.
+-const (
+- infoLog severity = iota
+- warningLog
+- errorLog
+- fatalLog
+- numSeverity = 4
+-)
-
-- success := c.SyncCluster()
-- if !success {
-- t.Fatal("cannot sync machines")
-- }
+-const severityChar = "IWEF"
-
-- for _, m := range c.GetCluster() {
-- u, err := url.Parse(m)
-- if err != nil {
-- t.Fatal(err)
-- }
-- if u.Scheme != "http" {
-- t.Fatal("scheme must be http")
-- }
+-var severityName = []string{
+- infoLog: "INFO",
+- warningLog: "WARNING",
+- errorLog: "ERROR",
+- fatalLog: "FATAL",
+-}
-
-- host, _, err := net.SplitHostPort(u.Host)
-- if err != nil {
-- t.Fatal(err)
-- }
-- if host != "127.0.0.1" {
-- t.Fatal("Host must be 127.0.0.1")
-- }
-- }
+-// get returns the value of the severity.
+-func (s *severity) get() severity {
+- return severity(atomic.LoadInt32((*int32)(s)))
+-}
-
-- badMachines := []string{"abc", "edef"}
+-// set sets the value of the severity.
+-func (s *severity) set(val severity) {
+- atomic.StoreInt32((*int32)(s), int32(val))
+-}
-
-- success = c.SetCluster(badMachines)
+-// String is part of the flag.Value interface.
+-func (s *severity) String() string {
+- return strconv.FormatInt(int64(*s), 10)
+-}
-
-- if success {
-- t.Fatal("should not sync on bad machines")
+-// Get is part of the flag.Value interface.
+-func (s *severity) Get() interface{} {
+- return *s
+-}
+-
+-// Set is part of the flag.Value interface.
+-func (s *severity) Set(value string) error {
+- var threshold severity
+- // Is it a known name?
+- if v, ok := severityByName(value); ok {
+- threshold = v
+- } else {
+- v, err := strconv.Atoi(value)
+- if err != nil {
+- return err
+- }
+- threshold = severity(v)
- }
+- logging.stderrThreshold.set(threshold)
+- return nil
+-}
-
-- goodMachines := []string{"127.0.0.1:4002"}
+-func severityByName(s string) (severity, bool) {
+- s = strings.ToUpper(s)
+- for i, name := range severityName {
+- if name == s {
+- return severity(i), true
+- }
+- }
+- return 0, false
+-}
-
-- success = c.SetCluster(goodMachines)
+-// OutputStats tracks the number of output lines and bytes written.
+-type OutputStats struct {
+- lines int64
+- bytes int64
+-}
-
-- if !success {
-- t.Fatal("cannot sync machines")
-- } else {
-- fmt.Println(c.cluster.Machines)
-- }
+-// Lines returns the number of lines written.
+-func (s *OutputStats) Lines() int64 {
+- return atomic.LoadInt64(&s.lines)
+-}
-
+-// Bytes returns the number of bytes written.
+-func (s *OutputStats) Bytes() int64 {
+- return atomic.LoadInt64(&s.bytes)
-}
-
--func TestPersistence(t *testing.T) {
-- c := NewClient(nil)
-- c.SyncCluster()
+-// Stats tracks the number of lines of output and number of bytes
+-// per severity level. Values must be read with atomic.LoadInt64.
+-var Stats struct {
+- Info, Warning, Error OutputStats
+-}
-
-- fo, err := os.Create("config.json")
-- if err != nil {
-- t.Fatal(err)
-- }
-- defer func() {
-- if err := fo.Close(); err != nil {
-- panic(err)
-- }
-- }()
+-var severityStats = [numSeverity]*OutputStats{
+- infoLog: &Stats.Info,
+- warningLog: &Stats.Warning,
+- errorLog: &Stats.Error,
+-}
-
-- c.SetPersistence(fo)
-- err = c.saveConfig()
-- if err != nil {
-- t.Fatal(err)
-- }
+-// Level is exported because it appears in the arguments to V and is
+-// the type of the v flag, which can be set programmatically.
+-// It's a distinct type because we want to discriminate it from logType.
+-// Variables of type level are only changed under logging.mu.
+-// The -v flag is read only with atomic ops, so the state of the logging
+-// module is consistent.
-
-- c2, err := NewClientFromFile("config.json")
-- if err != nil {
-- t.Fatal(err)
-- }
+-// Level is treated as a sync/atomic int32.
-
-- // Verify that the two clients have the same config
-- b1, _ := json.Marshal(c)
-- b2, _ := json.Marshal(c2)
+-// Level specifies a level of verbosity for V logs. *Level implements
+-// flag.Value; the -v flag is of type Level and should be modified
+-// only through the flag.Value interface.
+-type Level int32
-
-- if string(b1) != string(b2) {
-- t.Fatalf("The two configs should be equal!")
-- }
+-// get returns the value of the Level.
+-func (l *Level) get() Level {
+- return Level(atomic.LoadInt32((*int32)(l)))
-}
-diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/cluster.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/cluster.go
-deleted file mode 100644
-index aaa2054..0000000
---- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/cluster.go
-+++ /dev/null
-@@ -1,51 +0,0 @@
--package etcd
-
--import (
-- "net/url"
-- "strings"
--)
+-// set sets the value of the Level.
+-func (l *Level) set(val Level) {
+- atomic.StoreInt32((*int32)(l), int32(val))
+-}
-
--type Cluster struct {
-- Leader string `json:"leader"`
-- Machines []string `json:"machines"`
+-// String is part of the flag.Value interface.
+-func (l *Level) String() string {
+- return strconv.FormatInt(int64(*l), 10)
-}
-
--func NewCluster(machines []string) *Cluster {
-- // if an empty slice was sent in then just assume HTTP 4001 on localhost
-- if len(machines) == 0 {
-- machines = []string{"http://127.0.0.1:4001"}
-- }
+-// Get is part of the flag.Value interface.
+-func (l *Level) Get() interface{} {
+- return *l
+-}
-
-- // default leader and machines
-- return &Cluster{
-- Leader: machines[0],
-- Machines: machines,
+-// Set is part of the flag.Value interface.
+-func (l *Level) Set(value string) error {
+- v, err := strconv.Atoi(value)
+- if err != nil {
+- return err
- }
+- logging.mu.Lock()
+- defer logging.mu.Unlock()
+- logging.setVState(Level(v), logging.vmodule.filter, false)
+- return nil
-}
-
--// switchLeader switch the current leader to machines[num]
--func (cl *Cluster) switchLeader(num int) {
-- logger.Debugf("switch.leader[from %v to %v]",
-- cl.Leader, cl.Machines[num])
--
-- cl.Leader = cl.Machines[num]
+-// moduleSpec represents the setting of the -vmodule flag.
+-type moduleSpec struct {
+- filter []modulePat
-}
-
--func (cl *Cluster) updateFromStr(machines string) {
-- cl.Machines = strings.Split(machines, ", ")
+-// modulePat contains a filter for the -vmodule flag.
+-// It holds a verbosity level and a file pattern to match.
+-type modulePat struct {
+- pattern string
+- literal bool // The pattern is a literal string
+- level Level
-}
-
--func (cl *Cluster) updateLeader(leader string) {
-- logger.Debugf("update.leader[%s,%s]", cl.Leader, leader)
-- cl.Leader = leader
+-// match reports whether the file matches the pattern. It uses a string
+-// comparison if the pattern contains no metacharacters.
+-func (m *modulePat) match(file string) bool {
+- if m.literal {
+- return file == m.pattern
+- }
+- match, _ := filepath.Match(m.pattern, file)
+- return match
-}
-
--func (cl *Cluster) updateLeaderFromURL(u *url.URL) {
-- var leader string
-- if u.Scheme == "" {
-- leader = "http://" + u.Host
-- } else {
-- leader = u.Scheme + "://" + u.Host
+-func (m *moduleSpec) String() string {
+- // Lock because the type is not atomic. TODO: clean this up.
+- logging.mu.Lock()
+- defer logging.mu.Unlock()
+- var b bytes.Buffer
+- for i, f := range m.filter {
+- if i > 0 {
+- b.WriteRune(',')
+- }
+- fmt.Fprintf(&b, "%s=%d", f.pattern, f.level)
- }
-- cl.updateLeader(leader)
+- return b.String()
-}
-diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/compare_and_delete.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/compare_and_delete.go
-deleted file mode 100644
-index 11131bb..0000000
---- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/compare_and_delete.go
-+++ /dev/null
-@@ -1,34 +0,0 @@
--package etcd
-
--import "fmt"
+-// Get is part of the (Go 1.2) flag.Getter interface. It always returns nil for this flag type since the
+-// struct is not exported.
+-func (m *moduleSpec) Get() interface{} {
+- return nil
+-}
-
--func (c *Client) CompareAndDelete(key string, prevValue string, prevIndex uint64) (*Response, error) {
-- raw, err := c.RawCompareAndDelete(key, prevValue, prevIndex)
-- if err != nil {
-- return nil, err
-- }
+-var errVmoduleSyntax = errors.New("syntax error: expect comma-separated list of filename=N")
-
-- return raw.Unmarshal()
+-// Syntax: -vmodule=recordio=2,file=1,gfs*=3
+-func (m *moduleSpec) Set(value string) error {
+- var filter []modulePat
+- for _, pat := range strings.Split(value, ",") {
+- if len(pat) == 0 {
+- // Empty strings such as from a trailing comma can be ignored.
+- continue
+- }
+- patLev := strings.Split(pat, "=")
+- if len(patLev) != 2 || len(patLev[0]) == 0 || len(patLev[1]) == 0 {
+- return errVmoduleSyntax
+- }
+- pattern := patLev[0]
+- v, err := strconv.Atoi(patLev[1])
+- if err != nil {
+- return errors.New("syntax error: expect comma-separated list of filename=N")
+- }
+- if v < 0 {
+- return errors.New("negative value for vmodule level")
+- }
+- if v == 0 {
+- continue // Ignore. It's harmless but no point in paying the overhead.
+- }
+- // TODO: check syntax of filter?
+- filter = append(filter, modulePat{pattern, isLiteral(pattern), Level(v)})
+- }
+- logging.mu.Lock()
+- defer logging.mu.Unlock()
+- logging.setVState(logging.verbosity, filter, true)
+- return nil
-}
-
--func (c *Client) RawCompareAndDelete(key string, prevValue string, prevIndex uint64) (*RawResponse, error) {
-- if prevValue == "" && prevIndex == 0 {
-- return nil, fmt.Errorf("You must give either prevValue or prevIndex.")
-- }
+-// isLiteral reports whether the pattern is a literal string, that is, has no metacharacters
+-// that require filepath.Match to be called to match the pattern.
+-func isLiteral(pattern string) bool {
+- return !strings.ContainsAny(pattern, `\*?[]`)
+-}
-
-- options := Options{}
-- if prevValue != "" {
-- options["prevValue"] = prevValue
-- }
-- if prevIndex != 0 {
-- options["prevIndex"] = prevIndex
-- }
+-// traceLocation represents the setting of the -log_backtrace_at flag.
+-type traceLocation struct {
+- file string
+- line int
+-}
-
-- raw, err := c.delete(key, options)
+-// isSet reports whether the trace location has been specified.
+-// logging.mu is held.
+-func (t *traceLocation) isSet() bool {
+- return t.line > 0
+-}
-
-- if err != nil {
-- return nil, err
+-// match reports whether the specified file and line matches the trace location.
+-// The argument file name is the full path, not the basename specified in the flag.
+-// logging.mu is held.
+-func (t *traceLocation) match(file string, line int) bool {
+- if t.line != line {
+- return false
- }
--
-- return raw, err
+- if i := strings.LastIndex(file, "/"); i >= 0 {
+- file = file[i+1:]
+- }
+- return t.file == file
-}
-diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/compare_and_delete_test.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/compare_and_delete_test.go
-deleted file mode 100644
-index 223e50f..0000000
---- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/compare_and_delete_test.go
-+++ /dev/null
-@@ -1,46 +0,0 @@
--package etcd
-
--import (
-- "testing"
--)
+-func (t *traceLocation) String() string {
+- // Lock because the type is not atomic. TODO: clean this up.
+- logging.mu.Lock()
+- defer logging.mu.Unlock()
+- return fmt.Sprintf("%s:%d", t.file, t.line)
+-}
-
--func TestCompareAndDelete(t *testing.T) {
-- c := NewClient(nil)
-- defer func() {
-- c.Delete("foo", true)
-- }()
+-// Get is part of the (Go 1.2) flag.Getter interface. It always returns nil for this flag type since the
+-// struct is not exported
+-func (t *traceLocation) Get() interface{} {
+- return nil
+-}
-
-- c.Set("foo", "bar", 5)
+-var errTraceSyntax = errors.New("syntax error: expect file.go:234")
-
-- // This should succeed an correct prevValue
-- resp, err := c.CompareAndDelete("foo", "bar", 0)
-- if err != nil {
-- t.Fatal(err)
+-// Syntax: -log_backtrace_at=gopherflakes.go:234
+-// Note that unlike vmodule the file extension is included here.
+-func (t *traceLocation) Set(value string) error {
+- if value == "" {
+- // Unset.
+- t.line = 0
+- t.file = ""
- }
-- if !(resp.PrevNode.Value == "bar" && resp.PrevNode.Key == "/foo" && resp.PrevNode.TTL == 5) {
-- t.Fatalf("CompareAndDelete 1 prevNode failed: %#v", resp)
+- fields := strings.Split(value, ":")
+- if len(fields) != 2 {
+- return errTraceSyntax
- }
--
-- resp, _ = c.Set("foo", "bar", 5)
-- // This should fail because it gives an incorrect prevValue
-- _, err = c.CompareAndDelete("foo", "xxx", 0)
-- if err == nil {
-- t.Fatalf("CompareAndDelete 2 should have failed. The response is: %#v", resp)
+- file, line := fields[0], fields[1]
+- if !strings.Contains(file, ".") {
+- return errTraceSyntax
- }
--
-- // This should succeed because it gives an correct prevIndex
-- resp, err = c.CompareAndDelete("foo", "", resp.Node.ModifiedIndex)
+- v, err := strconv.Atoi(line)
- if err != nil {
-- t.Fatal(err)
+- return errTraceSyntax
- }
-- if !(resp.PrevNode.Value == "bar" && resp.PrevNode.Key == "/foo" && resp.PrevNode.TTL == 5) {
-- t.Fatalf("CompareAndSwap 3 prevNode failed: %#v", resp)
+- if v <= 0 {
+- return errors.New("negative or zero value for level")
- }
+- logging.mu.Lock()
+- defer logging.mu.Unlock()
+- t.line = v
+- t.file = file
+- return nil
+-}
-
-- c.Set("foo", "bar", 5)
-- // This should fail because it gives an incorrect prevIndex
-- resp, err = c.CompareAndDelete("foo", "", 29817514)
-- if err == nil {
-- t.Fatalf("CompareAndDelete 4 should have failed. The response is: %#v", resp)
-- }
+-// flushSyncWriter is the interface satisfied by logging destinations.
+-type flushSyncWriter interface {
+- Flush() error
+- Sync() error
+- io.Writer
-}
-diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/compare_and_swap.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/compare_and_swap.go
-deleted file mode 100644
-index bb4f906..0000000
---- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/compare_and_swap.go
-+++ /dev/null
-@@ -1,36 +0,0 @@
--package etcd
-
--import "fmt"
+-func init() {
+- flag.BoolVar(&logging.toStderr, "logtostderr", false, "log to standard error instead of files")
+- flag.BoolVar(&logging.alsoToStderr, "alsologtostderr", false, "log to standard error as well as files")
+- flag.Var(&logging.verbosity, "v", "log level for V logs")
+- flag.Var(&logging.stderrThreshold, "stderrthreshold", "logs at or above this threshold go to stderr")
+- flag.Var(&logging.vmodule, "vmodule", "comma-separated list of pattern=N settings for file-filtered logging")
+- flag.Var(&logging.traceLocation, "log_backtrace_at", "when logging hits line file:N, emit a stack trace")
-
--func (c *Client) CompareAndSwap(key string, value string, ttl uint64,
-- prevValue string, prevIndex uint64) (*Response, error) {
-- raw, err := c.RawCompareAndSwap(key, value, ttl, prevValue, prevIndex)
-- if err != nil {
-- return nil, err
-- }
+- // Default stderrThreshold is ERROR.
+- logging.stderrThreshold = errorLog
-
-- return raw.Unmarshal()
+- logging.setVState(0, nil, false)
+- go logging.flushDaemon()
-}
-
--func (c *Client) RawCompareAndSwap(key string, value string, ttl uint64,
-- prevValue string, prevIndex uint64) (*RawResponse, error) {
-- if prevValue == "" && prevIndex == 0 {
-- return nil, fmt.Errorf("You must give either prevValue or prevIndex.")
-- }
+-// Flush flushes all pending log I/O.
+-func Flush() {
+- logging.lockAndFlushAll()
+-}
-
-- options := Options{}
-- if prevValue != "" {
-- options["prevValue"] = prevValue
-- }
-- if prevIndex != 0 {
-- options["prevIndex"] = prevIndex
-- }
+-// loggingT collects all the global state of the logging setup.
+-type loggingT struct {
+- // Boolean flags. Not handled atomically because the flag.Value interface
+- // does not let us avoid the =true, and that shorthand is necessary for
+- // compatibility. TODO: does this matter enough to fix? Seems unlikely.
+- toStderr bool // The -logtostderr flag.
+- alsoToStderr bool // The -alsologtostderr flag.
-
-- raw, err := c.put(key, value, ttl, options)
+- // Level flag. Handled atomically.
+- stderrThreshold severity // The -stderrthreshold flag.
-
-- if err != nil {
-- return nil, err
-- }
+- // freeList is a list of byte buffers, maintained under freeListMu.
+- freeList *buffer
+- // freeListMu maintains the free list. It is separate from the main mutex
+- // so buffers can be grabbed and printed to without holding the main lock,
+- // for better parallelization.
+- freeListMu sync.Mutex
-
-- return raw, err
+- // mu protects the remaining elements of this structure and is
+- // used to synchronize logging.
+- mu sync.Mutex
+- // file holds writer for each of the log types.
+- file [numSeverity]flushSyncWriter
+- // pcs is used in V to avoid an allocation when computing the caller's PC.
+- pcs [1]uintptr
+- // vmap is a cache of the V Level for each V() call site, identified by PC.
+- // It is wiped whenever the vmodule flag changes state.
+- vmap map[uintptr]Level
+- // filterLength stores the length of the vmodule filter chain. If greater
+- // than zero, it means vmodule is enabled. It may be read safely
+- // using sync.LoadInt32, but is only modified under mu.
+- filterLength int32
+- // traceLocation is the state of the -log_backtrace_at flag.
+- traceLocation traceLocation
+- // These flags are modified only under lock, although verbosity may be fetched
+- // safely using atomic.LoadInt32.
+- vmodule moduleSpec // The state of the -vmodule flag.
+- verbosity Level // V logging level, the value of the -v flag/
-}
-diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/compare_and_swap_test.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/compare_and_swap_test.go
-deleted file mode 100644
-index 14a1b00..0000000
---- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/compare_and_swap_test.go
-+++ /dev/null
-@@ -1,57 +0,0 @@
--package etcd
-
--import (
-- "testing"
--)
+-// buffer holds a byte Buffer for reuse. The zero value is ready for use.
+-type buffer struct {
+- bytes.Buffer
+- tmp [64]byte // temporary byte array for creating headers.
+- next *buffer
+-}
-
--func TestCompareAndSwap(t *testing.T) {
-- c := NewClient(nil)
-- defer func() {
-- c.Delete("foo", true)
-- }()
+-var logging loggingT
-
-- c.Set("foo", "bar", 5)
+-// setVState sets a consistent state for V logging.
+-// l.mu is held.
+-func (l *loggingT) setVState(verbosity Level, filter []modulePat, setFilter bool) {
+- // Turn verbosity off so V will not fire while we are in transition.
+- logging.verbosity.set(0)
+- // Ditto for filter length.
+- atomic.StoreInt32(&logging.filterLength, 0)
-
-- // This should succeed
-- resp, err := c.CompareAndSwap("foo", "bar2", 5, "bar", 0)
-- if err != nil {
-- t.Fatal(err)
-- }
-- if !(resp.Node.Value == "bar2" && resp.Node.Key == "/foo" && resp.Node.TTL == 5) {
-- t.Fatalf("CompareAndSwap 1 failed: %#v", resp)
+- // Set the new filters and wipe the pc->Level map if the filter has changed.
+- if setFilter {
+- logging.vmodule.filter = filter
+- logging.vmap = make(map[uintptr]Level)
- }
-
-- if !(resp.PrevNode.Value == "bar" && resp.PrevNode.Key == "/foo" && resp.PrevNode.TTL == 5) {
-- t.Fatalf("CompareAndSwap 1 prevNode failed: %#v", resp)
-- }
+- // Things are consistent now, so enable filtering and verbosity.
+- // They are enabled in order opposite to that in V.
+- atomic.StoreInt32(&logging.filterLength, int32(len(filter)))
+- logging.verbosity.set(verbosity)
+-}
-
-- // This should fail because it gives an incorrect prevValue
-- resp, err = c.CompareAndSwap("foo", "bar3", 5, "xxx", 0)
-- if err == nil {
-- t.Fatalf("CompareAndSwap 2 should have failed. The response is: %#v", resp)
+-// getBuffer returns a new, ready-to-use buffer.
+-func (l *loggingT) getBuffer() *buffer {
+- l.freeListMu.Lock()
+- b := l.freeList
+- if b != nil {
+- l.freeList = b.next
- }
--
-- resp, err = c.Set("foo", "bar", 5)
-- if err != nil {
-- t.Fatal(err)
+- l.freeListMu.Unlock()
+- if b == nil {
+- b = new(buffer)
+- } else {
+- b.next = nil
+- b.Reset()
- }
+- return b
+-}
-
-- // This should succeed
-- resp, err = c.CompareAndSwap("foo", "bar2", 5, "", resp.Node.ModifiedIndex)
-- if err != nil {
-- t.Fatal(err)
-- }
-- if !(resp.Node.Value == "bar2" && resp.Node.Key == "/foo" && resp.Node.TTL == 5) {
-- t.Fatalf("CompareAndSwap 3 failed: %#v", resp)
+-// putBuffer returns a buffer to the free list.
+-func (l *loggingT) putBuffer(b *buffer) {
+- if b.Len() >= 256 {
+- // Let big buffers die a natural death.
+- return
- }
+- l.freeListMu.Lock()
+- b.next = l.freeList
+- l.freeList = b
+- l.freeListMu.Unlock()
+-}
-
-- if !(resp.PrevNode.Value == "bar" && resp.PrevNode.Key == "/foo" && resp.PrevNode.TTL == 5) {
-- t.Fatalf("CompareAndSwap 3 prevNode failed: %#v", resp)
-- }
+-var timeNow = time.Now // Stubbed out for testing.
-
-- // This should fail because it gives an incorrect prevIndex
-- resp, err = c.CompareAndSwap("foo", "bar3", 5, "", 29817514)
-- if err == nil {
-- t.Fatalf("CompareAndSwap 4 should have failed. The response is: %#v", resp)
+-/*
+-header formats a log header as defined by the C++ implementation.
+-It returns a buffer containing the formatted header and the user's file and line number.
+-The depth specifies how many stack frames above lives the source line to be identified in the log message.
+-
+-Log lines have this form:
+- Lmmdd hh:mm:ss.uuuuuu threadid file:line] msg...
+-where the fields are defined as follows:
+- L A single character, representing the log level (eg 'I' for INFO)
+- mm The month (zero padded; ie May is '05')
+- dd The day (zero padded)
+- hh:mm:ss.uuuuuu Time in hours, minutes and fractional seconds
+- threadid The space-padded thread ID as returned by GetTID()
+- file The file name
+- line The line number
+- msg The user-supplied message
+-*/
+-func (l *loggingT) header(s severity, depth int) (*buffer, string, int) {
+- _, file, line, ok := runtime.Caller(3 + depth)
+- if !ok {
+- file = "???"
+- line = 1
+- } else {
+- slash := strings.LastIndex(file, "/")
+- if slash >= 0 {
+- file = file[slash+1:]
+- }
- }
+- return l.formatHeader(s, file, line), file, line
-}
-diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/debug.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/debug.go
-deleted file mode 100644
-index 0f77788..0000000
---- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/debug.go
-+++ /dev/null
-@@ -1,55 +0,0 @@
--package etcd
--
--import (
-- "fmt"
-- "io/ioutil"
-- "log"
-- "strings"
--)
-
--var logger *etcdLogger
+-// formatHeader formats a log header using the provided file name and line number.
+-func (l *loggingT) formatHeader(s severity, file string, line int) *buffer {
+- now := timeNow()
+- if line < 0 {
+- line = 0 // not a real line number, but acceptable to someDigits
+- }
+- if s > fatalLog {
+- s = infoLog // for safety.
+- }
+- buf := l.getBuffer()
-
--func SetLogger(l *log.Logger) {
-- logger = &etcdLogger{l}
+- // Avoid Fprintf, for speed. The format is so simple that we can do it quickly by hand.
+- // It's worth about 3X. Fprintf is hard.
+- _, month, day := now.Date()
+- hour, minute, second := now.Clock()
+- // Lmmdd hh:mm:ss.uuuuuu threadid file:line]
+- buf.tmp[0] = severityChar[s]
+- buf.twoDigits(1, int(month))
+- buf.twoDigits(3, day)
+- buf.tmp[5] = ' '
+- buf.twoDigits(6, hour)
+- buf.tmp[8] = ':'
+- buf.twoDigits(9, minute)
+- buf.tmp[11] = ':'
+- buf.twoDigits(12, second)
+- buf.tmp[14] = '.'
+- buf.nDigits(6, 15, now.Nanosecond()/1000, '0')
+- buf.tmp[21] = ' '
+- buf.nDigits(7, 22, pid, ' ') // TODO: should be TID
+- buf.tmp[29] = ' '
+- buf.Write(buf.tmp[:30])
+- buf.WriteString(file)
+- buf.tmp[0] = ':'
+- n := buf.someDigits(1, line)
+- buf.tmp[n+1] = ']'
+- buf.tmp[n+2] = ' '
+- buf.Write(buf.tmp[:n+3])
+- return buf
-}
-
--func GetLogger() *log.Logger {
-- return logger.log
--}
+-// Some custom tiny helper functions to print the log header efficiently.
-
--type etcdLogger struct {
-- log *log.Logger
--}
+-const digits = "0123456789"
-
--func (p *etcdLogger) Debug(args ...interface{}) {
-- msg := "DEBUG: " + fmt.Sprint(args...)
-- p.log.Println(msg)
+-// twoDigits formats a zero-prefixed two-digit integer at buf.tmp[i].
+-func (buf *buffer) twoDigits(i, d int) {
+- buf.tmp[i+1] = digits[d%10]
+- d /= 10
+- buf.tmp[i] = digits[d%10]
-}
-
--func (p *etcdLogger) Debugf(f string, args ...interface{}) {
-- msg := "DEBUG: " + fmt.Sprintf(f, args...)
-- // Append newline if necessary
-- if !strings.HasSuffix(msg, "\n") {
-- msg = msg + "\n"
+-// nDigits formats an n-digit integer at buf.tmp[i],
+-// padding with pad on the left.
+-// It assumes d >= 0.
+-func (buf *buffer) nDigits(n, i, d int, pad byte) {
+- j := n - 1
+- for ; j >= 0 && d > 0; j-- {
+- buf.tmp[i+j] = digits[d%10]
+- d /= 10
+- }
+- for ; j >= 0; j-- {
+- buf.tmp[i+j] = pad
- }
-- p.log.Print(msg)
--}
--
--func (p *etcdLogger) Warning(args ...interface{}) {
-- msg := "WARNING: " + fmt.Sprint(args...)
-- p.log.Println(msg)
-}
-
--func (p *etcdLogger) Warningf(f string, args ...interface{}) {
-- msg := "WARNING: " + fmt.Sprintf(f, args...)
-- // Append newline if necessary
-- if !strings.HasSuffix(msg, "\n") {
-- msg = msg + "\n"
+-// someDigits formats a zero-prefixed variable-width integer at buf.tmp[i].
+-func (buf *buffer) someDigits(i, d int) int {
+- // Print into the top, then copy down. We know there's space for at least
+- // a 10-digit number.
+- j := len(buf.tmp)
+- for {
+- j--
+- buf.tmp[j] = digits[d%10]
+- d /= 10
+- if d == 0 {
+- break
+- }
- }
-- p.log.Print(msg)
+- return copy(buf.tmp[i:], buf.tmp[j:])
-}
-
--func init() {
-- // Default logger uses the go default log.
-- SetLogger(log.New(ioutil.Discard, "go-etcd", log.LstdFlags))
+-func (l *loggingT) println(s severity, args ...interface{}) {
+- buf, file, line := l.header(s, 0)
+- fmt.Fprintln(buf, args...)
+- l.output(s, buf, file, line, false)
-}
-diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/debug_test.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/debug_test.go
-deleted file mode 100644
-index 97f6d11..0000000
---- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/debug_test.go
-+++ /dev/null
-@@ -1,28 +0,0 @@
--package etcd
--
--import (
-- "testing"
--)
-
--type Foo struct{}
--type Bar struct {
-- one string
-- two int
+-func (l *loggingT) print(s severity, args ...interface{}) {
+- l.printDepth(s, 1, args...)
-}
-
--// Tests that logs don't panic with arbitrary interfaces
--func TestDebug(t *testing.T) {
-- f := &Foo{}
-- b := &Bar{"asfd", 3}
-- for _, test := range []interface{}{
-- 1234,
-- "asdf",
-- f,
-- b,
-- } {
-- logger.Debug(test)
-- logger.Debugf("something, %s", test)
-- logger.Warning(test)
-- logger.Warningf("something, %s", test)
+-func (l *loggingT) printDepth(s severity, depth int, args ...interface{}) {
+- buf, file, line := l.header(s, depth)
+- fmt.Fprint(buf, args...)
+- if buf.Bytes()[buf.Len()-1] != '\n' {
+- buf.WriteByte('\n')
- }
+- l.output(s, buf, file, line, false)
-}
-diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/delete.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/delete.go
-deleted file mode 100644
-index b37accd..0000000
---- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/delete.go
-+++ /dev/null
-@@ -1,40 +0,0 @@
--package etcd
--
--// Delete deletes the given key.
--//
--// When recursive set to false, if the key points to a
--// directory the method will fail.
--//
--// When recursive set to true, if the key points to a file,
--// the file will be deleted; if the key points to a directory,
--// then everything under the directory (including all child directories)
--// will be deleted.
--func (c *Client) Delete(key string, recursive bool) (*Response, error) {
-- raw, err := c.RawDelete(key, recursive, false)
-
-- if err != nil {
-- return nil, err
+-func (l *loggingT) printf(s severity, format string, args ...interface{}) {
+- buf, file, line := l.header(s, 0)
+- fmt.Fprintf(buf, format, args...)
+- if buf.Bytes()[buf.Len()-1] != '\n' {
+- buf.WriteByte('\n')
- }
--
-- return raw.Unmarshal()
+- l.output(s, buf, file, line, false)
-}
-
--// DeleteDir deletes an empty directory or a key value pair
--func (c *Client) DeleteDir(key string) (*Response, error) {
-- raw, err := c.RawDelete(key, false, true)
--
-- if err != nil {
-- return nil, err
+-// printWithFileLine behaves like print but uses the provided file and line number. If
+-// alsoLogToStderr is true, the log message always appears on standard error; it
+-// will also appear in the log file unless --logtostderr is set.
+-func (l *loggingT) printWithFileLine(s severity, file string, line int, alsoToStderr bool, args ...interface{}) {
+- buf := l.formatHeader(s, file, line)
+- fmt.Fprint(buf, args...)
+- if buf.Bytes()[buf.Len()-1] != '\n' {
+- buf.WriteByte('\n')
- }
--
-- return raw.Unmarshal()
+- l.output(s, buf, file, line, alsoToStderr)
-}
-
--func (c *Client) RawDelete(key string, recursive bool, dir bool) (*RawResponse, error) {
-- ops := Options{
-- "recursive": recursive,
-- "dir": dir,
+-// output writes the data to the log files and releases the buffer.
+-func (l *loggingT) output(s severity, buf *buffer, file string, line int, alsoToStderr bool) {
+- l.mu.Lock()
+- if l.traceLocation.isSet() {
+- if l.traceLocation.match(file, line) {
+- buf.Write(stacks(false))
+- }
+- }
+- data := buf.Bytes()
+- if l.toStderr {
+- os.Stderr.Write(data)
+- } else {
+- if alsoToStderr || l.alsoToStderr || s >= l.stderrThreshold.get() {
+- os.Stderr.Write(data)
+- }
+- if l.file[s] == nil {
+- if err := l.createFiles(s); err != nil {
+- os.Stderr.Write(data) // Make sure the message appears somewhere.
+- l.exit(err)
+- }
+- }
+- switch s {
+- case fatalLog:
+- l.file[fatalLog].Write(data)
+- fallthrough
+- case errorLog:
+- l.file[errorLog].Write(data)
+- fallthrough
+- case warningLog:
+- l.file[warningLog].Write(data)
+- fallthrough
+- case infoLog:
+- l.file[infoLog].Write(data)
+- }
+- }
+- if s == fatalLog {
+- // If we got here via Exit rather than Fatal, print no stacks.
+- if atomic.LoadUint32(&fatalNoStacks) > 0 {
+- l.mu.Unlock()
+- timeoutFlush(10 * time.Second)
+- os.Exit(1)
+- }
+- // Dump all goroutine stacks before exiting.
+- // First, make sure we see the trace for the current goroutine on standard error.
+- // If -logtostderr has been specified, the loop below will do that anyway
+- // as the first stack in the full dump.
+- if !l.toStderr {
+- os.Stderr.Write(stacks(false))
+- }
+- // Write the stack trace for all goroutines to the files.
+- trace := stacks(true)
+- logExitFunc = func(error) {} // If we get a write error, we'll still exit below.
+- for log := fatalLog; log >= infoLog; log-- {
+- if f := l.file[log]; f != nil { // Can be nil if -logtostderr is set.
+- f.Write(trace)
+- }
+- }
+- l.mu.Unlock()
+- timeoutFlush(10 * time.Second)
+- os.Exit(255) // C++ uses -1, which is silly because it's anded with 255 anyway.
+- }
+- l.putBuffer(buf)
+- l.mu.Unlock()
+- if stats := severityStats[s]; stats != nil {
+- atomic.AddInt64(&stats.lines, 1)
+- atomic.AddInt64(&stats.bytes, int64(len(data)))
- }
--
-- return c.delete(key, ops)
-}
-diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/delete_test.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/delete_test.go
-deleted file mode 100644
-index 5904971..0000000
---- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/delete_test.go
-+++ /dev/null
-@@ -1,81 +0,0 @@
--package etcd
--
--import (
-- "testing"
--)
-
--func TestDelete(t *testing.T) {
-- c := NewClient(nil)
-- defer func() {
-- c.Delete("foo", true)
+-// timeoutFlush calls Flush and returns when it completes or after timeout
+-// elapses, whichever happens first. This is needed because the hooks invoked
+-// by Flush may deadlock when glog.Fatal is called from a hook that holds
+-// a lock.
+-func timeoutFlush(timeout time.Duration) {
+- done := make(chan bool, 1)
+- go func() {
+- Flush() // calls logging.lockAndFlushAll()
+- done <- true
- }()
--
-- c.Set("foo", "bar", 5)
-- resp, err := c.Delete("foo", false)
-- if err != nil {
-- t.Fatal(err)
-- }
--
-- if !(resp.Node.Value == "") {
-- t.Fatalf("Delete failed with %s", resp.Node.Value)
+- select {
+- case <-done:
+- case <-time.After(timeout):
+- fmt.Fprintln(os.Stderr, "glog: Flush took longer than", timeout)
- }
+-}
-
-- if !(resp.PrevNode.Value == "bar") {
-- t.Fatalf("Delete PrevNode failed with %s", resp.Node.Value)
+-// stacks is a wrapper for runtime.Stack that attempts to recover the data for all goroutines.
+-func stacks(all bool) []byte {
+- // We don't know how big the traces are, so grow a few times if they don't fit. Start large, though.
+- n := 10000
+- if all {
+- n = 100000
- }
--
-- resp, err = c.Delete("foo", false)
-- if err == nil {
-- t.Fatalf("Delete should have failed because the key foo did not exist. "+
-- "The response was: %v", resp)
+- var trace []byte
+- for i := 0; i < 5; i++ {
+- trace = make([]byte, n)
+- nbytes := runtime.Stack(trace, all)
+- if nbytes < len(trace) {
+- return trace[:nbytes]
+- }
+- n *= 2
- }
+- return trace
-}
-
--func TestDeleteAll(t *testing.T) {
-- c := NewClient(nil)
-- defer func() {
-- c.Delete("foo", true)
-- c.Delete("fooDir", true)
-- }()
+-// logExitFunc provides a simple mechanism to override the default behavior
+-// of exiting on error. Used in testing and to guarantee we reach a required exit
+-// for fatal logs. Instead, exit could be a function rather than a method but that
+-// would make its use clumsier.
+-var logExitFunc func(error)
-
-- c.SetDir("foo", 5)
-- // test delete an empty dir
-- resp, err := c.DeleteDir("foo")
-- if err != nil {
-- t.Fatal(err)
+-// exit is called if there is trouble creating or writing log files.
+-// It flushes the logs and exits the program; there's no point in hanging around.
+-// l.mu is held.
+-func (l *loggingT) exit(err error) {
+- fmt.Fprintf(os.Stderr, "log: exiting because of error: %s\n", err)
+- // If logExitFunc is set, we do that instead of exiting.
+- if logExitFunc != nil {
+- logExitFunc(err)
+- return
- }
+- l.flushAll()
+- os.Exit(2)
+-}
-
-- if !(resp.Node.Value == "") {
-- t.Fatalf("DeleteAll 1 failed: %#v", resp)
-- }
+-// syncBuffer joins a bufio.Writer to its underlying file, providing access to the
+-// file's Sync method and providing a wrapper for the Write method that provides log
+-// file rotation. There are conflicting methods, so the file cannot be embedded.
+-// l.mu is held for all its methods.
+-type syncBuffer struct {
+- logger *loggingT
+- *bufio.Writer
+- file *os.File
+- sev severity
+- nbytes uint64 // The number of bytes written to this file
+-}
-
-- if !(resp.PrevNode.Dir == true && resp.PrevNode.Value == "") {
-- t.Fatalf("DeleteAll 1 PrevNode failed: %#v", resp)
-- }
+-func (sb *syncBuffer) Sync() error {
+- return sb.file.Sync()
+-}
-
-- c.CreateDir("fooDir", 5)
-- c.Set("fooDir/foo", "bar", 5)
-- _, err = c.DeleteDir("fooDir")
-- if err == nil {
-- t.Fatal("should not able to delete a non-empty dir with deletedir")
+-func (sb *syncBuffer) Write(p []byte) (n int, err error) {
+- if sb.nbytes+uint64(len(p)) >= MaxSize {
+- if err := sb.rotateFile(time.Now()); err != nil {
+- sb.logger.exit(err)
+- }
- }
--
-- resp, err = c.Delete("fooDir", true)
+- n, err = sb.Writer.Write(p)
+- sb.nbytes += uint64(n)
- if err != nil {
-- t.Fatal(err)
-- }
--
-- if !(resp.Node.Value == "") {
-- t.Fatalf("DeleteAll 2 failed: %#v", resp)
+- sb.logger.exit(err)
- }
+- return
+-}
-
-- if !(resp.PrevNode.Dir == true && resp.PrevNode.Value == "") {
-- t.Fatalf("DeleteAll 2 PrevNode failed: %#v", resp)
+-// rotateFile closes the syncBuffer's file and starts a new one.
+-func (sb *syncBuffer) rotateFile(now time.Time) error {
+- if sb.file != nil {
+- sb.Flush()
+- sb.file.Close()
- }
--
-- resp, err = c.Delete("foo", true)
-- if err == nil {
-- t.Fatalf("DeleteAll should have failed because the key foo did not exist. "+
-- "The response was: %v", resp)
+- var err error
+- sb.file, _, err = create(severityName[sb.sev], now)
+- sb.nbytes = 0
+- if err != nil {
+- return err
- }
--}
-diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/error.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/error.go
-deleted file mode 100644
-index 7e69287..0000000
---- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/error.go
-+++ /dev/null
-@@ -1,48 +0,0 @@
--package etcd
--
--import (
-- "encoding/json"
-- "fmt"
--)
--
--const (
-- ErrCodeEtcdNotReachable = 501
--)
-
--var (
-- errorMap = map[int]string{
-- ErrCodeEtcdNotReachable: "All the given peers are not reachable",
-- }
--)
+- sb.Writer = bufio.NewWriterSize(sb.file, bufferSize)
-
--type EtcdError struct {
-- ErrorCode int `json:"errorCode"`
-- Message string `json:"message"`
-- Cause string `json:"cause,omitempty"`
-- Index uint64 `json:"index"`
+- // Write header.
+- var buf bytes.Buffer
+- fmt.Fprintf(&buf, "Log file created at: %s\n", now.Format("2006/01/02 15:04:05"))
+- fmt.Fprintf(&buf, "Running on machine: %s\n", host)
+- fmt.Fprintf(&buf, "Binary: Built with %s %s for %s/%s\n", runtime.Compiler, runtime.Version(), runtime.GOOS, runtime.GOARCH)
+- fmt.Fprintf(&buf, "Log line format: [IWEF]mmdd hh:mm:ss.uuuuuu threadid file:line] msg\n")
+- n, err := sb.file.Write(buf.Bytes())
+- sb.nbytes += uint64(n)
+- return err
-}
-
--func (e EtcdError) Error() string {
-- return fmt.Sprintf("%v: %v (%v) [%v]", e.ErrorCode, e.Message, e.Cause, e.Index)
--}
+-// bufferSize sizes the buffer associated with each log file. It's large
+-// so that log records can accumulate without the logging thread blocking
+-// on disk I/O. The flushDaemon will block instead.
+-const bufferSize = 256 * 1024
-
--func newError(errorCode int, cause string, index uint64) *EtcdError {
-- return &EtcdError{
-- ErrorCode: errorCode,
-- Message: errorMap[errorCode],
-- Cause: cause,
-- Index: index,
+-// createFiles creates all the log files for severity from sev down to infoLog.
+-// l.mu is held.
+-func (l *loggingT) createFiles(sev severity) error {
+- now := time.Now()
+- // Files are created in decreasing severity order, so as soon as we find one
+- // has already been created, we can stop.
+- for s := sev; s >= infoLog && l.file[s] == nil; s-- {
+- sb := &syncBuffer{
+- logger: l,
+- sev: s,
+- }
+- if err := sb.rotateFile(now); err != nil {
+- return err
+- }
+- l.file[s] = sb
- }
+- return nil
-}
-
--func handleError(b []byte) error {
-- etcdErr := new(EtcdError)
+-const flushInterval = 30 * time.Second
-
-- err := json.Unmarshal(b, etcdErr)
-- if err != nil {
-- logger.Warningf("cannot unmarshal etcd error: %v", err)
-- return err
+-// flushDaemon periodically flushes the log file buffers.
+-func (l *loggingT) flushDaemon() {
+- for _ = range time.NewTicker(flushInterval).C {
+- l.lockAndFlushAll()
- }
--
-- return etcdErr
-}
-diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/get.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/get.go
-deleted file mode 100644
-index 976bf07..0000000
---- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/get.go
-+++ /dev/null
-@@ -1,27 +0,0 @@
--package etcd
-
--// Get gets the file or directory associated with the given key.
--// If the key points to a directory, files and directories under
--// it will be returned in sorted or unsorted order, depending on
--// the sort flag.
--// If recursive is set to false, contents under child directories
--// will not be returned.
--// If recursive is set to true, all the contents will be returned.
--func (c *Client) Get(key string, sort, recursive bool) (*Response, error) {
-- raw, err := c.RawGet(key, sort, recursive)
+-// lockAndFlushAll is like flushAll but locks l.mu first.
+-func (l *loggingT) lockAndFlushAll() {
+- l.mu.Lock()
+- l.flushAll()
+- l.mu.Unlock()
+-}
-
-- if err != nil {
-- return nil, err
+-// flushAll flushes all the logs and attempts to "sync" their data to disk.
+-// l.mu is held.
+-func (l *loggingT) flushAll() {
+- // Flush from fatal down, in case there's trouble flushing.
+- for s := fatalLog; s >= infoLog; s-- {
+- file := l.file[s]
+- if file != nil {
+- file.Flush() // ignore error
+- file.Sync() // ignore error
+- }
- }
--
-- return raw.Unmarshal()
-}
-
--func (c *Client) RawGet(key string, sort, recursive bool) (*RawResponse, error) {
-- ops := Options{
-- "recursive": recursive,
-- "sorted": sort,
+-// CopyStandardLogTo arranges for messages written to the Go "log" package's
+-// default logs to also appear in the Google logs for the named and lower
+-// severities. Subsequent changes to the standard log's default output location
+-// or format may break this behavior.
+-//
+-// Valid names are "INFO", "WARNING", "ERROR", and "FATAL". If the name is not
+-// recognized, CopyStandardLogTo panics.
+-func CopyStandardLogTo(name string) {
+- sev, ok := severityByName(name)
+- if !ok {
+- panic(fmt.Sprintf("log.CopyStandardLogTo(%q): unrecognized severity name", name))
- }
--
-- return c.get(key, ops)
+- // Set a log format that captures the user's file and line:
+- // d.go:23: message
+- stdLog.SetFlags(stdLog.Lshortfile)
+- stdLog.SetOutput(logBridge(sev))
-}
-diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/get_test.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/get_test.go
-deleted file mode 100644
-index 279c4e2..0000000
---- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/get_test.go
-+++ /dev/null
-@@ -1,131 +0,0 @@
--package etcd
-
--import (
-- "reflect"
-- "testing"
--)
+-// logBridge provides the Write method that enables CopyStandardLogTo to connect
+-// Go's standard logs to the logs provided by this package.
+-type logBridge severity
-
--// cleanNode scrubs Expiration, ModifiedIndex and CreatedIndex of a node.
--func cleanNode(n *Node) {
-- n.Expiration = nil
-- n.ModifiedIndex = 0
-- n.CreatedIndex = 0
+-// Write parses the standard logging line and passes its components to the
+-// logger for severity(lb).
+-func (lb logBridge) Write(b []byte) (n int, err error) {
+- var (
+- file = "???"
+- line = 1
+- text string
+- )
+- // Split "d.go:23: message" into "d.go", "23", and "message".
+- if parts := bytes.SplitN(b, []byte{':'}, 3); len(parts) != 3 || len(parts[0]) < 1 || len(parts[2]) < 1 {
+- text = fmt.Sprintf("bad log format: %s", b)
+- } else {
+- file = string(parts[0])
+- text = string(parts[2][1:]) // skip leading space
+- line, err = strconv.Atoi(string(parts[1]))
+- if err != nil {
+- text = fmt.Sprintf("bad line number: %s", b)
+- line = 1
+- }
+- }
+- // printWithFileLine with alsoToStderr=true, so standard log messages
+- // always appear on standard error.
+- logging.printWithFileLine(severity(lb), file, line, true, text)
+- return len(b), nil
-}
-
--// cleanResult scrubs a result object two levels deep of Expiration,
--// ModifiedIndex and CreatedIndex.
--func cleanResult(result *Response) {
-- // TODO(philips): make this recursive.
-- cleanNode(result.Node)
-- for i, _ := range result.Node.Nodes {
-- cleanNode(result.Node.Nodes[i])
-- for j, _ := range result.Node.Nodes[i].Nodes {
-- cleanNode(result.Node.Nodes[i].Nodes[j])
+-// setV computes and remembers the V level for a given PC
+-// when vmodule is enabled.
+-// File pattern matching takes the basename of the file, stripped
+-// of its .go suffix, and uses filepath.Match, which is a little more
+-// general than the *? matching used in C++.
+-// l.mu is held.
+-func (l *loggingT) setV(pc uintptr) Level {
+- fn := runtime.FuncForPC(pc)
+- file, _ := fn.FileLine(pc)
+- // The file is something like /a/b/c/d.go. We want just the d.
+- if strings.HasSuffix(file, ".go") {
+- file = file[:len(file)-3]
+- }
+- if slash := strings.LastIndex(file, "/"); slash >= 0 {
+- file = file[slash+1:]
+- }
+- for _, filter := range l.vmodule.filter {
+- if filter.match(file) {
+- l.vmap[pc] = filter.level
+- return filter.level
- }
- }
+- l.vmap[pc] = 0
+- return 0
-}
-
--func TestGet(t *testing.T) {
-- c := NewClient(nil)
-- defer func() {
-- c.Delete("foo", true)
-- }()
--
-- c.Set("foo", "bar", 5)
+-// Verbose is a boolean type that implements Infof (like Printf) etc.
+-// See the documentation of V for more information.
+-type Verbose bool
-
-- result, err := c.Get("foo", false, false)
+-// V reports whether verbosity at the call site is at least the requested level.
+-// The returned value is a boolean of type Verbose, which implements Info, Infoln
+-// and Infof. These methods will write to the Info log if called.
+-// Thus, one may write either
+-// if glog.V(2) { glog.Info("log this") }
+-// or
+-// glog.V(2).Info("log this")
+-// The second form is shorter but the first is cheaper if logging is off because it does
+-// not evaluate its arguments.
+-//
+-// Whether an individual call to V generates a log record depends on the setting of
+-// the -v and --vmodule flags; both are off by default. If the level in the call to
+-// V is at least the value of -v, or of -vmodule for the source file containing the
+-// call, the V call will log.
+-func V(level Level) Verbose {
+- // This function tries hard to be cheap unless there's work to do.
+- // The fast path is two atomic loads and compares.
-
-- if err != nil {
-- t.Fatal(err)
+- // Here is a cheap but safe test to see if V logging is enabled globally.
+- if logging.verbosity.get() >= level {
+- return Verbose(true)
- }
-
-- if result.Node.Key != "/foo" || result.Node.Value != "bar" {
-- t.Fatalf("Get failed with %s %s %v", result.Node.Key, result.Node.Value, result.Node.TTL)
+- // It's off globally but it vmodule may still be set.
+- // Here is another cheap but safe test to see if vmodule is enabled.
+- if atomic.LoadInt32(&logging.filterLength) > 0 {
+- // Now we need a proper lock to use the logging structure. The pcs field
+- // is shared so we must lock before accessing it. This is fairly expensive,
+- // but if V logging is enabled we're slow anyway.
+- logging.mu.Lock()
+- defer logging.mu.Unlock()
+- if runtime.Callers(2, logging.pcs[:]) == 0 {
+- return Verbose(false)
+- }
+- v, ok := logging.vmap[logging.pcs[0]]
+- if !ok {
+- v = logging.setV(logging.pcs[0])
+- }
+- return Verbose(v >= level)
- }
+- return Verbose(false)
+-}
-
-- result, err = c.Get("goo", false, false)
-- if err == nil {
-- t.Fatalf("should not be able to get non-exist key")
+-// Info is equivalent to the global Info function, guarded by the value of v.
+-// See the documentation of V for usage.
+-func (v Verbose) Info(args ...interface{}) {
+- if v {
+- logging.print(infoLog, args...)
- }
-}
-
--func TestGetAll(t *testing.T) {
-- c := NewClient(nil)
-- defer func() {
-- c.Delete("fooDir", true)
-- }()
--
-- c.CreateDir("fooDir", 5)
-- c.Set("fooDir/k0", "v0", 5)
-- c.Set("fooDir/k1", "v1", 5)
--
-- // Return kv-pairs in sorted order
-- result, err := c.Get("fooDir", true, false)
--
-- if err != nil {
-- t.Fatal(err)
+-// Infoln is equivalent to the global Infoln function, guarded by the value of v.
+-// See the documentation of V for usage.
+-func (v Verbose) Infoln(args ...interface{}) {
+- if v {
+- logging.println(infoLog, args...)
- }
+-}
-
-- expected := Nodes{
-- &Node{
-- Key: "/fooDir/k0",
-- Value: "v0",
-- TTL: 5,
-- },
-- &Node{
-- Key: "/fooDir/k1",
-- Value: "v1",
-- TTL: 5,
-- },
+-// Infof is equivalent to the global Infof function, guarded by the value of v.
+-// See the documentation of V for usage.
+-func (v Verbose) Infof(format string, args ...interface{}) {
+- if v {
+- logging.printf(infoLog, format, args...)
- }
+-}
-
-- cleanResult(result)
--
-- if !reflect.DeepEqual(result.Node.Nodes, expected) {
-- t.Fatalf("(actual) %v != (expected) %v", result.Node.Nodes, expected)
-- }
+-// Info logs to the INFO log.
+-// Arguments are handled in the manner of fmt.Print; a newline is appended if missing.
+-func Info(args ...interface{}) {
+- logging.print(infoLog, args...)
+-}
-
-- // Test the `recursive` option
-- c.CreateDir("fooDir/childDir", 5)
-- c.Set("fooDir/childDir/k2", "v2", 5)
+-// InfoDepth acts as Info but uses depth to determine which call frame to log.
+-// InfoDepth(0, "msg") is the same as Info("msg").
+-func InfoDepth(depth int, args ...interface{}) {
+- logging.printDepth(infoLog, depth, args...)
+-}
-
-- // Return kv-pairs in sorted order
-- result, err = c.Get("fooDir", true, true)
+-// Infoln logs to the INFO log.
+-// Arguments are handled in the manner of fmt.Println; a newline is appended if missing.
+-func Infoln(args ...interface{}) {
+- logging.println(infoLog, args...)
+-}
-
-- cleanResult(result)
+-// Infof logs to the INFO log.
+-// Arguments are handled in the manner of fmt.Printf; a newline is appended if missing.
+-func Infof(format string, args ...interface{}) {
+- logging.printf(infoLog, format, args...)
+-}
-
-- if err != nil {
-- t.Fatal(err)
-- }
+-// Warning logs to the WARNING and INFO logs.
+-// Arguments are handled in the manner of fmt.Print; a newline is appended if missing.
+-func Warning(args ...interface{}) {
+- logging.print(warningLog, args...)
+-}
-
-- expected = Nodes{
-- &Node{
-- Key: "/fooDir/childDir",
-- Dir: true,
-- Nodes: Nodes{
-- &Node{
-- Key: "/fooDir/childDir/k2",
-- Value: "v2",
-- TTL: 5,
-- },
-- },
-- TTL: 5,
-- },
-- &Node{
-- Key: "/fooDir/k0",
-- Value: "v0",
-- TTL: 5,
-- },
-- &Node{
-- Key: "/fooDir/k1",
-- Value: "v1",
-- TTL: 5,
-- },
-- }
+-// WarningDepth acts as Warning but uses depth to determine which call frame to log.
+-// WarningDepth(0, "msg") is the same as Warning("msg").
+-func WarningDepth(depth int, args ...interface{}) {
+- logging.printDepth(warningLog, depth, args...)
+-}
-
-- cleanResult(result)
+-// Warningln logs to the WARNING and INFO logs.
+-// Arguments are handled in the manner of fmt.Println; a newline is appended if missing.
+-func Warningln(args ...interface{}) {
+- logging.println(warningLog, args...)
+-}
-
-- if !reflect.DeepEqual(result.Node.Nodes, expected) {
-- t.Fatalf("(actual) %v != (expected) %v", result.Node.Nodes, expected)
-- }
+-// Warningf logs to the WARNING and INFO logs.
+-// Arguments are handled in the manner of fmt.Printf; a newline is appended if missing.
+-func Warningf(format string, args ...interface{}) {
+- logging.printf(warningLog, format, args...)
-}
-diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/options.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/options.go
-deleted file mode 100644
-index 701c9b3..0000000
---- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/options.go
-+++ /dev/null
-@@ -1,72 +0,0 @@
--package etcd
-
--import (
-- "fmt"
-- "net/url"
-- "reflect"
--)
+-// Error logs to the ERROR, WARNING, and INFO logs.
+-// Arguments are handled in the manner of fmt.Print; a newline is appended if missing.
+-func Error(args ...interface{}) {
+- logging.print(errorLog, args...)
+-}
-
--type Options map[string]interface{}
+-// ErrorDepth acts as Error but uses depth to determine which call frame to log.
+-// ErrorDepth(0, "msg") is the same as Error("msg").
+-func ErrorDepth(depth int, args ...interface{}) {
+- logging.printDepth(errorLog, depth, args...)
+-}
-
--// An internally-used data structure that represents a mapping
--// between valid options and their kinds
--type validOptions map[string]reflect.Kind
+-// Errorln logs to the ERROR, WARNING, and INFO logs.
+-// Arguments are handled in the manner of fmt.Println; a newline is appended if missing.
+-func Errorln(args ...interface{}) {
+- logging.println(errorLog, args...)
+-}
-
--// Valid options for GET, PUT, POST, DELETE
--// Using CAPITALIZED_UNDERSCORE to emphasize that these
--// values are meant to be used as constants.
--var (
-- VALID_GET_OPTIONS = validOptions{
-- "recursive": reflect.Bool,
-- "consistent": reflect.Bool,
-- "sorted": reflect.Bool,
-- "wait": reflect.Bool,
-- "waitIndex": reflect.Uint64,
-- }
+-// Errorf logs to the ERROR, WARNING, and INFO logs.
+-// Arguments are handled in the manner of fmt.Printf; a newline is appended if missing.
+-func Errorf(format string, args ...interface{}) {
+- logging.printf(errorLog, format, args...)
+-}
-
-- VALID_PUT_OPTIONS = validOptions{
-- "prevValue": reflect.String,
-- "prevIndex": reflect.Uint64,
-- "prevExist": reflect.Bool,
-- "dir": reflect.Bool,
-- }
+-// Fatal logs to the FATAL, ERROR, WARNING, and INFO logs,
+-// including a stack trace of all running goroutines, then calls os.Exit(255).
+-// Arguments are handled in the manner of fmt.Print; a newline is appended if missing.
+-func Fatal(args ...interface{}) {
+- logging.print(fatalLog, args...)
+-}
-
-- VALID_POST_OPTIONS = validOptions{}
+-// FatalDepth acts as Fatal but uses depth to determine which call frame to log.
+-// FatalDepth(0, "msg") is the same as Fatal("msg").
+-func FatalDepth(depth int, args ...interface{}) {
+- logging.printDepth(fatalLog, depth, args...)
+-}
-
-- VALID_DELETE_OPTIONS = validOptions{
-- "recursive": reflect.Bool,
-- "dir": reflect.Bool,
-- "prevValue": reflect.String,
-- "prevIndex": reflect.Uint64,
-- }
--)
+-// Fatalln logs to the FATAL, ERROR, WARNING, and INFO logs,
+-// including a stack trace of all running goroutines, then calls os.Exit(255).
+-// Arguments are handled in the manner of fmt.Println; a newline is appended if missing.
+-func Fatalln(args ...interface{}) {
+- logging.println(fatalLog, args...)
+-}
-
--// Convert options to a string of HTML parameters
--func (ops Options) toParameters(validOps validOptions) (string, error) {
-- p := "?"
-- values := url.Values{}
+-// Fatalf logs to the FATAL, ERROR, WARNING, and INFO logs,
+-// including a stack trace of all running goroutines, then calls os.Exit(255).
+-// Arguments are handled in the manner of fmt.Printf; a newline is appended if missing.
+-func Fatalf(format string, args ...interface{}) {
+- logging.printf(fatalLog, format, args...)
+-}
-
-- if ops == nil {
-- return "", nil
-- }
+-// fatalNoStacks is non-zero if we are to exit without dumping goroutine stacks.
+-// It allows Exit and relatives to use the Fatal logs.
+-var fatalNoStacks uint32
-
-- for k, v := range ops {
-- // Check if the given option is valid (that it exists)
-- kind := validOps[k]
-- if kind == reflect.Invalid {
-- return "", fmt.Errorf("Invalid option: %v", k)
-- }
+-// Exit logs to the FATAL, ERROR, WARNING, and INFO logs, then calls os.Exit(1).
+-// Arguments are handled in the manner of fmt.Print; a newline is appended if missing.
+-func Exit(args ...interface{}) {
+- atomic.StoreUint32(&fatalNoStacks, 1)
+- logging.print(fatalLog, args...)
+-}
-
-- // Check if the given option is of the valid type
-- t := reflect.TypeOf(v)
-- if kind != t.Kind() {
-- return "", fmt.Errorf("Option %s should be of %v kind, not of %v kind.",
-- k, kind, t.Kind())
-- }
+-// ExitDepth acts as Exit but uses depth to determine which call frame to log.
+-// ExitDepth(0, "msg") is the same as Exit("msg").
+-func ExitDepth(depth int, args ...interface{}) {
+- atomic.StoreUint32(&fatalNoStacks, 1)
+- logging.printDepth(fatalLog, depth, args...)
+-}
-
-- values.Set(k, fmt.Sprintf("%v", v))
-- }
+-// Exitln logs to the FATAL, ERROR, WARNING, and INFO logs, then calls os.Exit(1).
+-func Exitln(args ...interface{}) {
+- atomic.StoreUint32(&fatalNoStacks, 1)
+- logging.println(fatalLog, args...)
+-}
-
-- p += values.Encode()
-- return p, nil
+-// Exitf logs to the FATAL, ERROR, WARNING, and INFO logs, then calls os.Exit(1).
+-// Arguments are handled in the manner of fmt.Printf; a newline is appended if missing.
+-func Exitf(format string, args ...interface{}) {
+- atomic.StoreUint32(&fatalNoStacks, 1)
+- logging.printf(fatalLog, format, args...)
-}
-diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/requests.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/requests.go
+diff --git a/Godeps/_workspace/src/github.com/golang/glog/glog_file.go b/Godeps/_workspace/src/github.com/golang/glog/glog_file.go
deleted file mode 100644
-index 5d8b45a..0000000
---- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/requests.go
+index 65075d2..0000000
+--- a/Godeps/_workspace/src/github.com/golang/glog/glog_file.go
+++ /dev/null
-@@ -1,377 +0,0 @@
--package etcd
+@@ -1,124 +0,0 @@
+-// Go support for leveled logs, analogous to https://code.google.com/p/google-glog/
+-//
+-// Copyright 2013 Google Inc. All Rights Reserved.
+-//
+-// Licensed under the Apache License, Version 2.0 (the "License");
+-// you may not use this file except in compliance with the License.
+-// You may obtain a copy of the License at
+-//
+-// http://www.apache.org/licenses/LICENSE-2.0
+-//
+-// Unless required by applicable law or agreed to in writing, software
+-// distributed under the License is distributed on an "AS IS" BASIS,
+-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-// See the License for the specific language governing permissions and
+-// limitations under the License.
+-
+-// File I/O for logs.
+-
+-package glog
-
-import (
- "errors"
+- "flag"
- "fmt"
-- "io/ioutil"
-- "math/rand"
-- "net/http"
-- "net/url"
-- "path"
+- "os"
+- "os/user"
+- "path/filepath"
- "strings"
- "sync"
- "time"
-)
-
--// Errors introduced by handling requests
+-// MaxSize is the maximum size of a log file in bytes.
+-var MaxSize uint64 = 1024 * 1024 * 1800
+-
+-// logDirs lists the candidate directories for new log files.
+-var logDirs []string
+-
+-// If non-empty, overrides the choice of directory in which to write logs.
+-// See createLogDirs for the full list of possible destinations.
+-var logDir = flag.String("log_dir", "", "If non-empty, write log files in this directory")
+-
+-func createLogDirs() {
+- if *logDir != "" {
+- logDirs = append(logDirs, *logDir)
+- }
+- logDirs = append(logDirs, os.TempDir())
+-}
+-
-var (
-- ErrRequestCancelled = errors.New("sending request is cancelled")
+- pid = os.Getpid()
+- program = filepath.Base(os.Args[0])
+- host = "unknownhost"
+- userName = "unknownuser"
-)
-
--type RawRequest struct {
-- Method string
-- RelativePath string
-- Values url.Values
-- Cancel <-chan bool
+-func init() {
+- h, err := os.Hostname()
+- if err == nil {
+- host = shortHostname(h)
+- }
+-
+- current, err := user.Current()
+- if err == nil {
+- userName = current.Username
+- }
+-
+- // Sanitize userName since it may contain filepath separators on Windows.
+- userName = strings.Replace(userName, `\`, "_", -1)
-}
-
--// NewRawRequest returns a new RawRequest
--func NewRawRequest(method, relativePath string, values url.Values, cancel <-chan bool) *RawRequest {
-- return &RawRequest{
-- Method: method,
-- RelativePath: relativePath,
-- Values: values,
-- Cancel: cancel,
+-// shortHostname returns its argument, truncating at the first period.
+-// For instance, given "www.google.com" it returns "www".
+-func shortHostname(hostname string) string {
+- if i := strings.Index(hostname, "."); i >= 0 {
+- return hostname[:i]
- }
+- return hostname
-}
-
--// getCancelable issues a cancelable GET request
--func (c *Client) getCancelable(key string, options Options,
-- cancel <-chan bool) (*RawResponse, error) {
-- logger.Debugf("get %s [%s]", key, c.cluster.Leader)
-- p := keyToPath(key)
+-// logName returns a new log file name containing tag, with start time t, and
+-// the name for the symlink for tag.
+-func logName(tag string, t time.Time) (name, link string) {
+- name = fmt.Sprintf("%s.%s.%s.log.%s.%04d%02d%02d-%02d%02d%02d.%d",
+- program,
+- host,
+- userName,
+- tag,
+- t.Year(),
+- t.Month(),
+- t.Day(),
+- t.Hour(),
+- t.Minute(),
+- t.Second(),
+- pid)
+- return name, program + "." + tag
+-}
-
-- // If consistency level is set to STRONG, append
-- // the `consistent` query string.
-- if c.config.Consistency == STRONG_CONSISTENCY {
-- options["consistent"] = true
-- }
+-var onceLogDirs sync.Once
-
-- str, err := options.toParameters(VALID_GET_OPTIONS)
-- if err != nil {
-- return nil, err
+-// create creates a new log file and returns the file and its filename, which
+-// contains tag ("INFO", "FATAL", etc.) and t. If the file is created
+-// successfully, create also attempts to update the symlink for that tag, ignoring
+-// errors.
+-func create(tag string, t time.Time) (f *os.File, filename string, err error) {
+- onceLogDirs.Do(createLogDirs)
+- if len(logDirs) == 0 {
+- return nil, "", errors.New("log: no log dirs")
- }
-- p += str
+- name, link := logName(tag, t)
+- var lastErr error
+- for _, dir := range logDirs {
+- fname := filepath.Join(dir, name)
+- f, err := os.Create(fname)
+- if err == nil {
+- symlink := filepath.Join(dir, link)
+- os.Remove(symlink) // ignore err
+- os.Symlink(name, symlink) // ignore err
+- return f, fname, nil
+- }
+- lastErr = err
+- }
+- return nil, "", fmt.Errorf("log: cannot create log: %v", lastErr)
+-}
+diff --git a/Godeps/_workspace/src/github.com/golang/glog/glog_test.go b/Godeps/_workspace/src/github.com/golang/glog/glog_test.go
+deleted file mode 100644
+index 0fb376e..0000000
+--- a/Godeps/_workspace/src/github.com/golang/glog/glog_test.go
++++ /dev/null
+@@ -1,415 +0,0 @@
+-// Go support for leveled logs, analogous to https://code.google.com/p/google-glog/
+-//
+-// Copyright 2013 Google Inc. All Rights Reserved.
+-//
+-// Licensed under the Apache License, Version 2.0 (the "License");
+-// you may not use this file except in compliance with the License.
+-// You may obtain a copy of the License at
+-//
+-// http://www.apache.org/licenses/LICENSE-2.0
+-//
+-// Unless required by applicable law or agreed to in writing, software
+-// distributed under the License is distributed on an "AS IS" BASIS,
+-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-// See the License for the specific language governing permissions and
+-// limitations under the License.
+-
+-package glog
-
-- req := NewRawRequest("GET", p, nil, cancel)
-- resp, err := c.SendRequest(req)
+-import (
+- "bytes"
+- "fmt"
+- stdLog "log"
+- "path/filepath"
+- "runtime"
+- "strconv"
+- "strings"
+- "testing"
+- "time"
+-)
-
-- if err != nil {
-- return nil, err
+-// Test that shortHostname works as advertised.
+-func TestShortHostname(t *testing.T) {
+- for hostname, expect := range map[string]string{
+- "": "",
+- "host": "host",
+- "host.google.com": "host",
+- } {
+- if got := shortHostname(hostname); expect != got {
+- t.Errorf("shortHostname(%q): expected %q, got %q", hostname, expect, got)
+- }
- }
--
-- return resp, nil
-}
-
--// get issues a GET request
--func (c *Client) get(key string, options Options) (*RawResponse, error) {
-- return c.getCancelable(key, options, nil)
+-// flushBuffer wraps a bytes.Buffer to satisfy flushSyncWriter.
+-type flushBuffer struct {
+- bytes.Buffer
-}
-
--// put issues a PUT request
--func (c *Client) put(key string, value string, ttl uint64,
-- options Options) (*RawResponse, error) {
--
-- logger.Debugf("put %s, %s, ttl: %d, [%s]", key, value, ttl, c.cluster.Leader)
-- p := keyToPath(key)
--
-- str, err := options.toParameters(VALID_PUT_OPTIONS)
-- if err != nil {
-- return nil, err
-- }
-- p += str
+-func (f *flushBuffer) Flush() error {
+- return nil
+-}
-
-- req := NewRawRequest("PUT", p, buildValues(value, ttl), nil)
-- resp, err := c.SendRequest(req)
+-func (f *flushBuffer) Sync() error {
+- return nil
+-}
-
-- if err != nil {
-- return nil, err
+-// swap sets the log writers and returns the old array.
+-func (l *loggingT) swap(writers [numSeverity]flushSyncWriter) (old [numSeverity]flushSyncWriter) {
+- l.mu.Lock()
+- defer l.mu.Unlock()
+- old = l.file
+- for i, w := range writers {
+- logging.file[i] = w
- }
--
-- return resp, nil
+- return
-}
-
--// post issues a POST request
--func (c *Client) post(key string, value string, ttl uint64) (*RawResponse, error) {
-- logger.Debugf("post %s, %s, ttl: %d, [%s]", key, value, ttl, c.cluster.Leader)
-- p := keyToPath(key)
--
-- req := NewRawRequest("POST", p, buildValues(value, ttl), nil)
-- resp, err := c.SendRequest(req)
+-// newBuffers sets the log writers to all new byte buffers and returns the old array.
+-func (l *loggingT) newBuffers() [numSeverity]flushSyncWriter {
+- return l.swap([numSeverity]flushSyncWriter{new(flushBuffer), new(flushBuffer), new(flushBuffer), new(flushBuffer)})
+-}
-
-- if err != nil {
-- return nil, err
-- }
+-// contents returns the specified log value as a string.
+-func contents(s severity) string {
+- return logging.file[s].(*flushBuffer).String()
+-}
-
-- return resp, nil
+-// contains reports whether the string is contained in the log.
+-func contains(s severity, str string, t *testing.T) bool {
+- return strings.Contains(contents(s), str)
-}
-
--// delete issues a DELETE request
--func (c *Client) delete(key string, options Options) (*RawResponse, error) {
-- logger.Debugf("delete %s [%s]", key, c.cluster.Leader)
-- p := keyToPath(key)
+-// setFlags configures the logging flags how the test expects them.
+-func setFlags() {
+- logging.toStderr = false
+-}
-
-- str, err := options.toParameters(VALID_DELETE_OPTIONS)
-- if err != nil {
-- return nil, err
+-// Test that Info works as advertised.
+-func TestInfo(t *testing.T) {
+- setFlags()
+- defer logging.swap(logging.newBuffers())
+- Info("test")
+- if !contains(infoLog, "I", t) {
+- t.Errorf("Info has wrong character: %q", contents(infoLog))
- }
-- p += str
--
-- req := NewRawRequest("DELETE", p, nil, nil)
-- resp, err := c.SendRequest(req)
--
-- if err != nil {
-- return nil, err
+- if !contains(infoLog, "test", t) {
+- t.Error("Info failed")
- }
--
-- return resp, nil
-}
-
--// SendRequest sends a HTTP request and returns a Response as defined by etcd
--func (c *Client) SendRequest(rr *RawRequest) (*RawResponse, error) {
--
-- var req *http.Request
-- var resp *http.Response
-- var httpPath string
-- var err error
-- var respBody []byte
--
-- var numReqs = 1
--
-- checkRetry := c.CheckRetry
-- if checkRetry == nil {
-- checkRetry = DefaultCheckRetry
-- }
--
-- cancelled := make(chan bool, 1)
-- reqLock := new(sync.Mutex)
--
-- if rr.Cancel != nil {
-- cancelRoutine := make(chan bool)
-- defer close(cancelRoutine)
+-func TestInfoDepth(t *testing.T) {
+- setFlags()
+- defer logging.swap(logging.newBuffers())
-
-- go func() {
-- select {
-- case <-rr.Cancel:
-- cancelled <- true
-- logger.Debug("send.request is cancelled")
-- case <-cancelRoutine:
-- return
-- }
+- f := func() { InfoDepth(1, "depth-test1") }
-
-- // Repeat canceling request until this thread is stopped
-- // because we have no idea about whether it succeeds.
-- for {
-- reqLock.Lock()
-- c.httpClient.Transport.(*http.Transport).CancelRequest(req)
-- reqLock.Unlock()
+- // The next three lines must stay together
+- _, _, wantLine, _ := runtime.Caller(0)
+- InfoDepth(0, "depth-test0")
+- f()
-
-- select {
-- case <-time.After(100 * time.Millisecond):
-- case <-cancelRoutine:
-- return
-- }
-- }
-- }()
+- msgs := strings.Split(strings.TrimSuffix(contents(infoLog), "\n"), "\n")
+- if len(msgs) != 2 {
+- t.Fatalf("Got %d lines, expected 2", len(msgs))
- }
-
-- // If we connect to a follower and consistency is required, retry until
-- // we connect to a leader
-- sleep := 25 * time.Millisecond
-- maxSleep := time.Second
-- for attempt := 0; ; attempt++ {
-- if attempt > 0 {
-- select {
-- case <-cancelled:
-- return nil, ErrRequestCancelled
-- case <-time.After(sleep):
-- sleep = sleep * 2
-- if sleep > maxSleep {
-- sleep = maxSleep
-- }
-- }
-- }
--
-- logger.Debug("Connecting to etcd: attempt", attempt+1, "for", rr.RelativePath)
--
-- if rr.Method == "GET" && c.config.Consistency == WEAK_CONSISTENCY {
-- // If it's a GET and consistency level is set to WEAK,
-- // then use a random machine.
-- httpPath = c.getHttpPath(true, rr.RelativePath)
-- } else {
-- // Else use the leader.
-- httpPath = c.getHttpPath(false, rr.RelativePath)
-- }
--
-- // Return a cURL command if curlChan is set
-- if c.cURLch != nil {
-- command := fmt.Sprintf("curl -X %s %s", rr.Method, httpPath)
-- for key, value := range rr.Values {
-- command += fmt.Sprintf(" -d %s=%s", key, value[0])
-- }
-- c.sendCURL(command)
+- for i, m := range msgs {
+- if !strings.HasPrefix(m, "I") {
+- t.Errorf("InfoDepth[%d] has wrong character: %q", i, m)
- }
--
-- logger.Debug("send.request.to ", httpPath, " | method ", rr.Method)
--
-- reqLock.Lock()
-- if rr.Values == nil {
-- if req, err = http.NewRequest(rr.Method, httpPath, nil); err != nil {
-- return nil, err
-- }
-- } else {
-- body := strings.NewReader(rr.Values.Encode())
-- if req, err = http.NewRequest(rr.Method, httpPath, body); err != nil {
-- return nil, err
-- }
--
-- req.Header.Set("Content-Type",
-- "application/x-www-form-urlencoded; param=value")
+- w := fmt.Sprintf("depth-test%d", i)
+- if !strings.Contains(m, w) {
+- t.Errorf("InfoDepth[%d] missing %q: %q", i, w, m)
- }
-- reqLock.Unlock()
--
-- resp, err = c.httpClient.Do(req)
-- defer func() {
-- if resp != nil {
-- resp.Body.Close()
-- }
-- }()
-
-- // If the request was cancelled, return ErrRequestCancelled directly
-- select {
-- case <-cancelled:
-- return nil, ErrRequestCancelled
-- default:
+- // pull out the line number (between : and ])
+- msg := m[strings.LastIndex(m, ":")+1:]
+- x := strings.Index(msg, "]")
+- if x < 0 {
+- t.Errorf("InfoDepth[%d]: missing ']': %q", i, m)
+- continue
- }
--
-- numReqs++
--
-- // network error, change a machine!
+- line, err := strconv.Atoi(msg[:x])
- if err != nil {
-- logger.Debug("network error:", err.Error())
-- lastResp := http.Response{}
-- if checkErr := checkRetry(c.cluster, numReqs, lastResp, err); checkErr != nil {
-- return nil, checkErr
-- }
--
-- c.cluster.switchLeader(attempt % len(c.cluster.Machines))
+- t.Errorf("InfoDepth[%d]: bad line number: %q", i, m)
- continue
- }
--
-- // if there is no error, it should receive response
-- logger.Debug("recv.response.from", httpPath)
--
-- if validHttpStatusCode[resp.StatusCode] {
-- // try to read byte code and break the loop
-- respBody, err = ioutil.ReadAll(resp.Body)
-- if err == nil {
-- logger.Debug("recv.success.", httpPath)
-- break
-- }
-- // ReadAll error may be caused due to cancel request
-- select {
-- case <-cancelled:
-- return nil, ErrRequestCancelled
-- default:
-- }
+- wantLine++
+- if wantLine != line {
+- t.Errorf("InfoDepth[%d]: got line %d, want %d", i, line, wantLine)
- }
+- }
+-}
-
-- // if resp is TemporaryRedirect, set the new leader and retry
-- if resp.StatusCode == http.StatusTemporaryRedirect {
-- u, err := resp.Location()
+-func init() {
+- CopyStandardLogTo("INFO")
+-}
-
-- if err != nil {
-- logger.Warning(err)
-- } else {
-- // Update cluster leader based on redirect location
-- // because it should point to the leader address
-- c.cluster.updateLeaderFromURL(u)
-- logger.Debug("recv.response.relocate", u.String())
-- }
-- resp.Body.Close()
-- continue
+-// Test that CopyStandardLogTo panics on bad input.
+-func TestCopyStandardLogToPanic(t *testing.T) {
+- defer func() {
+- if s, ok := recover().(string); !ok || !strings.Contains(s, "LOG") {
+- t.Errorf(`CopyStandardLogTo("LOG") should have panicked: %v`, s)
- }
+- }()
+- CopyStandardLogTo("LOG")
+-}
-
-- if checkErr := checkRetry(c.cluster, numReqs, *resp,
-- errors.New("Unexpected HTTP status code")); checkErr != nil {
-- return nil, checkErr
-- }
-- resp.Body.Close()
+-// Test that using the standard log package logs to INFO.
+-func TestStandardLog(t *testing.T) {
+- setFlags()
+- defer logging.swap(logging.newBuffers())
+- stdLog.Print("test")
+- if !contains(infoLog, "I", t) {
+- t.Errorf("Info has wrong character: %q", contents(infoLog))
- }
--
-- r := &RawResponse{
-- StatusCode: resp.StatusCode,
-- Body: respBody,
-- Header: resp.Header,
+- if !contains(infoLog, "test", t) {
+- t.Error("Info failed")
- }
--
-- return r, nil
-}
-
--// DefaultCheckRetry defines the retrying behaviour for bad HTTP requests
--// If we have retried 2 * machine number, stop retrying.
--// If status code is InternalServerError, sleep for 200ms.
--func DefaultCheckRetry(cluster *Cluster, numReqs int, lastResp http.Response,
-- err error) error {
--
-- if numReqs >= 2*len(cluster.Machines) {
-- return newError(ErrCodeEtcdNotReachable,
-- "Tried to connect to each peer twice and failed", 0)
+-// Test that the header has the correct format.
+-func TestHeader(t *testing.T) {
+- setFlags()
+- defer logging.swap(logging.newBuffers())
+- defer func(previous func() time.Time) { timeNow = previous }(timeNow)
+- timeNow = func() time.Time {
+- return time.Date(2006, 1, 2, 15, 4, 5, .067890e9, time.Local)
- }
--
-- code := lastResp.StatusCode
-- if code == http.StatusInternalServerError {
-- time.Sleep(time.Millisecond * 200)
--
+- pid = 1234
+- Info("test")
+- var line int
+- format := "I0102 15:04:05.067890 1234 glog_test.go:%d] test\n"
+- n, err := fmt.Sscanf(contents(infoLog), format, &line)
+- if n != 1 || err != nil {
+- t.Errorf("log format error: %d elements, error %s:\n%s", n, err, contents(infoLog))
+- }
+- // Scanf treats multiple spaces as equivalent to a single space,
+- // so check for correct space-padding also.
+- want := fmt.Sprintf(format, line)
+- if contents(infoLog) != want {
+- t.Errorf("log format error: got:\n\t%q\nwant:\t%q", contents(infoLog), want)
- }
--
-- logger.Warning("bad response status code", code)
-- return nil
-}
-
--func (c *Client) getHttpPath(random bool, s ...string) string {
-- var machine string
-- if random {
-- machine = c.cluster.Machines[rand.Intn(len(c.cluster.Machines))]
-- } else {
-- machine = c.cluster.Leader
+-// Test that an Error log goes to Warning and Info.
+-// Even in the Info log, the source character will be E, so the data should
+-// all be identical.
+-func TestError(t *testing.T) {
+- setFlags()
+- defer logging.swap(logging.newBuffers())
+- Error("test")
+- if !contains(errorLog, "E", t) {
+- t.Errorf("Error has wrong character: %q", contents(errorLog))
- }
--
-- fullPath := machine + "/" + version
-- for _, seg := range s {
-- fullPath = fullPath + "/" + seg
+- if !contains(errorLog, "test", t) {
+- t.Error("Error failed")
- }
--
-- return fullPath
--}
--
--// buildValues builds a url.Values map according to the given value and ttl
--func buildValues(value string, ttl uint64) url.Values {
-- v := url.Values{}
--
-- if value != "" {
-- v.Set("value", value)
+- str := contents(errorLog)
+- if !contains(warningLog, str, t) {
+- t.Error("Warning failed")
- }
--
-- if ttl > 0 {
-- v.Set("ttl", fmt.Sprintf("%v", ttl))
+- if !contains(infoLog, str, t) {
+- t.Error("Info failed")
- }
--
-- return v
-}
-
--// convert key string to http path exclude version
--// for example: key[foo] -> path[keys/foo]
--// key[/] -> path[keys/]
--func keyToPath(key string) string {
-- p := path.Join("keys", key)
--
-- // corner case: if key is "/" or "//" ect
-- // path join will clear the tailing "/"
-- // we need to add it back
-- if p == "keys" {
-- p = "keys/"
+-// Test that a Warning log goes to Info.
+-// Even in the Info log, the source character will be W, so the data should
+-// all be identical.
+-func TestWarning(t *testing.T) {
+- setFlags()
+- defer logging.swap(logging.newBuffers())
+- Warning("test")
+- if !contains(warningLog, "W", t) {
+- t.Errorf("Warning has wrong character: %q", contents(warningLog))
+- }
+- if !contains(warningLog, "test", t) {
+- t.Error("Warning failed")
+- }
+- str := contents(warningLog)
+- if !contains(infoLog, str, t) {
+- t.Error("Info failed")
- }
--
-- return p
-}
-diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/response.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/response.go
-deleted file mode 100644
-index 1fe9b4e..0000000
---- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/response.go
-+++ /dev/null
-@@ -1,89 +0,0 @@
--package etcd
--
--import (
-- "encoding/json"
-- "net/http"
-- "strconv"
-- "time"
--)
-
--const (
-- rawResponse = iota
-- normalResponse
--)
--
--type responseType int
--
--type RawResponse struct {
-- StatusCode int
-- Body []byte
-- Header http.Header
+-// Test that a V log goes to Info.
+-func TestV(t *testing.T) {
+- setFlags()
+- defer logging.swap(logging.newBuffers())
+- logging.verbosity.Set("2")
+- defer logging.verbosity.Set("0")
+- V(2).Info("test")
+- if !contains(infoLog, "I", t) {
+- t.Errorf("Info has wrong character: %q", contents(infoLog))
+- }
+- if !contains(infoLog, "test", t) {
+- t.Error("Info failed")
+- }
-}
-
--var (
-- validHttpStatusCode = map[int]bool{
-- http.StatusCreated: true,
-- http.StatusOK: true,
-- http.StatusBadRequest: true,
-- http.StatusNotFound: true,
-- http.StatusPreconditionFailed: true,
-- http.StatusForbidden: true,
+-// Test that a vmodule enables a log in this file.
+-func TestVmoduleOn(t *testing.T) {
+- setFlags()
+- defer logging.swap(logging.newBuffers())
+- logging.vmodule.Set("glog_test=2")
+- defer logging.vmodule.Set("")
+- if !V(1) {
+- t.Error("V not enabled for 1")
- }
--)
--
--// Unmarshal parses RawResponse and stores the result in Response
--func (rr *RawResponse) Unmarshal() (*Response, error) {
-- if rr.StatusCode != http.StatusOK && rr.StatusCode != http.StatusCreated {
-- return nil, handleError(rr.Body)
+- if !V(2) {
+- t.Error("V not enabled for 2")
- }
--
-- resp := new(Response)
--
-- err := json.Unmarshal(rr.Body, resp)
--
-- if err != nil {
-- return nil, err
+- if V(3) {
+- t.Error("V enabled for 3")
+- }
+- V(2).Info("test")
+- if !contains(infoLog, "I", t) {
+- t.Errorf("Info has wrong character: %q", contents(infoLog))
+- }
+- if !contains(infoLog, "test", t) {
+- t.Error("Info failed")
- }
--
-- // attach index and term to response
-- resp.EtcdIndex, _ = strconv.ParseUint(rr.Header.Get("X-Etcd-Index"), 10, 64)
-- resp.RaftIndex, _ = strconv.ParseUint(rr.Header.Get("X-Raft-Index"), 10, 64)
-- resp.RaftTerm, _ = strconv.ParseUint(rr.Header.Get("X-Raft-Term"), 10, 64)
--
-- return resp, nil
--}
--
--type Response struct {
-- Action string `json:"action"`
-- Node *Node `json:"node"`
-- PrevNode *Node `json:"prevNode,omitempty"`
-- EtcdIndex uint64 `json:"etcdIndex"`
-- RaftIndex uint64 `json:"raftIndex"`
-- RaftTerm uint64 `json:"raftTerm"`
-}
-
--type Node struct {
-- Key string `json:"key, omitempty"`
-- Value string `json:"value,omitempty"`
-- Dir bool `json:"dir,omitempty"`
-- Expiration *time.Time `json:"expiration,omitempty"`
-- TTL int64 `json:"ttl,omitempty"`
-- Nodes Nodes `json:"nodes,omitempty"`
-- ModifiedIndex uint64 `json:"modifiedIndex,omitempty"`
-- CreatedIndex uint64 `json:"createdIndex,omitempty"`
+-// Test that a vmodule of another file does not enable a log in this file.
+-func TestVmoduleOff(t *testing.T) {
+- setFlags()
+- defer logging.swap(logging.newBuffers())
+- logging.vmodule.Set("notthisfile=2")
+- defer logging.vmodule.Set("")
+- for i := 1; i <= 3; i++ {
+- if V(Level(i)) {
+- t.Errorf("V enabled for %d", i)
+- }
+- }
+- V(2).Info("test")
+- if contents(infoLog) != "" {
+- t.Error("V logged incorrectly")
+- }
-}
-
--type Nodes []*Node
--
--// interfaces for sorting
--func (ns Nodes) Len() int {
-- return len(ns)
+-// vGlobs are patterns that match/don't match this file at V=2.
+-var vGlobs = map[string]bool{
+- // Easy to test the numeric match here.
+- "glog_test=1": false, // If -vmodule sets V to 1, V(2) will fail.
+- "glog_test=2": true,
+- "glog_test=3": true, // If -vmodule sets V to 1, V(3) will succeed.
+- // These all use 2 and check the patterns. All are true.
+- "*=2": true,
+- "?l*=2": true,
+- "????_*=2": true,
+- "??[mno]?_*t=2": true,
+- // These all use 2 and check the patterns. All are false.
+- "*x=2": false,
+- "m*=2": false,
+- "??_*=2": false,
+- "?[abc]?_*t=2": false,
-}
-
--func (ns Nodes) Less(i, j int) bool {
-- return ns[i].Key < ns[j].Key
+-// Test that vmodule globbing works as advertised.
+-func testVmoduleGlob(pat string, match bool, t *testing.T) {
+- setFlags()
+- defer logging.swap(logging.newBuffers())
+- defer logging.vmodule.Set("")
+- logging.vmodule.Set(pat)
+- if V(2) != Verbose(match) {
+- t.Errorf("incorrect match for %q: got %t expected %t", pat, V(2), match)
+- }
-}
-
--func (ns Nodes) Swap(i, j int) {
-- ns[i], ns[j] = ns[j], ns[i]
+-// Test that a vmodule globbing works as advertised.
+-func TestVmoduleGlob(t *testing.T) {
+- for glob, match := range vGlobs {
+- testVmoduleGlob(glob, match, t)
+- }
-}
-diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/set_curl_chan_test.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/set_curl_chan_test.go
-deleted file mode 100644
-index 756e317..0000000
---- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/set_curl_chan_test.go
-+++ /dev/null
-@@ -1,42 +0,0 @@
--package etcd
-
--import (
-- "fmt"
-- "testing"
--)
+-func TestRollover(t *testing.T) {
+- setFlags()
+- var err error
+- defer func(previous func(error)) { logExitFunc = previous }(logExitFunc)
+- logExitFunc = func(e error) {
+- err = e
+- }
+- defer func(previous uint64) { MaxSize = previous }(MaxSize)
+- MaxSize = 512
-
--func TestSetCurlChan(t *testing.T) {
-- c := NewClient(nil)
-- c.OpenCURL()
+- Info("x") // Be sure we have a file.
+- info, ok := logging.file[infoLog].(*syncBuffer)
+- if !ok {
+- t.Fatal("info wasn't created")
+- }
+- if err != nil {
+- t.Fatalf("info has initial error: %v", err)
+- }
+- fname0 := info.file.Name()
+- Info(strings.Repeat("x", int(MaxSize))) // force a rollover
+- if err != nil {
+- t.Fatalf("info has error after big write: %v", err)
+- }
-
-- defer func() {
-- c.Delete("foo", true)
-- }()
+- // Make sure the next log file gets a file name with a different
+- // time stamp.
+- //
+- // TODO: determine whether we need to support subsecond log
+- // rotation. C++ does not appear to handle this case (nor does it
+- // handle Daylight Savings Time properly).
+- time.Sleep(1 * time.Second)
-
-- _, err := c.Set("foo", "bar", 5)
+- Info("x") // create a new file
- if err != nil {
-- t.Fatal(err)
+- t.Fatalf("error after rotation: %v", err)
- }
--
-- expected := fmt.Sprintf("curl -X PUT %s/v2/keys/foo -d value=bar -d ttl=5",
-- c.cluster.Leader)
-- actual := c.RecvCURL()
-- if expected != actual {
-- t.Fatalf(`Command "%s" is not equal to expected value "%s"`,
-- actual, expected)
+- fname1 := info.file.Name()
+- if fname0 == fname1 {
+- t.Errorf("info.f.Name did not change: %v", fname0)
+- }
+- if info.nbytes >= MaxSize {
+- t.Errorf("file size was not reset: %d", info.nbytes)
- }
+-}
-
-- c.SetConsistency(STRONG_CONSISTENCY)
-- _, err = c.Get("foo", false, false)
-- if err != nil {
-- t.Fatal(err)
+-func TestLogBacktraceAt(t *testing.T) {
+- setFlags()
+- defer logging.swap(logging.newBuffers())
+- // The peculiar style of this code simplifies line counting and maintenance of the
+- // tracing block below.
+- var infoLine string
+- setTraceLocation := func(file string, line int, ok bool, delta int) {
+- if !ok {
+- t.Fatal("could not get file:line")
+- }
+- _, file = filepath.Split(file)
+- infoLine = fmt.Sprintf("%s:%d", file, line+delta)
+- err := logging.traceLocation.Set(infoLine)
+- if err != nil {
+- t.Fatal("error setting log_backtrace_at: ", err)
+- }
+- }
+- {
+- // Start of tracing block. These lines know about each other's relative position.
+- _, file, line, ok := runtime.Caller(0)
+- setTraceLocation(file, line, ok, +2) // Two lines between Caller and Info calls.
+- Info("we want a stack trace here")
+- }
+- numAppearances := strings.Count(contents(infoLog), infoLine)
+- if numAppearances < 2 {
+- // Need 2 appearances, one in the log header and one in the trace:
+- // log_test.go:281: I0511 16:36:06.952398 02238 log_test.go:280] we want a stack trace here
+- // ...
+- // github.com/glog/glog_test.go:280 (0x41ba91)
+- // ...
+- // We could be more precise but that would require knowing the details
+- // of the traceback format, which may not be dependable.
+- t.Fatal("got no trace back; log is ", contents(infoLog))
- }
+-}
-
-- expected = fmt.Sprintf("curl -X GET %s/v2/keys/foo?consistent=true&recursive=false&sorted=false",
-- c.cluster.Leader)
-- actual = c.RecvCURL()
-- if expected != actual {
-- t.Fatalf(`Command "%s" is not equal to expected value "%s"`,
-- actual, expected)
+-func BenchmarkHeader(b *testing.B) {
+- for i := 0; i < b.N; i++ {
+- buf, _, _ := logging.header(infoLog, 0)
+- logging.putBuffer(buf)
- }
-}
-diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/set_update_create.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/set_update_create.go
+diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/client/README.md b/Godeps/_workspace/src/github.com/google/cadvisor/client/README.md
deleted file mode 100644
-index cb0d567..0000000
---- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/set_update_create.go
+index fededef..0000000
+--- a/Godeps/_workspace/src/github.com/google/cadvisor/client/README.md
+++ /dev/null
-@@ -1,137 +0,0 @@
--package etcd
--
--// Set sets the given key to the given value.
--// It will create a new key value pair or replace the old one.
--// It will not replace a existing directory.
--func (c *Client) Set(key string, value string, ttl uint64) (*Response, error) {
-- raw, err := c.RawSet(key, value, ttl)
+@@ -1,54 +0,0 @@
+-# Example REST API Client
-
-- if err != nil {
-- return nil, err
-- }
+-This is an implementation of a cAdvisor REST API in Go. You can use it like this:
-
-- return raw.Unmarshal()
--}
+-```go
+-client, err := client.NewClient("http://192.168.59.103:8080/")
+-```
-
--// Set sets the given key to a directory.
--// It will create a new directory or replace the old key value pair by a directory.
--// It will not replace a existing directory.
--func (c *Client) SetDir(key string, ttl uint64) (*Response, error) {
-- raw, err := c.RawSetDir(key, ttl)
+-Obviously, replace the URL with the path to your actual cAdvisor REST endpoint.
-
-- if err != nil {
-- return nil, err
-- }
-
-- return raw.Unmarshal()
--}
+-### MachineInfo
-
--// CreateDir creates a directory. It succeeds only if
--// the given key does not yet exist.
--func (c *Client) CreateDir(key string, ttl uint64) (*Response, error) {
-- raw, err := c.RawCreateDir(key, ttl)
+-```go
+-client.MachineInfo()
+-```
-
-- if err != nil {
-- return nil, err
-- }
+-This method returns a cadvisor/info.MachineInfo struct with all the fields filled in. Here is an example return value:
-
-- return raw.Unmarshal()
--}
+-```
+-(*info.MachineInfo)(0xc208022b10)({
+- NumCores: (int) 4,
+- MemoryCapacity: (int64) 2106028032,
+- Filesystems: ([]info.FsInfo) (len=1 cap=4) {
+- (info.FsInfo) {
+- Device: (string) (len=9) "/dev/sda1",
+- Capacity: (uint64) 19507089408
+- }
+- }
+-})
+-```
-
--// UpdateDir updates the given directory. It succeeds only if the
--// given key already exists.
--func (c *Client) UpdateDir(key string, ttl uint64) (*Response, error) {
-- raw, err := c.RawUpdateDir(key, ttl)
+-You can see the full specification of the [MachineInfo struct in the source](../info/container.go)
-
-- if err != nil {
-- return nil, err
-- }
+-### ContainerInfo
-
-- return raw.Unmarshal()
--}
+-Given a container name and a ContainerInfoRequest, will return all information about the specified container. The ContainerInfoRequest struct just has one field, NumStats, which is the number of stat entries that you want returned.
-
--// Create creates a file with the given value under the given key. It succeeds
--// only if the given key does not yet exist.
--func (c *Client) Create(key string, value string, ttl uint64) (*Response, error) {
-- raw, err := c.RawCreate(key, value, ttl)
+-```go
+-request := info.ContainerInfoRequest{10}
+-sInfo, err := client.ContainerInfo("/docker/d9d3eb10179e6f93a...", &request)
+-```
+-Returns a [ContainerInfo struct](../info/container.go)
-
-- if err != nil {
-- return nil, err
-- }
+-### SubcontainersInfo
-
-- return raw.Unmarshal()
--}
+-Given a container name and a ContainerInfoRequest, will recursively return all info about the container and all subcontainers contained within the container. The ContainerInfoRequest struct just has one field, NumStats, which is the number of stat entries that you want returned.
-
--// CreateInOrder creates a file with a key that's guaranteed to be higher than other
--// keys in the given directory. It is useful for creating queues.
--func (c *Client) CreateInOrder(dir string, value string, ttl uint64) (*Response, error) {
-- raw, err := c.RawCreateInOrder(dir, value, ttl)
+-```go
+-request := info.ContainerInfoRequest{10}
+-sInfo, err := client.SubcontainersInfo("/docker", &request)
+-```
-
-- if err != nil {
-- return nil, err
-- }
+-Returns a [ContainerInfo struct](../info/container.go) with the Subcontainers field populated.
+diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/client/client.go b/Godeps/_workspace/src/github.com/google/cadvisor/client/client.go
+deleted file mode 100644
+index c1117d2..0000000
+--- a/Godeps/_workspace/src/github.com/google/cadvisor/client/client.go
++++ /dev/null
+@@ -1,123 +0,0 @@
+-// Copyright 2014 Google Inc. All Rights Reserved.
+-//
+-// Licensed under the Apache License, Version 2.0 (the "License");
+-// you may not use this file except in compliance with the License.
+-// You may obtain a copy of the License at
+-//
+-// http://www.apache.org/licenses/LICENSE-2.0
+-//
+-// Unless required by applicable law or agreed to in writing, software
+-// distributed under the License is distributed on an "AS IS" BASIS,
+-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-// See the License for the specific language governing permissions and
+-// limitations under the License.
-
-- return raw.Unmarshal()
--}
+-// TODO(cAdvisor): Package comment.
+-package client
-
--// Update updates the given key to the given value. It succeeds only if the
--// given key already exists.
--func (c *Client) Update(key string, value string, ttl uint64) (*Response, error) {
-- raw, err := c.RawUpdate(key, value, ttl)
+-import (
+- "bytes"
+- "encoding/json"
+- "fmt"
+- "io/ioutil"
+- "net/http"
+- "path"
+- "strings"
-
-- if err != nil {
-- return nil, err
-- }
+- "github.com/google/cadvisor/info"
+-)
-
-- return raw.Unmarshal()
+-// Client represents the base URL for a cAdvisor client.
+-type Client struct {
+- baseUrl string
-}
-
--func (c *Client) RawUpdateDir(key string, ttl uint64) (*RawResponse, error) {
-- ops := Options{
-- "prevExist": true,
-- "dir": true,
+-// NewClient returns a new client with the specified base URL.
+-func NewClient(url string) (*Client, error) {
+- if !strings.HasSuffix(url, "/") {
+- url += "/"
- }
-
-- return c.put(key, "", ttl, ops)
+- return &Client{
+- baseUrl: fmt.Sprintf("%sapi/v1.1/", url),
+- }, nil
-}
-
--func (c *Client) RawCreateDir(key string, ttl uint64) (*RawResponse, error) {
-- ops := Options{
-- "prevExist": false,
-- "dir": true,
+-// MachineInfo returns the JSON machine information for this client.
+-// A non-nil error result indicates a problem with obtaining
+-// the JSON machine information data.
+-func (self *Client) MachineInfo() (minfo *info.MachineInfo, err error) {
+- u := self.machineInfoUrl()
+- ret := new(info.MachineInfo)
+- if err = self.httpGetJsonData(ret, nil, u, "machine info"); err != nil {
+- return
- }
--
-- return c.put(key, "", ttl, ops)
--}
--
--func (c *Client) RawSet(key string, value string, ttl uint64) (*RawResponse, error) {
-- return c.put(key, value, ttl, nil)
+- minfo = ret
+- return
-}
-
--func (c *Client) RawSetDir(key string, ttl uint64) (*RawResponse, error) {
-- ops := Options{
-- "dir": true,
+-// ContainerInfo returns the JSON container information for the specified
+-// container and request.
+-func (self *Client) ContainerInfo(name string, query *info.ContainerInfoRequest) (cinfo *info.ContainerInfo, err error) {
+- u := self.containerInfoUrl(name)
+- ret := new(info.ContainerInfo)
+- if err = self.httpGetJsonData(ret, query, u, fmt.Sprintf("container info for %q", name)); err != nil {
+- return
- }
--
-- return c.put(key, "", ttl, ops)
+- cinfo = ret
+- return
-}
-
--func (c *Client) RawUpdate(key string, value string, ttl uint64) (*RawResponse, error) {
-- ops := Options{
-- "prevExist": true,
+-// Returns the information about all subcontainers (recursive) of the specified container (including itself).
+-func (self *Client) SubcontainersInfo(name string, query *info.ContainerInfoRequest) ([]info.ContainerInfo, error) {
+- var response []info.ContainerInfo
+- url := self.subcontainersInfoUrl(name)
+- err := self.httpGetJsonData(&response, query, url, fmt.Sprintf("subcontainers container info for %q", name))
+- if err != nil {
+- return []info.ContainerInfo{}, err
+-
- }
+- return response, nil
+-}
-
-- return c.put(key, value, ttl, ops)
+-func (self *Client) machineInfoUrl() string {
+- return self.baseUrl + path.Join("machine")
-}
-
--func (c *Client) RawCreate(key string, value string, ttl uint64) (*RawResponse, error) {
-- ops := Options{
-- "prevExist": false,
-- }
+-func (self *Client) containerInfoUrl(name string) string {
+- return self.baseUrl + path.Join("containers", name)
+-}
-
-- return c.put(key, value, ttl, ops)
+-func (self *Client) subcontainersInfoUrl(name string) string {
+- return self.baseUrl + path.Join("subcontainers", name)
-}
-
--func (c *Client) RawCreateInOrder(dir string, value string, ttl uint64) (*RawResponse, error) {
-- return c.post(dir, value, ttl)
+-func (self *Client) httpGetJsonData(data, postData interface{}, url, infoName string) error {
+- var resp *http.Response
+- var err error
+-
+- if postData != nil {
+- data, err := json.Marshal(postData)
+- if err != nil {
+- return fmt.Errorf("unable to marshal data: %v", err)
+- }
+- resp, err = http.Post(url, "application/json", bytes.NewBuffer(data))
+- } else {
+- resp, err = http.Get(url)
+- }
+- if err != nil {
+- err = fmt.Errorf("unable to get %v: %v", infoName, err)
+- return err
+- }
+- defer resp.Body.Close()
+- body, err := ioutil.ReadAll(resp.Body)
+- if err != nil {
+- err = fmt.Errorf("unable to read all %v: %v", infoName, err)
+- return err
+- }
+- if err = json.Unmarshal(body, data); err != nil {
+- err = fmt.Errorf("unable to unmarshal %v (%v): %v", infoName, string(body), err)
+- return err
+- }
+- return nil
-}
-diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/set_update_create_test.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/set_update_create_test.go
+diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/client/client_test.go b/Godeps/_workspace/src/github.com/google/cadvisor/client/client_test.go
deleted file mode 100644
-index ced0f06..0000000
---- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/set_update_create_test.go
+index 35a75ad..0000000
+--- a/Godeps/_workspace/src/github.com/google/cadvisor/client/client_test.go
+++ /dev/null
-@@ -1,241 +0,0 @@
--package etcd
+@@ -1,154 +0,0 @@
+-// Copyright 2014 Google Inc. All Rights Reserved.
+-//
+-// Licensed under the Apache License, Version 2.0 (the "License");
+-// you may not use this file except in compliance with the License.
+-// You may obtain a copy of the License at
+-//
+-// http://www.apache.org/licenses/LICENSE-2.0
+-//
+-// Unless required by applicable law or agreed to in writing, software
+-// distributed under the License is distributed on an "AS IS" BASIS,
+-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-// See the License for the specific language governing permissions and
+-// limitations under the License.
+-
+-package client
-
-import (
+- "encoding/json"
+- "fmt"
+- "net/http"
+- "net/http/httptest"
+- "path"
+- "reflect"
- "testing"
+- "time"
+-
+- "github.com/google/cadvisor/info"
+- itest "github.com/google/cadvisor/info/test"
+- "github.com/kr/pretty"
-)
-
--func TestSet(t *testing.T) {
-- c := NewClient(nil)
-- defer func() {
-- c.Delete("foo", true)
-- }()
+-func testGetJsonData(
+- expected interface{},
+- f func() (interface{}, error),
+-) error {
+- reply, err := f()
+- if err != nil {
+- return fmt.Errorf("unable to retrieve data: %v", err)
+- }
+- if !reflect.DeepEqual(reply, expected) {
+- return pretty.Errorf("retrieved wrong data: %# v != %# v", reply, expected)
+- }
+- return nil
+-}
-
-- resp, err := c.Set("foo", "bar", 5)
+-func cadvisorTestClient(path string, expectedPostObj, expectedPostObjEmpty, replyObj interface{}, t *testing.T) (*Client, *httptest.Server, error) {
+- ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+- if r.URL.Path == path {
+- if expectedPostObj != nil {
+- decoder := json.NewDecoder(r.Body)
+- if err := decoder.Decode(expectedPostObjEmpty); err != nil {
+- t.Errorf("Received invalid object: %v", err)
+- }
+- if !reflect.DeepEqual(expectedPostObj, expectedPostObjEmpty) {
+- t.Errorf("Received unexpected object: %+v", expectedPostObjEmpty)
+- }
+- }
+- encoder := json.NewEncoder(w)
+- encoder.Encode(replyObj)
+- } else if r.URL.Path == "/api/v1.1/machine" {
+- fmt.Fprint(w, `{"num_cores":8,"memory_capacity":31625871360}`)
+- } else {
+- w.WriteHeader(http.StatusNotFound)
+- fmt.Fprintf(w, "Page not found.")
+- }
+- }))
+- client, err := NewClient(ts.URL)
- if err != nil {
-- t.Fatal(err)
+- ts.Close()
+- return nil, nil, err
- }
-- if resp.Node.Key != "/foo" || resp.Node.Value != "bar" || resp.Node.TTL != 5 {
-- t.Fatalf("Set 1 failed: %#v", resp)
+- return client, ts, err
+-}
+-
+-// TestGetMachineInfo performs one test to check if MachineInfo()
+-// in a cAdvisor client returns the correct result.
+-func TestGetMachineinfo(t *testing.T) {
+- minfo := &info.MachineInfo{
+- NumCores: 8,
+- MemoryCapacity: 31625871360,
- }
-- if resp.PrevNode != nil {
-- t.Fatalf("Set 1 PrevNode failed: %#v", resp)
+- client, server, err := cadvisorTestClient("/api/v1.1/machine", nil, nil, minfo, t)
+- if err != nil {
+- t.Fatalf("unable to get a client %v", err)
- }
--
-- resp, err = c.Set("foo", "bar2", 5)
+- defer server.Close()
+- returned, err := client.MachineInfo()
- if err != nil {
- t.Fatal(err)
- }
-- if !(resp.Node.Key == "/foo" && resp.Node.Value == "bar2" && resp.Node.TTL == 5) {
-- t.Fatalf("Set 2 failed: %#v", resp)
-- }
-- if resp.PrevNode.Key != "/foo" || resp.PrevNode.Value != "bar" || resp.Node.TTL != 5 {
-- t.Fatalf("Set 2 PrevNode failed: %#v", resp)
+- if !reflect.DeepEqual(returned, minfo) {
+- t.Fatalf("received unexpected machine info")
- }
-}
-
--func TestUpdate(t *testing.T) {
-- c := NewClient(nil)
-- defer func() {
-- c.Delete("foo", true)
-- c.Delete("nonexistent", true)
-- }()
--
-- resp, err := c.Set("foo", "bar", 5)
--
+-// TestGetContainerInfo generates a random container information object
+-// and then checks that ContainerInfo returns the expected result.
+-func TestGetContainerInfo(t *testing.T) {
+- query := &info.ContainerInfoRequest{
+- NumStats: 3,
+- }
+- containerName := "/some/container"
+- cinfo := itest.GenerateRandomContainerInfo(containerName, 4, query, 1*time.Second)
+- client, server, err := cadvisorTestClient(fmt.Sprintf("/api/v1.1/containers%v", containerName), query, &info.ContainerInfoRequest{}, cinfo, t)
+- if err != nil {
+- t.Fatalf("unable to get a client %v", err)
+- }
+- defer server.Close()
+- returned, err := client.ContainerInfo(containerName, query)
- if err != nil {
- t.Fatal(err)
- }
-
-- // This should succeed.
-- resp, err = c.Update("foo", "wakawaka", 5)
+- if !returned.Eq(cinfo) {
+- t.Error("received unexpected ContainerInfo")
+- }
+-}
+-
+-func TestGetSubcontainersInfo(t *testing.T) {
+- query := &info.ContainerInfoRequest{
+- NumStats: 3,
+- }
+- containerName := "/some/container"
+- cinfo := itest.GenerateRandomContainerInfo(containerName, 4, query, 1*time.Second)
+- cinfo1 := itest.GenerateRandomContainerInfo(path.Join(containerName, "sub1"), 4, query, 1*time.Second)
+- cinfo2 := itest.GenerateRandomContainerInfo(path.Join(containerName, "sub2"), 4, query, 1*time.Second)
+- response := []info.ContainerInfo{
+- *cinfo,
+- *cinfo1,
+- *cinfo2,
+- }
+- client, server, err := cadvisorTestClient(fmt.Sprintf("/api/v1.1/subcontainers%v", containerName), query, &info.ContainerInfoRequest{}, response, t)
+- if err != nil {
+- t.Fatalf("unable to get a client %v", err)
+- }
+- defer server.Close()
+- returned, err := client.SubcontainersInfo(containerName, query)
- if err != nil {
- t.Fatal(err)
- }
-
-- if !(resp.Action == "update" && resp.Node.Key == "/foo" && resp.Node.TTL == 5) {
-- t.Fatalf("Update 1 failed: %#v", resp)
+- if len(returned) != 3 {
+- t.Errorf("unexpected number of results: got %d, expected 3", len(returned))
- }
-- if !(resp.PrevNode.Key == "/foo" && resp.PrevNode.Value == "bar" && resp.Node.TTL == 5) {
-- t.Fatalf("Update 1 prevValue failed: %#v", resp)
+- if !returned[0].Eq(cinfo) {
+- t.Error("received unexpected ContainerInfo")
- }
--
-- // This should fail because the key does not exist.
-- resp, err = c.Update("nonexistent", "whatever", 5)
-- if err == nil {
-- t.Fatalf("The key %v did not exist, so the update should have failed."+
-- "The response was: %#v", resp.Node.Key, resp)
+- if !returned[1].Eq(cinfo1) {
+- t.Error("received unexpected ContainerInfo")
+- }
+- if !returned[2].Eq(cinfo2) {
+- t.Error("received unexpected ContainerInfo")
- }
-}
+diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/info/advice.go b/Godeps/_workspace/src/github.com/google/cadvisor/info/advice.go
+deleted file mode 100644
+index 8084cf4..0000000
+--- a/Godeps/_workspace/src/github.com/google/cadvisor/info/advice.go
++++ /dev/null
+@@ -1,34 +0,0 @@
+-// Copyright 2014 Google Inc. All Rights Reserved.
+-//
+-// Licensed under the Apache License, Version 2.0 (the "License");
+-// you may not use this file except in compliance with the License.
+-// You may obtain a copy of the License at
+-//
+-// http://www.apache.org/licenses/LICENSE-2.0
+-//
+-// Unless required by applicable law or agreed to in writing, software
+-// distributed under the License is distributed on an "AS IS" BASIS,
+-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-// See the License for the specific language governing permissions and
+-// limitations under the License.
-
--func TestCreate(t *testing.T) {
-- c := NewClient(nil)
-- defer func() {
-- c.Delete("newKey", true)
-- }()
+-package info
-
-- newKey := "/newKey"
-- newValue := "/newValue"
+-// This struct describes one type of relationship between containers: One
+-// container, antagonist, interferes the performance of other
+-// containers, victims.
+-type Interference struct {
+- // Absolute name of the antagonist container name. This field
+- // should not be empty.
+- Antagonist string `json:"antagonist"`
-
-- // This should succeed
-- resp, err := c.Create(newKey, newValue, 5)
-- if err != nil {
-- t.Fatal(err)
-- }
+- // The absolute path of the victims. This field should not be empty.
+- Victims []string `json:"victims"`
-
-- if !(resp.Action == "create" && resp.Node.Key == newKey &&
-- resp.Node.Value == newValue && resp.Node.TTL == 5) {
-- t.Fatalf("Create 1 failed: %#v", resp)
-- }
-- if resp.PrevNode != nil {
-- t.Fatalf("Create 1 PrevNode failed: %#v", resp)
-- }
+- // The name of the detector used to detect this antagonism. This field
+- // should not be empty
+- Detector string `json:"detector"`
-
-- // This should fail, because the key is already there
-- resp, err = c.Create(newKey, newValue, 5)
-- if err == nil {
-- t.Fatalf("The key %v did exist, so the creation should have failed."+
-- "The response was: %#v", resp.Node.Key, resp)
-- }
+- // Human readable description of this interference
+- Description string `json:"description,omitempty"`
-}
+diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/info/container.go b/Godeps/_workspace/src/github.com/google/cadvisor/info/container.go
+deleted file mode 100644
+index 5eaacb5..0000000
+--- a/Godeps/_workspace/src/github.com/google/cadvisor/info/container.go
++++ /dev/null
+@@ -1,346 +0,0 @@
+-// Copyright 2014 Google Inc. All Rights Reserved.
+-//
+-// Licensed under the Apache License, Version 2.0 (the "License");
+-// you may not use this file except in compliance with the License.
+-// You may obtain a copy of the License at
+-//
+-// http://www.apache.org/licenses/LICENSE-2.0
+-//
+-// Unless required by applicable law or agreed to in writing, software
+-// distributed under the License is distributed on an "AS IS" BASIS,
+-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-// See the License for the specific language governing permissions and
+-// limitations under the License.
-
--func TestCreateInOrder(t *testing.T) {
-- c := NewClient(nil)
-- dir := "/queue"
-- defer func() {
-- c.DeleteDir(dir)
-- }()
+-package info
-
-- var firstKey, secondKey string
+-import (
+- "reflect"
+- "time"
+-)
-
-- resp, err := c.CreateInOrder(dir, "1", 5)
-- if err != nil {
-- t.Fatal(err)
-- }
+-type CpuSpec struct {
+- Limit uint64 `json:"limit"`
+- MaxLimit uint64 `json:"max_limit"`
+- Mask string `json:"mask,omitempty"`
+-}
-
-- if !(resp.Action == "create" && resp.Node.Value == "1" && resp.Node.TTL == 5) {
-- t.Fatalf("Create 1 failed: %#v", resp)
-- }
+-type MemorySpec struct {
+- // The amount of memory requested. Default is unlimited (-1).
+- // Units: bytes.
+- Limit uint64 `json:"limit,omitempty"`
-
-- firstKey = resp.Node.Key
+- // The amount of guaranteed memory. Default is 0.
+- // Units: bytes.
+- Reservation uint64 `json:"reservation,omitempty"`
-
-- resp, err = c.CreateInOrder(dir, "2", 5)
-- if err != nil {
-- t.Fatal(err)
-- }
+- // The amount of swap space requested. Default is unlimited (-1).
+- // Units: bytes.
+- SwapLimit uint64 `json:"swap_limit,omitempty"`
+-}
-
-- if !(resp.Action == "create" && resp.Node.Value == "2" && resp.Node.TTL == 5) {
-- t.Fatalf("Create 2 failed: %#v", resp)
-- }
+-type ContainerSpec struct {
+- HasCpu bool `json:"has_cpu"`
+- Cpu CpuSpec `json:"cpu,omitempty"`
-
-- secondKey = resp.Node.Key
+- HasMemory bool `json:"has_memory"`
+- Memory MemorySpec `json:"memory,omitempty"`
-
-- if firstKey >= secondKey {
-- t.Fatalf("Expected first key to be greater than second key, but %s is not greater than %s",
-- firstKey, secondKey)
-- }
+- HasNetwork bool `json:"has_network"`
+-
+- HasFilesystem bool `json:"has_filesystem"`
-}
-
--func TestSetDir(t *testing.T) {
-- c := NewClient(nil)
-- defer func() {
-- c.Delete("foo", true)
-- c.Delete("fooDir", true)
-- }()
+-// Container reference contains enough information to uniquely identify a container
+-type ContainerReference struct {
+- // The absolute name of the container.
+- Name string `json:"name"`
-
-- resp, err := c.CreateDir("fooDir", 5)
-- if err != nil {
-- t.Fatal(err)
-- }
-- if !(resp.Node.Key == "/fooDir" && resp.Node.Value == "" && resp.Node.TTL == 5) {
-- t.Fatalf("SetDir 1 failed: %#v", resp)
-- }
-- if resp.PrevNode != nil {
-- t.Fatalf("SetDir 1 PrevNode failed: %#v", resp)
-- }
+- Aliases []string `json:"aliases,omitempty"`
+-}
-
-- // This should fail because /fooDir already points to a directory
-- resp, err = c.CreateDir("/fooDir", 5)
-- if err == nil {
-- t.Fatalf("fooDir already points to a directory, so SetDir should have failed."+
-- "The response was: %#v", resp)
-- }
+-// ContainerInfoQuery is used when users check a container info from the REST api.
+-// It specifies how much data users want to get about a container
+-type ContainerInfoRequest struct {
+- // Max number of stats to return.
+- NumStats int `json:"num_stats,omitempty"`
+-}
-
-- _, err = c.Set("foo", "bar", 5)
-- if err != nil {
-- t.Fatal(err)
-- }
+-type ContainerInfo struct {
+- ContainerReference
-
-- // This should succeed
-- // It should replace the key
-- resp, err = c.SetDir("foo", 5)
-- if err != nil {
-- t.Fatal(err)
-- }
-- if !(resp.Node.Key == "/foo" && resp.Node.Value == "" && resp.Node.TTL == 5) {
-- t.Fatalf("SetDir 2 failed: %#v", resp)
-- }
-- if !(resp.PrevNode.Key == "/foo" && resp.PrevNode.Value == "bar" && resp.PrevNode.TTL == 5) {
-- t.Fatalf("SetDir 2 failed: %#v", resp)
-- }
+- // The direct subcontainers of the current container.
+- Subcontainers []ContainerReference `json:"subcontainers,omitempty"`
+-
+- // The isolation used in the container.
+- Spec ContainerSpec `json:"spec,omitempty"`
+-
+- // Historical statistics gathered from the container.
+- Stats []*ContainerStats `json:"stats,omitempty"`
-}
-
--func TestUpdateDir(t *testing.T) {
-- c := NewClient(nil)
-- defer func() {
-- c.Delete("fooDir", true)
-- }()
+-// ContainerInfo may be (un)marshaled by json or other en/decoder. In that
+-// case, the Timestamp field in each stats/sample may not be precisely
+-// en/decoded. This will lead to small but acceptable differences between a
+-// ContainerInfo and its encode-then-decode version. Eq() is used to compare
+-// two ContainerInfo accepting small difference (<10ms) of Time fields.
+-func (self *ContainerInfo) Eq(b *ContainerInfo) bool {
-
-- resp, err := c.CreateDir("fooDir", 5)
-- if err != nil {
-- t.Fatal(err)
+- // If both self and b are nil, then Eq() returns true
+- if self == nil {
+- return b == nil
- }
--
-- // This should succeed.
-- resp, err = c.UpdateDir("fooDir", 5)
-- if err != nil {
-- t.Fatal(err)
+- if b == nil {
+- return self == nil
- }
-
-- if !(resp.Action == "update" && resp.Node.Key == "/fooDir" &&
-- resp.Node.Value == "" && resp.Node.TTL == 5) {
-- t.Fatalf("UpdateDir 1 failed: %#v", resp)
+- // For fields other than time.Time, we will compare them precisely.
+- // This would require that any slice should have same order.
+- if !reflect.DeepEqual(self.ContainerReference, b.ContainerReference) {
+- return false
- }
-- if !(resp.PrevNode.Key == "/fooDir" && resp.PrevNode.Dir == true && resp.PrevNode.TTL == 5) {
-- t.Fatalf("UpdateDir 1 PrevNode failed: %#v", resp)
+- if !reflect.DeepEqual(self.Subcontainers, b.Subcontainers) {
+- return false
+- }
+- if !reflect.DeepEqual(self.Spec, b.Spec) {
+- return false
- }
-
-- // This should fail because the key does not exist.
-- resp, err = c.UpdateDir("nonexistentDir", 5)
-- if err == nil {
-- t.Fatalf("The key %v did not exist, so the update should have failed."+
-- "The response was: %#v", resp.Node.Key, resp)
+- for i, expectedStats := range b.Stats {
+- selfStats := self.Stats[i]
+- if !expectedStats.Eq(selfStats) {
+- return false
+- }
- }
--}
-
--func TestCreateDir(t *testing.T) {
-- c := NewClient(nil)
-- defer func() {
-- c.Delete("fooDir", true)
-- }()
+- return true
+-}
-
-- // This should succeed
-- resp, err := c.CreateDir("fooDir", 5)
-- if err != nil {
-- t.Fatal(err)
+-func (self *ContainerInfo) StatsAfter(ref time.Time) []*ContainerStats {
+- n := len(self.Stats) + 1
+- for i, s := range self.Stats {
+- if s.Timestamp.After(ref) {
+- n = i
+- break
+- }
- }
--
-- if !(resp.Action == "create" && resp.Node.Key == "/fooDir" &&
-- resp.Node.Value == "" && resp.Node.TTL == 5) {
-- t.Fatalf("CreateDir 1 failed: %#v", resp)
+- if n > len(self.Stats) {
+- return nil
- }
-- if resp.PrevNode != nil {
-- t.Fatalf("CreateDir 1 PrevNode failed: %#v", resp)
+- return self.Stats[n:]
+-}
+-
+-func (self *ContainerInfo) StatsStartTime() time.Time {
+- var ret time.Time
+- for _, s := range self.Stats {
+- if s.Timestamp.Before(ret) || ret.IsZero() {
+- ret = s.Timestamp
+- }
- }
+- return ret
+-}
-
-- // This should fail, because the key is already there
-- resp, err = c.CreateDir("fooDir", 5)
-- if err == nil {
-- t.Fatalf("The key %v did exist, so the creation should have failed."+
-- "The response was: %#v", resp.Node.Key, resp)
+-func (self *ContainerInfo) StatsEndTime() time.Time {
+- var ret time.Time
+- for i := len(self.Stats) - 1; i >= 0; i-- {
+- s := self.Stats[i]
+- if s.Timestamp.After(ret) {
+- ret = s.Timestamp
+- }
- }
+- return ret
-}
-diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/version.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/version.go
-deleted file mode 100644
-index b3d05df..0000000
---- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/version.go
-+++ /dev/null
-@@ -1,3 +0,0 @@
--package etcd
-
--const version = "v2"
-diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/watch.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/watch.go
-deleted file mode 100644
-index aa8d3df..0000000
---- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/watch.go
-+++ /dev/null
-@@ -1,103 +0,0 @@
--package etcd
+-// All CPU usage metrics are cumulative from the creation of the container
+-type CpuStats struct {
+- Usage struct {
+- // Total CPU usage.
+- // Units: nanoseconds
+- Total uint64 `json:"total"`
-
--import (
-- "errors"
--)
+- // Per CPU/core usage of the container.
+- // Unit: nanoseconds.
+- PerCpu []uint64 `json:"per_cpu_usage,omitempty"`
-
--// Errors introduced by the Watch command.
--var (
-- ErrWatchStoppedByUser = errors.New("Watch stopped by the user via stop channel")
--)
+- // Time spent in user space.
+- // Unit: nanoseconds
+- User uint64 `json:"user"`
-
--// If recursive is set to true the watch returns the first change under the given
--// prefix since the given index.
--//
--// If recursive is set to false the watch returns the first change to the given key
--// since the given index.
--//
--// To watch for the latest change, set waitIndex = 0.
--//
--// If a receiver channel is given, it will be a long-term watch. Watch will block at the
--//channel. After someone receives the channel, it will go on to watch that
--// prefix. If a stop channel is given, the client can close long-term watch using
--// the stop channel.
--func (c *Client) Watch(prefix string, waitIndex uint64, recursive bool,
-- receiver chan *Response, stop chan bool) (*Response, error) {
-- logger.Debugf("watch %s [%s]", prefix, c.cluster.Leader)
-- if receiver == nil {
-- raw, err := c.watchOnce(prefix, waitIndex, recursive, stop)
+- // Time spent in kernel space.
+- // Unit: nanoseconds
+- System uint64 `json:"system"`
+- } `json:"usage"`
+- Load int32 `json:"load"`
+-}
-
-- if err != nil {
-- return nil, err
-- }
+-type PerDiskStats struct {
+- Major uint64 `json:"major"`
+- Minor uint64 `json:"minor"`
+- Stats map[string]uint64 `json:"stats"`
+-}
-
-- return raw.Unmarshal()
-- }
-- defer close(receiver)
+-type DiskIoStats struct {
+- IoServiceBytes []PerDiskStats `json:"io_service_bytes,omitempty"`
+- IoServiced []PerDiskStats `json:"io_serviced,omitempty"`
+- IoQueued []PerDiskStats `json:"io_queued,omitempty"`
+- Sectors []PerDiskStats `json:"sectors,omitempty"`
+-}
-
-- for {
-- raw, err := c.watchOnce(prefix, waitIndex, recursive, stop)
+-type MemoryStats struct {
+- // Memory limit, equivalent to "limit" in MemorySpec.
+- // Units: Bytes.
+- Limit uint64 `json:"limit,omitempty"`
-
-- if err != nil {
-- return nil, err
-- }
+- // Usage statistics.
+-
+- // Current memory usage, this includes all memory regardless of when it was
+- // accessed.
+- // Units: Bytes.
+- Usage uint64 `json:"usage,omitempty"`
+-
+- // The amount of working set memory, this includes recently accessed memory,
+- // dirty memory, and kernel memory. Working set is <= "usage".
+- // Units: Bytes.
+- WorkingSet uint64 `json:"working_set,omitempty"`
+-
+- ContainerData MemoryStatsMemoryData `json:"container_data,omitempty"`
+- HierarchicalData MemoryStatsMemoryData `json:"hierarchical_data,omitempty"`
+-}
+-
+-type MemoryStatsMemoryData struct {
+- Pgfault uint64 `json:"pgfault,omitempty"`
+- Pgmajfault uint64 `json:"pgmajfault,omitempty"`
+-}
+-
+-type NetworkStats struct {
+- // Cumulative count of bytes received.
+- RxBytes uint64 `json:"rx_bytes"`
+- // Cumulative count of packets received.
+- RxPackets uint64 `json:"rx_packets"`
+- // Cumulative count of receive errors encountered.
+- RxErrors uint64 `json:"rx_errors"`
+- // Cumulative count of packets dropped while receiving.
+- RxDropped uint64 `json:"rx_dropped"`
+- // Cumulative count of bytes transmitted.
+- TxBytes uint64 `json:"tx_bytes"`
+- // Cumulative count of packets transmitted.
+- TxPackets uint64 `json:"tx_packets"`
+- // Cumulative count of transmit errors encountered.
+- TxErrors uint64 `json:"tx_errors"`
+- // Cumulative count of packets dropped while transmitting.
+- TxDropped uint64 `json:"tx_dropped"`
+-}
-
-- resp, err := raw.Unmarshal()
+-type FsStats struct {
+- // The block device name associated with the filesystem.
+- Device string `json:"device,omitempty"`
-
-- if err != nil {
-- return nil, err
-- }
+- // Number of bytes that can be consumed by the container on this filesystem.
+- Limit uint64 `json:"capacity"`
-
-- waitIndex = resp.Node.ModifiedIndex + 1
-- receiver <- resp
-- }
+- // Number of bytes that is consumed by the container on this filesystem.
+- Usage uint64 `json:"usage"`
-}
-
--func (c *Client) RawWatch(prefix string, waitIndex uint64, recursive bool,
-- receiver chan *RawResponse, stop chan bool) (*RawResponse, error) {
+-type ContainerStats struct {
+- // The time of this stat point.
+- Timestamp time.Time `json:"timestamp"`
+- Cpu *CpuStats `json:"cpu,omitempty"`
+- DiskIo DiskIoStats `json:"diskio,omitempty"`
+- Memory *MemoryStats `json:"memory,omitempty"`
+- Network *NetworkStats `json:"network,omitempty"`
+- // Filesystem statistics
+- Filesystem []FsStats `json:"filesystem,omitempty"`
+-}
-
-- logger.Debugf("rawWatch %s [%s]", prefix, c.cluster.Leader)
-- if receiver == nil {
-- return c.watchOnce(prefix, waitIndex, recursive, stop)
+-// Makes a deep copy of the ContainerStats and returns a pointer to the new
+-// copy. Copy() will allocate a new ContainerStats object if dst is nil.
+-func (self *ContainerStats) Copy(dst *ContainerStats) *ContainerStats {
+- if dst == nil {
+- dst = new(ContainerStats)
- }
--
-- for {
-- raw, err := c.watchOnce(prefix, waitIndex, recursive, stop)
--
-- if err != nil {
-- return nil, err
+- dst.Timestamp = self.Timestamp
+- if self.Cpu != nil {
+- if dst.Cpu == nil {
+- dst.Cpu = new(CpuStats)
- }
--
-- resp, err := raw.Unmarshal()
--
-- if err != nil {
-- return nil, err
+- // To make a deep copy of a slice, we need to copy every value
+- // in the slice. To make less memory allocation, we would like
+- // to reuse the slice in dst if possible.
+- percpu := dst.Cpu.Usage.PerCpu
+- if len(percpu) != len(self.Cpu.Usage.PerCpu) {
+- percpu = make([]uint64, len(self.Cpu.Usage.PerCpu))
- }
--
-- waitIndex = resp.Node.ModifiedIndex + 1
-- receiver <- raw
+- dst.Cpu.Usage = self.Cpu.Usage
+- dst.Cpu.Load = self.Cpu.Load
+- copy(percpu, self.Cpu.Usage.PerCpu)
+- dst.Cpu.Usage.PerCpu = percpu
+- } else {
+- dst.Cpu = nil
+- }
+- if self.Memory != nil {
+- if dst.Memory == nil {
+- dst.Memory = new(MemoryStats)
+- }
+- *dst.Memory = *self.Memory
+- } else {
+- dst.Memory = nil
- }
+- return dst
-}
-
--// helper func
--// return when there is change under the given prefix
--func (c *Client) watchOnce(key string, waitIndex uint64, recursive bool, stop chan bool) (*RawResponse, error) {
--
-- options := Options{
-- "wait": true,
+-func timeEq(t1, t2 time.Time, tolerance time.Duration) bool {
+- // t1 should not be later than t2
+- if t1.After(t2) {
+- t1, t2 = t2, t1
- }
-- if waitIndex > 0 {
-- options["waitIndex"] = waitIndex
+- diff := t2.Sub(t1)
+- if diff <= tolerance {
+- return true
- }
-- if recursive {
-- options["recursive"] = true
+- return false
+-}
+-
+-func durationEq(a, b time.Duration, tolerance time.Duration) bool {
+- if a > b {
+- a, b = b, a
+- }
+- diff := a - b
+- if diff <= tolerance {
+- return true
- }
+- return false
+-}
-
-- resp, err := c.getCancelable(key, options, stop)
+-const (
+- // 10ms, i.e. 0.01s
+- timePrecision time.Duration = 10 * time.Millisecond
+-)
-
-- if err == ErrRequestCancelled {
-- return nil, ErrWatchStoppedByUser
+-// This function is useful because we do not require precise time
+-// representation.
+-func (a *ContainerStats) Eq(b *ContainerStats) bool {
+- if !timeEq(a.Timestamp, b.Timestamp, timePrecision) {
+- return false
- }
+- return a.StatsEq(b)
+-}
-
-- return resp, err
+-// Checks equality of the stats values.
+-func (a *ContainerStats) StatsEq(b *ContainerStats) bool {
+- if !reflect.DeepEqual(a.Cpu, b.Cpu) {
+- return false
+- }
+- if !reflect.DeepEqual(a.Memory, b.Memory) {
+- return false
+- }
+- return true
-}
-diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/watch_test.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/watch_test.go
+-
+-// Saturate CPU usage to 0.
+-func calculateCpuUsage(prev, cur uint64) uint64 {
+- if prev > cur {
+- return 0
+- }
+- return cur - prev
+-}
+diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/info/container_test.go b/Godeps/_workspace/src/github.com/google/cadvisor/info/container_test.go
deleted file mode 100644
-index 43e1dfe..0000000
---- a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/watch_test.go
+index bd730c1..0000000
+--- a/Godeps/_workspace/src/github.com/google/cadvisor/info/container_test.go
+++ /dev/null
-@@ -1,119 +0,0 @@
--package etcd
+@@ -1,101 +0,0 @@
+-// Copyright 2014 Google Inc. All Rights Reserved.
+-//
+-// Licensed under the Apache License, Version 2.0 (the "License");
+-// you may not use this file except in compliance with the License.
+-// You may obtain a copy of the License at
+-//
+-// http://www.apache.org/licenses/LICENSE-2.0
+-//
+-// Unless required by applicable law or agreed to in writing, software
+-// distributed under the License is distributed on an "AS IS" BASIS,
+-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-// See the License for the specific language governing permissions and
+-// limitations under the License.
+-
+-package info
-
-import (
-- "fmt"
-- "runtime"
+- "reflect"
- "testing"
- "time"
-)
-
--func TestWatch(t *testing.T) {
-- c := NewClient(nil)
-- defer func() {
-- c.Delete("watch_foo", true)
-- }()
+-func TestStatsStartTime(t *testing.T) {
+- N := 10
+- stats := make([]*ContainerStats, 0, N)
+- ct := time.Now()
+- for i := 0; i < N; i++ {
+- s := &ContainerStats{
+- Timestamp: ct.Add(time.Duration(i) * time.Second),
+- }
+- stats = append(stats, s)
+- }
+- cinfo := &ContainerInfo{
+- ContainerReference: ContainerReference{
+- Name: "/some/container",
+- },
+- Stats: stats,
+- }
+- ref := ct.Add(time.Duration(N-1) * time.Second)
+- end := cinfo.StatsEndTime()
-
-- go setHelper("watch_foo", "bar", c)
+- if !ref.Equal(end) {
+- t.Errorf("end time is %v; should be %v", end, ref)
+- }
+-}
-
-- resp, err := c.Watch("watch_foo", 0, false, nil, nil)
-- if err != nil {
-- t.Fatal(err)
+-func TestStatsEndTime(t *testing.T) {
+- N := 10
+- stats := make([]*ContainerStats, 0, N)
+- ct := time.Now()
+- for i := 0; i < N; i++ {
+- s := &ContainerStats{
+- Timestamp: ct.Add(time.Duration(i) * time.Second),
+- }
+- stats = append(stats, s)
- }
-- if !(resp.Node.Key == "/watch_foo" && resp.Node.Value == "bar") {
-- t.Fatalf("Watch 1 failed: %#v", resp)
+- cinfo := &ContainerInfo{
+- ContainerReference: ContainerReference{
+- Name: "/some/container",
+- },
+- Stats: stats,
- }
+- ref := ct
+- start := cinfo.StatsStartTime()
-
-- go setHelper("watch_foo", "bar", c)
+- if !ref.Equal(start) {
+- t.Errorf("start time is %v; should be %v", start, ref)
+- }
+-}
-
-- resp, err = c.Watch("watch_foo", resp.Node.ModifiedIndex+1, false, nil, nil)
-- if err != nil {
-- t.Fatal(err)
+-func createStats(cpuUsage, memUsage uint64, timestamp time.Time) *ContainerStats {
+- stats := &ContainerStats{
+- Cpu: &CpuStats{},
+- Memory: &MemoryStats{},
- }
-- if !(resp.Node.Key == "/watch_foo" && resp.Node.Value == "bar") {
-- t.Fatalf("Watch 2 failed: %#v", resp)
+- stats.Cpu.Usage.PerCpu = []uint64{cpuUsage}
+- stats.Cpu.Usage.Total = cpuUsage
+- stats.Cpu.Usage.System = 0
+- stats.Cpu.Usage.User = cpuUsage
+- stats.Memory.Usage = memUsage
+- stats.Timestamp = timestamp
+- return stats
+-}
+-
+-func TestContainerStatsCopy(t *testing.T) {
+- stats := createStats(100, 101, time.Now())
+- shadowStats := stats.Copy(nil)
+- if !reflect.DeepEqual(stats, shadowStats) {
+- t.Errorf("Copy() returned different object")
+- }
+- stats.Cpu.Usage.PerCpu[0] = shadowStats.Cpu.Usage.PerCpu[0] + 1
+- stats.Cpu.Load = shadowStats.Cpu.Load + 1
+- stats.Memory.Usage = shadowStats.Memory.Usage + 1
+- if reflect.DeepEqual(stats, shadowStats) {
+- t.Errorf("Copy() did not deeply copy the object")
- }
+- stats = shadowStats.Copy(stats)
+- if !reflect.DeepEqual(stats, shadowStats) {
+- t.Errorf("Copy() returned different object")
+- }
+-}
+diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/info/machine.go b/Godeps/_workspace/src/github.com/google/cadvisor/info/machine.go
+deleted file mode 100644
+index 0e73a8e..0000000
+--- a/Godeps/_workspace/src/github.com/google/cadvisor/info/machine.go
++++ /dev/null
+@@ -1,53 +0,0 @@
+-// Copyright 2014 Google Inc. All Rights Reserved.
+-//
+-// Licensed under the Apache License, Version 2.0 (the "License");
+-// you may not use this file except in compliance with the License.
+-// You may obtain a copy of the License at
+-//
+-// http://www.apache.org/licenses/LICENSE-2.0
+-//
+-// Unless required by applicable law or agreed to in writing, software
+-// distributed under the License is distributed on an "AS IS" BASIS,
+-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-// See the License for the specific language governing permissions and
+-// limitations under the License.
-
-- routineNum := runtime.NumGoroutine()
+-package info
-
-- ch := make(chan *Response, 10)
-- stop := make(chan bool, 1)
+-type FsInfo struct {
+- // Block device associated with the filesystem.
+- Device string `json:"device"`
-
-- go setLoop("watch_foo", "bar", c)
+- // Total number of bytes available on the filesystem.
+- Capacity uint64 `json:"capacity"`
+-}
-
-- go receiver(ch, stop)
+-type MachineInfo struct {
+- // The number of cores in this machine.
+- NumCores int `json:"num_cores"`
-
-- _, err = c.Watch("watch_foo", 0, false, ch, stop)
-- if err != ErrWatchStoppedByUser {
-- t.Fatalf("Watch returned a non-user stop error")
-- }
+- // The amount of memory (in bytes) in this machine
+- MemoryCapacity int64 `json:"memory_capacity"`
-
-- if newRoutineNum := runtime.NumGoroutine(); newRoutineNum != routineNum {
-- t.Fatalf("Routine numbers differ after watch stop: %v, %v", routineNum, newRoutineNum)
-- }
+- // Filesystems on this machine.
+- Filesystems []FsInfo `json:"filesystems"`
-}
-
--func TestWatchAll(t *testing.T) {
-- c := NewClient(nil)
-- defer func() {
-- c.Delete("watch_foo", true)
-- }()
--
-- go setHelper("watch_foo/foo", "bar", c)
+-type VersionInfo struct {
+- // Kernel version.
+- KernelVersion string `json:"kernel_version"`
-
-- resp, err := c.Watch("watch_foo", 0, true, nil, nil)
-- if err != nil {
-- t.Fatal(err)
-- }
-- if !(resp.Node.Key == "/watch_foo/foo" && resp.Node.Value == "bar") {
-- t.Fatalf("WatchAll 1 failed: %#v", resp)
-- }
+- // OS image being used for cadvisor container, or host image if running on host directly.
+- ContainerOsVersion string `json:"container_os_version"`
-
-- go setHelper("watch_foo/foo", "bar", c)
+- // Docker version.
+- DockerVersion string `json:"docker_version"`
-
-- resp, err = c.Watch("watch_foo", resp.Node.ModifiedIndex+1, true, nil, nil)
-- if err != nil {
-- t.Fatal(err)
-- }
-- if !(resp.Node.Key == "/watch_foo/foo" && resp.Node.Value == "bar") {
-- t.Fatalf("WatchAll 2 failed: %#v", resp)
-- }
+- // cAdvisor version.
+- CadvisorVersion string `json:"cadvisor_version"`
+-}
-
-- ch := make(chan *Response, 10)
-- stop := make(chan bool, 1)
+-type MachineInfoFactory interface {
+- GetMachineInfo() (*MachineInfo, error)
+- GetVersionInfo() (*VersionInfo, error)
+-}
+diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/info/test/datagen.go b/Godeps/_workspace/src/github.com/google/cadvisor/info/test/datagen.go
+deleted file mode 100644
+index bb0b2ff..0000000
+--- a/Godeps/_workspace/src/github.com/google/cadvisor/info/test/datagen.go
++++ /dev/null
+@@ -1,78 +0,0 @@
+-// Copyright 2014 Google Inc. All Rights Reserved.
+-//
+-// Licensed under the Apache License, Version 2.0 (the "License");
+-// you may not use this file except in compliance with the License.
+-// You may obtain a copy of the License at
+-//
+-// http://www.apache.org/licenses/LICENSE-2.0
+-//
+-// Unless required by applicable law or agreed to in writing, software
+-// distributed under the License is distributed on an "AS IS" BASIS,
+-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-// See the License for the specific language governing permissions and
+-// limitations under the License.
-
-- routineNum := runtime.NumGoroutine()
+-package test
-
-- go setLoop("watch_foo/foo", "bar", c)
+-import (
+- "fmt"
+- "math/rand"
+- "time"
-
-- go receiver(ch, stop)
+- "github.com/google/cadvisor/info"
+-)
-
-- _, err = c.Watch("watch_foo", 0, true, ch, stop)
-- if err != ErrWatchStoppedByUser {
-- t.Fatalf("Watch returned a non-user stop error")
+-func GenerateRandomStats(numStats, numCores int, duration time.Duration) []*info.ContainerStats {
+- ret := make([]*info.ContainerStats, numStats)
+- perCoreUsages := make([]uint64, numCores)
+- currentTime := time.Now()
+- for i := range perCoreUsages {
+- perCoreUsages[i] = uint64(rand.Int63n(1000))
- }
+- for i := 0; i < numStats; i++ {
+- stats := new(info.ContainerStats)
+- stats.Cpu = new(info.CpuStats)
+- stats.Memory = new(info.MemoryStats)
+- stats.Timestamp = currentTime
+- currentTime = currentTime.Add(duration)
-
-- if newRoutineNum := runtime.NumGoroutine(); newRoutineNum != routineNum {
-- t.Fatalf("Routine numbers differ after watch stop: %v, %v", routineNum, newRoutineNum)
+- percore := make([]uint64, numCores)
+- for i := range perCoreUsages {
+- perCoreUsages[i] += uint64(rand.Int63n(1000))
+- percore[i] = perCoreUsages[i]
+- stats.Cpu.Usage.Total += percore[i]
+- }
+- stats.Cpu.Usage.PerCpu = percore
+- stats.Cpu.Usage.User = stats.Cpu.Usage.Total
+- stats.Cpu.Usage.System = 0
+- stats.Memory.Usage = uint64(rand.Int63n(4096))
+- ret[i] = stats
- }
+- return ret
-}
-
--func setHelper(key, value string, c *Client) {
-- time.Sleep(time.Second)
-- c.Set(key, value, 100)
--}
--
--func setLoop(key, value string, c *Client) {
-- time.Sleep(time.Second)
-- for i := 0; i < 10; i++ {
-- newValue := fmt.Sprintf("%s_%v", value, i)
-- c.Set(key, newValue, 100)
-- time.Sleep(time.Second / 10)
+-func GenerateRandomContainerSpec(numCores int) info.ContainerSpec {
+- ret := info.ContainerSpec{
+- Cpu: info.CpuSpec{},
+- Memory: info.MemorySpec{},
- }
+- ret.Cpu.Limit = uint64(1000 + rand.Int63n(2000))
+- ret.Cpu.MaxLimit = uint64(1000 + rand.Int63n(2000))
+- ret.Cpu.Mask = fmt.Sprintf("0-%d", numCores-1)
+- ret.Memory.Limit = uint64(4096 + rand.Int63n(4096))
+- return ret
-}
-
--func receiver(c chan *Response, stop chan bool) {
-- for i := 0; i < 10; i++ {
-- <-c
+-func GenerateRandomContainerInfo(containerName string, numCores int, query *info.ContainerInfoRequest, duration time.Duration) *info.ContainerInfo {
+- stats := GenerateRandomStats(query.NumStats, numCores, duration)
+- spec := GenerateRandomContainerSpec(numCores)
+-
+- ret := &info.ContainerInfo{
+- ContainerReference: info.ContainerReference{
+- Name: containerName,
+- },
+- Spec: spec,
+- Stats: stats,
- }
-- stop <- true
+- return ret
-}
-diff --git a/Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/LICENSE b/Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/LICENSE
+diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/info/version.go b/Godeps/_workspace/src/github.com/google/cadvisor/info/version.go
deleted file mode 100644
-index 5782c72..0000000
---- a/Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/LICENSE
+index 8ae9b22..0000000
+--- a/Godeps/_workspace/src/github.com/google/cadvisor/info/version.go
+++ /dev/null
-@@ -1,23 +0,0 @@
--Copyright (c) 2014, Elazar Leibovich
--All rights reserved.
--
--Redistribution and use in source and binary forms, with or without
--modification, are permitted provided that the following conditions are met:
--
--* Redistributions of source code must retain the above copyright notice, this
-- list of conditions and the following disclaimer.
+@@ -1,18 +0,0 @@
+-// Copyright 2014 Google Inc. All Rights Reserved.
+-//
+-// Licensed under the Apache License, Version 2.0 (the "License");
+-// you may not use this file except in compliance with the License.
+-// You may obtain a copy of the License at
+-//
+-// http://www.apache.org/licenses/LICENSE-2.0
+-//
+-// Unless required by applicable law or agreed to in writing, software
+-// distributed under the License is distributed on an "AS IS" BASIS,
+-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-// See the License for the specific language governing permissions and
+-// limitations under the License.
-
--* Redistributions in binary form must reproduce the above copyright notice,
-- this list of conditions and the following disclaimer in the documentation
-- and/or other materials provided with the distribution.
+-package info
-
--THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
--AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
--IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
--DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
--FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
--DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
--SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
--CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
--OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
--OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-diff --git a/Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/README.md b/Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/README.md
+-// Version of cAdvisor.
+-const VERSION = "0.5.0"
+diff --git a/Godeps/_workspace/src/github.com/google/gofuzz/.travis.yml b/Godeps/_workspace/src/github.com/google/gofuzz/.travis.yml
deleted file mode 100644
-index a3929a8..0000000
---- a/Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/README.md
+index 9384a54..0000000
+--- a/Godeps/_workspace/src/github.com/google/gofuzz/.travis.yml
+++ /dev/null
-@@ -1,18 +0,0 @@
--go-bindata-http
--===============
--
--Serve embedded files from [jteeuwen/go-bindata](https://github.com/jteeuwen/go-bindata) with `net/http`.
--
--[GoDoc](http://godoc.org/github.com/elazarl/go-bindata-assetfs)
--
--After running
--
-- $ go-bindata data/...
+@@ -1,12 +0,0 @@
+-language: go
-
--Use
+-go:
+- - 1.3
+- - 1.2
+- - tip
-
-- http.Handle("/",
-- http.FileServer(
-- &assetfs.AssetFS{Asset: Asset, AssetDir: AssetDir, Prefix: "data"}))
+-install:
+- - go get code.google.com/p/go.tools/cmd/cover
-
--to serve files embedded from the `data` directory.
-diff --git a/Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/assetfs.go b/Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/assetfs.go
+-script:
+- - go test -cover
+diff --git a/Godeps/_workspace/src/github.com/google/gofuzz/CONTRIBUTING.md b/Godeps/_workspace/src/github.com/google/gofuzz/CONTRIBUTING.md
deleted file mode 100644
-index 83cd94d..0000000
---- a/Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/assetfs.go
+index 51cf5cd..0000000
+--- a/Godeps/_workspace/src/github.com/google/gofuzz/CONTRIBUTING.md
+++ /dev/null
-@@ -1,141 +0,0 @@
--package assetfs
--
--import (
-- "bytes"
-- "errors"
-- "fmt"
-- "io"
-- "io/ioutil"
-- "net/http"
-- "os"
-- "path"
-- "path/filepath"
-- "time"
--)
+@@ -1,67 +0,0 @@
+-# How to contribute #
-
--// FakeFile implements os.FileInfo interface for a given path and size
--type FakeFile struct {
-- // Path is the path of this file
-- Path string
-- // Dir marks of the path is a directory
-- Dir bool
-- // Len is the length of the fake file, zero if it is a directory
-- Len int64
--}
+-We'd love to accept your patches and contributions to this project. There are
+-a just a few small guidelines you need to follow.
-
--func (f *FakeFile) Name() string {
-- _, name := filepath.Split(f.Path)
-- return name
--}
-
--func (f *FakeFile) Mode() os.FileMode {
-- mode := os.FileMode(0644)
-- if f.Dir {
-- return mode | os.ModeDir
-- }
-- return mode
--}
+-## Contributor License Agreement ##
-
--func (f *FakeFile) ModTime() time.Time {
-- return time.Unix(0, 0)
--}
+-Contributions to any Google project must be accompanied by a Contributor
+-License Agreement. This is not a copyright **assignment**, it simply gives
+-Google permission to use and redistribute your contributions as part of the
+-project.
-
--func (f *FakeFile) Size() int64 {
-- return f.Len
--}
+- * If you are an individual writing original source code and you're sure you
+- own the intellectual property, then you'll need to sign an [individual
+- CLA][].
-
--func (f *FakeFile) IsDir() bool {
-- return f.Mode().IsDir()
--}
+- * If you work for a company that wants to allow you to contribute your work,
+- then you'll need to sign a [corporate CLA][].
-
--func (f *FakeFile) Sys() interface{} {
-- return nil
--}
+-You generally only need to submit a CLA once, so if you've already submitted
+-one (even if it was for a different project), you probably don't need to do it
+-again.
-
--// AssetFile implements http.File interface for a no-directory file with content
--type AssetFile struct {
-- *bytes.Reader
-- io.Closer
-- FakeFile
--}
+-[individual CLA]: https://developers.google.com/open-source/cla/individual
+-[corporate CLA]: https://developers.google.com/open-source/cla/corporate
-
--func NewAssetFile(name string, content []byte) *AssetFile {
-- return &AssetFile{
-- bytes.NewReader(content),
-- ioutil.NopCloser(nil),
-- FakeFile{name, false, int64(len(content))}}
--}
-
--func (f *AssetFile) Readdir(count int) ([]os.FileInfo, error) {
-- return nil, errors.New("not a directory")
--}
+-## Submitting a patch ##
-
--func (f *AssetFile) Stat() (os.FileInfo, error) {
-- return f, nil
--}
+- 1. It's generally best to start by opening a new issue describing the bug or
+- feature you're intending to fix. Even if you think it's relatively minor,
+- it's helpful to know what people are working on. Mention in the initial
+- issue that you are planning to work on that bug or feature so that it can
+- be assigned to you.
-
--// AssetDirectory implements http.File interface for a directory
--type AssetDirectory struct {
-- AssetFile
-- ChildrenRead int
-- Children []os.FileInfo
--}
+- 1. Follow the normal process of [forking][] the project, and setup a new
+- branch to work in. It's important that each group of changes be done in
+- separate branches in order to ensure that a pull request only includes the
+- commits related to that bug or feature.
-
--func NewAssetDirectory(name string, children []string, fs *AssetFS) *AssetDirectory {
-- fileinfos := make([]os.FileInfo, 0, len(children))
-- for _, child := range children {
-- _, err := fs.AssetDir(filepath.Join(name, child))
-- fileinfos = append(fileinfos, &FakeFile{child, err == nil, 0})
-- }
-- return &AssetDirectory{
-- AssetFile{
-- bytes.NewReader(nil),
-- ioutil.NopCloser(nil),
-- FakeFile{name, true, 0},
-- },
-- 0,
-- fileinfos}
--}
+- 1. Go makes it very simple to ensure properly formatted code, so always run
+- `go fmt` on your code before committing it. You should also run
+- [golint][] over your code. As noted in the [golint readme][], it's not
+- strictly necessary that your code be completely "lint-free", but this will
+- help you find common style issues.
-
--func (f *AssetDirectory) Readdir(count int) ([]os.FileInfo, error) {
-- fmt.Println(f, count)
-- if count <= 0 {
-- return f.Children, nil
-- }
-- if f.ChildrenRead+count > len(f.Children) {
-- count = len(f.Children) - f.ChildrenRead
-- }
-- rv := f.Children[f.ChildrenRead : f.ChildrenRead+count]
-- f.ChildrenRead += count
-- return rv, nil
--}
+- 1. Any significant changes should almost always be accompanied by tests. The
+- project already has good test coverage, so look at some of the existing
+- tests if you're unsure how to go about it. [gocov][] and [gocov-html][]
+- are invaluable tools for seeing which parts of your code aren't being
+- exercised by your tests.
-
--func (f *AssetDirectory) Stat() (os.FileInfo, error) {
-- return f, nil
--}
+- 1. Do your best to have [well-formed commit messages][] for each change.
+- This provides consistency throughout the project, and ensures that commit
+- messages are able to be formatted properly by various git tools.
-
--// AssetFS implements http.FileSystem, allowing
--// embedded files to be served from net/http package.
--type AssetFS struct {
-- // Asset should return content of file in path if exists
-- Asset func(path string) ([]byte, error)
-- // AssetDir should return list of files in the path
-- AssetDir func(path string) ([]string, error)
-- // Prefix would be prepended to http requests
-- Prefix string
--}
+- 1. Finally, push the commits to your fork and submit a [pull request][].
-
--func (fs *AssetFS) Open(name string) (http.File, error) {
-- name = path.Join(fs.Prefix, name)
-- if len(name) > 0 && name[0] == '/' {
-- name = name[1:]
-- }
-- if children, err := fs.AssetDir(name); err == nil {
-- return NewAssetDirectory(name, children, fs), nil
-- }
-- b, err := fs.Asset(name)
-- if err != nil {
-- return nil, err
-- }
-- return NewAssetFile(name, b), nil
--}
-diff --git a/Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/doc.go b/Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/doc.go
-deleted file mode 100644
-index a664249..0000000
---- a/Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/doc.go
-+++ /dev/null
-@@ -1,13 +0,0 @@
--// assetfs allows packages to serve static content embedded
--// with the go-bindata tool with the standard net/http package.
--//
--// See https://github.com/jteeuwen/go-bindata for more information
--// about embedding binary data with go-bindata.
--//
--// Usage example, after running
--// $ go-bindata data/...
--// use:
--// http.Handle("/",
--// http.FileServer(
--// &assetfs.AssetFS{Asset: Asset, AssetDir: AssetDir, Prefix: "data"}))
--package assetfs
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/.gitignore b/Godeps/_workspace/src/github.com/emicklei/go-restful/.gitignore
+-[forking]: https://help.github.com/articles/fork-a-repo
+-[golint]: https://github.com/golang/lint
+-[golint readme]: https://github.com/golang/lint/blob/master/README
+-[gocov]: https://github.com/axw/gocov
+-[gocov-html]: https://github.com/matm/gocov-html
+-[well-formed commit messages]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
+-[squash]: http://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits
+-[pull request]: https://help.github.com/articles/creating-a-pull-request
+diff --git a/Godeps/_workspace/src/github.com/google/gofuzz/LICENSE b/Godeps/_workspace/src/github.com/google/gofuzz/LICENSE
deleted file mode 100644
-index cece7be..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/.gitignore
+index d645695..0000000
+--- a/Godeps/_workspace/src/github.com/google/gofuzz/LICENSE
+++ /dev/null
-@@ -1,70 +0,0 @@
--# Compiled Object files, Static and Dynamic libs (Shared Objects)
--*.o
--*.a
--*.so
+@@ -1,202 +0,0 @@
-
--# Folders
--_obj
--_test
+- Apache License
+- Version 2.0, January 2004
+- http://www.apache.org/licenses/
-
--# Architecture specific extensions/prefixes
--*.[568vq]
--[568vq].out
+- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
--*.cgo1.go
--*.cgo2.c
--_cgo_defun.c
--_cgo_gotypes.go
--_cgo_export.*
+- 1. Definitions.
-
--_testmain.go
+- "License" shall mean the terms and conditions for use, reproduction,
+- and distribution as defined by Sections 1 through 9 of this document.
-
--*.exe
+- "Licensor" shall mean the copyright owner or entity authorized by
+- the copyright owner that is granting the License.
-
--restful.html
+- "Legal Entity" shall mean the union of the acting entity and all
+- other entities that control, are controlled by, or are under common
+- control with that entity. For the purposes of this definition,
+- "control" means (i) the power, direct or indirect, to cause the
+- direction or management of such entity, whether by contract or
+- otherwise, or (ii) ownership of fifty percent (50%) or more of the
+- outstanding shares, or (iii) beneficial ownership of such entity.
-
--*.out
+- "You" (or "Your") shall mean an individual or Legal Entity
+- exercising permissions granted by this License.
-
--tmp.prof
+- "Source" form shall mean the preferred form for making modifications,
+- including but not limited to software source code, documentation
+- source, and configuration files.
-
--go-restful.test
+- "Object" form shall mean any form resulting from mechanical
+- transformation or translation of a Source form, including but
+- not limited to compiled object code, generated documentation,
+- and conversions to other media types.
-
--examples/restful-basic-authentication
+- "Work" shall mean the work of authorship, whether in Source or
+- Object form, made available under the License, as indicated by a
+- copyright notice that is included in or attached to the work
+- (an example is provided in the Appendix below).
-
--examples/restful-encoding-filter
+- "Derivative Works" shall mean any work, whether in Source or Object
+- form, that is based on (or derived from) the Work and for which the
+- editorial revisions, annotations, elaborations, or other modifications
+- represent, as a whole, an original work of authorship. For the purposes
+- of this License, Derivative Works shall not include works that remain
+- separable from, or merely link (or bind by name) to the interfaces of,
+- the Work and Derivative Works thereof.
-
--examples/restful-filters
+- "Contribution" shall mean any work of authorship, including
+- the original version of the Work and any modifications or additions
+- to that Work or Derivative Works thereof, that is intentionally
+- submitted to Licensor for inclusion in the Work by the copyright owner
+- or by an individual or Legal Entity authorized to submit on behalf of
+- the copyright owner. For the purposes of this definition, "submitted"
+- means any form of electronic, verbal, or written communication sent
+- to the Licensor or its representatives, including but not limited to
+- communication on electronic mailing lists, source code control systems,
+- and issue tracking systems that are managed by, or on behalf of, the
+- Licensor for the purpose of discussing and improving the Work, but
+- excluding communication that is conspicuously marked or otherwise
+- designated in writing by the copyright owner as "Not a Contribution."
-
--examples/restful-hello-world
+- "Contributor" shall mean Licensor and any individual or Legal Entity
+- on behalf of whom a Contribution has been received by Licensor and
+- subsequently incorporated within the Work.
-
--examples/restful-resource-functions
+- 2. Grant of Copyright License. Subject to the terms and conditions of
+- this License, each Contributor hereby grants to You a perpetual,
+- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+- copyright license to reproduce, prepare Derivative Works of,
+- publicly display, publicly perform, sublicense, and distribute the
+- Work and such Derivative Works in Source or Object form.
-
--examples/restful-serve-static
+- 3. Grant of Patent License. Subject to the terms and conditions of
+- this License, each Contributor hereby grants to You a perpetual,
+- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+- (except as stated in this section) patent license to make, have made,
+- use, offer to sell, sell, import, and otherwise transfer the Work,
+- where such license applies only to those patent claims licensable
+- by such Contributor that are necessarily infringed by their
+- Contribution(s) alone or by combination of their Contribution(s)
+- with the Work to which such Contribution(s) was submitted. If You
+- institute patent litigation against any entity (including a
+- cross-claim or counterclaim in a lawsuit) alleging that the Work
+- or a Contribution incorporated within the Work constitutes direct
+- or contributory patent infringement, then any patent licenses
+- granted to You under this License for that Work shall terminate
+- as of the date such litigation is filed.
-
--examples/restful-user-service
+- 4. Redistribution. You may reproduce and distribute copies of the
+- Work or Derivative Works thereof in any medium, with or without
+- modifications, and in Source or Object form, provided that You
+- meet the following conditions:
-
--*.DS_Store
--examples/restful-user-resource
+- (a) You must give any other recipients of the Work or
+- Derivative Works a copy of this License; and
-
--examples/restful-multi-containers
+- (b) You must cause any modified files to carry prominent notices
+- stating that You changed the files; and
-
--examples/restful-form-handling
+- (c) You must retain, in the Source form of any Derivative Works
+- that You distribute, all copyright, patent, trademark, and
+- attribution notices from the Source form of the Work,
+- excluding those notices that do not pertain to any part of
+- the Derivative Works; and
-
--examples/restful-CORS-filter
+- (d) If the Work includes a "NOTICE" text file as part of its
+- distribution, then any Derivative Works that You distribute must
+- include a readable copy of the attribution notices contained
+- within such NOTICE file, excluding those notices that do not
+- pertain to any part of the Derivative Works, in at least one
+- of the following places: within a NOTICE text file distributed
+- as part of the Derivative Works; within the Source form or
+- documentation, if provided along with the Derivative Works; or,
+- within a display generated by the Derivative Works, if and
+- wherever such third-party notices normally appear. The contents
+- of the NOTICE file are for informational purposes only and
+- do not modify the License. You may add Your own attribution
+- notices within Derivative Works that You distribute, alongside
+- or as an addendum to the NOTICE text from the Work, provided
+- that such additional attribution notices cannot be construed
+- as modifying the License.
-
--examples/restful-options-filter
+- You may add Your own copyright statement to Your modifications and
+- may provide additional or different license terms and conditions
+- for use, reproduction, or distribution of Your modifications, or
+- for any such Derivative Works as a whole, provided Your use,
+- reproduction, and distribution of the Work otherwise complies with
+- the conditions stated in this License.
-
--examples/restful-curly-router
+- 5. Submission of Contributions. Unless You explicitly state otherwise,
+- any Contribution intentionally submitted for inclusion in the Work
+- by You to the Licensor shall be under the terms and conditions of
+- this License, without any additional terms or conditions.
+- Notwithstanding the above, nothing herein shall supersede or modify
+- the terms of any separate license agreement you may have executed
+- with Licensor regarding such Contributions.
-
--examples/restful-cpuprofiler-service
+- 6. Trademarks. This License does not grant permission to use the trade
+- names, trademarks, service marks, or product names of the Licensor,
+- except as required for reasonable and customary use in describing the
+- origin of the Work and reproducing the content of the NOTICE file.
-
--examples/restful-pre-post-filters
+- 7. Disclaimer of Warranty. Unless required by applicable law or
+- agreed to in writing, Licensor provides the Work (and each
+- Contributor provides its Contributions) on an "AS IS" BASIS,
+- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+- implied, including, without limitation, any warranties or conditions
+- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+- PARTICULAR PURPOSE. You are solely responsible for determining the
+- appropriateness of using or redistributing the Work and assume any
+- risks associated with Your exercise of permissions under this License.
-
--curly.prof
+- 8. Limitation of Liability. In no event and under no legal theory,
+- whether in tort (including negligence), contract, or otherwise,
+- unless required by applicable law (such as deliberate and grossly
+- negligent acts) or agreed to in writing, shall any Contributor be
+- liable to You for damages, including any direct, indirect, special,
+- incidental, or consequential damages of any character arising as a
+- result of this License or out of the use or inability to use the
+- Work (including but not limited to damages for loss of goodwill,
+- work stoppage, computer failure or malfunction, or any and all
+- other commercial damages or losses), even if such Contributor
+- has been advised of the possibility of such damages.
-
--examples/restful-NCSA-logging
+- 9. Accepting Warranty or Additional Liability. While redistributing
+- the Work or Derivative Works thereof, You may choose to offer,
+- and charge a fee for, acceptance of support, warranty, indemnity,
+- or other liability obligations and/or rights consistent with this
+- License. However, in accepting such obligations, You may act only
+- on Your own behalf and on Your sole responsibility, not on behalf
+- of any other Contributor, and only if You agree to indemnify,
+- defend, and hold each Contributor harmless for any liability
+- incurred by, or claims asserted against, such Contributor by reason
+- of your accepting any such warranty or additional liability.
-
--examples/restful-html-template
+- END OF TERMS AND CONDITIONS
-
--s.html
--restful-path-tail
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/CHANGES.md b/Godeps/_workspace/src/github.com/emicklei/go-restful/CHANGES.md
-deleted file mode 100644
-index a04408b..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/CHANGES.md
-+++ /dev/null
-@@ -1,121 +0,0 @@
--Change history of go-restful
--=
--2014-10-31
--- (api change) ReturnsError -> Returns
--- (api add) RouteBuilder.Do(aBuilder) for DRY use of RouteBuilder
--- fix swagger nested structs
--- sort Swagger response messages by code
+- APPENDIX: How to apply the Apache License to your work.
-
--2014-10-23
--- (api add) ReturnsError allows you to document Http codes in swagger
--- fixed problem with greedy CurlyRouter
--- (api add) Access-Control-Max-Age in CORS
--- add tracing functionality (injectable) for debugging purposes
--- support JSON parse 64bit int
--- fix empty parameters for swagger
--- WebServicesUrl is now optional for swagger
--- fixed duplicate AccessControlAllowOrigin in CORS
--- (api change) expose ServeMux in container
--- (api add) added AllowedDomains in CORS
--- (api add) ParameterNamed for detailed documentation
+- To apply the Apache License to your work, attach the following
+- boilerplate notice, with the fields enclosed by brackets "[]"
+- replaced with your own identifying information. (Don't include
+- the brackets!) The text should be enclosed in the appropriate
+- comment syntax for the file format. We also recommend that a
+- file or class name and description of purpose be included on the
+- same "printed page" as the copyright notice for easier
+- identification within third-party archives.
-
--2014-04-16
--- (api add) expose constructor of Request for testing.
+- Copyright [yyyy] [name of copyright owner]
-
--2014-06-27
--- (api add) ParameterNamed gives access to a Parameter definition and its data (for further specification).
--- (api add) SetCacheReadEntity allow scontrol over whether or not the request body is being cached (default true for compatibility reasons).
+- Licensed under the Apache License, Version 2.0 (the "License");
+- you may not use this file except in compliance with the License.
+- You may obtain a copy of the License at
-
--2014-07-03
--- (api add) CORS can be configured with a list of allowed domains
+- http://www.apache.org/licenses/LICENSE-2.0
-
--2014-03-12
--- (api add) Route path parameters can use wildcard or regular expressions. (requires CurlyRouter)
+- Unless required by applicable law or agreed to in writing, software
+- distributed under the License is distributed on an "AS IS" BASIS,
+- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- See the License for the specific language governing permissions and
+- limitations under the License.
+diff --git a/Godeps/_workspace/src/github.com/google/gofuzz/README.md b/Godeps/_workspace/src/github.com/google/gofuzz/README.md
+deleted file mode 100644
+index 68fcf2c..0000000
+--- a/Godeps/_workspace/src/github.com/google/gofuzz/README.md
++++ /dev/null
+@@ -1,71 +0,0 @@
+-gofuzz
+-======
-
--2014-02-26
--- (api add) Request now provides information about the matched Route, see method SelectedRoutePath
+-gofuzz is a library for populating go objects with random values.
-
--2014-02-17
--- (api change) renamed parameter constants (go-lint checks)
+-[](https://godoc.org/github.com/google/gofuzz)
+-[](https://travis-ci.org/google/gofuzz)
-
--2014-01-10
-- - (api add) support for CloseNotify, see http://golang.org/pkg/net/http/#CloseNotifier
+-This is useful for testing:
-
--2014-01-07
-- - (api change) Write* methods in Response now return the error or nil.
-- - added example of serving HTML from a Go template.
-- - fixed comparing Allowed headers in CORS (is now case-insensitive)
+-* Do your project's objects really serialize/unserialize correctly in all cases?
+-* Is there an incorrectly formatted object that will cause your project to panic?
-
--2013-11-13
-- - (api add) Response knows how many bytes are written to the response body.
+-Import with ```import "github.com/google/gofuzz"```
-
--2013-10-29
-- - (api add) RecoverHandler(handler RecoverHandleFunction) to change how panic recovery is handled. Default behavior is to log and return a stacktrace. This may be a security issue as it exposes sourcecode information.
+-You can use it on single variables:
+-```
+-f := fuzz.New()
+-var myInt int
+-f.Fuzz(&myInt) // myInt gets a random value.
+-```
-
--2013-10-04
-- - (api add) Response knows what HTTP status has been written
-- - (api add) Request can have attributes (map of string->interface, also called request-scoped variables
+-You can use it on maps:
+-```
+-f := fuzz.New().NilChance(0).NumElements(1, 1)
+-var myMap map[ComplexKeyType]string
+-f.Fuzz(&myMap) // myMap will have exactly one element.
+-```
-
--2013-09-12
-- - (api change) Router interface simplified
-- - Implemented CurlyRouter, a Router that does not use|allow regular expressions in paths
+-Customize the chance of getting a nil pointer:
+-```
+-f := fuzz.New().NilChance(.5)
+-var fancyStruct struct {
+- A, B, C, D *string
+-}
+-f.Fuzz(&fancyStruct) // About half the pointers should be set.
+-```
-
--2013-08-05
-- - add OPTIONS support
-- - add CORS support
+-You can even customize the randomization completely if needed:
+-```
+-type MyEnum string
+-const (
+- A MyEnum = "A"
+- B MyEnum = "B"
+-)
+-type MyInfo struct {
+- Type MyEnum
+- AInfo *string
+- BInfo *string
+-}
-
--2013-08-27
-- - fixed some reported issues (see github)
-- - (api change) deprecated use of WriteError; use WriteErrorString instead
+-f := fuzz.New().NilChance(0).Funcs(
+- func(e *MyInfo, c fuzz.Continue) {
+- switch c.Intn(2) {
+- case 0:
+- e.Type = A
+- c.Fuzz(&e.AInfo)
+- case 1:
+- e.Type = B
+- c.Fuzz(&e.BInfo)
+- }
+- },
+-)
-
--2014-04-15
-- - (fix) v1.0.1 tag: fix Issue 111: WriteErrorString
+-var myObject MyInfo
+-f.Fuzz(&myObject) // Type will correspond to whether A or B info is set.
+-```
-
--2013-08-08
-- - (api add) Added implementation Container: a WebServices collection with its own http.ServeMux allowing multiple endpoints per program. Existing uses of go-restful will register their services to the DefaultContainer.
-- - (api add) the swagger package has be extended to have a UI per container.
-- - if panic is detected then a small stack trace is printed (thanks to runner-mei)
-- - (api add) WriteErrorString to Response
+-See more examples in ```example_test.go```.
-
--Important API changes:
+-Happy testing!
+diff --git a/Godeps/_workspace/src/github.com/google/gofuzz/doc.go b/Godeps/_workspace/src/github.com/google/gofuzz/doc.go
+deleted file mode 100644
+index 9f9956d..0000000
+--- a/Godeps/_workspace/src/github.com/google/gofuzz/doc.go
++++ /dev/null
+@@ -1,18 +0,0 @@
+-/*
+-Copyright 2014 Google Inc. All rights reserved.
-
-- - (api remove) package variable DoNotRecover no longer works ; use restful.DefaultContainer.DoNotRecover(true) instead.
-- - (api remove) package variable EnableContentEncoding no longer works ; use restful.DefaultContainer.EnableContentEncoding(true) instead.
--
--
--2013-07-06
+-Licensed under the Apache License, Version 2.0 (the "License");
+-you may not use this file except in compliance with the License.
+-You may obtain a copy of the License at
-
-- - (api add) Added support for response encoding (gzip and deflate(zlib)). This feature is disabled on default (for backwards compatibility). Use restful.EnableContentEncoding = true in your initialization to enable this feature.
+- http://www.apache.org/licenses/LICENSE-2.0
-
--2013-06-19
+-Unless required by applicable law or agreed to in writing, software
+-distributed under the License is distributed on an "AS IS" BASIS,
+-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-See the License for the specific language governing permissions and
+-limitations under the License.
+-*/
-
-- - (improve) DoNotRecover option, moved request body closer, improved ReadEntity
+-// Package fuzz is a library for populating go objects with random values.
+-package fuzz
+diff --git a/Godeps/_workspace/src/github.com/google/gofuzz/example_test.go b/Godeps/_workspace/src/github.com/google/gofuzz/example_test.go
+deleted file mode 100644
+index 792707a..0000000
+--- a/Godeps/_workspace/src/github.com/google/gofuzz/example_test.go
++++ /dev/null
+@@ -1,225 +0,0 @@
+-/*
+-Copyright 2014 Google Inc. All rights reserved.
-
--2013-06-03
+-Licensed under the Apache License, Version 2.0 (the "License");
+-you may not use this file except in compliance with the License.
+-You may obtain a copy of the License at
-
-- - (api change) removed Dispatcher interface, hide PathExpression
-- - changed receiver names of type functions to be more idiomatic Go
+- http://www.apache.org/licenses/LICENSE-2.0
-
--2013-06-02
+-Unless required by applicable law or agreed to in writing, software
+-distributed under the License is distributed on an "AS IS" BASIS,
+-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-See the License for the specific language governing permissions and
+-limitations under the License.
+-*/
-
-- - (optimize) Cache the RegExp compilation of Paths.
+-package fuzz_test
-
--2013-05-22
--
-- - (api add) Added support for request/response filter functions
+-import (
+- "encoding/json"
+- "fmt"
+- "math/rand"
-
--2013-05-18
+- "github.com/google/gofuzz"
+-)
-
+-func ExampleSimple() {
+- type MyType struct {
+- A string
+- B string
+- C int
+- D struct {
+- E float64
+- }
+- }
-
-- - (api add) Added feature to change the default Http Request Dispatch function (travis cline)
-- - (api change) Moved Swagger Webservice to swagger package (see example restful-user)
+- f := fuzz.New()
+- object := MyType{}
-
--[2012-11-14 .. 2013-05-18>
--
-- - See https://github.com/emicklei/go-restful/commits
+- uniqueObjects := map[MyType]int{}
-
--2012-11-14
+- for i := 0; i < 1000; i++ {
+- f.Fuzz(&object)
+- uniqueObjects[object]++
+- }
+- fmt.Printf("Got %v unique objects.\n", len(uniqueObjects))
+- // Output:
+- // Got 1000 unique objects.
+-}
-
-- - Initial commit
+-func ExampleCustom() {
+- type MyType struct {
+- A int
+- B string
+- }
-
+- counter := 0
+- f := fuzz.New().Funcs(
+- func(i *int, c fuzz.Continue) {
+- *i = counter
+- counter++
+- },
+- )
+- object := MyType{}
-
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/LICENSE b/Godeps/_workspace/src/github.com/emicklei/go-restful/LICENSE
-deleted file mode 100644
-index ece7ec6..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/LICENSE
-+++ /dev/null
-@@ -1,22 +0,0 @@
--Copyright (c) 2012,2013 Ernest Micklei
+- uniqueObjects := map[MyType]int{}
-
--MIT License
+- for i := 0; i < 100; i++ {
+- f.Fuzz(&object)
+- if object.A != i {
+- fmt.Printf("Unexpected value: %#v\n", object)
+- }
+- uniqueObjects[object]++
+- }
+- fmt.Printf("Got %v unique objects.\n", len(uniqueObjects))
+- // Output:
+- // Got 100 unique objects.
+-}
-
--Permission is hereby granted, free of charge, to any person obtaining
--a copy of this software and associated documentation files (the
--"Software"), to deal in the Software without restriction, including
--without limitation the rights to use, copy, modify, merge, publish,
--distribute, sublicense, and/or sell copies of the Software, and to
--permit persons to whom the Software is furnished to do so, subject to
--the following conditions:
+-func ExampleComplex() {
+- type OtherType struct {
+- A string
+- B string
+- }
+- type MyType struct {
+- Pointer *OtherType
+- Map map[string]OtherType
+- PointerMap *map[string]OtherType
+- Slice []OtherType
+- SlicePointer []*OtherType
+- PointerSlicePointer *[]*OtherType
+- }
-
--The above copyright notice and this permission notice shall be
--included in all copies or substantial portions of the Software.
+- f := fuzz.New().RandSource(rand.NewSource(0)).NilChance(0).NumElements(1, 1).Funcs(
+- func(o *OtherType, c fuzz.Continue) {
+- o.A = "Foo"
+- o.B = "Bar"
+- },
+- func(op **OtherType, c fuzz.Continue) {
+- *op = &OtherType{"A", "B"}
+- },
+- func(m map[string]OtherType, c fuzz.Continue) {
+- m["Works Because"] = OtherType{
+- "Fuzzer",
+- "Preallocated",
+- }
+- },
+- )
+- object := MyType{}
+- f.Fuzz(&object)
+- bytes, err := json.MarshalIndent(&object, "", " ")
+- if err != nil {
+- fmt.Printf("error: %v\n", err)
+- }
+- fmt.Printf("%s\n", string(bytes))
+- // Output:
+- // {
+- // "Pointer": {
+- // "A": "A",
+- // "B": "B"
+- // },
+- // "Map": {
+- // "Works Because": {
+- // "A": "Fuzzer",
+- // "B": "Preallocated"
+- // }
+- // },
+- // "PointerMap": {
+- // "Works Because": {
+- // "A": "Fuzzer",
+- // "B": "Preallocated"
+- // }
+- // },
+- // "Slice": [
+- // {
+- // "A": "Foo",
+- // "B": "Bar"
+- // }
+- // ],
+- // "SlicePointer": [
+- // {
+- // "A": "A",
+- // "B": "B"
+- // }
+- // ],
+- // "PointerSlicePointer": [
+- // {
+- // "A": "A",
+- // "B": "B"
+- // }
+- // ]
+- // }
+-}
-
--THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
--EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
--MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
--NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
--LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
--OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
--WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-\ No newline at end of file
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/README.md b/Godeps/_workspace/src/github.com/emicklei/go-restful/README.md
-deleted file mode 100644
-index 8af137d..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/README.md
-+++ /dev/null
-@@ -1,70 +0,0 @@
--go-restful
--==========
+-func ExampleMap() {
+- f := fuzz.New().NilChance(0).NumElements(1, 1)
+- var myMap map[struct{ A, B, C int }]string
+- f.Fuzz(&myMap)
+- fmt.Printf("myMap has %v element(s).\n", len(myMap))
+- // Output:
+- // myMap has 1 element(s).
+-}
-
--package for building REST-style Web Services using Google Go
+-func ExampleSingle() {
+- f := fuzz.New()
+- var i int
+- f.Fuzz(&i)
-
--REST asks developers to use HTTP methods explicitly and in a way that's consistent with the protocol definition. This basic REST design principle establishes a one-to-one mapping between create, read, update, and delete (CRUD) operations and HTTP methods. According to this mapping:
+- // Technically, we'd expect this to fail one out of 2 billion attempts...
+- fmt.Printf("(i == 0) == %v", i == 0)
+- // Output:
+- // (i == 0) == false
+-}
-
--- GET = Retrieve a representation of a resource
--- POST = Create if you are sending content to the server to create a subordinate of the specified resource collection, using some server-side algorithm.
--- PUT = Create if you are sending the full content of the specified resource (URI).
--- PUT = Update if you are updating the full content of the specified resource.
--- DELETE = Delete if you are requesting the server to delete the resource
--- PATCH = Update partial content of a resource
--- OPTIONS = Get information about the communication options for the request URI
--
--### Example
+-func ExampleEnum() {
+- type MyEnum string
+- const (
+- A MyEnum = "A"
+- B MyEnum = "B"
+- )
+- type MyInfo struct {
+- Type MyEnum
+- AInfo *string
+- BInfo *string
+- }
-
--```Go
--ws := new(restful.WebService)
--ws.
-- Path("/users").
-- Consumes(restful.MIME_XML, restful.MIME_JSON).
-- Produces(restful.MIME_JSON, restful.MIME_XML)
+- f := fuzz.New().NilChance(0).Funcs(
+- func(e *MyInfo, c fuzz.Continue) {
+- // Note c's embedded Rand allows for direct use.
+- // We could also use c.RandBool() here.
+- switch c.Intn(2) {
+- case 0:
+- e.Type = A
+- c.Fuzz(&e.AInfo)
+- case 1:
+- e.Type = B
+- c.Fuzz(&e.BInfo)
+- }
+- },
+- )
-
--ws.Route(ws.GET("/{user-id}").To(u.findUser).
-- Doc("get a user").
-- Param(ws.PathParameter("user-id", "identifier of the user").DataType("string")).
-- Writes(User{}))
--...
--
--func (u UserResource) findUser(request *restful.Request, response *restful.Response) {
-- id := request.PathParameter("user-id")
-- ...
+- for i := 0; i < 100; i++ {
+- var myObject MyInfo
+- f.Fuzz(&myObject)
+- switch myObject.Type {
+- case A:
+- if myObject.AInfo == nil {
+- fmt.Println("AInfo should have been set!")
+- }
+- if myObject.BInfo != nil {
+- fmt.Println("BInfo should NOT have been set!")
+- }
+- case B:
+- if myObject.BInfo == nil {
+- fmt.Println("BInfo should have been set!")
+- }
+- if myObject.AInfo != nil {
+- fmt.Println("AInfo should NOT have been set!")
+- }
+- default:
+- fmt.Println("Invalid enum value!")
+- }
+- }
+- // Output:
-}
--```
--
--[Full API of a UserResource](https://github.com/emicklei/go-restful/tree/master/examples/restful-user-resource.go)
--
--### Features
--
--- Routes for request → function mapping with path parameter (e.g. {id}) support
--- Configurable router:
-- - Routing algorithm after [JSR311](http://jsr311.java.net/nonav/releases/1.1/spec/spec.html) that is implemented using (but doest **not** accept) regular expressions (See RouterJSR311 which is used by default)
-- - Fast routing algorithm that allows static elements, regular expressions and dynamic parameters in the URL path (e.g. /meetings/{id} or /static/{subpath:*}, See CurlyRouter)
--- Request API for reading structs from JSON/XML and accesing parameters (path,query,header)
--- Response API for writing structs to JSON/XML and setting headers
--- Filters for intercepting the request → response flow on Service or Route level
--- Request-scoped variables using attributes
--- Containers for WebServices on different HTTP endpoints
--- Content encoding (gzip,deflate) of responses
--- Automatic responses on OPTIONS (using a filter)
--- Automatic CORS request handling (using a filter)
--- API declaration for Swagger UI (see swagger package)
--- Panic recovery to produce HTTP 500, customizable using RecoverHandler(...)
--
--### Resources
+diff --git a/Godeps/_workspace/src/github.com/google/gofuzz/fuzz.go b/Godeps/_workspace/src/github.com/google/gofuzz/fuzz.go
+deleted file mode 100644
+index 31c2838..0000000
+--- a/Godeps/_workspace/src/github.com/google/gofuzz/fuzz.go
++++ /dev/null
+@@ -1,366 +0,0 @@
+-/*
+-Copyright 2014 Google Inc. All rights reserved.
-
--- [Documentation on godoc.org](http://godoc.org/github.com/emicklei/go-restful)
--- [Code examples](https://github.com/emicklei/go-restful/tree/master/examples)
--- [Example posted on blog](http://ernestmicklei.com/2012/11/24/go-restful-first-working-example/)
--- [Design explained on blog](http://ernestmicklei.com/2012/11/11/go-restful-api-design/)
--- [sourcegraph](https://sourcegraph.com/github.com/emicklei/go-restful)
--- [gopkg.in](https://gopkg.in/emicklei/go-restful.v1)
--- [showcase: Mora - MongoDB REST Api server](https://github.com/emicklei/mora)
+-Licensed under the Apache License, Version 2.0 (the "License");
+-you may not use this file except in compliance with the License.
+-You may obtain a copy of the License at
-
--[](https://drone.io/github.com/emicklei/go-restful/latest)[](https://sourcegraph.com/github.com/emicklei/go-restful) [](https://sourcegraph.com/github.com/emicklei/go-restful) [](https://sourcegraph.com/github.com/emicklei/go-restful)
+- http://www.apache.org/licenses/LICENSE-2.0
-
--(c) 2012 - 2014, http://ernestmicklei.com. MIT License
+-Unless required by applicable law or agreed to in writing, software
+-distributed under the License is distributed on an "AS IS" BASIS,
+-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-See the License for the specific language governing permissions and
+-limitations under the License.
+-*/
-
--Type ```git shortlog -s``` for a full list of contributors.
-\ No newline at end of file
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/Srcfile b/Godeps/_workspace/src/github.com/emicklei/go-restful/Srcfile
-deleted file mode 100644
-index 16fd186..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/Srcfile
-+++ /dev/null
-@@ -1 +0,0 @@
--{"SkipDirs": ["examples"]}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/bench_curly_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/bench_curly_test.go
-deleted file mode 100644
-index db6a1a7..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/bench_curly_test.go
-+++ /dev/null
-@@ -1,51 +0,0 @@
--package restful
+-package fuzz
-
-import (
- "fmt"
-- "net/http"
-- "net/http/httptest"
-- "testing"
+- "math/rand"
+- "reflect"
+- "time"
-)
-
--func setupCurly(container *Container) []string {
-- wsCount := 26
-- rtCount := 26
-- urisCurly := []string{}
+-// fuzzFuncMap is a map from a type to a fuzzFunc that handles that type.
+-type fuzzFuncMap map[reflect.Type]reflect.Value
-
-- container.Router(CurlyRouter{})
-- for i := 0; i < wsCount; i++ {
-- root := fmt.Sprintf("/%s/{%s}/", string(i+97), string(i+97))
-- ws := new(WebService).Path(root)
-- for j := 0; j < rtCount; j++ {
-- sub := fmt.Sprintf("/%s2/{%s2}", string(j+97), string(j+97))
-- ws.Route(ws.GET(sub).Consumes("application/xml").Produces("application/xml").To(echoCurly))
+-// Fuzzer knows how to fill any object with random fields.
+-type Fuzzer struct {
+- fuzzFuncs fuzzFuncMap
+- r *rand.Rand
+- nilChance float64
+- minElements int
+- maxElements int
+-}
+-
+-// New returns a new Fuzzer. Customize your Fuzzer further by calling Funcs,
+-// RandSource, NilChance, or NumElements in any order.
+-func New() *Fuzzer {
+- f := &Fuzzer{
+- fuzzFuncs: fuzzFuncMap{},
+- r: rand.New(rand.NewSource(time.Now().UnixNano())),
+- nilChance: .2,
+- minElements: 1,
+- maxElements: 10,
+- }
+- return f
+-}
+-
+-// Funcs adds each entry in fuzzFuncs as a custom fuzzing function.
+-//
+-// Each entry in fuzzFuncs must be a function taking two parameters.
+-// The first parameter must be a pointer or map. It is the variable that
+-// function will fill with random data. The second parameter must be a
+-// fuzz.Continue, which will provide a source of randomness and a way
+-// to automatically continue fuzzing smaller pieces of the first parameter.
+-//
+-// These functions are called sensibly, e.g., if you wanted custom string
+-// fuzzing, the function `func(s *string, c fuzz.Continue)` would get
+-// called and passed the address of strings. Maps and pointers will always
+-// be made/new'd for you, ignoring the NilChange option. For slices, it
+-// doesn't make much sense to pre-create them--Fuzzer doesn't know how
+-// long you want your slice--so take a pointer to a slice, and make it
+-// yourself. (If you don't want your map/pointer type pre-made, take a
+-// pointer to it, and make it yourself.) See the examples for a range of
+-// custom functions.
+-func (f *Fuzzer) Funcs(fuzzFuncs ...interface{}) *Fuzzer {
+- for i := range fuzzFuncs {
+- v := reflect.ValueOf(fuzzFuncs[i])
+- if v.Kind() != reflect.Func {
+- panic("Need only funcs!")
- }
-- container.Add(ws)
-- for _, each := range ws.Routes() {
-- urisCurly = append(urisCurly, "http://bench.com"+each.Path)
+- t := v.Type()
+- if t.NumIn() != 2 || t.NumOut() != 0 {
+- panic("Need 2 in and 0 out params!")
+- }
+- argT := t.In(0)
+- switch argT.Kind() {
+- case reflect.Ptr, reflect.Map:
+- default:
+- panic("fuzzFunc must take pointer or map type")
+- }
+- if t.In(1) != reflect.TypeOf(Continue{}) {
+- panic("fuzzFunc's second parameter must be type fuzz.Continue")
- }
+- f.fuzzFuncs[argT] = v
+- }
+- return f
+-}
+-
+-// RandSource causes f to get values from the given source of randomness.
+-// Use if you want deterministic fuzzing.
+-func (f *Fuzzer) RandSource(s rand.Source) *Fuzzer {
+- f.r = rand.New(s)
+- return f
+-}
+-
+-// NilChance sets the probability of creating a nil pointer, map, or slice to
+-// 'p'. 'p' should be between 0 (no nils) and 1 (all nils), inclusive.
+-func (f *Fuzzer) NilChance(p float64) *Fuzzer {
+- if p < 0 || p > 1 {
+- panic("p should be between 0 and 1, inclusive.")
+- }
+- f.nilChance = p
+- return f
+-}
+-
+-// NumElements sets the minimum and maximum number of elements that will be
+-// added to a non-nil map or slice.
+-func (f *Fuzzer) NumElements(atLeast, atMost int) *Fuzzer {
+- if atLeast > atMost {
+- panic("atLeast must be <= atMost")
- }
-- return urisCurly
+- if atLeast < 0 {
+- panic("atLeast must be >= 0")
+- }
+- f.minElements = atLeast
+- f.maxElements = atMost
+- return f
-}
-
--func echoCurly(req *Request, resp *Response) {}
--
--func BenchmarkManyCurly(b *testing.B) {
-- container := NewContainer()
-- urisCurly := setupCurly(container)
-- b.ResetTimer()
-- for t := 0; t < b.N; t++ {
-- for r := 0; r < 1000; r++ {
-- for _, each := range urisCurly {
-- sendNoReturnTo(each, container, t)
-- }
-- }
+-func (f *Fuzzer) genElementCount() int {
+- if f.minElements == f.maxElements {
+- return f.minElements
- }
+- return f.minElements + f.r.Intn(f.maxElements-f.minElements)
-}
-
--func sendNoReturnTo(address string, container *Container, t int) {
-- httpRequest, _ := http.NewRequest("GET", address, nil)
-- httpRequest.Header.Set("Accept", "application/xml")
-- httpWriter := httptest.NewRecorder()
-- container.dispatch(httpWriter, httpRequest)
+-func (f *Fuzzer) genShouldFill() bool {
+- return f.r.Float64() > f.nilChance
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/bench_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/bench_test.go
-deleted file mode 100644
-index 3e77c2d..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/bench_test.go
-+++ /dev/null
-@@ -1,43 +0,0 @@
--package restful
--
--import (
-- "fmt"
-- "io"
-- "testing"
--)
--
--var uris = []string{}
-
--func setup(container *Container) {
-- wsCount := 26
-- rtCount := 26
+-// Fuzz recursively fills all of obj's fields with something random.
+-// Not safe for cyclic or tree-like structs!
+-// obj must be a pointer. Only exported (public) fields can be set (thanks, golang :/ )
+-// Intended for tests, so will panic on bad input or unimplemented fields.
+-func (f *Fuzzer) Fuzz(obj interface{}) {
+- v := reflect.ValueOf(obj)
+- if v.Kind() != reflect.Ptr {
+- panic("needed ptr!")
+- }
+- v = v.Elem()
+- f.doFuzz(v)
+-}
-
-- for i := 0; i < wsCount; i++ {
-- root := fmt.Sprintf("/%s/{%s}/", string(i+97), string(i+97))
-- ws := new(WebService).Path(root)
-- for j := 0; j < rtCount; j++ {
-- sub := fmt.Sprintf("/%s2/{%s2}", string(j+97), string(j+97))
-- ws.Route(ws.GET(sub).To(echo))
+-func (f *Fuzzer) doFuzz(v reflect.Value) {
+- if !v.CanSet() {
+- return
+- }
+- // Check for both pointer and non-pointer custom functions.
+- if v.CanAddr() && f.tryCustom(v.Addr()) {
+- return
+- }
+- if f.tryCustom(v) {
+- return
+- }
+- if fn, ok := fillFuncMap[v.Kind()]; ok {
+- fn(v, f.r)
+- return
+- }
+- switch v.Kind() {
+- case reflect.Map:
+- if f.genShouldFill() {
+- v.Set(reflect.MakeMap(v.Type()))
+- n := f.genElementCount()
+- for i := 0; i < n; i++ {
+- key := reflect.New(v.Type().Key()).Elem()
+- f.doFuzz(key)
+- val := reflect.New(v.Type().Elem()).Elem()
+- f.doFuzz(val)
+- v.SetMapIndex(key, val)
+- }
+- return
- }
-- container.Add(ws)
-- for _, each := range ws.Routes() {
-- uris = append(uris, "http://bench.com"+each.Path)
+- v.Set(reflect.Zero(v.Type()))
+- case reflect.Ptr:
+- if f.genShouldFill() {
+- v.Set(reflect.New(v.Type().Elem()))
+- f.doFuzz(v.Elem())
+- return
+- }
+- v.Set(reflect.Zero(v.Type()))
+- case reflect.Slice:
+- if f.genShouldFill() {
+- n := f.genElementCount()
+- v.Set(reflect.MakeSlice(v.Type(), n, n))
+- for i := 0; i < n; i++ {
+- f.doFuzz(v.Index(i))
+- }
+- return
+- }
+- v.Set(reflect.Zero(v.Type()))
+- case reflect.Struct:
+- for i := 0; i < v.NumField(); i++ {
+- f.doFuzz(v.Field(i))
- }
+- case reflect.Array:
+- fallthrough
+- case reflect.Chan:
+- fallthrough
+- case reflect.Func:
+- fallthrough
+- case reflect.Interface:
+- fallthrough
+- default:
+- panic(fmt.Sprintf("Can't handle %#v", v.Interface()))
- }
-}
-
--func echo(req *Request, resp *Response) {
-- io.WriteString(resp.ResponseWriter, "echo")
--}
+-// tryCustom searches for custom handlers, and returns true iff it finds a match
+-// and successfully randomizes v.
+-func (f *Fuzzer) tryCustom(v reflect.Value) bool {
+- doCustom, ok := f.fuzzFuncs[v.Type()]
+- if !ok {
+- return false
+- }
-
--func BenchmarkMany(b *testing.B) {
-- container := NewContainer()
-- setup(container)
-- b.ResetTimer()
-- for t := 0; t < b.N; t++ {
-- for _, each := range uris {
-- // println(each)
-- sendItTo(each, container)
+- switch v.Kind() {
+- case reflect.Ptr:
+- if v.IsNil() {
+- if !v.CanSet() {
+- return false
+- }
+- v.Set(reflect.New(v.Type().Elem()))
+- }
+- case reflect.Map:
+- if v.IsNil() {
+- if !v.CanSet() {
+- return false
+- }
+- v.Set(reflect.MakeMap(v.Type()))
- }
+- default:
+- return false
- }
--}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/bench_test.sh b/Godeps/_workspace/src/github.com/emicklei/go-restful/bench_test.sh
-deleted file mode 100644
-index 47ffbe4..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/bench_test.sh
-+++ /dev/null
-@@ -1,10 +0,0 @@
--#go test -run=none -file bench_test.go -test.bench . -cpuprofile=bench_test.out
--
--go test -c
--./go-restful.test -test.run=none -test.cpuprofile=tmp.prof -test.bench=BenchmarkMany
--./go-restful.test -test.run=none -test.cpuprofile=curly.prof -test.bench=BenchmarkManyCurly
--
--#go tool pprof go-restful.test tmp.prof
--go tool pprof go-restful.test curly.prof
-
+- doCustom.Call([]reflect.Value{v, reflect.ValueOf(Continue{
+- f: f,
+- Rand: f.r,
+- })})
+- return true
+-}
-
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/compress.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/compress.go
-deleted file mode 100644
-index c4dcca0..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/compress.go
-+++ /dev/null
-@@ -1,89 +0,0 @@
--package restful
--
--// Copyright 2013 Ernest Micklei. All rights reserved.
--// Use of this source code is governed by a license
--// that can be found in the LICENSE file.
+-// Continue can be passed to custom fuzzing functions to allow them to use
+-// the correct source of randomness and to continue fuzzing their members.
+-type Continue struct {
+- f *Fuzzer
-
--import (
-- "compress/gzip"
-- "compress/zlib"
-- "errors"
-- "io"
-- "net/http"
-- "strings"
--)
+- // For convenience, Continue implements rand.Rand via embedding.
+- // Use this for generating any randomness if you want your fuzzing
+- // to be repeatable for a given seed.
+- *rand.Rand
+-}
-
--// OBSOLETE : use restful.DefaultContainer.EnableContentEncoding(true) to change this setting.
--var EnableContentEncoding = false
+-// Fuzz continues fuzzing obj. obj must be a pointer.
+-func (c Continue) Fuzz(obj interface{}) {
+- v := reflect.ValueOf(obj)
+- if v.Kind() != reflect.Ptr {
+- panic("needed ptr!")
+- }
+- v = v.Elem()
+- c.f.doFuzz(v)
+-}
-
--// CompressingResponseWriter is a http.ResponseWriter that can perform content encoding (gzip and zlib)
--type CompressingResponseWriter struct {
-- writer http.ResponseWriter
-- compressor io.WriteCloser
+-// RandString makes a random string up to 20 characters long. The returned string
+-// may include a variety of (valid) UTF-8 encodings.
+-func (c Continue) RandString() string {
+- return randString(c.Rand)
-}
-
--// Header is part of http.ResponseWriter interface
--func (c *CompressingResponseWriter) Header() http.Header {
-- return c.writer.Header()
+-// RandUint64 makes random 64 bit numbers.
+-// Weirdly, rand doesn't have a function that gives you 64 random bits.
+-func (c Continue) RandUint64() uint64 {
+- return randUint64(c.Rand)
-}
-
--// WriteHeader is part of http.ResponseWriter interface
--func (c *CompressingResponseWriter) WriteHeader(status int) {
-- c.writer.WriteHeader(status)
+-// RandBool returns true or false randomly.
+-func (c Continue) RandBool() bool {
+- return randBool(c.Rand)
-}
-
--// Write is part of http.ResponseWriter interface
--// It is passed through the compressor
--func (c *CompressingResponseWriter) Write(bytes []byte) (int, error) {
-- return c.compressor.Write(bytes)
+-func fuzzInt(v reflect.Value, r *rand.Rand) {
+- v.SetInt(int64(randUint64(r)))
-}
-
--// CloseNotify is part of http.CloseNotifier interface
--func (c *CompressingResponseWriter) CloseNotify() <-chan bool {
-- return c.writer.(http.CloseNotifier).CloseNotify()
+-func fuzzUint(v reflect.Value, r *rand.Rand) {
+- v.SetUint(randUint64(r))
-}
-
--// Close the underlying compressor
--func (c *CompressingResponseWriter) Close() {
-- c.compressor.Close()
+-var fillFuncMap = map[reflect.Kind]func(reflect.Value, *rand.Rand){
+- reflect.Bool: func(v reflect.Value, r *rand.Rand) {
+- v.SetBool(randBool(r))
+- },
+- reflect.Int: fuzzInt,
+- reflect.Int8: fuzzInt,
+- reflect.Int16: fuzzInt,
+- reflect.Int32: fuzzInt,
+- reflect.Int64: fuzzInt,
+- reflect.Uint: fuzzUint,
+- reflect.Uint8: fuzzUint,
+- reflect.Uint16: fuzzUint,
+- reflect.Uint32: fuzzUint,
+- reflect.Uint64: fuzzUint,
+- reflect.Uintptr: fuzzUint,
+- reflect.Float32: func(v reflect.Value, r *rand.Rand) {
+- v.SetFloat(float64(r.Float32()))
+- },
+- reflect.Float64: func(v reflect.Value, r *rand.Rand) {
+- v.SetFloat(r.Float64())
+- },
+- reflect.Complex64: func(v reflect.Value, r *rand.Rand) {
+- panic("unimplemented")
+- },
+- reflect.Complex128: func(v reflect.Value, r *rand.Rand) {
+- panic("unimplemented")
+- },
+- reflect.String: func(v reflect.Value, r *rand.Rand) {
+- v.SetString(randString(r))
+- },
+- reflect.UnsafePointer: func(v reflect.Value, r *rand.Rand) {
+- panic("unimplemented")
+- },
-}
-
--// WantsCompressedResponse reads the Accept-Encoding header to see if and which encoding is requested.
--func wantsCompressedResponse(httpRequest *http.Request) (bool, string) {
-- header := httpRequest.Header.Get(HEADER_AcceptEncoding)
-- gi := strings.Index(header, ENCODING_GZIP)
-- zi := strings.Index(header, ENCODING_DEFLATE)
-- // use in order of appearance
-- if gi == -1 {
-- return zi != -1, ENCODING_DEFLATE
-- } else if zi == -1 {
-- return gi != -1, ENCODING_GZIP
-- } else {
-- if gi < zi {
-- return true, ENCODING_GZIP
-- }
-- return true, ENCODING_DEFLATE
+-// randBool returns true or false randomly.
+-func randBool(r *rand.Rand) bool {
+- if r.Int()&1 == 1 {
+- return true
- }
+- return false
-}
-
--// NewCompressingResponseWriter create a CompressingResponseWriter for a known encoding = {gzip,deflate}
--func NewCompressingResponseWriter(httpWriter http.ResponseWriter, encoding string) (*CompressingResponseWriter, error) {
-- httpWriter.Header().Set(HEADER_ContentEncoding, encoding)
-- c := new(CompressingResponseWriter)
-- c.writer = httpWriter
-- var err error
-- if ENCODING_GZIP == encoding {
-- c.compressor, err = gzip.NewWriterLevel(httpWriter, gzip.BestSpeed)
-- if err != nil {
-- return nil, err
-- }
-- } else if ENCODING_DEFLATE == encoding {
-- c.compressor, err = zlib.NewWriterLevel(httpWriter, zlib.BestSpeed)
-- if err != nil {
-- return nil, err
-- }
-- } else {
-- return nil, errors.New("Unknown encoding:" + encoding)
-- }
-- return c, err
+-type charRange struct {
+- first, last rune
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/compress_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/compress_test.go
-deleted file mode 100644
-index 332fb22..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/compress_test.go
-+++ /dev/null
-@@ -1,53 +0,0 @@
--package restful
-
--import (
-- "net/http"
-- "net/http/httptest"
-- "testing"
--)
+-// choose returns a random unicode character from the given range, using the
+-// given randomness source.
+-func (r *charRange) choose(rand *rand.Rand) rune {
+- count := int64(r.last - r.first)
+- return r.first + rune(rand.Int63n(count))
+-}
-
--func TestGzip(t *testing.T) {
-- EnableContentEncoding = true
-- httpRequest, _ := http.NewRequest("GET", "/test", nil)
-- httpRequest.Header.Set("Accept-Encoding", "gzip,deflate")
-- httpWriter := httptest.NewRecorder()
-- wanted, encoding := wantsCompressedResponse(httpRequest)
-- if !wanted {
-- t.Fatal("should accept gzip")
-- }
-- if encoding != "gzip" {
-- t.Fatal("expected gzip")
-- }
-- c, err := NewCompressingResponseWriter(httpWriter, encoding)
-- if err != nil {
-- t.Fatal(err.Error())
-- }
-- c.Write([]byte("Hello World"))
-- c.Close()
-- if httpWriter.Header().Get("Content-Encoding") != "gzip" {
-- t.Fatal("Missing gzip header")
-- }
+-var unicodeRanges = []charRange{
+- {' ', '~'}, // ASCII characters
+- {'\u00a0', '\u02af'}, // Multi-byte encoded characters
+- {'\u4e00', '\u9fff'}, // Common CJK (even longer encodings)
-}
-
--func TestDeflate(t *testing.T) {
-- EnableContentEncoding = true
-- httpRequest, _ := http.NewRequest("GET", "/test", nil)
-- httpRequest.Header.Set("Accept-Encoding", "deflate,gzip")
-- httpWriter := httptest.NewRecorder()
-- wanted, encoding := wantsCompressedResponse(httpRequest)
-- if !wanted {
-- t.Fatal("should accept deflate")
-- }
-- if encoding != "deflate" {
-- t.Fatal("expected deflate")
-- }
-- c, err := NewCompressingResponseWriter(httpWriter, encoding)
-- if err != nil {
-- t.Fatal(err.Error())
-- }
-- c.Write([]byte("Hello World"))
-- c.Close()
-- if httpWriter.Header().Get("Content-Encoding") != "deflate" {
-- t.Fatal("Missing deflate header")
+-// randString makes a random string up to 20 characters long. The returned string
+-// may include a variety of (valid) UTF-8 encodings.
+-func randString(r *rand.Rand) string {
+- n := r.Intn(20)
+- runes := make([]rune, n)
+- for i := range runes {
+- runes[i] = unicodeRanges[r.Intn(len(unicodeRanges))].choose(r)
- }
+- return string(runes)
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/constants.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/constants.go
+-
+-// randUint64 makes random 64 bit numbers.
+-// Weirdly, rand doesn't have a function that gives you 64 random bits.
+-func randUint64(r *rand.Rand) uint64 {
+- return uint64(r.Uint32())<<32 | uint64(r.Uint32())
+-}
+diff --git a/Godeps/_workspace/src/github.com/google/gofuzz/fuzz_test.go b/Godeps/_workspace/src/github.com/google/gofuzz/fuzz_test.go
deleted file mode 100644
-index 5e564d0..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/constants.go
+index 4f0d4db..0000000
+--- a/Godeps/_workspace/src/github.com/google/gofuzz/fuzz_test.go
+++ /dev/null
-@@ -1,29 +0,0 @@
--package restful
--
--// Copyright 2013 Ernest Micklei. All rights reserved.
--// Use of this source code is governed by a license
--// that can be found in the LICENSE file.
+@@ -1,258 +0,0 @@
+-/*
+-Copyright 2014 Google Inc. All rights reserved.
-
--const (
-- MIME_XML = "application/xml" // Accept or Content-Type used in Consumes() and/or Produces()
-- MIME_JSON = "application/json" // Accept or Content-Type used in Consumes() and/or Produces()
+-Licensed under the Apache License, Version 2.0 (the "License");
+-you may not use this file except in compliance with the License.
+-You may obtain a copy of the License at
-
-- HEADER_Allow = "Allow"
-- HEADER_Accept = "Accept"
-- HEADER_Origin = "Origin"
-- HEADER_ContentType = "Content-Type"
-- HEADER_LastModified = "Last-Modified"
-- HEADER_AcceptEncoding = "Accept-Encoding"
-- HEADER_ContentEncoding = "Content-Encoding"
-- HEADER_AccessControlExposeHeaders = "Access-Control-Expose-Headers"
-- HEADER_AccessControlRequestMethod = "Access-Control-Request-Method"
-- HEADER_AccessControlRequestHeaders = "Access-Control-Request-Headers"
-- HEADER_AccessControlAllowMethods = "Access-Control-Allow-Methods"
-- HEADER_AccessControlAllowOrigin = "Access-Control-Allow-Origin"
-- HEADER_AccessControlAllowCredentials = "Access-Control-Allow-Credentials"
-- HEADER_AccessControlAllowHeaders = "Access-Control-Allow-Headers"
-- HEADER_AccessControlMaxAge = "Access-Control-Max-Age"
+- http://www.apache.org/licenses/LICENSE-2.0
-
-- ENCODING_GZIP = "gzip"
-- ENCODING_DEFLATE = "deflate"
--)
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/container.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/container.go
-deleted file mode 100644
-index b5b5b2d..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/container.go
-+++ /dev/null
-@@ -1,257 +0,0 @@
--package restful
+-Unless required by applicable law or agreed to in writing, software
+-distributed under the License is distributed on an "AS IS" BASIS,
+-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-See the License for the specific language governing permissions and
+-limitations under the License.
+-*/
-
--// Copyright 2013 Ernest Micklei. All rights reserved.
--// Use of this source code is governed by a license
--// that can be found in the LICENSE file.
+-package fuzz
-
-import (
-- "bytes"
-- "fmt"
-- "log"
-- "net/http"
-- "runtime"
-- "strings"
+- "reflect"
+- "testing"
-)
-
--// Container holds a collection of WebServices and a http.ServeMux to dispatch http requests.
--// The requests are further dispatched to routes of WebServices using a RouteSelector
--type Container struct {
-- webServices []*WebService
-- ServeMux *http.ServeMux
-- isRegisteredOnRoot bool
-- containerFilters []FilterFunction
-- doNotRecover bool // default is false
-- recoverHandleFunc RecoverHandleFunction
-- router RouteSelector // default is a RouterJSR311, CurlyRouter is the faster alternative
-- contentEncodingEnabled bool // default is false
--}
--
--// NewContainer creates a new Container using a new ServeMux and default router (RouterJSR311)
--func NewContainer() *Container {
-- return &Container{
-- webServices: []*WebService{},
-- ServeMux: http.NewServeMux(),
-- isRegisteredOnRoot: false,
-- containerFilters: []FilterFunction{},
-- doNotRecover: false,
-- recoverHandleFunc: logStackOnRecover,
-- router: RouterJSR311{},
-- contentEncodingEnabled: false}
--}
+-func TestFuzz_basic(t *testing.T) {
+- obj := &struct {
+- I int
+- I8 int8
+- I16 int16
+- I32 int32
+- I64 int64
+- U uint
+- U8 uint8
+- U16 uint16
+- U32 uint32
+- U64 uint64
+- Uptr uintptr
+- S string
+- B bool
+- }{}
-
--// RecoverHandleFunction declares functions that can be used to handle a panic situation.
--// The first argument is what recover() returns. The second must be used to communicate an error response.
--type RecoverHandleFunction func(interface{}, http.ResponseWriter)
+- failed := map[string]int{}
+- for i := 0; i < 10; i++ {
+- New().Fuzz(obj)
-
--// RecoverHandler changes the default function (logStackOnRecover) to be called
--// when a panic is detected. DoNotRecover must be have its default value (=false).
--func (c *Container) RecoverHandler(handler RecoverHandleFunction) {
-- c.recoverHandleFunc = handler
+- if n, v := "i", obj.I; v == 0 {
+- failed[n] = failed[n] + 1
+- }
+- if n, v := "i8", obj.I8; v == 0 {
+- failed[n] = failed[n] + 1
+- }
+- if n, v := "i16", obj.I16; v == 0 {
+- failed[n] = failed[n] + 1
+- }
+- if n, v := "i32", obj.I32; v == 0 {
+- failed[n] = failed[n] + 1
+- }
+- if n, v := "i64", obj.I64; v == 0 {
+- failed[n] = failed[n] + 1
+- }
+- if n, v := "u", obj.U; v == 0 {
+- failed[n] = failed[n] + 1
+- }
+- if n, v := "u8", obj.U8; v == 0 {
+- failed[n] = failed[n] + 1
+- }
+- if n, v := "u16", obj.U16; v == 0 {
+- failed[n] = failed[n] + 1
+- }
+- if n, v := "u32", obj.U32; v == 0 {
+- failed[n] = failed[n] + 1
+- }
+- if n, v := "u64", obj.U64; v == 0 {
+- failed[n] = failed[n] + 1
+- }
+- if n, v := "uptr", obj.Uptr; v == 0 {
+- failed[n] = failed[n] + 1
+- }
+- if n, v := "s", obj.S; v == "" {
+- failed[n] = failed[n] + 1
+- }
+- if n, v := "b", obj.B; v == false {
+- failed[n] = failed[n] + 1
+- }
+- }
+- checkFailed(t, failed)
-}
-
--// DoNotRecover controls whether panics will be caught to return HTTP 500.
--// If set to true, Route functions are responsible for handling any error situation.
--// Default value is false = recover from panics. This has performance implications.
--func (c *Container) DoNotRecover(doNot bool) {
-- c.doNotRecover = doNot
+-func checkFailed(t *testing.T, failed map[string]int) {
+- for k, v := range failed {
+- if v > 8 {
+- t.Errorf("%v seems to not be getting set, was zero value %v times", k, v)
+- }
+- }
-}
-
--// Router changes the default Router (currently RouterJSR311)
--func (c *Container) Router(aRouter RouteSelector) {
-- c.router = aRouter
--}
+-func TestFuzz_structptr(t *testing.T) {
+- obj := &struct {
+- A *struct {
+- S string
+- }
+- }{}
-
--// EnableContentEncoding (default=false) allows for GZIP or DEFLATE encoding of responses.
--func (c *Container) EnableContentEncoding(enabled bool) {
-- c.contentEncodingEnabled = enabled
--}
+- f := New().NilChance(.5)
+- failed := map[string]int{}
+- for i := 0; i < 10; i++ {
+- f.Fuzz(obj)
-
--// Add a WebService to the Container. It will detect duplicate root paths and panic in that case.
--func (c *Container) Add(service *WebService) *Container {
-- // If registered on root then no additional specific mapping is needed
-- if !c.isRegisteredOnRoot {
-- pattern := c.fixedPrefixPath(service.RootPath())
-- // check if root path registration is needed
-- if "/" == pattern || "" == pattern {
-- c.ServeMux.HandleFunc("/", c.dispatch)
-- c.isRegisteredOnRoot = true
-- } else {
-- // detect if registration already exists
-- alreadyMapped := false
-- for _, each := range c.webServices {
-- if each.RootPath() == service.RootPath() {
-- alreadyMapped = true
-- break
-- }
-- }
-- if !alreadyMapped {
-- c.ServeMux.HandleFunc(pattern, c.dispatch)
-- if !strings.HasSuffix(pattern, "/") {
-- c.ServeMux.HandleFunc(pattern+"/", c.dispatch)
-- }
-- }
+- if n, v := "a not nil", obj.A; v == nil {
+- failed[n] = failed[n] + 1
- }
-- }
-- // cannot have duplicate root paths
-- for _, each := range c.webServices {
-- if each.RootPath() == service.RootPath() {
-- log.Fatalf("[restful] WebService with duplicate root path detected:['%v']", each)
+- if n, v := "a nil", obj.A; v != nil {
+- failed[n] = failed[n] + 1
+- }
+- if n, v := "as", obj.A; v == nil || v.S == "" {
+- failed[n] = failed[n] + 1
- }
- }
-- c.webServices = append(c.webServices, service)
-- return c
+- checkFailed(t, failed)
-}
-
--// logStackOnRecover is the default RecoverHandleFunction and is called
--// when DoNotRecover is false and the recoverHandleFunc is not set for the container.
--// Default implementation logs the stacktrace and writes the stacktrace on the response.
--// This may be a security issue as it exposes sourcecode information.
--func logStackOnRecover(panicReason interface{}, httpWriter http.ResponseWriter) {
-- var buffer bytes.Buffer
-- buffer.WriteString(fmt.Sprintf("[restful] recover from panic situation: - %v\r\n", panicReason))
-- for i := 2; ; i += 1 {
-- _, file, line, ok := runtime.Caller(i)
-- if !ok {
-- break
+-// tryFuzz tries fuzzing up to 20 times. Fail if check() never passes, report the highest
+-// stage it ever got to.
+-func tryFuzz(t *testing.T, f *Fuzzer, obj interface{}, check func() (stage int, passed bool)) {
+- maxStage := 0
+- for i := 0; i < 20; i++ {
+- f.Fuzz(obj)
+- stage, passed := check()
+- if stage > maxStage {
+- maxStage = stage
+- }
+- if passed {
+- return
- }
-- buffer.WriteString(fmt.Sprintf(" %s:%d\r\n", file, line))
- }
-- log.Println(buffer.String())
-- httpWriter.WriteHeader(http.StatusInternalServerError)
-- httpWriter.Write(buffer.Bytes())
+- t.Errorf("Only ever got to stage %v", maxStage)
-}
-
--// Dispatch the incoming Http Request to a matching WebService.
--func (c *Container) dispatch(httpWriter http.ResponseWriter, httpRequest *http.Request) {
-- // Instal panic recovery unless told otherwise
-- if !c.doNotRecover { // catch all for 500 response
-- defer func() {
-- if r := recover(); r != nil {
-- c.recoverHandleFunc(r, httpWriter)
-- return
-- }
-- }()
-- }
-- // Install closing the request body (if any)
-- defer func() {
-- if nil != httpRequest.Body {
-- httpRequest.Body.Close()
+-func TestFuzz_structmap(t *testing.T) {
+- obj := &struct {
+- A map[struct {
+- S string
+- }]struct {
+- S2 string
- }
-- }()
+- B map[string]string
+- }{}
-
-- // Detect if compression is needed
-- // assume without compression, test for override
-- writer := httpWriter
-- if c.contentEncodingEnabled {
-- doCompress, encoding := wantsCompressedResponse(httpRequest)
-- if doCompress {
-- var err error
-- writer, err = NewCompressingResponseWriter(httpWriter, encoding)
-- if err != nil {
-- log.Println("[restful] unable to install compressor:", err)
-- httpWriter.WriteHeader(http.StatusInternalServerError)
-- return
+- tryFuzz(t, New(), obj, func() (int, bool) {
+- if obj.A == nil {
+- return 1, false
+- }
+- if len(obj.A) == 0 {
+- return 2, false
+- }
+- for k, v := range obj.A {
+- if k.S == "" {
+- return 3, false
+- }
+- if v.S2 == "" {
+- return 4, false
- }
-- defer func() {
-- writer.(*CompressingResponseWriter).Close()
-- }()
- }
-- }
-- // Find best match Route ; err is non nil if no match was found
-- webService, route, err := c.router.SelectRoute(
-- c.webServices,
-- httpRequest)
-- if err != nil {
-- // a non-200 response has already been written
-- // run container filters anyway ; they should not touch the response...
-- chain := FilterChain{Filters: c.containerFilters, Target: func(req *Request, resp *Response) {
-- switch err.(type) {
-- case ServiceError:
-- ser := err.(ServiceError)
-- resp.WriteErrorString(ser.Code, ser.Message)
+-
+- if obj.B == nil {
+- return 5, false
+- }
+- if len(obj.B) == 0 {
+- return 6, false
+- }
+- for k, v := range obj.B {
+- if k == "" {
+- return 7, false
- }
-- // TODO
-- }}
-- chain.ProcessFilter(NewRequest(httpRequest), NewResponse(writer))
-- return
-- }
-- wrappedRequest, wrappedResponse := route.wrapRequestResponse(writer, httpRequest)
-- // pass through filters (if any)
-- if len(c.containerFilters)+len(webService.filters)+len(route.Filters) > 0 {
-- // compose filter chain
-- allFilters := []FilterFunction{}
-- allFilters = append(allFilters, c.containerFilters...)
-- allFilters = append(allFilters, webService.filters...)
-- allFilters = append(allFilters, route.Filters...)
-- chain := FilterChain{Filters: allFilters, Target: func(req *Request, resp *Response) {
-- // handle request by route after passing all filters
-- route.Function(wrappedRequest, wrappedResponse)
-- }}
-- chain.ProcessFilter(wrappedRequest, wrappedResponse)
-- } else {
-- // no filters, handle request by route
-- route.Function(wrappedRequest, wrappedResponse)
-- }
+- if v == "" {
+- return 8, false
+- }
+- }
+- return 9, true
+- })
-}
-
--// fixedPrefixPath returns the fixed part of the partspec ; it may include template vars {}
--func (c Container) fixedPrefixPath(pathspec string) string {
-- varBegin := strings.Index(pathspec, "{")
-- if -1 == varBegin {
-- return pathspec
-- }
-- return pathspec[:varBegin]
--}
+-func TestFuzz_structslice(t *testing.T) {
+- obj := &struct {
+- A []struct {
+- S string
+- }
+- B []string
+- }{}
-
--// ServeHTTP implements net/http.Handler therefore a Container can be a Handler in a http.Server
--func (c Container) ServeHTTP(httpwriter http.ResponseWriter, httpRequest *http.Request) {
-- c.ServeMux.ServeHTTP(httpwriter, httpRequest)
--}
+- tryFuzz(t, New(), obj, func() (int, bool) {
+- if obj.A == nil {
+- return 1, false
+- }
+- if len(obj.A) == 0 {
+- return 2, false
+- }
+- for _, v := range obj.A {
+- if v.S == "" {
+- return 3, false
+- }
+- }
-
--// Handle registers the handler for the given pattern. If a handler already exists for pattern, Handle panics.
--func (c Container) Handle(pattern string, handler http.Handler) {
-- c.ServeMux.Handle(pattern, handler)
+- if obj.B == nil {
+- return 4, false
+- }
+- if len(obj.B) == 0 {
+- return 5, false
+- }
+- for _, v := range obj.B {
+- if v == "" {
+- return 6, false
+- }
+- }
+- return 7, true
+- })
-}
-
--// Filter appends a container FilterFunction. These are called before dispatching
--// a http.Request to a WebService from the container
--func (c *Container) Filter(filter FilterFunction) {
-- c.containerFilters = append(c.containerFilters, filter)
--}
+-func TestFuzz_custom(t *testing.T) {
+- obj := &struct {
+- A string
+- B *string
+- C map[string]string
+- D *map[string]string
+- }{}
-
--// RegisteredWebServices returns the collections of added WebServices
--func (c Container) RegisteredWebServices() []*WebService {
-- return c.webServices
--}
+- testPhrase := "gotcalled"
+- testMap := map[string]string{"C": "D"}
+- f := New().Funcs(
+- func(s *string, c Continue) {
+- *s = testPhrase
+- },
+- func(m map[string]string, c Continue) {
+- m["C"] = "D"
+- },
+- )
-
--// computeAllowedMethods returns a list of HTTP methods that are valid for a Request
--func (c Container) computeAllowedMethods(req *Request) []string {
-- // Go through all RegisteredWebServices() and all its Routes to collect the options
-- methods := []string{}
-- requestPath := req.Request.URL.Path
-- for _, ws := range c.RegisteredWebServices() {
-- matches := ws.compiledPathExpression().Matcher.FindStringSubmatch(requestPath)
-- if matches != nil {
-- finalMatch := matches[len(matches)-1]
-- for _, rt := range ws.Routes() {
-- matches := rt.pathExpr.Matcher.FindStringSubmatch(finalMatch)
-- if matches != nil {
-- lastMatch := matches[len(matches)-1]
-- if lastMatch == "" || lastMatch == "/" { // do not include if value is neither empty nor ‘/’.
-- methods = append(methods, rt.Method)
-- }
-- }
-- }
+- tryFuzz(t, f, obj, func() (int, bool) {
+- if obj.A != testPhrase {
+- return 1, false
- }
-- }
-- // methods = append(methods, "OPTIONS") not sure about this
-- return methods
+- if obj.B == nil {
+- return 2, false
+- }
+- if *obj.B != testPhrase {
+- return 3, false
+- }
+- if e, a := testMap, obj.C; !reflect.DeepEqual(e, a) {
+- return 4, false
+- }
+- if obj.D == nil {
+- return 5, false
+- }
+- if e, a := testMap, *obj.D; !reflect.DeepEqual(e, a) {
+- return 6, false
+- }
+- return 7, true
+- })
-}
+diff --git a/Godeps/_workspace/src/github.com/kr/text/License b/Godeps/_workspace/src/github.com/kr/text/License
+deleted file mode 100644
+index 480a328..0000000
+--- a/Godeps/_workspace/src/github.com/kr/text/License
++++ /dev/null
+@@ -1,19 +0,0 @@
+-Copyright 2012 Keith Rarick
-
--// newBasicRequestResponse creates a pair of Request,Response from its http versions.
--// It is basic because no parameter or (produces) content-type information is given.
--func newBasicRequestResponse(httpWriter http.ResponseWriter, httpRequest *http.Request) (*Request, *Response) {
-- resp := NewResponse(httpWriter)
-- resp.requestAccept = httpRequest.Header.Get(HEADER_Accept)
-- return NewRequest(httpRequest), resp
--}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/cors_filter.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/cors_filter.go
+-Permission is hereby granted, free of charge, to any person obtaining a copy
+-of this software and associated documentation files (the "Software"), to deal
+-in the Software without restriction, including without limitation the rights
+-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+-copies of the Software, and to permit persons to whom the Software is
+-furnished to do so, subject to the following conditions:
+-
+-The above copyright notice and this permission notice shall be included in
+-all copies or substantial portions of the Software.
+-
+-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+-THE SOFTWARE.
+diff --git a/Godeps/_workspace/src/github.com/kr/text/Readme b/Godeps/_workspace/src/github.com/kr/text/Readme
deleted file mode 100644
-index ae166b6..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/cors_filter.go
+index 7e6e7c0..0000000
+--- a/Godeps/_workspace/src/github.com/kr/text/Readme
+++ /dev/null
-@@ -1,170 +0,0 @@
--package restful
+@@ -1,3 +0,0 @@
+-This is a Go package for manipulating paragraphs of text.
-
--// Copyright 2013 Ernest Micklei. All rights reserved.
--// Use of this source code is governed by a license
--// that can be found in the LICENSE file.
+-See http://go.pkgdoc.org/github.com/kr/text for full documentation.
+diff --git a/Godeps/_workspace/src/github.com/kr/text/colwriter/Readme b/Godeps/_workspace/src/github.com/kr/text/colwriter/Readme
+deleted file mode 100644
+index 1c1f4e6..0000000
+--- a/Godeps/_workspace/src/github.com/kr/text/colwriter/Readme
++++ /dev/null
+@@ -1,5 +0,0 @@
+-Package colwriter provides a write filter that formats
+-input lines in multiple columns.
+-
+-The package is a straightforward translation from
+-/src/cmd/draw/mc.c in Plan 9 from User Space.
+diff --git a/Godeps/_workspace/src/github.com/kr/text/colwriter/column.go b/Godeps/_workspace/src/github.com/kr/text/colwriter/column.go
+deleted file mode 100644
+index 7302ce9..0000000
+--- a/Godeps/_workspace/src/github.com/kr/text/colwriter/column.go
++++ /dev/null
+@@ -1,147 +0,0 @@
+-// Package colwriter provides a write filter that formats
+-// input lines in multiple columns.
+-//
+-// The package is a straightforward translation from
+-// /src/cmd/draw/mc.c in Plan 9 from User Space.
+-package colwriter
-
-import (
-- "strconv"
-- "strings"
+- "bytes"
+- "io"
+- "unicode/utf8"
-)
-
--// CrossOriginResourceSharing is used to create a Container Filter that implements CORS.
--// Cross-origin resource sharing (CORS) is a mechanism that allows JavaScript on a web page
--// to make XMLHttpRequests to another domain, not the domain the JavaScript originated from.
--//
--// http://en.wikipedia.org/wiki/Cross-origin_resource_sharing
--// http://enable-cors.org/server.html
--// http://www.html5rocks.com/en/tutorials/cors/#toc-handling-a-not-so-simple-request
--type CrossOriginResourceSharing struct {
-- ExposeHeaders []string // list of Header names
-- AllowedHeaders []string // list of Header names
-- AllowedDomains []string // list of allowed values for Http Origin. If empty all are allowed.
-- AllowedMethods []string
-- MaxAge int // number of seconds before requiring new Options request
-- CookiesAllowed bool
-- Container *Container
--}
+-const (
+- tab = 4
+-)
-
--// Filter is a filter function that implements the CORS flow as documented on http://enable-cors.org/server.html
--// and http://www.html5rocks.com/static/images/cors_server_flowchart.png
--func (c CrossOriginResourceSharing) Filter(req *Request, resp *Response, chain *FilterChain) {
-- origin := req.Request.Header.Get(HEADER_Origin)
-- if len(origin) == 0 {
-- if trace {
-- traceLogger.Println("no Http header Origin set")
-- }
-- chain.ProcessFilter(req, resp)
-- return
-- }
-- if len(c.AllowedDomains) > 0 { // if provided then origin must be included
-- included := false
-- for _, each := range c.AllowedDomains {
-- if each == origin {
-- included = true
-- break
-- }
-- }
-- if !included {
-- if trace {
-- traceLogger.Println("HTTP Origin:%s is not part of %v", origin, c.AllowedDomains)
-- }
-- chain.ProcessFilter(req, resp)
-- return
-- }
-- }
-- if req.Request.Method != "OPTIONS" {
-- c.doActualRequest(req, resp)
-- chain.ProcessFilter(req, resp)
-- return
-- }
-- if acrm := req.Request.Header.Get(HEADER_AccessControlRequestMethod); acrm != "" {
-- c.doPreflightRequest(req, resp)
-- } else {
-- c.doActualRequest(req, resp)
-- }
--}
+-const (
+- // Print each input line ending in a colon ':' separately.
+- BreakOnColon uint = 1 << iota
+-)
-
--func (c CrossOriginResourceSharing) doActualRequest(req *Request, resp *Response) {
-- c.setOptionsHeaders(req, resp)
-- // continue processing the response
+-// A Writer is a filter that arranges input lines in as many columns as will
+-// fit in its width. Tab '\t' chars in the input are translated to sequences
+-// of spaces ending at multiples of 4 positions.
+-//
+-// If BreakOnColon is set, each input line ending in a colon ':' is written
+-// separately.
+-//
+-// The Writer assumes that all Unicode code points have the same width; this
+-// may not be true in some fonts.
+-type Writer struct {
+- w io.Writer
+- buf []byte
+- width int
+- flag uint
-}
-
--func (c CrossOriginResourceSharing) doPreflightRequest(req *Request, resp *Response) {
-- if len(c.AllowedMethods) == 0 {
-- c.AllowedMethods = c.Container.computeAllowedMethods(req)
+-// NewWriter allocates and initializes a new Writer writing to w.
+-// Parameter width controls the total number of characters on each line
+-// across all columns.
+-func NewWriter(w io.Writer, width int, flag uint) *Writer {
+- return &Writer{
+- w: w,
+- width: width,
+- flag: flag,
- }
+-}
-
-- acrm := req.Request.Header.Get(HEADER_AccessControlRequestMethod)
-- if !c.isValidAccessControlRequestMethod(acrm, c.AllowedMethods) {
-- if trace {
-- traceLogger.Printf("Http header %s:%s is not in %v",
-- HEADER_AccessControlRequestMethod,
-- acrm,
-- c.AllowedMethods)
+-// Write writes p to the writer w. The only errors returned are ones
+-// encountered while writing to the underlying output stream.
+-func (w *Writer) Write(p []byte) (n int, err error) {
+- var linelen int
+- var lastWasColon bool
+- for i, c := range p {
+- w.buf = append(w.buf, c)
+- linelen++
+- if c == '\t' {
+- w.buf[len(w.buf)-1] = ' '
+- for linelen%tab != 0 {
+- w.buf = append(w.buf, ' ')
+- linelen++
+- }
- }
-- return
-- }
-- acrhs := req.Request.Header.Get(HEADER_AccessControlRequestHeaders)
-- if len(acrhs) > 0 {
-- for _, each := range strings.Split(acrhs, ",") {
-- if !c.isValidAccessControlRequestHeader(strings.Trim(each, " ")) {
-- if trace {
-- traceLogger.Printf("Http header %s:%s is not in %v",
-- HEADER_AccessControlRequestHeaders,
-- acrhs,
-- c.AllowedHeaders)
+- if w.flag&BreakOnColon != 0 && c == ':' {
+- lastWasColon = true
+- } else if lastWasColon {
+- if c == '\n' {
+- pos := bytes.LastIndex(w.buf[:len(w.buf)-1], []byte{'\n'})
+- if pos < 0 {
+- pos = 0
+- }
+- line := w.buf[pos:]
+- w.buf = w.buf[:pos]
+- if err = w.columnate(); err != nil {
+- if len(line) < i {
+- return i - len(line), err
+- }
+- return 0, err
+- }
+- if n, err := w.w.Write(line); err != nil {
+- if r := len(line) - n; r < i {
+- return i - r, err
+- }
+- return 0, err
- }
-- return
- }
+- lastWasColon = false
+- }
+- if c == '\n' {
+- linelen = 0
- }
- }
-- resp.AddHeader(HEADER_AccessControlAllowMethods, strings.Join(c.AllowedMethods, ","))
-- resp.AddHeader(HEADER_AccessControlAllowHeaders, acrhs)
-- c.setOptionsHeaders(req, resp)
--
-- // return http 200 response, no body
+- return len(p), nil
-}
-
--func (c CrossOriginResourceSharing) setOptionsHeaders(req *Request, resp *Response) {
-- c.checkAndSetExposeHeaders(resp)
-- c.setAllowOriginHeader(req, resp)
-- c.checkAndSetAllowCredentials(resp)
-- if c.MaxAge > 0 {
-- resp.AddHeader(HEADER_AccessControlMaxAge, strconv.Itoa(c.MaxAge))
-- }
+-// Flush should be called after the last call to Write to ensure that any data
+-// buffered in the Writer is written to output.
+-func (w *Writer) Flush() error {
+- return w.columnate()
-}
-
--func (c CrossOriginResourceSharing) isOriginAllowed(origin string) bool {
-- if len(origin) == 0 {
-- return false
-- }
-- if len(c.AllowedDomains) == 0 {
-- return true
+-func (w *Writer) columnate() error {
+- words := bytes.Split(w.buf, []byte{'\n'})
+- w.buf = nil
+- if len(words[len(words)-1]) == 0 {
+- words = words[:len(words)-1]
- }
-- allowed := false
-- for _, each := range c.AllowedDomains {
-- if each == origin {
-- allowed = true
-- break
+- maxwidth := 0
+- for _, wd := range words {
+- if n := utf8.RuneCount(wd); n > maxwidth {
+- maxwidth = n
- }
- }
-- return allowed
--}
--
--func (c CrossOriginResourceSharing) setAllowOriginHeader(req *Request, resp *Response) {
-- origin := req.Request.Header.Get(HEADER_Origin)
-- if c.isOriginAllowed(origin) {
-- resp.AddHeader(HEADER_AccessControlAllowOrigin, origin)
-- }
--}
--
--func (c CrossOriginResourceSharing) checkAndSetExposeHeaders(resp *Response) {
-- if len(c.ExposeHeaders) > 0 {
-- resp.AddHeader(HEADER_AccessControlExposeHeaders, strings.Join(c.ExposeHeaders, ","))
-- }
--}
--
--func (c CrossOriginResourceSharing) checkAndSetAllowCredentials(resp *Response) {
-- if c.CookiesAllowed {
-- resp.AddHeader(HEADER_AccessControlAllowCredentials, "true")
+- maxwidth++ // space char
+- wordsPerLine := w.width / maxwidth
+- if wordsPerLine <= 0 {
+- wordsPerLine = 1
- }
--}
--
--func (c CrossOriginResourceSharing) isValidAccessControlRequestMethod(method string, allowedMethods []string) bool {
-- for _, each := range allowedMethods {
-- if each == method {
-- return true
+- nlines := (len(words) + wordsPerLine - 1) / wordsPerLine
+- for i := 0; i < nlines; i++ {
+- col := 0
+- endcol := 0
+- for j := i; j < len(words); j += nlines {
+- endcol += maxwidth
+- _, err := w.w.Write(words[j])
+- if err != nil {
+- return err
+- }
+- col += utf8.RuneCount(words[j])
+- if j+nlines < len(words) {
+- for col < endcol {
+- _, err := w.w.Write([]byte{' '})
+- if err != nil {
+- return err
+- }
+- col++
+- }
+- }
- }
-- }
-- return false
--}
--
--func (c CrossOriginResourceSharing) isValidAccessControlRequestHeader(header string) bool {
-- for _, each := range c.AllowedHeaders {
-- if strings.ToLower(each) == strings.ToLower(header) {
-- return true
+- _, err := w.w.Write([]byte{'\n'})
+- if err != nil {
+- return err
- }
- }
-- return false
+- return nil
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/cors_filter_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/cors_filter_test.go
+diff --git a/Godeps/_workspace/src/github.com/kr/text/colwriter/column_test.go b/Godeps/_workspace/src/github.com/kr/text/colwriter/column_test.go
deleted file mode 100644
-index 9b47230..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/cors_filter_test.go
+index 8d0bf8f..0000000
+--- a/Godeps/_workspace/src/github.com/kr/text/colwriter/column_test.go
+++ /dev/null
-@@ -1,125 +0,0 @@
--package restful
+@@ -1,90 +0,0 @@
+-package colwriter
-
-import (
-- "net/http"
-- "net/http/httptest"
+- "bytes"
- "testing"
-)
-
--// go test -v -test.run TestCORSFilter_Preflight ...restful
--// http://www.html5rocks.com/en/tutorials/cors/#toc-handling-a-not-so-simple-request
--func TestCORSFilter_Preflight(t *testing.T) {
-- tearDown()
-- ws := new(WebService)
-- ws.Route(ws.PUT("/cors").To(dummy))
-- Add(ws)
--
-- cors := CrossOriginResourceSharing{
-- ExposeHeaders: []string{"X-Custom-Header"},
-- AllowedHeaders: []string{"X-Custom-Header", "X-Additional-Header"},
-- CookiesAllowed: true,
-- Container: DefaultContainer}
-- Filter(cors.Filter)
--
-- // Preflight
-- httpRequest, _ := http.NewRequest("OPTIONS", "http://api.alice.com/cors", nil)
-- httpRequest.Method = "OPTIONS"
-- httpRequest.Header.Set(HEADER_Origin, "http://api.bob.com")
-- httpRequest.Header.Set(HEADER_AccessControlRequestMethod, "PUT")
-- httpRequest.Header.Set(HEADER_AccessControlRequestHeaders, "X-Custom-Header, X-Additional-Header")
--
-- httpWriter := httptest.NewRecorder()
-- DefaultContainer.dispatch(httpWriter, httpRequest)
--
-- actual := httpWriter.Header().Get(HEADER_AccessControlAllowOrigin)
-- if "http://api.bob.com" != actual {
-- t.Fatal("expected: http://api.bob.com but got:" + actual)
-- }
-- actual = httpWriter.Header().Get(HEADER_AccessControlAllowMethods)
-- if "PUT" != actual {
-- t.Fatal("expected: PUT but got:" + actual)
-- }
-- actual = httpWriter.Header().Get(HEADER_AccessControlAllowHeaders)
-- if "X-Custom-Header, X-Additional-Header" != actual {
-- t.Fatal("expected: X-Custom-Header, X-Additional-Header but got:" + actual)
-- }
--
-- if !cors.isOriginAllowed("somewhere") {
-- t.Fatal("origin expected to be allowed")
-- }
-- cors.AllowedDomains = []string{"overthere.com"}
-- if cors.isOriginAllowed("somewhere") {
-- t.Fatal("origin [somewhere] expected NOT to be allowed")
-- }
-- if !cors.isOriginAllowed("overthere.com") {
-- t.Fatal("origin [overthere] expected to be allowed")
-- }
--
--}
--
--// go test -v -test.run TestCORSFilter_Actual ...restful
--// http://www.html5rocks.com/en/tutorials/cors/#toc-handling-a-not-so-simple-request
--func TestCORSFilter_Actual(t *testing.T) {
-- tearDown()
-- ws := new(WebService)
-- ws.Route(ws.PUT("/cors").To(dummy))
-- Add(ws)
--
-- cors := CrossOriginResourceSharing{
-- ExposeHeaders: []string{"X-Custom-Header"},
-- AllowedHeaders: []string{"X-Custom-Header", "X-Additional-Header"},
-- CookiesAllowed: true,
-- Container: DefaultContainer}
-- Filter(cors.Filter)
--
-- // Actual
-- httpRequest, _ := http.NewRequest("PUT", "http://api.alice.com/cors", nil)
-- httpRequest.Header.Set(HEADER_Origin, "http://api.bob.com")
-- httpRequest.Header.Set("X-Custom-Header", "value")
--
-- httpWriter := httptest.NewRecorder()
-- DefaultContainer.dispatch(httpWriter, httpRequest)
-- actual := httpWriter.Header().Get(HEADER_AccessControlAllowOrigin)
-- if "http://api.bob.com" != actual {
-- t.Fatal("expected: http://api.bob.com but got:" + actual)
-- }
-- if httpWriter.Body.String() != "dummy" {
-- t.Fatal("expected: dummy but got:" + httpWriter.Body.String())
-- }
--}
+-var src = `
+-.git
+-.gitignore
+-.godir
+-Procfile:
+-README.md
+-api.go
+-apps.go
+-auth.go
+-darwin.go
+-data.go
+-dyno.go:
+-env.go
+-git.go
+-help.go
+-hkdist
+-linux.go
+-ls.go
+-main.go
+-plugin.go
+-run.go
+-scale.go
+-ssh.go
+-tail.go
+-term
+-unix.go
+-update.go
+-version.go
+-windows.go
+-`[1:]
-
--var allowedDomainInput = []struct {
-- domains []string
-- origin string
-- accepted bool
+-var tests = []struct{
+- wid int
+- flag uint
+- src string
+- want string
-}{
-- {[]string{}, "http://anything.com", true},
--}
+- {80, 0, "", ""},
+- {80, 0, src, `
+-.git README.md darwin.go git.go ls.go scale.go unix.go
+-.gitignore api.go data.go help.go main.go ssh.go update.go
+-.godir apps.go dyno.go: hkdist plugin.go tail.go version.go
+-Procfile: auth.go env.go linux.go run.go term windows.go
+-`[1:]},
+- {80, BreakOnColon, src, `
+-.git .gitignore .godir
-
--// go test -v -test.run TestCORSFilter_AllowedDomains ...restful
--func TestCORSFilter_AllowedDomains(t *testing.T) {
-- for _, each := range allowedDomainInput {
-- tearDown()
-- ws := new(WebService)
-- ws.Route(ws.PUT("/cors").To(dummy))
-- Add(ws)
+-Procfile:
+-README.md api.go apps.go auth.go darwin.go data.go
-
-- cors := CrossOriginResourceSharing{
-- AllowedDomains: each.domains,
-- CookiesAllowed: true,
-- Container: DefaultContainer}
-- Filter(cors.Filter)
+-dyno.go:
+-env.go hkdist main.go scale.go term version.go
+-git.go linux.go plugin.go ssh.go unix.go windows.go
+-help.go ls.go run.go tail.go update.go
+-`[1:]},
+- {20, 0, `
+-Hello
+-Γειά σου
+-안녕
+-今日は
+-`[1:], `
+-Hello 안녕
+-Γειά σου 今日は
+-`[1:]},
+-}
-
-- httpRequest, _ := http.NewRequest("PUT", "http://api.his.com/cors", nil)
-- httpRequest.Header.Set(HEADER_Origin, each.origin)
-- httpWriter := httptest.NewRecorder()
-- DefaultContainer.dispatch(httpWriter, httpRequest)
-- actual := httpWriter.Header().Get(HEADER_AccessControlAllowOrigin)
-- if actual != each.origin && each.accepted {
-- t.Fatal("expected to be accepted")
+-func TestWriter(t *testing.T) {
+- for _, test := range tests {
+- b := new(bytes.Buffer)
+- w := NewWriter(b, test.wid, test.flag)
+- if _, err := w.Write([]byte(test.src)); err != nil {
+- t.Error(err)
- }
-- if actual == each.origin && !each.accepted {
-- t.Fatal("did not expect to be accepted")
+- if err := w.Flush(); err != nil {
+- t.Error(err)
+- }
+- if g := b.String(); test.want != g {
+- t.Log("\n" + test.want)
+- t.Log("\n" + g)
+- t.Errorf("%q != %q", test.want, g)
- }
- }
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/coverage.sh b/Godeps/_workspace/src/github.com/emicklei/go-restful/coverage.sh
+diff --git a/Godeps/_workspace/src/github.com/kr/text/doc.go b/Godeps/_workspace/src/github.com/kr/text/doc.go
deleted file mode 100644
-index e27dbf1..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/coverage.sh
+index cf4c198..0000000
+--- a/Godeps/_workspace/src/github.com/kr/text/doc.go
+++ /dev/null
-@@ -1,2 +0,0 @@
--go test -coverprofile=coverage.out
--go tool cover -html=coverage.out
-\ No newline at end of file
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/curly.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/curly.go
+@@ -1,3 +0,0 @@
+-// Package text provides rudimentary functions for manipulating text in
+-// paragraphs.
+-package text
+diff --git a/Godeps/_workspace/src/github.com/kr/text/indent.go b/Godeps/_workspace/src/github.com/kr/text/indent.go
deleted file mode 100644
-index 1a29826..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/curly.go
+index 4ebac45..0000000
+--- a/Godeps/_workspace/src/github.com/kr/text/indent.go
+++ /dev/null
-@@ -1,162 +0,0 @@
--package restful
--
--// Copyright 2013 Ernest Micklei. All rights reserved.
--// Use of this source code is governed by a license
--// that can be found in the LICENSE file.
+@@ -1,74 +0,0 @@
+-package text
-
-import (
-- "net/http"
-- "regexp"
-- "sort"
-- "strings"
+- "io"
-)
-
--// CurlyRouter expects Routes with paths that contain zero or more parameters in curly brackets.
--type CurlyRouter struct{}
--
--// SelectRoute is part of the Router interface and returns the best match
--// for the WebService and its Route for the given Request.
--func (c CurlyRouter) SelectRoute(
-- webServices []*WebService,
-- httpRequest *http.Request) (selectedService *WebService, selected *Route, err error) {
--
-- requestTokens := tokenizePath(httpRequest.URL.Path)
--
-- detectedService := c.detectWebService(requestTokens, webServices)
-- if detectedService == nil {
-- if trace {
-- traceLogger.Printf("no WebService was found to match URL path:%s\n", httpRequest.URL.Path)
-- }
-- return nil, nil, NewError(http.StatusNotFound, "404: Page Not Found")
-- }
-- candidateRoutes := c.selectRoutes(detectedService, requestTokens)
-- if len(candidateRoutes) == 0 {
-- if trace {
-- traceLogger.Printf("no Route in WebService with path %s was found to match URL path:%s\n", detectedService.rootPath, httpRequest.URL.Path)
-- }
-- return detectedService, nil, NewError(http.StatusNotFound, "404: Page Not Found")
-- }
-- selectedRoute, err := c.detectRoute(candidateRoutes, httpRequest)
-- if selectedRoute == nil {
-- return detectedService, nil, err
-- }
-- return detectedService, selectedRoute, nil
--}
--
--// selectRoutes return a collection of Route from a WebService that matches the path tokens from the request.
--func (c CurlyRouter) selectRoutes(ws *WebService, requestTokens []string) []Route {
-- candidates := &sortableCurlyRoutes{[]*curlyRoute{}}
-- for _, each := range ws.routes {
-- matches, paramCount, staticCount := c.matchesRouteByPathTokens(each.pathParts, requestTokens)
-- if matches {
-- candidates.add(&curlyRoute{each, paramCount, staticCount}) // TODO make sure Routes() return pointers?
-- }
-- }
-- sort.Sort(sort.Reverse(candidates))
-- return candidates.routes()
--}
--
--// matchesRouteByPathTokens computes whether it matches, howmany parameters do match and what the number of static path elements are.
--func (c CurlyRouter) matchesRouteByPathTokens(routeTokens, requestTokens []string) (matches bool, paramCount int, staticCount int) {
-- if len(routeTokens) < len(requestTokens) {
-- // proceed in matching only if last routeToken is wildcard
-- count := len(routeTokens)
-- if count == 0 || !strings.HasSuffix(routeTokens[count-1], "*}") {
-- return false, 0, 0
-- }
-- // proceed
-- }
-- for i, routeToken := range routeTokens {
-- if i == len(requestTokens) {
-- // reached end of request path
-- return false, 0, 0
-- }
-- requestToken := requestTokens[i]
-- if strings.HasPrefix(routeToken, "{") {
-- paramCount++
-- if colon := strings.Index(routeToken, ":"); colon != -1 {
-- // match by regex
-- matchesToken, matchesRemainder := c.regularMatchesPathToken(routeToken, colon, requestToken)
-- if !matchesToken {
-- return false, 0, 0
-- }
-- if matchesRemainder {
-- break
-- }
-- }
-- } else { // no { prefix
-- if requestToken != routeToken {
-- return false, 0, 0
-- }
-- staticCount++
-- }
-- }
-- return true, paramCount, staticCount
+-// Indent inserts prefix at the beginning of each non-empty line of s. The
+-// end-of-line marker is NL.
+-func Indent(s, prefix string) string {
+- return string(IndentBytes([]byte(s), []byte(prefix)))
-}
-
--// regularMatchesPathToken tests whether the regular expression part of routeToken matches the requestToken or all remaining tokens
--// format routeToken is {someVar:someExpression}, e.g. {zipcode:[\d][\d][\d][\d][A-Z][A-Z]}
--func (c CurlyRouter) regularMatchesPathToken(routeToken string, colon int, requestToken string) (matchesToken bool, matchesRemainder bool) {
-- regPart := routeToken[colon+1 : len(routeToken)-1]
-- if regPart == "*" {
-- if trace {
-- traceLogger.Printf("wildcard parameter detected in route token %s that matches %s\n", routeToken, requestToken)
+-// IndentBytes inserts prefix at the beginning of each non-empty line of b.
+-// The end-of-line marker is NL.
+-func IndentBytes(b, prefix []byte) []byte {
+- var res []byte
+- bol := true
+- for _, c := range b {
+- if bol && c != '\n' {
+- res = append(res, prefix...)
- }
-- return true, true
-- }
-- matched, err := regexp.MatchString(regPart, requestToken)
-- return (matched && err == nil), false
+- res = append(res, c)
+- bol = c == '\n'
+- }
+- return res
-}
-
--// detectRoute selectes from a list of Route the first match by inspecting both the Accept and Content-Type
--// headers of the Request. See also RouterJSR311 in jsr311.go
--func (c CurlyRouter) detectRoute(candidateRoutes []Route, httpRequest *http.Request) (*Route, error) {
-- // tracing is done inside detectRoute
-- return RouterJSR311{}.detectRoute(candidateRoutes, httpRequest)
+-// Writer indents each line of its input.
+-type indentWriter struct {
+- w io.Writer
+- bol bool
+- pre [][]byte
+- sel int
+- off int
-}
-
--// detectWebService returns the best matching webService given the list of path tokens.
--// see also computeWebserviceScore
--func (c CurlyRouter) detectWebService(requestTokens []string, webServices []*WebService) *WebService {
-- var best *WebService
-- score := -1
-- for _, each := range webServices {
-- matches, eachScore := c.computeWebserviceScore(requestTokens, each.compiledPathExpression().tokens)
-- if matches && (eachScore > score) {
-- best = each
-- score = eachScore
-- }
+-// NewIndentWriter makes a new write filter that indents the input
+-// lines. Each line is prefixed in order with the corresponding
+-// element of pre. If there are more lines than elements, the last
+-// element of pre is repeated for each subsequent line.
+-func NewIndentWriter(w io.Writer, pre ...[]byte) io.Writer {
+- return &indentWriter{
+- w: w,
+- pre: pre,
+- bol: true,
- }
-- return best
-}
-
--// computeWebserviceScore returns whether tokens match and
--// the weighted score of the longest matching consecutive tokens from the beginning.
--func (c CurlyRouter) computeWebserviceScore(requestTokens []string, tokens []string) (bool, int) {
-- if len(tokens) > len(requestTokens) {
-- return false, 0
-- }
-- score := 0
-- for i := 0; i < len(tokens); i++ {
-- each := requestTokens[i]
-- other := tokens[i]
-- if len(each) == 0 && len(other) == 0 {
-- score++
-- continue
-- }
-- if len(other) > 0 && strings.HasPrefix(other, "{") {
-- // no empty match
-- if len(each) == 0 {
-- return false, score
+-// The only errors returned are from the underlying indentWriter.
+-func (w *indentWriter) Write(p []byte) (n int, err error) {
+- for _, c := range p {
+- if w.bol {
+- var i int
+- i, err = w.w.Write(w.pre[w.sel][w.off:])
+- w.off += i
+- if err != nil {
+- return n, err
- }
-- score += 1
-- } else {
-- // not a parameter
-- if each != other {
-- return false, score
+- }
+- _, err = w.w.Write([]byte{c})
+- if err != nil {
+- return n, err
+- }
+- n++
+- w.bol = c == '\n'
+- if w.bol {
+- w.off = 0
+- if w.sel < len(w.pre)-1 {
+- w.sel++
- }
-- score += (len(tokens) - i) * 10 //fuzzy
- }
- }
-- return true, score
+- return n, nil
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/curly_route.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/curly_route.go
+diff --git a/Godeps/_workspace/src/github.com/kr/text/indent_test.go b/Godeps/_workspace/src/github.com/kr/text/indent_test.go
deleted file mode 100644
-index 3edab72..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/curly_route.go
+index 5c723ee..0000000
+--- a/Godeps/_workspace/src/github.com/kr/text/indent_test.go
+++ /dev/null
-@@ -1,54 +0,0 @@
--package restful
+@@ -1,119 +0,0 @@
+-package text
-
--// Copyright 2013 Ernest Micklei. All rights reserved.
--// Use of this source code is governed by a license
--// that can be found in the LICENSE file.
+-import (
+- "bytes"
+- "testing"
+-)
-
--// curlyRoute exits for sorting Routes by the CurlyRouter based on number of parameters and number of static path elements.
--type curlyRoute struct {
-- route Route
-- paramCount int
-- staticCount int
+-type T struct {
+- inp, exp, pre string
-}
-
--type sortableCurlyRoutes struct {
-- candidates []*curlyRoute
+-var tests = []T{
+- {
+- "The quick brown fox\njumps over the lazy\ndog.\nBut not quickly.\n",
+- "xxxThe quick brown fox\nxxxjumps over the lazy\nxxxdog.\nxxxBut not quickly.\n",
+- "xxx",
+- },
+- {
+- "The quick brown fox\njumps over the lazy\ndog.\n\nBut not quickly.",
+- "xxxThe quick brown fox\nxxxjumps over the lazy\nxxxdog.\n\nxxxBut not quickly.",
+- "xxx",
+- },
-}
-
--func (s *sortableCurlyRoutes) add(route *curlyRoute) {
-- s.candidates = append(s.candidates, route)
+-func TestIndent(t *testing.T) {
+- for _, test := range tests {
+- got := Indent(test.inp, test.pre)
+- if got != test.exp {
+- t.Errorf("mismatch %q != %q", got, test.exp)
+- }
+- }
-}
-
--func (s *sortableCurlyRoutes) routes() (routes []Route) {
-- for _, each := range s.candidates {
-- routes = append(routes, each.route) // TODO change return type
-- }
-- return routes
+-type IndentWriterTest struct {
+- inp, exp string
+- pre []string
-}
-
--func (s *sortableCurlyRoutes) Len() int {
-- return len(s.candidates)
+-var ts = []IndentWriterTest{
+- {
+- `
+-The quick brown fox
+-jumps over the lazy
+-dog.
+-But not quickly.
+-`[1:],
+- `
+-xxxThe quick brown fox
+-xxxjumps over the lazy
+-xxxdog.
+-xxxBut not quickly.
+-`[1:],
+- []string{"xxx"},
+- },
+- {
+- `
+-The quick brown fox
+-jumps over the lazy
+-dog.
+-But not quickly.
+-`[1:],
+- `
+-xxaThe quick brown fox
+-xxxjumps over the lazy
+-xxxdog.
+-xxxBut not quickly.
+-`[1:],
+- []string{"xxa", "xxx"},
+- },
+- {
+- `
+-The quick brown fox
+-jumps over the lazy
+-dog.
+-But not quickly.
+-`[1:],
+- `
+-xxaThe quick brown fox
+-xxbjumps over the lazy
+-xxcdog.
+-xxxBut not quickly.
+-`[1:],
+- []string{"xxa", "xxb", "xxc", "xxx"},
+- },
+- {
+- `
+-The quick brown fox
+-jumps over the lazy
+-dog.
+-
+-But not quickly.`[1:],
+- `
+-xxaThe quick brown fox
+-xxxjumps over the lazy
+-xxxdog.
+-xxx
+-xxxBut not quickly.`[1:],
+- []string{"xxa", "xxx"},
+- },
-}
--func (s *sortableCurlyRoutes) Swap(i, j int) {
-- s.candidates[i], s.candidates[j] = s.candidates[j], s.candidates[i]
+-
+-func TestIndentWriter(t *testing.T) {
+- for _, test := range ts {
+- b := new(bytes.Buffer)
+- pre := make([][]byte, len(test.pre))
+- for i := range test.pre {
+- pre[i] = []byte(test.pre[i])
+- }
+- w := NewIndentWriter(b, pre...)
+- if _, err := w.Write([]byte(test.inp)); err != nil {
+- t.Error(err)
+- }
+- if got := b.String(); got != test.exp {
+- t.Errorf("mismatch %q != %q", got, test.exp)
+- t.Log(got)
+- t.Log(test.exp)
+- }
+- }
-}
--func (s *sortableCurlyRoutes) Less(i, j int) bool {
-- ci := s.candidates[i]
-- cj := s.candidates[j]
+diff --git a/Godeps/_workspace/src/github.com/kr/text/mc/Readme b/Godeps/_workspace/src/github.com/kr/text/mc/Readme
+deleted file mode 100644
+index 519ddc0..0000000
+--- a/Godeps/_workspace/src/github.com/kr/text/mc/Readme
++++ /dev/null
+@@ -1,9 +0,0 @@
+-Command mc prints in multiple columns.
-
-- // primary key
-- if ci.staticCount < cj.staticCount {
-- return true
+- Usage: mc [-] [-N] [file...]
+-
+-Mc splits the input into as many columns as will fit in N
+-print positions. If the output is a tty, the default N is
+-the number of characters in a terminal line; otherwise the
+-default N is 80. Under option - each input line ending in
+-a colon ':' is printed separately.
+diff --git a/Godeps/_workspace/src/github.com/kr/text/mc/mc.go b/Godeps/_workspace/src/github.com/kr/text/mc/mc.go
+deleted file mode 100644
+index 00169a3..0000000
+--- a/Godeps/_workspace/src/github.com/kr/text/mc/mc.go
++++ /dev/null
+@@ -1,62 +0,0 @@
+-// Command mc prints in multiple columns.
+-//
+-// Usage: mc [-] [-N] [file...]
+-//
+-// Mc splits the input into as many columns as will fit in N
+-// print positions. If the output is a tty, the default N is
+-// the number of characters in a terminal line; otherwise the
+-// default N is 80. Under option - each input line ending in
+-// a colon ':' is printed separately.
+-package main
+-
+-import (
+- "github.com/kr/pty"
+- "github.com/kr/text/colwriter"
+- "io"
+- "log"
+- "os"
+- "strconv"
+-)
+-
+-func main() {
+- var width int
+- var flag uint
+- args := os.Args[1:]
+- for len(args) > 0 && len(args[0]) > 0 && args[0][0] == '-' {
+- if len(args[0]) > 1 {
+- width, _ = strconv.Atoi(args[0][1:])
+- } else {
+- flag |= colwriter.BreakOnColon
+- }
+- args = args[1:]
- }
-- if ci.staticCount > cj.staticCount {
-- return false
+- if width < 1 {
+- _, width, _ = pty.Getsize(os.Stdout)
- }
-- // secundary key
-- if ci.paramCount < cj.paramCount {
-- return true
+- if width < 1 {
+- width = 80
- }
-- if ci.paramCount > cj.paramCount {
-- return false
+-
+- w := colwriter.NewWriter(os.Stdout, width, flag)
+- if len(args) > 0 {
+- for _, s := range args {
+- if f, err := os.Open(s); err == nil {
+- copyin(w, f)
+- f.Close()
+- } else {
+- log.Println(err)
+- }
+- }
+- } else {
+- copyin(w, os.Stdin)
- }
-- return ci.route.Path < cj.route.Path
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/curly_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/curly_test.go
+-
+-func copyin(w *colwriter.Writer, r io.Reader) {
+- if _, err := io.Copy(w, r); err != nil {
+- log.Println(err)
+- }
+- if err := w.Flush(); err != nil {
+- log.Println(err)
+- }
+-}
+diff --git a/Godeps/_workspace/src/github.com/kr/text/wrap.go b/Godeps/_workspace/src/github.com/kr/text/wrap.go
deleted file mode 100644
-index 4291825..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/curly_test.go
+index ca88565..0000000
+--- a/Godeps/_workspace/src/github.com/kr/text/wrap.go
+++ /dev/null
-@@ -1,228 +0,0 @@
--package restful
+@@ -1,86 +0,0 @@
+-package text
-
-import (
-- "io"
-- "net/http"
-- "testing"
+- "bytes"
+- "math"
-)
-
--var requestPaths = []struct {
-- // url with path (1) is handled by service with root (2) and remainder has value final (3)
-- path, root string
--}{
-- {"/", "/"},
-- {"/p", "/p"},
-- {"/p/x", "/p/{q}"},
-- {"/q/x", "/q"},
-- {"/p/x/", "/p/{q}"},
-- {"/p/x/y", "/p/{q}"},
-- {"/q/x/y", "/q"},
-- {"/z/q", "/{p}/q"},
-- {"/a/b/c/q", "/"},
--}
--
--// go test -v -test.run TestCurlyDetectWebService ...restful
--func TestCurlyDetectWebService(t *testing.T) {
-- ws1 := new(WebService).Path("/")
-- ws2 := new(WebService).Path("/p")
-- ws3 := new(WebService).Path("/q")
-- ws4 := new(WebService).Path("/p/q")
-- ws5 := new(WebService).Path("/p/{q}")
-- ws7 := new(WebService).Path("/{p}/q")
-- var wss = []*WebService{ws1, ws2, ws3, ws4, ws5, ws7}
+-var (
+- nl = []byte{'\n'}
+- sp = []byte{' '}
+-)
-
-- for _, each := range wss {
-- t.Logf("path=%s,toks=%v\n", each.compiledPathExpression().Source, each.compiledPathExpression().tokens)
-- }
+-const defaultPenalty = 1e5
-
-- router := CurlyRouter{}
+-// Wrap wraps s into a paragraph of lines of length lim, with minimal
+-// raggedness.
+-func Wrap(s string, lim int) string {
+- return string(WrapBytes([]byte(s), lim))
+-}
-
-- ok := true
-- for i, fixture := range requestPaths {
-- requestTokens := tokenizePath(fixture.path)
-- who := router.detectWebService(requestTokens, wss)
-- if who != nil && who.RootPath() != fixture.root {
-- t.Logf("[line:%v] Unexpected dispatcher, expected:%v, actual:%v", i, fixture.root, who.RootPath())
-- ok = false
-- }
-- }
-- if !ok {
-- t.Fail()
+-// WrapBytes wraps b into a paragraph of lines of length lim, with minimal
+-// raggedness.
+-func WrapBytes(b []byte, lim int) []byte {
+- words := bytes.Split(bytes.Replace(bytes.TrimSpace(b), nl, sp, -1), sp)
+- var lines [][]byte
+- for _, line := range WrapWords(words, 1, lim, defaultPenalty) {
+- lines = append(lines, bytes.Join(line, sp))
- }
+- return bytes.Join(lines, nl)
-}
-
--var serviceDetects = []struct {
-- path string
-- found bool
-- root string
--}{
-- {"/a/b", true, "/{p}/{q}/{r}"},
-- {"/p/q", true, "/p/q"},
-- {"/q/p", true, "/q"},
-- {"/", true, "/"},
-- {"/p/q/r", true, "/p/q"},
--}
+-// WrapWords is the low-level line-breaking algorithm, useful if you need more
+-// control over the details of the text wrapping process. For most uses, either
+-// Wrap or WrapBytes will be sufficient and more convenient.
+-//
+-// WrapWords splits a list of words into lines with minimal "raggedness",
+-// treating each byte as one unit, accounting for spc units between adjacent
+-// words on each line, and attempting to limit lines to lim units. Raggedness
+-// is the total error over all lines, where error is the square of the
+-// difference of the length of the line and lim. Too-long lines (which only
+-// happen when a single word is longer than lim units) have pen penalty units
+-// added to the error.
+-func WrapWords(words [][]byte, spc, lim, pen int) [][][]byte {
+- n := len(words)
-
--// go test -v -test.run Test_detectWebService ...restful
--func Test_detectWebService(t *testing.T) {
-- router := CurlyRouter{}
-- ws1 := new(WebService).Path("/")
-- ws2 := new(WebService).Path("/p")
-- ws3 := new(WebService).Path("/q")
-- ws4 := new(WebService).Path("/p/q")
-- ws5 := new(WebService).Path("/p/{q}")
-- ws6 := new(WebService).Path("/p/{q}/")
-- ws7 := new(WebService).Path("/{p}/q")
-- ws8 := new(WebService).Path("/{p}/{q}/{r}")
-- var wss = []*WebService{ws8, ws7, ws6, ws5, ws4, ws3, ws2, ws1}
-- for _, fix := range serviceDetects {
-- requestPath := fix.path
-- requestTokens := tokenizePath(requestPath)
-- for _, ws := range wss {
-- serviceTokens := ws.compiledPathExpression().tokens
-- matches, score := router.computeWebserviceScore(requestTokens, serviceTokens)
-- t.Logf("req=%s,toks:%v,ws=%s,toks:%v,score=%d,matches=%v", requestPath, requestTokens, ws.RootPath(), serviceTokens, score, matches)
+- length := make([][]int, n)
+- for i := 0; i < n; i++ {
+- length[i] = make([]int, n)
+- length[i][i] = len(words[i])
+- for j := i + 1; j < n; j++ {
+- length[i][j] = length[i][j-1] + spc + len(words[j])
- }
-- best := router.detectWebService(requestTokens, wss)
-- if best != nil {
-- if fix.found {
-- t.Logf("best=%s", best.RootPath())
-- } else {
-- t.Fatalf("should have found:%s", fix.root)
+- }
+-
+- nbrk := make([]int, n)
+- cost := make([]int, n)
+- for i := range cost {
+- cost[i] = math.MaxInt32
+- }
+- for i := n - 1; i >= 0; i-- {
+- if length[i][n-1] <= lim {
+- cost[i] = 0
+- nbrk[i] = n
+- } else {
+- for j := i + 1; j < n; j++ {
+- d := lim - length[i][j-1]
+- c := d*d + cost[j]
+- if length[i][j-1] > lim {
+- c += pen // too-long lines get a worse penalty
+- }
+- if c < cost[i] {
+- cost[i] = c
+- nbrk[i] = j
+- }
- }
- }
- }
--}
-
--var routeMatchers = []struct {
-- route string
-- path string
-- matches bool
-- paramCount int
-- staticCount int
--}{
-- // route, request-path
-- {"/a", "/a", true, 0, 1},
-- {"/a", "/b", false, 0, 0},
-- {"/a", "/b", false, 0, 0},
-- {"/a/{b}/c/", "/a/2/c", true, 1, 2},
-- {"/{a}/{b}/{c}/", "/a/b", false, 0, 0},
-- {"/{x:*}", "/", false, 0, 0},
-- {"/{x:*}", "/a", true, 1, 0},
-- {"/{x:*}", "/a/b", true, 1, 0},
-- {"/a/{x:*}", "/a/b", true, 1, 1},
-- {"/a/{x:[A-Z][A-Z]}", "/a/ZX", true, 1, 1},
-- {"/basepath/{resource:*}", "/basepath/some/other/location/test.xml", true, 1, 1},
+- var lines [][][]byte
+- i := 0
+- for i < n {
+- lines = append(lines, words[i:nbrk[i]])
+- i = nbrk[i]
+- }
+- return lines
-}
+diff --git a/Godeps/_workspace/src/github.com/kr/text/wrap_test.go b/Godeps/_workspace/src/github.com/kr/text/wrap_test.go
+deleted file mode 100644
+index 90f065c..0000000
+--- a/Godeps/_workspace/src/github.com/kr/text/wrap_test.go
++++ /dev/null
+@@ -1,44 +0,0 @@
+-package text
-
--// clear && go test -v -test.run Test_matchesRouteByPathTokens ...restful
--func Test_matchesRouteByPathTokens(t *testing.T) {
-- router := CurlyRouter{}
-- for i, each := range routeMatchers {
-- routeToks := tokenizePath(each.route)
-- reqToks := tokenizePath(each.path)
-- matches, pCount, sCount := router.matchesRouteByPathTokens(routeToks, reqToks)
-- if matches != each.matches {
-- t.Fatalf("[%d] unexpected matches outcome route:%s, path:%s, matches:%v", i, each.route, each.path, matches)
-- }
-- if pCount != each.paramCount {
-- t.Fatalf("[%d] unexpected paramCount got:%d want:%d ", i, pCount, each.paramCount)
+-import (
+- "bytes"
+- "testing"
+-)
+-
+-var text = "The quick brown fox jumps over the lazy dog."
+-
+-func TestWrap(t *testing.T) {
+- exp := [][]string{
+- {"The", "quick", "brown", "fox"},
+- {"jumps", "over", "the", "lazy", "dog."},
+- }
+- words := bytes.Split([]byte(text), sp)
+- got := WrapWords(words, 1, 24, defaultPenalty)
+- if len(exp) != len(got) {
+- t.Fail()
+- }
+- for i := range exp {
+- if len(exp[i]) != len(got[i]) {
+- t.Fail()
- }
-- if sCount != each.staticCount {
-- t.Fatalf("[%d] unexpected staticCount got:%d want:%d ", i, sCount, each.staticCount)
+- for j := range exp[i] {
+- if exp[i][j] != string(got[i][j]) {
+- t.Fatal(i, exp[i][j], got[i][j])
+- }
- }
- }
-}
-
--// clear && go test -v -test.run TestExtractParameters_Wildcard1 ...restful
--func TestExtractParameters_Wildcard1(t *testing.T) {
-- params := doExtractParams("/fixed/{var:*}", 2, "/fixed/remainder", t)
-- if params["var"] != "remainder" {
-- t.Errorf("parameter mismatch var: %s", params["var"])
+-func TestWrapNarrow(t *testing.T) {
+- exp := "The\nquick\nbrown\nfox\njumps\nover\nthe\nlazy\ndog."
+- if Wrap(text, 5) != exp {
+- t.Fail()
- }
-}
-
--// clear && go test -v -test.run TestExtractParameters_Wildcard2 ...restful
--func TestExtractParameters_Wildcard2(t *testing.T) {
-- params := doExtractParams("/fixed/{var:*}", 2, "/fixed/remain/der", t)
-- if params["var"] != "remain/der" {
-- t.Errorf("parameter mismatch var: %s", params["var"])
+-func TestWrapOneLine(t *testing.T) {
+- exp := "The quick brown fox jumps over the lazy dog."
+- if Wrap(text, 500) != exp {
+- t.Fail()
- }
-}
+diff --git a/Godeps/_workspace/src/github.com/mitchellh/goamz/aws/attempt.go b/Godeps/_workspace/src/github.com/mitchellh/goamz/aws/attempt.go
+deleted file mode 100644
+index c0654f5..0000000
+--- a/Godeps/_workspace/src/github.com/mitchellh/goamz/aws/attempt.go
++++ /dev/null
+@@ -1,74 +0,0 @@
+-package aws
-
--// clear && go test -v -test.run TestExtractParameters_Wildcard3 ...restful
--func TestExtractParameters_Wildcard3(t *testing.T) {
-- params := doExtractParams("/static/{var:*}", 2, "/static/test/sub/hi.html", t)
-- if params["var"] != "test/sub/hi.html" {
-- t.Errorf("parameter mismatch var: %s", params["var"])
-- }
+-import (
+- "time"
+-)
+-
+-// AttemptStrategy represents a strategy for waiting for an action
+-// to complete successfully. This is an internal type used by the
+-// implementation of other goamz packages.
+-type AttemptStrategy struct {
+- Total time.Duration // total duration of attempt.
+- Delay time.Duration // interval between each try in the burst.
+- Min int // minimum number of retries; overrides Total
-}
-
--// clear && go test -v -test.run TestCurly_ISSUE_34 ...restful
--func TestCurly_ISSUE_34(t *testing.T) {
-- ws1 := new(WebService).Path("/")
-- ws1.Route(ws1.GET("/{type}/{id}").To(curlyDummy))
-- ws1.Route(ws1.GET("/network/{id}").To(curlyDummy))
-- routes := CurlyRouter{}.selectRoutes(ws1, tokenizePath("/network/12"))
-- if len(routes) != 2 {
-- t.Fatal("expected 2 routes")
-- }
-- if routes[0].Path != "/network/{id}" {
-- t.Error("first is", routes[0].Path)
-- }
+-type Attempt struct {
+- strategy AttemptStrategy
+- last time.Time
+- end time.Time
+- force bool
+- count int
-}
-
--// clear && go test -v -test.run TestCurly_ISSUE_34_2 ...restful
--func TestCurly_ISSUE_34_2(t *testing.T) {
-- ws1 := new(WebService)
-- ws1.Route(ws1.GET("/network/{id}").To(curlyDummy))
-- ws1.Route(ws1.GET("/{type}/{id}").To(curlyDummy))
-- routes := CurlyRouter{}.selectRoutes(ws1, tokenizePath("/network/12"))
-- if len(routes) != 2 {
-- t.Fatal("expected 2 routes")
-- }
-- if routes[0].Path != "/network/{id}" {
-- t.Error("first is", routes[0].Path)
+-// Start begins a new sequence of attempts for the given strategy.
+-func (s AttemptStrategy) Start() *Attempt {
+- now := time.Now()
+- return &Attempt{
+- strategy: s,
+- last: now,
+- end: now.Add(s.Total),
+- force: true,
- }
-}
-
--// clear && go test -v -test.run TestCurly_JsonHtml ...restful
--func TestCurly_JsonHtml(t *testing.T) {
-- ws1 := new(WebService)
-- ws1.Route(ws1.GET("/some.html").To(curlyDummy).Consumes("*/*").Produces("text/html"))
-- req, _ := http.NewRequest("GET", "/some.html", nil)
-- req.Header.Set("Accept", "application/json")
-- _, route, err := CurlyRouter{}.SelectRoute([]*WebService{ws1}, req)
-- if err == nil {
-- t.Error("error expected")
+-// Next waits until it is time to perform the next attempt or returns
+-// false if it is time to stop trying.
+-func (a *Attempt) Next() bool {
+- now := time.Now()
+- sleep := a.nextSleep(now)
+- if !a.force && !now.Add(sleep).Before(a.end) && a.strategy.Min <= a.count {
+- return false
- }
-- if route != nil {
-- t.Error("no route expected")
+- a.force = false
+- if sleep > 0 && a.count > 0 {
+- time.Sleep(sleep)
+- now = time.Now()
- }
+- a.count++
+- a.last = now
+- return true
-}
-
--// go test -v -test.run TestCurly_ISSUE_137 ...restful
--func TestCurly_ISSUE_137(t *testing.T) {
-- ws1 := new(WebService)
-- ws1.Route(ws1.GET("/hello").To(curlyDummy))
-- req, _ := http.NewRequest("GET", "/", nil)
-- _, route, _ := CurlyRouter{}.SelectRoute([]*WebService{ws1}, req)
-- t.Log(route)
-- if route != nil {
-- t.Error("no route expected")
+-func (a *Attempt) nextSleep(now time.Time) time.Duration {
+- sleep := a.strategy.Delay - now.Sub(a.last)
+- if sleep < 0 {
+- return 0
- }
+- return sleep
-}
-
--// go test -v -test.run TestCurly_ISSUE_137_2 ...restful
--func TestCurly_ISSUE_137_2(t *testing.T) {
-- ws1 := new(WebService)
-- ws1.Route(ws1.GET("/hello").To(curlyDummy))
-- req, _ := http.NewRequest("GET", "/hello/bob", nil)
-- _, route, _ := CurlyRouter{}.SelectRoute([]*WebService{ws1}, req)
-- t.Log(route)
-- if route != nil {
-- t.Errorf("no route expected, got %v", route)
+-// HasNext returns whether another attempt will be made if the current
+-// one fails. If it returns true, the following call to Next is
+-// guaranteed to return true.
+-func (a *Attempt) HasNext() bool {
+- if a.force || a.strategy.Min > a.count {
+- return true
+- }
+- now := time.Now()
+- if now.Add(a.nextSleep(now)).Before(a.end) {
+- a.force = true
+- return true
- }
+- return false
-}
--
--func curlyDummy(req *Request, resp *Response) { io.WriteString(resp.ResponseWriter, "curlyDummy") }
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/doc.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/doc.go
+diff --git a/Godeps/_workspace/src/github.com/mitchellh/goamz/aws/attempt_test.go b/Godeps/_workspace/src/github.com/mitchellh/goamz/aws/attempt_test.go
deleted file mode 100644
-index c095566..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/doc.go
+index 1fda5bf..0000000
+--- a/Godeps/_workspace/src/github.com/mitchellh/goamz/aws/attempt_test.go
+++ /dev/null
-@@ -1,184 +0,0 @@
--/*
--Package restful, a lean package for creating REST-style WebServices without magic.
--
--WebServices and Routes
--
--A WebService has a collection of Route objects that dispatch incoming Http Requests to a function calls.
--Typically, a WebService has a root path (e.g. /users) and defines common MIME types for its routes.
--WebServices must be added to a container (see below) in order to handler Http requests from a server.
--
--A Route is defined by a HTTP method, an URL path and (optionally) the MIME types it consumes (Content-Type) and produces (Accept).
--This package has the logic to find the best matching Route and if found, call its Function.
--
-- ws := new(restful.WebService)
-- ws.
-- Path("/users").
-- Consumes(restful.MIME_JSON, restful.MIME_XML).
-- Produces(restful.MIME_JSON, restful.MIME_XML)
--
-- ws.Route(ws.GET("/{user-id}").To(u.findUser)) // u is a UserResource
+@@ -1,57 +0,0 @@
+-package aws_test
-
-- ...
+-import (
+- "github.com/mitchellh/goamz/aws"
+- . "github.com/motain/gocheck"
+- "time"
+-)
-
-- // GET http://localhost:8080/users/1
-- func (u UserResource) findUser(request *restful.Request, response *restful.Response) {
-- id := request.PathParameter("user-id")
-- ...
+-func (S) TestAttemptTiming(c *C) {
+- testAttempt := aws.AttemptStrategy{
+- Total: 0.25e9,
+- Delay: 0.1e9,
- }
+- want := []time.Duration{0, 0.1e9, 0.2e9, 0.2e9}
+- got := make([]time.Duration, 0, len(want)) // avoid allocation when testing timing
+- t0 := time.Now()
+- for a := testAttempt.Start(); a.Next(); {
+- got = append(got, time.Now().Sub(t0))
+- }
+- got = append(got, time.Now().Sub(t0))
+- c.Assert(got, HasLen, len(want))
+- const margin = 0.01e9
+- for i, got := range want {
+- lo := want[i] - margin
+- hi := want[i] + margin
+- if got < lo || got > hi {
+- c.Errorf("attempt %d want %g got %g", i, want[i].Seconds(), got.Seconds())
+- }
+- }
+-}
-
--The (*Request, *Response) arguments provide functions for reading information from the request and writing information back to the response.
--
--See the example https://github.com/emicklei/go-restful/blob/master/examples/restful-user-resource.go with a full implementation.
--
--Regular expression matching Routes
--
--A Route parameter can be specified using the format "uri/{var[:regexp]}" or the special version "uri/{var:*}" for matching the tail of the path.
--For example, /persons/{name:[A-Z][A-Z]} can be used to restrict values for the parameter "name" to only contain capital alphabetic characters.
--Regular expressions must use the standard Go syntax as described in the regexp package. (https://code.google.com/p/re2/wiki/Syntax)
--This feature requires the use of a CurlyRouter.
--
--Containers
--
--A Container holds a collection of WebServices, Filters and a http.ServeMux for multiplexing http requests.
--Using the statements "restful.Add(...) and restful.Filter(...)" will register WebServices and Filters to the Default Container.
--The Default container of go-restful uses the http.DefaultServeMux.
--You can create your own Container and create a new http.Server for that particular container.
--
-- container := restful.NewContainer()
-- server := &http.Server{Addr: ":8081", Handler: container}
--
--Filters
--
--A filter dynamically intercepts requests and responses to transform or use the information contained in the requests or responses.
--You can use filters to perform generic logging, measurement, authentication, redirect, set response headers etc.
--In the restful package there are three hooks into the request,response flow where filters can be added.
--Each filter must define a FilterFunction:
--
-- func (req *restful.Request, resp *restful.Response, chain *restful.FilterChain)
--
--Use the following statement to pass the request,response pair to the next filter or RouteFunction
--
-- chain.ProcessFilter(req, resp)
--
--Container Filters
--
--These are processed before any registered WebService.
--
-- // install a (global) filter for the default container (processed before any webservice)
-- restful.Filter(globalLogging)
--
--WebService Filters
--
--These are processed before any Route of a WebService.
--
-- // install a webservice filter (processed before any route)
-- ws.Filter(webserviceLogging).Filter(measureTime)
--
--
--Route Filters
--
--These are processed before calling the function associated with the Route.
--
-- // install 2 chained route filters (processed before calling findUser)
-- ws.Route(ws.GET("/{user-id}").Filter(routeLogging).Filter(NewCountFilter().routeCounter).To(findUser))
--
--See the example https://github.com/emicklei/go-restful/blob/master/examples/restful-filters.go with full implementations.
--
--Response Encoding
--
--Two encodings are supported: gzip and deflate. To enable this for all responses:
--
-- restful.DefaultContainer.EnableContentEncoding(true)
--
--If a Http request includes the Accept-Encoding header then the response content will be compressed using the specified encoding.
--Alternatively, you can create a Filter that performs the encoding and install it per WebService or Route.
--
--See the example https://github.com/emicklei/go-restful/blob/master/examples/restful-encoding-filter.go
--
--OPTIONS support
--
--By installing a pre-defined container filter, your Webservice(s) can respond to the OPTIONS Http request.
--
-- Filter(OPTIONSFilter())
--
--CORS
--
--By installing the filter of a CrossOriginResourceSharing (CORS), your WebService(s) can handle CORS requests.
--
-- cors := CrossOriginResourceSharing{ExposeHeaders: []string{"X-My-Header"}, CookiesAllowed: false, Container: DefaultContainer}
-- Filter(cors.Filter)
--
--Error Handling
--
--Unexpected things happen. If a request cannot be processed because of a failure, your service needs to tell via the response what happened and why.
--For this reason HTTP status codes exist and it is important to use the correct code in every exceptional situation.
--
-- 400: Bad Request
--
--If path or query parameters are not valid (content or type) then use http.StatusBadRequest.
--
-- 404: Not Found
--
--Despite a valid URI, the resource requested may not be available
--
-- 500: Internal Server Error
--
--If the application logic could not process the request (or write the response) then use http.StatusInternalServerError.
--
-- 405: Method Not Allowed
--
--The request has a valid URL but the method (GET,PUT,POST,...) is not allowed.
--
-- 406: Not Acceptable
--
--The request does not have or has an unknown Accept Header set for this operation.
--
-- 415: Unsupported Media Type
--
--The request does not have or has an unknown Content-Type Header set for this operation.
--
--ServiceError
--
--In addition to setting the correct (error) Http status code, you can choose to write a ServiceError message on the response.
--
--Performance options
--
--This package has several options that affect the performance of your service. It is important to understand them and how you can change it.
--
-- restful.DefaultContainer.Router(CurlyRouter{})
--
--The default router is the RouterJSR311 which is an implementation of its spec (http://jsr311.java.net/nonav/releases/1.1/spec/spec.html).
--However, it uses regular expressions for all its routes which, depending on your usecase, may consume a significant amount of time.
--The CurlyRouter implementation is more lightweight that also allows you to use wildcards and expressions, but only if needed.
--
-- restful.DefaultContainer.DoNotRecover(true)
--
--DoNotRecover controls whether panics will be caught to return HTTP 500.
--If set to true, Route functions are responsible for handling any error situation.
--Default value is false; it will recover from panics. This has performance implications.
--
-- restful.SetCacheReadEntity(false)
+-func (S) TestAttemptNextHasNext(c *C) {
+- a := aws.AttemptStrategy{}.Start()
+- c.Assert(a.Next(), Equals, true)
+- c.Assert(a.Next(), Equals, false)
-
--SetCacheReadEntity controls whether the response data ([]byte) is cached such that ReadEntity is repeatable.
--If you expect to read large amounts of payload data, and you do not use this feature, you should set it to false.
+- a = aws.AttemptStrategy{}.Start()
+- c.Assert(a.Next(), Equals, true)
+- c.Assert(a.HasNext(), Equals, false)
+- c.Assert(a.Next(), Equals, false)
-
--Trouble shooting
+- a = aws.AttemptStrategy{Total: 2e8}.Start()
+- c.Assert(a.Next(), Equals, true)
+- c.Assert(a.HasNext(), Equals, true)
+- time.Sleep(2e8)
+- c.Assert(a.HasNext(), Equals, true)
+- c.Assert(a.Next(), Equals, true)
+- c.Assert(a.Next(), Equals, false)
-
--This package has the means to produce detail logging of the complete Http request matching process and filter invocation.
--Enabling this feature requires you to set a log.Logger instance such as:
+- a = aws.AttemptStrategy{Total: 1e8, Min: 2}.Start()
+- time.Sleep(1e8)
+- c.Assert(a.Next(), Equals, true)
+- c.Assert(a.HasNext(), Equals, true)
+- c.Assert(a.Next(), Equals, true)
+- c.Assert(a.HasNext(), Equals, false)
+- c.Assert(a.Next(), Equals, false)
+-}
+diff --git a/Godeps/_workspace/src/github.com/mitchellh/goamz/aws/aws.go b/Godeps/_workspace/src/github.com/mitchellh/goamz/aws/aws.go
+deleted file mode 100644
+index c304d55..0000000
+--- a/Godeps/_workspace/src/github.com/mitchellh/goamz/aws/aws.go
++++ /dev/null
+@@ -1,423 +0,0 @@
+-//
+-// goamz - Go packages to interact with the Amazon Web Services.
+-//
+-// https://wiki.ubuntu.com/goamz
+-//
+-// Copyright (c) 2011 Canonical Ltd.
+-//
+-// Written by Gustavo Niemeyer <gustavo.niemeyer at canonical.com>
+-//
+-package aws
-
-- restful.TraceLogger(log.New(os.Stdout, "[restful] ", log.LstdFlags|log.Lshortfile))
+-import (
+- "encoding/json"
+- "errors"
+- "fmt"
+- "github.com/vaughan0/go-ini"
+- "io/ioutil"
+- "os"
+-)
-
--Resources
+-// Region defines the URLs where AWS services may be accessed.
+-//
+-// See http://goo.gl/d8BP1 for more details.
+-type Region struct {
+- Name string // the canonical name of this region.
+- EC2Endpoint string
+- S3Endpoint string
+- S3BucketEndpoint string // Not needed by AWS S3. Use ${bucket} for bucket name.
+- S3LocationConstraint bool // true if this region requires a LocationConstraint declaration.
+- S3LowercaseBucket bool // true if the region requires bucket names to be lower case.
+- SDBEndpoint string
+- SNSEndpoint string
+- SQSEndpoint string
+- IAMEndpoint string
+- ELBEndpoint string
+- AutoScalingEndpoint string
+- RdsEndpoint string
+- Route53Endpoint string
+-}
-
--[project]: https://github.com/emicklei/go-restful
+-var USGovWest = Region{
+- "us-gov-west-1",
+- "https://ec2.us-gov-west-1.amazonaws.com",
+- "https://s3-fips-us-gov-west-1.amazonaws.com",
+- "",
+- true,
+- true,
+- "",
+- "https://sns.us-gov-west-1.amazonaws.com",
+- "https://sqs.us-gov-west-1.amazonaws.com",
+- "https://iam.us-gov.amazonaws.com",
+- "https://elasticloadbalancing.us-gov-west-1.amazonaws.com",
+- "https://autoscaling.us-gov-west-1.amazonaws.com",
+- "https://rds.us-gov-west-1.amazonaws.com",
+- "https://route53.amazonaws.com",
+-}
-
--[examples]: https://github.com/emicklei/go-restful/blob/master/examples
+-var USEast = Region{
+- "us-east-1",
+- "https://ec2.us-east-1.amazonaws.com",
+- "https://s3.amazonaws.com",
+- "",
+- false,
+- false,
+- "https://sdb.amazonaws.com",
+- "https://sns.us-east-1.amazonaws.com",
+- "https://sqs.us-east-1.amazonaws.com",
+- "https://iam.amazonaws.com",
+- "https://elasticloadbalancing.us-east-1.amazonaws.com",
+- "https://autoscaling.us-east-1.amazonaws.com",
+- "https://rds.us-east-1.amazonaws.com",
+- "https://route53.amazonaws.com",
+-}
-
--[design]: http://ernestmicklei.com/2012/11/11/go-restful-api-design/
+-var USWest = Region{
+- "us-west-1",
+- "https://ec2.us-west-1.amazonaws.com",
+- "https://s3-us-west-1.amazonaws.com",
+- "",
+- true,
+- true,
+- "https://sdb.us-west-1.amazonaws.com",
+- "https://sns.us-west-1.amazonaws.com",
+- "https://sqs.us-west-1.amazonaws.com",
+- "https://iam.amazonaws.com",
+- "https://elasticloadbalancing.us-west-1.amazonaws.com",
+- "https://autoscaling.us-west-1.amazonaws.com",
+- "https://rds.us-west-1.amazonaws.com",
+- "https://route53.amazonaws.com",
+-}
-
--[showcases]: https://github.com/emicklei/mora, https://github.com/emicklei/landskape
+-var USWest2 = Region{
+- "us-west-2",
+- "https://ec2.us-west-2.amazonaws.com",
+- "https://s3-us-west-2.amazonaws.com",
+- "",
+- true,
+- true,
+- "https://sdb.us-west-2.amazonaws.com",
+- "https://sns.us-west-2.amazonaws.com",
+- "https://sqs.us-west-2.amazonaws.com",
+- "https://iam.amazonaws.com",
+- "https://elasticloadbalancing.us-west-2.amazonaws.com",
+- "https://autoscaling.us-west-2.amazonaws.com",
+- "https://rds.us-west-2.amazonaws.com",
+- "https://route53.amazonaws.com",
+-}
-
--(c) 2012-2014, http://ernestmicklei.com. MIT License
--*/
--package restful
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/doc_examples_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/doc_examples_test.go
-deleted file mode 100644
-index e1a2f3b..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/doc_examples_test.go
-+++ /dev/null
-@@ -1,35 +0,0 @@
--package restful
+-var EUWest = Region{
+- "eu-west-1",
+- "https://ec2.eu-west-1.amazonaws.com",
+- "https://s3-eu-west-1.amazonaws.com",
+- "",
+- true,
+- true,
+- "https://sdb.eu-west-1.amazonaws.com",
+- "https://sns.eu-west-1.amazonaws.com",
+- "https://sqs.eu-west-1.amazonaws.com",
+- "https://iam.amazonaws.com",
+- "https://elasticloadbalancing.eu-west-1.amazonaws.com",
+- "https://autoscaling.eu-west-1.amazonaws.com",
+- "https://rds.eu-west-1.amazonaws.com",
+- "https://route53.amazonaws.com",
+-}
-
--import "net/http"
+-var APSoutheast = Region{
+- "ap-southeast-1",
+- "https://ec2.ap-southeast-1.amazonaws.com",
+- "https://s3-ap-southeast-1.amazonaws.com",
+- "",
+- true,
+- true,
+- "https://sdb.ap-southeast-1.amazonaws.com",
+- "https://sns.ap-southeast-1.amazonaws.com",
+- "https://sqs.ap-southeast-1.amazonaws.com",
+- "https://iam.amazonaws.com",
+- "https://elasticloadbalancing.ap-southeast-1.amazonaws.com",
+- "https://autoscaling.ap-southeast-1.amazonaws.com",
+- "https://rds.ap-southeast-1.amazonaws.com",
+- "https://route53.amazonaws.com",
+-}
-
--func ExampleOPTIONSFilter() {
-- // Install the OPTIONS filter on the default Container
-- Filter(OPTIONSFilter())
+-var APSoutheast2 = Region{
+- "ap-southeast-2",
+- "https://ec2.ap-southeast-2.amazonaws.com",
+- "https://s3-ap-southeast-2.amazonaws.com",
+- "",
+- true,
+- true,
+- "https://sdb.ap-southeast-2.amazonaws.com",
+- "https://sns.ap-southeast-2.amazonaws.com",
+- "https://sqs.ap-southeast-2.amazonaws.com",
+- "https://iam.amazonaws.com",
+- "https://elasticloadbalancing.ap-southeast-2.amazonaws.com",
+- "https://autoscaling.ap-southeast-2.amazonaws.com",
+- "https://rds.ap-southeast-2.amazonaws.com",
+- "https://route53.amazonaws.com",
-}
--func ExampleContainer_OPTIONSFilter() {
-- // Install the OPTIONS filter on a Container
-- myContainer := new(Container)
-- myContainer.Filter(myContainer.OPTIONSFilter)
+-
+-var APNortheast = Region{
+- "ap-northeast-1",
+- "https://ec2.ap-northeast-1.amazonaws.com",
+- "https://s3-ap-northeast-1.amazonaws.com",
+- "",
+- true,
+- true,
+- "https://sdb.ap-northeast-1.amazonaws.com",
+- "https://sns.ap-northeast-1.amazonaws.com",
+- "https://sqs.ap-northeast-1.amazonaws.com",
+- "https://iam.amazonaws.com",
+- "https://elasticloadbalancing.ap-northeast-1.amazonaws.com",
+- "https://autoscaling.ap-northeast-1.amazonaws.com",
+- "https://rds.ap-northeast-1.amazonaws.com",
+- "https://route53.amazonaws.com",
-}
-
--func ExampleContainer() {
-- // The Default container of go-restful uses the http.DefaultServeMux.
-- // You can create your own Container using restful.NewContainer() and create a new http.Server for that particular container
+-var SAEast = Region{
+- "sa-east-1",
+- "https://ec2.sa-east-1.amazonaws.com",
+- "https://s3-sa-east-1.amazonaws.com",
+- "",
+- true,
+- true,
+- "https://sdb.sa-east-1.amazonaws.com",
+- "https://sns.sa-east-1.amazonaws.com",
+- "https://sqs.sa-east-1.amazonaws.com",
+- "https://iam.amazonaws.com",
+- "https://elasticloadbalancing.sa-east-1.amazonaws.com",
+- "https://autoscaling.sa-east-1.amazonaws.com",
+- "https://rds.sa-east-1.amazonaws.com",
+- "https://route53.amazonaws.com",
+-}
-
-- ws := new(WebService)
-- wsContainer := NewContainer()
-- wsContainer.Add(ws)
-- server := &http.Server{Addr: ":8080", Handler: wsContainer}
-- server.ListenAndServe()
+-var CNNorth = Region{
+- "cn-north-1",
+- "https://ec2.cn-north-1.amazonaws.com.cn",
+- "https://s3.cn-north-1.amazonaws.com.cn",
+- "",
+- true,
+- true,
+- "",
+- "https://sns.cn-north-1.amazonaws.com.cn",
+- "https://sqs.cn-north-1.amazonaws.com.cn",
+- "https://iam.cn-north-1.amazonaws.com.cn",
+- "https://elasticloadbalancing.cn-north-1.amazonaws.com.cn",
+- "https://autoscaling.cn-north-1.amazonaws.com.cn",
+- "https://rds.cn-north-1.amazonaws.com.cn",
+- "https://route53.amazonaws.com",
-}
-
--func ExampleCrossOriginResourceSharing() {
-- // To install this filter on the Default Container use:
-- cors := CrossOriginResourceSharing{ExposeHeaders: []string{"X-My-Header"}, CookiesAllowed: false, Container: DefaultContainer}
-- Filter(cors.Filter)
+-var Regions = map[string]Region{
+- APNortheast.Name: APNortheast,
+- APSoutheast.Name: APSoutheast,
+- APSoutheast2.Name: APSoutheast2,
+- EUWest.Name: EUWest,
+- USEast.Name: USEast,
+- USWest.Name: USWest,
+- USWest2.Name: USWest2,
+- SAEast.Name: SAEast,
+- USGovWest.Name: USGovWest,
+- CNNorth.Name: CNNorth,
-}
-
--func ExampleServiceError() {
-- resp := new(Response)
-- resp.WriteEntity(NewError(http.StatusBadRequest, "Non-integer {id} path parameter"))
+-type Auth struct {
+- AccessKey, SecretKey, Token string
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/.goconvey b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/.goconvey
-deleted file mode 100644
-index 8485e98..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/.goconvey
-+++ /dev/null
-@@ -1 +0,0 @@
--ignore
-\ No newline at end of file
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/.goconvey b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/.goconvey
-deleted file mode 100644
-index 8485e98..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/.goconvey
-+++ /dev/null
-@@ -1 +0,0 @@
--ignore
-\ No newline at end of file
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/app.yaml b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/app.yaml
-deleted file mode 100644
-index 362db6b..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/app.yaml
-+++ /dev/null
-@@ -1,20 +0,0 @@
--#
--# Include your application ID here
--#
--application: <your_app_id>
--version: 1
--runtime: go
--api_version: go1
-
--handlers:
--#
--# Regex for all swagger files to make as static content.
--# You should create the folder static/swagger and copy
--# swagger-ui into it.
--#
--- url: /apidocs/(.*?)/(.*\.(js|html|css))
-- static_files: static/swagger/\1/\2
-- upload: static/swagger/(.*?)/(.*\.(js|html|css))
+-var unreserved = make([]bool, 128)
+-var hex = "0123456789ABCDEF"
-
--- url: /.*
-- script: _go_app
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/datastore/.goconvey b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/datastore/.goconvey
-deleted file mode 100644
-index 8485e98..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/datastore/.goconvey
-+++ /dev/null
-@@ -1 +0,0 @@
--ignore
-\ No newline at end of file
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/datastore/app.yaml b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/datastore/app.yaml
-deleted file mode 100644
-index 33883d1..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/datastore/app.yaml
-+++ /dev/null
-@@ -1,18 +0,0 @@
--application: datastore-example
--version: 1
--runtime: go
--api_version: go1
+-func init() {
+- // RFC3986
+- u := "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz01234567890-_.~"
+- for _, c := range u {
+- unreserved[c] = true
+- }
+-}
-
--handlers:
--# Regex for all swagger files to make as static content.
--# You should create the folder static/swagger and copy
--# swagger-ui into it.
--#
--- url: /apidocs/(.*?)/(.*\.(js|html|css))
-- static_files: static/swagger/\1/\2
-- upload: static/swagger/(.*?)/(.*\.(js|html|css))
+-type credentials struct {
+- Code string
+- LastUpdated string
+- Type string
+- AccessKeyId string
+- SecretAccessKey string
+- Token string
+- Expiration string
+-}
-
--# Catch all.
--- url: /.*
-- script: _go_app
-- login: required
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/datastore/main.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/datastore/main.go
-deleted file mode 100644
-index cf832ef..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/datastore/main.go
-+++ /dev/null
-@@ -1,266 +0,0 @@
--package main
+-// GetMetaData retrieves instance metadata about the current machine.
+-//
+-// See http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/AESDG-chapter-instancedata.html for more details.
+-func GetMetaData(path string) (contents []byte, err error) {
+- url := "http://169.254.169.254/latest/meta-data/" + path
-
--import (
-- "appengine"
-- "appengine/datastore"
-- "appengine/user"
-- "github.com/emicklei/go-restful"
-- "github.com/emicklei/go-restful/swagger"
-- "net/http"
-- "time"
--)
+- resp, err := RetryingClient.Get(url)
+- if err != nil {
+- return
+- }
+- defer resp.Body.Close()
-
--// This example demonstrates a reasonably complete suite of RESTful operations backed
--// by DataStore on Google App Engine.
+- if resp.StatusCode != 200 {
+- err = fmt.Errorf("Code %d returned for url %s", resp.StatusCode, url)
+- return
+- }
-
--// Our simple example struct.
--type Profile struct {
-- LastModified time.Time `json:"-" xml:"-"`
-- Email string `json:"-" xml:"-"`
-- FirstName string `json:"first_name" xml:"first-name"`
-- NickName string `json:"nick_name" xml:"nick-name"`
-- LastName string `json:"last_name" xml:"last-name"`
+- body, err := ioutil.ReadAll(resp.Body)
+- if err != nil {
+- return
+- }
+- return []byte(body), err
-}
-
--type ProfileApi struct {
-- Path string
--}
+-func getInstanceCredentials() (cred credentials, err error) {
+- credentialPath := "iam/security-credentials/"
-
--func gaeUrl() string {
-- if appengine.IsDevAppServer() {
-- return "http://localhost:8080"
-- } else {
-- // Include your URL on App Engine here.
-- // I found no way to get AppID without appengine.Context and this always
-- // based on a http.Request.
-- return "http://federatedservices.appspot.com"
+- // Get the instance role
+- role, err := GetMetaData(credentialPath)
+- if err != nil {
+- return
+- }
+-
+- // Get the instance role credentials
+- credentialJSON, err := GetMetaData(credentialPath + string(role))
+- if err != nil {
+- return
- }
+-
+- err = json.Unmarshal([]byte(credentialJSON), &cred)
+- return
-}
-
--func init() {
-- u := ProfileApi{Path: "/profiles"}
-- u.register()
+-// GetAuth creates an Auth based on either passed in credentials,
+-// environment information or instance based role credentials.
+-func GetAuth(accessKey string, secretKey string) (auth Auth, err error) {
+- // First try passed in credentials
+- if accessKey != "" && secretKey != "" {
+- return Auth{accessKey, secretKey, ""}, nil
+- }
-
-- // Optionally, you can install the Swagger Service which provides a nice Web UI on your REST API
-- // You need to download the Swagger HTML5 assets and change the FilePath location in the config below.
-- // Open <your_app_id>.appspot.com/apidocs and enter
-- // Place the Swagger UI files into a folder called static/swagger if you wish to use Swagger
-- // http://<your_app_id>.appspot.com/apidocs.json in the api input field.
-- // For testing, you can use http://localhost:8080/apidocs.json
-- config := swagger.Config{
-- // You control what services are visible
-- WebServices: restful.RegisteredWebServices(),
-- WebServicesUrl: gaeUrl(),
-- ApiPath: "/apidocs.json",
+- // Next try to get auth from the environment
+- auth, err = SharedAuth()
+- if err == nil {
+- // Found auth, return
+- return
+- }
-
-- // Optionally, specifiy where the UI is located
-- SwaggerPath: "/apidocs/",
+- // Next try to get auth from the environment
+- auth, err = EnvAuth()
+- if err == nil {
+- // Found auth, return
+- return
+- }
-
-- // GAE support static content which is configured in your app.yaml.
-- // This example expect the swagger-ui in static/swagger so you should place it there :)
-- SwaggerFilePath: "static/swagger"}
-- swagger.InstallSwaggerService(config)
+- // Next try getting auth from the instance role
+- cred, err := getInstanceCredentials()
+- if err == nil {
+- // Found auth, return
+- auth.AccessKey = cred.AccessKeyId
+- auth.SecretKey = cred.SecretAccessKey
+- auth.Token = cred.Token
+- return
+- }
+- err = errors.New("No valid AWS authentication found")
+- return
-}
-
--func (u ProfileApi) register() {
-- ws := new(restful.WebService)
+-// SharedAuth creates an Auth based on shared credentials stored in
+-// $HOME/.aws/credentials. The AWS_PROFILE environment variables is used to
+-// select the profile.
+-func SharedAuth() (auth Auth, err error) {
+- var profileName = os.Getenv("AWS_PROFILE")
-
-- ws.
-- Path(u.Path).
-- // You can specify consumes and produces per route as well.
-- Consumes(restful.MIME_JSON, restful.MIME_XML).
-- Produces(restful.MIME_JSON, restful.MIME_XML)
+- if profileName == "" {
+- profileName = "default"
+- }
-
-- ws.Route(ws.POST("").To(u.insert).
-- // Swagger documentation.
-- Doc("insert a new profile").
-- Param(ws.BodyParameter("Profile", "representation of a profile").DataType("main.Profile")).
-- Reads(Profile{}))
+- var homeDir = os.Getenv("HOME")
+- if homeDir == "" {
+- err = errors.New("Could not get HOME")
+- return
+- }
-
-- ws.Route(ws.GET("/{profile-id}").To(u.read).
-- // Swagger documentation.
-- Doc("read a profile").
-- Param(ws.PathParameter("profile-id", "identifier for a profile").DataType("string")).
-- Writes(Profile{}))
+- var credentialsFile = homeDir + "/.aws/credentials"
+- file, err := ini.LoadFile(credentialsFile)
+- if err != nil {
+- err = errors.New("Couldn't parse AWS credentials file")
+- return
+- }
-
-- ws.Route(ws.PUT("/{profile-id}").To(u.update).
-- // Swagger documentation.
-- Doc("update an existing profile").
-- Param(ws.PathParameter("profile-id", "identifier for a profile").DataType("string")).
-- Param(ws.BodyParameter("Profile", "representation of a profile").DataType("main.Profile")).
-- Reads(Profile{}))
+- var profile = file[profileName]
+- if profile == nil {
+- err = errors.New("Couldn't find profile in AWS credentials file")
+- return
+- }
-
-- ws.Route(ws.DELETE("/{profile-id}").To(u.remove).
-- // Swagger documentation.
-- Doc("remove a profile").
-- Param(ws.PathParameter("profile-id", "identifier for a profile").DataType("string")))
+- auth.AccessKey = profile["aws_access_key_id"]
+- auth.SecretKey = profile["aws_secret_access_key"]
-
-- restful.Add(ws)
+- if auth.AccessKey == "" {
+- err = errors.New("AWS_ACCESS_KEY_ID not found in environment in credentials file")
+- }
+- if auth.SecretKey == "" {
+- err = errors.New("AWS_SECRET_ACCESS_KEY not found in credentials file")
+- }
+- return
-}
-
--// POST http://localhost:8080/profiles
--// {"first_name": "Ivan", "nick_name": "Socks", "last_name": "Hawkes"}
--//
--func (u *ProfileApi) insert(r *restful.Request, w *restful.Response) {
-- c := appengine.NewContext(r.Request)
+-// EnvAuth creates an Auth based on environment information.
+-// The AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY environment
+-// For accounts that require a security token, it is read from AWS_SECURITY_TOKEN
+-// variables are used.
+-func EnvAuth() (auth Auth, err error) {
+- auth.AccessKey = os.Getenv("AWS_ACCESS_KEY_ID")
+- if auth.AccessKey == "" {
+- auth.AccessKey = os.Getenv("AWS_ACCESS_KEY")
+- }
-
-- // Marshall the entity from the request into a struct.
-- p := new(Profile)
-- err := r.ReadEntity(&p)
-- if err != nil {
-- w.WriteError(http.StatusNotAcceptable, err)
-- return
+- auth.SecretKey = os.Getenv("AWS_SECRET_ACCESS_KEY")
+- if auth.SecretKey == "" {
+- auth.SecretKey = os.Getenv("AWS_SECRET_KEY")
- }
-
-- // Ensure we start with a sensible value for this field.
-- p.LastModified = time.Now()
+- auth.Token = os.Getenv("AWS_SECURITY_TOKEN")
-
-- // The profile belongs to this user.
-- p.Email = user.Current(c).String()
+- if auth.AccessKey == "" {
+- err = errors.New("AWS_ACCESS_KEY_ID or AWS_ACCESS_KEY not found in environment")
+- }
+- if auth.SecretKey == "" {
+- err = errors.New("AWS_SECRET_ACCESS_KEY or AWS_SECRET_KEY not found in environment")
+- }
+- return
+-}
-
-- k, err := datastore.Put(c, datastore.NewIncompleteKey(c, "profiles", nil), p)
-- if err != nil {
-- http.Error(w, err.Error(), http.StatusInternalServerError)
-- return
+-// Encode takes a string and URI-encodes it in a way suitable
+-// to be used in AWS signatures.
+-func Encode(s string) string {
+- encode := false
+- for i := 0; i != len(s); i++ {
+- c := s[i]
+- if c > 127 || !unreserved[c] {
+- encode = true
+- break
+- }
+- }
+- if !encode {
+- return s
+- }
+- e := make([]byte, len(s)*3)
+- ei := 0
+- for i := 0; i != len(s); i++ {
+- c := s[i]
+- if c > 127 || !unreserved[c] {
+- e[ei] = '%'
+- e[ei+1] = hex[c>>4]
+- e[ei+2] = hex[c&0xF]
+- ei += 3
+- } else {
+- e[ei] = c
+- ei += 1
+- }
- }
+- return string(e[:ei])
+-}
+diff --git a/Godeps/_workspace/src/github.com/mitchellh/goamz/aws/aws_test.go b/Godeps/_workspace/src/github.com/mitchellh/goamz/aws/aws_test.go
+deleted file mode 100644
+index 78cbbaf..0000000
+--- a/Godeps/_workspace/src/github.com/mitchellh/goamz/aws/aws_test.go
++++ /dev/null
+@@ -1,203 +0,0 @@
+-package aws_test
-
-- // Let them know the location of the newly created resource.
-- // TODO: Use a safe Url path append function.
-- w.AddHeader("Location", u.Path+"/"+k.Encode())
+-import (
+- "github.com/mitchellh/goamz/aws"
+- . "github.com/motain/gocheck"
+- "io/ioutil"
+- "os"
+- "strings"
+- "testing"
+-)
-
-- // Return the resultant entity.
-- w.WriteHeader(http.StatusCreated)
-- w.WriteEntity(p)
+-func Test(t *testing.T) {
+- TestingT(t)
-}
-
--// GET http://localhost:8080/profiles/ahdkZXZ-ZmVkZXJhdGlvbi1zZXJ2aWNlc3IVCxIIcHJvZmlsZXMYgICAgICAgAoM
--//
--func (u ProfileApi) read(r *restful.Request, w *restful.Response) {
-- c := appengine.NewContext(r.Request)
+-var _ = Suite(&S{})
-
-- // Decode the request parameter to determine the key for the entity.
-- k, err := datastore.DecodeKey(r.PathParameter("profile-id"))
-- if err != nil {
-- http.Error(w, err.Error(), http.StatusBadRequest)
-- return
-- }
+-type S struct {
+- environ []string
+-}
-
-- // Retrieve the entity from the datastore.
-- p := Profile{}
-- if err := datastore.Get(c, k, &p); err != nil {
-- if err.Error() == "datastore: no such entity" {
-- http.Error(w, err.Error(), http.StatusNotFound)
-- } else {
-- http.Error(w, err.Error(), http.StatusInternalServerError)
-- }
-- return
+-func (s *S) SetUpSuite(c *C) {
+- s.environ = os.Environ()
+-}
+-
+-func (s *S) TearDownTest(c *C) {
+- os.Clearenv()
+- for _, kv := range s.environ {
+- l := strings.SplitN(kv, "=", 2)
+- os.Setenv(l[0], l[1])
- }
+-}
-
-- // Check we own the profile before allowing them to view it.
-- // Optionally, return a 404 instead to help prevent guessing ids.
-- // TODO: Allow admins access.
-- if p.Email != user.Current(c).String() {
-- http.Error(w, "You do not have access to this resource", http.StatusForbidden)
-- return
-- }
+-func (s *S) TestSharedAuthNoHome(c *C) {
+- os.Clearenv()
+- os.Setenv("AWS_PROFILE", "foo")
+- _, err := aws.SharedAuth()
+- c.Assert(err, ErrorMatches, "Could not get HOME")
+-}
-
-- w.WriteEntity(p)
+-func (s *S) TestSharedAuthNoCredentialsFile(c *C) {
+- os.Clearenv()
+- os.Setenv("AWS_PROFILE", "foo")
+- os.Setenv("HOME", "/tmp")
+- _, err := aws.SharedAuth()
+- c.Assert(err, ErrorMatches, "Couldn't parse AWS credentials file")
-}
-
--// PUT http://localhost:8080/profiles/ahdkZXZ-ZmVkZXJhdGlvbi1zZXJ2aWNlc3IVCxIIcHJvZmlsZXMYgICAgICAgAoM
--// {"first_name": "Ivan", "nick_name": "Socks", "last_name": "Hawkes"}
--//
--func (u *ProfileApi) update(r *restful.Request, w *restful.Response) {
-- c := appengine.NewContext(r.Request)
+-func (s *S) TestSharedAuthNoProfileInFile(c *C) {
+- os.Clearenv()
+- os.Setenv("AWS_PROFILE", "foo")
-
-- // Decode the request parameter to determine the key for the entity.
-- k, err := datastore.DecodeKey(r.PathParameter("profile-id"))
+- d, err := ioutil.TempDir("", "")
- if err != nil {
-- http.Error(w, err.Error(), http.StatusBadRequest)
-- return
+- panic(err)
- }
+- defer os.RemoveAll(d)
-
-- // Marshall the entity from the request into a struct.
-- p := new(Profile)
-- err = r.ReadEntity(&p)
+- err = os.Mkdir(d+"/.aws", 0755)
- if err != nil {
-- w.WriteError(http.StatusNotAcceptable, err)
-- return
+- panic(err)
- }
-
-- // Retrieve the old entity from the datastore.
-- old := Profile{}
-- if err := datastore.Get(c, k, &old); err != nil {
-- if err.Error() == "datastore: no such entity" {
-- http.Error(w, err.Error(), http.StatusNotFound)
-- } else {
-- http.Error(w, err.Error(), http.StatusInternalServerError)
-- }
-- return
-- }
+- ioutil.WriteFile(d+"/.aws/credentials", []byte("[bar]\n"), 0644)
+- os.Setenv("HOME", d)
-
-- // Check we own the profile before allowing them to update it.
-- // Optionally, return a 404 instead to help prevent guessing ids.
-- // TODO: Allow admins access.
-- if old.Email != user.Current(c).String() {
-- http.Error(w, "You do not have access to this resource", http.StatusForbidden)
-- return
-- }
+- _, err = aws.SharedAuth()
+- c.Assert(err, ErrorMatches, "Couldn't find profile in AWS credentials file")
+-}
-
-- // Since the whole entity is re-written, we need to assign any invariant fields again
-- // e.g. the owner of the entity.
-- p.Email = user.Current(c).String()
+-func (s *S) TestSharedAuthNoKeysInProfile(c *C) {
+- os.Clearenv()
+- os.Setenv("AWS_PROFILE", "bar")
-
-- // Keep track of the last modification date.
-- p.LastModified = time.Now()
+- d, err := ioutil.TempDir("", "")
+- if err != nil {
+- panic(err)
+- }
+- defer os.RemoveAll(d)
-
-- // Attempt to overwrite the old entity.
-- _, err = datastore.Put(c, k, p)
+- err = os.Mkdir(d+"/.aws", 0755)
- if err != nil {
-- http.Error(w, err.Error(), http.StatusInternalServerError)
-- return
+- panic(err)
- }
-
-- // Let them know it succeeded.
-- w.WriteHeader(http.StatusNoContent)
+- ioutil.WriteFile(d+"/.aws/credentials", []byte("[bar]\nawsaccesskeyid = AK.."), 0644)
+- os.Setenv("HOME", d)
+-
+- _, err = aws.SharedAuth()
+- c.Assert(err, ErrorMatches, "AWS_SECRET_ACCESS_KEY not found in credentials file")
-}
-
--// DELETE http://localhost:8080/profiles/ahdkZXZ-ZmVkZXJhdGlvbi1zZXJ2aWNlc3IVCxIIcHJvZmlsZXMYgICAgICAgAoM
--//
--func (u *ProfileApi) remove(r *restful.Request, w *restful.Response) {
-- c := appengine.NewContext(r.Request)
+-func (s *S) TestSharedAuthDefaultCredentials(c *C) {
+- os.Clearenv()
-
-- // Decode the request parameter to determine the key for the entity.
-- k, err := datastore.DecodeKey(r.PathParameter("profile-id"))
+- d, err := ioutil.TempDir("", "")
- if err != nil {
-- http.Error(w, err.Error(), http.StatusBadRequest)
-- return
-- }
--
-- // Retrieve the old entity from the datastore.
-- old := Profile{}
-- if err := datastore.Get(c, k, &old); err != nil {
-- if err.Error() == "datastore: no such entity" {
-- http.Error(w, err.Error(), http.StatusNotFound)
-- } else {
-- http.Error(w, err.Error(), http.StatusInternalServerError)
-- }
-- return
+- panic(err)
- }
+- defer os.RemoveAll(d)
-
-- // Check we own the profile before allowing them to delete it.
-- // Optionally, return a 404 instead to help prevent guessing ids.
-- // TODO: Allow admins access.
-- if old.Email != user.Current(c).String() {
-- http.Error(w, "You do not have access to this resource", http.StatusForbidden)
-- return
+- err = os.Mkdir(d+"/.aws", 0755)
+- if err != nil {
+- panic(err)
- }
-
-- // Delete the entity.
-- if err := datastore.Delete(c, k); err != nil {
-- http.Error(w, err.Error(), http.StatusInternalServerError)
-- }
+- ioutil.WriteFile(d+"/.aws/credentials", []byte("[default]\naws_access_key_id = access\naws_secret_access_key = secret\n"), 0644)
+- os.Setenv("HOME", d)
-
-- // Success notification.
-- w.WriteHeader(http.StatusNoContent)
+- auth, err := aws.SharedAuth()
+- c.Assert(err, IsNil)
+- c.Assert(auth, Equals, aws.Auth{SecretKey: "secret", AccessKey: "access"})
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/restful-appstats-integration.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/restful-appstats-integration.go
-deleted file mode 100644
-index b3261ee..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/restful-appstats-integration.go
-+++ /dev/null
-@@ -1,13 +0,0 @@
--package main
--
--import (
-- "github.com/mjibson/appstats"
--)
-
+-func (s *S) TestSharedAuth(c *C) {
+- os.Clearenv()
+- os.Setenv("AWS_PROFILE", "bar")
-
--func stats(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
-- c := appstats.NewContext(req.Request)
-- chain.ProcessFilter(req, resp)
-- c.Stats.Status = resp.StatusCode()
-- c.Save()
--}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/restful-user-service.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/restful-user-service.go
-deleted file mode 100644
-index e97ba2e..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/restful-user-service.go
-+++ /dev/null
-@@ -1,161 +0,0 @@
--package main
+- d, err := ioutil.TempDir("", "")
+- if err != nil {
+- panic(err)
+- }
+- defer os.RemoveAll(d)
-
--import (
-- "appengine"
-- "appengine/memcache"
-- "github.com/emicklei/go-restful"
-- "github.com/emicklei/go-restful/swagger"
-- "net/http"
--)
+- err = os.Mkdir(d+"/.aws", 0755)
+- if err != nil {
+- panic(err)
+- }
-
--// This example is functionally the same as ../restful-user-service.go
--// but it`s supposed to run on Goole App Engine (GAE)
--//
--// contributed by ivanhawkes
+- ioutil.WriteFile(d+"/.aws/credentials", []byte("[bar]\naws_access_key_id = access\naws_secret_access_key = secret\n"), 0644)
+- os.Setenv("HOME", d)
-
--type User struct {
-- Id, Name string
+- auth, err := aws.SharedAuth()
+- c.Assert(err, IsNil)
+- c.Assert(auth, Equals, aws.Auth{SecretKey: "secret", AccessKey: "access"})
-}
-
--type UserService struct {
-- // normally one would use DAO (data access object)
-- // but in this example we simple use memcache.
+-func (s *S) TestEnvAuthNoSecret(c *C) {
+- os.Clearenv()
+- _, err := aws.EnvAuth()
+- c.Assert(err, ErrorMatches, "AWS_SECRET_ACCESS_KEY or AWS_SECRET_KEY not found in environment")
-}
-
--func (u UserService) Register() {
-- ws := new(restful.WebService)
--
-- ws.
-- Path("/users").
-- Consumes(restful.MIME_XML, restful.MIME_JSON).
-- Produces(restful.MIME_JSON, restful.MIME_XML) // you can specify this per route as well
--
-- ws.Route(ws.GET("/{user-id}").To(u.findUser).
-- // docs
-- Doc("get a user").
-- Param(ws.PathParameter("user-id", "identifier of the user").DataType("string")).
-- Writes(User{})) // on the response
--
-- ws.Route(ws.PATCH("").To(u.updateUser).
-- // docs
-- Doc("update a user").
-- Reads(User{})) // from the request
--
-- ws.Route(ws.PUT("/{user-id}").To(u.createUser).
-- // docs
-- Doc("create a user").
-- Param(ws.PathParameter("user-id", "identifier of the user").DataType("string")).
-- Reads(User{})) // from the request
--
-- ws.Route(ws.DELETE("/{user-id}").To(u.removeUser).
-- // docs
-- Doc("delete a user").
-- Param(ws.PathParameter("user-id", "identifier of the user").DataType("string")))
--
-- restful.Add(ws)
+-func (s *S) TestEnvAuthNoAccess(c *C) {
+- os.Clearenv()
+- os.Setenv("AWS_SECRET_ACCESS_KEY", "foo")
+- _, err := aws.EnvAuth()
+- c.Assert(err, ErrorMatches, "AWS_ACCESS_KEY_ID or AWS_ACCESS_KEY not found in environment")
-}
-
--// GET http://localhost:8080/users/1
--//
--func (u UserService) findUser(request *restful.Request, response *restful.Response) {
-- c := appengine.NewContext(request.Request)
-- id := request.PathParameter("user-id")
-- usr := new(User)
-- _, err := memcache.Gob.Get(c, id, &usr)
-- if err != nil || len(usr.Id) == 0 {
-- response.WriteErrorString(http.StatusNotFound, "User could not be found.")
-- } else {
-- response.WriteEntity(usr)
-- }
+-func (s *S) TestEnvAuth(c *C) {
+- os.Clearenv()
+- os.Setenv("AWS_SECRET_ACCESS_KEY", "secret")
+- os.Setenv("AWS_ACCESS_KEY_ID", "access")
+- auth, err := aws.EnvAuth()
+- c.Assert(err, IsNil)
+- c.Assert(auth, Equals, aws.Auth{SecretKey: "secret", AccessKey: "access"})
-}
-
--// PATCH http://localhost:8080/users
--// <User><Id>1</Id><Name>Melissa Raspberry</Name></User>
--//
--func (u *UserService) updateUser(request *restful.Request, response *restful.Response) {
-- c := appengine.NewContext(request.Request)
-- usr := new(User)
-- err := request.ReadEntity(&usr)
-- if err == nil {
-- item := &memcache.Item{
-- Key: usr.Id,
-- Object: &usr,
-- }
-- err = memcache.Gob.Set(c, item)
-- if err != nil {
-- response.WriteError(http.StatusInternalServerError, err)
-- return
-- }
-- response.WriteEntity(usr)
-- } else {
-- response.WriteError(http.StatusInternalServerError, err)
-- }
+-func (s *S) TestEnvAuthWithToken(c *C) {
+- os.Clearenv()
+- os.Setenv("AWS_SECRET_ACCESS_KEY", "secret")
+- os.Setenv("AWS_ACCESS_KEY_ID", "access")
+- os.Setenv("AWS_SECURITY_TOKEN", "token")
+- auth, err := aws.EnvAuth()
+- c.Assert(err, IsNil)
+- c.Assert(auth, Equals, aws.Auth{SecretKey: "secret", AccessKey: "access", Token: "token"})
-}
-
--// PUT http://localhost:8080/users/1
--// <User><Id>1</Id><Name>Melissa</Name></User>
--//
--func (u *UserService) createUser(request *restful.Request, response *restful.Response) {
-- c := appengine.NewContext(request.Request)
-- usr := User{Id: request.PathParameter("user-id")}
-- err := request.ReadEntity(&usr)
-- if err == nil {
-- item := &memcache.Item{
-- Key: usr.Id,
-- Object: &usr,
-- }
-- err = memcache.Gob.Add(c, item)
-- if err != nil {
-- response.WriteError(http.StatusInternalServerError, err)
-- return
-- }
-- response.WriteHeader(http.StatusCreated)
-- response.WriteEntity(usr)
-- } else {
-- response.WriteError(http.StatusInternalServerError, err)
-- }
+-func (s *S) TestEnvAuthAlt(c *C) {
+- os.Clearenv()
+- os.Setenv("AWS_SECRET_KEY", "secret")
+- os.Setenv("AWS_ACCESS_KEY", "access")
+- auth, err := aws.EnvAuth()
+- c.Assert(err, IsNil)
+- c.Assert(auth, Equals, aws.Auth{SecretKey: "secret", AccessKey: "access"})
-}
-
--// DELETE http://localhost:8080/users/1
--//
--func (u *UserService) removeUser(request *restful.Request, response *restful.Response) {
-- c := appengine.NewContext(request.Request)
-- id := request.PathParameter("user-id")
-- err := memcache.Delete(c, id)
-- if err != nil {
-- response.WriteError(http.StatusInternalServerError, err)
-- }
+-func (s *S) TestGetAuthStatic(c *C) {
+- auth, err := aws.GetAuth("access", "secret")
+- c.Assert(err, IsNil)
+- c.Assert(auth, Equals, aws.Auth{SecretKey: "secret", AccessKey: "access"})
-}
-
--func getGaeURL() string {
-- if appengine.IsDevAppServer() {
-- return "http://localhost:8080"
-- } else {
-- /**
-- * Include your URL on App Engine here.
-- * I found no way to get AppID without appengine.Context and this always
-- * based on a http.Request.
-- */
-- return "http://<your_app_id>.appspot.com"
-- }
+-func (s *S) TestGetAuthEnv(c *C) {
+- os.Clearenv()
+- os.Setenv("AWS_SECRET_ACCESS_KEY", "secret")
+- os.Setenv("AWS_ACCESS_KEY_ID", "access")
+- auth, err := aws.GetAuth("", "")
+- c.Assert(err, IsNil)
+- c.Assert(auth, Equals, aws.Auth{SecretKey: "secret", AccessKey: "access"})
-}
-
--func init() {
-- u := UserService{}
-- u.Register()
--
-- // Optionally, you can install the Swagger Service which provides a nice Web UI on your REST API
-- // You need to download the Swagger HTML5 assets and change the FilePath location in the config below.
-- // Open <your_app_id>.appspot.com/apidocs and enter http://<your_app_id>.appspot.com/apidocs.json in the api input field.
-- config := swagger.Config{
-- WebServices: restful.RegisteredWebServices(), // you control what services are visible
-- WebServicesUrl: getGaeURL(),
-- ApiPath: "/apidocs.json",
--
-- // Optionally, specifiy where the UI is located
-- SwaggerPath: "/apidocs/",
-- // GAE support static content which is configured in your app.yaml.
-- // This example expect the swagger-ui in static/swagger so you should place it there :)
-- SwaggerFilePath: "static/swagger"}
-- swagger.InstallSwaggerService(config)
+-func (s *S) TestEncode(c *C) {
+- c.Assert(aws.Encode("foo"), Equals, "foo")
+- c.Assert(aws.Encode("/"), Equals, "%2F")
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/home.html b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/home.html
-deleted file mode 100644
-index e5d49b4..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/home.html
-+++ /dev/null
-@@ -1,7 +0,0 @@
--<!DOCTYPE html>
-
--<html>
--<body>
-- <h1>{{.Text}}</h1>
--</body>
--</html>
-\ No newline at end of file
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-CORS-filter.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-CORS-filter.go
+-func (s *S) TestRegionsAreNamed(c *C) {
+- for n, r := range aws.Regions {
+- c.Assert(n, Equals, r.Name)
+- }
+-}
+diff --git a/Godeps/_workspace/src/github.com/mitchellh/goamz/aws/client.go b/Godeps/_workspace/src/github.com/mitchellh/goamz/aws/client.go
deleted file mode 100644
-index aacaa3d..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-CORS-filter.go
+index ee53238..0000000
+--- a/Godeps/_workspace/src/github.com/mitchellh/goamz/aws/client.go
+++ /dev/null
-@@ -1,67 +0,0 @@
--package main
+@@ -1,125 +0,0 @@
+-package aws
-
-import (
-- "io"
-- "log"
+- "math"
+- "net"
- "net/http"
--
-- "github.com/emicklei/go-restful"
+- "time"
-)
-
--// Cross-origin resource sharing (CORS) is a mechanism that allows JavaScript on a web page
--// to make XMLHttpRequests to another domain, not the domain the JavaScript originated from.
--//
--// http://en.wikipedia.org/wiki/Cross-origin_resource_sharing
--// http://enable-cors.org/server.html
--//
--// GET http://localhost:8080/users
--//
--// GET http://localhost:8080/users/1
--//
--// PUT http://localhost:8080/users/1
--//
--// DELETE http://localhost:8080/users/1
--//
--// OPTIONS http://localhost:8080/users/1 with Header "Origin" set to some domain and
--
--type UserResource struct{}
+-type RetryableFunc func(*http.Request, *http.Response, error) bool
+-type WaitFunc func(try int)
+-type DeadlineFunc func() time.Time
-
--func (u UserResource) RegisterTo(container *restful.Container) {
-- ws := new(restful.WebService)
-- ws.
-- Path("/users").
-- Consumes("*/*").
-- Produces("*/*")
+-type ResilientTransport struct {
+- // Timeout is the maximum amount of time a dial will wait for
+- // a connect to complete.
+- //
+- // The default is no timeout.
+- //
+- // With or without a timeout, the operating system may impose
+- // its own earlier timeout. For instance, TCP timeouts are
+- // often around 3 minutes.
+- DialTimeout time.Duration
-
-- ws.Route(ws.GET("/{user-id}").To(u.nop))
-- ws.Route(ws.POST("").To(u.nop))
-- ws.Route(ws.PUT("/{user-id}").To(u.nop))
-- ws.Route(ws.DELETE("/{user-id}").To(u.nop))
+- // MaxTries, if non-zero, specifies the number of times we will retry on
+- // failure. Retries are only attempted for temporary network errors or known
+- // safe failures.
+- MaxTries int
+- Deadline DeadlineFunc
+- ShouldRetry RetryableFunc
+- Wait WaitFunc
+- transport *http.Transport
+-}
-
-- container.Add(ws)
+-// Convenience method for creating an http client
+-func NewClient(rt *ResilientTransport) *http.Client {
+- rt.transport = &http.Transport{
+- Dial: func(netw, addr string) (net.Conn, error) {
+- c, err := net.DialTimeout(netw, addr, rt.DialTimeout)
+- if err != nil {
+- return nil, err
+- }
+- c.SetDeadline(rt.Deadline())
+- return c, nil
+- },
+- DisableKeepAlives: true,
+- Proxy: http.ProxyFromEnvironment,
+- }
+- // TODO: Would be nice is ResilientTransport allowed clients to initialize
+- // with http.Transport attributes.
+- return &http.Client{
+- Transport: rt,
+- }
-}
-
--func (u UserResource) nop(request *restful.Request, response *restful.Response) {
-- io.WriteString(response.ResponseWriter, "this would be a normal response")
+-var retryingTransport = &ResilientTransport{
+- Deadline: func() time.Time {
+- return time.Now().Add(5 * time.Second)
+- },
+- DialTimeout: 10 * time.Second,
+- MaxTries: 3,
+- ShouldRetry: awsRetry,
+- Wait: ExpBackoff,
-}
-
--func main() {
-- wsContainer := restful.NewContainer()
-- u := UserResource{}
-- u.RegisterTo(wsContainer)
+-// Exported default client
+-var RetryingClient = NewClient(retryingTransport)
-
-- // Add container filter to enable CORS
-- cors := restful.CrossOriginResourceSharing{
-- ExposeHeaders: []string{"X-My-Header"},
-- AllowedHeaders: []string{"Content-Type"},
-- CookiesAllowed: false,
-- Container: wsContainer}
-- wsContainer.Filter(cors.Filter)
+-func (t *ResilientTransport) RoundTrip(req *http.Request) (*http.Response, error) {
+- return t.tries(req)
+-}
-
-- // Add container filter to respond to OPTIONS
-- wsContainer.Filter(wsContainer.OPTIONSFilter)
+-// Retry a request a maximum of t.MaxTries times.
+-// We'll only retry if the proper criteria are met.
+-// If a wait function is specified, wait that amount of time
+-// In between requests.
+-func (t *ResilientTransport) tries(req *http.Request) (res *http.Response, err error) {
+- for try := 0; try < t.MaxTries; try += 1 {
+- res, err = t.transport.RoundTrip(req)
-
-- log.Printf("start listening on localhost:8080")
-- server := &http.Server{Addr: ":8080", Handler: wsContainer}
-- log.Fatal(server.ListenAndServe())
+- if !t.ShouldRetry(req, res, err) {
+- break
+- }
+- if res != nil {
+- res.Body.Close()
+- }
+- if t.Wait != nil {
+- t.Wait(try)
+- }
+- }
+-
+- return
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-NCSA-logging.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-NCSA-logging.go
-deleted file mode 100644
-index 0cda50d..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-NCSA-logging.go
-+++ /dev/null
-@@ -1,54 +0,0 @@
--package main
-
--import (
-- "github.com/emicklei/go-restful"
-- "io"
-- "log"
-- "net/http"
-- "os"
-- "strings"
-- "time"
--)
+-func ExpBackoff(try int) {
+- time.Sleep(100 * time.Millisecond *
+- time.Duration(math.Exp2(float64(try))))
+-}
-
--// This example shows how to create a filter that produces log lines
--// according to the Common Log Format, also known as the NCSA standard.
--//
--// kindly contributed by leehambley
--//
--// GET http://localhost:8080/ping
+-func LinearBackoff(try int) {
+- time.Sleep(time.Duration(try*100) * time.Millisecond)
+-}
-
--var logger *log.Logger = log.New(os.Stdout, "", 0)
+-// Decide if we should retry a request.
+-// In general, the criteria for retrying a request is described here
+-// http://docs.aws.amazon.com/general/latest/gr/api-retries.html
+-func awsRetry(req *http.Request, res *http.Response, err error) bool {
+- retry := false
-
--func NCSACommonLogFormatLogger() restful.FilterFunction {
-- return func(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
-- var username = "-"
-- if req.Request.URL.User != nil {
-- if name := req.Request.URL.User.Username(); name != "" {
-- username = name
-- }
+- // Retry if there's a temporary network error.
+- if neterr, ok := err.(net.Error); ok {
+- if neterr.Temporary() {
+- retry = true
- }
-- chain.ProcessFilter(req, resp)
-- logger.Printf("%s - %s [%s] \"%s %s %s\" %d %d",
-- strings.Split(req.Request.RemoteAddr, ":")[0],
-- username,
-- time.Now().Format("02/Jan/2006:15:04:05 -0700"),
-- req.Request.Method,
-- req.Request.URL.RequestURI(),
-- req.Request.Proto,
-- resp.StatusCode(),
-- resp.ContentLength(),
-- )
- }
--}
-
--func main() {
-- ws := new(restful.WebService)
-- ws.Filter(NCSACommonLogFormatLogger())
-- ws.Route(ws.GET("/ping").To(hello))
-- restful.Add(ws)
-- http.ListenAndServe(":8080", nil)
--}
+- // Retry if we get a 5xx series error.
+- if res != nil {
+- if res.StatusCode >= 500 && res.StatusCode < 600 {
+- retry = true
+- }
+- }
-
--func hello(req *restful.Request, resp *restful.Response) {
-- io.WriteString(resp, "pong")
+- return retry
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-basic-authentication.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-basic-authentication.go
+diff --git a/Godeps/_workspace/src/github.com/mitchellh/goamz/aws/client_test.go b/Godeps/_workspace/src/github.com/mitchellh/goamz/aws/client_test.go
deleted file mode 100644
-index 5dd3067..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-basic-authentication.go
+index 2f6b39c..0000000
+--- a/Godeps/_workspace/src/github.com/mitchellh/goamz/aws/client_test.go
+++ /dev/null
-@@ -1,35 +0,0 @@
--package main
+@@ -1,121 +0,0 @@
+-package aws_test
-
-import (
-- "github.com/emicklei/go-restful"
-- "io"
+- "fmt"
+- "github.com/mitchellh/goamz/aws"
+- "io/ioutil"
- "net/http"
+- "net/http/httptest"
+- "strings"
+- "testing"
+- "time"
-)
-
--// This example shows how to create a (Route) Filter that performs Basic Authentication on the Http request.
--//
--// GET http://localhost:8080/secret
--// and use admin,admin for the credentials
--
--func main() {
-- ws := new(restful.WebService)
-- ws.Route(ws.GET("/secret").Filter(basicAuthenticate).To(secret))
-- restful.Add(ws)
-- http.ListenAndServe(":8080", nil)
+-// Retrieve the response from handler using aws.RetryingClient
+-func serveAndGet(handler http.HandlerFunc) (body string, err error) {
+- ts := httptest.NewServer(handler)
+- defer ts.Close()
+- resp, err := aws.RetryingClient.Get(ts.URL)
+- if err != nil {
+- return
+- }
+- if resp.StatusCode != 200 {
+- return "", fmt.Errorf("Bad status code: %d", resp.StatusCode)
+- }
+- greeting, err := ioutil.ReadAll(resp.Body)
+- resp.Body.Close()
+- if err != nil {
+- return
+- }
+- return strings.TrimSpace(string(greeting)), nil
-}
-
--func basicAuthenticate(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
-- encoded := req.Request.Header.Get("Authorization")
-- // usr/pwd = admin/admin
-- // real code does some decoding
-- if len(encoded) == 0 || "Basic YWRtaW46YWRtaW4=" != encoded {
-- resp.AddHeader("WWW-Authenticate", "Basic realm=Protected Area")
-- resp.WriteErrorString(401, "401: Not Authorized")
-- return
+-func TestClient_expected(t *testing.T) {
+- body := "foo bar"
+-
+- resp, err := serveAndGet(func(w http.ResponseWriter, r *http.Request) {
+- fmt.Fprintln(w, body)
+- })
+- if err != nil {
+- t.Fatal(err)
+- }
+- if resp != body {
+- t.Fatal("Body not as expected.")
- }
-- chain.ProcessFilter(req, resp)
-}
-
--func secret(req *restful.Request, resp *restful.Response) {
-- io.WriteString(resp, "42")
+-func TestClient_delay(t *testing.T) {
+- body := "baz"
+- wait := 4
+- resp, err := serveAndGet(func(w http.ResponseWriter, r *http.Request) {
+- if wait < 0 {
+- // If we dipped to zero delay and still failed.
+- t.Fatal("Never succeeded.")
+- }
+- wait -= 1
+- time.Sleep(time.Second * time.Duration(wait))
+- fmt.Fprintln(w, body)
+- })
+- if err != nil {
+- t.Fatal(err)
+- }
+- if resp != body {
+- t.Fatal("Body not as expected.", resp)
+- }
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-cpuprofiler-service.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-cpuprofiler-service.go
-deleted file mode 100644
-index 9148213..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-cpuprofiler-service.go
-+++ /dev/null
-@@ -1,65 +0,0 @@
--package main
-
--import (
-- "github.com/emicklei/go-restful"
-- "io"
-- "log"
-- "os"
-- "runtime/pprof"
--)
+-func TestClient_no4xxRetry(t *testing.T) {
+- tries := 0
-
--// ProfilingService is a WebService that can start/stop a CPU profile and write results to a file
--// GET /{rootPath}/start will activate CPU profiling
--// GET /{rootPath}/stop will stop profiling
--//
--// NewProfileService("/profiler", "ace.prof").AddWebServiceTo(restful.DefaultContainer)
--//
--type ProfilingService struct {
-- rootPath string // the base (root) of the service, e.g. /profiler
-- cpuprofile string // the output filename to write profile results, e.g. myservice.prof
-- cpufile *os.File // if not nil, then profiling is active
--}
+- // Fail once before succeeding.
+- _, err := serveAndGet(func(w http.ResponseWriter, r *http.Request) {
+- tries += 1
+- http.Error(w, "error", 404)
+- })
-
--func NewProfileService(rootPath string, outputFilename string) *ProfilingService {
-- ps := new(ProfilingService)
-- ps.rootPath = rootPath
-- ps.cpuprofile = outputFilename
-- return ps
--}
+- if err == nil {
+- t.Fatal("should have error")
+- }
-
--// Add this ProfileService to a restful Container
--func (p ProfilingService) AddWebServiceTo(container *restful.Container) {
-- ws := new(restful.WebService)
-- ws.Path(p.rootPath).Consumes("*/*").Produces(restful.MIME_JSON)
-- ws.Route(ws.GET("/start").To(p.startProfiler))
-- ws.Route(ws.GET("/stop").To(p.stopProfiler))
-- container.Add(ws)
+- if tries != 1 {
+- t.Fatalf("should only try once: %d", tries)
+- }
-}
-
--func (p *ProfilingService) startProfiler(req *restful.Request, resp *restful.Response) {
-- if p.cpufile != nil {
-- io.WriteString(resp.ResponseWriter, "[restful] CPU profiling already running")
-- return // error?
+-func TestClient_retries(t *testing.T) {
+- body := "biz"
+- failed := false
+- // Fail once before succeeding.
+- resp, err := serveAndGet(func(w http.ResponseWriter, r *http.Request) {
+- if !failed {
+- http.Error(w, "error", 500)
+- failed = true
+- } else {
+- fmt.Fprintln(w, body)
+- }
+- })
+- if failed != true {
+- t.Error("We didn't retry!")
- }
-- cpufile, err := os.Create(p.cpuprofile)
- if err != nil {
-- log.Fatal(err)
+- t.Fatal(err)
+- }
+- if resp != body {
+- t.Fatal("Body not as expected.")
- }
-- // remember for close
-- p.cpufile = cpufile
-- pprof.StartCPUProfile(cpufile)
-- io.WriteString(resp.ResponseWriter, "[restful] CPU profiling started, writing on:"+p.cpuprofile)
-}
-
--func (p *ProfilingService) stopProfiler(req *restful.Request, resp *restful.Response) {
-- if p.cpufile == nil {
-- io.WriteString(resp.ResponseWriter, "[restful] CPU profiling not active")
-- return // error?
+-func TestClient_fails(t *testing.T) {
+- tries := 0
+- // Fail 3 times and return the last error.
+- _, err := serveAndGet(func(w http.ResponseWriter, r *http.Request) {
+- tries += 1
+- http.Error(w, "error", 500)
+- })
+- if err == nil {
+- t.Fatal(err)
+- }
+- if tries != 3 {
+- t.Fatal("Didn't retry enough")
- }
-- pprof.StopCPUProfile()
-- p.cpufile.Close()
-- p.cpufile = nil
-- io.WriteString(resp.ResponseWriter, "[restful] CPU profiling stopped, closing:"+p.cpuprofile)
-}
--
--func main() {} // exists for example compilation only
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-curly-router.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-curly-router.go
+diff --git a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/ec2.go b/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/ec2.go
deleted file mode 100644
-index 1b95dd0..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-curly-router.go
+index 8f94ad5..0000000
+--- a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/ec2.go
+++ /dev/null
-@@ -1,107 +0,0 @@
--package main
+@@ -1,2599 +0,0 @@
+-//
+-// goamz - Go packages to interact with the Amazon Web Services.
+-//
+-// https://wiki.ubuntu.com/goamz
+-//
+-// Copyright (c) 2011 Canonical Ltd.
+-//
+-// Written by Gustavo Niemeyer <gustavo.niemeyer at canonical.com>
+-//
+-
+-package ec2
-
-import (
-- "github.com/emicklei/go-restful"
+- "crypto/rand"
+- "encoding/base64"
+- "encoding/hex"
+- "encoding/xml"
+- "fmt"
- "log"
- "net/http"
+- "net/http/httputil"
+- "net/url"
+- "sort"
+- "strconv"
+- "strings"
+- "time"
+-
+- "github.com/mitchellh/goamz/aws"
-)
-
--// This example has the same service definition as restful-user-resource
--// but uses a different router (CurlyRouter) that does not use regular expressions
--//
--// POST http://localhost:8080/users
--// <User><Id>1</Id><Name>Melissa Raspberry</Name></User>
--//
--// GET http://localhost:8080/users/1
--//
--// PUT http://localhost:8080/users/1
--// <User><Id>1</Id><Name>Melissa</Name></User>
--//
--// DELETE http://localhost:8080/users/1
--//
+-const debug = false
-
--type User struct {
-- Id, Name string
+-// The EC2 type encapsulates operations with a specific EC2 region.
+-type EC2 struct {
+- aws.Auth
+- aws.Region
+- httpClient *http.Client
+- private byte // Reserve the right of using private data.
-}
-
--type UserResource struct {
-- // normally one would use DAO (data access object)
-- users map[string]User
+-// New creates a new EC2.
+-func NewWithClient(auth aws.Auth, region aws.Region, client *http.Client) *EC2 {
+- return &EC2{auth, region, client, 0}
-}
-
--func (u UserResource) Register(container *restful.Container) {
-- ws := new(restful.WebService)
-- ws.
-- Path("/users").
-- Consumes(restful.MIME_XML, restful.MIME_JSON).
-- Produces(restful.MIME_JSON, restful.MIME_XML) // you can specify this per route as well
+-func New(auth aws.Auth, region aws.Region) *EC2 {
+- return NewWithClient(auth, region, aws.RetryingClient)
+-}
-
-- ws.Route(ws.GET("/{user-id}").To(u.findUser))
-- ws.Route(ws.POST("").To(u.updateUser))
-- ws.Route(ws.PUT("/{user-id}").To(u.createUser))
-- ws.Route(ws.DELETE("/{user-id}").To(u.removeUser))
+-// ----------------------------------------------------------------------------
+-// Filtering helper.
-
-- container.Add(ws)
+-// Filter builds filtering parameters to be used in an EC2 query which supports
+-// filtering. For example:
+-//
+-// filter := NewFilter()
+-// filter.Add("architecture", "i386")
+-// filter.Add("launch-index", "0")
+-// resp, err := ec2.Instances(nil, filter)
+-//
+-type Filter struct {
+- m map[string][]string
-}
-
--// GET http://localhost:8080/users/1
--//
--func (u UserResource) findUser(request *restful.Request, response *restful.Response) {
-- id := request.PathParameter("user-id")
-- usr := u.users[id]
-- if len(usr.Id) == 0 {
-- response.AddHeader("Content-Type", "text/plain")
-- response.WriteErrorString(http.StatusNotFound, "User could not be found.")
-- } else {
-- response.WriteEntity(usr)
-- }
+-// NewFilter creates a new Filter.
+-func NewFilter() *Filter {
+- return &Filter{make(map[string][]string)}
-}
-
--// POST http://localhost:8080/users
--// <User><Id>1</Id><Name>Melissa Raspberry</Name></User>
--//
--func (u *UserResource) updateUser(request *restful.Request, response *restful.Response) {
-- usr := new(User)
-- err := request.ReadEntity(&usr)
-- if err == nil {
-- u.users[usr.Id] = *usr
-- response.WriteEntity(usr)
-- } else {
-- response.AddHeader("Content-Type", "text/plain")
-- response.WriteErrorString(http.StatusInternalServerError, err.Error())
+-// Add appends a filtering parameter with the given name and value(s).
+-func (f *Filter) Add(name string, value ...string) {
+- f.m[name] = append(f.m[name], value...)
+-}
+-
+-func (f *Filter) addParams(params map[string]string) {
+- if f != nil {
+- a := make([]string, len(f.m))
+- i := 0
+- for k := range f.m {
+- a[i] = k
+- i++
+- }
+- sort.StringSlice(a).Sort()
+- for i, k := range a {
+- prefix := "Filter." + strconv.Itoa(i+1)
+- params[prefix+".Name"] = k
+- for j, v := range f.m[k] {
+- params[prefix+".Value."+strconv.Itoa(j+1)] = v
+- }
+- }
- }
-}
-
--// PUT http://localhost:8080/users/1
--// <User><Id>1</Id><Name>Melissa</Name></User>
+-// ----------------------------------------------------------------------------
+-// Request dispatching logic.
+-
+-// Error encapsulates an error returned by EC2.
-//
--func (u *UserResource) createUser(request *restful.Request, response *restful.Response) {
-- usr := User{Id: request.PathParameter("user-id")}
-- err := request.ReadEntity(&usr)
-- if err == nil {
-- u.users[usr.Id] = usr
-- response.WriteHeader(http.StatusCreated)
-- response.WriteEntity(usr)
-- } else {
-- response.AddHeader("Content-Type", "text/plain")
-- response.WriteErrorString(http.StatusInternalServerError, err.Error())
+-// See http://goo.gl/VZGuC for more details.
+-type Error struct {
+- // HTTP status code (200, 403, ...)
+- StatusCode int
+- // EC2 error code ("UnsupportedOperation", ...)
+- Code string
+- // The human-oriented error message
+- Message string
+- RequestId string `xml:"RequestID"`
+-}
+-
+-func (err *Error) Error() string {
+- if err.Code == "" {
+- return err.Message
- }
+-
+- return fmt.Sprintf("%s (%s)", err.Message, err.Code)
-}
-
--// DELETE http://localhost:8080/users/1
--//
--func (u *UserResource) removeUser(request *restful.Request, response *restful.Response) {
-- id := request.PathParameter("user-id")
-- delete(u.users, id)
+-// For now a single error inst is being exposed. In the future it may be useful
+-// to provide access to all of them, but rather than doing it as an array/slice,
+-// use a *next pointer, so that it's backward compatible and it continues to be
+-// easy to handle the first error, which is what most people will want.
+-type xmlErrors struct {
+- RequestId string `xml:"RequestID"`
+- Errors []Error `xml:"Errors>Error"`
-}
-
--func main() {
-- wsContainer := restful.NewContainer()
-- wsContainer.Router(restful.CurlyRouter{})
-- u := UserResource{map[string]User{}}
-- u.Register(wsContainer)
+-var timeNow = time.Now
-
-- log.Printf("start listening on localhost:8080")
-- server := &http.Server{Addr: ":8080", Handler: wsContainer}
-- log.Fatal(server.ListenAndServe())
+-func (ec2 *EC2) query(params map[string]string, resp interface{}) error {
+- params["Version"] = "2014-05-01"
+- params["Timestamp"] = timeNow().In(time.UTC).Format(time.RFC3339)
+- endpoint, err := url.Parse(ec2.Region.EC2Endpoint)
+- if err != nil {
+- return err
+- }
+- if endpoint.Path == "" {
+- endpoint.Path = "/"
+- }
+- sign(ec2.Auth, "GET", endpoint.Path, params, endpoint.Host)
+- endpoint.RawQuery = multimap(params).Encode()
+- if debug {
+- log.Printf("get { %v } -> {\n", endpoint.String())
+- }
+-
+- r, err := ec2.httpClient.Get(endpoint.String())
+- if err != nil {
+- return err
+- }
+- defer r.Body.Close()
+-
+- if debug {
+- dump, _ := httputil.DumpResponse(r, true)
+- log.Printf("response:\n")
+- log.Printf("%v\n}\n", string(dump))
+- }
+- if r.StatusCode != 200 {
+- return buildError(r)
+- }
+- err = xml.NewDecoder(r.Body).Decode(resp)
+- return err
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-encoding-filter.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-encoding-filter.go
-deleted file mode 100644
-index 6094c49..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-encoding-filter.go
-+++ /dev/null
-@@ -1,61 +0,0 @@
--package main
-
--import (
-- "github.com/emicklei/go-restful"
-- "log"
-- "net/http"
--)
+-func multimap(p map[string]string) url.Values {
+- q := make(url.Values, len(p))
+- for k, v := range p {
+- q[k] = []string{v}
+- }
+- return q
+-}
-
--type User struct {
-- Id, Name string
+-func buildError(r *http.Response) error {
+- errors := xmlErrors{}
+- xml.NewDecoder(r.Body).Decode(&errors)
+- var err Error
+- if len(errors.Errors) > 0 {
+- err = errors.Errors[0]
+- }
+- err.RequestId = errors.RequestId
+- err.StatusCode = r.StatusCode
+- if err.Message == "" {
+- err.Message = r.Status
+- }
+- return &err
-}
-
--type UserList struct {
-- Users []User
+-func makeParams(action string) map[string]string {
+- params := make(map[string]string)
+- params["Action"] = action
+- return params
-}
-
--//
--// This example shows how to use the CompressingResponseWriter by a Filter
--// such that encoding can be enabled per WebService or per Route (instead of per container)
--// Using restful.DefaultContainer.EnableContentEncoding(true) will encode all responses served by WebServices in the DefaultContainer.
--//
--// Set Accept-Encoding to gzip or deflate
--// GET http://localhost:8080/users/42
--// and look at the response headers
--
--func main() {
-- restful.Add(NewUserService())
-- log.Printf("start listening on localhost:8080")
-- log.Fatal(http.ListenAndServe(":8080", nil))
+-func addParamsList(params map[string]string, label string, ids []string) {
+- for i, id := range ids {
+- params[label+"."+strconv.Itoa(i+1)] = id
+- }
-}
-
--func NewUserService() *restful.WebService {
-- ws := new(restful.WebService)
-- ws.
-- Path("/users").
-- Consumes(restful.MIME_XML, restful.MIME_JSON).
-- Produces(restful.MIME_JSON, restful.MIME_XML)
+-func addBlockDeviceParams(prename string, params map[string]string, blockdevices []BlockDeviceMapping) {
+- for i, k := range blockdevices {
+- // Fixup index since Amazon counts these from 1
+- prefix := prename + "BlockDeviceMapping." + strconv.Itoa(i+1) + "."
-
-- // install a response encoding filter
-- ws.Route(ws.GET("/{user-id}").Filter(encodingFilter).To(findUser))
-- return ws
+- if k.DeviceName != "" {
+- params[prefix+"DeviceName"] = k.DeviceName
+- }
+- if k.VirtualName != "" {
+- params[prefix+"VirtualName"] = k.VirtualName
+- }
+- if k.SnapshotId != "" {
+- params[prefix+"Ebs.SnapshotId"] = k.SnapshotId
+- }
+- if k.VolumeType != "" {
+- params[prefix+"Ebs.VolumeType"] = k.VolumeType
+- }
+- if k.IOPS != 0 {
+- params[prefix+"Ebs.Iops"] = strconv.FormatInt(k.IOPS, 10)
+- }
+- if k.VolumeSize != 0 {
+- params[prefix+"Ebs.VolumeSize"] = strconv.FormatInt(k.VolumeSize, 10)
+- }
+- if k.DeleteOnTermination {
+- params[prefix+"Ebs.DeleteOnTermination"] = "true"
+- }
+- if k.Encrypted {
+- params[prefix+"Ebs.Encrypted"] = "true"
+- }
+- if k.NoDevice {
+- params[prefix+"NoDevice"] = ""
+- }
+- }
-}
-
--// Route Filter (defines FilterFunction)
--func encodingFilter(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
-- log.Printf("[encoding-filter] %s,%s\n", req.Request.Method, req.Request.URL)
-- // wrap responseWriter into a compressing one
-- compress, _ := restful.NewCompressingResponseWriter(resp.ResponseWriter, restful.ENCODING_GZIP)
-- resp.ResponseWriter = compress
-- defer func() {
-- compress.Close()
-- }()
-- chain.ProcessFilter(req, resp)
--}
+-// ----------------------------------------------------------------------------
+-// Instance management functions and types.
-
--// GET http://localhost:8080/users/42
+-// The RunInstances type encapsulates options for the respective request in EC2.
-//
--func findUser(request *restful.Request, response *restful.Response) {
-- log.Printf("findUser")
-- response.WriteEntity(User{"42", "Gandalf"})
+-// See http://goo.gl/Mcm3b for more details.
+-type RunInstances struct {
+- ImageId string
+- MinCount int
+- MaxCount int
+- KeyName string
+- InstanceType string
+- SecurityGroups []SecurityGroup
+- IamInstanceProfile string
+- KernelId string
+- RamdiskId string
+- UserData []byte
+- AvailZone string
+- PlacementGroupName string
+- Monitoring bool
+- SubnetId string
+- AssociatePublicIpAddress bool
+- DisableAPITermination bool
+- ShutdownBehavior string
+- PrivateIPAddress string
+- BlockDevices []BlockDeviceMapping
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-filters.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-filters.go
-deleted file mode 100644
-index 47e1146..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-filters.go
-+++ /dev/null
-@@ -1,114 +0,0 @@
--package main
--
--import (
-- "github.com/emicklei/go-restful"
-- "log"
-- "net/http"
-- "time"
--)
-
--type User struct {
-- Id, Name string
+-// Response to a RunInstances request.
+-//
+-// See http://goo.gl/Mcm3b for more details.
+-type RunInstancesResp struct {
+- RequestId string `xml:"requestId"`
+- ReservationId string `xml:"reservationId"`
+- OwnerId string `xml:"ownerId"`
+- SecurityGroups []SecurityGroup `xml:"groupSet>item"`
+- Instances []Instance `xml:"instancesSet>item"`
-}
-
--type UserList struct {
-- Users []User
+-// Instance encapsulates a running instance in EC2.
+-//
+-// See http://goo.gl/OCH8a for more details.
+-type Instance struct {
+- InstanceId string `xml:"instanceId"`
+- InstanceType string `xml:"instanceType"`
+- ImageId string `xml:"imageId"`
+- PrivateDNSName string `xml:"privateDnsName"`
+- DNSName string `xml:"dnsName"`
+- KeyName string `xml:"keyName"`
+- AMILaunchIndex int `xml:"amiLaunchIndex"`
+- Hypervisor string `xml:"hypervisor"`
+- VirtType string `xml:"virtualizationType"`
+- Monitoring string `xml:"monitoring>state"`
+- AvailZone string `xml:"placement>availabilityZone"`
+- PlacementGroupName string `xml:"placement>groupName"`
+- State InstanceState `xml:"instanceState"`
+- Tags []Tag `xml:"tagSet>item"`
+- VpcId string `xml:"vpcId"`
+- SubnetId string `xml:"subnetId"`
+- IamInstanceProfile string `xml:"iamInstanceProfile"`
+- PrivateIpAddress string `xml:"privateIpAddress"`
+- PublicIpAddress string `xml:"ipAddress"`
+- Architecture string `xml:"architecture"`
+- LaunchTime time.Time `xml:"launchTime"`
+- SourceDestCheck bool `xml:"sourceDestCheck"`
+- SecurityGroups []SecurityGroup `xml:"groupSet>item"`
-}
-
--// This example show how to create and use the three different Filters (Container,WebService and Route)
--// When applied to the restful.DefaultContainer, we refer to them as a global filter.
+-// RunInstances starts new instances in EC2.
+-// If options.MinCount and options.MaxCount are both zero, a single instance
+-// will be started; otherwise if options.MaxCount is zero, options.MinCount
+-// will be used insteead.
-//
--// GET http://locahost:8080/users/42
--// and see the logging per filter (try repeating this request)
--
--func main() {
-- // install a global (=DefaultContainer) filter (processed before any webservice in the DefaultContainer)
-- restful.Filter(globalLogging)
--
-- restful.Add(NewUserService())
-- log.Printf("start listening on localhost:8080")
-- log.Fatal(http.ListenAndServe(":8080", nil))
--}
+-// See http://goo.gl/Mcm3b for more details.
+-func (ec2 *EC2) RunInstances(options *RunInstances) (resp *RunInstancesResp, err error) {
+- params := makeParams("RunInstances")
+- params["ImageId"] = options.ImageId
+- params["InstanceType"] = options.InstanceType
+- var min, max int
+- if options.MinCount == 0 && options.MaxCount == 0 {
+- min = 1
+- max = 1
+- } else if options.MaxCount == 0 {
+- min = options.MinCount
+- max = min
+- } else {
+- min = options.MinCount
+- max = options.MaxCount
+- }
+- params["MinCount"] = strconv.Itoa(min)
+- params["MaxCount"] = strconv.Itoa(max)
+- token, err := clientToken()
+- if err != nil {
+- return nil, err
+- }
+- params["ClientToken"] = token
-
--func NewUserService() *restful.WebService {
-- ws := new(restful.WebService)
-- ws.
-- Path("/users").
-- Consumes(restful.MIME_XML, restful.MIME_JSON).
-- Produces(restful.MIME_JSON, restful.MIME_XML)
+- if options.KeyName != "" {
+- params["KeyName"] = options.KeyName
+- }
+- if options.KernelId != "" {
+- params["KernelId"] = options.KernelId
+- }
+- if options.RamdiskId != "" {
+- params["RamdiskId"] = options.RamdiskId
+- }
+- if options.UserData != nil {
+- userData := make([]byte, b64.EncodedLen(len(options.UserData)))
+- b64.Encode(userData, options.UserData)
+- params["UserData"] = string(userData)
+- }
+- if options.AvailZone != "" {
+- params["Placement.AvailabilityZone"] = options.AvailZone
+- }
+- if options.PlacementGroupName != "" {
+- params["Placement.GroupName"] = options.PlacementGroupName
+- }
+- if options.Monitoring {
+- params["Monitoring.Enabled"] = "true"
+- }
+- if options.SubnetId != "" && options.AssociatePublicIpAddress {
+- // If we have a non-default VPC / Subnet specified, we can flag
+- // AssociatePublicIpAddress to get a Public IP assigned. By default these are not provided.
+- // You cannot specify both SubnetId and the NetworkInterface.0.* parameters though, otherwise
+- // you get: Network interfaces and an instance-level subnet ID may not be specified on the same request
+- // You also need to attach Security Groups to the NetworkInterface instead of the instance,
+- // to avoid: Network interfaces and an instance-level security groups may not be specified on
+- // the same request
+- params["NetworkInterface.0.DeviceIndex"] = "0"
+- params["NetworkInterface.0.AssociatePublicIpAddress"] = "true"
+- params["NetworkInterface.0.SubnetId"] = options.SubnetId
-
-- // install a webservice filter (processed before any route)
-- ws.Filter(webserviceLogging).Filter(measureTime)
+- i := 1
+- for _, g := range options.SecurityGroups {
+- // We only have SecurityGroupId's on NetworkInterface's, no SecurityGroup params.
+- if g.Id != "" {
+- params["NetworkInterface.0.SecurityGroupId."+strconv.Itoa(i)] = g.Id
+- i++
+- }
+- }
+- } else {
+- if options.SubnetId != "" {
+- params["SubnetId"] = options.SubnetId
+- }
-
-- // install a counter filter
-- ws.Route(ws.GET("").Filter(NewCountFilter().routeCounter).To(getAllUsers))
+- i, j := 1, 1
+- for _, g := range options.SecurityGroups {
+- if g.Id != "" {
+- params["SecurityGroupId."+strconv.Itoa(i)] = g.Id
+- i++
+- } else {
+- params["SecurityGroup."+strconv.Itoa(j)] = g.Name
+- j++
+- }
+- }
+- }
+- if options.IamInstanceProfile != "" {
+- params["IamInstanceProfile.Name"] = options.IamInstanceProfile
+- }
+- if options.DisableAPITermination {
+- params["DisableApiTermination"] = "true"
+- }
+- if options.ShutdownBehavior != "" {
+- params["InstanceInitiatedShutdownBehavior"] = options.ShutdownBehavior
+- }
+- if options.PrivateIPAddress != "" {
+- params["PrivateIpAddress"] = options.PrivateIPAddress
+- }
+- addBlockDeviceParams("", params, options.BlockDevices)
-
-- // install 2 chained route filters (processed before calling findUser)
-- ws.Route(ws.GET("/{user-id}").Filter(routeLogging).Filter(NewCountFilter().routeCounter).To(findUser))
-- return ws
+- resp = &RunInstancesResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
+- }
+- return
-}
-
--// Global Filter
--func globalLogging(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
-- log.Printf("[global-filter (logger)] %s,%s\n", req.Request.Method, req.Request.URL)
-- chain.ProcessFilter(req, resp)
+-func clientToken() (string, error) {
+- // Maximum EC2 client token size is 64 bytes.
+- // Each byte expands to two when hex encoded.
+- buf := make([]byte, 32)
+- _, err := rand.Read(buf)
+- if err != nil {
+- return "", err
+- }
+- return hex.EncodeToString(buf), nil
-}
-
--// WebService Filter
--func webserviceLogging(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
-- log.Printf("[webservice-filter (logger)] %s,%s\n", req.Request.Method, req.Request.URL)
-- chain.ProcessFilter(req, resp)
--}
+-// ----------------------------------------------------------------------------
+-// Spot Instance management functions and types.
-
--// WebService (post-process) Filter (as a struct that defines a FilterFunction)
--func measureTime(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
-- now := time.Now()
-- chain.ProcessFilter(req, resp)
-- log.Printf("[webservice-filter (timer)] %v\n", time.Now().Sub(now))
+-// The RequestSpotInstances type encapsulates options for the respective request in EC2.
+-//
+-// See http://goo.gl/GRZgCD for more details.
+-type RequestSpotInstances struct {
+- SpotPrice string
+- InstanceCount int
+- Type string
+- ImageId string
+- KeyName string
+- InstanceType string
+- SecurityGroups []SecurityGroup
+- IamInstanceProfile string
+- KernelId string
+- RamdiskId string
+- UserData []byte
+- AvailZone string
+- PlacementGroupName string
+- Monitoring bool
+- SubnetId string
+- AssociatePublicIpAddress bool
+- PrivateIPAddress string
+- BlockDevices []BlockDeviceMapping
-}
-
--// Route Filter (defines FilterFunction)
--func routeLogging(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
-- log.Printf("[route-filter (logger)] %s,%s\n", req.Request.Method, req.Request.URL)
-- chain.ProcessFilter(req, resp)
+-type SpotInstanceSpec struct {
+- ImageId string
+- KeyName string
+- InstanceType string
+- SecurityGroups []SecurityGroup
+- IamInstanceProfile string
+- KernelId string
+- RamdiskId string
+- UserData []byte
+- AvailZone string
+- PlacementGroupName string
+- Monitoring bool
+- SubnetId string
+- AssociatePublicIpAddress bool
+- PrivateIPAddress string
+- BlockDevices []BlockDeviceMapping
-}
-
--// Route Filter (as a struct that defines a FilterFunction)
--// CountFilter implements a FilterFunction for counting requests.
--type CountFilter struct {
-- count int
-- counter chan int // for go-routine safe count increments
+-type SpotLaunchSpec struct {
+- ImageId string `xml:"imageId"`
+- KeyName string `xml:"keyName"`
+- InstanceType string `xml:"instanceType"`
+- SecurityGroups []SecurityGroup `xml:"groupSet>item"`
+- IamInstanceProfile string `xml:"iamInstanceProfile"`
+- KernelId string `xml:"kernelId"`
+- RamdiskId string `xml:"ramdiskId"`
+- PlacementGroupName string `xml:"placement>groupName"`
+- Monitoring bool `xml:"monitoring>enabled"`
+- SubnetId string `xml:"subnetId"`
+- BlockDevices []BlockDeviceMapping `xml:"blockDeviceMapping>item"`
-}
-
--// NewCountFilter creates and initializes a new CountFilter.
--func NewCountFilter() *CountFilter {
-- c := new(CountFilter)
-- c.counter = make(chan int)
-- go func() {
-- for {
-- c.count += <-c.counter
-- }
-- }()
-- return c
+-type SpotStatus struct {
+- Code string `xml:"code"`
+- UpdateTime string `xml:"updateTime"`
+- Message string `xml:"message"`
-}
-
--// routeCounter increments the count of the filter (through a channel)
--func (c *CountFilter) routeCounter(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
-- c.counter <- 1
-- log.Printf("[route-filter (counter)] count:%d", c.count)
-- chain.ProcessFilter(req, resp)
+-type SpotRequestResult struct {
+- SpotRequestId string `xml:"spotInstanceRequestId"`
+- SpotPrice string `xml:"spotPrice"`
+- Type string `xml:"type"`
+- AvailZone string `xml:"launchedAvailabilityZone"`
+- InstanceId string `xml:"instanceId"`
+- State string `xml:"state"`
+- Status SpotStatus `xml:"status"`
+- SpotLaunchSpec SpotLaunchSpec `xml:"launchSpecification"`
+- CreateTime string `xml:"createTime"`
+- Tags []Tag `xml:"tagSet>item"`
-}
-
--// GET http://localhost:8080/users
+-// Response to a RequestSpotInstances request.
-//
--func getAllUsers(request *restful.Request, response *restful.Response) {
-- log.Printf("getAllUsers")
-- response.WriteEntity(UserList{[]User{User{"42", "Gandalf"}, User{"3.14", "Pi"}}})
+-// See http://goo.gl/GRZgCD for more details.
+-type RequestSpotInstancesResp struct {
+- RequestId string `xml:"requestId"`
+- SpotRequestResults []SpotRequestResult `xml:"spotInstanceRequestSet>item"`
-}
-
--// GET http://localhost:8080/users/42
--//
--func findUser(request *restful.Request, response *restful.Response) {
-- log.Printf("findUser")
-- response.WriteEntity(User{"42", "Gandalf"})
--}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-form-handling.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-form-handling.go
-deleted file mode 100644
-index a83db44..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-form-handling.go
-+++ /dev/null
-@@ -1,62 +0,0 @@
--package main
+-// RequestSpotInstances requests a new spot instances in EC2.
+-func (ec2 *EC2) RequestSpotInstances(options *RequestSpotInstances) (resp *RequestSpotInstancesResp, err error) {
+- params := makeParams("RequestSpotInstances")
+- prefix := "LaunchSpecification" + "."
-
--import (
-- "fmt"
-- "github.com/emicklei/go-restful"
-- "github.com/gorilla/schema"
-- "io"
-- "net/http"
--)
+- params["SpotPrice"] = options.SpotPrice
+- params[prefix+"ImageId"] = options.ImageId
+- params[prefix+"InstanceType"] = options.InstanceType
-
--// This example shows how to handle a POST of a HTML form that uses the standard x-www-form-urlencoded content-type.
--// It uses the gorilla web tool kit schema package to decode the form data into a struct.
--//
--// GET http://localhost:8080/profiles
--//
+- if options.InstanceCount != 0 {
+- params["InstanceCount"] = strconv.Itoa(options.InstanceCount)
+- }
+- if options.KeyName != "" {
+- params[prefix+"KeyName"] = options.KeyName
+- }
+- if options.KernelId != "" {
+- params[prefix+"KernelId"] = options.KernelId
+- }
+- if options.RamdiskId != "" {
+- params[prefix+"RamdiskId"] = options.RamdiskId
+- }
+- if options.UserData != nil {
+- userData := make([]byte, b64.EncodedLen(len(options.UserData)))
+- b64.Encode(userData, options.UserData)
+- params[prefix+"UserData"] = string(userData)
+- }
+- if options.AvailZone != "" {
+- params[prefix+"Placement.AvailabilityZone"] = options.AvailZone
+- }
+- if options.PlacementGroupName != "" {
+- params[prefix+"Placement.GroupName"] = options.PlacementGroupName
+- }
+- if options.Monitoring {
+- params[prefix+"Monitoring.Enabled"] = "true"
+- }
+- if options.SubnetId != "" && options.AssociatePublicIpAddress {
+- // If we have a non-default VPC / Subnet specified, we can flag
+- // AssociatePublicIpAddress to get a Public IP assigned. By default these are not provided.
+- // You cannot specify both SubnetId and the NetworkInterface.0.* parameters though, otherwise
+- // you get: Network interfaces and an instance-level subnet ID may not be specified on the same request
+- // You also need to attach Security Groups to the NetworkInterface instead of the instance,
+- // to avoid: Network interfaces and an instance-level security groups may not be specified on
+- // the same request
+- params[prefix+"NetworkInterface.0.DeviceIndex"] = "0"
+- params[prefix+"NetworkInterface.0.AssociatePublicIpAddress"] = "true"
+- params[prefix+"NetworkInterface.0.SubnetId"] = options.SubnetId
+-
+- i := 1
+- for _, g := range options.SecurityGroups {
+- // We only have SecurityGroupId's on NetworkInterface's, no SecurityGroup params.
+- if g.Id != "" {
+- params[prefix+"NetworkInterface.0.SecurityGroupId."+strconv.Itoa(i)] = g.Id
+- i++
+- }
+- }
+- } else {
+- if options.SubnetId != "" {
+- params[prefix+"SubnetId"] = options.SubnetId
+- }
+-
+- i, j := 1, 1
+- for _, g := range options.SecurityGroups {
+- if g.Id != "" {
+- params[prefix+"SecurityGroupId."+strconv.Itoa(i)] = g.Id
+- i++
+- } else {
+- params[prefix+"SecurityGroup."+strconv.Itoa(j)] = g.Name
+- j++
+- }
+- }
+- }
+- if options.IamInstanceProfile != "" {
+- params[prefix+"IamInstanceProfile.Name"] = options.IamInstanceProfile
+- }
+- if options.PrivateIPAddress != "" {
+- params[prefix+"PrivateIpAddress"] = options.PrivateIPAddress
+- }
+- addBlockDeviceParams(prefix, params, options.BlockDevices)
-
--type Profile struct {
-- Name string
-- Age int
+- resp = &RequestSpotInstancesResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
+- }
+- return
-}
-
--var decoder *schema.Decoder
--
--func main() {
-- decoder = schema.NewDecoder()
-- ws := new(restful.WebService)
-- ws.Route(ws.POST("/profiles").Consumes("application/x-www-form-urlencoded").To(postAdddress))
-- ws.Route(ws.GET("/profiles").To(addresssForm))
-- restful.Add(ws)
-- http.ListenAndServe(":8080", nil)
+-// Response to a DescribeSpotInstanceRequests request.
+-//
+-// See http://goo.gl/KsKJJk for more details.
+-type SpotRequestsResp struct {
+- RequestId string `xml:"requestId"`
+- SpotRequestResults []SpotRequestResult `xml:"spotInstanceRequestSet>item"`
-}
-
--func postAdddress(req *restful.Request, resp *restful.Response) {
-- err := req.Request.ParseForm()
-- if err != nil {
-- resp.WriteErrorString(http.StatusBadRequest, err.Error())
-- return
-- }
-- p := new(Profile)
-- err = decoder.Decode(p, req.Request.PostForm)
+-// DescribeSpotInstanceRequests returns details about spot requests in EC2. Both parameters
+-// are optional, and if provided will limit the spot requests returned to those
+-// matching the given spot request ids or filtering rules.
+-//
+-// See http://goo.gl/KsKJJk for more details.
+-func (ec2 *EC2) DescribeSpotRequests(spotrequestIds []string, filter *Filter) (resp *SpotRequestsResp, err error) {
+- params := makeParams("DescribeSpotInstanceRequests")
+- addParamsList(params, "SpotInstanceRequestId", spotrequestIds)
+- filter.addParams(params)
+- resp = &SpotRequestsResp{}
+- err = ec2.query(params, resp)
- if err != nil {
-- resp.WriteErrorString(http.StatusBadRequest, err.Error())
-- return
+- return nil, err
- }
-- io.WriteString(resp.ResponseWriter, fmt.Sprintf("<html><body>Name=%s, Age=%d</body></html>", p.Name, p.Age))
+- return
-}
-
--func addresssForm(req *restful.Request, resp *restful.Response) {
-- io.WriteString(resp.ResponseWriter,
-- `<html>
-- <body>
-- <h1>Enter Profile</h1>
-- <form method="post">
-- <label>Name:</label>
-- <input type="text" name="Name"/>
-- <label>Age:</label>
-- <input type="text" name="Age"/>
-- <input type="Submit" />
-- </form>
-- </body>
-- </html>`)
+-// Response to a CancelSpotInstanceRequests request.
+-//
+-// See http://goo.gl/3BKHj for more details.
+-type CancelSpotRequestResult struct {
+- SpotRequestId string `xml:"spotInstanceRequestId"`
+- State string `xml:"state"`
+-}
+-type CancelSpotRequestsResp struct {
+- RequestId string `xml:"requestId"`
+- CancelSpotRequestResults []CancelSpotRequestResult `xml:"spotInstanceRequestSet>item"`
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-hello-world.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-hello-world.go
-deleted file mode 100644
-index a21c2a6..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-hello-world.go
-+++ /dev/null
-@@ -1,22 +0,0 @@
--package main
--
--import (
-- "github.com/emicklei/go-restful"
-- "io"
-- "net/http"
--)
-
--// This example shows the minimal code needed to get a restful.WebService working.
+-// CancelSpotRequests requests the cancellation of spot requests when the given ids.
-//
--// GET http://localhost:8080/hello
--
--func main() {
-- ws := new(restful.WebService)
-- ws.Route(ws.GET("/hello").To(hello))
-- restful.Add(ws)
-- http.ListenAndServe(":8080", nil)
+-// See http://goo.gl/3BKHj for more details.
+-func (ec2 *EC2) CancelSpotRequests(spotrequestIds []string) (resp *CancelSpotRequestsResp, err error) {
+- params := makeParams("CancelSpotInstanceRequests")
+- addParamsList(params, "SpotInstanceRequestId", spotrequestIds)
+- resp = &CancelSpotRequestsResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
+- }
+- return
-}
-
--func hello(req *restful.Request, resp *restful.Response) {
-- io.WriteString(resp, "world")
+-// Response to a TerminateInstances request.
+-//
+-// See http://goo.gl/3BKHj for more details.
+-type TerminateInstancesResp struct {
+- RequestId string `xml:"requestId"`
+- StateChanges []InstanceStateChange `xml:"instancesSet>item"`
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-html-template.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-html-template.go
-deleted file mode 100644
-index de51c59..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-html-template.go
-+++ /dev/null
-@@ -1,35 +0,0 @@
--package main
--
--import (
-- "log"
-- "net/http"
-- "text/template"
-
-- "github.com/emicklei/go-restful"
--)
--
--// This example shows how to serve a HTML page using the standard Go template engine.
+-// InstanceState encapsulates the state of an instance in EC2.
-//
--// GET http://localhost:8080/
--
--func main() {
-- ws := new(restful.WebService)
-- ws.Route(ws.GET("/").To(home))
-- restful.Add(ws)
-- print("open browser on http://localhost:8080/\n")
-- http.ListenAndServe(":8080", nil)
+-// See http://goo.gl/y3ZBq for more details.
+-type InstanceState struct {
+- Code int `xml:"code"` // Watch out, bits 15-8 have unpublished meaning.
+- Name string `xml:"name"`
-}
-
--type Message struct {
-- Text string
+-// InstanceStateChange informs of the previous and current states
+-// for an instance when a state change is requested.
+-type InstanceStateChange struct {
+- InstanceId string `xml:"instanceId"`
+- CurrentState InstanceState `xml:"currentState"`
+- PreviousState InstanceState `xml:"previousState"`
-}
-
--func home(req *restful.Request, resp *restful.Response) {
-- p := &Message{"restful-html-template demo"}
-- // you might want to cache compiled templates
-- t, err := template.ParseFiles("home.html")
+-// TerminateInstances requests the termination of instances when the given ids.
+-//
+-// See http://goo.gl/3BKHj for more details.
+-func (ec2 *EC2) TerminateInstances(instIds []string) (resp *TerminateInstancesResp, err error) {
+- params := makeParams("TerminateInstances")
+- addParamsList(params, "InstanceId", instIds)
+- resp = &TerminateInstancesResp{}
+- err = ec2.query(params, resp)
- if err != nil {
-- log.Fatalf("Template gave: %s", err)
+- return nil, err
- }
-- t.Execute(resp.ResponseWriter, p)
+- return
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-multi-containers.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-multi-containers.go
-deleted file mode 100644
-index 3f1650b..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-multi-containers.go
-+++ /dev/null
-@@ -1,43 +0,0 @@
--package main
-
--import (
-- "github.com/emicklei/go-restful"
-- "io"
-- "log"
-- "net/http"
--)
--
--// This example shows how to have a program with 2 WebServices containers
--// each having a http server listening on its own port.
--//
--// The first "hello" is added to the restful.DefaultContainer (and uses DefaultServeMux)
--// For the second "hello", a new container and ServeMux is created
--// and requires a new http.Server with the container being the Handler.
--// This first server is spawn in its own go-routine such that the program proceeds to create the second.
+-// Response to a DescribeInstances request.
-//
--// GET http://localhost:8080/hello
--// GET http://localhost:8081/hello
--
--func main() {
-- ws := new(restful.WebService)
-- ws.Route(ws.GET("/hello").To(hello))
-- restful.Add(ws)
-- go func() {
-- http.ListenAndServe(":8080", nil)
-- }()
--
-- container2 := restful.NewContainer()
-- ws2 := new(restful.WebService)
-- ws2.Route(ws2.GET("/hello").To(hello2))
-- container2.Add(ws2)
-- server := &http.Server{Addr: ":8081", Handler: container2}
-- log.Fatal(server.ListenAndServe())
+-// See http://goo.gl/mLbmw for more details.
+-type InstancesResp struct {
+- RequestId string `xml:"requestId"`
+- Reservations []Reservation `xml:"reservationSet>item"`
-}
-
--func hello(req *restful.Request, resp *restful.Response) {
-- io.WriteString(resp, "default world")
+-// Reservation represents details about a reservation in EC2.
+-//
+-// See http://goo.gl/0ItPT for more details.
+-type Reservation struct {
+- ReservationId string `xml:"reservationId"`
+- OwnerId string `xml:"ownerId"`
+- RequesterId string `xml:"requesterId"`
+- SecurityGroups []SecurityGroup `xml:"groupSet>item"`
+- Instances []Instance `xml:"instancesSet>item"`
-}
-
--func hello2(req *restful.Request, resp *restful.Response) {
-- io.WriteString(resp, "second world")
+-// Instances returns details about instances in EC2. Both parameters
+-// are optional, and if provided will limit the instances returned to those
+-// matching the given instance ids or filtering rules.
+-//
+-// See http://goo.gl/4No7c for more details.
+-func (ec2 *EC2) Instances(instIds []string, filter *Filter) (resp *InstancesResp, err error) {
+- params := makeParams("DescribeInstances")
+- addParamsList(params, "InstanceId", instIds)
+- filter.addParams(params)
+- resp = &InstancesResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
+- }
+- return
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-options-filter.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-options-filter.go
-deleted file mode 100644
-index 73dc3cf..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-options-filter.go
-+++ /dev/null
-@@ -1,51 +0,0 @@
--package main
-
--import (
-- "github.com/emicklei/go-restful"
-- "io"
-- "log"
-- "net/http"
--)
+-// ----------------------------------------------------------------------------
+-// Volume management
-
--// This example shows how to use the OPTIONSFilter on a Container
--//
--// OPTIONS http://localhost:8080/users
+-// The CreateVolume request parameters
-//
--// OPTIONS http://localhost:8080/users/1
--
--type UserResource struct{}
--
--func (u UserResource) RegisterTo(container *restful.Container) {
-- ws := new(restful.WebService)
-- ws.
-- Path("/users").
-- Consumes("*/*").
-- Produces("*/*")
--
-- ws.Route(ws.GET("/{user-id}").To(u.nop))
-- ws.Route(ws.POST("").To(u.nop))
-- ws.Route(ws.PUT("/{user-id}").To(u.nop))
-- ws.Route(ws.DELETE("/{user-id}").To(u.nop))
--
-- container.Add(ws)
+-// See http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-CreateVolume.html
+-type CreateVolume struct {
+- AvailZone string
+- Size int64
+- SnapshotId string
+- VolumeType string
+- IOPS int64
+- Encrypted bool
-}
-
--func (u UserResource) nop(request *restful.Request, response *restful.Response) {
-- io.WriteString(response.ResponseWriter, "this would be a normal response")
+-// Response to an AttachVolume request
+-type AttachVolumeResp struct {
+- RequestId string `xml:"requestId"`
+- VolumeId string `xml:"volumeId"`
+- InstanceId string `xml:"instanceId"`
+- Device string `xml:"device"`
+- Status string `xml:"status"`
+- AttachTime string `xml:"attachTime"`
-}
-
--func main() {
-- wsContainer := restful.NewContainer()
-- u := UserResource{}
-- u.RegisterTo(wsContainer)
--
-- // Add container filter to respond to OPTIONS
-- wsContainer.Filter(wsContainer.OPTIONSFilter)
+-// Response to a CreateVolume request
+-type CreateVolumeResp struct {
+- RequestId string `xml:"requestId"`
+- VolumeId string `xml:"volumeId"`
+- Size int64 `xml:"size"`
+- SnapshotId string `xml:"snapshotId"`
+- AvailZone string `xml:"availabilityZone"`
+- Status string `xml:"status"`
+- CreateTime string `xml:"createTime"`
+- VolumeType string `xml:"volumeType"`
+- IOPS int64 `xml:"iops"`
+- Encrypted bool `xml:"encrypted"`
+-}
-
-- // For use on the default container, you can write
-- // restful.Filter(restful.OPTIONSFilter())
+-// Volume is a single volume.
+-type Volume struct {
+- VolumeId string `xml:"volumeId"`
+- Size string `xml:"size"`
+- SnapshotId string `xml:"snapshotId"`
+- AvailZone string `xml:"availabilityZone"`
+- Status string `xml:"status"`
+- Attachments []VolumeAttachment `xml:"attachmentSet>item"`
+- VolumeType string `xml:"volumeType"`
+- IOPS int64 `xml:"iops"`
+- Encrypted bool `xml:"encrypted"`
+- Tags []Tag `xml:"tagSet>item"`
+-}
-
-- log.Printf("start listening on localhost:8080")
-- server := &http.Server{Addr: ":8080", Handler: wsContainer}
-- log.Fatal(server.ListenAndServe())
+-type VolumeAttachment struct {
+- VolumeId string `xml:"volumeId"`
+- InstanceId string `xml:"instanceId"`
+- Device string `xml:"device"`
+- Status string `xml:"status"`
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-path-tail.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-path-tail.go
-deleted file mode 100644
-index 8488a23..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-path-tail.go
-+++ /dev/null
-@@ -1,26 +0,0 @@
--package main
-
--import (
-- "io"
-- "net/http"
-- . "github.com/emicklei/go-restful"
--)
+-// Response to a DescribeVolumes request
+-type VolumesResp struct {
+- RequestId string `xml:"requestId"`
+- Volumes []Volume `xml:"volumeSet>item"`
+-}
-
--// This example shows how to a Route that matches the "tail" of a path.
--// Requires the use of a CurlyRouter and the star "*" path parameter pattern.
--//
--// GET http://localhost:8080/basepath/some/other/location/test.xml
+-// Attach a volume.
+-func (ec2 *EC2) AttachVolume(volumeId string, instanceId string, device string) (resp *AttachVolumeResp, err error) {
+- params := makeParams("AttachVolume")
+- params["VolumeId"] = volumeId
+- params["InstanceId"] = instanceId
+- params["Device"] = device
-
--func main() {
-- DefaultContainer.Router(CurlyRouter{})
-- ws := new(WebService)
-- ws.Route(ws.GET("/basepath/{resource:*}").To(staticFromPathParam))
-- Add(ws)
+- resp = &AttachVolumeResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
+- }
-
-- println("[go-restful] serve path tails from http://localhost:8080/basepath")
-- http.ListenAndServe(":8080", nil)
+- return
-}
-
--func staticFromPathParam(req *Request, resp *Response) {
-- io.WriteString(resp, "Tail="+req.PathParameter("resource"))
--}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-pre-post-filters.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-pre-post-filters.go
-deleted file mode 100644
-index 0b55f14..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-pre-post-filters.go
-+++ /dev/null
-@@ -1,98 +0,0 @@
--package main
+-// Create a new volume.
+-func (ec2 *EC2) CreateVolume(options *CreateVolume) (resp *CreateVolumeResp, err error) {
+- params := makeParams("CreateVolume")
+- params["AvailabilityZone"] = options.AvailZone
+- if options.Size > 0 {
+- params["Size"] = strconv.FormatInt(options.Size, 10)
+- }
-
--import (
-- "github.com/emicklei/go-restful"
-- "io"
-- "log"
-- "net/http"
--)
+- if options.SnapshotId != "" {
+- params["SnapshotId"] = options.SnapshotId
+- }
-
--// This example shows how the different types of filters are called in the request-response flow.
--// The call chain is logged on the console when sending an http request.
--//
--// GET http://localhost:8080/1
--// GET http://localhost:8080/2
+- if options.VolumeType != "" {
+- params["VolumeType"] = options.VolumeType
+- }
-
--var indentLevel int
+- if options.IOPS > 0 {
+- params["Iops"] = strconv.FormatInt(options.IOPS, 10)
+- }
-
--func container_filter_A(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
-- log.Printf("url path:%v\n", req.Request.URL)
-- trace("container_filter_A: before", 1)
-- chain.ProcessFilter(req, resp)
-- trace("container_filter_A: after", -1)
--}
+- if options.Encrypted {
+- params["Encrypted"] = "true"
+- }
-
--func container_filter_B(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
-- trace("container_filter_B: before", 1)
-- chain.ProcessFilter(req, resp)
-- trace("container_filter_B: after", -1)
--}
+- resp = &CreateVolumeResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
+- }
-
--func service_filter_A(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
-- trace("service_filter_A: before", 1)
-- chain.ProcessFilter(req, resp)
-- trace("service_filter_A: after", -1)
+- return
-}
-
--func service_filter_B(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
-- trace("service_filter_B: before", 1)
-- chain.ProcessFilter(req, resp)
-- trace("service_filter_B: after", -1)
--}
+-// Delete an EBS volume.
+-func (ec2 *EC2) DeleteVolume(id string) (resp *SimpleResp, err error) {
+- params := makeParams("DeleteVolume")
+- params["VolumeId"] = id
-
--func route_filter_A(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
-- trace("route_filter_A: before", 1)
-- chain.ProcessFilter(req, resp)
-- trace("route_filter_A: after", -1)
+- resp = &SimpleResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
+- }
+- return
-}
-
--func route_filter_B(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
-- trace("route_filter_B: before", 1)
-- chain.ProcessFilter(req, resp)
-- trace("route_filter_B: after", -1)
--}
+-// Detaches an EBS volume.
+-func (ec2 *EC2) DetachVolume(id string) (resp *SimpleResp, err error) {
+- params := makeParams("DetachVolume")
+- params["VolumeId"] = id
-
--func trace(what string, delta int) {
-- indented := what
-- if delta < 0 {
-- indentLevel += delta
-- }
-- for t := 0; t < indentLevel; t++ {
-- indented = "." + indented
-- }
-- log.Printf("%s", indented)
-- if delta > 0 {
-- indentLevel += delta
+- resp = &SimpleResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
- }
+- return
-}
-
--func main() {
-- restful.Filter(container_filter_A)
-- restful.Filter(container_filter_B)
--
-- ws1 := new(restful.WebService)
-- ws1.Path("/1")
-- ws1.Filter(service_filter_A)
-- ws1.Filter(service_filter_B)
-- ws1.Route(ws1.GET("").To(doit1).Filter(route_filter_A).Filter(route_filter_B))
--
-- ws2 := new(restful.WebService)
-- ws2.Path("/2")
-- ws2.Filter(service_filter_A)
-- ws2.Filter(service_filter_B)
-- ws2.Route(ws2.GET("").To(doit2).Filter(route_filter_A).Filter(route_filter_B))
--
-- restful.Add(ws1)
-- restful.Add(ws2)
--
-- log.Print("go-restful example listing on http://localhost:8080/1 and http://localhost:8080/2")
-- log.Fatal(http.ListenAndServe(":8080", nil))
+-// Finds or lists all volumes.
+-func (ec2 *EC2) Volumes(volIds []string, filter *Filter) (resp *VolumesResp, err error) {
+- params := makeParams("DescribeVolumes")
+- addParamsList(params, "VolumeId", volIds)
+- filter.addParams(params)
+- resp = &VolumesResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
+- }
+- return
-}
-
--func doit1(req *restful.Request, resp *restful.Response) {
-- io.WriteString(resp, "nothing to see in 1")
--}
+-// ----------------------------------------------------------------------------
+-// ElasticIp management (for VPC)
-
--func doit2(req *restful.Request, resp *restful.Response) {
-- io.WriteString(resp, "nothing to see in 2")
+-// The AllocateAddress request parameters
+-//
+-// see http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-AllocateAddress.html
+-type AllocateAddress struct {
+- Domain string
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-resource-functions.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-resource-functions.go
-deleted file mode 100644
-index fb1012a..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-resource-functions.go
-+++ /dev/null
-@@ -1,63 +0,0 @@
--package main
-
--import (
-- "github.com/emicklei/go-restful"
-- "log"
-- "net/http"
--)
+-// Response to an AllocateAddress request
+-type AllocateAddressResp struct {
+- RequestId string `xml:"requestId"`
+- PublicIp string `xml:"publicIp"`
+- Domain string `xml:"domain"`
+- AllocationId string `xml:"allocationId"`
+-}
-
--// This example shows how to use methods as RouteFunctions for WebServices.
--// The ProductResource has a Register() method that creates and initializes
--// a WebService to expose its methods as REST operations.
--// The WebService is added to the restful.DefaultContainer.
--// A ProductResource is typically created using some data access object.
+-// The AssociateAddress request parameters
-//
--// GET http://localhost:8080/products/1
--// POST http://localhost:8080/products
--// <Product><Id>1</Id><Title>The First</Title></Product>
--
--type Product struct {
-- Id, Title string
+-// http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-AssociateAddress.html
+-type AssociateAddress struct {
+- InstanceId string
+- PublicIp string
+- AllocationId string
+- AllowReassociation bool
-}
-
--type ProductResource struct {
-- // typically reference a DAO (data-access-object)
+-// Response to an AssociateAddress request
+-type AssociateAddressResp struct {
+- RequestId string `xml:"requestId"`
+- Return bool `xml:"return"`
+- AssociationId string `xml:"associationId"`
-}
-
--func (p ProductResource) getOne(req *restful.Request, resp *restful.Response) {
-- id := req.PathParameter("id")
-- log.Println("getting product with id:" + id)
-- resp.WriteEntity(Product{Id: id, Title: "test"})
+-// Address represents an Elastic IP Address
+-// See http://goo.gl/uxCjp7 for more details
+-type Address struct {
+- PublicIp string `xml:"publicIp"`
+- AllocationId string `xml:"allocationId"`
+- Domain string `xml:"domain"`
+- InstanceId string `xml:"instanceId"`
+- AssociationId string `xml:"associationId"`
+- NetworkInterfaceId string `xml:"networkInterfaceId"`
+- NetworkInterfaceOwnerId string `xml:"networkInterfaceOwnerId"`
+- PrivateIpAddress string `xml:"privateIpAddress"`
-}
-
--func (p ProductResource) postOne(req *restful.Request, resp *restful.Response) {
-- updatedProduct := new(Product)
-- err := req.ReadEntity(updatedProduct)
-- if err != nil { // bad request
-- resp.WriteErrorString(http.StatusBadRequest, err.Error())
-- return
-- }
-- log.Println("updating product with id:" + updatedProduct.Id)
+-type DescribeAddressesResp struct {
+- RequestId string `xml:"requestId"`
+- Addresses []Address `xml:"addressesSet>item"`
-}
-
--func (p ProductResource) Register() {
-- ws := new(restful.WebService)
-- ws.Path("/products")
-- ws.Consumes(restful.MIME_XML)
-- ws.Produces(restful.MIME_XML)
--
-- ws.Route(ws.GET("/{id}").To(p.getOne).
-- Doc("get the product by its id").
-- Param(ws.PathParameter("id", "identifier of the product").DataType("string")))
+-// Allocate a new Elastic IP.
+-func (ec2 *EC2) AllocateAddress(options *AllocateAddress) (resp *AllocateAddressResp, err error) {
+- params := makeParams("AllocateAddress")
+- params["Domain"] = options.Domain
-
-- ws.Route(ws.POST("").To(p.postOne).
-- Doc("update or create a product").
-- Param(ws.BodyParameter("Product", "a Product (XML)").DataType("main.Product")))
+- resp = &AllocateAddressResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
+- }
-
-- restful.Add(ws)
+- return
-}
-
--func main() {
-- ProductResource{}.Register()
-- http.ListenAndServe(":8080", nil)
--}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-route_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-route_test.go
-deleted file mode 100644
-index 20c366b..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-route_test.go
-+++ /dev/null
-@@ -1,39 +0,0 @@
--package main
+-// Release an Elastic IP (VPC).
+-func (ec2 *EC2) ReleaseAddress(id string) (resp *SimpleResp, err error) {
+- params := makeParams("ReleaseAddress")
+- params["AllocationId"] = id
-
--import (
-- "net/http"
-- "net/http/httptest"
-- "strings"
-- "testing"
+- resp = &SimpleResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
+- }
-
-- "github.com/emicklei/go-restful"
--)
+- return
+-}
-
--var (
-- Result string
--)
+-// Release an Elastic IP (Public)
+-func (ec2 *EC2) ReleasePublicAddress(publicIp string) (resp *SimpleResp, err error) {
+- params := makeParams("ReleaseAddress")
+- params["PublicIp"] = publicIp
-
--func TestRouteExtractParameter(t *testing.T) {
-- // setup service
-- ws := new(restful.WebService)
-- ws.Consumes(restful.MIME_XML)
-- ws.Route(ws.GET("/test/{param}").To(DummyHandler))
-- restful.Add(ws)
+- resp = &SimpleResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
+- }
-
-- // setup request + writer
-- bodyReader := strings.NewReader("<Sample><Value>42</Value></Sample>")
-- httpRequest, _ := http.NewRequest("GET", "/test/THIS", bodyReader)
-- httpRequest.Header.Set("Content-Type", restful.MIME_XML)
-- httpWriter := httptest.NewRecorder()
+- return
+-}
-
-- // run
-- restful.DefaultContainer.ServeHTTP(httpWriter, httpRequest)
+-// Associate an address with a VPC instance.
+-func (ec2 *EC2) AssociateAddress(options *AssociateAddress) (resp *AssociateAddressResp, err error) {
+- params := makeParams("AssociateAddress")
+- params["InstanceId"] = options.InstanceId
+- if options.PublicIp != "" {
+- params["PublicIp"] = options.PublicIp
+- }
+- if options.AllocationId != "" {
+- params["AllocationId"] = options.AllocationId
+- }
+- if options.AllowReassociation {
+- params["AllowReassociation"] = "true"
+- }
-
-- if Result != "THIS" {
-- t.Fatalf("Result is actually: %s", Result)
+- resp = &AssociateAddressResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
- }
--}
-
--func DummyHandler(rq *restful.Request, rp *restful.Response) {
-- Result = rq.PathParameter("param")
+- return
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-routefunction_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-routefunction_test.go
-deleted file mode 100644
-index 6d61c5c..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-routefunction_test.go
-+++ /dev/null
-@@ -1,29 +0,0 @@
--package main
--
--import (
-- "net/http"
-- "net/http/httptest"
-- "testing"
-
-- "github.com/emicklei/go-restful"
--)
+-// Disassociate an address from a VPC instance.
+-func (ec2 *EC2) DisassociateAddress(id string) (resp *SimpleResp, err error) {
+- params := makeParams("DisassociateAddress")
+- params["AssociationId"] = id
-
--// This example show how to test one particular RouteFunction (getIt)
--// It uses the httptest.ResponseRecorder to capture output
+- resp = &SimpleResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
+- }
-
--func getIt(req *restful.Request, resp *restful.Response) {
-- resp.WriteHeader(404)
+- return
-}
-
--func TestCallFunction(t *testing.T) {
-- httpReq, _ := http.NewRequest("GET", "/", nil)
-- req := restful.NewRequest(httpReq)
--
-- recorder := new(httptest.ResponseRecorder)
-- resp := restful.NewResponse(recoder)
--
-- getIt(req, resp)
-- if recorder.Code != 404 {
-- t.Logf("Missing or wrong status code:%d", recorder.Code)
+-// DescribeAddresses returns details about one or more
+-// Elastic IP Addresses. Returned addresses can be
+-// filtered by Public IP, Allocation ID or multiple filters
+-//
+-// See http://goo.gl/zW7J4p for more details.
+-func (ec2 *EC2) Addresses(publicIps []string, allocationIds []string, filter *Filter) (resp *DescribeAddressesResp, err error) {
+- params := makeParams("DescribeAddresses")
+- addParamsList(params, "PublicIp", publicIps)
+- addParamsList(params, "AllocationId", allocationIds)
+- filter.addParams(params)
+- resp = &DescribeAddressesResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
- }
+- return
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-serve-static.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-serve-static.go
-deleted file mode 100644
-index 8cb7848..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-serve-static.go
-+++ /dev/null
-@@ -1,47 +0,0 @@
--package main
--
--import (
-- "fmt"
-- "net/http"
-- "path"
-
-- "github.com/emicklei/go-restful"
--)
+-// ----------------------------------------------------------------------------
+-// Image and snapshot management functions and types.
-
--// This example shows how to define methods that serve static files
--// It uses the standard http.ServeFile method
--//
--// GET http://localhost:8080/static/test.xml
--// GET http://localhost:8080/static/
+-// The CreateImage request parameters.
-//
--// GET http://localhost:8080/static?resource=subdir/test.xml
+-// See http://goo.gl/cxU41 for more details.
+-type CreateImage struct {
+- InstanceId string
+- Name string
+- Description string
+- NoReboot bool
+- BlockDevices []BlockDeviceMapping
+-}
-
--var rootdir = "/tmp"
+-// Response to a CreateImage request.
+-//
+-// See http://goo.gl/cxU41 for more details.
+-type CreateImageResp struct {
+- RequestId string `xml:"requestId"`
+- ImageId string `xml:"imageId"`
+-}
-
--func main() {
-- restful.DefaultContainer.Router(restful.CurlyRouter{})
+-// Response to a DescribeImages request.
+-//
+-// See http://goo.gl/hLnyg for more details.
+-type ImagesResp struct {
+- RequestId string `xml:"requestId"`
+- Images []Image `xml:"imagesSet>item"`
+-}
-
-- ws := new(restful.WebService)
-- ws.Route(ws.GET("/static/{subpath:*}").To(staticFromPathParam))
-- ws.Route(ws.GET("/static").To(staticFromQueryParam))
-- restful.Add(ws)
+-// Response to a DescribeImageAttribute request.
+-//
+-// See http://goo.gl/bHO3zT for more details.
+-type ImageAttributeResp struct {
+- RequestId string `xml:"requestId"`
+- ImageId string `xml:"imageId"`
+- Kernel string `xml:"kernel>value"`
+- RamDisk string `xml:"ramdisk>value"`
+- Description string `xml:"description>value"`
+- Group string `xml:"launchPermission>item>group"`
+- UserIds []string `xml:"launchPermission>item>userId"`
+- ProductCodes []string `xml:"productCodes>item>productCode"`
+- BlockDevices []BlockDeviceMapping `xml:"blockDeviceMapping>item"`
+-}
-
-- println("[go-restful] serving files on http://localhost:8080/static from local /tmp")
-- http.ListenAndServe(":8080", nil)
+-// The RegisterImage request parameters.
+-type RegisterImage struct {
+- ImageLocation string
+- Name string
+- Description string
+- Architecture string
+- KernelId string
+- RamdiskId string
+- RootDeviceName string
+- VirtType string
+- SriovNetSupport string
+- BlockDevices []BlockDeviceMapping
-}
-
--func staticFromPathParam(req *restful.Request, resp *restful.Response) {
-- actual := path.Join(rootdir, req.PathParameter("subpath"))
-- fmt.Printf("serving %s ... (from %s)\n", actual, req.PathParameter("subpath"))
-- http.ServeFile(
-- resp.ResponseWriter,
-- req.Request,
-- actual)
+-// Response to a RegisterImage request.
+-type RegisterImageResp struct {
+- RequestId string `xml:"requestId"`
+- ImageId string `xml:"imageId"`
-}
-
--func staticFromQueryParam(req *restful.Request, resp *restful.Response) {
-- http.ServeFile(
-- resp.ResponseWriter,
-- req.Request,
-- path.Join(rootdir, req.QueryParameter("resource")))
+-// Response to a DegisterImage request.
+-//
+-// See http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DeregisterImage.html
+-type DeregisterImageResp struct {
+- RequestId string `xml:"requestId"`
+- Return bool `xml:"return"`
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-user-resource.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-user-resource.go
-deleted file mode 100644
-index f6ec988..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-user-resource.go
-+++ /dev/null
-@@ -1,153 +0,0 @@
--package main
-
--import (
-- "log"
-- "net/http"
-- "strconv"
+-// BlockDeviceMapping represents the association of a block device with an image.
+-//
+-// See http://goo.gl/wnDBf for more details.
+-type BlockDeviceMapping struct {
+- DeviceName string `xml:"deviceName"`
+- VirtualName string `xml:"virtualName"`
+- SnapshotId string `xml:"ebs>snapshotId"`
+- VolumeType string `xml:"ebs>volumeType"`
+- VolumeSize int64 `xml:"ebs>volumeSize"`
+- DeleteOnTermination bool `xml:"ebs>deleteOnTermination"`
+- Encrypted bool `xml:"ebs>encrypted"`
+- NoDevice bool `xml:"noDevice"`
-
-- "github.com/emicklei/go-restful"
-- "github.com/emicklei/go-restful/swagger"
--)
+- // The number of I/O operations per second (IOPS) that the volume supports.
+- IOPS int64 `xml:"ebs>iops"`
+-}
-
--// This example show a complete (GET,PUT,POST,DELETE) conventional example of
--// a REST Resource including documentation to be served by e.g. a Swagger UI
--// It is recommended to create a Resource struct (UserResource) that can encapsulate
--// an object that provide domain access (a DAO)
--// It has a Register method including the complete Route mapping to methods together
--// with all the appropriate documentation
--//
--// POST http://localhost:8080/users
--// <User><Id>1</Id><Name>Melissa Raspberry</Name></User>
--//
--// GET http://localhost:8080/users/1
--//
--// PUT http://localhost:8080/users/1
--// <User><Id>1</Id><Name>Melissa</Name></User>
--//
--// DELETE http://localhost:8080/users/1
+-// Image represents details about an image.
-//
+-// See http://goo.gl/iSqJG for more details.
+-type Image struct {
+- Id string `xml:"imageId"`
+- Name string `xml:"name"`
+- Description string `xml:"description"`
+- Type string `xml:"imageType"`
+- State string `xml:"imageState"`
+- Location string `xml:"imageLocation"`
+- Public bool `xml:"isPublic"`
+- Architecture string `xml:"architecture"`
+- Platform string `xml:"platform"`
+- ProductCodes []string `xml:"productCode>item>productCode"`
+- KernelId string `xml:"kernelId"`
+- RamdiskId string `xml:"ramdiskId"`
+- StateReason string `xml:"stateReason"`
+- OwnerId string `xml:"imageOwnerId"`
+- OwnerAlias string `xml:"imageOwnerAlias"`
+- RootDeviceType string `xml:"rootDeviceType"`
+- RootDeviceName string `xml:"rootDeviceName"`
+- VirtualizationType string `xml:"virtualizationType"`
+- Hypervisor string `xml:"hypervisor"`
+- BlockDevices []BlockDeviceMapping `xml:"blockDeviceMapping>item"`
+- Tags []Tag `xml:"tagSet>item"`
+-}
-
--type User struct {
-- Id, Name string
+-// The ModifyImageAttribute request parameters.
+-type ModifyImageAttribute struct {
+- AddUsers []string
+- RemoveUsers []string
+- AddGroups []string
+- RemoveGroups []string
+- ProductCodes []string
+- Description string
-}
-
--type UserResource struct {
-- // normally one would use DAO (data access object)
-- users map[string]User
+-// The CopyImage request parameters.
+-//
+-// See http://goo.gl/hQwPCK for more details.
+-type CopyImage struct {
+- SourceRegion string
+- SourceImageId string
+- Name string
+- Description string
+- ClientToken string
-}
-
--func (u UserResource) Register(container *restful.Container) {
-- ws := new(restful.WebService)
-- ws.
-- Path("/users").
-- Doc("Manage Users").
-- Consumes(restful.MIME_XML, restful.MIME_JSON).
-- Produces(restful.MIME_JSON, restful.MIME_XML) // you can specify this per route as well
+-// Response to a CopyImage request.
+-//
+-// See http://goo.gl/hQwPCK for more details.
+-type CopyImageResp struct {
+- RequestId string `xml:"requestId"`
+- ImageId string `xml:"imageId"`
+-}
-
-- ws.Route(ws.GET("/{user-id}").To(u.findUser).
-- // docs
-- Doc("get a user").
-- Operation("findUser").
-- Param(ws.PathParameter("user-id", "identifier of the user").DataType("string")).
-- Writes(User{})) // on the response
+-// Creates an Amazon EBS-backed AMI from an Amazon EBS-backed instance
+-// that is either running or stopped.
+-//
+-// See http://goo.gl/cxU41 for more details.
+-func (ec2 *EC2) CreateImage(options *CreateImage) (resp *CreateImageResp, err error) {
+- params := makeParams("CreateImage")
+- params["InstanceId"] = options.InstanceId
+- params["Name"] = options.Name
+- if options.Description != "" {
+- params["Description"] = options.Description
+- }
+- if options.NoReboot {
+- params["NoReboot"] = "true"
+- }
+- addBlockDeviceParams("", params, options.BlockDevices)
-
-- ws.Route(ws.PUT("/{user-id}").To(u.updateUser).
-- // docs
-- Doc("update a user").
-- Operation("updateUser").
-- Param(ws.PathParameter("user-id", "identifier of the user").DataType("string")).
-- ReturnsError(409, "duplicate user-id", nil).
-- Reads(User{})) // from the request
+- resp = &CreateImageResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
+- }
-
-- ws.Route(ws.POST("").To(u.createUser).
-- // docs
-- Doc("create a user").
-- Operation("createUser").
-- Reads(User{})) // from the request
+- return
+-}
-
-- ws.Route(ws.DELETE("/{user-id}").To(u.removeUser).
-- // docs
-- Doc("delete a user").
-- Operation("removeUser").
-- Param(ws.PathParameter("user-id", "identifier of the user").DataType("string")))
+-// Images returns details about available images.
+-// The ids and filter parameters, if provided, will limit the images returned.
+-// For example, to get all the private images associated with this account set
+-// the boolean filter "is-public" to 0.
+-// For list of filters: http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeImages.html
+-//
+-// Note: calling this function with nil ids and filter parameters will result in
+-// a very large number of images being returned.
+-//
+-// See http://goo.gl/SRBhW for more details.
+-func (ec2 *EC2) Images(ids []string, filter *Filter) (resp *ImagesResp, err error) {
+- params := makeParams("DescribeImages")
+- for i, id := range ids {
+- params["ImageId."+strconv.Itoa(i+1)] = id
+- }
+- filter.addParams(params)
-
-- container.Add(ws)
+- resp = &ImagesResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
+- }
+- return
-}
-
--// GET http://localhost:8080/users/1
+-// ImagesByOwners returns details about available images.
+-// The ids, owners, and filter parameters, if provided, will limit the images returned.
+-// For example, to get all the private images associated with this account set
+-// the boolean filter "is-public" to 0.
+-// For list of filters: http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeImages.html
-//
--func (u UserResource) findUser(request *restful.Request, response *restful.Response) {
-- id := request.PathParameter("user-id")
-- usr := u.users[id]
-- if len(usr.Id) == 0 {
-- response.AddHeader("Content-Type", "text/plain")
-- response.WriteErrorString(http.StatusNotFound, "404: User could not be found.")
-- return
+-// Note: calling this function with nil ids and filter parameters will result in
+-// a very large number of images being returned.
+-//
+-// See http://goo.gl/SRBhW for more details.
+-func (ec2 *EC2) ImagesByOwners(ids []string, owners []string, filter *Filter) (resp *ImagesResp, err error) {
+- params := makeParams("DescribeImages")
+- for i, id := range ids {
+- params["ImageId."+strconv.Itoa(i+1)] = id
+- }
+- for i, owner := range owners {
+- params[fmt.Sprintf("Owner.%d", i+1)] = owner
- }
-- response.WriteEntity(usr)
--}
-
--// POST http://localhost:8080/users
--// <User><Name>Melissa</Name></User>
--//
--func (u *UserResource) createUser(request *restful.Request, response *restful.Response) {
-- usr := new(User)
-- err := request.ReadEntity(usr)
+- filter.addParams(params)
+-
+- resp = &ImagesResp{}
+- err = ec2.query(params, resp)
- if err != nil {
-- response.AddHeader("Content-Type", "text/plain")
-- response.WriteErrorString(http.StatusInternalServerError, err.Error())
-- return
+- return nil, err
- }
-- usr.Id = strconv.Itoa(len(u.users) + 1) // simple id generation
-- u.users[usr.Id] = *usr
-- response.WriteHeader(http.StatusCreated)
-- response.WriteEntity(usr)
+- return
-}
-
--// PUT http://localhost:8080/users/1
--// <User><Id>1</Id><Name>Melissa Raspberry</Name></User>
+-// ImageAttribute describes an attribute of an AMI.
+-// You can specify only one attribute at a time.
+-// Valid attributes are:
+-// description | kernel | ramdisk | launchPermission | productCodes | blockDeviceMapping
-//
--func (u *UserResource) updateUser(request *restful.Request, response *restful.Response) {
-- usr := new(User)
-- err := request.ReadEntity(&usr)
+-// See http://goo.gl/bHO3zT for more details.
+-func (ec2 *EC2) ImageAttribute(imageId, attribute string) (resp *ImageAttributeResp, err error) {
+- params := makeParams("DescribeImageAttribute")
+- params["ImageId"] = imageId
+- params["Attribute"] = attribute
+-
+- resp = &ImageAttributeResp{}
+- err = ec2.query(params, resp)
- if err != nil {
-- response.AddHeader("Content-Type", "text/plain")
-- response.WriteErrorString(http.StatusInternalServerError, err.Error())
-- return
+- return nil, err
- }
-- u.users[usr.Id] = *usr
-- response.WriteEntity(usr)
+- return
-}
-
--// DELETE http://localhost:8080/users/1
+-// ModifyImageAttribute sets attributes for an image.
-//
--func (u *UserResource) removeUser(request *restful.Request, response *restful.Response) {
-- id := request.PathParameter("user-id")
-- delete(u.users, id)
--}
--
--func main() {
-- // to see what happens in the package, uncomment the following
-- //restful.TraceLogger(log.New(os.Stdout, "[restful] ", log.LstdFlags|log.Lshortfile))
--
-- wsContainer := restful.NewContainer()
-- u := UserResource{map[string]User{}}
-- u.Register(wsContainer)
+-// See http://goo.gl/YUjO4G for more details.
+-func (ec2 *EC2) ModifyImageAttribute(imageId string, options *ModifyImageAttribute) (resp *SimpleResp, err error) {
+- params := makeParams("ModifyImageAttribute")
+- params["ImageId"] = imageId
+- if options.Description != "" {
+- params["Description.Value"] = options.Description
+- }
-
-- // Optionally, you can install the Swagger Service which provides a nice Web UI on your REST API
-- // You need to download the Swagger HTML5 assets and change the FilePath location in the config below.
-- // Open http://localhost:8080/apidocs and enter http://localhost:8080/apidocs.json in the api input field.
-- config := swagger.Config{
-- WebServices: wsContainer.RegisteredWebServices(), // you control what services are visible
-- WebServicesUrl: "http://localhost:8080",
-- ApiPath: "/apidocs.json",
+- if options.AddUsers != nil {
+- for i, user := range options.AddUsers {
+- p := fmt.Sprintf("LaunchPermission.Add.%d.UserId", i+1)
+- params[p] = user
+- }
+- }
-
-- // Optionally, specifiy where the UI is located
-- SwaggerPath: "/apidocs/",
-- SwaggerFilePath: "/Users/emicklei/xProjects/swagger-ui/dist"}
-- swagger.RegisterSwaggerService(config, wsContainer)
+- if options.RemoveUsers != nil {
+- for i, user := range options.RemoveUsers {
+- p := fmt.Sprintf("LaunchPermission.Remove.%d.UserId", i+1)
+- params[p] = user
+- }
+- }
-
-- log.Printf("start listening on localhost:8080")
-- server := &http.Server{Addr: ":8080", Handler: wsContainer}
-- log.Fatal(server.ListenAndServe())
--}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-user-service.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-user-service.go
-deleted file mode 100644
-index d0d9872..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-user-service.go
-+++ /dev/null
-@@ -1,138 +0,0 @@
--package main
+- if options.AddGroups != nil {
+- for i, group := range options.AddGroups {
+- p := fmt.Sprintf("LaunchPermission.Add.%d.Group", i+1)
+- params[p] = group
+- }
+- }
-
--import (
-- "log"
-- "net/http"
+- if options.RemoveGroups != nil {
+- for i, group := range options.RemoveGroups {
+- p := fmt.Sprintf("LaunchPermission.Remove.%d.Group", i+1)
+- params[p] = group
+- }
+- }
-
-- "github.com/emicklei/go-restful"
-- "github.com/emicklei/go-restful/swagger"
--)
+- if options.ProductCodes != nil {
+- addParamsList(params, "ProductCode", options.ProductCodes)
+- }
-
--// This example is functionally the same as the example in restful-user-resource.go
--// with the only difference that is served using the restful.DefaultContainer
+- resp = &SimpleResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- resp = nil
+- }
-
--type User struct {
-- Id, Name string
+- return
-}
-
--type UserService struct {
-- // normally one would use DAO (data access object)
-- users map[string]User
--}
+-// Registers a new AMI with EC2.
+-//
+-// See: http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-RegisterImage.html
+-func (ec2 *EC2) RegisterImage(options *RegisterImage) (resp *RegisterImageResp, err error) {
+- params := makeParams("RegisterImage")
+- params["Name"] = options.Name
+- if options.ImageLocation != "" {
+- params["ImageLocation"] = options.ImageLocation
+- }
-
--func (u UserService) Register() {
-- ws := new(restful.WebService)
-- ws.
-- Path("/users").
-- Consumes(restful.MIME_XML, restful.MIME_JSON).
-- Produces(restful.MIME_JSON, restful.MIME_XML) // you can specify this per route as well
+- if options.Description != "" {
+- params["Description"] = options.Description
+- }
-
-- ws.Route(ws.GET("/").To(u.findAllUsers).
-- // docs
-- Doc("get all users").
-- Operation("findAllUsers").
-- Returns(200, "OK", []User{}))
+- if options.Architecture != "" {
+- params["Architecture"] = options.Architecture
+- }
-
-- ws.Route(ws.GET("/{user-id}").To(u.findUser).
-- // docs
-- Doc("get a user").
-- Operation("findUser").
-- Param(ws.PathParameter("user-id", "identifier of the user").DataType("string")).
-- Writes(User{})) // on the response
+- if options.KernelId != "" {
+- params["KernelId"] = options.KernelId
+- }
-
-- ws.Route(ws.PUT("/{user-id}").To(u.updateUser).
-- // docs
-- Doc("update a user").
-- Operation("updateUser").
-- Param(ws.PathParameter("user-id", "identifier of the user").DataType("string")).
-- Reads(User{})) // from the request
+- if options.RamdiskId != "" {
+- params["RamdiskId"] = options.RamdiskId
+- }
-
-- ws.Route(ws.PUT("").To(u.createUser).
-- // docs
-- Doc("create a user").
-- Operation("createUser").
-- Reads(User{})) // from the request
+- if options.RootDeviceName != "" {
+- params["RootDeviceName"] = options.RootDeviceName
+- }
-
-- ws.Route(ws.DELETE("/{user-id}").To(u.removeUser).
-- // docs
-- Doc("delete a user").
-- Operation("removeUser").
-- Param(ws.PathParameter("user-id", "identifier of the user").DataType("string")))
+- if options.VirtType != "" {
+- params["VirtualizationType"] = options.VirtType
+- }
-
-- restful.Add(ws)
--}
+- if options.SriovNetSupport != "" {
+- params["SriovNetSupport"] = "simple"
+- }
-
--// GET http://localhost:8080/users
--//
--func (u UserService) findAllUsers(request *restful.Request, response *restful.Response) {
-- response.WriteEntity(u.users)
--}
+- addBlockDeviceParams("", params, options.BlockDevices)
-
--// GET http://localhost:8080/users/1
--//
--func (u UserService) findUser(request *restful.Request, response *restful.Response) {
-- id := request.PathParameter("user-id")
-- usr := u.users[id]
-- if len(usr.Id) == 0 {
-- response.WriteErrorString(http.StatusNotFound, "User could not be found.")
-- } else {
-- response.WriteEntity(usr)
+- resp = &RegisterImageResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
- }
--}
-
--// PUT http://localhost:8080/users/1
--// <User><Id>1</Id><Name>Melissa Raspberry</Name></User>
--//
--func (u *UserService) updateUser(request *restful.Request, response *restful.Response) {
-- usr := new(User)
-- err := request.ReadEntity(&usr)
-- if err == nil {
-- u.users[usr.Id] = *usr
-- response.WriteEntity(usr)
-- } else {
-- response.WriteError(http.StatusInternalServerError, err)
-- }
+- return
-}
-
--// PUT http://localhost:8080/users/1
--// <User><Id>1</Id><Name>Melissa</Name></User>
+-// Degisters an image. Note that this does not delete the backing stores of the AMI.
-//
--func (u *UserService) createUser(request *restful.Request, response *restful.Response) {
-- usr := User{Id: request.PathParameter("user-id")}
-- err := request.ReadEntity(&usr)
-- if err == nil {
-- u.users[usr.Id] = usr
-- response.WriteHeader(http.StatusCreated)
-- response.WriteEntity(usr)
-- } else {
-- response.WriteError(http.StatusInternalServerError, err)
+-// See http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DeregisterImage.html
+-func (ec2 *EC2) DeregisterImage(imageId string) (resp *DeregisterImageResp, err error) {
+- params := makeParams("DeregisterImage")
+- params["ImageId"] = imageId
+-
+- resp = &DeregisterImageResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
- }
--}
-
--// DELETE http://localhost:8080/users/1
--//
--func (u *UserService) removeUser(request *restful.Request, response *restful.Response) {
-- id := request.PathParameter("user-id")
-- delete(u.users, id)
+- return
-}
-
--func main() {
-- u := UserService{map[string]User{}}
-- u.Register()
--
-- // Optionally, you can install the Swagger Service which provides a nice Web UI on your REST API
-- // You need to download the Swagger HTML5 assets and change the FilePath location in the config below.
-- // Open http://localhost:8080/apidocs and enter http://localhost:8080/apidocs.json in the api input field.
-- config := swagger.Config{
-- WebServices: restful.RegisteredWebServices(), // you control what services are visible
-- WebServicesUrl: "http://localhost:8080",
-- ApiPath: "/apidocs.json",
--
-- // Optionally, specifiy where the UI is located
-- SwaggerPath: "/apidocs/",
-- SwaggerFilePath: "/Users/emicklei/Projects/swagger-ui/dist"}
-- swagger.InstallSwaggerService(config)
--
-- log.Printf("start listening on localhost:8080")
-- log.Fatal(http.ListenAndServe(":8080", nil))
--}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/filter.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/filter.go
-deleted file mode 100644
-index 4b86656..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/filter.go
-+++ /dev/null
-@@ -1,26 +0,0 @@
--package restful
+-// Copy and Image from one region to another.
+-//
+-// See http://goo.gl/hQwPCK for more details.
+-func (ec2 *EC2) CopyImage(options *CopyImage) (resp *CopyImageResp, err error) {
+- params := makeParams("CopyImage")
-
--// Copyright 2013 Ernest Micklei. All rights reserved.
--// Use of this source code is governed by a license
--// that can be found in the LICENSE file.
+- if options.SourceRegion != "" {
+- params["SourceRegion"] = options.SourceRegion
+- }
-
--// FilterChain is a request scoped object to process one or more filters before calling the target RouteFunction.
--type FilterChain struct {
-- Filters []FilterFunction // ordered list of FilterFunction
-- Index int // index into filters that is currently in progress
-- Target RouteFunction // function to call after passing all filters
--}
+- if options.SourceImageId != "" {
+- params["SourceImageId"] = options.SourceImageId
+- }
-
--// ProcessFilter passes the request,response pair through the next of Filters.
--// Each filter can decide to proceed to the next Filter or handle the Response itself.
--func (f *FilterChain) ProcessFilter(request *Request, response *Response) {
-- if f.Index < len(f.Filters) {
-- f.Index++
-- f.Filters[f.Index-1](request, response, f)
-- } else {
-- f.Target(request, response)
+- if options.Name != "" {
+- params["Name"] = options.Name
- }
--}
-
--// FilterFunction definitions must call ProcessFilter on the FilterChain to pass on the control and eventually call the RouteFunction
--type FilterFunction func(*Request, *Response, *FilterChain)
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/filter_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/filter_test.go
-deleted file mode 100644
-index fadfb57..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/filter_test.go
-+++ /dev/null
-@@ -1,141 +0,0 @@
--package restful
+- if options.Description != "" {
+- params["Description"] = options.Description
+- }
-
--import (
-- "io"
-- "net/http"
-- "net/http/httptest"
-- "testing"
--)
+- if options.ClientToken != "" {
+- params["ClientToken"] = options.ClientToken
+- }
-
--func setupServices(addGlobalFilter bool, addServiceFilter bool, addRouteFilter bool) {
-- if addGlobalFilter {
-- Filter(globalFilter)
+- resp = &CopyImageResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
- }
-- Add(newTestService(addServiceFilter, addRouteFilter))
--}
-
--func tearDown() {
-- DefaultContainer.webServices = []*WebService{}
-- DefaultContainer.isRegisteredOnRoot = true // this allows for setupServices multiple times
-- DefaultContainer.containerFilters = []FilterFunction{}
+- return
-}
-
--func newTestService(addServiceFilter bool, addRouteFilter bool) *WebService {
-- ws := new(WebService).Path("")
-- if addServiceFilter {
-- ws.Filter(serviceFilter)
-- }
-- rb := ws.GET("/foo").To(foo)
-- if addRouteFilter {
-- rb.Filter(routeFilter)
-- }
-- ws.Route(rb)
-- ws.Route(ws.GET("/bar").To(bar))
-- return ws
+-// Response to a CreateSnapshot request.
+-//
+-// See http://goo.gl/ttcda for more details.
+-type CreateSnapshotResp struct {
+- RequestId string `xml:"requestId"`
+- Snapshot
-}
-
--func foo(req *Request, resp *Response) {
-- io.WriteString(resp.ResponseWriter, "foo")
--}
+-// CreateSnapshot creates a volume snapshot and stores it in S3.
+-//
+-// See http://goo.gl/ttcda for more details.
+-func (ec2 *EC2) CreateSnapshot(volumeId, description string) (resp *CreateSnapshotResp, err error) {
+- params := makeParams("CreateSnapshot")
+- params["VolumeId"] = volumeId
+- params["Description"] = description
-
--func bar(req *Request, resp *Response) {
-- io.WriteString(resp.ResponseWriter, "bar")
+- resp = &CreateSnapshotResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
+- }
+- return
-}
-
--func fail(req *Request, resp *Response) {
-- http.Error(resp.ResponseWriter, "something failed", http.StatusInternalServerError)
--}
+-// DeleteSnapshots deletes the volume snapshots with the given ids.
+-//
+-// Note: If you make periodic snapshots of a volume, the snapshots are
+-// incremental so that only the blocks on the device that have changed
+-// since your last snapshot are incrementally saved in the new snapshot.
+-// Even though snapshots are saved incrementally, the snapshot deletion
+-// process is designed so that you need to retain only the most recent
+-// snapshot in order to restore the volume.
+-//
+-// See http://goo.gl/vwU1y for more details.
+-func (ec2 *EC2) DeleteSnapshots(ids []string) (resp *SimpleResp, err error) {
+- params := makeParams("DeleteSnapshot")
+- for i, id := range ids {
+- params["SnapshotId."+strconv.Itoa(i+1)] = id
+- }
-
--func globalFilter(req *Request, resp *Response, chain *FilterChain) {
-- io.WriteString(resp.ResponseWriter, "global-")
-- chain.ProcessFilter(req, resp)
+- resp = &SimpleResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
+- }
+- return
-}
-
--func serviceFilter(req *Request, resp *Response, chain *FilterChain) {
-- io.WriteString(resp.ResponseWriter, "service-")
-- chain.ProcessFilter(req, resp)
+-// Response to a DescribeSnapshots request.
+-//
+-// See http://goo.gl/nClDT for more details.
+-type SnapshotsResp struct {
+- RequestId string `xml:"requestId"`
+- Snapshots []Snapshot `xml:"snapshotSet>item"`
-}
-
--func routeFilter(req *Request, resp *Response, chain *FilterChain) {
-- io.WriteString(resp.ResponseWriter, "route-")
-- chain.ProcessFilter(req, resp)
+-// Snapshot represents details about a volume snapshot.
+-//
+-// See http://goo.gl/nkovs for more details.
+-type Snapshot struct {
+- Id string `xml:"snapshotId"`
+- VolumeId string `xml:"volumeId"`
+- VolumeSize string `xml:"volumeSize"`
+- Status string `xml:"status"`
+- StartTime string `xml:"startTime"`
+- Description string `xml:"description"`
+- Progress string `xml:"progress"`
+- OwnerId string `xml:"ownerId"`
+- OwnerAlias string `xml:"ownerAlias"`
+- Encrypted bool `xml:"encrypted"`
+- Tags []Tag `xml:"tagSet>item"`
-}
-
--func TestNoFilter(t *testing.T) {
-- tearDown()
-- setupServices(false, false, false)
-- actual := sendIt("http://example.com/foo")
-- if "foo" != actual {
-- t.Fatal("expected: foo but got:" + actual)
+-// Snapshots returns details about volume snapshots available to the user.
+-// The ids and filter parameters, if provided, limit the snapshots returned.
+-//
+-// See http://goo.gl/ogJL4 for more details.
+-func (ec2 *EC2) Snapshots(ids []string, filter *Filter) (resp *SnapshotsResp, err error) {
+- params := makeParams("DescribeSnapshots")
+- for i, id := range ids {
+- params["SnapshotId."+strconv.Itoa(i+1)] = id
- }
--}
+- filter.addParams(params)
-
--func TestGlobalFilter(t *testing.T) {
-- tearDown()
-- setupServices(true, false, false)
-- actual := sendIt("http://example.com/foo")
-- if "global-foo" != actual {
-- t.Fatal("expected: global-foo but got:" + actual)
+- resp = &SnapshotsResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
- }
+- return
-}
-
--func TestWebServiceFilter(t *testing.T) {
-- tearDown()
-- setupServices(true, true, false)
-- actual := sendIt("http://example.com/foo")
-- if "global-service-foo" != actual {
-- t.Fatal("expected: global-service-foo but got:" + actual)
-- }
+-// ----------------------------------------------------------------------------
+-// KeyPair management functions and types.
+-
+-type KeyPair struct {
+- Name string `xml:"keyName"`
+- Fingerprint string `xml:"keyFingerprint"`
-}
-
--func TestRouteFilter(t *testing.T) {
-- tearDown()
-- setupServices(true, true, true)
-- actual := sendIt("http://example.com/foo")
-- if "global-service-route-foo" != actual {
-- t.Fatal("expected: global-service-route-foo but got:" + actual)
-- }
+-type KeyPairsResp struct {
+- RequestId string `xml:"requestId"`
+- Keys []KeyPair `xml:"keySet>item"`
-}
-
--func TestRouteFilterOnly(t *testing.T) {
-- tearDown()
-- setupServices(false, false, true)
-- actual := sendIt("http://example.com/foo")
-- if "route-foo" != actual {
-- t.Fatal("expected: route-foo but got:" + actual)
-- }
+-type CreateKeyPairResp struct {
+- RequestId string `xml:"requestId"`
+- KeyName string `xml:"keyName"`
+- KeyFingerprint string `xml:"keyFingerprint"`
+- KeyMaterial string `xml:"keyMaterial"`
-}
-
--func TestBar(t *testing.T) {
-- tearDown()
-- setupServices(false, true, false)
-- actual := sendIt("http://example.com/bar")
-- if "service-bar" != actual {
-- t.Fatal("expected: service-bar but got:" + actual)
-- }
+-type ImportKeyPairResponse struct {
+- RequestId string `xml:"requestId"`
+- KeyName string `xml:"keyName"`
+- KeyFingerprint string `xml:"keyFingerprint"`
-}
-
--func TestAllFiltersBar(t *testing.T) {
-- tearDown()
-- setupServices(true, true, true)
-- actual := sendIt("http://example.com/bar")
-- if "global-service-bar" != actual {
-- t.Fatal("expected: global-service-bar but got:" + actual)
+-// CreateKeyPair creates a new key pair and returns the private key contents.
+-//
+-// See http://goo.gl/0S6hV
+-func (ec2 *EC2) CreateKeyPair(keyName string) (resp *CreateKeyPairResp, err error) {
+- params := makeParams("CreateKeyPair")
+- params["KeyName"] = keyName
+-
+- resp = &CreateKeyPairResp{}
+- err = ec2.query(params, resp)
+- if err == nil {
+- resp.KeyFingerprint = strings.TrimSpace(resp.KeyFingerprint)
- }
+- return
-}
-
--func sendIt(address string) string {
-- httpRequest, _ := http.NewRequest("GET", address, nil)
-- httpRequest.Header.Set("Accept", "*/*")
-- httpWriter := httptest.NewRecorder()
-- DefaultContainer.dispatch(httpWriter, httpRequest)
-- return httpWriter.Body.String()
--}
+-// DeleteKeyPair deletes a key pair.
+-//
+-// See http://goo.gl/0bqok
+-func (ec2 *EC2) DeleteKeyPair(name string) (resp *SimpleResp, err error) {
+- params := makeParams("DeleteKeyPair")
+- params["KeyName"] = name
-
--func sendItTo(address string, container *Container) string {
-- httpRequest, _ := http.NewRequest("GET", address, nil)
-- httpRequest.Header.Set("Accept", "*/*")
-- httpWriter := httptest.NewRecorder()
-- container.dispatch(httpWriter, httpRequest)
-- return httpWriter.Body.String()
+- resp = &SimpleResp{}
+- err = ec2.query(params, resp)
+- return
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/install.sh b/Godeps/_workspace/src/github.com/emicklei/go-restful/install.sh
-deleted file mode 100644
-index b5de8a2..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/install.sh
-+++ /dev/null
-@@ -1,9 +0,0 @@
--cd examples
-- ls *.go | xargs -I {} go build {}
-- cd ..
--go fmt ...swagger && \
--go test -test.v ...swagger && \
--go install ...swagger && \
--go fmt ...restful && \
--go test -test.v ...restful && \
--go install ...restful
-\ No newline at end of file
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/jsr311.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/jsr311.go
-deleted file mode 100644
-index affeee7..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/jsr311.go
-+++ /dev/null
-@@ -1,248 +0,0 @@
--package restful
-
--// Copyright 2013 Ernest Micklei. All rights reserved.
--// Use of this source code is governed by a license
--// that can be found in the LICENSE file.
+-// KeyPairs returns list of key pairs for this account
+-//
+-// See http://goo.gl/Apzsfz
+-func (ec2 *EC2) KeyPairs(keynames []string, filter *Filter) (resp *KeyPairsResp, err error) {
+- params := makeParams("DescribeKeyPairs")
+- for i, name := range keynames {
+- params["KeyName."+strconv.Itoa(i)] = name
+- }
+- filter.addParams(params)
-
--import (
-- "errors"
-- "fmt"
-- "net/http"
-- "sort"
--)
+- resp = &KeyPairsResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
+- }
-
--// RouterJSR311 implements the flow for matching Requests to Routes (and consequently Resource Functions)
--// as specified by the JSR311 http://jsr311.java.net/nonav/releases/1.1/spec/spec.html.
--// RouterJSR311 implements the Router interface.
--// Concept of locators is not implemented.
--type RouterJSR311 struct{}
+- return resp, nil
+-}
-
--// SelectRoute is part of the Router interface and returns the best match
--// for the WebService and its Route for the given Request.
--func (r RouterJSR311) SelectRoute(
-- webServices []*WebService,
-- httpRequest *http.Request) (selectedService *WebService, selectedRoute *Route, err error) {
+-// ImportKeyPair imports a key into AWS
+-//
+-// See http://goo.gl/NbZUvw
+-func (ec2 *EC2) ImportKeyPair(keyname string, key string) (resp *ImportKeyPairResponse, err error) {
+- params := makeParams("ImportKeyPair")
+- params["KeyName"] = keyname
-
-- // Identify the root resource class (WebService)
-- dispatcher, finalMatch, err := r.detectDispatcher(httpRequest.URL.Path, webServices)
+- // Oddly, AWS requires the key material to be base64-encoded, even if it was
+- // already encoded. So, we force another round of encoding...
+- // c.f. https://groups.google.com/forum/?fromgroups#!topic/boto-dev/IczrStO9Q8M
+- params["PublicKeyMaterial"] = base64.StdEncoding.EncodeToString([]byte(key))
+-
+- resp = &ImportKeyPairResponse{}
+- err = ec2.query(params, resp)
- if err != nil {
-- return nil, nil, NewError(http.StatusNotFound, "")
-- }
-- // Obtain the set of candidate methods (Routes)
-- routes := r.selectRoutes(dispatcher, finalMatch)
-- if len(routes) == 0 {
-- return dispatcher, nil, NewError(http.StatusNotFound, "404: Page Not Found")
+- return nil, err
- }
--
-- // Identify the method (Route) that will handle the request
-- route, ok := r.detectRoute(routes, httpRequest)
-- return dispatcher, route, ok
+- return resp, nil
-}
-
--// http://jsr311.java.net/nonav/releases/1.1/spec/spec3.html#x3-360003.7.2
--func (r RouterJSR311) detectRoute(routes []Route, httpRequest *http.Request) (*Route, error) {
-- // http method
-- methodOk := []Route{}
-- for _, each := range routes {
-- if httpRequest.Method == each.Method {
-- methodOk = append(methodOk, each)
-- }
-- }
-- if len(methodOk) == 0 {
-- if trace {
-- traceLogger.Printf("no Route found (in %d routes) that matches HTTP method %s\n", len(routes), httpRequest.Method)
-- }
-- return nil, NewError(http.StatusMethodNotAllowed, "405: Method Not Allowed")
-- }
-- inputMediaOk := methodOk
-- // content-type
-- contentType := httpRequest.Header.Get(HEADER_ContentType)
-- if httpRequest.ContentLength > 0 {
-- inputMediaOk = []Route{}
-- for _, each := range methodOk {
-- if each.matchesContentType(contentType) {
-- inputMediaOk = append(inputMediaOk, each)
-- }
-- }
-- if len(inputMediaOk) == 0 {
-- if trace {
-- traceLogger.Printf("no Route found (from %d) that matches HTTP Content-Type: %s\n", len(methodOk), contentType)
-- }
-- return nil, NewError(http.StatusUnsupportedMediaType, "415: Unsupported Media Type")
-- }
-- }
-- // accept
-- outputMediaOk := []Route{}
-- accept := httpRequest.Header.Get(HEADER_Accept)
-- if accept == "" {
-- accept = "*/*"
-- }
-- for _, each := range inputMediaOk {
-- if each.matchesAccept(accept) {
-- outputMediaOk = append(outputMediaOk, each)
-- }
-- }
-- if len(outputMediaOk) == 0 {
-- if trace {
-- traceLogger.Printf("no Route found (from %d) that matches HTTP Accept: %s\n", len(inputMediaOk), accept)
-- }
-- return nil, NewError(http.StatusNotAcceptable, "406: Not Acceptable")
-- }
-- return r.bestMatchByMedia(outputMediaOk, contentType, accept), nil
+-// ----------------------------------------------------------------------------
+-// Security group management functions and types.
+-
+-// SimpleResp represents a response to an EC2 request which on success will
+-// return no other information besides a request id.
+-type SimpleResp struct {
+- XMLName xml.Name
+- RequestId string `xml:"requestId"`
-}
-
--// http://jsr311.java.net/nonav/releases/1.1/spec/spec3.html#x3-360003.7.2
--// n/m > n/* > */*
--func (r RouterJSR311) bestMatchByMedia(routes []Route, contentType string, accept string) *Route {
-- // TODO
-- return &routes[0]
+-// CreateSecurityGroupResp represents a response to a CreateSecurityGroup request.
+-type CreateSecurityGroupResp struct {
+- SecurityGroup
+- RequestId string `xml:"requestId"`
-}
-
--// http://jsr311.java.net/nonav/releases/1.1/spec/spec3.html#x3-360003.7.2 (step 2)
--func (r RouterJSR311) selectRoutes(dispatcher *WebService, pathRemainder string) []Route {
-- filtered := &sortableRouteCandidates{}
-- for _, each := range dispatcher.Routes() {
-- pathExpr := each.pathExpr
-- matches := pathExpr.Matcher.FindStringSubmatch(pathRemainder)
-- if matches != nil {
-- lastMatch := matches[len(matches)-1]
-- if len(lastMatch) == 0 || lastMatch == "/" { // do not include if value is neither empty nor ‘/’.
-- filtered.candidates = append(filtered.candidates,
-- routeCandidate{each, len(matches) - 1, pathExpr.LiteralCount, pathExpr.VarCount})
-- }
-- }
-- }
-- if len(filtered.candidates) == 0 {
-- if trace {
-- traceLogger.Printf("WebService on path %s has no routes that match URL path remainder:%s\n", dispatcher.rootPath, pathRemainder)
-- }
-- return []Route{}
+-// CreateSecurityGroup run a CreateSecurityGroup request in EC2, with the provided
+-// name and description.
+-//
+-// See http://goo.gl/Eo7Yl for more details.
+-func (ec2 *EC2) CreateSecurityGroup(group SecurityGroup) (resp *CreateSecurityGroupResp, err error) {
+- params := makeParams("CreateSecurityGroup")
+- params["GroupName"] = group.Name
+- params["GroupDescription"] = group.Description
+- if group.VpcId != "" {
+- params["VpcId"] = group.VpcId
- }
-- sort.Sort(sort.Reverse(filtered))
-
-- // select other routes from candidates whoes expression matches rmatch
-- matchingRoutes := []Route{filtered.candidates[0].route}
-- for c := 1; c < len(filtered.candidates); c++ {
-- each := filtered.candidates[c]
-- if each.route.pathExpr.Matcher.MatchString(pathRemainder) {
-- matchingRoutes = append(matchingRoutes, each.route)
-- }
+- resp = &CreateSecurityGroupResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
- }
-- return matchingRoutes
+- resp.Name = group.Name
+- return resp, nil
-}
-
--// http://jsr311.java.net/nonav/releases/1.1/spec/spec3.html#x3-360003.7.2 (step 1)
--func (r RouterJSR311) detectDispatcher(requestPath string, dispatchers []*WebService) (*WebService, string, error) {
-- filtered := &sortableDispatcherCandidates{}
-- for _, each := range dispatchers {
-- pathExpr := each.compiledPathExpression()
-- matches := pathExpr.Matcher.FindStringSubmatch(requestPath)
-- if matches != nil {
-- filtered.candidates = append(filtered.candidates,
-- dispatcherCandidate{each, matches[len(matches)-1], len(matches), pathExpr.LiteralCount, pathExpr.VarCount})
-- }
-- }
-- if len(filtered.candidates) == 0 {
-- if trace {
-- traceLogger.Printf("no WebService was found to match URL path:%s\n", requestPath)
-- }
-- return nil, "", errors.New("not found")
-- }
-- sort.Sort(sort.Reverse(filtered))
-- return filtered.candidates[0].dispatcher, filtered.candidates[0].finalMatch, nil
+-// SecurityGroupsResp represents a response to a DescribeSecurityGroups
+-// request in EC2.
+-//
+-// See http://goo.gl/k12Uy for more details.
+-type SecurityGroupsResp struct {
+- RequestId string `xml:"requestId"`
+- Groups []SecurityGroupInfo `xml:"securityGroupInfo>item"`
-}
-
--// Types and functions to support the sorting of Routes
--
--type routeCandidate struct {
-- route Route
-- matchesCount int // the number of capturing groups
-- literalCount int // the number of literal characters (means those not resulting from template variable substitution)
-- nonDefaultCount int // the number of capturing groups with non-default regular expressions (i.e. not ‘([^ /]+?)’)
+-// SecurityGroup encapsulates details for a security group in EC2.
+-//
+-// See http://goo.gl/CIdyP for more details.
+-type SecurityGroupInfo struct {
+- SecurityGroup
+- OwnerId string `xml:"ownerId"`
+- Description string `xml:"groupDescription"`
+- IPPerms []IPPerm `xml:"ipPermissions>item"`
-}
-
--func (r routeCandidate) expressionToMatch() string {
-- return r.route.pathExpr.Source
+-// IPPerm represents an allowance within an EC2 security group.
+-//
+-// See http://goo.gl/4oTxv for more details.
+-type IPPerm struct {
+- Protocol string `xml:"ipProtocol"`
+- FromPort int `xml:"fromPort"`
+- ToPort int `xml:"toPort"`
+- SourceIPs []string `xml:"ipRanges>item>cidrIp"`
+- SourceGroups []UserSecurityGroup `xml:"groups>item"`
-}
-
--func (r routeCandidate) String() string {
-- return fmt.Sprintf("(m=%d,l=%d,n=%d)", r.matchesCount, r.literalCount, r.nonDefaultCount)
+-// UserSecurityGroup holds a security group and the owner
+-// of that group.
+-type UserSecurityGroup struct {
+- Id string `xml:"groupId"`
+- Name string `xml:"groupName"`
+- OwnerId string `xml:"userId"`
-}
-
--type sortableRouteCandidates struct {
-- candidates []routeCandidate
+-// SecurityGroup represents an EC2 security group.
+-// If SecurityGroup is used as a parameter, then one of Id or Name
+-// may be empty. If both are set, then Id is used.
+-type SecurityGroup struct {
+- Id string `xml:"groupId"`
+- Name string `xml:"groupName"`
+- Description string `xml:"groupDescription"`
+- VpcId string `xml:"vpcId"`
-}
-
--func (rcs *sortableRouteCandidates) Len() int {
-- return len(rcs.candidates)
--}
--func (rcs *sortableRouteCandidates) Swap(i, j int) {
-- rcs.candidates[i], rcs.candidates[j] = rcs.candidates[j], rcs.candidates[i]
--}
--func (rcs *sortableRouteCandidates) Less(i, j int) bool {
-- ci := rcs.candidates[i]
-- cj := rcs.candidates[j]
-- // primary key
-- if ci.literalCount < cj.literalCount {
-- return true
-- }
-- if ci.literalCount > cj.literalCount {
-- return false
-- }
-- // secundary key
-- if ci.matchesCount < cj.matchesCount {
-- return true
-- }
-- if ci.matchesCount > cj.matchesCount {
-- return false
-- }
-- // tertiary key
-- if ci.nonDefaultCount < cj.nonDefaultCount {
-- return true
-- }
-- if ci.nonDefaultCount > cj.nonDefaultCount {
-- return false
+-// SecurityGroupNames is a convenience function that
+-// returns a slice of security groups with the given names.
+-func SecurityGroupNames(names ...string) []SecurityGroup {
+- g := make([]SecurityGroup, len(names))
+- for i, name := range names {
+- g[i] = SecurityGroup{Name: name}
- }
-- // quaternary key ("source" is interpreted as Path)
-- return ci.route.Path < cj.route.Path
+- return g
-}
-
--// Types and functions to support the sorting of Dispatchers
--
--type dispatcherCandidate struct {
-- dispatcher *WebService
-- finalMatch string
-- matchesCount int // the number of capturing groups
-- literalCount int // the number of literal characters (means those not resulting from template variable substitution)
-- nonDefaultCount int // the number of capturing groups with non-default regular expressions (i.e. not ‘([^ /]+?)’)
--}
--type sortableDispatcherCandidates struct {
-- candidates []dispatcherCandidate
+-// SecurityGroupNames is a convenience function that
+-// returns a slice of security groups with the given ids.
+-func SecurityGroupIds(ids ...string) []SecurityGroup {
+- g := make([]SecurityGroup, len(ids))
+- for i, id := range ids {
+- g[i] = SecurityGroup{Id: id}
+- }
+- return g
-}
-
--func (dc *sortableDispatcherCandidates) Len() int {
-- return len(dc.candidates)
--}
--func (dc *sortableDispatcherCandidates) Swap(i, j int) {
-- dc.candidates[i], dc.candidates[j] = dc.candidates[j], dc.candidates[i]
--}
--func (dc *sortableDispatcherCandidates) Less(i, j int) bool {
-- ci := dc.candidates[i]
-- cj := dc.candidates[j]
-- // primary key
-- if ci.matchesCount < cj.matchesCount {
-- return true
+-// SecurityGroups returns details about security groups in EC2. Both parameters
+-// are optional, and if provided will limit the security groups returned to those
+-// matching the given groups or filtering rules.
+-//
+-// See http://goo.gl/k12Uy for more details.
+-func (ec2 *EC2) SecurityGroups(groups []SecurityGroup, filter *Filter) (resp *SecurityGroupsResp, err error) {
+- params := makeParams("DescribeSecurityGroups")
+- i, j := 1, 1
+- for _, g := range groups {
+- if g.Id != "" {
+- params["GroupId."+strconv.Itoa(i)] = g.Id
+- i++
+- } else {
+- params["GroupName."+strconv.Itoa(j)] = g.Name
+- j++
+- }
- }
-- if ci.matchesCount > cj.matchesCount {
-- return false
+- filter.addParams(params)
+-
+- resp = &SecurityGroupsResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
- }
-- // secundary key
-- if ci.literalCount < cj.literalCount {
-- return true
+- return resp, nil
+-}
+-
+-// DeleteSecurityGroup removes the given security group in EC2.
+-//
+-// See http://goo.gl/QJJDO for more details.
+-func (ec2 *EC2) DeleteSecurityGroup(group SecurityGroup) (resp *SimpleResp, err error) {
+- params := makeParams("DeleteSecurityGroup")
+- if group.Id != "" {
+- params["GroupId"] = group.Id
+- } else {
+- params["GroupName"] = group.Name
- }
-- if ci.literalCount > cj.literalCount {
-- return false
+-
+- resp = &SimpleResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
- }
-- // tertiary key
-- return ci.nonDefaultCount < cj.nonDefaultCount
+- return resp, nil
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/jsr311_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/jsr311_test.go
-deleted file mode 100644
-index 8d54ed9..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/jsr311_test.go
-+++ /dev/null
-@@ -1,231 +0,0 @@
--package restful
--
--import (
-- "io"
-- "sort"
-- "testing"
--)
-
+-// AuthorizeSecurityGroup creates an allowance for clients matching the provided
+-// rules to access instances within the given security group.
-//
--// Step 1 tests
+-// See http://goo.gl/u2sDJ for more details.
+-func (ec2 *EC2) AuthorizeSecurityGroup(group SecurityGroup, perms []IPPerm) (resp *SimpleResp, err error) {
+- return ec2.authOrRevoke("AuthorizeSecurityGroupIngress", group, perms)
+-}
+-
+-// AuthorizeSecurityGroupEgress creates an allowance for clients matching the provided
+-// rules for egress access.
-//
--var paths = []struct {
-- // url with path (1) is handled by service with root (2) and last capturing group has value final (3)
-- path, root, final string
--}{
-- {"/", "/", "/"},
-- {"/p", "/p", ""},
-- {"/p/x", "/p/{q}", ""},
-- {"/q/x", "/q", "/x"},
-- {"/p/x/", "/p/{q}", "/"},
-- {"/p/x/y", "/p/{q}", "/y"},
-- {"/q/x/y", "/q", "/x/y"},
-- {"/z/q", "/{p}/q", ""},
-- {"/a/b/c/q", "/", "/a/b/c/q"},
+-// See http://goo.gl/UHnH4L for more details.
+-func (ec2 *EC2) AuthorizeSecurityGroupEgress(group SecurityGroup, perms []IPPerm) (resp *SimpleResp, err error) {
+- return ec2.authOrRevoke("AuthorizeSecurityGroupEgress", group, perms)
-}
-
--func TestDetectDispatcher(t *testing.T) {
-- ws1 := new(WebService).Path("/")
-- ws2 := new(WebService).Path("/p")
-- ws3 := new(WebService).Path("/q")
-- ws4 := new(WebService).Path("/p/q")
-- ws5 := new(WebService).Path("/p/{q}")
-- ws6 := new(WebService).Path("/p/{q}/")
-- ws7 := new(WebService).Path("/{p}/q")
-- var dispatchers = []*WebService{ws1, ws2, ws3, ws4, ws5, ws6, ws7}
+-// RevokeSecurityGroup revokes permissions from a group.
+-//
+-// See http://goo.gl/ZgdxA for more details.
+-func (ec2 *EC2) RevokeSecurityGroup(group SecurityGroup, perms []IPPerm) (resp *SimpleResp, err error) {
+- return ec2.authOrRevoke("RevokeSecurityGroupIngress", group, perms)
+-}
-
-- router := RouterJSR311{}
+-func (ec2 *EC2) authOrRevoke(op string, group SecurityGroup, perms []IPPerm) (resp *SimpleResp, err error) {
+- params := makeParams(op)
+- if group.Id != "" {
+- params["GroupId"] = group.Id
+- } else {
+- params["GroupName"] = group.Name
+- }
-
-- ok := true
-- for i, fixture := range paths {
-- who, final, err := router.detectDispatcher(fixture.path, dispatchers)
-- if err != nil {
-- t.Logf("error in detection:%v", err)
-- ok = false
-- }
-- if who.RootPath() != fixture.root {
-- t.Logf("[line:%v] Unexpected dispatcher, expected:%v, actual:%v", i, fixture.root, who.RootPath())
-- ok = false
+- for i, perm := range perms {
+- prefix := "IpPermissions." + strconv.Itoa(i+1)
+- params[prefix+".IpProtocol"] = perm.Protocol
+- params[prefix+".FromPort"] = strconv.Itoa(perm.FromPort)
+- params[prefix+".ToPort"] = strconv.Itoa(perm.ToPort)
+- for j, ip := range perm.SourceIPs {
+- params[prefix+".IpRanges."+strconv.Itoa(j+1)+".CidrIp"] = ip
- }
-- if final != fixture.final {
-- t.Logf("[line:%v] Unexpected final, expected:%v, actual:%v", i, fixture.final, final)
-- ok = false
+- for j, g := range perm.SourceGroups {
+- subprefix := prefix + ".Groups." + strconv.Itoa(j+1)
+- if g.OwnerId != "" {
+- params[subprefix+".UserId"] = g.OwnerId
+- }
+- if g.Id != "" {
+- params[subprefix+".GroupId"] = g.Id
+- } else {
+- params[subprefix+".GroupName"] = g.Name
+- }
- }
- }
-- if !ok {
-- t.Fail()
+-
+- resp = &SimpleResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
- }
+- return resp, nil
-}
-
+-// ResourceTag represents key-value metadata used to classify and organize
+-// EC2 instances.
-//
--// Step 2 tests
+-// See http://goo.gl/bncl3 for more details
+-type Tag struct {
+- Key string `xml:"key"`
+- Value string `xml:"value"`
+-}
+-
+-// CreateTags adds or overwrites one or more tags for the specified taggable resources.
+-// For a list of tagable resources, see: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.html
-//
+-// See http://goo.gl/Vmkqc for more details
+-func (ec2 *EC2) CreateTags(resourceIds []string, tags []Tag) (resp *SimpleResp, err error) {
+- params := makeParams("CreateTags")
+- addParamsList(params, "ResourceId", resourceIds)
-
--// go test -v -test.run TestISSUE_30 ...restful
--func TestISSUE_30(t *testing.T) {
-- ws1 := new(WebService).Path("/users")
-- ws1.Route(ws1.GET("/{id}").To(dummy))
-- ws1.Route(ws1.POST("/login").To(dummy))
-- routes := RouterJSR311{}.selectRoutes(ws1, "/login")
-- if len(routes) != 2 {
-- t.Fatal("expected 2 routes")
+- for j, tag := range tags {
+- params["Tag."+strconv.Itoa(j+1)+".Key"] = tag.Key
+- params["Tag."+strconv.Itoa(j+1)+".Value"] = tag.Value
- }
-- if routes[0].Path != "/users/login" {
-- t.Error("first is", routes[0].Path)
-- t.Logf("routes:%v", routes)
+-
+- resp = &SimpleResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
- }
+- return resp, nil
-}
-
--// go test -v -test.run TestISSUE_34 ...restful
--func TestISSUE_34(t *testing.T) {
-- ws1 := new(WebService).Path("/")
-- ws1.Route(ws1.GET("/{type}/{id}").To(dummy))
-- ws1.Route(ws1.GET("/network/{id}").To(dummy))
-- routes := RouterJSR311{}.selectRoutes(ws1, "/network/12")
-- if len(routes) != 2 {
-- t.Fatal("expected 2 routes")
-- }
-- if routes[0].Path != "/network/{id}" {
-- t.Error("first is", routes[0].Path)
-- t.Logf("routes:%v", routes)
-- }
+-type TagsResp struct {
+- RequestId string `xml:"requestId"`
+- Tags []ResourceTag `xml:"tagSet>item"`
-}
-
--// go test -v -test.run TestISSUE_34_2 ...restful
--func TestISSUE_34_2(t *testing.T) {
-- ws1 := new(WebService).Path("/")
-- // change the registration order
-- ws1.Route(ws1.GET("/network/{id}").To(dummy))
-- ws1.Route(ws1.GET("/{type}/{id}").To(dummy))
-- routes := RouterJSR311{}.selectRoutes(ws1, "/network/12")
-- if len(routes) != 2 {
-- t.Fatal("expected 2 routes")
-- }
-- if routes[0].Path != "/network/{id}" {
-- t.Error("first is", routes[0].Path)
-- }
+-type ResourceTag struct {
+- Tag
+- ResourceId string `xml:"resourceId"`
+- ResourceType string `xml:"resourceType"`
-}
-
--// go test -v -test.run TestISSUE_137 ...restful
--func TestISSUE_137(t *testing.T) {
-- ws1 := new(WebService)
-- ws1.Route(ws1.GET("/hello").To(dummy))
-- routes := RouterJSR311{}.selectRoutes(ws1, "/")
-- t.Log(routes)
-- if len(routes) > 0 {
-- t.Error("no route expected")
+-func (ec2 *EC2) Tags(filter *Filter) (*TagsResp, error) {
+- params := makeParams("DescribeTags")
+- filter.addParams(params)
+-
+- resp := &TagsResp{}
+- if err := ec2.query(params, resp); err != nil {
+- return nil, err
- }
--}
-
--func TestSelectRoutesSlash(t *testing.T) {
-- ws1 := new(WebService).Path("/")
-- ws1.Route(ws1.GET("").To(dummy))
-- ws1.Route(ws1.GET("/").To(dummy))
-- ws1.Route(ws1.GET("/u").To(dummy))
-- ws1.Route(ws1.POST("/u").To(dummy))
-- ws1.Route(ws1.POST("/u/v").To(dummy))
-- ws1.Route(ws1.POST("/u/{w}").To(dummy))
-- ws1.Route(ws1.POST("/u/{w}/z").To(dummy))
-- routes := RouterJSR311{}.selectRoutes(ws1, "/u")
-- checkRoutesContains(routes, "/u", t)
-- checkRoutesContainsNo(routes, "/u/v", t)
-- checkRoutesContainsNo(routes, "/", t)
-- checkRoutesContainsNo(routes, "/u/{w}/z", t)
+- return resp, nil
-}
--func TestSelectRoutesU(t *testing.T) {
-- ws1 := new(WebService).Path("/u")
-- ws1.Route(ws1.GET("").To(dummy))
-- ws1.Route(ws1.GET("/").To(dummy))
-- ws1.Route(ws1.GET("/v").To(dummy))
-- ws1.Route(ws1.POST("/{w}").To(dummy))
-- ws1.Route(ws1.POST("/{w}/z").To(dummy)) // so full path = /u/{w}/z
-- routes := RouterJSR311{}.selectRoutes(ws1, "/v") // test against /u/v
-- checkRoutesContains(routes, "/u/{w}", t)
+-
+-// Response to a StartInstances request.
+-//
+-// See http://goo.gl/awKeF for more details.
+-type StartInstanceResp struct {
+- RequestId string `xml:"requestId"`
+- StateChanges []InstanceStateChange `xml:"instancesSet>item"`
-}
-
--func TestSelectRoutesUsers1(t *testing.T) {
-- ws1 := new(WebService).Path("/users")
-- ws1.Route(ws1.POST("").To(dummy))
-- ws1.Route(ws1.POST("/").To(dummy))
-- ws1.Route(ws1.PUT("/{id}").To(dummy))
-- routes := RouterJSR311{}.selectRoutes(ws1, "/1")
-- checkRoutesContains(routes, "/users/{id}", t)
+-// Response to a StopInstances request.
+-//
+-// See http://goo.gl/436dJ for more details.
+-type StopInstanceResp struct {
+- RequestId string `xml:"requestId"`
+- StateChanges []InstanceStateChange `xml:"instancesSet>item"`
-}
--func checkRoutesContains(routes []Route, path string, t *testing.T) {
-- if !containsRoutePath(routes, path, t) {
-- for _, r := range routes {
-- t.Logf("route %v %v", r.Method, r.Path)
-- }
-- t.Fatalf("routes should include [%v]:", path)
+-
+-// StartInstances starts an Amazon EBS-backed AMI that you've previously stopped.
+-//
+-// See http://goo.gl/awKeF for more details.
+-func (ec2 *EC2) StartInstances(ids ...string) (resp *StartInstanceResp, err error) {
+- params := makeParams("StartInstances")
+- addParamsList(params, "InstanceId", ids)
+- resp = &StartInstanceResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
- }
+- return resp, nil
-}
--func checkRoutesContainsNo(routes []Route, path string, t *testing.T) {
-- if containsRoutePath(routes, path, t) {
-- for _, r := range routes {
-- t.Logf("route %v %v", r.Method, r.Path)
-- }
-- t.Fatalf("routes should not include [%v]:", path)
+-
+-// StopInstances requests stopping one or more Amazon EBS-backed instances.
+-//
+-// See http://goo.gl/436dJ for more details.
+-func (ec2 *EC2) StopInstances(ids ...string) (resp *StopInstanceResp, err error) {
+- params := makeParams("StopInstances")
+- addParamsList(params, "InstanceId", ids)
+- resp = &StopInstanceResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
- }
+- return resp, nil
-}
--func containsRoutePath(routes []Route, path string, t *testing.T) bool {
-- for _, each := range routes {
-- if each.Path == path {
-- return true
-- }
+-
+-// RebootInstance requests a reboot of one or more instances. This operation is asynchronous;
+-// it only queues a request to reboot the specified instance(s). The operation will succeed
+-// if the instances are valid and belong to you.
+-//
+-// Requests to reboot terminated instances are ignored.
+-//
+-// See http://goo.gl/baoUf for more details.
+-func (ec2 *EC2) RebootInstances(ids ...string) (resp *SimpleResp, err error) {
+- params := makeParams("RebootInstances")
+- addParamsList(params, "InstanceId", ids)
+- resp = &SimpleResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
- }
-- return false
+- return resp, nil
-}
-
--var tempregexs = []struct {
-- template, regex string
-- literalCount, varCount int
--}{
-- {"", "^(/.*)?$", 0, 0},
-- {"/a/{b}/c/", "^/a/([^/]+?)/c(/.*)?$", 2, 1},
-- {"/{a}/{b}/{c-d-e}/", "^/([^/]+?)/([^/]+?)/([^/]+?)(/.*)?$", 0, 3},
-- {"/{p}/abcde", "^/([^/]+?)/abcde(/.*)?$", 5, 1},
+-// The ModifyInstanceAttribute request parameters.
+-type ModifyInstance struct {
+- InstanceType string
+- BlockDevices []BlockDeviceMapping
+- DisableAPITermination bool
+- EbsOptimized bool
+- SecurityGroups []SecurityGroup
+- ShutdownBehavior string
+- KernelId string
+- RamdiskId string
+- SourceDestCheck bool
+- SriovNetSupport bool
+- UserData []byte
+-
+- SetSourceDestCheck bool
-}
-
--func TestTemplateToRegularExpression(t *testing.T) {
-- ok := true
-- for i, fixture := range tempregexs {
-- actual, lCount, vCount, _ := templateToRegularExpression(fixture.template)
-- if actual != fixture.regex {
-- t.Logf("regex mismatch, expected:%v , actual:%v, line:%v\n", fixture.regex, actual, i) // 11 = where the data starts
-- ok = false
-- }
-- if lCount != fixture.literalCount {
-- t.Logf("literal count mismatch, expected:%v , actual:%v, line:%v\n", fixture.literalCount, lCount, i)
-- ok = false
-- }
-- if vCount != fixture.varCount {
-- t.Logf("variable count mismatch, expected:%v , actual:%v, line:%v\n", fixture.varCount, vCount, i)
-- ok = false
-- }
-- }
-- if !ok {
-- t.Fatal("one or more expression did not match")
-- }
+-// Response to a ModifyInstanceAttribute request.
+-//
+-// http://goo.gl/icuXh5 for more details.
+-type ModifyInstanceResp struct {
+- RequestId string `xml:"requestId"`
+- Return bool `xml:"return"`
-}
-
--// go test -v -test.run TestSortableRouteCandidates ...restful
--func TestSortableRouteCandidates(t *testing.T) {
-- fixture := &sortableRouteCandidates{}
-- r1 := routeCandidate{matchesCount: 0, literalCount: 0, nonDefaultCount: 0}
-- r2 := routeCandidate{matchesCount: 0, literalCount: 0, nonDefaultCount: 1}
-- r3 := routeCandidate{matchesCount: 0, literalCount: 1, nonDefaultCount: 1}
-- r4 := routeCandidate{matchesCount: 1, literalCount: 1, nonDefaultCount: 0}
-- r5 := routeCandidate{matchesCount: 1, literalCount: 0, nonDefaultCount: 0}
-- fixture.candidates = append(fixture.candidates, r5, r4, r3, r2, r1)
-- sort.Sort(sort.Reverse(fixture))
-- first := fixture.candidates[0]
-- if first.matchesCount != 1 && first.literalCount != 1 && first.nonDefaultCount != 0 {
-- t.Fatal("expected r4")
+-// ModifyImageAttribute modifies the specified attribute of the specified instance.
+-// You can specify only one attribute at a time. To modify some attributes, the
+-// instance must be stopped.
+-//
+-// See http://goo.gl/icuXh5 for more details.
+-func (ec2 *EC2) ModifyInstance(instId string, options *ModifyInstance) (resp *ModifyInstanceResp, err error) {
+- params := makeParams("ModifyInstanceAttribute")
+- params["InstanceId"] = instId
+- addBlockDeviceParams("", params, options.BlockDevices)
+-
+- if options.InstanceType != "" {
+- params["InstanceType.Value"] = options.InstanceType
- }
-- last := fixture.candidates[len(fixture.candidates)-1]
-- if last.matchesCount != 0 && last.literalCount != 0 && last.nonDefaultCount != 0 {
-- t.Fatal("expected r1")
+-
+- if options.DisableAPITermination {
+- params["DisableApiTermination.Value"] = "true"
- }
--}
-
--func dummy(req *Request, resp *Response) { io.WriteString(resp.ResponseWriter, "dummy") }
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/logger.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/logger.go
-deleted file mode 100644
-index 25d6a8e..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/logger.go
-+++ /dev/null
-@@ -1,16 +0,0 @@
--package restful
+- if options.EbsOptimized {
+- params["EbsOptimized"] = "true"
+- }
-
--import "log"
+- if options.ShutdownBehavior != "" {
+- params["InstanceInitiatedShutdownBehavior.Value"] = options.ShutdownBehavior
+- }
-
--// Copyright 2014 Ernest Micklei. All rights reserved.
--// Use of this source code is governed by a license
--// that can be found in the LICENSE file.
+- if options.KernelId != "" {
+- params["Kernel.Value"] = options.KernelId
+- }
-
--var trace bool = false
--var traceLogger *log.Logger
+- if options.RamdiskId != "" {
+- params["Ramdisk.Value"] = options.RamdiskId
+- }
-
--// TraceLogger enables detailed logging of Http request matching and filter invocation. Default no logger is set.
--func TraceLogger(logger *log.Logger) {
-- traceLogger = logger
-- trace = logger != nil
--}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/options_filter.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/options_filter.go
-deleted file mode 100644
-index bd5d0c2..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/options_filter.go
-+++ /dev/null
-@@ -1,24 +0,0 @@
--package restful
+- if options.SourceDestCheck || options.SetSourceDestCheck {
+- if options.SourceDestCheck {
+- params["SourceDestCheck.Value"] = "true"
+- } else {
+- params["SourceDestCheck.Value"] = "false"
+- }
+- }
-
--import "strings"
+- if options.SriovNetSupport {
+- params["SriovNetSupport.Value"] = "simple"
+- }
-
--// Copyright 2013 Ernest Micklei. All rights reserved.
--// Use of this source code is governed by a license
--// that can be found in the LICENSE file.
+- if options.UserData != nil {
+- userData := make([]byte, b64.EncodedLen(len(options.UserData)))
+- b64.Encode(userData, options.UserData)
+- params["UserData"] = string(userData)
+- }
-
--// OPTIONSFilter is a filter function that inspects the Http Request for the OPTIONS method
--// and provides the response with a set of allowed methods for the request URL Path.
--// As for any filter, you can also install it for a particular WebService within a Container
--func (c Container) OPTIONSFilter(req *Request, resp *Response, chain *FilterChain) {
-- if "OPTIONS" != req.Request.Method {
-- chain.ProcessFilter(req, resp)
-- return
+- i := 1
+- for _, g := range options.SecurityGroups {
+- if g.Id != "" {
+- params["GroupId."+strconv.Itoa(i)] = g.Id
+- i++
+- }
- }
-- resp.AddHeader(HEADER_Allow, strings.Join(c.computeAllowedMethods(req), ","))
+-
+- resp = &ModifyInstanceResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- resp = nil
+- }
+- return
-}
-
--// OPTIONSFilter is a filter function that inspects the Http Request for the OPTIONS method
--// and provides the response with a set of allowed methods for the request URL Path.
--func OPTIONSFilter() FilterFunction {
-- return DefaultContainer.OPTIONSFilter
+-// ----------------------------------------------------------------------------
+-// VPC management functions and types.
+-
+-// The CreateVpc request parameters
+-//
+-// See http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-CreateVpc.html
+-type CreateVpc struct {
+- CidrBlock string
+- InstanceTenancy string
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/options_filter_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/options_filter_test.go
-deleted file mode 100644
-index f0fceb8..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/options_filter_test.go
-+++ /dev/null
-@@ -1,34 +0,0 @@
--package restful
-
--import (
-- "net/http"
-- "net/http/httptest"
-- "testing"
--)
+-// Response to a CreateVpc request
+-type CreateVpcResp struct {
+- RequestId string `xml:"requestId"`
+- VPC VPC `xml:"vpc"`
+-}
-
--// go test -v -test.run TestOptionsFilter ...restful
--func TestOptionsFilter(t *testing.T) {
-- tearDown()
-- ws := new(WebService)
-- ws.Route(ws.GET("/candy/{kind}").To(dummy))
-- ws.Route(ws.DELETE("/candy/{kind}").To(dummy))
-- ws.Route(ws.POST("/candies").To(dummy))
-- Add(ws)
-- Filter(OPTIONSFilter())
+-// The ModifyVpcAttribute request parameters.
+-//
+-// See http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/index.html?ApiReference-query-DescribeVpcAttribute.html for more details.
+-type ModifyVpcAttribute struct {
+- EnableDnsSupport bool
+- EnableDnsHostnames bool
-
-- httpRequest, _ := http.NewRequest("OPTIONS", "http://here.io/candy/gum", nil)
-- httpWriter := httptest.NewRecorder()
-- DefaultContainer.dispatch(httpWriter, httpRequest)
-- actual := httpWriter.Header().Get(HEADER_Allow)
-- if "GET,DELETE" != actual {
-- t.Fatal("expected: GET,DELETE but got:" + actual)
-- }
+- SetEnableDnsSupport bool
+- SetEnableDnsHostnames bool
+-}
-
-- httpRequest, _ = http.NewRequest("OPTIONS", "http://here.io/candies", nil)
-- httpWriter = httptest.NewRecorder()
-- DefaultContainer.dispatch(httpWriter, httpRequest)
-- actual = httpWriter.Header().Get(HEADER_Allow)
-- if "POST" != actual {
-- t.Fatal("expected: POST but got:" + actual)
-- }
+-// Response to a DescribeVpcAttribute request.
+-//
+-// See http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/index.html?ApiReference-query-DescribeVpcAttribute.html for more details.
+-type VpcAttributeResp struct {
+- RequestId string `xml:"requestId"`
+- VpcId string `xml:"vpcId"`
+- EnableDnsSupport bool `xml:"enableDnsSupport>value"`
+- EnableDnsHostnames bool `xml:"enableDnsHostnames>value"`
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/parameter.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/parameter.go
-deleted file mode 100644
-index 7f38a0a..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/parameter.go
-+++ /dev/null
-@@ -1,95 +0,0 @@
--package restful
-
--// Copyright 2013 Ernest Micklei. All rights reserved.
--// Use of this source code is governed by a license
--// that can be found in the LICENSE file.
+-// CreateInternetGateway request parameters.
+-//
+-// http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-CreateInternetGateway.html
+-type CreateInternetGateway struct{}
-
--const (
-- // PathParameterKind = indicator of Request parameter type "path"
-- PathParameterKind = iota
+-// CreateInternetGateway response
+-type CreateInternetGatewayResp struct {
+- RequestId string `xml:"requestId"`
+- InternetGateway InternetGateway `xml:"internetGateway"`
+-}
-
-- // QueryParameterKind = indicator of Request parameter type "query"
-- QueryParameterKind
+-// The CreateRouteTable request parameters.
+-//
+-// http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-CreateRouteTable.html
+-type CreateRouteTable struct {
+- VpcId string
+-}
-
-- // BodyParameterKind = indicator of Request parameter type "body"
-- BodyParameterKind
+-// Response to a CreateRouteTable request.
+-type CreateRouteTableResp struct {
+- RequestId string `xml:"requestId"`
+- RouteTable RouteTable `xml:"routeTable"`
+-}
-
-- // HeaderParameterKind = indicator of Request parameter type "header"
-- HeaderParameterKind
+-// CreateRoute request parameters
+-//
+-// http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-CreateRoute.html
+-type CreateRoute struct {
+- RouteTableId string
+- DestinationCidrBlock string
+- GatewayId string
+- InstanceId string
+- NetworkInterfaceId string
+- VpcPeeringConnectionId string
+-}
+-type ReplaceRoute struct {
+- RouteTableId string
+- DestinationCidrBlock string
+- GatewayId string
+- InstanceId string
+- NetworkInterfaceId string
+- VpcPeeringConnectionId string
+-}
-
-- // FormParameterKind = indicator of Request parameter type "form"
-- FormParameterKind
--)
+-type AssociateRouteTableResp struct {
+- RequestId string `xml:"requestId"`
+- AssociationId string `xml:"associationId"`
+-}
+-type ReassociateRouteTableResp struct {
+- RequestId string `xml:"requestId"`
+- AssociationId string `xml:"newAssociationId"`
+-}
-
--// Parameter is for documententing the parameter used in a Http Request
--// ParameterData kinds are Path,Query and Body
--type Parameter struct {
-- data *ParameterData
+-// The CreateSubnet request parameters
+-//
+-// http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-CreateSubnet.html
+-type CreateSubnet struct {
+- VpcId string
+- CidrBlock string
+- AvailabilityZone string
-}
-
--// ParameterData represents the state of a Parameter.
--// It is made public to make it accessible to e.g. the Swagger package.
--type ParameterData struct {
-- Name, Description, DataType string
-- Kind int
-- Required bool
-- AllowableValues map[string]string
-- AllowMultiple bool
+-// Response to a CreateSubnet request
+-type CreateSubnetResp struct {
+- RequestId string `xml:"requestId"`
+- Subnet Subnet `xml:"subnet"`
-}
-
--// Data returns the state of the Parameter
--func (p *Parameter) Data() ParameterData {
-- return *p.data
+-// Response to a DescribeInternetGateways request.
+-type InternetGatewaysResp struct {
+- RequestId string `xml:"requestId"`
+- InternetGateways []InternetGateway `xml:"internetGatewaySet>item"`
-}
-
--// Kind returns the parameter type indicator (see const for valid values)
--func (p *Parameter) Kind() int {
-- return p.data.Kind
+-// Response to a DescribeRouteTables request.
+-type RouteTablesResp struct {
+- RequestId string `xml:"requestId"`
+- RouteTables []RouteTable `xml:"routeTableSet>item"`
-}
-
--func (p *Parameter) bePath() *Parameter {
-- p.data.Kind = PathParameterKind
-- return p
+-// Response to a DescribeVpcs request.
+-type VpcsResp struct {
+- RequestId string `xml:"requestId"`
+- VPCs []VPC `xml:"vpcSet>item"`
-}
--func (p *Parameter) beQuery() *Parameter {
-- p.data.Kind = QueryParameterKind
-- return p
+-
+-// Internet Gateway
+-type InternetGateway struct {
+- InternetGatewayId string `xml:"internetGatewayId"`
+- Attachments []InternetGatewayAttachment `xml:"attachmentSet>item"`
+- Tags []Tag `xml:"tagSet>item"`
-}
--func (p *Parameter) beBody() *Parameter {
-- p.data.Kind = BodyParameterKind
-- return p
+-
+-type InternetGatewayAttachment struct {
+- VpcId string `xml:"vpcId"`
+- State string `xml:"state"`
-}
-
--func (p *Parameter) beHeader() *Parameter {
-- p.data.Kind = HeaderParameterKind
-- return p
+-// Routing Table
+-type RouteTable struct {
+- RouteTableId string `xml:"routeTableId"`
+- VpcId string `xml:"vpcId"`
+- Associations []RouteTableAssociation `xml:"associationSet>item"`
+- Routes []Route `xml:"routeSet>item"`
+- Tags []Tag `xml:"tagSet>item"`
-}
-
--func (p *Parameter) beForm() *Parameter {
-- p.data.Kind = FormParameterKind
-- return p
+-type RouteTableAssociation struct {
+- AssociationId string `xml:"routeTableAssociationId"`
+- RouteTableId string `xml:"routeTableId"`
+- SubnetId string `xml:"subnetId"`
+- Main bool `xml:"main"`
-}
-
--// Required sets the required field and return the receiver
--func (p *Parameter) Required(required bool) *Parameter {
-- p.data.Required = required
-- return p
+-type Route struct {
+- DestinationCidrBlock string `xml:"destinationCidrBlock"`
+- GatewayId string `xml:"gatewayId"`
+- InstanceId string `xml:"instanceId"`
+- InstanceOwnerId string `xml:"instanceOwnerId"`
+- NetworkInterfaceId string `xml:"networkInterfaceId"`
+- State string `xml:"state"`
+- Origin string `xml:"origin"`
+- VpcPeeringConnectionId string `xml:"vpcPeeringConnectionId"`
-}
-
--// AllowMultiple sets the allowMultiple field and return the receiver
--func (p *Parameter) AllowMultiple(multiple bool) *Parameter {
-- p.data.AllowMultiple = multiple
-- return p
+-// Subnet
+-type Subnet struct {
+- SubnetId string `xml:"subnetId"`
+- State string `xml:"state"`
+- VpcId string `xml:"vpcId"`
+- CidrBlock string `xml:"cidrBlock"`
+- AvailableIpAddressCount int `xml:"availableIpAddressCount"`
+- AvailabilityZone string `xml:"availabilityZone"`
+- DefaultForAZ bool `xml:"defaultForAz"`
+- MapPublicIpOnLaunch bool `xml:"mapPublicIpOnLaunch"`
+- Tags []Tag `xml:"tagSet>item"`
-}
-
--// AllowableValues sets the allowableValues field and return the receiver
--func (p *Parameter) AllowableValues(values map[string]string) *Parameter {
-- p.data.AllowableValues = values
-- return p
+-// VPC represents a single VPC.
+-type VPC struct {
+- VpcId string `xml:"vpcId"`
+- State string `xml:"state"`
+- CidrBlock string `xml:"cidrBlock"`
+- DHCPOptionsID string `xml:"dhcpOptionsId"`
+- InstanceTenancy string `xml:"instanceTenancy"`
+- IsDefault bool `xml:"isDefault"`
+- Tags []Tag `xml:"tagSet>item"`
-}
-
--// DataType sets the dataType field and return the receiver
--func (p *Parameter) DataType(typeName string) *Parameter {
-- p.data.DataType = typeName
-- return p
+-// Response to a DescribeSubnets request.
+-type SubnetsResp struct {
+- RequestId string `xml:"requestId"`
+- Subnets []Subnet `xml:"subnetSet>item"`
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/path_expression.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/path_expression.go
-deleted file mode 100644
-index 8749cb5..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/path_expression.go
-+++ /dev/null
-@@ -1,56 +0,0 @@
--package restful
-
--// Copyright 2013 Ernest Micklei. All rights reserved.
--// Use of this source code is governed by a license
--// that can be found in the LICENSE file.
+-// Create a new VPC.
+-func (ec2 *EC2) CreateVpc(options *CreateVpc) (resp *CreateVpcResp, err error) {
+- params := makeParams("CreateVpc")
+- params["CidrBlock"] = options.CidrBlock
-
--import (
-- "bytes"
-- "regexp"
-- "strings"
--)
+- if options.InstanceTenancy != "" {
+- params["InstanceTenancy"] = options.InstanceTenancy
+- }
-
--// PathExpression holds a compiled path expression (RegExp) needed to match against
--// Http request paths and to extract path parameter values.
--type pathExpression struct {
-- LiteralCount int // the number of literal characters (means those not resulting from template variable substitution)
-- VarCount int // the number of named parameters (enclosed by {}) in the path
-- Matcher *regexp.Regexp
-- Source string // Path as defined by the RouteBuilder
-- tokens []string
+- resp = &CreateVpcResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
+- }
+-
+- return
-}
-
--// NewPathExpression creates a PathExpression from the input URL path.
--// Returns an error if the path is invalid.
--func newPathExpression(path string) (*pathExpression, error) {
-- expression, literalCount, varCount, tokens := templateToRegularExpression(path)
-- compiled, err := regexp.Compile(expression)
+-// Delete a VPC.
+-func (ec2 *EC2) DeleteVpc(id string) (resp *SimpleResp, err error) {
+- params := makeParams("DeleteVpc")
+- params["VpcId"] = id
+-
+- resp = &SimpleResp{}
+- err = ec2.query(params, resp)
- if err != nil {
- return nil, err
- }
-- return &pathExpression{literalCount, varCount, compiled, expression, tokens}, nil
+- return
-}
-
--// http://jsr311.java.net/nonav/releases/1.1/spec/spec3.html#x3-370003.7.3
--func templateToRegularExpression(template string) (expression string, literalCount int, varCount int, tokens []string) {
-- var buffer bytes.Buffer
-- buffer.WriteString("^")
-- //tokens = strings.Split(template, "/")
-- tokens = tokenizePath(template)
-- for _, each := range tokens {
-- if each == "" {
-- continue
-- }
-- buffer.WriteString("/")
-- if strings.HasPrefix(each, "{") {
-- // ignore var spec
-- varCount += 1
-- buffer.WriteString("([^/]+?)")
-- } else {
-- literalCount += len(each)
-- encoded := each // TODO URI encode
-- buffer.WriteString(regexp.QuoteMeta(encoded))
-- }
+-// DescribeVpcs
+-//
+-// See http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeVpcs.html
+-func (ec2 *EC2) DescribeVpcs(ids []string, filter *Filter) (resp *VpcsResp, err error) {
+- params := makeParams("DescribeVpcs")
+- addParamsList(params, "VpcId", ids)
+- filter.addParams(params)
+- resp = &VpcsResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
- }
-- return strings.TrimRight(buffer.String(), "/") + "(/.*)?$", literalCount, varCount, tokens
+-
+- return
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/request.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/request.go
-deleted file mode 100644
-index 00a069f..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/request.go
-+++ /dev/null
-@@ -1,135 +0,0 @@
--package restful
-
--// Copyright 2013 Ernest Micklei. All rights reserved.
--// Use of this source code is governed by a license
--// that can be found in the LICENSE file.
+-// VpcAttribute describes an attribute of a VPC.
+-// You can specify only one attribute at a time.
+-// Valid attributes are:
+-// enableDnsSupport | enableDnsHostnames
+-//
+-// See http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/index.html?ApiReference-query-DescribeVpcAttribute.html for more details.
+-func (ec2 *EC2) VpcAttribute(vpcId, attribute string) (resp *VpcAttributeResp, err error) {
+- params := makeParams("DescribeVpcAttribute")
+- params["VpcId"] = vpcId
+- params["Attribute"] = attribute
-
--import (
-- "bytes"
-- "encoding/json"
-- "encoding/xml"
-- "io"
-- "io/ioutil"
-- "net/http"
-- "strings"
--)
+- resp = &VpcAttributeResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
+- }
+- return
+-}
-
--var defaultRequestContentType string
+-// ModifyVpcAttribute modifies the specified attribute of the specified VPC.
+-//
+-// See http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/index.html?ApiReference-query-ModifyVpcAttribute.html for more details.
+-func (ec2 *EC2) ModifyVpcAttribute(vpcId string, options *ModifyVpcAttribute) (*SimpleResp, error) {
+- params := makeParams("ModifyVpcAttribute")
-
--var doCacheReadEntityBytes = true
+- params["VpcId"] = vpcId
-
--// Request is a wrapper for a http Request that provides convenience methods
--type Request struct {
-- Request *http.Request
-- bodyContent *[]byte // to cache the request body for multiple reads of ReadEntity
-- pathParameters map[string]string
-- attributes map[string]interface{} // for storing request-scoped values
-- selectedRoutePath string // root path + route path that matched the request, e.g. /meetings/{id}/attendees
--}
+- if options.SetEnableDnsSupport {
+- params["EnableDnsSupport.Value"] = strconv.FormatBool(options.EnableDnsSupport)
+- }
-
--func NewRequest(httpRequest *http.Request) *Request {
-- return &Request{
-- Request: httpRequest,
-- pathParameters: map[string]string{},
-- attributes: map[string]interface{}{},
-- } // empty parameters, attributes
--}
+- if options.SetEnableDnsHostnames {
+- params["EnableDnsHostnames.Value"] = strconv.FormatBool(options.EnableDnsHostnames)
+- }
-
--// If ContentType is missing or */* is given then fall back to this type, otherwise
--// a "Unable to unmarshal content of type:" response is returned.
--// Valid values are restful.MIME_JSON and restful.MIME_XML
--// Example:
--// restful.DefaultRequestContentType(restful.MIME_JSON)
--func DefaultRequestContentType(mime string) {
-- defaultRequestContentType = mime
--}
+- resp := &SimpleResp{}
+- if err := ec2.query(params, resp); err != nil {
+- return nil, err
+- }
-
--// SetCacheReadEntity controls whether the response data ([]byte) is cached such that ReadEntity is repeatable.
--// Default is true (due to backwardcompatibility). For better performance, you should set it to false if you don't need it.
--func SetCacheReadEntity(doCache bool) {
-- doCacheReadEntityBytes = doCache
+- return resp, nil
-}
-
--// PathParameter accesses the Path parameter value by its name
--func (r *Request) PathParameter(name string) string {
-- return r.pathParameters[name]
--}
+-// Create a new subnet.
+-func (ec2 *EC2) CreateSubnet(options *CreateSubnet) (resp *CreateSubnetResp, err error) {
+- params := makeParams("CreateSubnet")
+- params["AvailabilityZone"] = options.AvailabilityZone
+- params["CidrBlock"] = options.CidrBlock
+- params["VpcId"] = options.VpcId
-
--// PathParameters accesses the Path parameter values
--func (r *Request) PathParameters() map[string]string {
-- return r.pathParameters
--}
+- resp = &CreateSubnetResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
+- }
-
--// QueryParameter returns the (first) Query parameter value by its name
--func (r *Request) QueryParameter(name string) string {
-- return r.Request.FormValue(name)
+- return
-}
-
--// BodyParameter parses the body of the request (once for typically a POST or a PUT) and returns the value of the given name or an error.
--func (r *Request) BodyParameter(name string) (string, error) {
-- err := r.Request.ParseForm()
+-// Delete a Subnet.
+-func (ec2 *EC2) DeleteSubnet(id string) (resp *SimpleResp, err error) {
+- params := makeParams("DeleteSubnet")
+- params["SubnetId"] = id
+-
+- resp = &SimpleResp{}
+- err = ec2.query(params, resp)
- if err != nil {
-- return "", err
+- return nil, err
- }
-- return r.Request.PostFormValue(name), nil
+- return
-}
-
--// HeaderParameter returns the HTTP Header value of a Header name or empty if missing
--func (r *Request) HeaderParameter(name string) string {
-- return r.Request.Header.Get(name)
--}
+-// DescribeSubnets
+-//
+-// http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeSubnets.html
+-func (ec2 *EC2) DescribeSubnets(ids []string, filter *Filter) (resp *SubnetsResp, err error) {
+- params := makeParams("DescribeSubnets")
+- addParamsList(params, "SubnetId", ids)
+- filter.addParams(params)
-
--// ReadEntity checks the Accept header and reads the content into the entityPointer
--// May be called multiple times in the request-response flow
--func (r *Request) ReadEntity(entityPointer interface{}) (err error) {
-- contentType := r.Request.Header.Get(HEADER_ContentType)
-- if doCacheReadEntityBytes {
-- return r.cachingReadEntity(contentType, entityPointer)
+- resp = &SubnetsResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
- }
-- // unmarshall directly from request Body
-- return r.decodeEntity(r.Request.Body, contentType, entityPointer)
--}
-
--func (r *Request) cachingReadEntity(contentType string, entityPointer interface{}) (err error) {
-- var buffer []byte
-- if r.bodyContent != nil {
-- buffer = *r.bodyContent
-- } else {
-- buffer, err = ioutil.ReadAll(r.Request.Body)
-- if err != nil {
-- return err
-- }
-- r.bodyContent = &buffer
-- }
-- return r.decodeEntity(bytes.NewReader(buffer), contentType, entityPointer)
+- return
-}
-
--func (r *Request) decodeEntity(reader io.Reader, contentType string, entityPointer interface{}) (err error) {
-- if strings.Contains(contentType, MIME_XML) {
-- return xml.NewDecoder(reader).Decode(entityPointer)
-- }
-- if strings.Contains(contentType, MIME_JSON) || MIME_JSON == defaultRequestContentType {
-- decoder := json.NewDecoder(reader)
-- decoder.UseNumber()
-- return decoder.Decode(entityPointer)
-- }
-- if MIME_XML == defaultRequestContentType {
-- return xml.NewDecoder(reader).Decode(entityPointer)
+-// Create a new internet gateway.
+-func (ec2 *EC2) CreateInternetGateway(
+- options *CreateInternetGateway) (resp *CreateInternetGatewayResp, err error) {
+- params := makeParams("CreateInternetGateway")
+-
+- resp = &CreateInternetGatewayResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
- }
-- return NewError(400, "Unable to unmarshal content of type:"+contentType)
--}
-
--// SetAttribute adds or replaces the attribute with the given value.
--func (r *Request) SetAttribute(name string, value interface{}) {
-- r.attributes[name] = value
+- return
-}
-
--// Attribute returns the value associated to the given name. Returns nil if absent.
--func (r Request) Attribute(name string) interface{} {
-- return r.attributes[name]
--}
+-// Attach an InternetGateway.
+-func (ec2 *EC2) AttachInternetGateway(id, vpcId string) (resp *SimpleResp, err error) {
+- params := makeParams("AttachInternetGateway")
+- params["InternetGatewayId"] = id
+- params["VpcId"] = vpcId
-
--// SelectedRoutePath root path + route path that matched the request, e.g. /meetings/{id}/attendees
--func (r Request) SelectedRoutePath() string {
-- return r.selectedRoutePath
+- resp = &SimpleResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
+- }
+- return
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/request_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/request_test.go
-deleted file mode 100644
-index 6e7c55b..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/request_test.go
-+++ /dev/null
-@@ -1,204 +0,0 @@
--package restful
-
--import (
-- "encoding/json"
-- "net/http"
-- "net/url"
-- "strconv"
-- "strings"
-- "testing"
--)
+-// Detach an InternetGateway.
+-func (ec2 *EC2) DetachInternetGateway(id, vpcId string) (resp *SimpleResp, err error) {
+- params := makeParams("DetachInternetGateway")
+- params["InternetGatewayId"] = id
+- params["VpcId"] = vpcId
-
--func TestQueryParameter(t *testing.T) {
-- hreq := http.Request{Method: "GET"}
-- hreq.URL, _ = url.Parse("http://www.google.com/search?q=foo&q=bar")
-- rreq := Request{Request: &hreq}
-- if rreq.QueryParameter("q") != "foo" {
-- t.Errorf("q!=foo %#v", rreq)
+- resp = &SimpleResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
- }
+- return
-}
-
--type Anything map[string]interface{}
+-// Delete an InternetGateway.
+-func (ec2 *EC2) DeleteInternetGateway(id string) (resp *SimpleResp, err error) {
+- params := makeParams("DeleteInternetGateway")
+- params["InternetGatewayId"] = id
-
--type Number struct {
-- ValueFloat float64
-- ValueInt int64
+- resp = &SimpleResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
+- }
+- return
-}
-
--type Sample struct {
-- Value string
--}
+-// DescribeInternetGateways
+-//
+-// http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeInternetGateways.html
+-func (ec2 *EC2) DescribeInternetGateways(ids []string, filter *Filter) (resp *InternetGatewaysResp, err error) {
+- params := makeParams("DescribeInternetGateways")
+- addParamsList(params, "InternetGatewayId", ids)
+- filter.addParams(params)
-
--func TestReadEntityXml(t *testing.T) {
-- SetCacheReadEntity(true)
-- bodyReader := strings.NewReader("<Sample><Value>42</Value></Sample>")
-- httpRequest, _ := http.NewRequest("GET", "/test", bodyReader)
-- httpRequest.Header.Set("Content-Type", "application/xml")
-- request := &Request{Request: httpRequest}
-- sam := new(Sample)
-- request.ReadEntity(sam)
-- if sam.Value != "42" {
-- t.Fatal("read failed")
+- resp = &InternetGatewaysResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
- }
-- if request.bodyContent == nil {
-- t.Fatal("no expected cached bytes found")
+-
+- return
+-}
+-
+-// Create a new routing table.
+-func (ec2 *EC2) CreateRouteTable(
+- options *CreateRouteTable) (resp *CreateRouteTableResp, err error) {
+- params := makeParams("CreateRouteTable")
+- params["VpcId"] = options.VpcId
+-
+- resp = &CreateRouteTableResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
- }
+-
+- return
-}
-
--func TestReadEntityXmlNonCached(t *testing.T) {
-- SetCacheReadEntity(false)
-- bodyReader := strings.NewReader("<Sample><Value>42</Value></Sample>")
-- httpRequest, _ := http.NewRequest("GET", "/test", bodyReader)
-- httpRequest.Header.Set("Content-Type", "application/xml")
-- request := &Request{Request: httpRequest}
-- sam := new(Sample)
-- request.ReadEntity(sam)
-- if sam.Value != "42" {
-- t.Fatal("read failed")
-- }
-- if request.bodyContent != nil {
-- t.Fatal("unexpected cached bytes found")
+-// Delete a RouteTable.
+-func (ec2 *EC2) DeleteRouteTable(id string) (resp *SimpleResp, err error) {
+- params := makeParams("DeleteRouteTable")
+- params["RouteTableId"] = id
+-
+- resp = &SimpleResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
- }
+- return
-}
-
--func TestReadEntityJson(t *testing.T) {
-- bodyReader := strings.NewReader(`{"Value" : "42"}`)
-- httpRequest, _ := http.NewRequest("GET", "/test", bodyReader)
-- httpRequest.Header.Set("Content-Type", "application/json")
-- request := &Request{Request: httpRequest}
-- sam := new(Sample)
-- request.ReadEntity(sam)
-- if sam.Value != "42" {
-- t.Fatal("read failed")
+-// DescribeRouteTables
+-//
+-// http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeRouteTables.html
+-func (ec2 *EC2) DescribeRouteTables(ids []string, filter *Filter) (resp *RouteTablesResp, err error) {
+- params := makeParams("DescribeRouteTables")
+- addParamsList(params, "RouteTableId", ids)
+- filter.addParams(params)
+-
+- resp = &RouteTablesResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
- }
+-
+- return
-}
-
--func TestReadEntityJsonCharset(t *testing.T) {
-- bodyReader := strings.NewReader(`{"Value" : "42"}`)
-- httpRequest, _ := http.NewRequest("GET", "/test", bodyReader)
-- httpRequest.Header.Set("Content-Type", "application/json; charset=UTF-8")
-- request := NewRequest(httpRequest)
-- sam := new(Sample)
-- request.ReadEntity(sam)
-- if sam.Value != "42" {
-- t.Fatal("read failed")
+-// Associate a routing table.
+-func (ec2 *EC2) AssociateRouteTable(id, subnetId string) (*AssociateRouteTableResp, error) {
+- params := makeParams("AssociateRouteTable")
+- params["RouteTableId"] = id
+- params["SubnetId"] = subnetId
+-
+- resp := &AssociateRouteTableResp{}
+- err := ec2.query(params, resp)
+- if err != nil {
+- return nil, err
- }
+- return resp, nil
-}
-
--func TestReadEntityJsonNumber(t *testing.T) {
-- SetCacheReadEntity(true)
-- bodyReader := strings.NewReader(`{"Value" : 4899710515899924123}`)
-- httpRequest, _ := http.NewRequest("GET", "/test", bodyReader)
-- httpRequest.Header.Set("Content-Type", "application/json")
-- request := &Request{Request: httpRequest}
-- any := make(Anything)
-- request.ReadEntity(&any)
-- number, ok := any["Value"].(json.Number)
-- if !ok {
-- t.Fatal("read failed")
-- }
-- vint, err := number.Int64()
+-// Disassociate a routing table.
+-func (ec2 *EC2) DisassociateRouteTable(id string) (*SimpleResp, error) {
+- params := makeParams("DisassociateRouteTable")
+- params["AssociationId"] = id
+-
+- resp := &SimpleResp{}
+- err := ec2.query(params, resp)
- if err != nil {
-- t.Fatal("convert failed")
-- }
-- if vint != 4899710515899924123 {
-- t.Fatal("read failed")
+- return nil, err
- }
-- vfloat, err := number.Float64()
+- return resp, nil
+-}
+-
+-// Re-associate a routing table.
+-func (ec2 *EC2) ReassociateRouteTable(id, routeTableId string) (*ReassociateRouteTableResp, error) {
+- params := makeParams("ReplaceRouteTableAssociation")
+- params["AssociationId"] = id
+- params["RouteTableId"] = routeTableId
+-
+- resp := &ReassociateRouteTableResp{}
+- err := ec2.query(params, resp)
- if err != nil {
-- t.Fatal("convert failed")
-- }
-- // match the default behaviour
-- vstring := strconv.FormatFloat(vfloat, 'e', 15, 64)
-- if vstring != "4.899710515899924e+18" {
-- t.Fatal("convert float64 failed")
+- return nil, err
- }
+- return resp, nil
-}
-
--func TestReadEntityJsonNumberNonCached(t *testing.T) {
-- SetCacheReadEntity(false)
-- bodyReader := strings.NewReader(`{"Value" : 4899710515899924123}`)
-- httpRequest, _ := http.NewRequest("GET", "/test", bodyReader)
-- httpRequest.Header.Set("Content-Type", "application/json")
-- request := &Request{Request: httpRequest}
-- any := make(Anything)
-- request.ReadEntity(&any)
-- number, ok := any["Value"].(json.Number)
-- if !ok {
-- t.Fatal("read failed")
+-// Create a new route.
+-func (ec2 *EC2) CreateRoute(options *CreateRoute) (resp *SimpleResp, err error) {
+- params := makeParams("CreateRoute")
+- params["RouteTableId"] = options.RouteTableId
+- params["DestinationCidrBlock"] = options.DestinationCidrBlock
+-
+- if v := options.GatewayId; v != "" {
+- params["GatewayId"] = v
- }
-- vint, err := number.Int64()
-- if err != nil {
-- t.Fatal("convert failed")
+- if v := options.InstanceId; v != "" {
+- params["InstanceId"] = v
- }
-- if vint != 4899710515899924123 {
-- t.Fatal("read failed")
+- if v := options.NetworkInterfaceId; v != "" {
+- params["NetworkInterfaceId"] = v
- }
-- vfloat, err := number.Float64()
-- if err != nil {
-- t.Fatal("convert failed")
+- if v := options.VpcPeeringConnectionId; v != "" {
+- params["VpcPeeringConnectionId"] = v
- }
-- // match the default behaviour
-- vstring := strconv.FormatFloat(vfloat, 'e', 15, 64)
-- if vstring != "4.899710515899924e+18" {
-- t.Fatal("convert float64 failed")
+-
+- resp = &SimpleResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
- }
+- return
-}
-
--func TestReadEntityJsonLong(t *testing.T) {
-- bodyReader := strings.NewReader(`{"ValueFloat" : 4899710515899924123, "ValueInt": 4899710515899924123}`)
-- httpRequest, _ := http.NewRequest("GET", "/test", bodyReader)
-- httpRequest.Header.Set("Content-Type", "application/json")
-- request := &Request{Request: httpRequest}
-- number := new(Number)
-- request.ReadEntity(&number)
-- if number.ValueInt != 4899710515899924123 {
-- t.Fatal("read failed")
-- }
-- // match the default behaviour
-- vstring := strconv.FormatFloat(number.ValueFloat, 'e', 15, 64)
-- if vstring != "4.899710515899924e+18" {
-- t.Fatal("convert float64 failed")
+-// Delete a Route.
+-func (ec2 *EC2) DeleteRoute(routeTableId, cidr string) (resp *SimpleResp, err error) {
+- params := makeParams("DeleteRoute")
+- params["RouteTableId"] = routeTableId
+- params["DestinationCidrBlock"] = cidr
+-
+- resp = &SimpleResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
- }
+- return
-}
-
--func TestBodyParameter(t *testing.T) {
-- bodyReader := strings.NewReader(`value1=42&value2=43`)
-- httpRequest, _ := http.NewRequest("POST", "/test?value1=44", bodyReader) // POST and PUT body parameters take precedence over URL query string
-- httpRequest.Header.Set("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8")
-- request := NewRequest(httpRequest)
-- v1, err := request.BodyParameter("value1")
-- if err != nil {
-- t.Error(err)
+-// Replace a new route.
+-func (ec2 *EC2) ReplaceRoute(options *ReplaceRoute) (resp *SimpleResp, err error) {
+- params := makeParams("ReplaceRoute")
+- params["RouteTableId"] = options.RouteTableId
+- params["DestinationCidrBlock"] = options.DestinationCidrBlock
+-
+- if v := options.GatewayId; v != "" {
+- params["GatewayId"] = v
- }
-- v2, err := request.BodyParameter("value2")
-- if err != nil {
-- t.Error(err)
+- if v := options.InstanceId; v != "" {
+- params["InstanceId"] = v
- }
-- if v1 != "42" || v2 != "43" {
-- t.Fatal("read failed")
+- if v := options.NetworkInterfaceId; v != "" {
+- params["NetworkInterfaceId"] = v
+- }
+- if v := options.VpcPeeringConnectionId; v != "" {
+- params["VpcPeeringConnectionId"] = v
- }
--}
-
--func TestReadEntityUnkown(t *testing.T) {
-- bodyReader := strings.NewReader("?")
-- httpRequest, _ := http.NewRequest("GET", "/test", bodyReader)
-- httpRequest.Header.Set("Content-Type", "application/rubbish")
-- request := NewRequest(httpRequest)
-- sam := new(Sample)
-- err := request.ReadEntity(sam)
-- if err == nil {
-- t.Fatal("read should be in error")
+- resp = &SimpleResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
- }
+- return
-}
-
--func TestSetAttribute(t *testing.T) {
-- bodyReader := strings.NewReader("?")
-- httpRequest, _ := http.NewRequest("GET", "/test", bodyReader)
-- request := NewRequest(httpRequest)
-- request.SetAttribute("go", "there")
-- there := request.Attribute("go")
-- if there != "there" {
-- t.Fatalf("missing request attribute:%v", there)
+-// The ResetImageAttribute request parameters.
+-type ResetImageAttribute struct {
+- Attribute string
+-}
+-
+-// ResetImageAttribute resets an attribute of an AMI to its default value.
+-//
+-// http://goo.gl/r6ZCPm for more details.
+-func (ec2 *EC2) ResetImageAttribute(imageId string, options *ResetImageAttribute) (resp *SimpleResp, err error) {
+- params := makeParams("ResetImageAttribute")
+- params["ImageId"] = imageId
+-
+- if options.Attribute != "" {
+- params["Attribute"] = options.Attribute
- }
+-
+- resp = &SimpleResp{}
+- err = ec2.query(params, resp)
+- if err != nil {
+- return nil, err
+- }
+- return
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/response.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/response.go
+diff --git a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/ec2_test.go b/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/ec2_test.go
deleted file mode 100644
-index 2b6d762..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/response.go
+index 849bfe2..0000000
+--- a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/ec2_test.go
+++ /dev/null
-@@ -1,233 +0,0 @@
--package restful
--
--// Copyright 2013 Ernest Micklei. All rights reserved.
--// Use of this source code is governed by a license
--// that can be found in the LICENSE file.
+@@ -1,1243 +0,0 @@
+-package ec2_test
-
-import (
-- "encoding/json"
-- "encoding/xml"
-- "net/http"
-- "strings"
--)
--
--// DEPRECATED, use DefaultResponseContentType(mime)
--var DefaultResponseMimeType string
+- "testing"
-
--//PrettyPrintResponses controls the indentation feature of XML and JSON
--//serialization in the response methods WriteEntity, WriteAsJson, and
--//WriteAsXml.
--var PrettyPrintResponses = true
+- "github.com/mitchellh/goamz/aws"
+- "github.com/mitchellh/goamz/ec2"
+- "github.com/mitchellh/goamz/testutil"
+- . "github.com/motain/gocheck"
+-)
-
--// Response is a wrapper on the actual http ResponseWriter
--// It provides several convenience methods to prepare and write response content.
--type Response struct {
-- http.ResponseWriter
-- requestAccept string // mime-type what the Http Request says it wants to receive
-- routeProduces []string // mime-types what the Route says it can produce
-- statusCode int // HTTP status code that has been written explicity (if zero then net/http has written 200)
-- contentLength int // number of bytes written for the response body
+-func Test(t *testing.T) {
+- TestingT(t)
-}
-
--// Creates a new response based on a http ResponseWriter.
--func NewResponse(httpWriter http.ResponseWriter) *Response {
-- return &Response{httpWriter, "", []string{}, http.StatusOK, 0} // empty content-types
--}
+-var _ = Suite(&S{})
-
--// If Accept header matching fails, fall back to this type, otherwise
--// a "406: Not Acceptable" response is returned.
--// Valid values are restful.MIME_JSON and restful.MIME_XML
--// Example:
--// restful.DefaultResponseContentType(restful.MIME_JSON)
--func DefaultResponseContentType(mime string) {
-- DefaultResponseMimeType = mime
+-type S struct {
+- ec2 *ec2.EC2
-}
-
--// InternalServerError writes the StatusInternalServerError header.
--// DEPRECATED, use WriteErrorString(http.StatusInternalServerError,reason)
--func (r Response) InternalServerError() Response {
-- r.WriteHeader(http.StatusInternalServerError)
-- return r
--}
+-var testServer = testutil.NewHTTPServer()
-
--// AddHeader is a shortcut for .Header().Add(header,value)
--func (r Response) AddHeader(header string, value string) Response {
-- r.Header().Add(header, value)
-- return r
+-func (s *S) SetUpSuite(c *C) {
+- testServer.Start()
+- auth := aws.Auth{"abc", "123", ""}
+- s.ec2 = ec2.NewWithClient(
+- auth,
+- aws.Region{EC2Endpoint: testServer.URL},
+- testutil.DefaultClient,
+- )
-}
-
--// SetRequestAccepts tells the response what Mime-type(s) the HTTP request said it wants to accept. Exposed for testing.
--func (r *Response) SetRequestAccepts(mime string) {
-- r.requestAccept = mime
+-func (s *S) TearDownTest(c *C) {
+- testServer.Flush()
-}
-
--// WriteEntity marshals the value using the representation denoted by the Accept Header (XML or JSON)
--// If no Accept header is specified (or */*) then return the Content-Type as specified by the first in the Route.Produces.
--// If an Accept header is specified then return the Content-Type as specified by the first in the Route.Produces that is matched with the Accept header.
--// If the value is nil then nothing is written. You may want to call WriteHeader(http.StatusNotFound) instead.
--// Current implementation ignores any q-parameters in the Accept Header.
--func (r *Response) WriteEntity(value interface{}) error {
-- if value == nil { // do not write a nil representation
-- return nil
-- }
-- for _, qualifiedMime := range strings.Split(r.requestAccept, ",") {
-- mime := strings.Trim(strings.Split(qualifiedMime, ";")[0], " ")
-- if 0 == len(mime) || mime == "*/*" {
-- for _, each := range r.routeProduces {
-- if MIME_JSON == each {
-- return r.WriteAsJson(value)
-- }
-- if MIME_XML == each {
-- return r.WriteAsXml(value)
-- }
-- }
-- } else { // mime is not blank; see if we have a match in Produces
-- for _, each := range r.routeProduces {
-- if mime == each {
-- if MIME_JSON == each {
-- return r.WriteAsJson(value)
-- }
-- if MIME_XML == each {
-- return r.WriteAsXml(value)
-- }
-- }
-- }
-- }
-- }
-- if DefaultResponseMimeType == MIME_JSON {
-- return r.WriteAsJson(value)
-- } else if DefaultResponseMimeType == MIME_XML {
-- return r.WriteAsXml(value)
-- } else {
-- if trace {
-- traceLogger.Printf("mismatch in mime-types and no defaults; (http)Accept=%v,(route)Produces=%v\n", r.requestAccept, r.routeProduces)
-- }
-- r.WriteHeader(http.StatusNotAcceptable) // for recording only
-- r.ResponseWriter.WriteHeader(http.StatusNotAcceptable)
-- if _, err := r.Write([]byte("406: Not Acceptable")); err != nil {
-- return err
-- }
+-func (s *S) TestRunInstancesErrorDump(c *C) {
+- testServer.Response(400, nil, ErrorDump)
+-
+- options := ec2.RunInstances{
+- ImageId: "ami-a6f504cf", // Ubuntu Maverick, i386, instance store
+- InstanceType: "t1.micro", // Doesn't work with micro, results in 400.
- }
-- return nil
--}
-
--// WriteAsXml is a convenience method for writing a value in xml (requires Xml tags on the value)
--func (r *Response) WriteAsXml(value interface{}) error {
-- var output []byte
-- var err error
+- msg := `AMIs with an instance-store root device are not supported for the instance type 't1\.micro'\.`
-
-- if value == nil { // do not write a nil representation
-- return nil
-- }
-- if PrettyPrintResponses {
-- output, err = xml.MarshalIndent(value, " ", " ")
-- } else {
-- output, err = xml.Marshal(value)
-- }
+- resp, err := s.ec2.RunInstances(&options)
-
-- if err != nil {
-- return r.WriteError(http.StatusInternalServerError, err)
-- }
-- r.Header().Set(HEADER_ContentType, MIME_XML)
-- if r.statusCode > 0 { // a WriteHeader was intercepted
-- r.ResponseWriter.WriteHeader(r.statusCode)
-- }
-- _, err = r.Write([]byte(xml.Header))
-- if err != nil {
-- return err
-- }
-- if _, err = r.Write(output); err != nil {
-- return err
-- }
-- return nil
+- testServer.WaitRequest()
+-
+- c.Assert(resp, IsNil)
+- c.Assert(err, ErrorMatches, msg+` \(UnsupportedOperation\)`)
+-
+- ec2err, ok := err.(*ec2.Error)
+- c.Assert(ok, Equals, true)
+- c.Assert(ec2err.StatusCode, Equals, 400)
+- c.Assert(ec2err.Code, Equals, "UnsupportedOperation")
+- c.Assert(ec2err.Message, Matches, msg)
+- c.Assert(ec2err.RequestId, Equals, "0503f4e9-bbd6-483c-b54f-c4ae9f3b30f4")
-}
-
--// WriteAsJson is a convenience method for writing a value in json
--func (r *Response) WriteAsJson(value interface{}) error {
-- var output []byte
-- var err error
+-func (s *S) TestRequestSpotInstancesErrorDump(c *C) {
+- testServer.Response(400, nil, ErrorDump)
-
-- if value == nil { // do not write a nil representation
-- return nil
-- }
-- if PrettyPrintResponses {
-- output, err = json.MarshalIndent(value, " ", " ")
-- } else {
-- output, err = json.Marshal(value)
+- options := ec2.RequestSpotInstances{
+- SpotPrice: "0.01",
+- ImageId: "ami-a6f504cf", // Ubuntu Maverick, i386, instance store
+- InstanceType: "t1.micro", // Doesn't work with micro, results in 400.
- }
-
-- if err != nil {
-- return r.WriteErrorString(http.StatusInternalServerError, err.Error())
-- }
-- r.Header().Set(HEADER_ContentType, MIME_JSON)
-- if r.statusCode > 0 { // a WriteHeader was intercepted
-- r.ResponseWriter.WriteHeader(r.statusCode)
-- }
-- if _, err = r.Write(output); err != nil {
-- return err
-- }
-- return nil
--}
+- msg := `AMIs with an instance-store root device are not supported for the instance type 't1\.micro'\.`
-
--// WriteError write the http status and the error string on the response.
--func (r *Response) WriteError(httpStatus int, err error) error {
-- return r.WriteErrorString(httpStatus, err.Error())
--}
+- resp, err := s.ec2.RequestSpotInstances(&options)
-
--// WriteServiceError is a convenience method for a responding with a ServiceError and a status
--func (r *Response) WriteServiceError(httpStatus int, err ServiceError) error {
-- r.WriteHeader(httpStatus) // for recording only
-- return r.WriteEntity(err)
--}
+- testServer.WaitRequest()
-
--// WriteErrorString is a convenience method for an error status with the actual error
--func (r *Response) WriteErrorString(status int, errorReason string) error {
-- r.statusCode = status // for recording only
-- r.ResponseWriter.WriteHeader(status)
-- if _, err := r.Write([]byte(errorReason)); err != nil {
-- return err
-- }
-- return nil
+- c.Assert(resp, IsNil)
+- c.Assert(err, ErrorMatches, msg+` \(UnsupportedOperation\)`)
+-
+- ec2err, ok := err.(*ec2.Error)
+- c.Assert(ok, Equals, true)
+- c.Assert(ec2err.StatusCode, Equals, 400)
+- c.Assert(ec2err.Code, Equals, "UnsupportedOperation")
+- c.Assert(ec2err.Message, Matches, msg)
+- c.Assert(ec2err.RequestId, Equals, "0503f4e9-bbd6-483c-b54f-c4ae9f3b30f4")
-}
-
--// WriteHeader is overridden to remember the Status Code that has been written.
--// Note that using this method, the status value is only written when
--// - calling WriteEntity
--// - or directly WriteAsXml,WriteAsJson.
--// - or if the status is 204 (http.StatusNoContent)
--func (r *Response) WriteHeader(httpStatus int) {
-- r.statusCode = httpStatus
-- // if 204 then WriteEntity will not be called so we need to pass this code
-- if http.StatusNoContent == httpStatus {
-- r.ResponseWriter.WriteHeader(httpStatus)
-- }
+-func (s *S) TestRunInstancesErrorWithoutXML(c *C) {
+- testServer.Responses(5, 500, nil, "")
+- options := ec2.RunInstances{ImageId: "image-id"}
+-
+- resp, err := s.ec2.RunInstances(&options)
+-
+- testServer.WaitRequest()
+-
+- c.Assert(resp, IsNil)
+- c.Assert(err, ErrorMatches, "500 Internal Server Error")
+-
+- ec2err, ok := err.(*ec2.Error)
+- c.Assert(ok, Equals, true)
+- c.Assert(ec2err.StatusCode, Equals, 500)
+- c.Assert(ec2err.Code, Equals, "")
+- c.Assert(ec2err.Message, Equals, "500 Internal Server Error")
+- c.Assert(ec2err.RequestId, Equals, "")
-}
-
--// StatusCode returns the code that has been written using WriteHeader.
--func (r Response) StatusCode() int {
-- if 0 == r.statusCode {
-- // no status code has been written yet; assume OK
-- return http.StatusOK
-- }
-- return r.statusCode
--}
+-func (s *S) TestRequestSpotInstancesErrorWithoutXML(c *C) {
+- testServer.Responses(5, 500, nil, "")
+- options := ec2.RequestSpotInstances{SpotPrice: "spot-price", ImageId: "image-id"}
-
--// Write writes the data to the connection as part of an HTTP reply.
--// Write is part of http.ResponseWriter interface.
--func (r *Response) Write(bytes []byte) (int, error) {
-- written, err := r.ResponseWriter.Write(bytes)
-- r.contentLength += written
-- return written, err
--}
+- resp, err := s.ec2.RequestSpotInstances(&options)
-
--// ContentLength returns the number of bytes written for the response content.
--// Note that this value is only correct if all data is written through the Response using its Write* methods.
--// Data written directly using the underlying http.ResponseWriter is not accounted for.
--func (r Response) ContentLength() int {
-- return r.contentLength
--}
+- testServer.WaitRequest()
-
--// CloseNotify is part of http.CloseNotifier interface
--func (r Response) CloseNotify() <-chan bool {
-- return r.ResponseWriter.(http.CloseNotifier).CloseNotify()
+- c.Assert(resp, IsNil)
+- c.Assert(err, ErrorMatches, "500 Internal Server Error")
+-
+- ec2err, ok := err.(*ec2.Error)
+- c.Assert(ok, Equals, true)
+- c.Assert(ec2err.StatusCode, Equals, 500)
+- c.Assert(ec2err.Code, Equals, "")
+- c.Assert(ec2err.Message, Equals, "500 Internal Server Error")
+- c.Assert(ec2err.RequestId, Equals, "")
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/response_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/response_test.go
-deleted file mode 100644
-index 314a95a..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/response_test.go
-+++ /dev/null
-@@ -1,137 +0,0 @@
--package restful
-
--import (
-- "errors"
-- "net/http"
-- "net/http/httptest"
-- "testing"
--)
+-func (s *S) TestRunInstancesExample(c *C) {
+- testServer.Response(200, nil, RunInstancesExample)
-
--func TestWriteHeader(t *testing.T) {
-- httpWriter := httptest.NewRecorder()
-- resp := Response{httpWriter, "*/*", []string{"*/*"}, 0, 0}
-- resp.WriteHeader(123)
-- if resp.StatusCode() != 123 {
-- t.Errorf("Unexpected status code:%d", resp.StatusCode())
+- options := ec2.RunInstances{
+- KeyName: "my-keys",
+- ImageId: "image-id",
+- InstanceType: "inst-type",
+- SecurityGroups: []ec2.SecurityGroup{{Name: "g1"}, {Id: "g2"}, {Name: "g3"}, {Id: "g4"}},
+- UserData: []byte("1234"),
+- KernelId: "kernel-id",
+- RamdiskId: "ramdisk-id",
+- AvailZone: "zone",
+- PlacementGroupName: "group",
+- Monitoring: true,
+- SubnetId: "subnet-id",
+- DisableAPITermination: true,
+- ShutdownBehavior: "terminate",
+- PrivateIPAddress: "10.0.0.25",
+- BlockDevices: []ec2.BlockDeviceMapping{
+- {DeviceName: "/dev/sdb", VirtualName: "ephemeral0"},
+- {DeviceName: "/dev/sdc", SnapshotId: "snap-a08912c9", DeleteOnTermination: true},
+- },
- }
--}
+- resp, err := s.ec2.RunInstances(&options)
-
--func TestNoWriteHeader(t *testing.T) {
-- httpWriter := httptest.NewRecorder()
-- resp := Response{httpWriter, "*/*", []string{"*/*"}, 0, 0}
-- if resp.StatusCode() != http.StatusOK {
-- t.Errorf("Unexpected status code:%d", resp.StatusCode())
-- }
--}
+- req := testServer.WaitRequest()
+- c.Assert(req.Form["Action"], DeepEquals, []string{"RunInstances"})
+- c.Assert(req.Form["ImageId"], DeepEquals, []string{"image-id"})
+- c.Assert(req.Form["MinCount"], DeepEquals, []string{"1"})
+- c.Assert(req.Form["MaxCount"], DeepEquals, []string{"1"})
+- c.Assert(req.Form["KeyName"], DeepEquals, []string{"my-keys"})
+- c.Assert(req.Form["InstanceType"], DeepEquals, []string{"inst-type"})
+- c.Assert(req.Form["SecurityGroup.1"], DeepEquals, []string{"g1"})
+- c.Assert(req.Form["SecurityGroup.2"], DeepEquals, []string{"g3"})
+- c.Assert(req.Form["SecurityGroupId.1"], DeepEquals, []string{"g2"})
+- c.Assert(req.Form["SecurityGroupId.2"], DeepEquals, []string{"g4"})
+- c.Assert(req.Form["UserData"], DeepEquals, []string{"MTIzNA=="})
+- c.Assert(req.Form["KernelId"], DeepEquals, []string{"kernel-id"})
+- c.Assert(req.Form["RamdiskId"], DeepEquals, []string{"ramdisk-id"})
+- c.Assert(req.Form["Placement.AvailabilityZone"], DeepEquals, []string{"zone"})
+- c.Assert(req.Form["Placement.GroupName"], DeepEquals, []string{"group"})
+- c.Assert(req.Form["Monitoring.Enabled"], DeepEquals, []string{"true"})
+- c.Assert(req.Form["SubnetId"], DeepEquals, []string{"subnet-id"})
+- c.Assert(req.Form["DisableApiTermination"], DeepEquals, []string{"true"})
+- c.Assert(req.Form["InstanceInitiatedShutdownBehavior"], DeepEquals, []string{"terminate"})
+- c.Assert(req.Form["PrivateIpAddress"], DeepEquals, []string{"10.0.0.25"})
+- c.Assert(req.Form["BlockDeviceMapping.1.DeviceName"], DeepEquals, []string{"/dev/sdb"})
+- c.Assert(req.Form["BlockDeviceMapping.1.VirtualName"], DeepEquals, []string{"ephemeral0"})
+- c.Assert(req.Form["BlockDeviceMapping.2.Ebs.SnapshotId"], DeepEquals, []string{"snap-a08912c9"})
+- c.Assert(req.Form["BlockDeviceMapping.2.Ebs.DeleteOnTermination"], DeepEquals, []string{"true"})
-
--type food struct {
-- Kind string
--}
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
+- c.Assert(resp.ReservationId, Equals, "r-47a5402e")
+- c.Assert(resp.OwnerId, Equals, "999988887777")
+- c.Assert(resp.SecurityGroups, DeepEquals, []ec2.SecurityGroup{{Name: "default", Id: "sg-67ad940e"}})
+- c.Assert(resp.Instances, HasLen, 3)
-
--// go test -v -test.run TestMeasureContentLengthXml ...restful
--func TestMeasureContentLengthXml(t *testing.T) {
-- httpWriter := httptest.NewRecorder()
-- resp := Response{httpWriter, "*/*", []string{"*/*"}, 0, 0}
-- resp.WriteAsXml(food{"apple"})
-- if resp.ContentLength() != 76 {
-- t.Errorf("Incorrect measured length:%d", resp.ContentLength())
-- }
--}
+- i0 := resp.Instances[0]
+- c.Assert(i0.InstanceId, Equals, "i-2ba64342")
+- c.Assert(i0.InstanceType, Equals, "m1.small")
+- c.Assert(i0.ImageId, Equals, "ami-60a54009")
+- c.Assert(i0.Monitoring, Equals, "enabled")
+- c.Assert(i0.KeyName, Equals, "example-key-name")
+- c.Assert(i0.AMILaunchIndex, Equals, 0)
+- c.Assert(i0.VirtType, Equals, "paravirtual")
+- c.Assert(i0.Hypervisor, Equals, "xen")
-
--// go test -v -test.run TestMeasureContentLengthJson ...restful
--func TestMeasureContentLengthJson(t *testing.T) {
-- httpWriter := httptest.NewRecorder()
-- resp := Response{httpWriter, "*/*", []string{"*/*"}, 0, 0}
-- resp.WriteAsJson(food{"apple"})
-- if resp.ContentLength() != 22 {
-- t.Errorf("Incorrect measured length:%d", resp.ContentLength())
-- }
--}
+- i1 := resp.Instances[1]
+- c.Assert(i1.InstanceId, Equals, "i-2bc64242")
+- c.Assert(i1.InstanceType, Equals, "m1.small")
+- c.Assert(i1.ImageId, Equals, "ami-60a54009")
+- c.Assert(i1.Monitoring, Equals, "enabled")
+- c.Assert(i1.KeyName, Equals, "example-key-name")
+- c.Assert(i1.AMILaunchIndex, Equals, 1)
+- c.Assert(i1.VirtType, Equals, "paravirtual")
+- c.Assert(i1.Hypervisor, Equals, "xen")
-
--// go test -v -test.run TestMeasureContentLengthWriteErrorString ...restful
--func TestMeasureContentLengthWriteErrorString(t *testing.T) {
-- httpWriter := httptest.NewRecorder()
-- resp := Response{httpWriter, "*/*", []string{"*/*"}, 0, 0}
-- resp.WriteErrorString(404, "Invalid")
-- if resp.ContentLength() != len("Invalid") {
-- t.Errorf("Incorrect measured length:%d", resp.ContentLength())
-- }
+- i2 := resp.Instances[2]
+- c.Assert(i2.InstanceId, Equals, "i-2be64332")
+- c.Assert(i2.InstanceType, Equals, "m1.small")
+- c.Assert(i2.ImageId, Equals, "ami-60a54009")
+- c.Assert(i2.Monitoring, Equals, "enabled")
+- c.Assert(i2.KeyName, Equals, "example-key-name")
+- c.Assert(i2.AMILaunchIndex, Equals, 2)
+- c.Assert(i2.VirtType, Equals, "paravirtual")
+- c.Assert(i2.Hypervisor, Equals, "xen")
-}
-
--// go test -v -test.run TestStatusCreatedAndContentTypeJson_Issue54 ...restful
--func TestStatusCreatedAndContentTypeJson_Issue54(t *testing.T) {
-- httpWriter := httptest.NewRecorder()
-- resp := Response{httpWriter, "application/json", []string{"application/json"}, 0, 0}
-- resp.WriteHeader(201)
-- resp.WriteAsJson(food{"Juicy"})
-- if httpWriter.HeaderMap.Get("Content-Type") != "application/json" {
-- t.Errorf("Expected content type json but got:%d", httpWriter.HeaderMap.Get("Content-Type"))
-- }
-- if httpWriter.Code != 201 {
-- t.Errorf("Expected status 201 but got:%d", httpWriter.Code)
+-func (s *S) TestRequestSpotInstancesExample(c *C) {
+- testServer.Response(200, nil, RequestSpotInstancesExample)
+-
+- options := ec2.RequestSpotInstances{
+- SpotPrice: "0.5",
+- KeyName: "my-keys",
+- ImageId: "image-id",
+- InstanceType: "inst-type",
+- SecurityGroups: []ec2.SecurityGroup{{Name: "g1"}, {Id: "g2"}, {Name: "g3"}, {Id: "g4"}},
+- UserData: []byte("1234"),
+- KernelId: "kernel-id",
+- RamdiskId: "ramdisk-id",
+- AvailZone: "zone",
+- PlacementGroupName: "group",
+- Monitoring: true,
+- SubnetId: "subnet-id",
+- PrivateIPAddress: "10.0.0.25",
+- BlockDevices: []ec2.BlockDeviceMapping{
+- {DeviceName: "/dev/sdb", VirtualName: "ephemeral0"},
+- {DeviceName: "/dev/sdc", SnapshotId: "snap-a08912c9", DeleteOnTermination: true},
+- },
- }
--}
+- resp, err := s.ec2.RequestSpotInstances(&options)
-
--type errorOnWriteRecorder struct {
-- *httptest.ResponseRecorder
--}
+- req := testServer.WaitRequest()
+- c.Assert(req.Form["Action"], DeepEquals, []string{"RequestSpotInstances"})
+- c.Assert(req.Form["SpotPrice"], DeepEquals, []string{"0.5"})
+- c.Assert(req.Form["LaunchSpecification.ImageId"], DeepEquals, []string{"image-id"})
+- c.Assert(req.Form["LaunchSpecification.KeyName"], DeepEquals, []string{"my-keys"})
+- c.Assert(req.Form["LaunchSpecification.InstanceType"], DeepEquals, []string{"inst-type"})
+- c.Assert(req.Form["LaunchSpecification.SecurityGroup.1"], DeepEquals, []string{"g1"})
+- c.Assert(req.Form["LaunchSpecification.SecurityGroup.2"], DeepEquals, []string{"g3"})
+- c.Assert(req.Form["LaunchSpecification.SecurityGroupId.1"], DeepEquals, []string{"g2"})
+- c.Assert(req.Form["LaunchSpecification.SecurityGroupId.2"], DeepEquals, []string{"g4"})
+- c.Assert(req.Form["LaunchSpecification.UserData"], DeepEquals, []string{"MTIzNA=="})
+- c.Assert(req.Form["LaunchSpecification.KernelId"], DeepEquals, []string{"kernel-id"})
+- c.Assert(req.Form["LaunchSpecification.RamdiskId"], DeepEquals, []string{"ramdisk-id"})
+- c.Assert(req.Form["LaunchSpecification.Placement.AvailabilityZone"], DeepEquals, []string{"zone"})
+- c.Assert(req.Form["LaunchSpecification.Placement.GroupName"], DeepEquals, []string{"group"})
+- c.Assert(req.Form["LaunchSpecification.Monitoring.Enabled"], DeepEquals, []string{"true"})
+- c.Assert(req.Form["LaunchSpecification.SubnetId"], DeepEquals, []string{"subnet-id"})
+- c.Assert(req.Form["LaunchSpecification.PrivateIpAddress"], DeepEquals, []string{"10.0.0.25"})
+- c.Assert(req.Form["LaunchSpecification.BlockDeviceMapping.1.DeviceName"], DeepEquals, []string{"/dev/sdb"})
+- c.Assert(req.Form["LaunchSpecification.BlockDeviceMapping.1.VirtualName"], DeepEquals, []string{"ephemeral0"})
+- c.Assert(req.Form["LaunchSpecification.BlockDeviceMapping.2.Ebs.SnapshotId"], DeepEquals, []string{"snap-a08912c9"})
+- c.Assert(req.Form["LaunchSpecification.BlockDeviceMapping.2.Ebs.DeleteOnTermination"], DeepEquals, []string{"true"})
-
--func (e errorOnWriteRecorder) Write(bytes []byte) (int, error) {
-- return 0, errors.New("fail")
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
+- c.Assert(resp.SpotRequestResults[0].SpotRequestId, Equals, "sir-1a2b3c4d")
+- c.Assert(resp.SpotRequestResults[0].SpotPrice, Equals, "0.5")
+- c.Assert(resp.SpotRequestResults[0].State, Equals, "open")
+- c.Assert(resp.SpotRequestResults[0].SpotLaunchSpec.ImageId, Equals, "ami-1a2b3c4d")
+- c.Assert(resp.SpotRequestResults[0].Status.Code, Equals, "pending-evaluation")
+- c.Assert(resp.SpotRequestResults[0].Status.UpdateTime, Equals, "2008-05-07T12:51:50.000Z")
+- c.Assert(resp.SpotRequestResults[0].Status.Message, Equals, "Your Spot request has been submitted for review, and is pending evaluation.")
-}
-
--// go test -v -test.run TestLastWriteErrorCaught ...restful
--func TestLastWriteErrorCaught(t *testing.T) {
-- httpWriter := errorOnWriteRecorder{httptest.NewRecorder()}
-- resp := Response{httpWriter, "application/json", []string{"application/json"}, 0, 0}
-- err := resp.WriteAsJson(food{"Juicy"})
-- if err.Error() != "fail" {
-- t.Errorf("Unexpected error message:%v", err)
-- }
--}
+-func (s *S) TestCancelSpotRequestsExample(c *C) {
+- testServer.Response(200, nil, CancelSpotRequestsExample)
-
--// go test -v -test.run TestAcceptStarStar_Issue83 ...restful
--func TestAcceptStarStar_Issue83(t *testing.T) {
-- httpWriter := httptest.NewRecorder()
-- // Accept Produces
-- resp := Response{httpWriter, "application/bogus,*/*;q=0.8", []string{"application/json"}, 0, 0}
-- resp.WriteEntity(food{"Juicy"})
-- ct := httpWriter.Header().Get("Content-Type")
-- if "application/json" != ct {
-- t.Errorf("Unexpected content type:%s", ct)
-- }
--}
+- resp, err := s.ec2.CancelSpotRequests([]string{"s-1", "s-2"})
-
--// go test -v -test.run TestAcceptSkipStarStar_Issue83 ...restful
--func TestAcceptSkipStarStar_Issue83(t *testing.T) {
-- httpWriter := httptest.NewRecorder()
-- // Accept Produces
-- resp := Response{httpWriter, " application/xml ,*/* ; q=0.8", []string{"application/json", "application/xml"}, 0, 0}
-- resp.WriteEntity(food{"Juicy"})
-- ct := httpWriter.Header().Get("Content-Type")
-- if "application/xml" != ct {
-- t.Errorf("Unexpected content type:%s", ct)
-- }
--}
+- req := testServer.WaitRequest()
+- c.Assert(req.Form["Action"], DeepEquals, []string{"CancelSpotInstanceRequests"})
+- c.Assert(req.Form["SpotInstanceRequestId.1"], DeepEquals, []string{"s-1"})
+- c.Assert(req.Form["SpotInstanceRequestId.2"], DeepEquals, []string{"s-2"})
-
--// go test -v -test.run TestAcceptXmlBeforeStarStar_Issue83 ...restful
--func TestAcceptXmlBeforeStarStar_Issue83(t *testing.T) {
-- httpWriter := httptest.NewRecorder()
-- // Accept Produces
-- resp := Response{httpWriter, "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8", []string{"application/json"}, 0, 0}
-- resp.WriteEntity(food{"Juicy"})
-- ct := httpWriter.Header().Get("Content-Type")
-- if "application/json" != ct {
-- t.Errorf("Unexpected content type:%s", ct)
-- }
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
+- c.Assert(resp.CancelSpotRequestResults[0].SpotRequestId, Equals, "sir-1a2b3c4d")
+- c.Assert(resp.CancelSpotRequestResults[0].State, Equals, "cancelled")
-}
-
--// go test -v -test.run TestWriteHeaderNoContent_Issue124 ...restful
--func TestWriteHeaderNoContent_Issue124(t *testing.T) {
-- httpWriter := httptest.NewRecorder()
-- resp := Response{httpWriter, "text/plain", []string{"text/plain"}, 0, 0}
-- resp.WriteHeader(http.StatusNoContent)
-- if httpWriter.Code != http.StatusNoContent {
-- t.Errorf("got %d want %d", httpWriter.Code, http.StatusNoContent)
-- }
--}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/route.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/route.go
-deleted file mode 100644
-index 59d6e23..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/route.go
-+++ /dev/null
-@@ -1,166 +0,0 @@
--package restful
+-func (s *S) TestTerminateInstancesExample(c *C) {
+- testServer.Response(200, nil, TerminateInstancesExample)
-
--// Copyright 2013 Ernest Micklei. All rights reserved.
--// Use of this source code is governed by a license
--// that can be found in the LICENSE file.
+- resp, err := s.ec2.TerminateInstances([]string{"i-1", "i-2"})
-
--import (
-- "bytes"
-- "net/http"
-- "strings"
--)
+- req := testServer.WaitRequest()
+- c.Assert(req.Form["Action"], DeepEquals, []string{"TerminateInstances"})
+- c.Assert(req.Form["InstanceId.1"], DeepEquals, []string{"i-1"})
+- c.Assert(req.Form["InstanceId.2"], DeepEquals, []string{"i-2"})
+- c.Assert(req.Form["UserData"], IsNil)
+- c.Assert(req.Form["KernelId"], IsNil)
+- c.Assert(req.Form["RamdiskId"], IsNil)
+- c.Assert(req.Form["Placement.AvailabilityZone"], IsNil)
+- c.Assert(req.Form["Placement.GroupName"], IsNil)
+- c.Assert(req.Form["Monitoring.Enabled"], IsNil)
+- c.Assert(req.Form["SubnetId"], IsNil)
+- c.Assert(req.Form["DisableApiTermination"], IsNil)
+- c.Assert(req.Form["InstanceInitiatedShutdownBehavior"], IsNil)
+- c.Assert(req.Form["PrivateIpAddress"], IsNil)
-
--// RouteFunction declares the signature of a function that can be bound to a Route.
--type RouteFunction func(*Request, *Response)
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
+- c.Assert(resp.StateChanges, HasLen, 1)
+- c.Assert(resp.StateChanges[0].InstanceId, Equals, "i-3ea74257")
+- c.Assert(resp.StateChanges[0].CurrentState.Code, Equals, 32)
+- c.Assert(resp.StateChanges[0].CurrentState.Name, Equals, "shutting-down")
+- c.Assert(resp.StateChanges[0].PreviousState.Code, Equals, 16)
+- c.Assert(resp.StateChanges[0].PreviousState.Name, Equals, "running")
+-}
-
--// Route binds a HTTP Method,Path,Consumes combination to a RouteFunction.
--type Route struct {
-- Method string
-- Produces []string
-- Consumes []string
-- Path string // webservice root path + described path
-- Function RouteFunction
-- Filters []FilterFunction
+-func (s *S) TestDescribeSpotRequestsExample(c *C) {
+- testServer.Response(200, nil, DescribeSpotRequestsExample)
-
-- // cached values for dispatching
-- relativePath string
-- pathParts []string
-- pathExpr *pathExpression // cached compilation of relativePath as RegExp
+- filter := ec2.NewFilter()
+- filter.Add("key1", "value1")
+- filter.Add("key2", "value2", "value3")
-
-- // documentation
-- Doc string
-- Operation string
-- ParameterDocs []*Parameter
-- ResponseErrors map[int]ResponseError
-- ReadSample, WriteSample interface{} // structs that model an example request or response payload
--}
+- resp, err := s.ec2.DescribeSpotRequests([]string{"s-1", "s-2"}, filter)
-
--// Initialize for Route
--func (r *Route) postBuild() {
-- r.pathParts = tokenizePath(r.Path)
--}
+- req := testServer.WaitRequest()
+- c.Assert(req.Form["Action"], DeepEquals, []string{"DescribeSpotInstanceRequests"})
+- c.Assert(req.Form["SpotInstanceRequestId.1"], DeepEquals, []string{"s-1"})
+- c.Assert(req.Form["SpotInstanceRequestId.2"], DeepEquals, []string{"s-2"})
-
--// Create Request and Response from their http versions
--func (r *Route) wrapRequestResponse(httpWriter http.ResponseWriter, httpRequest *http.Request) (*Request, *Response) {
-- params := r.extractParameters(httpRequest.URL.Path)
-- wrappedRequest := NewRequest(httpRequest)
-- wrappedRequest.pathParameters = params
-- wrappedRequest.selectedRoutePath = r.Path
-- wrappedResponse := NewResponse(httpWriter)
-- wrappedResponse.requestAccept = httpRequest.Header.Get(HEADER_Accept)
-- wrappedResponse.routeProduces = r.Produces
-- return wrappedRequest, wrappedResponse
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "b1719f2a-5334-4479-b2f1-26926EXAMPLE")
+- c.Assert(resp.SpotRequestResults[0].SpotRequestId, Equals, "sir-1a2b3c4d")
+- c.Assert(resp.SpotRequestResults[0].State, Equals, "active")
+- c.Assert(resp.SpotRequestResults[0].SpotPrice, Equals, "0.5")
+- c.Assert(resp.SpotRequestResults[0].SpotLaunchSpec.ImageId, Equals, "ami-1a2b3c4d")
+- c.Assert(resp.SpotRequestResults[0].Status.Code, Equals, "fulfilled")
+- c.Assert(resp.SpotRequestResults[0].Status.UpdateTime, Equals, "2008-05-07T12:51:50.000Z")
+- c.Assert(resp.SpotRequestResults[0].Status.Message, Equals, "Your Spot request is fulfilled.")
-}
-
--// dispatchWithFilters call the function after passing through its own filters
--func (r *Route) dispatchWithFilters(wrappedRequest *Request, wrappedResponse *Response) {
-- if len(r.Filters) > 0 {
-- chain := FilterChain{Filters: r.Filters, Target: r.Function}
-- chain.ProcessFilter(wrappedRequest, wrappedResponse)
-- } else {
-- // unfiltered
-- r.Function(wrappedRequest, wrappedResponse)
-- }
--}
+-func (s *S) TestDescribeInstancesExample1(c *C) {
+- testServer.Response(200, nil, DescribeInstancesExample1)
-
--// Return whether the mimeType matches to what this Route can produce.
--func (r Route) matchesAccept(mimeTypesWithQuality string) bool {
-- parts := strings.Split(mimeTypesWithQuality, ",")
-- for _, each := range parts {
-- var withoutQuality string
-- if strings.Contains(each, ";") {
-- withoutQuality = strings.Split(each, ";")[0]
-- } else {
-- withoutQuality = each
-- }
-- // trim before compare
-- withoutQuality = strings.Trim(withoutQuality, " ")
-- if withoutQuality == "*/*" {
-- return true
-- }
-- for _, other := range r.Produces {
-- if other == withoutQuality {
-- return true
-- }
-- }
-- }
-- return false
--}
+- filter := ec2.NewFilter()
+- filter.Add("key1", "value1")
+- filter.Add("key2", "value2", "value3")
-
--// Return whether the mimeType matches to what this Route can consume.
--func (r Route) matchesContentType(mimeTypes string) bool {
-- parts := strings.Split(mimeTypes, ",")
-- for _, each := range parts {
-- var contentType string
-- if strings.Contains(each, ";") {
-- contentType = strings.Split(each, ";")[0]
-- } else {
-- contentType = each
-- }
-- // trim before compare
-- contentType = strings.Trim(contentType, " ")
-- for _, other := range r.Consumes {
-- if other == "*/*" || other == contentType {
-- return true
-- }
-- }
-- }
-- return false
--}
+- resp, err := s.ec2.Instances([]string{"i-1", "i-2"}, nil)
-
--// Extract the parameters from the request url path
--func (r Route) extractParameters(urlPath string) map[string]string {
-- urlParts := tokenizePath(urlPath)
-- pathParameters := map[string]string{}
-- for i, key := range r.pathParts {
-- var value string
-- if i >= len(urlParts) {
-- value = ""
-- } else {
-- value = urlParts[i]
-- }
-- if strings.HasPrefix(key, "{") { // path-parameter
-- if colon := strings.Index(key, ":"); colon != -1 {
-- // extract by regex
-- regPart := key[colon+1 : len(key)-1]
-- keyPart := key[1:colon]
-- if regPart == "*" {
-- pathParameters[keyPart] = untokenizePath(i, urlParts)
-- break
-- } else {
-- pathParameters[keyPart] = value
-- }
-- } else {
-- // without enclosing {}
-- pathParameters[key[1:len(key)-1]] = value
-- }
-- }
-- }
-- return pathParameters
+- req := testServer.WaitRequest()
+- c.Assert(req.Form["Action"], DeepEquals, []string{"DescribeInstances"})
+- c.Assert(req.Form["InstanceId.1"], DeepEquals, []string{"i-1"})
+- c.Assert(req.Form["InstanceId.2"], DeepEquals, []string{"i-2"})
+-
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "98e3c9a4-848c-4d6d-8e8a-b1bdEXAMPLE")
+- c.Assert(resp.Reservations, HasLen, 2)
+-
+- r0 := resp.Reservations[0]
+- c.Assert(r0.ReservationId, Equals, "r-b27e30d9")
+- c.Assert(r0.OwnerId, Equals, "999988887777")
+- c.Assert(r0.RequesterId, Equals, "854251627541")
+- c.Assert(r0.SecurityGroups, DeepEquals, []ec2.SecurityGroup{{Name: "default", Id: "sg-67ad940e"}})
+- c.Assert(r0.Instances, HasLen, 1)
+-
+- r0i := r0.Instances[0]
+- c.Assert(r0i.InstanceId, Equals, "i-c5cd56af")
+- c.Assert(r0i.PrivateDNSName, Equals, "domU-12-31-39-10-56-34.compute-1.internal")
+- c.Assert(r0i.DNSName, Equals, "ec2-174-129-165-232.compute-1.amazonaws.com")
+- c.Assert(r0i.AvailZone, Equals, "us-east-1b")
-}
-
--// Untokenize back into an URL path using the slash separator
--func untokenizePath(offset int, parts []string) string {
-- var buffer bytes.Buffer
-- for p := offset; p < len(parts); p++ {
-- buffer.WriteString(parts[p])
-- // do not end
-- if p < len(parts)-1 {
-- buffer.WriteString("/")
-- }
-- }
-- return buffer.String()
--}
+-func (s *S) TestDescribeInstancesExample2(c *C) {
+- testServer.Response(200, nil, DescribeInstancesExample2)
-
--// Tokenize an URL path using the slash separator ; the result does not have empty tokens
--func tokenizePath(path string) []string {
-- if "/" == path {
-- return []string{}
-- }
-- return strings.Split(strings.Trim(path, "/"), "/")
--}
+- filter := ec2.NewFilter()
+- filter.Add("key1", "value1")
+- filter.Add("key2", "value2", "value3")
-
--// for debugging
--func (r Route) String() string {
-- return r.Method + " " + r.Path
--}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/route_builder.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/route_builder.go
-deleted file mode 100644
-index 0046afb..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/route_builder.go
-+++ /dev/null
-@@ -1,208 +0,0 @@
--package restful
+- resp, err := s.ec2.Instances([]string{"i-1", "i-2"}, filter)
-
--// Copyright 2013 Ernest Micklei. All rights reserved.
--// Use of this source code is governed by a license
--// that can be found in the LICENSE file.
+- req := testServer.WaitRequest()
+- c.Assert(req.Form["Action"], DeepEquals, []string{"DescribeInstances"})
+- c.Assert(req.Form["InstanceId.1"], DeepEquals, []string{"i-1"})
+- c.Assert(req.Form["InstanceId.2"], DeepEquals, []string{"i-2"})
+- c.Assert(req.Form["Filter.1.Name"], DeepEquals, []string{"key1"})
+- c.Assert(req.Form["Filter.1.Value.1"], DeepEquals, []string{"value1"})
+- c.Assert(req.Form["Filter.1.Value.2"], IsNil)
+- c.Assert(req.Form["Filter.2.Name"], DeepEquals, []string{"key2"})
+- c.Assert(req.Form["Filter.2.Value.1"], DeepEquals, []string{"value2"})
+- c.Assert(req.Form["Filter.2.Value.2"], DeepEquals, []string{"value3"})
-
--import (
-- "log"
-- "reflect"
-- "strings"
--)
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
+- c.Assert(resp.Reservations, HasLen, 1)
-
--// RouteBuilder is a helper to construct Routes.
--type RouteBuilder struct {
-- rootPath string
-- currentPath string
-- produces []string
-- consumes []string
-- httpMethod string // required
-- function RouteFunction // required
-- filters []FilterFunction
-- // documentation
-- doc string
-- operation string
-- readSample, writeSample interface{}
-- parameters []*Parameter
-- errorMap map[int]ResponseError
+- r0 := resp.Reservations[0]
+- r0i := r0.Instances[0]
+- c.Assert(r0i.State.Code, Equals, 16)
+- c.Assert(r0i.State.Name, Equals, "running")
+-
+- r0t0 := r0i.Tags[0]
+- r0t1 := r0i.Tags[1]
+- c.Assert(r0t0.Key, Equals, "webserver")
+- c.Assert(r0t0.Value, Equals, "")
+- c.Assert(r0t1.Key, Equals, "stack")
+- c.Assert(r0t1.Value, Equals, "Production")
-}
-
--// Do evaluates each argument with the RouteBuilder itself.
--// This allows you to follow DRY principles without breaking the fluent programming style.
--// Example:
--// ws.Route(ws.DELETE("/{name}").To(t.deletePerson).Do(Returns200, Returns500))
--//
--// func Returns500(b *RouteBuilder) {
--// b.Returns(500, "Internal Server Error", restful.ServiceError{})
--// }
--func (b *RouteBuilder) Do(oneArgBlocks ...func(*RouteBuilder)) *RouteBuilder {
-- for _, each := range oneArgBlocks {
-- each(b)
+-func (s *S) TestCreateImageExample(c *C) {
+- testServer.Response(200, nil, CreateImageExample)
+-
+- options := &ec2.CreateImage{
+- InstanceId: "i-123456",
+- Name: "foo",
+- Description: "Test CreateImage",
+- NoReboot: true,
+- BlockDevices: []ec2.BlockDeviceMapping{
+- {DeviceName: "/dev/sdb", VirtualName: "ephemeral0"},
+- {DeviceName: "/dev/sdc", SnapshotId: "snap-a08912c9", DeleteOnTermination: true},
+- },
- }
-- return b
--}
-
--// To bind the route to a function.
--// If this route is matched with the incoming Http Request then call this function with the *Request,*Response pair. Required.
--func (b *RouteBuilder) To(function RouteFunction) *RouteBuilder {
-- b.function = function
-- return b
--}
+- resp, err := s.ec2.CreateImage(options)
-
--// Method specifies what HTTP method to match. Required.
--func (b *RouteBuilder) Method(method string) *RouteBuilder {
-- b.httpMethod = method
-- return b
--}
+- req := testServer.WaitRequest()
+- c.Assert(req.Form["Action"], DeepEquals, []string{"CreateImage"})
+- c.Assert(req.Form["InstanceId"], DeepEquals, []string{options.InstanceId})
+- c.Assert(req.Form["Name"], DeepEquals, []string{options.Name})
+- c.Assert(req.Form["Description"], DeepEquals, []string{options.Description})
+- c.Assert(req.Form["NoReboot"], DeepEquals, []string{"true"})
+- c.Assert(req.Form["BlockDeviceMapping.1.DeviceName"], DeepEquals, []string{"/dev/sdb"})
+- c.Assert(req.Form["BlockDeviceMapping.1.VirtualName"], DeepEquals, []string{"ephemeral0"})
+- c.Assert(req.Form["BlockDeviceMapping.2.DeviceName"], DeepEquals, []string{"/dev/sdc"})
+- c.Assert(req.Form["BlockDeviceMapping.2.Ebs.SnapshotId"], DeepEquals, []string{"snap-a08912c9"})
+- c.Assert(req.Form["BlockDeviceMapping.2.Ebs.DeleteOnTermination"], DeepEquals, []string{"true"})
-
--// Produces specifies what MIME types can be produced ; the matched one will appear in the Content-Type Http header.
--func (b *RouteBuilder) Produces(mimeTypes ...string) *RouteBuilder {
-- b.produces = mimeTypes
-- return b
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
+- c.Assert(resp.ImageId, Equals, "ami-4fa54026")
-}
-
--// Consumes specifies what MIME types can be consumes ; the Accept Http header must matched any of these
--func (b *RouteBuilder) Consumes(mimeTypes ...string) *RouteBuilder {
-- b.consumes = mimeTypes
-- return b
--}
+-func (s *S) TestDescribeImagesExample(c *C) {
+- testServer.Response(200, nil, DescribeImagesExample)
-
--// Path specifies the relative (w.r.t WebService root path) URL path to match. Default is "/".
--func (b *RouteBuilder) Path(subPath string) *RouteBuilder {
-- b.currentPath = subPath
-- return b
--}
+- filter := ec2.NewFilter()
+- filter.Add("key1", "value1")
+- filter.Add("key2", "value2", "value3")
-
--// Doc tells what this route is all about. Optional.
--func (b *RouteBuilder) Doc(documentation string) *RouteBuilder {
-- b.doc = documentation
-- return b
--}
+- resp, err := s.ec2.Images([]string{"ami-1", "ami-2"}, filter)
-
--// Reads tells what resource type will be read from the request payload. Optional.
--// A parameter of type "body" is added ,required is set to true and the dataType is set to the qualified name of the sample's type.
--func (b *RouteBuilder) Reads(sample interface{}) *RouteBuilder {
-- b.readSample = sample
-- typeAsName := reflect.TypeOf(sample).String()
-- bodyParameter := &Parameter{&ParameterData{Name: typeAsName}}
-- bodyParameter.beBody()
-- bodyParameter.Required(true)
-- bodyParameter.DataType(typeAsName)
-- b.Param(bodyParameter)
-- return b
--}
+- req := testServer.WaitRequest()
+- c.Assert(req.Form["Action"], DeepEquals, []string{"DescribeImages"})
+- c.Assert(req.Form["ImageId.1"], DeepEquals, []string{"ami-1"})
+- c.Assert(req.Form["ImageId.2"], DeepEquals, []string{"ami-2"})
+- c.Assert(req.Form["Filter.1.Name"], DeepEquals, []string{"key1"})
+- c.Assert(req.Form["Filter.1.Value.1"], DeepEquals, []string{"value1"})
+- c.Assert(req.Form["Filter.1.Value.2"], IsNil)
+- c.Assert(req.Form["Filter.2.Name"], DeepEquals, []string{"key2"})
+- c.Assert(req.Form["Filter.2.Value.1"], DeepEquals, []string{"value2"})
+- c.Assert(req.Form["Filter.2.Value.2"], DeepEquals, []string{"value3"})
-
--// ParameterNamed returns a Parameter already known to the RouteBuilder. Returns nil if not.
--// Use this to modify or extend information for the Parameter (through its Data()).
--func (b RouteBuilder) ParameterNamed(name string) (p *Parameter) {
-- for _, each := range b.parameters {
-- if each.Data().Name == name {
-- return each
-- }
-- }
-- return p
--}
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "4a4a27a2-2e7c-475d-b35b-ca822EXAMPLE")
+- c.Assert(resp.Images, HasLen, 1)
-
--// Writes tells what resource type will be written as the response payload. Optional.
--func (b *RouteBuilder) Writes(sample interface{}) *RouteBuilder {
-- b.writeSample = sample
-- return b
--}
+- i0 := resp.Images[0]
+- c.Assert(i0.Id, Equals, "ami-a2469acf")
+- c.Assert(i0.Type, Equals, "machine")
+- c.Assert(i0.Name, Equals, "example-marketplace-amzn-ami.1")
+- c.Assert(i0.Description, Equals, "Amazon Linux AMI i386 EBS")
+- c.Assert(i0.Location, Equals, "aws-marketplace/example-marketplace-amzn-ami.1")
+- c.Assert(i0.State, Equals, "available")
+- c.Assert(i0.Public, Equals, true)
+- c.Assert(i0.OwnerId, Equals, "123456789999")
+- c.Assert(i0.OwnerAlias, Equals, "aws-marketplace")
+- c.Assert(i0.Architecture, Equals, "i386")
+- c.Assert(i0.KernelId, Equals, "aki-805ea7e9")
+- c.Assert(i0.RootDeviceType, Equals, "ebs")
+- c.Assert(i0.RootDeviceName, Equals, "/dev/sda1")
+- c.Assert(i0.VirtualizationType, Equals, "paravirtual")
+- c.Assert(i0.Hypervisor, Equals, "xen")
-
--// Param allows you to document the parameters of the Route. It adds a new Parameter (does not check for duplicates).
--func (b *RouteBuilder) Param(parameter *Parameter) *RouteBuilder {
-- if b.parameters == nil {
-- b.parameters = []*Parameter{}
-- }
-- b.parameters = append(b.parameters, parameter)
-- return b
--}
+- c.Assert(i0.BlockDevices, HasLen, 1)
+- c.Assert(i0.BlockDevices[0].DeviceName, Equals, "/dev/sda1")
+- c.Assert(i0.BlockDevices[0].SnapshotId, Equals, "snap-787e9403")
+- c.Assert(i0.BlockDevices[0].VolumeSize, Equals, int64(8))
+- c.Assert(i0.BlockDevices[0].DeleteOnTermination, Equals, true)
-
--// Operation allows you to document what the acutal method/function call is of the Route.
--func (b *RouteBuilder) Operation(name string) *RouteBuilder {
-- b.operation = name
-- return b
--}
+- testServer.Response(200, nil, DescribeImagesExample)
+- resp2, err := s.ec2.ImagesByOwners([]string{"ami-1", "ami-2"}, []string{"123456789999", "id2"}, filter)
-
--// ReturnsError is deprecated, use Returns instead.
--func (b *RouteBuilder) ReturnsError(code int, message string, model interface{}) *RouteBuilder {
-- log.Println("ReturnsError is deprecated, use Returns instead.")
-- return b.Returns(code, message, model)
--}
+- req2 := testServer.WaitRequest()
+- c.Assert(req2.Form["Action"], DeepEquals, []string{"DescribeImages"})
+- c.Assert(req2.Form["ImageId.1"], DeepEquals, []string{"ami-1"})
+- c.Assert(req2.Form["ImageId.2"], DeepEquals, []string{"ami-2"})
+- c.Assert(req2.Form["Owner.1"], DeepEquals, []string{"123456789999"})
+- c.Assert(req2.Form["Owner.2"], DeepEquals, []string{"id2"})
+- c.Assert(req2.Form["Filter.1.Name"], DeepEquals, []string{"key1"})
+- c.Assert(req2.Form["Filter.1.Value.1"], DeepEquals, []string{"value1"})
+- c.Assert(req2.Form["Filter.1.Value.2"], IsNil)
+- c.Assert(req2.Form["Filter.2.Name"], DeepEquals, []string{"key2"})
+- c.Assert(req2.Form["Filter.2.Value.1"], DeepEquals, []string{"value2"})
+- c.Assert(req2.Form["Filter.2.Value.2"], DeepEquals, []string{"value3"})
-
--// Returns allows you to document what responses (errors or regular) can be expected.
--// The model parameter is optional ; either pass a struct instance or use nil if not applicable.
--func (b *RouteBuilder) Returns(code int, message string, model interface{}) *RouteBuilder {
-- err := ResponseError{
-- Code: code,
-- Message: message,
-- Model: model,
-- }
-- // lazy init because there is no NewRouteBuilder (yet)
-- if b.errorMap == nil {
-- b.errorMap = map[int]ResponseError{}
-- }
-- b.errorMap[code] = err
-- return b
--}
+- c.Assert(err, IsNil)
+- c.Assert(resp2.RequestId, Equals, "4a4a27a2-2e7c-475d-b35b-ca822EXAMPLE")
+- c.Assert(resp2.Images, HasLen, 1)
-
--type ResponseError struct {
-- Code int
-- Message string
-- Model interface{}
--}
+- i1 := resp2.Images[0]
+- c.Assert(i1.Id, Equals, "ami-a2469acf")
+- c.Assert(i1.Type, Equals, "machine")
+- c.Assert(i1.Name, Equals, "example-marketplace-amzn-ami.1")
+- c.Assert(i1.Description, Equals, "Amazon Linux AMI i386 EBS")
+- c.Assert(i1.Location, Equals, "aws-marketplace/example-marketplace-amzn-ami.1")
+- c.Assert(i1.State, Equals, "available")
+- c.Assert(i1.Public, Equals, true)
+- c.Assert(i1.OwnerId, Equals, "123456789999")
+- c.Assert(i1.OwnerAlias, Equals, "aws-marketplace")
+- c.Assert(i1.Architecture, Equals, "i386")
+- c.Assert(i1.KernelId, Equals, "aki-805ea7e9")
+- c.Assert(i1.RootDeviceType, Equals, "ebs")
+- c.Assert(i1.RootDeviceName, Equals, "/dev/sda1")
+- c.Assert(i1.VirtualizationType, Equals, "paravirtual")
+- c.Assert(i1.Hypervisor, Equals, "xen")
-
--func (b *RouteBuilder) servicePath(path string) *RouteBuilder {
-- b.rootPath = path
-- return b
+- c.Assert(i1.BlockDevices, HasLen, 1)
+- c.Assert(i1.BlockDevices[0].DeviceName, Equals, "/dev/sda1")
+- c.Assert(i1.BlockDevices[0].SnapshotId, Equals, "snap-787e9403")
+- c.Assert(i1.BlockDevices[0].VolumeSize, Equals, int64(8))
+- c.Assert(i1.BlockDevices[0].DeleteOnTermination, Equals, true)
-}
-
--// Filter appends a FilterFunction to the end of filters for this Route to build.
--func (b *RouteBuilder) Filter(filter FilterFunction) *RouteBuilder {
-- b.filters = append(b.filters, filter)
-- return b
--}
+-func (s *S) TestImageAttributeExample(c *C) {
+- testServer.Response(200, nil, ImageAttributeExample)
-
--// If no specific Route path then set to rootPath
--// If no specific Produces then set to rootProduces
--// If no specific Consumes then set to rootConsumes
--func (b *RouteBuilder) copyDefaults(rootProduces, rootConsumes []string) {
-- if len(b.produces) == 0 {
-- b.produces = rootProduces
-- }
-- if len(b.consumes) == 0 {
-- b.consumes = rootConsumes
-- }
--}
+- resp, err := s.ec2.ImageAttribute("ami-61a54008", "launchPermission")
-
--// Build creates a new Route using the specification details collected by the RouteBuilder
--func (b *RouteBuilder) Build() Route {
-- pathExpr, err := newPathExpression(b.currentPath)
-- if err != nil {
-- log.Fatalf("[restful] Invalid path:%s because:%v", b.currentPath, err)
-- }
-- if b.function == nil {
-- log.Fatalf("[restful] No function specified for route:" + b.currentPath)
-- }
-- route := Route{
-- Method: b.httpMethod,
-- Path: concatPath(b.rootPath, b.currentPath),
-- Produces: b.produces,
-- Consumes: b.consumes,
-- Function: b.function,
-- Filters: b.filters,
-- relativePath: b.currentPath,
-- pathExpr: pathExpr,
-- Doc: b.doc,
-- Operation: b.operation,
-- ParameterDocs: b.parameters,
-- ResponseErrors: b.errorMap,
-- ReadSample: b.readSample,
-- WriteSample: b.writeSample}
-- route.postBuild()
-- return route
--}
+- req := testServer.WaitRequest()
+- c.Assert(req.Form["Action"], DeepEquals, []string{"DescribeImageAttribute"})
-
--func concatPath(path1, path2 string) string {
-- return strings.TrimRight(path1, "/") + "/" + strings.TrimLeft(path2, "/")
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
+- c.Assert(resp.ImageId, Equals, "ami-61a54008")
+- c.Assert(resp.Group, Equals, "all")
+- c.Assert(resp.UserIds[0], Equals, "495219933132")
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/route_builder_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/route_builder_test.go
-deleted file mode 100644
-index 42ec689..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/route_builder_test.go
-+++ /dev/null
-@@ -1,55 +0,0 @@
--package restful
-
--import (
-- "testing"
--)
+-func (s *S) TestCreateSnapshotExample(c *C) {
+- testServer.Response(200, nil, CreateSnapshotExample)
-
--func TestRouteBuilder_PathParameter(t *testing.T) {
-- p := &Parameter{&ParameterData{Name: "name", Description: "desc"}}
-- p.AllowMultiple(true)
-- p.DataType("int")
-- p.Required(true)
-- values := map[string]string{"a": "b"}
-- p.AllowableValues(values)
-- p.bePath()
+- resp, err := s.ec2.CreateSnapshot("vol-4d826724", "Daily Backup")
-
-- b := new(RouteBuilder)
-- b.function = dummy
-- b.Param(p)
-- r := b.Build()
-- if !r.ParameterDocs[0].Data().AllowMultiple {
-- t.Error("AllowMultiple invalid")
-- }
-- if r.ParameterDocs[0].Data().DataType != "int" {
-- t.Error("dataType invalid")
-- }
-- if !r.ParameterDocs[0].Data().Required {
-- t.Error("required invalid")
-- }
-- if r.ParameterDocs[0].Data().Kind != PathParameterKind {
-- t.Error("kind invalid")
-- }
-- if r.ParameterDocs[0].Data().AllowableValues["a"] != "b" {
-- t.Error("allowableValues invalid")
-- }
-- if b.ParameterNamed("name") == nil {
-- t.Error("access to parameter failed")
-- }
--}
+- req := testServer.WaitRequest()
+- c.Assert(req.Form["Action"], DeepEquals, []string{"CreateSnapshot"})
+- c.Assert(req.Form["VolumeId"], DeepEquals, []string{"vol-4d826724"})
+- c.Assert(req.Form["Description"], DeepEquals, []string{"Daily Backup"})
-
--func TestRouteBuilder(t *testing.T) {
-- json := "application/json"
-- b := new(RouteBuilder)
-- b.To(dummy)
-- b.Path("/routes").Method("HEAD").Consumes(json).Produces(json)
-- r := b.Build()
-- if r.Path != "/routes" {
-- t.Error("path invalid")
-- }
-- if r.Produces[0] != json {
-- t.Error("produces invalid")
-- }
-- if r.Consumes[0] != json {
-- t.Error("consumes invalid")
-- }
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
+- c.Assert(resp.Snapshot.Id, Equals, "snap-78a54011")
+- c.Assert(resp.Snapshot.VolumeId, Equals, "vol-4d826724")
+- c.Assert(resp.Snapshot.Status, Equals, "pending")
+- c.Assert(resp.Snapshot.StartTime, Equals, "2008-05-07T12:51:50.000Z")
+- c.Assert(resp.Snapshot.Progress, Equals, "60%")
+- c.Assert(resp.Snapshot.OwnerId, Equals, "111122223333")
+- c.Assert(resp.Snapshot.VolumeSize, Equals, "10")
+- c.Assert(resp.Snapshot.Description, Equals, "Daily Backup")
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/route_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/route_test.go
-deleted file mode 100644
-index a416576..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/route_test.go
-+++ /dev/null
-@@ -1,108 +0,0 @@
--package restful
-
--import (
-- "testing"
--)
+-func (s *S) TestDeleteSnapshotsExample(c *C) {
+- testServer.Response(200, nil, DeleteSnapshotExample)
-
--// accept should match produces
--func TestMatchesAcceptStar(t *testing.T) {
-- r := Route{Produces: []string{"application/xml"}}
-- if !r.matchesAccept("*/*") {
-- t.Errorf("accept should match star")
-- }
--}
+- resp, err := s.ec2.DeleteSnapshots([]string{"snap-78a54011"})
-
--// accept should match produces
--func TestMatchesAcceptIE(t *testing.T) {
-- r := Route{Produces: []string{"application/xml"}}
-- if !r.matchesAccept("text/html, application/xhtml+xml, */*") {
-- t.Errorf("accept should match star")
-- }
--}
+- req := testServer.WaitRequest()
+- c.Assert(req.Form["Action"], DeepEquals, []string{"DeleteSnapshot"})
+- c.Assert(req.Form["SnapshotId.1"], DeepEquals, []string{"snap-78a54011"})
-
--// accept should match produces
--func TestMatchesAcceptXml(t *testing.T) {
-- r := Route{Produces: []string{"application/xml"}}
-- if r.matchesAccept("application/json") {
-- t.Errorf("accept should not match json")
-- }
-- if !r.matchesAccept("application/xml") {
-- t.Errorf("accept should match xml")
-- }
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
-}
-
--// content type should match consumes
--func TestMatchesContentTypeXml(t *testing.T) {
-- r := Route{Consumes: []string{"application/xml"}}
-- if r.matchesContentType("application/json") {
-- t.Errorf("accept should not match json")
-- }
-- if !r.matchesContentType("application/xml") {
-- t.Errorf("accept should match xml")
-- }
+-func (s *S) TestDescribeSnapshotsExample(c *C) {
+- testServer.Response(200, nil, DescribeSnapshotsExample)
+-
+- filter := ec2.NewFilter()
+- filter.Add("key1", "value1")
+- filter.Add("key2", "value2", "value3")
+-
+- resp, err := s.ec2.Snapshots([]string{"snap-1", "snap-2"}, filter)
+-
+- req := testServer.WaitRequest()
+- c.Assert(req.Form["Action"], DeepEquals, []string{"DescribeSnapshots"})
+- c.Assert(req.Form["SnapshotId.1"], DeepEquals, []string{"snap-1"})
+- c.Assert(req.Form["SnapshotId.2"], DeepEquals, []string{"snap-2"})
+- c.Assert(req.Form["Filter.1.Name"], DeepEquals, []string{"key1"})
+- c.Assert(req.Form["Filter.1.Value.1"], DeepEquals, []string{"value1"})
+- c.Assert(req.Form["Filter.1.Value.2"], IsNil)
+- c.Assert(req.Form["Filter.2.Name"], DeepEquals, []string{"key2"})
+- c.Assert(req.Form["Filter.2.Value.1"], DeepEquals, []string{"value2"})
+- c.Assert(req.Form["Filter.2.Value.2"], DeepEquals, []string{"value3"})
+-
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
+- c.Assert(resp.Snapshots, HasLen, 1)
+-
+- s0 := resp.Snapshots[0]
+- c.Assert(s0.Id, Equals, "snap-1a2b3c4d")
+- c.Assert(s0.VolumeId, Equals, "vol-8875daef")
+- c.Assert(s0.VolumeSize, Equals, "15")
+- c.Assert(s0.Status, Equals, "pending")
+- c.Assert(s0.StartTime, Equals, "2010-07-29T04:12:01.000Z")
+- c.Assert(s0.Progress, Equals, "30%")
+- c.Assert(s0.OwnerId, Equals, "111122223333")
+- c.Assert(s0.Description, Equals, "Daily Backup")
+-
+- c.Assert(s0.Tags, HasLen, 1)
+- c.Assert(s0.Tags[0].Key, Equals, "Purpose")
+- c.Assert(s0.Tags[0].Value, Equals, "demo_db_14_backup")
-}
-
--// content type should match consumes
--func TestMatchesContentTypeCharsetInformation(t *testing.T) {
-- r := Route{Consumes: []string{"application/json"}}
-- if !r.matchesContentType("application/json; charset=UTF-8") {
-- t.Errorf("matchesContentType should ignore charset information")
-- }
--}
+-func (s *S) TestModifyImageAttributeExample(c *C) {
+- testServer.Response(200, nil, ModifyImageAttributeExample)
-
--func TestMatchesPath_OneParam(t *testing.T) {
-- params := doExtractParams("/from/{source}", 2, "/from/here", t)
-- if params["source"] != "here" {
-- t.Errorf("parameter mismatch here")
+- options := ec2.ModifyImageAttribute{
+- Description: "Test Description",
- }
--}
-
--func TestMatchesPath_Slash(t *testing.T) {
-- params := doExtractParams("/", 0, "/", t)
-- if len(params) != 0 {
-- t.Errorf("expected empty parameters")
-- }
+- resp, err := s.ec2.ModifyImageAttribute("ami-4fa54026", &options)
+-
+- req := testServer.WaitRequest()
+- c.Assert(req.Form["Action"], DeepEquals, []string{"ModifyImageAttribute"})
+-
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
-}
-
--func TestMatchesPath_SlashNonVar(t *testing.T) {
-- params := doExtractParams("/any", 1, "/any", t)
-- if len(params) != 0 {
-- t.Errorf("expected empty parameters")
+-func (s *S) TestModifyImageAttributeExample_complex(c *C) {
+- testServer.Response(200, nil, ModifyImageAttributeExample)
+-
+- options := ec2.ModifyImageAttribute{
+- AddUsers: []string{"u1", "u2"},
+- RemoveUsers: []string{"u3"},
+- AddGroups: []string{"g1", "g3"},
+- RemoveGroups: []string{"g2"},
+- Description: "Test Description",
- }
+-
+- resp, err := s.ec2.ModifyImageAttribute("ami-4fa54026", &options)
+-
+- req := testServer.WaitRequest()
+- c.Assert(req.Form["Action"], DeepEquals, []string{"ModifyImageAttribute"})
+- c.Assert(req.Form["LaunchPermission.Add.1.UserId"], DeepEquals, []string{"u1"})
+- c.Assert(req.Form["LaunchPermission.Add.2.UserId"], DeepEquals, []string{"u2"})
+- c.Assert(req.Form["LaunchPermission.Remove.1.UserId"], DeepEquals, []string{"u3"})
+- c.Assert(req.Form["LaunchPermission.Add.1.Group"], DeepEquals, []string{"g1"})
+- c.Assert(req.Form["LaunchPermission.Add.2.Group"], DeepEquals, []string{"g3"})
+- c.Assert(req.Form["LaunchPermission.Remove.1.Group"], DeepEquals, []string{"g2"})
+-
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
-}
-
--func TestMatchesPath_TwoVars(t *testing.T) {
-- params := doExtractParams("/from/{source}/to/{destination}", 4, "/from/AMS/to/NY", t)
-- if params["source"] != "AMS" {
-- t.Errorf("parameter mismatch AMS")
+-func (s *S) TestCopyImageExample(c *C) {
+- testServer.Response(200, nil, CopyImageExample)
+-
+- options := ec2.CopyImage{
+- SourceRegion: "us-west-2",
+- SourceImageId: "ami-1a2b3c4d",
+- Description: "Test Description",
- }
+-
+- resp, err := s.ec2.CopyImage(&options)
+-
+- req := testServer.WaitRequest()
+- c.Assert(req.Form["Action"], DeepEquals, []string{"CopyImage"})
+-
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "60bc441d-fa2c-494d-b155-5d6a3EXAMPLE")
-}
-
--func TestMatchesPath_VarOnFront(t *testing.T) {
-- params := doExtractParams("{what}/from/{source}/", 3, "who/from/SOS/", t)
-- if params["source"] != "SOS" {
-- t.Errorf("parameter mismatch SOS")
-- }
+-func (s *S) TestCreateKeyPairExample(c *C) {
+- testServer.Response(200, nil, CreateKeyPairExample)
+-
+- resp, err := s.ec2.CreateKeyPair("foo")
+-
+- req := testServer.WaitRequest()
+- c.Assert(req.Form["Action"], DeepEquals, []string{"CreateKeyPair"})
+- c.Assert(req.Form["KeyName"], DeepEquals, []string{"foo"})
+-
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
+- c.Assert(resp.KeyName, Equals, "foo")
+- c.Assert(resp.KeyFingerprint, Equals, "00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00")
-}
-
--func TestExtractParameters_EmptyValue(t *testing.T) {
-- params := doExtractParams("/fixed/{var}", 2, "/fixed/", t)
-- if params["var"] != "" {
-- t.Errorf("parameter mismatch var")
-- }
+-func (s *S) TestDeleteKeyPairExample(c *C) {
+- testServer.Response(200, nil, DeleteKeyPairExample)
+-
+- resp, err := s.ec2.DeleteKeyPair("foo")
+-
+- req := testServer.WaitRequest()
+- c.Assert(req.Form["Action"], DeepEquals, []string{"DeleteKeyPair"})
+- c.Assert(req.Form["KeyName"], DeepEquals, []string{"foo"})
+-
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
-}
-
--func TestTokenizePath(t *testing.T) {
-- if len(tokenizePath("/")) != 0 {
-- t.Errorf("not empty path tokens")
-- }
+-func (s *S) TestCreateSecurityGroupExample(c *C) {
+- testServer.Response(200, nil, CreateSecurityGroupExample)
+-
+- resp, err := s.ec2.CreateSecurityGroup(ec2.SecurityGroup{Name: "websrv", Description: "Web Servers"})
+-
+- req := testServer.WaitRequest()
+- c.Assert(req.Form["Action"], DeepEquals, []string{"CreateSecurityGroup"})
+- c.Assert(req.Form["GroupName"], DeepEquals, []string{"websrv"})
+- c.Assert(req.Form["GroupDescription"], DeepEquals, []string{"Web Servers"})
+-
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
+- c.Assert(resp.Name, Equals, "websrv")
+- c.Assert(resp.Id, Equals, "sg-67ad940e")
-}
-
--func doExtractParams(routePath string, size int, urlPath string, t *testing.T) map[string]string {
-- r := Route{Path: routePath}
-- r.postBuild()
-- if len(r.pathParts) != size {
-- t.Fatalf("len not %v %v, but %v", size, r.pathParts, len(r.pathParts))
-- }
-- return r.extractParameters(urlPath)
+-func (s *S) TestDescribeSecurityGroupsExample(c *C) {
+- testServer.Response(200, nil, DescribeSecurityGroupsExample)
+-
+- resp, err := s.ec2.SecurityGroups([]ec2.SecurityGroup{{Name: "WebServers"}, {Name: "RangedPortsBySource"}}, nil)
+-
+- req := testServer.WaitRequest()
+- c.Assert(req.Form["Action"], DeepEquals, []string{"DescribeSecurityGroups"})
+- c.Assert(req.Form["GroupName.1"], DeepEquals, []string{"WebServers"})
+- c.Assert(req.Form["GroupName.2"], DeepEquals, []string{"RangedPortsBySource"})
+-
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
+- c.Assert(resp.Groups, HasLen, 2)
+-
+- g0 := resp.Groups[0]
+- c.Assert(g0.OwnerId, Equals, "999988887777")
+- c.Assert(g0.Name, Equals, "WebServers")
+- c.Assert(g0.Id, Equals, "sg-67ad940e")
+- c.Assert(g0.Description, Equals, "Web Servers")
+- c.Assert(g0.IPPerms, HasLen, 1)
+-
+- g0ipp := g0.IPPerms[0]
+- c.Assert(g0ipp.Protocol, Equals, "tcp")
+- c.Assert(g0ipp.FromPort, Equals, 80)
+- c.Assert(g0ipp.ToPort, Equals, 80)
+- c.Assert(g0ipp.SourceIPs, DeepEquals, []string{"0.0.0.0/0"})
+-
+- g1 := resp.Groups[1]
+- c.Assert(g1.OwnerId, Equals, "999988887777")
+- c.Assert(g1.Name, Equals, "RangedPortsBySource")
+- c.Assert(g1.Id, Equals, "sg-76abc467")
+- c.Assert(g1.Description, Equals, "Group A")
+- c.Assert(g1.IPPerms, HasLen, 1)
+-
+- g1ipp := g1.IPPerms[0]
+- c.Assert(g1ipp.Protocol, Equals, "tcp")
+- c.Assert(g1ipp.FromPort, Equals, 6000)
+- c.Assert(g1ipp.ToPort, Equals, 7000)
+- c.Assert(g1ipp.SourceIPs, IsNil)
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/router.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/router.go
-deleted file mode 100644
-index 9b32fb6..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/router.go
-+++ /dev/null
-@@ -1,18 +0,0 @@
--package restful
-
--// Copyright 2013 Ernest Micklei. All rights reserved.
--// Use of this source code is governed by a license
--// that can be found in the LICENSE file.
+-func (s *S) TestDescribeSecurityGroupsExampleWithFilter(c *C) {
+- testServer.Response(200, nil, DescribeSecurityGroupsExample)
-
--import "net/http"
+- filter := ec2.NewFilter()
+- filter.Add("ip-permission.protocol", "tcp")
+- filter.Add("ip-permission.from-port", "22")
+- filter.Add("ip-permission.to-port", "22")
+- filter.Add("ip-permission.group-name", "app_server_group", "database_group")
-
--// A RouteSelector finds the best matching Route given the input HTTP Request
--type RouteSelector interface {
+- _, err := s.ec2.SecurityGroups(nil, filter)
-
-- // SelectRoute finds a Route given the input HTTP Request and a list of WebServices.
-- // It returns a selected Route and its containing WebService or an error indicating
-- // a problem.
-- SelectRoute(
-- webServices []*WebService,
-- httpRequest *http.Request) (selectedService *WebService, selected *Route, err error)
+- req := testServer.WaitRequest()
+- c.Assert(req.Form["Action"], DeepEquals, []string{"DescribeSecurityGroups"})
+- c.Assert(req.Form["Filter.1.Name"], DeepEquals, []string{"ip-permission.from-port"})
+- c.Assert(req.Form["Filter.1.Value.1"], DeepEquals, []string{"22"})
+- c.Assert(req.Form["Filter.2.Name"], DeepEquals, []string{"ip-permission.group-name"})
+- c.Assert(req.Form["Filter.2.Value.1"], DeepEquals, []string{"app_server_group"})
+- c.Assert(req.Form["Filter.2.Value.2"], DeepEquals, []string{"database_group"})
+- c.Assert(req.Form["Filter.3.Name"], DeepEquals, []string{"ip-permission.protocol"})
+- c.Assert(req.Form["Filter.3.Value.1"], DeepEquals, []string{"tcp"})
+- c.Assert(req.Form["Filter.4.Name"], DeepEquals, []string{"ip-permission.to-port"})
+- c.Assert(req.Form["Filter.4.Value.1"], DeepEquals, []string{"22"})
+-
+- c.Assert(err, IsNil)
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/service_error.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/service_error.go
-deleted file mode 100644
-index 62d1108..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/service_error.go
-+++ /dev/null
-@@ -1,23 +0,0 @@
--package restful
-
--// Copyright 2013 Ernest Micklei. All rights reserved.
--// Use of this source code is governed by a license
--// that can be found in the LICENSE file.
+-func (s *S) TestDescribeSecurityGroupsDumpWithGroup(c *C) {
+- testServer.Response(200, nil, DescribeSecurityGroupsDump)
-
--import "fmt"
+- resp, err := s.ec2.SecurityGroups(nil, nil)
-
--// ServiceError is a transport object to pass information about a non-Http error occurred in a WebService while processing a request.
--type ServiceError struct {
-- Code int
-- Message string
+- req := testServer.WaitRequest()
+- c.Assert(req.Form["Action"], DeepEquals, []string{"DescribeSecurityGroups"})
+- c.Assert(err, IsNil)
+- c.Check(resp.Groups, HasLen, 1)
+- c.Check(resp.Groups[0].IPPerms, HasLen, 2)
+-
+- ipp0 := resp.Groups[0].IPPerms[0]
+- c.Assert(ipp0.SourceIPs, IsNil)
+- c.Check(ipp0.Protocol, Equals, "icmp")
+- c.Assert(ipp0.SourceGroups, HasLen, 1)
+- c.Check(ipp0.SourceGroups[0].OwnerId, Equals, "12345")
+- c.Check(ipp0.SourceGroups[0].Name, Equals, "default")
+- c.Check(ipp0.SourceGroups[0].Id, Equals, "sg-67ad940e")
+-
+- ipp1 := resp.Groups[0].IPPerms[1]
+- c.Check(ipp1.Protocol, Equals, "tcp")
+- c.Assert(ipp0.SourceIPs, IsNil)
+- c.Assert(ipp0.SourceGroups, HasLen, 1)
+- c.Check(ipp1.SourceGroups[0].Id, Equals, "sg-76abc467")
+- c.Check(ipp1.SourceGroups[0].OwnerId, Equals, "12345")
+- c.Check(ipp1.SourceGroups[0].Name, Equals, "other")
-}
-
--// NewError returns a ServiceError using the code and reason
--func NewError(code int, message string) ServiceError {
-- return ServiceError{Code: code, Message: message}
+-func (s *S) TestDeleteSecurityGroupExample(c *C) {
+- testServer.Response(200, nil, DeleteSecurityGroupExample)
+-
+- resp, err := s.ec2.DeleteSecurityGroup(ec2.SecurityGroup{Name: "websrv"})
+- req := testServer.WaitRequest()
+-
+- c.Assert(req.Form["Action"], DeepEquals, []string{"DeleteSecurityGroup"})
+- c.Assert(req.Form["GroupName"], DeepEquals, []string{"websrv"})
+- c.Assert(req.Form["GroupId"], IsNil)
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
-}
-
--// Error returns a text representation of the service error
--func (s ServiceError) Error() string {
-- return fmt.Sprintf("[ServiceError:%v] %v", s.Code, s.Message)
+-func (s *S) TestDeleteSecurityGroupExampleWithId(c *C) {
+- testServer.Response(200, nil, DeleteSecurityGroupExample)
+-
+- // ignore return and error - we're only want to check the parameter handling.
+- s.ec2.DeleteSecurityGroup(ec2.SecurityGroup{Id: "sg-67ad940e", Name: "ignored"})
+- req := testServer.WaitRequest()
+-
+- c.Assert(req.Form["GroupName"], IsNil)
+- c.Assert(req.Form["GroupId"], DeepEquals, []string{"sg-67ad940e"})
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/CHANGES.md b/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/CHANGES.md
-deleted file mode 100644
-index cae91f3..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/CHANGES.md
-+++ /dev/null
-@@ -1,19 +0,0 @@
--Change history of swagger
--=
--2014-05-29
--- (api add) Ability to define custom http.Handler to serve swagger-ui static files
-
--2014-05-04
--- (fix) include model for array element type of response
+-func (s *S) TestAuthorizeSecurityGroupExample1(c *C) {
+- testServer.Response(200, nil, AuthorizeSecurityGroupIngressExample)
-
--2014-01-03
--- (fix) do not add primitive type to the Api models
+- perms := []ec2.IPPerm{{
+- Protocol: "tcp",
+- FromPort: 80,
+- ToPort: 80,
+- SourceIPs: []string{"205.192.0.0/16", "205.159.0.0/16"},
+- }}
+- resp, err := s.ec2.AuthorizeSecurityGroup(ec2.SecurityGroup{Name: "websrv"}, perms)
-
--2013-11-27
--- (fix) make Swagger work for WebServices with root ("/" or "") paths
+- req := testServer.WaitRequest()
-
--2013-10-29
--- (api add) package variable LogInfo to customize logging function
+- c.Assert(req.Form["Action"], DeepEquals, []string{"AuthorizeSecurityGroupIngress"})
+- c.Assert(req.Form["GroupName"], DeepEquals, []string{"websrv"})
+- c.Assert(req.Form["IpPermissions.1.IpProtocol"], DeepEquals, []string{"tcp"})
+- c.Assert(req.Form["IpPermissions.1.FromPort"], DeepEquals, []string{"80"})
+- c.Assert(req.Form["IpPermissions.1.ToPort"], DeepEquals, []string{"80"})
+- c.Assert(req.Form["IpPermissions.1.IpRanges.1.CidrIp"], DeepEquals, []string{"205.192.0.0/16"})
+- c.Assert(req.Form["IpPermissions.1.IpRanges.2.CidrIp"], DeepEquals, []string{"205.159.0.0/16"})
-
--2013-10-15
--- upgraded to spec version 1.2 (https://github.com/wordnik/swagger-core/wiki/1.2-transition)
-\ No newline at end of file
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/README.md b/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/README.md
-deleted file mode 100644
-index d4f4fc4..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/README.md
-+++ /dev/null
-@@ -1,28 +0,0 @@
--How to use Swagger UI with go-restful
--=
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
+-}
-
--Get the Swagger UI sources (version 1.2 only)
+-func (s *S) TestAuthorizeSecurityGroupEgress(c *C) {
+- testServer.Response(200, nil, AuthorizeSecurityGroupEgressExample)
-
-- git clone https://github.com/wordnik/swagger-ui.git
--
--The project contains a "dist" folder.
--Its contents has all the Swagger UI files you need.
+- perms := []ec2.IPPerm{{
+- Protocol: "tcp",
+- FromPort: 80,
+- ToPort: 80,
+- SourceIPs: []string{"205.192.0.0/16", "205.159.0.0/16"},
+- }}
+- resp, err := s.ec2.AuthorizeSecurityGroupEgress(ec2.SecurityGroup{Name: "websrv"}, perms)
-
--The `index.html` has an `url` set to `http://petstore.swagger.wordnik.com/api/api-docs`.
--You need to change that to match your WebService JSON endpoint e.g. `http://localhost:8080/apidocs.json`
+- req := testServer.WaitRequest()
-
--Now, you can install the Swagger WebService for serving the Swagger specification in JSON.
+- c.Assert(req.Form["Action"], DeepEquals, []string{"AuthorizeSecurityGroupEgress"})
+- c.Assert(req.Form["GroupName"], DeepEquals, []string{"websrv"})
+- c.Assert(req.Form["IpPermissions.1.IpProtocol"], DeepEquals, []string{"tcp"})
+- c.Assert(req.Form["IpPermissions.1.FromPort"], DeepEquals, []string{"80"})
+- c.Assert(req.Form["IpPermissions.1.ToPort"], DeepEquals, []string{"80"})
+- c.Assert(req.Form["IpPermissions.1.IpRanges.1.CidrIp"], DeepEquals, []string{"205.192.0.0/16"})
+- c.Assert(req.Form["IpPermissions.1.IpRanges.2.CidrIp"], DeepEquals, []string{"205.159.0.0/16"})
-
-- config := swagger.Config{
-- WebServices: restful.RegisteredWebServices(),
-- WebServicesUrl: "http://localhost:8080",
-- ApiPath: "/apidocs.json",
-- SwaggerPath: "/apidocs/",
-- SwaggerFilePath: "/Users/emicklei/Projects/swagger-ui/dist"}
-- swagger.InstallSwaggerService(config)
--
--
--Notes
----
--- Use RouteBuilder.Operation(..) to set the Nickname field of the API spec
--- The WebServices field of swagger.Config can be used to control which service you want to expose and document ; you can have multiple configs and therefore multiple endpoints.
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/config.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/config.go
-deleted file mode 100644
-index 4fca0fa..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/config.go
-+++ /dev/null
-@@ -1,25 +0,0 @@
--package swagger
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
+-}
-
--import (
-- "net/http"
+-func (s *S) TestAuthorizeSecurityGroupExample1WithId(c *C) {
+- testServer.Response(200, nil, AuthorizeSecurityGroupIngressExample)
-
-- "github.com/emicklei/go-restful"
--)
+- perms := []ec2.IPPerm{{
+- Protocol: "tcp",
+- FromPort: 80,
+- ToPort: 80,
+- SourceIPs: []string{"205.192.0.0/16", "205.159.0.0/16"},
+- }}
+- // ignore return and error - we're only want to check the parameter handling.
+- s.ec2.AuthorizeSecurityGroup(ec2.SecurityGroup{Id: "sg-67ad940e", Name: "ignored"}, perms)
-
--type Config struct {
-- // url where the services are available, e.g. http://localhost:8080
-- // if left empty then the basePath of Swagger is taken from the actual request
-- WebServicesUrl string
-- // path where the JSON api is avaiable , e.g. /apidocs
-- ApiPath string
-- // [optional] path where the swagger UI will be served, e.g. /swagger
-- SwaggerPath string
-- // [optional] location of folder containing Swagger HTML5 application index.html
-- SwaggerFilePath string
-- // api listing is constructed from this list of restful WebServices.
-- WebServices []*restful.WebService
-- // will serve all static content (scripts,pages,images)
-- StaticHandler http.Handler
-- // [optional] on default CORS (Cross-Origin-Resource-Sharing) is enabled.
-- DisableCORS bool
+- req := testServer.WaitRequest()
+-
+- c.Assert(req.Form["GroupName"], IsNil)
+- c.Assert(req.Form["GroupId"], DeepEquals, []string{"sg-67ad940e"})
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/model_builder.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/model_builder.go
-deleted file mode 100644
-index 71a69e4..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/model_builder.go
-+++ /dev/null
-@@ -1,265 +0,0 @@
--package swagger
-
--import (
-- "encoding/json"
-- "reflect"
-- "strings"
--)
+-func (s *S) TestAuthorizeSecurityGroupExample2(c *C) {
+- testServer.Response(200, nil, AuthorizeSecurityGroupIngressExample)
-
--type modelBuilder struct {
-- Models map[string]Model
+- perms := []ec2.IPPerm{{
+- Protocol: "tcp",
+- FromPort: 80,
+- ToPort: 81,
+- SourceGroups: []ec2.UserSecurityGroup{
+- {OwnerId: "999988887777", Name: "OtherAccountGroup"},
+- {Id: "sg-67ad940e"},
+- },
+- }}
+- resp, err := s.ec2.AuthorizeSecurityGroup(ec2.SecurityGroup{Name: "websrv"}, perms)
+-
+- req := testServer.WaitRequest()
+-
+- c.Assert(req.Form["Action"], DeepEquals, []string{"AuthorizeSecurityGroupIngress"})
+- c.Assert(req.Form["GroupName"], DeepEquals, []string{"websrv"})
+- c.Assert(req.Form["IpPermissions.1.IpProtocol"], DeepEquals, []string{"tcp"})
+- c.Assert(req.Form["IpPermissions.1.FromPort"], DeepEquals, []string{"80"})
+- c.Assert(req.Form["IpPermissions.1.ToPort"], DeepEquals, []string{"81"})
+- c.Assert(req.Form["IpPermissions.1.Groups.1.UserId"], DeepEquals, []string{"999988887777"})
+- c.Assert(req.Form["IpPermissions.1.Groups.1.GroupName"], DeepEquals, []string{"OtherAccountGroup"})
+- c.Assert(req.Form["IpPermissions.1.Groups.2.UserId"], IsNil)
+- c.Assert(req.Form["IpPermissions.1.Groups.2.GroupName"], IsNil)
+- c.Assert(req.Form["IpPermissions.1.Groups.2.GroupId"], DeepEquals, []string{"sg-67ad940e"})
+-
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
-}
-
--func (b modelBuilder) addModel(st reflect.Type, nameOverride string) {
-- modelName := b.keyFrom(st)
-- if nameOverride != "" {
-- modelName = nameOverride
-- }
-- // no models needed for primitive types
-- if b.isPrimitiveType(modelName) {
-- return
-- }
-- // see if we already have visited this model
-- if _, ok := b.Models[modelName]; ok {
-- return
-- }
-- sm := Model{
-- Id: modelName,
-- Required: []string{},
-- Properties: map[string]ModelProperty{}}
+-func (s *S) TestRevokeSecurityGroupExample(c *C) {
+- // RevokeSecurityGroup is implemented by the same code as AuthorizeSecurityGroup
+- // so there's no need to duplicate all the tests.
+- testServer.Response(200, nil, RevokeSecurityGroupIngressExample)
-
-- // reference the model before further initializing (enables recursive structs)
-- b.Models[modelName] = sm
+- resp, err := s.ec2.RevokeSecurityGroup(ec2.SecurityGroup{Name: "websrv"}, nil)
-
-- // check for slice or array
-- if st.Kind() == reflect.Slice || st.Kind() == reflect.Array {
-- b.addModel(st.Elem(), "")
-- return
-- }
-- // check for structure or primitive type
-- if st.Kind() != reflect.Struct {
-- return
-- }
-- for i := 0; i < st.NumField(); i++ {
-- field := st.Field(i)
-- jsonName, prop := b.buildProperty(field, &sm, modelName)
-- // add if not ommitted
-- if len(jsonName) != 0 {
-- // update Required
-- if b.isPropertyRequired(field) {
-- sm.Required = append(sm.Required, jsonName)
-- }
-- sm.Properties[jsonName] = prop
-- }
-- }
+- req := testServer.WaitRequest()
-
-- // update model builder with completed model
-- b.Models[modelName] = sm
+- c.Assert(req.Form["Action"], DeepEquals, []string{"RevokeSecurityGroupIngress"})
+- c.Assert(req.Form["GroupName"], DeepEquals, []string{"websrv"})
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
-}
-
--func (b modelBuilder) isPropertyRequired(field reflect.StructField) bool {
-- required := true
-- if jsonTag := field.Tag.Get("json"); jsonTag != "" {
-- s := strings.Split(jsonTag, ",")
-- if len(s) > 1 && s[1] == "omitempty" {
-- return false
-- }
-- }
-- return required
+-func (s *S) TestCreateTags(c *C) {
+- testServer.Response(200, nil, CreateTagsExample)
+-
+- resp, err := s.ec2.CreateTags([]string{"ami-1a2b3c4d", "i-7f4d3a2b"}, []ec2.Tag{{"webserver", ""}, {"stack", "Production"}})
+-
+- req := testServer.WaitRequest()
+- c.Assert(req.Form["ResourceId.1"], DeepEquals, []string{"ami-1a2b3c4d"})
+- c.Assert(req.Form["ResourceId.2"], DeepEquals, []string{"i-7f4d3a2b"})
+- c.Assert(req.Form["Tag.1.Key"], DeepEquals, []string{"webserver"})
+- c.Assert(req.Form["Tag.1.Value"], DeepEquals, []string{""})
+- c.Assert(req.Form["Tag.2.Key"], DeepEquals, []string{"stack"})
+- c.Assert(req.Form["Tag.2.Value"], DeepEquals, []string{"Production"})
+-
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
-}
-
--func (b modelBuilder) buildProperty(field reflect.StructField, model *Model, modelName string) (jsonName string, prop ModelProperty) {
-- jsonName = b.jsonNameOfField(field)
-- if len(jsonName) == 0 {
-- // empty name signals skip property
-- return "", prop
-- }
-- fieldType := field.Type
-- fieldKind := fieldType.Kind()
+-func (s *S) TestStartInstances(c *C) {
+- testServer.Response(200, nil, StartInstancesExample)
-
-- if jsonTag := field.Tag.Get("json"); jsonTag != "" {
-- s := strings.Split(jsonTag, ",")
-- if len(s) > 1 && s[1] == "string" {
-- prop.Description = "(" + fieldType.String() + " as string)"
-- fieldType = reflect.TypeOf("")
-- }
-- }
+- resp, err := s.ec2.StartInstances("i-10a64379")
+- req := testServer.WaitRequest()
-
-- var pType = b.jsonSchemaType(fieldType.String()) // may include pkg path
-- prop.Type = &pType
-- if b.isPrimitiveType(fieldType.String()) {
-- prop.Format = b.jsonSchemaFormat(fieldType.String())
-- return jsonName, prop
-- }
+- c.Assert(req.Form["Action"], DeepEquals, []string{"StartInstances"})
+- c.Assert(req.Form["InstanceId.1"], DeepEquals, []string{"i-10a64379"})
-
-- marshalerType := reflect.TypeOf((*json.Marshaler)(nil)).Elem()
-- if fieldType.Implements(marshalerType) {
-- var pType = "string"
-- prop.Type = &pType
-- return jsonName, prop
-- }
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
-
-- if fieldKind == reflect.Struct {
-- return b.buildStructTypeProperty(field, jsonName, model)
-- }
+- s0 := resp.StateChanges[0]
+- c.Assert(s0.InstanceId, Equals, "i-10a64379")
+- c.Assert(s0.CurrentState.Code, Equals, 0)
+- c.Assert(s0.CurrentState.Name, Equals, "pending")
+- c.Assert(s0.PreviousState.Code, Equals, 80)
+- c.Assert(s0.PreviousState.Name, Equals, "stopped")
+-}
-
-- if fieldKind == reflect.Slice || fieldKind == reflect.Array {
-- return b.buildArrayTypeProperty(field, jsonName, modelName)
-- }
+-func (s *S) TestStopInstances(c *C) {
+- testServer.Response(200, nil, StopInstancesExample)
-
-- if fieldKind == reflect.Ptr {
-- return b.buildPointerTypeProperty(field, jsonName, modelName)
-- }
+- resp, err := s.ec2.StopInstances("i-10a64379")
+- req := testServer.WaitRequest()
-
-- if fieldType.Name() == "" { // override type of anonymous structs
-- nestedTypeName := modelName + "." + jsonName
-- var pType = nestedTypeName
-- prop.Type = &pType
-- b.addModel(fieldType, nestedTypeName)
-- }
-- return jsonName, prop
--}
+- c.Assert(req.Form["Action"], DeepEquals, []string{"StopInstances"})
+- c.Assert(req.Form["InstanceId.1"], DeepEquals, []string{"i-10a64379"})
-
--func (b modelBuilder) buildStructTypeProperty(field reflect.StructField, jsonName string, model *Model) (nameJson string, prop ModelProperty) {
-- fieldType := field.Type
-- // check for anonymous
-- if len(fieldType.Name()) == 0 {
-- // anonymous
-- anonType := model.Id + "." + jsonName
-- b.addModel(fieldType, anonType)
-- prop.Type = &anonType
-- return jsonName, prop
-- }
-- if field.Name == fieldType.Name() && field.Anonymous {
-- // embedded struct
-- sub := modelBuilder{map[string]Model{}}
-- sub.addModel(fieldType, "")
-- subKey := sub.keyFrom(fieldType)
-- // merge properties from sub
-- subModel := sub.Models[subKey]
-- for k, v := range subModel.Properties {
-- model.Properties[k] = v
-- model.Required = append(model.Required, k)
-- }
-- // empty name signals skip property
-- return "", prop
-- }
-- // simple struct
-- b.addModel(fieldType, "")
-- var pType = fieldType.String()
-- prop.Type = &pType
-- return jsonName, prop
--}
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
-
--func (b modelBuilder) buildArrayTypeProperty(field reflect.StructField, jsonName, modelName string) (nameJson string, prop ModelProperty) {
-- fieldType := field.Type
-- var pType = "array"
-- prop.Type = &pType
-- elemName := b.getElementTypeName(modelName, jsonName, fieldType.Elem())
-- prop.Items = []Item{Item{Ref: &elemName}}
-- // add|overwrite model for element type
-- b.addModel(fieldType.Elem(), elemName)
-- return jsonName, prop
+- s0 := resp.StateChanges[0]
+- c.Assert(s0.InstanceId, Equals, "i-10a64379")
+- c.Assert(s0.CurrentState.Code, Equals, 64)
+- c.Assert(s0.CurrentState.Name, Equals, "stopping")
+- c.Assert(s0.PreviousState.Code, Equals, 16)
+- c.Assert(s0.PreviousState.Name, Equals, "running")
-}
-
--func (b modelBuilder) buildPointerTypeProperty(field reflect.StructField, jsonName, modelName string) (nameJson string, prop ModelProperty) {
-- fieldType := field.Type
+-func (s *S) TestRebootInstances(c *C) {
+- testServer.Response(200, nil, RebootInstancesExample)
-
-- // override type of pointer to list-likes
-- if fieldType.Elem().Kind() == reflect.Slice || fieldType.Elem().Kind() == reflect.Array {
-- var pType = "array"
-- prop.Type = &pType
-- elemName := b.getElementTypeName(modelName, jsonName, fieldType.Elem().Elem())
-- prop.Items = []Item{Item{Ref: &elemName}}
-- // add|overwrite model for element type
-- b.addModel(fieldType.Elem().Elem(), elemName)
-- } else {
-- // non-array, pointer type
-- var pType = fieldType.String()[1:] // no star, include pkg path
-- prop.Type = &pType
-- elemName := ""
-- if fieldType.Elem().Name() == "" {
-- elemName = modelName + "." + jsonName
-- prop.Type = &elemName
-- }
-- b.addModel(fieldType.Elem(), elemName)
-- }
-- return jsonName, prop
--}
+- resp, err := s.ec2.RebootInstances("i-10a64379")
+- req := testServer.WaitRequest()
-
--func (b modelBuilder) getElementTypeName(modelName, jsonName string, t reflect.Type) string {
-- if t.Name() == "" {
-- return modelName + "." + jsonName
-- }
-- if b.isPrimitiveType(t.Name()) {
-- return b.jsonSchemaType(t.Name())
-- }
-- return b.keyFrom(t)
--}
+- c.Assert(req.Form["Action"], DeepEquals, []string{"RebootInstances"})
+- c.Assert(req.Form["InstanceId.1"], DeepEquals, []string{"i-10a64379"})
-
--func (b modelBuilder) keyFrom(st reflect.Type) string {
-- key := st.String()
-- if len(st.Name()) == 0 { // unnamed type
-- // Swagger UI has special meaning for [
-- key = strings.Replace(key, "[]", "||", -1)
-- }
-- return key
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
-}
-
--func (b modelBuilder) isPrimitiveType(modelName string) bool {
-- return strings.Contains("uint8 int int32 int64 float32 float64 bool string byte time.Time", modelName)
--}
+-func (s *S) TestSignatureWithEndpointPath(c *C) {
+- ec2.FakeTime(true)
+- defer ec2.FakeTime(false)
-
--// jsonNameOfField returns the name of the field as it should appear in JSON format
--// An empty string indicates that this field is not part of the JSON representation
--func (b modelBuilder) jsonNameOfField(field reflect.StructField) string {
-- if jsonTag := field.Tag.Get("json"); jsonTag != "" {
-- s := strings.Split(jsonTag, ",")
-- if s[0] == "-" {
-- // empty name signals skip property
-- return ""
-- } else if s[0] != "" {
-- return s[0]
-- }
-- }
-- return field.Name
--}
+- testServer.Response(200, nil, RebootInstancesExample)
-
--func (b modelBuilder) jsonSchemaType(modelName string) string {
-- schemaMap := map[string]string{
-- "uint8": "integer",
-- "int": "integer",
-- "int32": "integer",
-- "int64": "integer",
-- "byte": "string",
-- "float64": "number",
-- "float32": "number",
-- "bool": "boolean",
-- "time.Time": "string",
-- }
-- mapped, ok := schemaMap[modelName]
-- if ok {
-- return mapped
-- } else {
-- return modelName // use as is (custom or struct)
-- }
+- // https://bugs.launchpad.net/goamz/+bug/1022749
+- ec2 := ec2.NewWithClient(s.ec2.Auth, aws.Region{EC2Endpoint: testServer.URL + "/services/Cloud"}, testutil.DefaultClient)
+-
+- _, err := ec2.RebootInstances("i-10a64379")
+- c.Assert(err, IsNil)
+-
+- req := testServer.WaitRequest()
+- c.Assert(req.Form["Signature"], DeepEquals, []string{"QmvgkYGn19WirCuCz/jRp3RmRgFwWR5WRkKZ5AZnyXQ="})
-}
-
--func (b modelBuilder) jsonSchemaFormat(modelName string) string {
-- schemaMap := map[string]string{
-- "int": "int32",
-- "int32": "int32",
-- "int64": "int64",
-- "byte": "byte",
-- "uint8": "byte",
-- "float64": "double",
-- "float32": "float",
-- "time.Time": "date-time",
-- }
-- mapped, ok := schemaMap[modelName]
-- if ok {
-- return mapped
-- } else {
-- return "" // no format
+-func (s *S) TestAllocateAddressExample(c *C) {
+- testServer.Response(200, nil, AllocateAddressExample)
+-
+- options := &ec2.AllocateAddress{
+- Domain: "vpc",
- }
--}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/model_builder_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/model_builder_test.go
-deleted file mode 100644
-index 8dc8073..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/model_builder_test.go
-+++ /dev/null
-@@ -1,716 +0,0 @@
--package swagger
-
--import (
-- "testing"
-- "time"
--)
+- resp, err := s.ec2.AllocateAddress(options)
-
--type YesNo bool
+- req := testServer.WaitRequest()
+- c.Assert(req.Form["Action"], DeepEquals, []string{"AllocateAddress"})
+- c.Assert(req.Form["Domain"], DeepEquals, []string{"vpc"})
-
--func (y YesNo) MarshalJSON() ([]byte, error) {
-- if y {
-- return []byte("yes"), nil
-- }
-- return []byte("no"), nil
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
+- c.Assert(resp.PublicIp, Equals, "198.51.100.1")
+- c.Assert(resp.Domain, Equals, "vpc")
+- c.Assert(resp.AllocationId, Equals, "eipalloc-5723d13e")
-}
-
--// clear && go test -v -test.run TestCustomMarshaller_Issue96 ...swagger
--func TestCustomMarshaller_Issue96(t *testing.T) {
-- type Vote struct {
-- What YesNo
-- }
-- testJsonFromStruct(t, Vote{}, `{
-- "swagger.Vote": {
-- "id": "swagger.Vote",
-- "required": [
-- "What"
-- ],
-- "properties": {
-- "What": {
-- "type": "string"
-- }
-- }
-- }
-- }`)
--}
+-func (s *S) TestReleaseAddressExample(c *C) {
+- testServer.Response(200, nil, ReleaseAddressExample)
-
--// clear && go test -v -test.run TestPrimitiveTypes ...swagger
--func TestPrimitiveTypes(t *testing.T) {
-- type Prims struct {
-- f float64
-- t time.Time
-- }
-- testJsonFromStruct(t, Prims{}, `{
-- "swagger.Prims": {
-- "id": "swagger.Prims",
-- "required": [
-- "f",
-- "t"
-- ],
-- "properties": {
-- "f": {
-- "type": "number",
-- "format": "double"
-- },
-- "t": {
-- "type": "string",
-- "format": "date-time"
-- }
-- }
-- }
-- }`)
--}
+- resp, err := s.ec2.ReleaseAddress("eipalloc-5723d13e")
-
--// clear && go test -v -test.run TestS1 ...swagger
--func TestS1(t *testing.T) {
-- type S1 struct {
-- Id string
-- }
-- testJsonFromStruct(t, S1{}, `{
-- "swagger.S1": {
-- "id": "swagger.S1",
-- "required": [
-- "Id"
-- ],
-- "properties": {
-- "Id": {
-- "type": "string"
-- }
-- }
-- }
-- }`)
--}
+- req := testServer.WaitRequest()
+- c.Assert(req.Form["Action"], DeepEquals, []string{"ReleaseAddress"})
+- c.Assert(req.Form["AllocationId"], DeepEquals, []string{"eipalloc-5723d13e"})
-
--// clear && go test -v -test.run TestS2 ...swagger
--func TestS2(t *testing.T) {
-- type S2 struct {
-- Ids []string
-- }
-- testJsonFromStruct(t, S2{}, `{
-- "swagger.S2": {
-- "id": "swagger.S2",
-- "required": [
-- "Ids"
-- ],
-- "properties": {
-- "Ids": {
-- "type": "array",
-- "items": [
-- {
-- "$ref": "string"
-- }
-- ]
-- }
-- }
-- }
-- }`)
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
-}
-
--// clear && go test -v -test.run TestS3 ...swagger
--func TestS3(t *testing.T) {
-- type NestedS3 struct {
-- Id string
-- }
-- type S3 struct {
-- Nested NestedS3
+-func (s *S) TestAssociateAddressExample(c *C) {
+- testServer.Response(200, nil, AssociateAddressExample)
+-
+- options := &ec2.AssociateAddress{
+- InstanceId: "i-4fd2431a",
+- AllocationId: "eipalloc-5723d13e",
+- AllowReassociation: true,
- }
-- testJsonFromStruct(t, S3{}, `{
-- "swagger.NestedS3": {
-- "id": "swagger.NestedS3",
-- "required": [
-- "Id"
-- ],
-- "properties": {
-- "Id": {
-- "type": "string"
-- }
-- }
-- },
-- "swagger.S3": {
-- "id": "swagger.S3",
-- "required": [
-- "Nested"
-- ],
-- "properties": {
-- "Nested": {
-- "type": "swagger.NestedS3"
-- }
-- }
-- }
-- }`)
--}
-
--type sample struct {
-- id string `swagger:"required"` // TODO
-- items []item
-- rootItem item `json:"root"`
--}
+- resp, err := s.ec2.AssociateAddress(options)
-
--type item struct {
-- itemName string `json:"name"`
+- req := testServer.WaitRequest()
+- c.Assert(req.Form["Action"], DeepEquals, []string{"AssociateAddress"})
+- c.Assert(req.Form["InstanceId"], DeepEquals, []string{"i-4fd2431a"})
+- c.Assert(req.Form["AllocationId"], DeepEquals, []string{"eipalloc-5723d13e"})
+- c.Assert(req.Form["AllowReassociation"], DeepEquals, []string{"true"})
+-
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
+- c.Assert(resp.AssociationId, Equals, "eipassoc-fc5ca095")
-}
-
--// clear && go test -v -test.run TestSampleToModelAsJson ...swagger
--func TestSampleToModelAsJson(t *testing.T) {
-- testJsonFromStruct(t, sample{items: []item{}}, `{
-- "swagger.item": {
-- "id": "swagger.item",
-- "required": [
-- "name"
-- ],
-- "properties": {
-- "name": {
-- "type": "string"
-- }
-- }
-- },
-- "swagger.sample": {
-- "id": "swagger.sample",
-- "required": [
-- "id",
-- "items",
-- "root"
-- ],
-- "properties": {
-- "id": {
-- "type": "string"
-- },
-- "items": {
-- "type": "array",
-- "items": [
-- {
-- "$ref": "swagger.item"
-- }
-- ]
-- },
-- "root": {
-- "type": "swagger.item"
-- }
-- }
-- }
-- }`)
+-func (s *S) TestDisassociateAddressExample(c *C) {
+- testServer.Response(200, nil, DisassociateAddressExample)
+-
+- resp, err := s.ec2.DisassociateAddress("eipassoc-aa7486c3")
+-
+- req := testServer.WaitRequest()
+- c.Assert(req.Form["Action"], DeepEquals, []string{"DisassociateAddress"})
+- c.Assert(req.Form["AssociationId"], DeepEquals, []string{"eipassoc-aa7486c3"})
+-
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
-}
-
--func TestJsonTags(t *testing.T) {
-- type X struct {
-- A string
-- B string `json:"-"`
-- C int `json:",string"`
-- D int `json:","`
+-func (s *S) TestModifyInstance(c *C) {
+- testServer.Response(200, nil, ModifyInstanceExample)
+-
+- options := ec2.ModifyInstance{
+- InstanceType: "m1.small",
+- DisableAPITermination: true,
+- EbsOptimized: true,
+- SecurityGroups: []ec2.SecurityGroup{{Id: "g1"}, {Id: "g2"}},
+- ShutdownBehavior: "terminate",
+- KernelId: "kernel-id",
+- RamdiskId: "ramdisk-id",
+- SourceDestCheck: true,
+- SriovNetSupport: true,
+- UserData: []byte("1234"),
+- BlockDevices: []ec2.BlockDeviceMapping{
+- {DeviceName: "/dev/sda1", SnapshotId: "snap-a08912c9", DeleteOnTermination: true},
+- },
- }
-
-- expected := `{
-- "swagger.X": {
-- "id": "swagger.X",
-- "required": [
-- "A",
-- "C",
-- "D"
-- ],
-- "properties": {
-- "A": {
-- "type": "string"
-- },
-- "C": {
-- "type": "string",
-- "description": "(int as string)"
-- },
-- "D": {
-- "type": "integer",
-- "format": "int32"
-- }
-- }
-- }
-- }`
+- resp, err := s.ec2.ModifyInstance("i-2ba64342", &options)
+- req := testServer.WaitRequest()
+-
+- c.Assert(req.Form["Action"], DeepEquals, []string{"ModifyInstanceAttribute"})
+- c.Assert(req.Form["InstanceId"], DeepEquals, []string{"i-2ba64342"})
+- c.Assert(req.Form["InstanceType.Value"], DeepEquals, []string{"m1.small"})
+- c.Assert(req.Form["BlockDeviceMapping.1.DeviceName"], DeepEquals, []string{"/dev/sda1"})
+- c.Assert(req.Form["BlockDeviceMapping.1.Ebs.SnapshotId"], DeepEquals, []string{"snap-a08912c9"})
+- c.Assert(req.Form["BlockDeviceMapping.1.Ebs.DeleteOnTermination"], DeepEquals, []string{"true"})
+- c.Assert(req.Form["DisableApiTermination.Value"], DeepEquals, []string{"true"})
+- c.Assert(req.Form["EbsOptimized"], DeepEquals, []string{"true"})
+- c.Assert(req.Form["GroupId.1"], DeepEquals, []string{"g1"})
+- c.Assert(req.Form["GroupId.2"], DeepEquals, []string{"g2"})
+- c.Assert(req.Form["InstanceInitiatedShutdownBehavior.Value"], DeepEquals, []string{"terminate"})
+- c.Assert(req.Form["Kernel.Value"], DeepEquals, []string{"kernel-id"})
+- c.Assert(req.Form["Ramdisk.Value"], DeepEquals, []string{"ramdisk-id"})
+- c.Assert(req.Form["SourceDestCheck.Value"], DeepEquals, []string{"true"})
+- c.Assert(req.Form["SriovNetSupport.Value"], DeepEquals, []string{"simple"})
+- c.Assert(req.Form["UserData"], DeepEquals, []string{"MTIzNA=="})
-
-- testJsonFromStruct(t, X{}, expected)
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
-}
-
--func TestJsonTagOmitempty(t *testing.T) {
-- type X struct {
-- A int `json:",omitempty"`
-- B int `json:"C,omitempty"`
+-func (s *S) TestCreateVpc(c *C) {
+- testServer.Response(200, nil, CreateVpcExample)
+-
+- options := &ec2.CreateVpc{
+- CidrBlock: "foo",
- }
-
-- expected := `{
-- "swagger.X": {
-- "id": "swagger.X",
-- "properties": {
-- "A": {
-- "type": "integer",
-- "format": "int32"
-- },
-- "C": {
-- "type": "integer",
-- "format": "int32"
-- }
-- }
-- }
-- }`
+- resp, err := s.ec2.CreateVpc(options)
-
-- testJsonFromStruct(t, X{}, expected)
+- req := testServer.WaitRequest()
+- c.Assert(req.Form["CidrBlock"], DeepEquals, []string{"foo"})
+-
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "7a62c49f-347e-4fc4-9331-6e8eEXAMPLE")
+- c.Assert(resp.VPC.VpcId, Equals, "vpc-1a2b3c4d")
+- c.Assert(resp.VPC.State, Equals, "pending")
+- c.Assert(resp.VPC.CidrBlock, Equals, "10.0.0.0/16")
+- c.Assert(resp.VPC.DHCPOptionsID, Equals, "dopt-1a2b3c4d2")
+- c.Assert(resp.VPC.InstanceTenancy, Equals, "default")
-}
-
--func TestJsonTagName(t *testing.T) {
-- type X struct {
-- A string `json:"B"`
-- }
+-func (s *S) TestDescribeVpcs(c *C) {
+- testServer.Response(200, nil, DescribeVpcsExample)
-
-- expected := `{
-- "swagger.X": {
-- "id": "swagger.X",
-- "required": [
-- "B"
-- ],
-- "properties": {
-- "B": {
-- "type": "string"
-- }
-- }
-- }
-- }`
+- filter := ec2.NewFilter()
+- filter.Add("key1", "value1")
+- filter.Add("key2", "value2", "value3")
-
-- testJsonFromStruct(t, X{}, expected)
+- resp, err := s.ec2.DescribeVpcs([]string{"id1", "id2"}, filter)
+-
+- req := testServer.WaitRequest()
+- c.Assert(req.Form["Action"], DeepEquals, []string{"DescribeVpcs"})
+- c.Assert(req.Form["VpcId.1"], DeepEquals, []string{"id1"})
+- c.Assert(req.Form["VpcId.2"], DeepEquals, []string{"id2"})
+- c.Assert(req.Form["Filter.1.Name"], DeepEquals, []string{"key1"})
+- c.Assert(req.Form["Filter.1.Value.1"], DeepEquals, []string{"value1"})
+- c.Assert(req.Form["Filter.1.Value.2"], IsNil)
+- c.Assert(req.Form["Filter.2.Name"], DeepEquals, []string{"key2"})
+- c.Assert(req.Form["Filter.2.Value.1"], DeepEquals, []string{"value2"})
+- c.Assert(req.Form["Filter.2.Value.2"], DeepEquals, []string{"value3"})
+-
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "7a62c49f-347e-4fc4-9331-6e8eEXAMPLE")
+- c.Assert(resp.VPCs, HasLen, 1)
-}
-
--func TestAnonymousStruct(t *testing.T) {
-- type X struct {
-- A struct {
-- B int
-- }
+-func (s *S) TestCreateSubnet(c *C) {
+- testServer.Response(200, nil, CreateSubnetExample)
+-
+- options := &ec2.CreateSubnet{
+- AvailabilityZone: "baz",
+- CidrBlock: "foo",
+- VpcId: "bar",
- }
-
-- expected := `{
-- "swagger.X": {
-- "id": "swagger.X",
-- "required": [
-- "A"
-- ],
-- "properties": {
-- "A": {
-- "type": "swagger.X.A"
-- }
-- }
-- },
-- "swagger.X.A": {
-- "id": "swagger.X.A",
-- "required": [
-- "B"
-- ],
-- "properties": {
-- "B": {
-- "type": "integer",
-- "format": "int32"
-- }
-- }
-- }
-- }`
+- resp, err := s.ec2.CreateSubnet(options)
-
-- testJsonFromStruct(t, X{}, expected)
+- req := testServer.WaitRequest()
+- c.Assert(req.Form["VpcId"], DeepEquals, []string{"bar"})
+- c.Assert(req.Form["CidrBlock"], DeepEquals, []string{"foo"})
+- c.Assert(req.Form["AvailabilityZone"], DeepEquals, []string{"baz"})
+-
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "7a62c49f-347e-4fc4-9331-6e8eEXAMPLE")
+- c.Assert(resp.Subnet.SubnetId, Equals, "subnet-9d4a7b6c")
+- c.Assert(resp.Subnet.State, Equals, "pending")
+- c.Assert(resp.Subnet.VpcId, Equals, "vpc-1a2b3c4d")
+- c.Assert(resp.Subnet.CidrBlock, Equals, "10.0.1.0/24")
+- c.Assert(resp.Subnet.AvailableIpAddressCount, Equals, 251)
-}
-
--func TestAnonymousPtrStruct(t *testing.T) {
-- type X struct {
-- A *struct {
-- B int
-- }
-- }
+-func (s *S) TestResetImageAttribute(c *C) {
+- testServer.Response(200, nil, ResetImageAttributeExample)
-
-- expected := `{
-- "swagger.X": {
-- "id": "swagger.X",
-- "required": [
-- "A"
-- ],
-- "properties": {
-- "A": {
-- "type": "swagger.X.A"
-- }
-- }
-- },
-- "swagger.X.A": {
-- "id": "swagger.X.A",
-- "required": [
-- "B"
-- ],
-- "properties": {
-- "B": {
-- "type": "integer",
-- "format": "int32"
-- }
-- }
-- }
-- }`
+- options := ec2.ResetImageAttribute{Attribute: "launchPermission"}
+- resp, err := s.ec2.ResetImageAttribute("i-2ba64342", &options)
-
-- testJsonFromStruct(t, X{}, expected)
--}
+- req := testServer.WaitRequest()
+- c.Assert(req.Form["Action"], DeepEquals, []string{"ResetImageAttribute"})
-
--func TestAnonymousArrayStruct(t *testing.T) {
-- type X struct {
-- A []struct {
-- B int
-- }
-- }
+- c.Assert(err, IsNil)
+- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
+-}
+diff --git a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/ec2i_test.go b/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/ec2i_test.go
+deleted file mode 100644
+index 3773041..0000000
+--- a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/ec2i_test.go
++++ /dev/null
+@@ -1,203 +0,0 @@
+-package ec2_test
-
-- expected := `{
-- "swagger.X": {
-- "id": "swagger.X",
-- "required": [
-- "A"
-- ],
-- "properties": {
-- "A": {
-- "type": "array",
-- "items": [
-- {
-- "$ref": "swagger.X.A"
-- }
-- ]
-- }
-- }
-- },
-- "swagger.X.A": {
-- "id": "swagger.X.A",
-- "required": [
-- "B"
-- ],
-- "properties": {
-- "B": {
-- "type": "integer",
-- "format": "int32"
-- }
-- }
-- }
-- }`
+-import (
+- "crypto/rand"
+- "fmt"
+- "github.com/mitchellh/goamz/aws"
+- "github.com/mitchellh/goamz/ec2"
+- "github.com/mitchellh/goamz/testutil"
+- . "github.com/motain/gocheck"
+-)
-
-- testJsonFromStruct(t, X{}, expected)
+-// AmazonServer represents an Amazon EC2 server.
+-type AmazonServer struct {
+- auth aws.Auth
-}
-
--func TestAnonymousPtrArrayStruct(t *testing.T) {
-- type X struct {
-- A *[]struct {
-- B int
-- }
+-func (s *AmazonServer) SetUp(c *C) {
+- auth, err := aws.EnvAuth()
+- if err != nil {
+- c.Fatal(err.Error())
- }
+- s.auth = auth
+-}
-
-- expected := `{
-- "swagger.X": {
-- "id": "swagger.X",
-- "required": [
-- "A"
-- ],
-- "properties": {
-- "A": {
-- "type": "array",
-- "items": [
-- {
-- "$ref": "swagger.X.A"
-- }
-- ]
-- }
-- }
-- },
-- "swagger.X.A": {
-- "id": "swagger.X.A",
-- "required": [
-- "B"
-- ],
-- "properties": {
-- "B": {
-- "type": "integer",
-- "format": "int32"
-- }
-- }
-- }
-- }`
+-// Suite cost per run: 0.02 USD
+-var _ = Suite(&AmazonClientSuite{})
-
-- testJsonFromStruct(t, X{}, expected)
+-// AmazonClientSuite tests the client against a live EC2 server.
+-type AmazonClientSuite struct {
+- srv AmazonServer
+- ClientTests
-}
-
--// go test -v -test.run TestEmbeddedStruct_Issue98 ...swagger
--func TestEmbeddedStruct_Issue98(t *testing.T) {
-- type Y struct {
-- A int
-- }
-- type X struct {
-- Y
+-func (s *AmazonClientSuite) SetUpSuite(c *C) {
+- if !testutil.Amazon {
+- c.Skip("AmazonClientSuite tests not enabled")
- }
-- testJsonFromStruct(t, X{}, `{
-- "swagger.X": {
-- "id": "swagger.X",
-- "required": [
-- "A"
-- ],
-- "properties": {
-- "A": {
-- "type": "integer",
-- "format": "int32"
-- }
-- }
-- }
-- }`)
+- s.srv.SetUp(c)
+- s.ec2 = ec2.NewWithClient(s.srv.auth, aws.USEast, testutil.DefaultClient)
-}
-
--type Dataset struct {
-- Names []string
+-// ClientTests defines integration tests designed to test the client.
+-// It is not used as a test suite in itself, but embedded within
+-// another type.
+-type ClientTests struct {
+- ec2 *ec2.EC2
-}
-
--// clear && go test -v -test.run TestIssue85 ...swagger
--func TestIssue85(t *testing.T) {
-- anon := struct{ Datasets []Dataset }{}
-- testJsonFromStruct(t, anon, `{
-- "struct { Datasets ||swagger.Dataset }": {
-- "id": "struct { Datasets ||swagger.Dataset }",
-- "required": [
-- "Datasets"
-- ],
-- "properties": {
-- "Datasets": {
-- "type": "array",
-- "items": [
-- {
-- "$ref": "swagger.Dataset"
-- }
-- ]
-- }
-- }
-- },
-- "swagger.Dataset": {
-- "id": "swagger.Dataset",
-- "required": [
-- "Names"
-- ],
-- "properties": {
-- "Names": {
-- "type": "array",
-- "items": [
-- {
-- "$ref": "string"
-- }
-- ]
-- }
-- }
-- }
-- }`)
--}
+-var imageId = "ami-ccf405a5" // Ubuntu Maverick, i386, EBS store
-
--type File struct {
-- History []File
-- HistoryPtrs []*File
--}
+-// Cost: 0.00 USD
+-func (s *ClientTests) TestRunInstancesError(c *C) {
+- options := ec2.RunInstances{
+- ImageId: "ami-a6f504cf", // Ubuntu Maverick, i386, instance store
+- InstanceType: "t1.micro", // Doesn't work with micro, results in 400.
+- }
-
--// go test -v -test.run TestRecursiveStructure ...swagger
--func TestRecursiveStructure(t *testing.T) {
-- testJsonFromStruct(t, File{}, `{
-- "swagger.File": {
-- "id": "swagger.File",
-- "required": [
-- "History",
-- "HistoryPtrs"
-- ],
-- "properties": {
-- "History": {
-- "type": "array",
-- "items": [
-- {
-- "$ref": "swagger.File"
-- }
-- ]
-- },
-- "HistoryPtrs": {
-- "type": "array",
-- "items": [
-- {
-- "$ref": "swagger.File.HistoryPtrs"
-- }
-- ]
-- }
-- }
-- },
-- "swagger.File.HistoryPtrs": {
-- "id": "swagger.File.HistoryPtrs",
-- "properties": {}
-- }
-- }`)
+- resp, err := s.ec2.RunInstances(&options)
+-
+- c.Assert(resp, IsNil)
+- c.Assert(err, ErrorMatches, "AMI.*root device.*not supported.*")
+-
+- ec2err, ok := err.(*ec2.Error)
+- c.Assert(ok, Equals, true)
+- c.Assert(ec2err.StatusCode, Equals, 400)
+- c.Assert(ec2err.Code, Equals, "UnsupportedOperation")
+- c.Assert(ec2err.Message, Matches, "AMI.*root device.*not supported.*")
+- c.Assert(ec2err.RequestId, Matches, ".+")
-}
-
--type A1 struct {
-- B struct {
-- Id int
+-// Cost: 0.02 USD
+-func (s *ClientTests) TestRunAndTerminate(c *C) {
+- options := ec2.RunInstances{
+- ImageId: imageId,
+- InstanceType: "t1.micro",
- }
--}
+- resp1, err := s.ec2.RunInstances(&options)
+- c.Assert(err, IsNil)
+- c.Check(resp1.ReservationId, Matches, "r-[0-9a-f]*")
+- c.Check(resp1.OwnerId, Matches, "[0-9]+")
+- c.Check(resp1.Instances, HasLen, 1)
+- c.Check(resp1.Instances[0].InstanceType, Equals, "t1.micro")
-
--// go test -v -test.run TestEmbeddedStructA1 ...swagger
--func TestEmbeddedStructA1(t *testing.T) {
-- testJsonFromStruct(t, A1{}, `{
-- "swagger.A1": {
-- "id": "swagger.A1",
-- "required": [
-- "B"
-- ],
-- "properties": {
-- "B": {
-- "type": "swagger.A1.B"
-- }
-- }
-- },
-- "swagger.A1.B": {
-- "id": "swagger.A1.B",
-- "required": [
-- "Id"
-- ],
-- "properties": {
-- "Id": {
-- "type": "integer",
-- "format": "int32"
-- }
-- }
-- }
-- }`)
--}
+- instId := resp1.Instances[0].InstanceId
-
--type A2 struct {
-- C
--}
--type C struct {
-- Id int `json:"B"`
--}
+- resp2, err := s.ec2.Instances([]string{instId}, nil)
+- c.Assert(err, IsNil)
+- if c.Check(resp2.Reservations, HasLen, 1) && c.Check(len(resp2.Reservations[0].Instances), Equals, 1) {
+- inst := resp2.Reservations[0].Instances[0]
+- c.Check(inst.InstanceId, Equals, instId)
+- }
-
--// go test -v -test.run TestEmbeddedStructA2 ...swagger
--func TestEmbeddedStructA2(t *testing.T) {
-- testJsonFromStruct(t, A2{}, `{
-- "swagger.A2": {
-- "id": "swagger.A2",
-- "required": [
-- "B"
-- ],
-- "properties": {
-- "B": {
-- "type": "integer",
-- "format": "int32"
-- }
-- }
-- }
-- }`)
+- resp3, err := s.ec2.TerminateInstances([]string{instId})
+- c.Assert(err, IsNil)
+- c.Check(resp3.StateChanges, HasLen, 1)
+- c.Check(resp3.StateChanges[0].InstanceId, Equals, instId)
+- c.Check(resp3.StateChanges[0].CurrentState.Name, Equals, "shutting-down")
+- c.Check(resp3.StateChanges[0].CurrentState.Code, Equals, 32)
-}
-
--type A3 struct {
-- B D
--}
+-// Cost: 0.00 USD
+-func (s *ClientTests) TestSecurityGroups(c *C) {
+- name := "goamz-test"
+- descr := "goamz security group for tests"
+-
+- // Clean it up, if a previous test left it around and avoid leaving it around.
+- s.ec2.DeleteSecurityGroup(ec2.SecurityGroup{Name: name})
+- defer s.ec2.DeleteSecurityGroup(ec2.SecurityGroup{Name: name})
+-
+- resp1, err := s.ec2.CreateSecurityGroup(ec2.SecurityGroup{Name: name, Description: descr})
+- c.Assert(err, IsNil)
+- c.Assert(resp1.RequestId, Matches, ".+")
+- c.Assert(resp1.Name, Equals, name)
+- c.Assert(resp1.Id, Matches, ".+")
+-
+- resp1, err = s.ec2.CreateSecurityGroup(ec2.SecurityGroup{Name: name, Description: descr})
+- ec2err, _ := err.(*ec2.Error)
+- c.Assert(resp1, IsNil)
+- c.Assert(ec2err, NotNil)
+- c.Assert(ec2err.Code, Equals, "InvalidGroup.Duplicate")
+-
+- perms := []ec2.IPPerm{{
+- Protocol: "tcp",
+- FromPort: 0,
+- ToPort: 1024,
+- SourceIPs: []string{"127.0.0.1/24"},
+- }}
+-
+- resp2, err := s.ec2.AuthorizeSecurityGroup(ec2.SecurityGroup{Name: name}, perms)
+- c.Assert(err, IsNil)
+- c.Assert(resp2.RequestId, Matches, ".+")
-
--type D struct {
-- Id int
--}
+- resp3, err := s.ec2.SecurityGroups(ec2.SecurityGroupNames(name), nil)
+- c.Assert(err, IsNil)
+- c.Assert(resp3.RequestId, Matches, ".+")
+- c.Assert(resp3.Groups, HasLen, 1)
-
--// clear && go test -v -test.run TestStructA3 ...swagger
--func TestStructA3(t *testing.T) {
-- testJsonFromStruct(t, A3{}, `{
-- "swagger.A3": {
-- "id": "swagger.A3",
-- "required": [
-- "B"
-- ],
-- "properties": {
-- "B": {
-- "type": "swagger.D"
-- }
-- }
-- },
-- "swagger.D": {
-- "id": "swagger.D",
-- "required": [
-- "Id"
-- ],
-- "properties": {
-- "Id": {
-- "type": "integer",
-- "format": "int32"
-- }
-- }
-- }
-- }`)
+- g0 := resp3.Groups[0]
+- c.Assert(g0.Name, Equals, name)
+- c.Assert(g0.Description, Equals, descr)
+- c.Assert(g0.IPPerms, HasLen, 1)
+- c.Assert(g0.IPPerms[0].Protocol, Equals, "tcp")
+- c.Assert(g0.IPPerms[0].FromPort, Equals, 0)
+- c.Assert(g0.IPPerms[0].ToPort, Equals, 1024)
+- c.Assert(g0.IPPerms[0].SourceIPs, DeepEquals, []string{"127.0.0.1/24"})
+-
+- resp2, err = s.ec2.DeleteSecurityGroup(ec2.SecurityGroup{Name: name})
+- c.Assert(err, IsNil)
+- c.Assert(resp2.RequestId, Matches, ".+")
-}
-
--type ObjectId []byte
+-var sessionId = func() string {
+- buf := make([]byte, 8)
+- // if we have no randomness, we'll just make do, so ignore the error.
+- rand.Read(buf)
+- return fmt.Sprintf("%x", buf)
+-}()
-
--type Region struct {
-- Id ObjectId `bson:"_id" json:"id"`
-- Name string `bson:"name" json:"name"`
-- Type string `bson:"type" json:"type"`
+-// sessionName reutrns a name that is probably
+-// unique to this test session.
+-func sessionName(prefix string) string {
+- return prefix + "-" + sessionId
-}
-
--// clear && go test -v -test.run TestRegion_Issue113 ...swagger
--func TestRegion_Issue113(t *testing.T) {
-- testJsonFromStruct(t, []Region{}, `{
-- "integer": {
-- "id": "integer",
-- "properties": {}
-- },
-- "swagger.Region": {
-- "id": "swagger.Region",
-- "required": [
-- "id",
-- "name",
-- "type"
-- ],
-- "properties": {
-- "id": {
-- "type": "array",
-- "items": [
-- {
-- "$ref": "integer"
-- }
-- ]
-- },
-- "name": {
-- "type": "string"
-- },
-- "type": {
-- "type": "string"
-- }
-- }
-- },
-- "||swagger.Region": {
-- "id": "||swagger.Region",
-- "properties": {}
-- }
-- }`)
+-var allRegions = []aws.Region{
+- aws.USEast,
+- aws.USWest,
+- aws.EUWest,
+- aws.APSoutheast,
+- aws.APNortheast,
-}
-
--// clear && go test -v -test.run TestIssue158 ...swagger
--func TestIssue158(t *testing.T) {
-- type Address struct {
-- Country string `json:"country,omitempty"`
+-// Communicate with all EC2 endpoints to see if they are alive.
+-func (s *ClientTests) TestRegions(c *C) {
+- name := sessionName("goamz-region-test")
+- perms := []ec2.IPPerm{{
+- Protocol: "tcp",
+- FromPort: 80,
+- ToPort: 80,
+- SourceIPs: []string{"127.0.0.1/32"},
+- }}
+- errs := make(chan error, len(allRegions))
+- for _, region := range allRegions {
+- go func(r aws.Region) {
+- e := ec2.NewWithClient(s.ec2.Auth, r, testutil.DefaultClient)
+- _, err := e.AuthorizeSecurityGroup(ec2.SecurityGroup{Name: name}, perms)
+- errs <- err
+- }(region)
- }
--
-- type Customer struct {
-- Name string `json:"name"`
-- Address Address `json:"address"`
+- for _ = range allRegions {
+- err := <-errs
+- if err != nil {
+- ec2_err, ok := err.(*ec2.Error)
+- if ok {
+- c.Check(ec2_err.Code, Matches, "InvalidGroup.NotFound")
+- } else {
+- c.Errorf("Non-EC2 error: %s", err)
+- }
+- } else {
+- c.Errorf("Test should have errored but it seems to have succeeded")
+- }
- }
-- expected := `{
-- "swagger.Address": {
-- "id": "swagger.Address",
-- "properties": {
-- "country": {
-- "type": "string"
-- }
-- }
-- },
-- "swagger.Customer": {
-- "id": "swagger.Customer",
-- "required": [
-- "name",
-- "address"
-- ],
-- "properties": {
-- "address": {
-- "type": "swagger.Address"
-- },
-- "name": {
-- "type": "string"
-- }
-- }
-- }
-- }`
-- testJsonFromStruct(t, Customer{}, expected)
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/swagger.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/swagger.go
+diff --git a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/ec2t_test.go b/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/ec2t_test.go
deleted file mode 100644
-index 9f2fe4b..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/swagger.go
+index fe50356..0000000
+--- a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/ec2t_test.go
+++ /dev/null
-@@ -1,184 +0,0 @@
--// Package swagger implements the structures of the Swagger
--// https://github.com/wordnik/swagger-spec/blob/master/versions/1.2.md
--package swagger
+@@ -1,580 +0,0 @@
+-package ec2_test
-
--const swaggerVersion = "1.2"
+-import (
+- "fmt"
+- "github.com/mitchellh/goamz/aws"
+- "github.com/mitchellh/goamz/ec2"
+- "github.com/mitchellh/goamz/ec2/ec2test"
+- "github.com/mitchellh/goamz/testutil"
+- . "github.com/motain/gocheck"
+- "regexp"
+- "sort"
+-)
-
--// 4.3.3 Data Type Fields
--type DataTypeFields struct {
-- Type *string `json:"type,omitempty"` // if Ref not used
-- Ref *string `json:"$ref,omitempty"` // if Type not used
-- Format string `json:"format,omitempty"`
-- DefaultValue Special `json:"defaultValue,omitempty"`
-- Enum []string `json:"enum,omitempty"`
-- Minimum string `json:"minimum,omitempty"`
-- Maximum string `json:"maximum,omitempty"`
-- Items []Item `json:"items,omitempty"`
-- UniqueItems *bool `json:"uniqueItems,omitempty"`
+-// LocalServer represents a local ec2test fake server.
+-type LocalServer struct {
+- auth aws.Auth
+- region aws.Region
+- srv *ec2test.Server
-}
-
--type Special string
+-func (s *LocalServer) SetUp(c *C) {
+- srv, err := ec2test.NewServer()
+- c.Assert(err, IsNil)
+- c.Assert(srv, NotNil)
-
--// 4.3.4 Items Object
--type Item struct {
-- Type *string `json:"type,omitempty"`
-- Ref *string `json:"$ref,omitempty"`
-- Format string `json:"format,omitempty"`
+- s.srv = srv
+- s.region = aws.Region{EC2Endpoint: srv.URL()}
-}
-
--// 5.1 Resource Listing
--type ResourceListing struct {
-- SwaggerVersion string `json:"swaggerVersion"` // e.g 1.2
-- Apis []Resource `json:"apis"`
-- ApiVersion string `json:"apiVersion"`
-- Info Info `json:"info"`
-- Authorizations []Authorization `json:"authorizations,omitempty"`
+-// LocalServerSuite defines tests that will run
+-// against the local ec2test server. It includes
+-// selected tests from ClientTests;
+-// when the ec2test functionality is sufficient, it should
+-// include all of them, and ClientTests can be simply embedded.
+-type LocalServerSuite struct {
+- srv LocalServer
+- ServerTests
+- clientTests ClientTests
-}
-
--// 5.1.2 Resource Object
--type Resource struct {
-- Path string `json:"path"` // relative or absolute, must start with /
-- Description string `json:"description"`
--}
+-var _ = Suite(&LocalServerSuite{})
-
--// 5.1.3 Info Object
--type Info struct {
-- Title string `json:"title"`
-- Description string `json:"description"`
-- TermsOfServiceUrl string `json:"termsOfServiceUrl,omitempty"`
-- Contact string `json:"contact,omitempty"`
-- License string `json:"license,omitempty"`
-- LicensUrl string `json:"licensUrl,omitempty"`
+-func (s *LocalServerSuite) SetUpSuite(c *C) {
+- s.srv.SetUp(c)
+- s.ServerTests.ec2 = ec2.NewWithClient(s.srv.auth, s.srv.region, testutil.DefaultClient)
+- s.clientTests.ec2 = ec2.NewWithClient(s.srv.auth, s.srv.region, testutil.DefaultClient)
-}
-
--// 5.1.5
--type Authorization struct {
-- Type string `json:"type"`
-- PassAs string `json:"passAs"`
-- Keyname string `json:"keyname"`
-- Scopes []Scope `json:"scopes"`
-- GrantTypes []GrantType `json:"grandTypes"`
+-func (s *LocalServerSuite) TestRunAndTerminate(c *C) {
+- s.clientTests.TestRunAndTerminate(c)
-}
-
--// 5.1.6, 5.2.11
--type Scope struct {
-- // Required. The name of the scope.
-- Scope string `json:"scope"`
-- // Recommended. A short description of the scope.
-- Description string `json:"description"`
+-func (s *LocalServerSuite) TestSecurityGroups(c *C) {
+- s.clientTests.TestSecurityGroups(c)
-}
-
--// 5.1.7
--type GrantType struct {
-- Implicit Implicit `json:"implicit"`
-- AuthorizationCode AuthorizationCode `json:"authorization_code"`
--}
+-// TestUserData is not defined on ServerTests because it
+-// requires the ec2test server to function.
+-func (s *LocalServerSuite) TestUserData(c *C) {
+- data := make([]byte, 256)
+- for i := range data {
+- data[i] = byte(i)
+- }
+- inst, err := s.ec2.RunInstances(&ec2.RunInstances{
+- ImageId: imageId,
+- InstanceType: "t1.micro",
+- UserData: data,
+- })
+- c.Assert(err, IsNil)
+- c.Assert(inst, NotNil)
+- c.Assert(inst.Instances[0].DNSName, Equals, inst.Instances[0].InstanceId+".example.com")
-
--// 5.1.8 Implicit Object
--type Implicit struct {
-- // Required. The login endpoint definition.
-- loginEndpoint LoginEndpoint `json:"loginEndpoint"`
-- // An optional alternative name to standard "access_token" OAuth2 parameter.
-- TokenName string `json:"tokenName"`
--}
+- id := inst.Instances[0].InstanceId
-
--// 5.1.9 Authorization Code Object
--type AuthorizationCode struct {
-- TokenRequestEndpoint TokenRequestEndpoint `json:"tokenRequestEndpoint"`
-- TokenEndpoint TokenEndpoint `json:"tokenEndpoint"`
+- defer s.ec2.TerminateInstances([]string{id})
+-
+- tinst := s.srv.srv.Instance(id)
+- c.Assert(tinst, NotNil)
+- c.Assert(tinst.UserData, DeepEquals, data)
-}
-
--// 5.1.10 Login Endpoint Object
--type LoginEndpoint struct {
-- // Required. The URL of the authorization endpoint for the implicit grant flow. The value SHOULD be in a URL format.
-- Url string `json:"url"`
+-// AmazonServerSuite runs the ec2test server tests against a live EC2 server.
+-// It will only be activated if the -all flag is specified.
+-type AmazonServerSuite struct {
+- srv AmazonServer
+- ServerTests
-}
-
--// 5.1.11 Token Request Endpoint Object
--type TokenRequestEndpoint struct {
-- // Required. The URL of the authorization endpoint for the authentication code grant flow. The value SHOULD be in a URL format.
-- Url string `json:"url"`
-- // An optional alternative name to standard "client_id" OAuth2 parameter.
-- ClientIdName string `json:"clientIdName"`
-- // An optional alternative name to the standard "client_secret" OAuth2 parameter.
-- ClientSecretName string `json:"clientSecretName"`
+-var _ = Suite(&AmazonServerSuite{})
+-
+-func (s *AmazonServerSuite) SetUpSuite(c *C) {
+- if !testutil.Amazon {
+- c.Skip("AmazonServerSuite tests not enabled")
+- }
+- s.srv.SetUp(c)
+- s.ServerTests.ec2 = ec2.NewWithClient(s.srv.auth, aws.USEast, testutil.DefaultClient)
-}
-
--// 5.1.12 Token Endpoint Object
--type TokenEndpoint struct {
-- // Required. The URL of the token endpoint for the authentication code grant flow. The value SHOULD be in a URL format.
-- Url string `json:"url"`
-- // An optional alternative name to standard "access_token" OAuth2 parameter.
-- TokenName string `json:"tokenName"`
+-// ServerTests defines a set of tests designed to test
+-// the ec2test local fake ec2 server.
+-// It is not used as a test suite in itself, but embedded within
+-// another type.
+-type ServerTests struct {
+- ec2 *ec2.EC2
-}
-
--// 5.2 API Declaration
--type ApiDeclaration struct {
-- SwaggerVersion string `json:"swaggerVersion"`
-- ApiVersion string `json:"apiVersion"`
-- BasePath string `json:"basePath"`
-- ResourcePath string `json:"resourcePath"` // must start with /
-- Apis []Api `json:"apis,omitempty"`
-- Models map[string]Model `json:"models,omitempty"`
-- Produces []string `json:"produces,omitempty"`
-- Consumes []string `json:"consumes,omitempty"`
-- Authorizations []Authorization `json:"authorizations,omitempty"`
+-func terminateInstances(c *C, e *ec2.EC2, insts []*ec2.Instance) {
+- var ids []string
+- for _, inst := range insts {
+- if inst != nil {
+- ids = append(ids, inst.InstanceId)
+- }
+- }
+- _, err := e.TerminateInstances(ids)
+- c.Check(err, IsNil, Commentf("%d INSTANCES LEFT RUNNING!!!", len(ids)))
-}
-
--// 5.2.2 API Object
--type Api struct {
-- Path string `json:"path"` // relative or absolute, must start with /
-- Description string `json:"description"`
-- Operations []Operation `json:"operations,omitempty"`
+-func (s *ServerTests) makeTestGroup(c *C, name, descr string) ec2.SecurityGroup {
+- // Clean it up if a previous test left it around.
+- _, err := s.ec2.DeleteSecurityGroup(ec2.SecurityGroup{Name: name})
+- if err != nil && err.(*ec2.Error).Code != "InvalidGroup.NotFound" {
+- c.Fatalf("delete security group: %v", err)
+- }
+-
+- resp, err := s.ec2.CreateSecurityGroup(ec2.SecurityGroup{Name: name, Description: descr})
+- c.Assert(err, IsNil)
+- c.Assert(resp.Name, Equals, name)
+- return resp.SecurityGroup
-}
-
--// 5.2.3 Operation Object
--type Operation struct {
-- Type string `json:"type"`
-- Method string `json:"method"`
-- Summary string `json:"summary,omitempty"`
-- Notes string `json:"notes,omitempty"`
-- Nickname string `json:"nickname"`
-- Authorizations []Authorization `json:"authorizations,omitempty"`
-- Parameters []Parameter `json:"parameters"`
-- ResponseMessages []ResponseMessage `json:"responseMessages,omitempty"` // optional
-- Produces []string `json:"produces,omitempty"`
-- Consumes []string `json:"consumes,omitempty"`
-- Deprecated string `json:"deprecated,omitempty"`
+-func (s *ServerTests) TestIPPerms(c *C) {
+- g0 := s.makeTestGroup(c, "goamz-test0", "ec2test group 0")
+- defer s.ec2.DeleteSecurityGroup(g0)
+-
+- g1 := s.makeTestGroup(c, "goamz-test1", "ec2test group 1")
+- defer s.ec2.DeleteSecurityGroup(g1)
+-
+- resp, err := s.ec2.SecurityGroups([]ec2.SecurityGroup{g0, g1}, nil)
+- c.Assert(err, IsNil)
+- c.Assert(resp.Groups, HasLen, 2)
+- c.Assert(resp.Groups[0].IPPerms, HasLen, 0)
+- c.Assert(resp.Groups[1].IPPerms, HasLen, 0)
+-
+- ownerId := resp.Groups[0].OwnerId
+-
+- // test some invalid parameters
+- // TODO more
+- _, err = s.ec2.AuthorizeSecurityGroup(g0, []ec2.IPPerm{{
+- Protocol: "tcp",
+- FromPort: 0,
+- ToPort: 1024,
+- SourceIPs: []string{"z127.0.0.1/24"},
+- }})
+- c.Assert(err, NotNil)
+- c.Check(err.(*ec2.Error).Code, Equals, "InvalidPermission.Malformed")
+-
+- // Check that AuthorizeSecurityGroup adds the correct authorizations.
+- _, err = s.ec2.AuthorizeSecurityGroup(g0, []ec2.IPPerm{{
+- Protocol: "tcp",
+- FromPort: 2000,
+- ToPort: 2001,
+- SourceIPs: []string{"127.0.0.0/24"},
+- SourceGroups: []ec2.UserSecurityGroup{{
+- Name: g1.Name,
+- }, {
+- Id: g0.Id,
+- }},
+- }, {
+- Protocol: "tcp",
+- FromPort: 2000,
+- ToPort: 2001,
+- SourceIPs: []string{"200.1.1.34/32"},
+- }})
+- c.Assert(err, IsNil)
+-
+- resp, err = s.ec2.SecurityGroups([]ec2.SecurityGroup{g0}, nil)
+- c.Assert(err, IsNil)
+- c.Assert(resp.Groups, HasLen, 1)
+- c.Assert(resp.Groups[0].IPPerms, HasLen, 1)
+-
+- perm := resp.Groups[0].IPPerms[0]
+- srcg := perm.SourceGroups
+- c.Assert(srcg, HasLen, 2)
+-
+- // Normalize so we don't care about returned order.
+- if srcg[0].Name == g1.Name {
+- srcg[0], srcg[1] = srcg[1], srcg[0]
+- }
+- c.Check(srcg[0].Name, Equals, g0.Name)
+- c.Check(srcg[0].Id, Equals, g0.Id)
+- c.Check(srcg[0].OwnerId, Equals, ownerId)
+- c.Check(srcg[1].Name, Equals, g1.Name)
+- c.Check(srcg[1].Id, Equals, g1.Id)
+- c.Check(srcg[1].OwnerId, Equals, ownerId)
+-
+- sort.Strings(perm.SourceIPs)
+- c.Check(perm.SourceIPs, DeepEquals, []string{"127.0.0.0/24", "200.1.1.34/32"})
+-
+- // Check that we can't delete g1 (because g0 is using it)
+- _, err = s.ec2.DeleteSecurityGroup(g1)
+- c.Assert(err, NotNil)
+- c.Check(err.(*ec2.Error).Code, Equals, "InvalidGroup.InUse")
+-
+- _, err = s.ec2.RevokeSecurityGroup(g0, []ec2.IPPerm{{
+- Protocol: "tcp",
+- FromPort: 2000,
+- ToPort: 2001,
+- SourceGroups: []ec2.UserSecurityGroup{{Id: g1.Id}},
+- }, {
+- Protocol: "tcp",
+- FromPort: 2000,
+- ToPort: 2001,
+- SourceIPs: []string{"200.1.1.34/32"},
+- }})
+- c.Assert(err, IsNil)
+-
+- resp, err = s.ec2.SecurityGroups([]ec2.SecurityGroup{g0}, nil)
+- c.Assert(err, IsNil)
+- c.Assert(resp.Groups, HasLen, 1)
+- c.Assert(resp.Groups[0].IPPerms, HasLen, 1)
+-
+- perm = resp.Groups[0].IPPerms[0]
+- srcg = perm.SourceGroups
+- c.Assert(srcg, HasLen, 1)
+- c.Check(srcg[0].Name, Equals, g0.Name)
+- c.Check(srcg[0].Id, Equals, g0.Id)
+- c.Check(srcg[0].OwnerId, Equals, ownerId)
+-
+- c.Check(perm.SourceIPs, DeepEquals, []string{"127.0.0.0/24"})
+-
+- // We should be able to delete g1 now because we've removed its only use.
+- _, err = s.ec2.DeleteSecurityGroup(g1)
+- c.Assert(err, IsNil)
+-
+- _, err = s.ec2.DeleteSecurityGroup(g0)
+- c.Assert(err, IsNil)
+-
+- f := ec2.NewFilter()
+- f.Add("group-id", g0.Id, g1.Id)
+- resp, err = s.ec2.SecurityGroups(nil, f)
+- c.Assert(err, IsNil)
+- c.Assert(resp.Groups, HasLen, 0)
-}
-
--// 5.2.4 Parameter Object
--type Parameter struct {
-- DataTypeFields
-- ParamType string `json:"paramType"` // path,query,body,header,form
-- Name string `json:"name"`
-- Description string `json:"description"`
-- Required bool `json:"required"`
-- AllowMultiple bool `json:"allowMultiple"`
--}
+-func (s *ServerTests) TestDuplicateIPPerm(c *C) {
+- name := "goamz-test"
+- descr := "goamz security group for tests"
-
--// 5.2.5 Response Message Object
--type ResponseMessage struct {
-- Code int `json:"code"`
-- Message string `json:"message"`
-- ResponseModel string `json:"responseModel,omitempty"`
--}
+- // Clean it up, if a previous test left it around and avoid leaving it around.
+- s.ec2.DeleteSecurityGroup(ec2.SecurityGroup{Name: name})
+- defer s.ec2.DeleteSecurityGroup(ec2.SecurityGroup{Name: name})
-
--// 5.2.6, 5.2.7 Models Object
--type Model struct {
-- Id string `json:"id"`
-- Description string `json:"description,omitempty"`
-- Required []string `json:"required,omitempty"`
-- Properties map[string]ModelProperty `json:"properties"`
-- SubTypes []string `json:"subTypes,omitempty"`
-- Discriminator string `json:"discriminator,omitempty"`
+- resp1, err := s.ec2.CreateSecurityGroup(ec2.SecurityGroup{Name: name, Description: descr})
+- c.Assert(err, IsNil)
+- c.Assert(resp1.Name, Equals, name)
+-
+- perms := []ec2.IPPerm{{
+- Protocol: "tcp",
+- FromPort: 200,
+- ToPort: 1024,
+- SourceIPs: []string{"127.0.0.1/24"},
+- }, {
+- Protocol: "tcp",
+- FromPort: 0,
+- ToPort: 100,
+- SourceIPs: []string{"127.0.0.1/24"},
+- }}
+-
+- _, err = s.ec2.AuthorizeSecurityGroup(ec2.SecurityGroup{Name: name}, perms[0:1])
+- c.Assert(err, IsNil)
+-
+- _, err = s.ec2.AuthorizeSecurityGroup(ec2.SecurityGroup{Name: name}, perms[0:2])
+- c.Assert(err, ErrorMatches, `.*\(InvalidPermission.Duplicate\)`)
-}
-
--// 5.2.8 Properties Object
--type ModelProperty struct {
-- DataTypeFields
-- Description string `json:"description,omitempty"`
+-type filterSpec struct {
+- name string
+- values []string
-}
-
--// 5.2.10
--type Authorizations map[string]Authorization
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/swagger_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/swagger_test.go
-deleted file mode 100644
-index 12f4e14..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/swagger_test.go
-+++ /dev/null
-@@ -1,115 +0,0 @@
--package swagger
+-func (s *ServerTests) TestInstanceFiltering(c *C) {
+- groupResp, err := s.ec2.CreateSecurityGroup(ec2.SecurityGroup{Name: sessionName("testgroup1"), Description: "testgroup one description"})
+- c.Assert(err, IsNil)
+- group1 := groupResp.SecurityGroup
+- defer s.ec2.DeleteSecurityGroup(group1)
-
--import (
-- "encoding/json"
-- "fmt"
-- "testing"
+- groupResp, err = s.ec2.CreateSecurityGroup(ec2.SecurityGroup{Name: sessionName("testgroup2"), Description: "testgroup two description"})
+- c.Assert(err, IsNil)
+- group2 := groupResp.SecurityGroup
+- defer s.ec2.DeleteSecurityGroup(group2)
-
-- "github.com/emicklei/go-restful"
--)
+- insts := make([]*ec2.Instance, 3)
+- inst, err := s.ec2.RunInstances(&ec2.RunInstances{
+- MinCount: 2,
+- ImageId: imageId,
+- InstanceType: "t1.micro",
+- SecurityGroups: []ec2.SecurityGroup{group1},
+- })
+- c.Assert(err, IsNil)
+- insts[0] = &inst.Instances[0]
+- insts[1] = &inst.Instances[1]
+- defer terminateInstances(c, s.ec2, insts)
-
--// go test -v -test.run TestApi ...swagger
--func TestApi(t *testing.T) {
-- value := Api{Path: "/", Description: "Some Path", Operations: []Operation{}}
-- compareJson(t, true, value, `{"path":"/","description":"Some Path"}`)
--}
+- imageId2 := "ami-e358958a" // Natty server, i386, EBS store
+- inst, err = s.ec2.RunInstances(&ec2.RunInstances{
+- ImageId: imageId2,
+- InstanceType: "t1.micro",
+- SecurityGroups: []ec2.SecurityGroup{group2},
+- })
+- c.Assert(err, IsNil)
+- insts[2] = &inst.Instances[0]
-
--// go test -v -test.run TestServiceToApi ...swagger
--func TestServiceToApi(t *testing.T) {
-- ws := new(restful.WebService)
-- ws.Path("/tests")
-- ws.Consumes(restful.MIME_JSON)
-- ws.Produces(restful.MIME_XML)
-- ws.Route(ws.GET("/all").To(dummy).Writes(sample{}))
-- cfg := Config{
-- WebServicesUrl: "http://here.com",
-- ApiPath: "/apipath",
-- WebServices: []*restful.WebService{ws}}
-- sws := newSwaggerService(cfg)
-- decl := sws.composeDeclaration(ws, "/tests")
-- data, err := json.MarshalIndent(decl, " ", " ")
-- if err != nil {
-- t.Fatal(err.Error())
+- ids := func(indices ...int) (instIds []string) {
+- for _, index := range indices {
+- instIds = append(instIds, insts[index].InstanceId)
+- }
+- return
- }
-- // for visual inspection only
-- fmt.Println(string(data))
--}
--
--func dummy(i *restful.Request, o *restful.Response) {}
-
--// go test -v -test.run TestIssue78 ...swagger
--type Response struct {
-- Code int
-- Users *[]User
-- Items *[]TestItem
--}
--type User struct {
-- Id, Name string
--}
--type TestItem struct {
-- Id, Name string
+- tests := []struct {
+- about string
+- instanceIds []string // instanceIds argument to Instances method.
+- filters []filterSpec // filters argument to Instances method.
+- resultIds []string // set of instance ids of expected results.
+- allowExtra bool // resultIds may be incomplete.
+- err string // expected error.
+- }{
+- {
+- about: "check that Instances returns all instances",
+- resultIds: ids(0, 1, 2),
+- allowExtra: true,
+- }, {
+- about: "check that specifying two instance ids returns them",
+- instanceIds: ids(0, 2),
+- resultIds: ids(0, 2),
+- }, {
+- about: "check that specifying a non-existent instance id gives an error",
+- instanceIds: append(ids(0), "i-deadbeef"),
+- err: `.*\(InvalidInstanceID\.NotFound\)`,
+- }, {
+- about: "check that a filter allowed both instances returns both of them",
+- filters: []filterSpec{
+- {"instance-id", ids(0, 2)},
+- },
+- resultIds: ids(0, 2),
+- }, {
+- about: "check that a filter allowing only one instance returns it",
+- filters: []filterSpec{
+- {"instance-id", ids(1)},
+- },
+- resultIds: ids(1),
+- }, {
+- about: "check that a filter allowing no instances returns none",
+- filters: []filterSpec{
+- {"instance-id", []string{"i-deadbeef12345"}},
+- },
+- }, {
+- about: "check that filtering on group id works",
+- filters: []filterSpec{
+- {"group-id", []string{group1.Id}},
+- },
+- resultIds: ids(0, 1),
+- }, {
+- about: "check that filtering on group name works",
+- filters: []filterSpec{
+- {"group-name", []string{group1.Name}},
+- },
+- resultIds: ids(0, 1),
+- }, {
+- about: "check that filtering on image id works",
+- filters: []filterSpec{
+- {"image-id", []string{imageId}},
+- },
+- resultIds: ids(0, 1),
+- allowExtra: true,
+- }, {
+- about: "combination filters 1",
+- filters: []filterSpec{
+- {"image-id", []string{imageId, imageId2}},
+- {"group-name", []string{group1.Name}},
+- },
+- resultIds: ids(0, 1),
+- }, {
+- about: "combination filters 2",
+- filters: []filterSpec{
+- {"image-id", []string{imageId2}},
+- {"group-name", []string{group1.Name}},
+- },
+- },
+- }
+- for i, t := range tests {
+- c.Logf("%d. %s", i, t.about)
+- var f *ec2.Filter
+- if t.filters != nil {
+- f = ec2.NewFilter()
+- for _, spec := range t.filters {
+- f.Add(spec.name, spec.values...)
+- }
+- }
+- resp, err := s.ec2.Instances(t.instanceIds, f)
+- if t.err != "" {
+- c.Check(err, ErrorMatches, t.err)
+- continue
+- }
+- c.Assert(err, IsNil)
+- insts := make(map[string]*ec2.Instance)
+- for _, r := range resp.Reservations {
+- for j := range r.Instances {
+- inst := &r.Instances[j]
+- c.Check(insts[inst.InstanceId], IsNil, Commentf("duplicate instance id: %q", inst.InstanceId))
+- insts[inst.InstanceId] = inst
+- }
+- }
+- if !t.allowExtra {
+- c.Check(insts, HasLen, len(t.resultIds), Commentf("expected %d instances got %#v", len(t.resultIds), insts))
+- }
+- for j, id := range t.resultIds {
+- c.Check(insts[id], NotNil, Commentf("instance id %d (%q) not found; got %#v", j, id, insts))
+- }
+- }
-}
-
--// clear && go test -v -test.run TestComposeResponseMessages ...swagger
--func TestComposeResponseMessages(t *testing.T) {
-- responseErrors := map[int]restful.ResponseError{}
-- responseErrors[400] = restful.ResponseError{Code: 400, Message: "Bad Request", Model: TestItem{}}
-- route := restful.Route{ResponseErrors: responseErrors}
-- decl := new(ApiDeclaration)
-- decl.Models = map[string]Model{}
-- msgs := composeResponseMessages(route, decl)
-- if msgs[0].ResponseModel != "swagger.TestItem" {
-- t.Errorf("got %s want swagger.TestItem", msgs[0].ResponseModel)
+-func idsOnly(gs []ec2.SecurityGroup) []ec2.SecurityGroup {
+- for i := range gs {
+- gs[i].Name = ""
- }
+- return gs
-}
-
--// clear && go test -v -test.run TestComposeResponseMessageArray ...swagger
--func TestComposeResponseMessageArray(t *testing.T) {
-- responseErrors := map[int]restful.ResponseError{}
-- responseErrors[400] = restful.ResponseError{Code: 400, Message: "Bad Request", Model: []TestItem{}}
-- route := restful.Route{ResponseErrors: responseErrors}
-- decl := new(ApiDeclaration)
-- decl.Models = map[string]Model{}
-- msgs := composeResponseMessages(route, decl)
-- if msgs[0].ResponseModel != "array[swagger.TestItem]" {
-- t.Errorf("got %s want swagger.TestItem", msgs[0].ResponseModel)
+-func namesOnly(gs []ec2.SecurityGroup) []ec2.SecurityGroup {
+- for i := range gs {
+- gs[i].Id = ""
- }
+- return gs
-}
-
--func TestIssue78(t *testing.T) {
-- sws := newSwaggerService(Config{})
-- models := map[string]Model{}
-- sws.addModelFromSampleTo(&Operation{}, true, Response{Items: &[]TestItem{}}, models)
-- model, ok := models["swagger.Response"]
-- if !ok {
-- t.Fatal("missing response model")
+-func (s *ServerTests) TestGroupFiltering(c *C) {
+- g := make([]ec2.SecurityGroup, 4)
+- for i := range g {
+- resp, err := s.ec2.CreateSecurityGroup(ec2.SecurityGroup{Name: sessionName(fmt.Sprintf("testgroup%d", i)), Description: fmt.Sprintf("testdescription%d", i)})
+- c.Assert(err, IsNil)
+- g[i] = resp.SecurityGroup
+- c.Logf("group %d: %v", i, g[i])
+- defer s.ec2.DeleteSecurityGroup(g[i])
- }
-- if "swagger.Response" != model.Id {
-- t.Fatal("wrong model id:" + model.Id)
+-
+- perms := [][]ec2.IPPerm{
+- {{
+- Protocol: "tcp",
+- FromPort: 100,
+- ToPort: 200,
+- SourceIPs: []string{"1.2.3.4/32"},
+- }},
+- {{
+- Protocol: "tcp",
+- FromPort: 200,
+- ToPort: 300,
+- SourceGroups: []ec2.UserSecurityGroup{{Id: g[1].Id}},
+- }},
+- {{
+- Protocol: "udp",
+- FromPort: 200,
+- ToPort: 400,
+- SourceGroups: []ec2.UserSecurityGroup{{Id: g[1].Id}},
+- }},
- }
-- code, ok := model.Properties["Code"]
-- if !ok {
-- t.Fatal("missing code")
+- for i, ps := range perms {
+- _, err := s.ec2.AuthorizeSecurityGroup(g[i], ps)
+- c.Assert(err, IsNil)
- }
-- if "integer" != *code.Type {
-- t.Fatal("wrong code type:" + *code.Type)
+-
+- groups := func(indices ...int) (gs []ec2.SecurityGroup) {
+- for _, index := range indices {
+- gs = append(gs, g[index])
+- }
+- return
- }
-- items, ok := model.Properties["Items"]
-- if !ok {
-- t.Fatal("missing items")
+-
+- type groupTest struct {
+- about string
+- groups []ec2.SecurityGroup // groupIds argument to SecurityGroups method.
+- filters []filterSpec // filters argument to SecurityGroups method.
+- results []ec2.SecurityGroup // set of expected result groups.
+- allowExtra bool // specified results may be incomplete.
+- err string // expected error.
- }
-- if "array" != *items.Type {
-- t.Fatal("wrong items type:" + *items.Type)
+- filterCheck := func(name, val string, gs []ec2.SecurityGroup) groupTest {
+- return groupTest{
+- about: "filter check " + name,
+- filters: []filterSpec{{name, []string{val}}},
+- results: gs,
+- allowExtra: true,
+- }
- }
-- items_items := items.Items
-- if len(items_items) == 0 {
-- t.Fatal("missing items->items")
+- tests := []groupTest{
+- {
+- about: "check that SecurityGroups returns all groups",
+- results: groups(0, 1, 2, 3),
+- allowExtra: true,
+- }, {
+- about: "check that specifying two group ids returns them",
+- groups: idsOnly(groups(0, 2)),
+- results: groups(0, 2),
+- }, {
+- about: "check that specifying names only works",
+- groups: namesOnly(groups(0, 2)),
+- results: groups(0, 2),
+- }, {
+- about: "check that specifying a non-existent group id gives an error",
+- groups: append(groups(0), ec2.SecurityGroup{Id: "sg-eeeeeeeee"}),
+- err: `.*\(InvalidGroup\.NotFound\)`,
+- }, {
+- about: "check that a filter allowed two groups returns both of them",
+- filters: []filterSpec{
+- {"group-id", []string{g[0].Id, g[2].Id}},
+- },
+- results: groups(0, 2),
+- },
+- {
+- about: "check that the previous filter works when specifying a list of ids",
+- groups: groups(1, 2),
+- filters: []filterSpec{
+- {"group-id", []string{g[0].Id, g[2].Id}},
+- },
+- results: groups(2),
+- }, {
+- about: "check that a filter allowing no groups returns none",
+- filters: []filterSpec{
+- {"group-id", []string{"sg-eeeeeeeee"}},
+- },
+- },
+- filterCheck("description", "testdescription1", groups(1)),
+- filterCheck("group-name", g[2].Name, groups(2)),
+- filterCheck("ip-permission.cidr", "1.2.3.4/32", groups(0)),
+- filterCheck("ip-permission.group-name", g[1].Name, groups(1, 2)),
+- filterCheck("ip-permission.protocol", "udp", groups(2)),
+- filterCheck("ip-permission.from-port", "200", groups(1, 2)),
+- filterCheck("ip-permission.to-port", "200", groups(0)),
+- // TODO owner-id
- }
-- ref := items_items[0].Ref
-- if ref == nil {
-- t.Fatal("missing $ref")
+- for i, t := range tests {
+- c.Logf("%d. %s", i, t.about)
+- var f *ec2.Filter
+- if t.filters != nil {
+- f = ec2.NewFilter()
+- for _, spec := range t.filters {
+- f.Add(spec.name, spec.values...)
+- }
+- }
+- resp, err := s.ec2.SecurityGroups(t.groups, f)
+- if t.err != "" {
+- c.Check(err, ErrorMatches, t.err)
+- continue
+- }
+- c.Assert(err, IsNil)
+- groups := make(map[string]*ec2.SecurityGroup)
+- for j := range resp.Groups {
+- group := &resp.Groups[j].SecurityGroup
+- c.Check(groups[group.Id], IsNil, Commentf("duplicate group id: %q", group.Id))
+-
+- groups[group.Id] = group
+- }
+- // If extra groups may be returned, eliminate all groups that
+- // we did not create in this session apart from the default group.
+- if t.allowExtra {
+- namePat := regexp.MustCompile(sessionName("testgroup[0-9]"))
+- for id, g := range groups {
+- if !namePat.MatchString(g.Name) {
+- delete(groups, id)
+- }
+- }
+- }
+- c.Check(groups, HasLen, len(t.results))
+- for j, g := range t.results {
+- rg := groups[g.Id]
+- c.Assert(rg, NotNil, Commentf("group %d (%v) not found; got %#v", j, g, groups))
+- c.Check(rg.Name, Equals, g.Name, Commentf("group %d (%v)", j, g))
+- }
- }
-- if *ref != "swagger.TestItem" {
-- t.Fatal("wrong $ref:" + *ref)
+-}
+diff --git a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/ec2test/filter.go b/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/ec2test/filter.go
+deleted file mode 100644
+index 1a0c046..0000000
+--- a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/ec2test/filter.go
++++ /dev/null
+@@ -1,84 +0,0 @@
+-package ec2test
+-
+-import (
+- "fmt"
+- "net/url"
+- "strings"
+-)
+-
+-// filter holds an ec2 filter. A filter maps an attribute to a set of
+-// possible values for that attribute. For an item to pass through the
+-// filter, every attribute of the item mentioned in the filter must match
+-// at least one of its given values.
+-type filter map[string][]string
+-
+-// newFilter creates a new filter from the Filter fields in the url form.
+-//
+-// The filtering is specified through a map of name=>values, where the
+-// name is a well-defined key identifying the data to be matched,
+-// and the list of values holds the possible values the filtered
+-// item can take for the key to be included in the
+-// result set. For example:
+-//
+-// Filter.1.Name=instance-type
+-// Filter.1.Value.1=m1.small
+-// Filter.1.Value.2=m1.large
+-//
+-func newFilter(form url.Values) filter {
+- // TODO return an error if the fields are not well formed?
+- names := make(map[int]string)
+- values := make(map[int][]string)
+- maxId := 0
+- for name, fvalues := range form {
+- var rest string
+- var id int
+- if x, _ := fmt.Sscanf(name, "Filter.%d.%s", &id, &rest); x != 2 {
+- continue
+- }
+- if id > maxId {
+- maxId = id
+- }
+- if rest == "Name" {
+- names[id] = fvalues[0]
+- continue
+- }
+- if !strings.HasPrefix(rest, "Value.") {
+- continue
+- }
+- values[id] = append(values[id], fvalues[0])
+- }
+-
+- f := make(filter)
+- for id, name := range names {
+- f[name] = values[id]
+- }
+- return f
+-}
+-
+-func notDigit(r rune) bool {
+- return r < '0' || r > '9'
+-}
+-
+-// filterable represents an object that can be passed through a filter.
+-type filterable interface {
+- // matchAttr returns true if given attribute of the
+- // object matches value. It returns an error if the
+- // attribute is not recognised or the value is malformed.
+- matchAttr(attr, value string) (bool, error)
+-}
+-
+-// ok returns true if x passes through the filter.
+-func (f filter) ok(x filterable) (bool, error) {
+-next:
+- for a, vs := range f {
+- for _, v := range vs {
+- if ok, err := x.matchAttr(a, v); ok {
+- continue next
+- } else if err != nil {
+- return false, fmt.Errorf("bad attribute or value %q=%q for type %T: %v", a, v, x, err)
+- }
+- }
+- return false, nil
- }
+- return true, nil
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/swagger_webservice.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/swagger_webservice.go
+diff --git a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/ec2test/server.go b/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/ec2test/server.go
deleted file mode 100644
-index c20de2e..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/swagger_webservice.go
+index 2f24cb2..0000000
+--- a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/ec2test/server.go
+++ /dev/null
-@@ -1,349 +0,0 @@
--package swagger
+@@ -1,993 +0,0 @@
+-// The ec2test package implements a fake EC2 provider with
+-// the capability of inducing errors on any given operation,
+-// and retrospectively determining what operations have been
+-// carried out.
+-package ec2test
-
-import (
+- "encoding/base64"
+- "encoding/xml"
- "fmt"
-- "github.com/emicklei/go-restful"
-- // "github.com/emicklei/hopwatch"
-- "log"
+- "github.com/mitchellh/goamz/ec2"
+- "io"
+- "net"
- "net/http"
-- "reflect"
-- "sort"
+- "net/url"
+- "regexp"
+- "strconv"
- "strings"
+- "sync"
-)
-
--type SwaggerService struct {
-- config Config
-- apiDeclarationMap map[string]ApiDeclaration
+-var b64 = base64.StdEncoding
+-
+-// Action represents a request that changes the ec2 state.
+-type Action struct {
+- RequestId string
+-
+- // Request holds the requested action as a url.Values instance
+- Request url.Values
+-
+- // If the action succeeded, Response holds the value that
+- // was marshalled to build the XML response for the request.
+- Response interface{}
+-
+- // If the action failed, Err holds an error giving details of the failure.
+- Err *ec2.Error
-}
-
--func newSwaggerService(config Config) *SwaggerService {
-- return &SwaggerService{
-- config: config,
-- apiDeclarationMap: map[string]ApiDeclaration{}}
+-// TODO possible other things:
+-// - some virtual time stamp interface, so a client
+-// can ask for all actions after a certain virtual time.
+-
+-// Server implements an EC2 simulator for use in testing.
+-type Server struct {
+- url string
+- listener net.Listener
+- mu sync.Mutex
+- reqs []*Action
+-
+- instances map[string]*Instance // id -> instance
+- reservations map[string]*reservation // id -> reservation
+- groups map[string]*securityGroup // id -> group
+- maxId counter
+- reqId counter
+- reservationId counter
+- groupId counter
+- initialInstanceState ec2.InstanceState
-}
-
--// LogInfo is the function that is called when this package needs to log. It defaults to log.Printf
--var LogInfo = log.Printf
+-// reservation holds a simulated ec2 reservation.
+-type reservation struct {
+- id string
+- instances map[string]*Instance
+- groups []*securityGroup
+-}
-
--// InstallSwaggerService add the WebService that provides the API documentation of all services
--// conform the Swagger documentation specifcation. (https://github.com/wordnik/swagger-core/wiki).
--func InstallSwaggerService(aSwaggerConfig Config) {
-- RegisterSwaggerService(aSwaggerConfig, restful.DefaultContainer)
+-// instance holds a simulated ec2 instance
+-type Instance struct {
+- // UserData holds the data that was passed to the RunInstances request
+- // when the instance was started.
+- UserData []byte
+- id string
+- imageId string
+- reservation *reservation
+- instType string
+- state ec2.InstanceState
-}
-
--// RegisterSwaggerService add the WebService that provides the API documentation of all services
--// conform the Swagger documentation specifcation. (https://github.com/wordnik/swagger-core/wiki).
--func RegisterSwaggerService(config Config, wsContainer *restful.Container) {
-- sws := newSwaggerService(config)
-- ws := new(restful.WebService)
-- ws.Path(config.ApiPath)
-- ws.Produces(restful.MIME_JSON)
-- if config.DisableCORS {
-- ws.Filter(enableCORS)
+-// permKey represents permission for a given security
+-// group or IP address (but not both) to access a given range of
+-// ports. Equality of permKeys is used in the implementation of
+-// permission sets, relying on the uniqueness of securityGroup
+-// instances.
+-type permKey struct {
+- protocol string
+- fromPort int
+- toPort int
+- group *securityGroup
+- ipAddr string
+-}
+-
+-// securityGroup holds a simulated ec2 security group.
+-// Instances of securityGroup should only be created through
+-// Server.createSecurityGroup to ensure that groups can be
+-// compared by pointer value.
+-type securityGroup struct {
+- id string
+- name string
+- description string
+-
+- perms map[permKey]bool
+-}
+-
+-func (g *securityGroup) ec2SecurityGroup() ec2.SecurityGroup {
+- return ec2.SecurityGroup{
+- Name: g.name,
+- Id: g.id,
- }
-- ws.Route(ws.GET("/").To(sws.getListing))
-- ws.Route(ws.GET("/{a}").To(sws.getDeclarations))
-- ws.Route(ws.GET("/{a}/{b}").To(sws.getDeclarations))
-- ws.Route(ws.GET("/{a}/{b}/{c}").To(sws.getDeclarations))
-- ws.Route(ws.GET("/{a}/{b}/{c}/{d}").To(sws.getDeclarations))
-- ws.Route(ws.GET("/{a}/{b}/{c}/{d}/{e}").To(sws.getDeclarations))
-- ws.Route(ws.GET("/{a}/{b}/{c}/{d}/{e}/{f}").To(sws.getDeclarations))
-- ws.Route(ws.GET("/{a}/{b}/{c}/{d}/{e}/{f}/{g}").To(sws.getDeclarations))
-- LogInfo("[restful/swagger] listing is available at %v%v", config.WebServicesUrl, config.ApiPath)
-- wsContainer.Add(ws)
+-}
-
-- // Build all ApiDeclarations
-- for _, each := range config.WebServices {
-- rootPath := each.RootPath()
-- // skip the api service itself
-- if rootPath != config.ApiPath {
-- if rootPath == "" || rootPath == "/" {
-- // use routes
-- for _, route := range each.Routes() {
-- entry := staticPathFromRoute(route)
-- _, exists := sws.apiDeclarationMap[entry]
-- if !exists {
-- sws.apiDeclarationMap[entry] = sws.composeDeclaration(each, entry)
-- }
-- }
-- } else { // use root path
-- sws.apiDeclarationMap[each.RootPath()] = sws.composeDeclaration(each, each.RootPath())
-- }
+-func (g *securityGroup) matchAttr(attr, value string) (ok bool, err error) {
+- switch attr {
+- case "description":
+- return g.description == value, nil
+- case "group-id":
+- return g.id == value, nil
+- case "group-name":
+- return g.name == value, nil
+- case "ip-permission.cidr":
+- return g.hasPerm(func(k permKey) bool { return k.ipAddr == value }), nil
+- case "ip-permission.group-name":
+- return g.hasPerm(func(k permKey) bool {
+- return k.group != nil && k.group.name == value
+- }), nil
+- case "ip-permission.from-port":
+- port, err := strconv.Atoi(value)
+- if err != nil {
+- return false, err
- }
+- return g.hasPerm(func(k permKey) bool { return k.fromPort == port }), nil
+- case "ip-permission.to-port":
+- port, err := strconv.Atoi(value)
+- if err != nil {
+- return false, err
+- }
+- return g.hasPerm(func(k permKey) bool { return k.toPort == port }), nil
+- case "ip-permission.protocol":
+- return g.hasPerm(func(k permKey) bool { return k.protocol == value }), nil
+- case "owner-id":
+- return value == ownerId, nil
- }
+- return false, fmt.Errorf("unknown attribute %q", attr)
+-}
-
-- // Check paths for UI serving
-- if config.StaticHandler == nil && config.SwaggerFilePath != "" && config.SwaggerPath != "" {
-- swaggerPathSlash := config.SwaggerPath
-- // path must end with slash /
-- if "/" != config.SwaggerPath[len(config.SwaggerPath)-1:] {
-- LogInfo("[restful/swagger] use corrected SwaggerPath ; must end with slash (/)")
-- swaggerPathSlash += "/"
+-func (g *securityGroup) hasPerm(test func(k permKey) bool) bool {
+- for k := range g.perms {
+- if test(k) {
+- return true
- }
+- }
+- return false
+-}
-
-- LogInfo("[restful/swagger] %v%v is mapped to folder %v", config.WebServicesUrl, swaggerPathSlash, config.SwaggerFilePath)
-- wsContainer.Handle(swaggerPathSlash, http.StripPrefix(swaggerPathSlash, http.FileServer(http.Dir(config.SwaggerFilePath))))
--
-- //if we define a custom static handler use it
-- } else if config.StaticHandler != nil && config.SwaggerPath != "" {
-- swaggerPathSlash := config.SwaggerPath
-- // path must end with slash /
-- if "/" != config.SwaggerPath[len(config.SwaggerPath)-1:] {
-- LogInfo("[restful/swagger] use corrected SwaggerFilePath ; must end with slash (/)")
-- swaggerPathSlash += "/"
+-// ec2Perms returns the list of EC2 permissions granted
+-// to g. It groups permissions by port range and protocol.
+-func (g *securityGroup) ec2Perms() (perms []ec2.IPPerm) {
+- // The grouping is held in result. We use permKey for convenience,
+- // (ensuring that the group and ipAddr of each key is zero). For
+- // each protocol/port range combination, we build up the permission
+- // set in the associated value.
+- result := make(map[permKey]*ec2.IPPerm)
+- for k := range g.perms {
+- groupKey := k
+- groupKey.group = nil
+- groupKey.ipAddr = ""
-
+- ec2p := result[groupKey]
+- if ec2p == nil {
+- ec2p = &ec2.IPPerm{
+- Protocol: k.protocol,
+- FromPort: k.fromPort,
+- ToPort: k.toPort,
+- }
+- result[groupKey] = ec2p
+- }
+- if k.group != nil {
+- ec2p.SourceGroups = append(ec2p.SourceGroups,
+- ec2.UserSecurityGroup{
+- Id: k.group.id,
+- Name: k.group.name,
+- OwnerId: ownerId,
+- })
+- } else {
+- ec2p.SourceIPs = append(ec2p.SourceIPs, k.ipAddr)
- }
-- LogInfo("[restful/swagger] %v%v is mapped to custom Handler %T", config.WebServicesUrl, swaggerPathSlash, config.StaticHandler)
-- wsContainer.Handle(swaggerPathSlash, config.StaticHandler)
--
-- } else {
-- LogInfo("[restful/swagger] Swagger(File)Path is empty ; no UI is served")
- }
+- for _, ec2p := range result {
+- perms = append(perms, *ec2p)
+- }
+- return
-}
-
--func staticPathFromRoute(r restful.Route) string {
-- static := r.Path
-- bracket := strings.Index(static, "{")
-- if bracket <= 1 { // result cannot be empty
-- return static
+-var actions = map[string]func(*Server, http.ResponseWriter, *http.Request, string) interface{}{
+- "RunInstances": (*Server).runInstances,
+- "TerminateInstances": (*Server).terminateInstances,
+- "DescribeInstances": (*Server).describeInstances,
+- "CreateSecurityGroup": (*Server).createSecurityGroup,
+- "DescribeSecurityGroups": (*Server).describeSecurityGroups,
+- "DeleteSecurityGroup": (*Server).deleteSecurityGroup,
+- "AuthorizeSecurityGroupIngress": (*Server).authorizeSecurityGroupIngress,
+- "RevokeSecurityGroupIngress": (*Server).revokeSecurityGroupIngress,
+-}
+-
+-const ownerId = "9876"
+-
+-// newAction allocates a new action and adds it to the
+-// recorded list of server actions.
+-func (srv *Server) newAction() *Action {
+- srv.mu.Lock()
+- defer srv.mu.Unlock()
+-
+- a := new(Action)
+- srv.reqs = append(srv.reqs, a)
+- return a
+-}
+-
+-// NewServer returns a new server.
+-func NewServer() (*Server, error) {
+- srv := &Server{
+- instances: make(map[string]*Instance),
+- groups: make(map[string]*securityGroup),
+- reservations: make(map[string]*reservation),
+- initialInstanceState: Pending,
- }
-- if bracket != -1 {
-- static = r.Path[:bracket]
+-
+- // Add default security group.
+- g := &securityGroup{
+- name: "default",
+- description: "default group",
+- id: fmt.Sprintf("sg-%d", srv.groupId.next()),
- }
-- if strings.HasSuffix(static, "/") {
-- return static[:len(static)-1]
-- } else {
-- return static
+- g.perms = map[permKey]bool{
+- permKey{
+- protocol: "icmp",
+- fromPort: -1,
+- toPort: -1,
+- group: g,
+- }: true,
+- permKey{
+- protocol: "tcp",
+- fromPort: 0,
+- toPort: 65535,
+- group: g,
+- }: true,
+- permKey{
+- protocol: "udp",
+- fromPort: 0,
+- toPort: 65535,
+- group: g,
+- }: true,
- }
--}
+- srv.groups[g.id] = g
-
--func enableCORS(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
-- if origin := req.HeaderParameter(restful.HEADER_Origin); origin != "" {
-- // prevent duplicate header
-- if len(resp.Header().Get(restful.HEADER_AccessControlAllowOrigin)) == 0 {
-- resp.AddHeader(restful.HEADER_AccessControlAllowOrigin, origin)
-- }
+- l, err := net.Listen("tcp", "localhost:0")
+- if err != nil {
+- return nil, fmt.Errorf("cannot listen on localhost: %v", err)
- }
-- chain.ProcessFilter(req, resp)
+- srv.listener = l
+-
+- srv.url = "http://" + l.Addr().String()
+-
+- // we use HandlerFunc rather than *Server directly so that we
+- // can avoid exporting HandlerFunc from *Server.
+- go http.Serve(l, http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+- srv.serveHTTP(w, req)
+- }))
+- return srv, nil
-}
-
--func (sws SwaggerService) getListing(req *restful.Request, resp *restful.Response) {
-- listing := ResourceListing{SwaggerVersion: swaggerVersion}
-- for k, v := range sws.apiDeclarationMap {
-- ref := Resource{Path: k}
-- if len(v.Apis) > 0 { // use description of first (could still be empty)
-- ref.Description = v.Apis[0].Description
-- }
-- listing.Apis = append(listing.Apis, ref)
-- }
-- resp.WriteAsJson(listing)
+-// Quit closes down the server.
+-func (srv *Server) Quit() {
+- srv.listener.Close()
-}
-
--func (sws SwaggerService) getDeclarations(req *restful.Request, resp *restful.Response) {
-- decl := sws.apiDeclarationMap[composeRootPath(req)]
-- // unless WebServicesUrl is given
-- if len(sws.config.WebServicesUrl) == 0 {
-- // update base path from the actual request
-- // TODO how to detect https? assume http for now
-- (&decl).BasePath = fmt.Sprintf("http://%s", req.Request.Host)
-- }
-- resp.WriteAsJson(decl)
+-// SetInitialInstanceState sets the state that any new instances will be started in.
+-func (srv *Server) SetInitialInstanceState(state ec2.InstanceState) {
+- srv.mu.Lock()
+- srv.initialInstanceState = state
+- srv.mu.Unlock()
-}
-
--func (sws SwaggerService) composeDeclaration(ws *restful.WebService, pathPrefix string) ApiDeclaration {
-- decl := ApiDeclaration{
-- SwaggerVersion: swaggerVersion,
-- BasePath: sws.config.WebServicesUrl,
-- ResourcePath: ws.RootPath(),
-- Models: map[string]Model{}}
+-// URL returns the URL of the server.
+-func (srv *Server) URL() string {
+- return srv.url
+-}
-
-- // collect any path parameters
-- rootParams := []Parameter{}
-- for _, param := range ws.PathParameters() {
-- rootParams = append(rootParams, asSwaggerParameter(param.Data()))
-- }
-- // aggregate by path
-- pathToRoutes := map[string][]restful.Route{}
-- for _, other := range ws.Routes() {
-- if strings.HasPrefix(other.Path, pathPrefix) {
-- routes := pathToRoutes[other.Path]
-- pathToRoutes[other.Path] = append(routes, other)
-- }
-- }
-- for path, routes := range pathToRoutes {
-- api := Api{Path: strings.TrimSuffix(path, "/"), Description: ws.Documentation()}
-- for _, route := range routes {
-- operation := Operation{
-- Method: route.Method,
-- Summary: route.Doc,
-- Type: asDataType(route.WriteSample),
-- Parameters: []Parameter{},
-- Nickname: route.Operation,
-- ResponseMessages: composeResponseMessages(route, &decl)}
+-// serveHTTP serves the EC2 protocol.
+-func (srv *Server) serveHTTP(w http.ResponseWriter, req *http.Request) {
+- req.ParseForm()
-
-- operation.Consumes = route.Consumes
-- operation.Produces = route.Produces
+- a := srv.newAction()
+- a.RequestId = fmt.Sprintf("req%d", srv.reqId.next())
+- a.Request = req.Form
-
-- // share root params if any
-- for _, swparam := range rootParams {
-- operation.Parameters = append(operation.Parameters, swparam)
-- }
-- // route specific params
-- for _, param := range route.ParameterDocs {
-- operation.Parameters = append(operation.Parameters, asSwaggerParameter(param.Data()))
-- }
-- sws.addModelsFromRouteTo(&operation, route, &decl)
-- api.Operations = append(api.Operations, operation)
+- // Methods on Server that deal with parsing user data
+- // may fail. To save on error handling code, we allow these
+- // methods to call fatalf, which will panic with an *ec2.Error
+- // which will be caught here and returned
+- // to the client as a properly formed EC2 error.
+- defer func() {
+- switch err := recover().(type) {
+- case *ec2.Error:
+- a.Err = err
+- err.RequestId = a.RequestId
+- writeError(w, err)
+- case nil:
+- default:
+- panic(err)
- }
-- decl.Apis = append(decl.Apis, api)
+- }()
+-
+- f := actions[req.Form.Get("Action")]
+- if f == nil {
+- fatalf(400, "InvalidParameterValue", "Unrecognized Action")
- }
-- return decl
+-
+- response := f(srv, w, req, a.RequestId)
+- a.Response = response
+-
+- w.Header().Set("Content-Type", `xml version="1.0" encoding="UTF-8"`)
+- xmlMarshal(w, response)
-}
-
--// composeResponseMessages takes the ResponseErrors (if any) and creates ResponseMessages from them.
--func composeResponseMessages(route restful.Route, decl *ApiDeclaration) (messages []ResponseMessage) {
-- if route.ResponseErrors == nil {
-- return messages
-- }
-- // sort by code
-- codes := sort.IntSlice{}
-- for code, _ := range route.ResponseErrors {
-- codes = append(codes, code)
+-// Instance returns the instance for the given instance id.
+-// It returns nil if there is no such instance.
+-func (srv *Server) Instance(id string) *Instance {
+- srv.mu.Lock()
+- defer srv.mu.Unlock()
+- return srv.instances[id]
+-}
+-
+-// writeError writes an appropriate error response.
+-// TODO how should we deal with errors when the
+-// error itself is potentially generated by backend-agnostic
+-// code?
+-func writeError(w http.ResponseWriter, err *ec2.Error) {
+- // Error encapsulates an error returned by EC2.
+- // TODO merge with ec2.Error when xml supports ignoring a field.
+- type ec2error struct {
+- Code string // EC2 error code ("UnsupportedOperation", ...)
+- Message string // The human-oriented error message
+- RequestId string
- }
-- codes.Sort()
-- for _, code := range codes {
-- each := route.ResponseErrors[code]
-- message := ResponseMessage{
-- Code: code,
-- Message: each.Message,
-- }
-- if each.Model != nil {
-- st := reflect.TypeOf(each.Model)
-- isCollection, st := detectCollectionType(st)
-- modelName := modelBuilder{}.keyFrom(st)
-- if isCollection {
-- modelName = "array[" + modelName + "]"
-- }
-- modelBuilder{decl.Models}.addModel(st, "")
-- // reference the model
-- message.ResponseModel = modelName
-- }
-- messages = append(messages, message)
+-
+- type Response struct {
+- RequestId string
+- Errors []ec2error `xml:"Errors>Error"`
- }
-- return
+-
+- w.Header().Set("Content-Type", `xml version="1.0" encoding="UTF-8"`)
+- w.WriteHeader(err.StatusCode)
+- xmlMarshal(w, Response{
+- RequestId: err.RequestId,
+- Errors: []ec2error{{
+- Code: err.Code,
+- Message: err.Message,
+- }},
+- })
-}
-
--// addModelsFromRoute takes any read or write sample from the Route and creates a Swagger model from it.
--func (sws SwaggerService) addModelsFromRouteTo(operation *Operation, route restful.Route, decl *ApiDeclaration) {
-- if route.ReadSample != nil {
-- sws.addModelFromSampleTo(operation, false, route.ReadSample, decl.Models)
-- }
-- if route.WriteSample != nil {
-- sws.addModelFromSampleTo(operation, true, route.WriteSample, decl.Models)
+-// xmlMarshal is the same as xml.Marshal except that
+-// it panics on error. The marshalling should not fail,
+-// but we want to know if it does.
+-func xmlMarshal(w io.Writer, x interface{}) {
+- if err := xml.NewEncoder(w).Encode(x); err != nil {
+- panic(fmt.Errorf("error marshalling %#v: %v", x, err))
- }
-}
-
--func detectCollectionType(st reflect.Type) (bool, reflect.Type) {
-- isCollection := false
-- if st.Kind() == reflect.Slice || st.Kind() == reflect.Array {
-- st = st.Elem()
-- isCollection = true
-- } else {
-- if st.Kind() == reflect.Ptr {
-- if st.Elem().Kind() == reflect.Slice || st.Elem().Kind() == reflect.Array {
-- st = st.Elem().Elem()
-- isCollection = true
+-// formToGroups parses a set of SecurityGroup form values
+-// as found in a RunInstances request, and returns the resulting
+-// slice of security groups.
+-// It calls fatalf if a group is not found.
+-func (srv *Server) formToGroups(form url.Values) []*securityGroup {
+- var groups []*securityGroup
+- for name, values := range form {
+- switch {
+- case strings.HasPrefix(name, "SecurityGroupId."):
+- if g := srv.groups[values[0]]; g != nil {
+- groups = append(groups, g)
+- } else {
+- fatalf(400, "InvalidGroup.NotFound", "unknown group id %q", values[0])
+- }
+- case strings.HasPrefix(name, "SecurityGroup."):
+- var found *securityGroup
+- for _, g := range srv.groups {
+- if g.name == values[0] {
+- found = g
+- }
+- }
+- if found == nil {
+- fatalf(400, "InvalidGroup.NotFound", "unknown group name %q", values[0])
- }
+- groups = append(groups, found)
- }
- }
-- return isCollection, st
+- return groups
-}
-
--// addModelFromSample creates and adds (or overwrites) a Model from a sample resource
--func (sws SwaggerService) addModelFromSampleTo(operation *Operation, isResponse bool, sample interface{}, models map[string]Model) {
-- st := reflect.TypeOf(sample)
-- isCollection, st := detectCollectionType(st)
-- modelName := modelBuilder{}.keyFrom(st)
-- if isResponse {
-- if isCollection {
-- modelName = "array[" + modelName + "]"
+-// runInstances implements the EC2 RunInstances entry point.
+-func (srv *Server) runInstances(w http.ResponseWriter, req *http.Request, reqId string) interface{} {
+- min := atoi(req.Form.Get("MinCount"))
+- max := atoi(req.Form.Get("MaxCount"))
+- if min < 0 || max < 1 {
+- fatalf(400, "InvalidParameterValue", "bad values for MinCount or MaxCount")
+- }
+- if min > max {
+- fatalf(400, "InvalidParameterCombination", "MinCount is greater than MaxCount")
+- }
+- var userData []byte
+- if data := req.Form.Get("UserData"); data != "" {
+- var err error
+- userData, err = b64.DecodeString(data)
+- if err != nil {
+- fatalf(400, "InvalidParameterValue", "bad UserData value: %v", err)
- }
-- operation.Type = modelName
- }
-- modelBuilder{models}.addModel(reflect.TypeOf(sample), "")
--}
-
--func asSwaggerParameter(param restful.ParameterData) Parameter {
-- return Parameter{
-- DataTypeFields: DataTypeFields{
-- Type: ¶m.DataType,
-- Format: asFormat(param.DataType),
-- },
-- Name: param.Name,
-- Description: param.Description,
-- ParamType: asParamType(param.Kind),
+- // TODO attributes still to consider:
+- // ImageId: accept anything, we can verify later
+- // KeyName ?
+- // InstanceType ?
+- // KernelId ?
+- // RamdiskId ?
+- // AvailZone ?
+- // GroupName tag
+- // Monitoring ignore?
+- // SubnetId ?
+- // DisableAPITermination bool
+- // ShutdownBehavior string
+- // PrivateIPAddress string
-
-- Required: param.Required}
--}
+- srv.mu.Lock()
+- defer srv.mu.Unlock()
-
--// Between 1..7 path parameters is supported
--func composeRootPath(req *restful.Request) string {
-- path := "/" + req.PathParameter("a")
-- b := req.PathParameter("b")
-- if b == "" {
-- return path
-- }
-- path = path + "/" + b
-- c := req.PathParameter("c")
-- if c == "" {
-- return path
-- }
-- path = path + "/" + c
-- d := req.PathParameter("d")
-- if d == "" {
-- return path
-- }
-- path = path + "/" + d
-- e := req.PathParameter("e")
-- if e == "" {
-- return path
-- }
-- path = path + "/" + e
-- f := req.PathParameter("f")
-- if f == "" {
-- return path
-- }
-- path = path + "/" + f
-- g := req.PathParameter("g")
-- if g == "" {
-- return path
-- }
-- return path + "/" + g
--}
+- // make sure that form fields are correct before creating the reservation.
+- instType := req.Form.Get("InstanceType")
+- imageId := req.Form.Get("ImageId")
-
--func asFormat(name string) string {
-- return "" // TODO
--}
+- r := srv.newReservation(srv.formToGroups(req.Form))
-
--func asParamType(kind int) string {
-- switch {
-- case kind == restful.PathParameterKind:
-- return "path"
-- case kind == restful.QueryParameterKind:
-- return "query"
-- case kind == restful.BodyParameterKind:
-- return "body"
-- case kind == restful.HeaderParameterKind:
-- return "header"
-- case kind == restful.FormParameterKind:
-- return "form"
+- var resp ec2.RunInstancesResp
+- resp.RequestId = reqId
+- resp.ReservationId = r.id
+- resp.OwnerId = ownerId
+-
+- for i := 0; i < max; i++ {
+- inst := srv.newInstance(r, instType, imageId, srv.initialInstanceState)
+- inst.UserData = userData
+- resp.Instances = append(resp.Instances, inst.ec2instance())
- }
-- return ""
+- return &resp
-}
-
--func asDataType(any interface{}) string {
-- if any == nil {
-- return "void"
+-func (srv *Server) group(group ec2.SecurityGroup) *securityGroup {
+- if group.Id != "" {
+- return srv.groups[group.Id]
- }
-- return reflect.TypeOf(any).Name()
+- for _, g := range srv.groups {
+- if g.name == group.Name {
+- return g
+- }
+- }
+- return nil
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/utils_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/utils_test.go
-deleted file mode 100644
-index 6127bd5..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/utils_test.go
-+++ /dev/null
-@@ -1,70 +0,0 @@
--package swagger
-
--import (
-- "bytes"
-- "encoding/json"
-- "fmt"
-- "reflect"
-- "strings"
-- "testing"
--)
+-// NewInstances creates n new instances in srv with the given instance type,
+-// image ID, initial state and security groups. If any group does not already
+-// exist, it will be created. NewInstances returns the ids of the new instances.
+-func (srv *Server) NewInstances(n int, instType string, imageId string, state ec2.InstanceState, groups []ec2.SecurityGroup) []string {
+- srv.mu.Lock()
+- defer srv.mu.Unlock()
-
--func testJsonFromStruct(t *testing.T, sample interface{}, expectedJson string) {
-- compareJson(t, false, modelsFromStruct(sample), expectedJson)
--}
+- rgroups := make([]*securityGroup, len(groups))
+- for i, group := range groups {
+- g := srv.group(group)
+- if g == nil {
+- fatalf(400, "InvalidGroup.NotFound", "no such group %v", g)
+- }
+- rgroups[i] = g
+- }
+- r := srv.newReservation(rgroups)
-
--func modelsFromStruct(sample interface{}) map[string]Model {
-- models := map[string]Model{}
-- builder := modelBuilder{models}
-- builder.addModel(reflect.TypeOf(sample), "")
-- return models
+- ids := make([]string, n)
+- for i := 0; i < n; i++ {
+- inst := srv.newInstance(r, instType, imageId, state)
+- ids[i] = inst.id
+- }
+- return ids
-}
-
--func compareJson(t *testing.T, flatCompare bool, value interface{}, expectedJsonAsString string) {
-- var output []byte
-- var err error
-- if flatCompare {
-- output, err = json.Marshal(value)
-- } else {
-- output, err = json.MarshalIndent(value, " ", " ")
-- }
-- if err != nil {
-- t.Error(err.Error())
-- return
-- }
-- actual := string(output)
-- if actual != expectedJsonAsString {
-- t.Errorf("First mismatch JSON doc at line:%d", indexOfNonMatchingLine(actual, expectedJsonAsString))
-- // Use simple fmt to create a pastable output :-)
-- fmt.Println("---- expected -----")
-- fmt.Println(withLineNumbers(expectedJsonAsString))
-- fmt.Println("---- actual -----")
-- fmt.Println(withLineNumbers(actual))
-- fmt.Println("---- raw -----")
-- fmt.Println(actual)
+-func (srv *Server) newInstance(r *reservation, instType string, imageId string, state ec2.InstanceState) *Instance {
+- inst := &Instance{
+- id: fmt.Sprintf("i-%d", srv.maxId.next()),
+- instType: instType,
+- imageId: imageId,
+- state: state,
+- reservation: r,
- }
+- srv.instances[inst.id] = inst
+- r.instances[inst.id] = inst
+- return inst
-}
-
--func indexOfNonMatchingLine(actual, expected string) int {
-- a := strings.Split(actual, "\n")
-- e := strings.Split(expected, "\n")
-- size := len(a)
-- if len(e) < len(a) {
-- size = len(e)
-- }
-- for i := 0; i < size; i++ {
-- if a[i] != e[i] {
-- return i
-- }
+-func (srv *Server) newReservation(groups []*securityGroup) *reservation {
+- r := &reservation{
+- id: fmt.Sprintf("r-%d", srv.reservationId.next()),
+- instances: make(map[string]*Instance),
+- groups: groups,
- }
-- return -1
+-
+- srv.reservations[r.id] = r
+- return r
-}
-
--func withLineNumbers(content string) string {
-- var buffer bytes.Buffer
-- lines := strings.Split(content, "\n")
-- for i, each := range lines {
-- buffer.WriteString(fmt.Sprintf("%d:%s\n", i, each))
+-func (srv *Server) terminateInstances(w http.ResponseWriter, req *http.Request, reqId string) interface{} {
+- srv.mu.Lock()
+- defer srv.mu.Unlock()
+- var resp ec2.TerminateInstancesResp
+- resp.RequestId = reqId
+- var insts []*Instance
+- for attr, vals := range req.Form {
+- if strings.HasPrefix(attr, "InstanceId.") {
+- id := vals[0]
+- inst := srv.instances[id]
+- if inst == nil {
+- fatalf(400, "InvalidInstanceID.NotFound", "no such instance id %q", id)
+- }
+- insts = append(insts, inst)
+- }
- }
-- return buffer.String()
+- for _, inst := range insts {
+- resp.StateChanges = append(resp.StateChanges, inst.terminate())
+- }
+- return &resp
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/web_service.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/web_service.go
-deleted file mode 100644
-index ce261b5..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/web_service.go
-+++ /dev/null
-@@ -1,184 +0,0 @@
--package restful
--
--// Copyright 2013 Ernest Micklei. All rights reserved.
--// Use of this source code is governed by a license
--// that can be found in the LICENSE file.
-
--import (
-- "log"
--)
+-func (inst *Instance) terminate() (d ec2.InstanceStateChange) {
+- d.PreviousState = inst.state
+- inst.state = ShuttingDown
+- d.CurrentState = inst.state
+- d.InstanceId = inst.id
+- return d
+-}
-
--// WebService holds a collection of Route values that bind a Http Method + URL Path to a function.
--type WebService struct {
-- rootPath string
-- pathExpr *pathExpression // cached compilation of rootPath as RegExp
-- routes []Route
-- produces []string
-- consumes []string
-- pathParameters []*Parameter
-- filters []FilterFunction
-- documentation string
+-func (inst *Instance) ec2instance() ec2.Instance {
+- return ec2.Instance{
+- InstanceId: inst.id,
+- InstanceType: inst.instType,
+- ImageId: inst.imageId,
+- DNSName: fmt.Sprintf("%s.example.com", inst.id),
+- // TODO the rest
+- }
-}
-
--// compiledPathExpression ensures that the path is compiled into a RegEx for those routers that need it.
--func (w *WebService) compiledPathExpression() *pathExpression {
-- if w.pathExpr == nil {
-- if len(w.rootPath) == 0 {
-- w.Path("/") // lazy initialize path
+-func (inst *Instance) matchAttr(attr, value string) (ok bool, err error) {
+- switch attr {
+- case "architecture":
+- return value == "i386", nil
+- case "instance-id":
+- return inst.id == value, nil
+- case "group-id":
+- for _, g := range inst.reservation.groups {
+- if g.id == value {
+- return true, nil
+- }
- }
-- compiled, err := newPathExpression(w.rootPath)
+- return false, nil
+- case "group-name":
+- for _, g := range inst.reservation.groups {
+- if g.name == value {
+- return true, nil
+- }
+- }
+- return false, nil
+- case "image-id":
+- return value == inst.imageId, nil
+- case "instance-state-code":
+- code, err := strconv.Atoi(value)
- if err != nil {
-- log.Fatalf("[restful] Invalid path:%s because:%v", w.rootPath, err)
+- return false, err
- }
-- w.pathExpr = compiled
+- return code&0xff == inst.state.Code, nil
+- case "instance-state-name":
+- return value == inst.state.Name, nil
- }
-- return w.pathExpr
+- return false, fmt.Errorf("unknown attribute %q", attr)
-}
-
--// Path specifies the root URL template path of the WebService.
--// All Routes will be relative to this path.
--func (w *WebService) Path(root string) *WebService {
-- w.rootPath = root
-- return w
--}
+-var (
+- Pending = ec2.InstanceState{0, "pending"}
+- Running = ec2.InstanceState{16, "running"}
+- ShuttingDown = ec2.InstanceState{32, "shutting-down"}
+- Terminated = ec2.InstanceState{16, "terminated"}
+- Stopped = ec2.InstanceState{16, "stopped"}
+-)
-
--// Param adds a PathParameter to document parameters used in the root path.
--func (w *WebService) Param(parameter *Parameter) *WebService {
-- if w.pathParameters == nil {
-- w.pathParameters = []*Parameter{}
+-func (srv *Server) createSecurityGroup(w http.ResponseWriter, req *http.Request, reqId string) interface{} {
+- name := req.Form.Get("GroupName")
+- if name == "" {
+- fatalf(400, "InvalidParameterValue", "empty security group name")
- }
-- w.pathParameters = append(w.pathParameters, parameter)
-- return w
--}
--
--// PathParameter creates a new Parameter of kind Path for documentation purposes.
--// It is initialized as required with string as its DataType.
--func (w *WebService) PathParameter(name, description string) *Parameter {
-- p := &Parameter{&ParameterData{Name: name, Description: description, Required: true, DataType: "string"}}
-- p.bePath()
-- return p
--}
--
--// QueryParameter creates a new Parameter of kind Query for documentation purposes.
--// It is initialized as not required with string as its DataType.
--func (w *WebService) QueryParameter(name, description string) *Parameter {
-- p := &Parameter{&ParameterData{Name: name, Description: description, Required: false, DataType: "string"}}
-- p.beQuery()
-- return p
+- srv.mu.Lock()
+- defer srv.mu.Unlock()
+- if srv.group(ec2.SecurityGroup{Name: name}) != nil {
+- fatalf(400, "InvalidGroup.Duplicate", "group %q already exists", name)
+- }
+- g := &securityGroup{
+- name: name,
+- description: req.Form.Get("GroupDescription"),
+- id: fmt.Sprintf("sg-%d", srv.groupId.next()),
+- perms: make(map[permKey]bool),
+- }
+- srv.groups[g.id] = g
+- // we define a local type for this because ec2.CreateSecurityGroupResp
+- // contains SecurityGroup, but the response to this request
+- // should not contain the security group name.
+- type CreateSecurityGroupResponse struct {
+- RequestId string `xml:"requestId"`
+- Return bool `xml:"return"`
+- GroupId string `xml:"groupId"`
+- }
+- r := &CreateSecurityGroupResponse{
+- RequestId: reqId,
+- Return: true,
+- GroupId: g.id,
+- }
+- return r
-}
-
--// BodyParameter creates a new Parameter of kind Body for documentation purposes.
--// It is initialized as required without a DataType.
--func (w *WebService) BodyParameter(name, description string) *Parameter {
-- p := &Parameter{&ParameterData{Name: name, Description: description, Required: true}}
-- p.beBody()
-- return p
+-func (srv *Server) notImplemented(w http.ResponseWriter, req *http.Request, reqId string) interface{} {
+- fatalf(500, "InternalError", "not implemented")
+- panic("not reached")
-}
-
--// HeaderParameter creates a new Parameter of kind (Http) Header for documentation purposes.
--// It is initialized as not required with string as its DataType.
--func (w *WebService) HeaderParameter(name, description string) *Parameter {
-- p := &Parameter{&ParameterData{Name: name, Description: description, Required: false, DataType: "string"}}
-- p.beHeader()
-- return p
--}
+-func (srv *Server) describeInstances(w http.ResponseWriter, req *http.Request, reqId string) interface{} {
+- srv.mu.Lock()
+- defer srv.mu.Unlock()
+- insts := make(map[*Instance]bool)
+- for name, vals := range req.Form {
+- if !strings.HasPrefix(name, "InstanceId.") {
+- continue
+- }
+- inst := srv.instances[vals[0]]
+- if inst == nil {
+- fatalf(400, "InvalidInstanceID.NotFound", "instance %q not found", vals[0])
+- }
+- insts[inst] = true
+- }
-
--// FormParameter creates a new Parameter of kind Form (using application/x-www-form-urlencoded) for documentation purposes.
--// It is initialized as required with string as its DataType.
--func (w *WebService) FormParameter(name, description string) *Parameter {
-- p := &Parameter{&ParameterData{Name: name, Description: description, Required: false, DataType: "string"}}
-- p.beForm()
-- return p
--}
+- f := newFilter(req.Form)
-
--// Route creates a new Route using the RouteBuilder and add to the ordered list of Routes.
--func (w *WebService) Route(builder *RouteBuilder) *WebService {
-- builder.copyDefaults(w.produces, w.consumes)
-- w.routes = append(w.routes, builder.Build())
-- return w
+- var resp ec2.InstancesResp
+- resp.RequestId = reqId
+- for _, r := range srv.reservations {
+- var instances []ec2.Instance
+- for _, inst := range r.instances {
+- if len(insts) > 0 && !insts[inst] {
+- continue
+- }
+- ok, err := f.ok(inst)
+- if ok {
+- instances = append(instances, inst.ec2instance())
+- } else if err != nil {
+- fatalf(400, "InvalidParameterValue", "describe instances: %v", err)
+- }
+- }
+- if len(instances) > 0 {
+- var groups []ec2.SecurityGroup
+- for _, g := range r.groups {
+- groups = append(groups, g.ec2SecurityGroup())
+- }
+- resp.Reservations = append(resp.Reservations, ec2.Reservation{
+- ReservationId: r.id,
+- OwnerId: ownerId,
+- Instances: instances,
+- SecurityGroups: groups,
+- })
+- }
+- }
+- return &resp
-}
-
--// Method creates a new RouteBuilder and initialize its http method
--func (w *WebService) Method(httpMethod string) *RouteBuilder {
-- return new(RouteBuilder).servicePath(w.rootPath).Method(httpMethod)
--}
+-func (srv *Server) describeSecurityGroups(w http.ResponseWriter, req *http.Request, reqId string) interface{} {
+- // BUG similar bug to describeInstances, but for GroupName and GroupId
+- srv.mu.Lock()
+- defer srv.mu.Unlock()
-
--// Produces specifies that this WebService can produce one or more MIME types.
--// Http requests must have one of these values set for the Accept header.
--func (w *WebService) Produces(contentTypes ...string) *WebService {
-- w.produces = contentTypes
-- return w
--}
+- var groups []*securityGroup
+- for name, vals := range req.Form {
+- var g ec2.SecurityGroup
+- switch {
+- case strings.HasPrefix(name, "GroupName."):
+- g.Name = vals[0]
+- case strings.HasPrefix(name, "GroupId."):
+- g.Id = vals[0]
+- default:
+- continue
+- }
+- sg := srv.group(g)
+- if sg == nil {
+- fatalf(400, "InvalidGroup.NotFound", "no such group %v", g)
+- }
+- groups = append(groups, sg)
+- }
+- if len(groups) == 0 {
+- for _, g := range srv.groups {
+- groups = append(groups, g)
+- }
+- }
-
--// Consumes specifies that this WebService can consume one or more MIME types.
--// Http requests must have one of these values set for the Content-Type header.
--func (w *WebService) Consumes(accepts ...string) *WebService {
-- w.consumes = accepts
-- return w
+- f := newFilter(req.Form)
+- var resp ec2.SecurityGroupsResp
+- resp.RequestId = reqId
+- for _, group := range groups {
+- ok, err := f.ok(group)
+- if ok {
+- resp.Groups = append(resp.Groups, ec2.SecurityGroupInfo{
+- OwnerId: ownerId,
+- SecurityGroup: group.ec2SecurityGroup(),
+- Description: group.description,
+- IPPerms: group.ec2Perms(),
+- })
+- } else if err != nil {
+- fatalf(400, "InvalidParameterValue", "describe security groups: %v", err)
+- }
+- }
+- return &resp
-}
-
--// Routes returns the Routes associated with this WebService
--func (w WebService) Routes() []Route {
-- return w.routes
--}
+-func (srv *Server) authorizeSecurityGroupIngress(w http.ResponseWriter, req *http.Request, reqId string) interface{} {
+- srv.mu.Lock()
+- defer srv.mu.Unlock()
+- g := srv.group(ec2.SecurityGroup{
+- Name: req.Form.Get("GroupName"),
+- Id: req.Form.Get("GroupId"),
+- })
+- if g == nil {
+- fatalf(400, "InvalidGroup.NotFound", "group not found")
+- }
+- perms := srv.parsePerms(req)
-
--// RootPath returns the RootPath associated with this WebService. Default "/"
--func (w WebService) RootPath() string {
-- return w.rootPath
+- for _, p := range perms {
+- if g.perms[p] {
+- fatalf(400, "InvalidPermission.Duplicate", "Permission has already been authorized on the specified group")
+- }
+- }
+- for _, p := range perms {
+- g.perms[p] = true
+- }
+- return &ec2.SimpleResp{
+- XMLName: xml.Name{"", "AuthorizeSecurityGroupIngressResponse"},
+- RequestId: reqId,
+- }
-}
-
--// PathParameters return the path parameter names for (shared amoung its Routes)
--func (w WebService) PathParameters() []*Parameter {
-- return w.pathParameters
--}
+-func (srv *Server) revokeSecurityGroupIngress(w http.ResponseWriter, req *http.Request, reqId string) interface{} {
+- srv.mu.Lock()
+- defer srv.mu.Unlock()
+- g := srv.group(ec2.SecurityGroup{
+- Name: req.Form.Get("GroupName"),
+- Id: req.Form.Get("GroupId"),
+- })
+- if g == nil {
+- fatalf(400, "InvalidGroup.NotFound", "group not found")
+- }
+- perms := srv.parsePerms(req)
-
--// Filter adds a filter function to the chain of filters applicable to all its Routes
--func (w *WebService) Filter(filter FilterFunction) *WebService {
-- w.filters = append(w.filters, filter)
-- return w
+- // Note EC2 does not give an error if asked to revoke an authorization
+- // that does not exist.
+- for _, p := range perms {
+- delete(g.perms, p)
+- }
+- return &ec2.SimpleResp{
+- XMLName: xml.Name{"", "RevokeSecurityGroupIngressResponse"},
+- RequestId: reqId,
+- }
-}
-
--// Doc is used to set the documentation of this service.
--func (w *WebService) Doc(plainText string) *WebService {
-- w.documentation = plainText
-- return w
--}
+-var secGroupPat = regexp.MustCompile(`^sg-[a-z0-9]+$`)
+-var ipPat = regexp.MustCompile(`^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/[0-9]+$`)
+-var ownerIdPat = regexp.MustCompile(`^[0-9]+$`)
-
--// Documentation returns it.
--func (w WebService) Documentation() string {
-- return w.documentation
--}
+-// parsePerms returns a slice of permKey values extracted
+-// from the permission fields in req.
+-func (srv *Server) parsePerms(req *http.Request) []permKey {
+- // perms maps an index found in the form to its associated
+- // IPPerm. For instance, the form value with key
+- // "IpPermissions.3.FromPort" will be stored in perms[3].FromPort
+- perms := make(map[int]ec2.IPPerm)
-
--/*
-- Convenience methods
--*/
+- type subgroupKey struct {
+- id1, id2 int
+- }
+- // Each IPPerm can have many source security groups. The form key
+- // for a source security group contains two indices: the index
+- // of the IPPerm and the sub-index of the security group. The
+- // sourceGroups map maps from a subgroupKey containing these
+- // two indices to the associated security group. For instance,
+- // the form value with key "IPPermissions.3.Groups.2.GroupName"
+- // will be stored in sourceGroups[subgroupKey{3, 2}].Name.
+- sourceGroups := make(map[subgroupKey]ec2.UserSecurityGroup)
-
--// HEAD is a shortcut for .Method("HEAD").Path(subPath)
--func (w *WebService) HEAD(subPath string) *RouteBuilder {
-- return new(RouteBuilder).servicePath(w.rootPath).Method("HEAD").Path(subPath)
+- // For each value in the form we store its associated information in the
+- // above maps. The maps are necessary because the form keys may
+- // arrive in any order, and the indices are not
+- // necessarily sequential or even small.
+- for name, vals := range req.Form {
+- val := vals[0]
+- var id1 int
+- var rest string
+- if x, _ := fmt.Sscanf(name, "IpPermissions.%d.%s", &id1, &rest); x != 2 {
+- continue
+- }
+- ec2p := perms[id1]
+- switch {
+- case rest == "FromPort":
+- ec2p.FromPort = atoi(val)
+- case rest == "ToPort":
+- ec2p.ToPort = atoi(val)
+- case rest == "IpProtocol":
+- switch val {
+- case "tcp", "udp", "icmp":
+- ec2p.Protocol = val
+- default:
+- // check it's a well formed number
+- atoi(val)
+- ec2p.Protocol = val
+- }
+- case strings.HasPrefix(rest, "Groups."):
+- k := subgroupKey{id1: id1}
+- if x, _ := fmt.Sscanf(rest[len("Groups."):], "%d.%s", &k.id2, &rest); x != 2 {
+- continue
+- }
+- g := sourceGroups[k]
+- switch rest {
+- case "UserId":
+- // BUG if the user id is blank, this does not conform to the
+- // way that EC2 handles it - a specified but blank owner id
+- // can cause RevokeSecurityGroupIngress to fail with
+- // "group not found" even if the security group id has been
+- // correctly specified.
+- // By failing here, we ensure that we fail early in this case.
+- if !ownerIdPat.MatchString(val) {
+- fatalf(400, "InvalidUserID.Malformed", "Invalid user ID: %q", val)
+- }
+- g.OwnerId = val
+- case "GroupName":
+- g.Name = val
+- case "GroupId":
+- if !secGroupPat.MatchString(val) {
+- fatalf(400, "InvalidGroupId.Malformed", "Invalid group ID: %q", val)
+- }
+- g.Id = val
+- default:
+- fatalf(400, "UnknownParameter", "unknown parameter %q", name)
+- }
+- sourceGroups[k] = g
+- case strings.HasPrefix(rest, "IpRanges."):
+- var id2 int
+- if x, _ := fmt.Sscanf(rest[len("IpRanges."):], "%d.%s", &id2, &rest); x != 2 {
+- continue
+- }
+- switch rest {
+- case "CidrIp":
+- if !ipPat.MatchString(val) {
+- fatalf(400, "InvalidPermission.Malformed", "Invalid IP range: %q", val)
+- }
+- ec2p.SourceIPs = append(ec2p.SourceIPs, val)
+- default:
+- fatalf(400, "UnknownParameter", "unknown parameter %q", name)
+- }
+- default:
+- fatalf(400, "UnknownParameter", "unknown parameter %q", name)
+- }
+- perms[id1] = ec2p
+- }
+- // Associate each set of source groups with its IPPerm.
+- for k, g := range sourceGroups {
+- p := perms[k.id1]
+- p.SourceGroups = append(p.SourceGroups, g)
+- perms[k.id1] = p
+- }
+-
+- // Now that we have built up the IPPerms we need, we check for
+- // parameter errors and build up a permKey for each permission,
+- // looking up security groups from srv as we do so.
+- var result []permKey
+- for _, p := range perms {
+- if p.FromPort > p.ToPort {
+- fatalf(400, "InvalidParameterValue", "invalid port range")
+- }
+- k := permKey{
+- protocol: p.Protocol,
+- fromPort: p.FromPort,
+- toPort: p.ToPort,
+- }
+- for _, g := range p.SourceGroups {
+- if g.OwnerId != "" && g.OwnerId != ownerId {
+- fatalf(400, "InvalidGroup.NotFound", "group %q not found", g.Name)
+- }
+- var ec2g ec2.SecurityGroup
+- switch {
+- case g.Id != "":
+- ec2g.Id = g.Id
+- case g.Name != "":
+- ec2g.Name = g.Name
+- }
+- k.group = srv.group(ec2g)
+- if k.group == nil {
+- fatalf(400, "InvalidGroup.NotFound", "group %v not found", g)
+- }
+- result = append(result, k)
+- }
+- k.group = nil
+- for _, ip := range p.SourceIPs {
+- k.ipAddr = ip
+- result = append(result, k)
+- }
+- }
+- return result
-}
-
--// GET is a shortcut for .Method("GET").Path(subPath)
--func (w *WebService) GET(subPath string) *RouteBuilder {
-- return new(RouteBuilder).servicePath(w.rootPath).Method("GET").Path(subPath)
+-func (srv *Server) deleteSecurityGroup(w http.ResponseWriter, req *http.Request, reqId string) interface{} {
+- srv.mu.Lock()
+- defer srv.mu.Unlock()
+- g := srv.group(ec2.SecurityGroup{
+- Name: req.Form.Get("GroupName"),
+- Id: req.Form.Get("GroupId"),
+- })
+- if g == nil {
+- fatalf(400, "InvalidGroup.NotFound", "group not found")
+- }
+- for _, r := range srv.reservations {
+- for _, h := range r.groups {
+- if h == g && r.hasRunningMachine() {
+- fatalf(500, "InvalidGroup.InUse", "group is currently in use by a running instance")
+- }
+- }
+- }
+- for _, sg := range srv.groups {
+- // If a group refers to itself, it's ok to delete it.
+- if sg == g {
+- continue
+- }
+- for k := range sg.perms {
+- if k.group == g {
+- fatalf(500, "InvalidGroup.InUse", "group is currently in use by group %q", sg.id)
+- }
+- }
+- }
+-
+- delete(srv.groups, g.id)
+- return &ec2.SimpleResp{
+- XMLName: xml.Name{"", "DeleteSecurityGroupResponse"},
+- RequestId: reqId,
+- }
-}
-
--// POST is a shortcut for .Method("POST").Path(subPath)
--func (w *WebService) POST(subPath string) *RouteBuilder {
-- return new(RouteBuilder).servicePath(w.rootPath).Method("POST").Path(subPath)
+-func (r *reservation) hasRunningMachine() bool {
+- for _, inst := range r.instances {
+- if inst.state.Code != ShuttingDown.Code && inst.state.Code != Terminated.Code {
+- return true
+- }
+- }
+- return false
-}
-
--// PUT is a shortcut for .Method("PUT").Path(subPath)
--func (w *WebService) PUT(subPath string) *RouteBuilder {
-- return new(RouteBuilder).servicePath(w.rootPath).Method("PUT").Path(subPath)
+-type counter int
+-
+-func (c *counter) next() (i int) {
+- i = int(*c)
+- (*c)++
+- return
-}
-
--// PATCH is a shortcut for .Method("PATCH").Path(subPath)
--func (w *WebService) PATCH(subPath string) *RouteBuilder {
-- return new(RouteBuilder).servicePath(w.rootPath).Method("PATCH").Path(subPath)
+-// atoi is like strconv.Atoi but is fatal if the
+-// string is not well formed.
+-func atoi(s string) int {
+- i, err := strconv.Atoi(s)
+- if err != nil {
+- fatalf(400, "InvalidParameterValue", "bad number: %v", err)
+- }
+- return i
-}
-
--// DELETE is a shortcut for .Method("DELETE").Path(subPath)
--func (w *WebService) DELETE(subPath string) *RouteBuilder {
-- return new(RouteBuilder).servicePath(w.rootPath).Method("DELETE").Path(subPath)
+-func fatalf(statusCode int, code string, f string, a ...interface{}) {
+- panic(&ec2.Error{
+- StatusCode: statusCode,
+- Code: code,
+- Message: fmt.Sprintf(f, a...),
+- })
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/web_service_container.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/web_service_container.go
+diff --git a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/export_test.go b/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/export_test.go
deleted file mode 100644
-index c9d31b0..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/web_service_container.go
+index 1c24422..0000000
+--- a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/export_test.go
+++ /dev/null
-@@ -1,39 +0,0 @@
--package restful
--
--// Copyright 2013 Ernest Micklei. All rights reserved.
--// Use of this source code is governed by a license
--// that can be found in the LICENSE file.
+@@ -1,22 +0,0 @@
+-package ec2
-
-import (
-- "net/http"
+- "github.com/mitchellh/goamz/aws"
+- "time"
-)
-
--// DefaultContainer is a restful.Container that uses http.DefaultServeMux
--var DefaultContainer *Container
--
--func init() {
-- DefaultContainer = NewContainer()
-- DefaultContainer.ServeMux = http.DefaultServeMux
--}
--
--// If set the true then panics will not be caught to return HTTP 500.
--// In that case, Route functions are responsible for handling any error situation.
--// Default value is false = recover from panics. This has performance implications.
--// OBSOLETE ; use restful.DefaultContainer.DoNotRecover(true)
--var DoNotRecover = false
--
--// Add registers a new WebService add it to the DefaultContainer.
--func Add(service *WebService) {
-- DefaultContainer.Add(service)
+-func Sign(auth aws.Auth, method, path string, params map[string]string, host string) {
+- sign(auth, method, path, params, host)
-}
-
--// Filter appends a container FilterFunction from the DefaultContainer.
--// These are called before dispatching a http.Request to a WebService.
--func Filter(filter FilterFunction) {
-- DefaultContainer.Filter(filter)
+-func fixedTime() time.Time {
+- return time.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC)
-}
-
--// RegisteredWebServices returns the collections of WebServices from the DefaultContainer
--func RegisteredWebServices() []*WebService {
-- return DefaultContainer.RegisteredWebServices()
+-func FakeTime(fakeIt bool) {
+- if fakeIt {
+- timeNow = fixedTime
+- } else {
+- timeNow = time.Now
+- }
-}
-diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/web_service_test.go b/Godeps/_workspace/src/github.com/emicklei/go-restful/web_service_test.go
+diff --git a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/responses_test.go b/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/responses_test.go
deleted file mode 100644
-index e200979..0000000
---- a/Godeps/_workspace/src/github.com/emicklei/go-restful/web_service_test.go
+index 0a4dbb3..0000000
+--- a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/responses_test.go
+++ /dev/null
-@@ -1,115 +0,0 @@
--package restful
+@@ -1,854 +0,0 @@
+-package ec2_test
+-
+-var ErrorDump = `
+-<?xml version="1.0" encoding="UTF-8"?>
+-<Response><Errors><Error><Code>UnsupportedOperation</Code>
+-<Message>AMIs with an instance-store root device are not supported for the instance type 't1.micro'.</Message>
+-</Error></Errors><RequestID>0503f4e9-bbd6-483c-b54f-c4ae9f3b30f4</RequestID></Response>
+-`
+-
+-// http://goo.gl/Mcm3b
+-var RunInstancesExample = `
+-<RunInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2011-12-15/">
+- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
+- <reservationId>r-47a5402e</reservationId>
+- <ownerId>999988887777</ownerId>
+- <groupSet>
+- <item>
+- <groupId>sg-67ad940e</groupId>
+- <groupName>default</groupName>
+- </item>
+- </groupSet>
+- <instancesSet>
+- <item>
+- <instanceId>i-2ba64342</instanceId>
+- <imageId>ami-60a54009</imageId>
+- <instanceState>
+- <code>0</code>
+- <name>pending</name>
+- </instanceState>
+- <privateDnsName></privateDnsName>
+- <dnsName></dnsName>
+- <keyName>example-key-name</keyName>
+- <amiLaunchIndex>0</amiLaunchIndex>
+- <instanceType>m1.small</instanceType>
+- <launchTime>2007-08-07T11:51:50.000Z</launchTime>
+- <placement>
+- <availabilityZone>us-east-1b</availabilityZone>
+- </placement>
+- <monitoring>
+- <state>enabled</state>
+- </monitoring>
+- <virtualizationType>paravirtual</virtualizationType>
+- <clientToken/>
+- <tagSet/>
+- <hypervisor>xen</hypervisor>
+- </item>
+- <item>
+- <instanceId>i-2bc64242</instanceId>
+- <imageId>ami-60a54009</imageId>
+- <instanceState>
+- <code>0</code>
+- <name>pending</name>
+- </instanceState>
+- <privateDnsName></privateDnsName>
+- <dnsName></dnsName>
+- <keyName>example-key-name</keyName>
+- <amiLaunchIndex>1</amiLaunchIndex>
+- <instanceType>m1.small</instanceType>
+- <launchTime>2007-08-07T11:51:50.000Z</launchTime>
+- <placement>
+- <availabilityZone>us-east-1b</availabilityZone>
+- </placement>
+- <monitoring>
+- <state>enabled</state>
+- </monitoring>
+- <virtualizationType>paravirtual</virtualizationType>
+- <clientToken/>
+- <tagSet/>
+- <hypervisor>xen</hypervisor>
+- </item>
+- <item>
+- <instanceId>i-2be64332</instanceId>
+- <imageId>ami-60a54009</imageId>
+- <instanceState>
+- <code>0</code>
+- <name>pending</name>
+- </instanceState>
+- <privateDnsName></privateDnsName>
+- <dnsName></dnsName>
+- <keyName>example-key-name</keyName>
+- <amiLaunchIndex>2</amiLaunchIndex>
+- <instanceType>m1.small</instanceType>
+- <launchTime>2007-08-07T11:51:50.000Z</launchTime>
+- <placement>
+- <availabilityZone>us-east-1b</availabilityZone>
+- </placement>
+- <monitoring>
+- <state>enabled</state>
+- </monitoring>
+- <virtualizationType>paravirtual</virtualizationType>
+- <clientToken/>
+- <tagSet/>
+- <hypervisor>xen</hypervisor>
+- </item>
+- </instancesSet>
+-</RunInstancesResponse>
+-`
+-
+-// http://goo.gl/GRZgCD
+-var RequestSpotInstancesExample = `
+-<RequestSpotInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2014-02-01/">
+- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
+- <spotInstanceRequestSet>
+- <item>
+- <spotInstanceRequestId>sir-1a2b3c4d</spotInstanceRequestId>
+- <spotPrice>0.5</spotPrice>
+- <type>one-time</type>
+- <state>open</state>
+- <status>
+- <code>pending-evaluation</code>
+- <updateTime>2008-05-07T12:51:50.000Z</updateTime>
+- <message>Your Spot request has been submitted for review, and is pending evaluation.</message>
+- </status>
+- <availabilityZoneGroup>MyAzGroup</availabilityZoneGroup>
+- <launchSpecification>
+- <imageId>ami-1a2b3c4d</imageId>
+- <keyName>gsg-keypair</keyName>
+- <groupSet>
+- <item>
+- <groupId>sg-1a2b3c4d</groupId>
+- <groupName>websrv</groupName>
+- </item>
+- </groupSet>
+- <instanceType>m1.small</instanceType>
+- <blockDeviceMapping/>
+- <monitoring>
+- <enabled>false</enabled>
+- </monitoring>
+- <ebsOptimized>false</ebsOptimized>
+- </launchSpecification>
+- <createTime>YYYY-MM-DDTHH:MM:SS.000Z</createTime>
+- <productDescription>Linux/UNIX</productDescription>
+- </item>
+- </spotInstanceRequestSet>
+-</RequestSpotInstancesResponse>
+-`
-
--import (
-- "net/http"
-- "net/http/httptest"
-- "testing"
--)
+-// http://goo.gl/KsKJJk
+-var DescribeSpotRequestsExample = `
+-<DescribeSpotInstanceRequestsResponse xmlns="http://ec2.amazonaws.com/doc/2014-02-01/">
+- <requestId>b1719f2a-5334-4479-b2f1-26926EXAMPLE</requestId>
+- <spotInstanceRequestSet>
+- <item>
+- <spotInstanceRequestId>sir-1a2b3c4d</spotInstanceRequestId>
+- <spotPrice>0.5</spotPrice>
+- <type>one-time</type>
+- <state>active</state>
+- <status>
+- <code>fulfilled</code>
+- <updateTime>2008-05-07T12:51:50.000Z</updateTime>
+- <message>Your Spot request is fulfilled.</message>
+- </status>
+- <launchSpecification>
+- <imageId>ami-1a2b3c4d</imageId>
+- <keyName>gsg-keypair</keyName>
+- <groupSet>
+- <item>
+- <groupId>sg-1a2b3c4d</groupId>
+- <groupName>websrv</groupName>
+- </item>
+- </groupSet>
+- <instanceType>m1.small</instanceType>
+- <monitoring>
+- <enabled>false</enabled>
+- </monitoring>
+- <ebsOptimized>false</ebsOptimized>
+- </launchSpecification>
+- <instanceId>i-1a2b3c4d</instanceId>
+- <createTime>YYYY-MM-DDTHH:MM:SS.000Z</createTime>
+- <productDescription>Linux/UNIX</productDescription>
+- <launchedAvailabilityZone>us-east-1a</launchedAvailabilityZone>
+- </item>
+- </spotInstanceRequestSet>
+-</DescribeSpotInstanceRequestsResponse>
+-`
-
--const (
-- pathGetFriends = "/get/{userId}/friends"
--)
+-// http://goo.gl/DcfFgJ
+-var CancelSpotRequestsExample = `
+-<CancelSpotInstanceRequestsResponse xmlns="http://ec2.amazonaws.com/doc/2014-02-01/">
+- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
+- <spotInstanceRequestSet>
+- <item>
+- <spotInstanceRequestId>sir-1a2b3c4d</spotInstanceRequestId>
+- <state>cancelled</state>
+- </item>
+- </spotInstanceRequestSet>
+-</CancelSpotInstanceRequestsResponse>
+-`
-
--func TestParameter(t *testing.T) {
-- p := &Parameter{&ParameterData{Name: "name", Description: "desc"}}
-- p.AllowMultiple(true)
-- p.DataType("int")
-- p.Required(true)
-- values := map[string]string{"a": "b"}
-- p.AllowableValues(values)
-- p.bePath()
+-// http://goo.gl/3BKHj
+-var TerminateInstancesExample = `
+-<TerminateInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2011-12-15/">
+- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
+- <instancesSet>
+- <item>
+- <instanceId>i-3ea74257</instanceId>
+- <currentState>
+- <code>32</code>
+- <name>shutting-down</name>
+- </currentState>
+- <previousState>
+- <code>16</code>
+- <name>running</name>
+- </previousState>
+- </item>
+- </instancesSet>
+-</TerminateInstancesResponse>
+-`
-
-- ws := new(WebService)
-- ws.Param(p)
-- if ws.pathParameters[0].Data().Name != "name" {
-- t.Error("path parameter (or name) invalid")
-- }
--}
--func TestWebService_CanCreateParameterKinds(t *testing.T) {
-- ws := new(WebService)
-- if ws.BodyParameter("b", "b").Kind() != BodyParameterKind {
-- t.Error("body parameter expected")
-- }
-- if ws.PathParameter("p", "p").Kind() != PathParameterKind {
-- t.Error("path parameter expected")
-- }
-- if ws.QueryParameter("q", "q").Kind() != QueryParameterKind {
-- t.Error("query parameter expected")
-- }
--}
+-// http://goo.gl/mLbmw
+-var DescribeInstancesExample1 = `
+-<DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2011-12-15/">
+- <requestId>98e3c9a4-848c-4d6d-8e8a-b1bdEXAMPLE</requestId>
+- <reservationSet>
+- <item>
+- <reservationId>r-b27e30d9</reservationId>
+- <ownerId>999988887777</ownerId>
+- <groupSet>
+- <item>
+- <groupId>sg-67ad940e</groupId>
+- <groupName>default</groupName>
+- </item>
+- </groupSet>
+- <instancesSet>
+- <item>
+- <instanceId>i-c5cd56af</instanceId>
+- <imageId>ami-1a2b3c4d</imageId>
+- <instanceState>
+- <code>16</code>
+- <name>running</name>
+- </instanceState>
+- <privateDnsName>domU-12-31-39-10-56-34.compute-1.internal</privateDnsName>
+- <dnsName>ec2-174-129-165-232.compute-1.amazonaws.com</dnsName>
+- <reason/>
+- <keyName>GSG_Keypair</keyName>
+- <amiLaunchIndex>0</amiLaunchIndex>
+- <productCodes/>
+- <instanceType>m1.small</instanceType>
+- <launchTime>2010-08-17T01:15:18.000Z</launchTime>
+- <placement>
+- <availabilityZone>us-east-1b</availabilityZone>
+- <groupName/>
+- </placement>
+- <kernelId>aki-94c527fd</kernelId>
+- <ramdiskId>ari-96c527ff</ramdiskId>
+- <monitoring>
+- <state>disabled</state>
+- </monitoring>
+- <privateIpAddress>10.198.85.190</privateIpAddress>
+- <ipAddress>174.129.165.232</ipAddress>
+- <architecture>i386</architecture>
+- <rootDeviceType>ebs</rootDeviceType>
+- <rootDeviceName>/dev/sda1</rootDeviceName>
+- <blockDeviceMapping>
+- <item>
+- <deviceName>/dev/sda1</deviceName>
+- <ebs>
+- <volumeId>vol-a082c1c9</volumeId>
+- <status>attached</status>
+- <attachTime>2010-08-17T01:15:21.000Z</attachTime>
+- <deleteOnTermination>false</deleteOnTermination>
+- </ebs>
+- </item>
+- </blockDeviceMapping>
+- <instanceLifecycle>spot</instanceLifecycle>
+- <spotInstanceRequestId>sir-7a688402</spotInstanceRequestId>
+- <virtualizationType>paravirtual</virtualizationType>
+- <clientToken/>
+- <tagSet/>
+- <hypervisor>xen</hypervisor>
+- </item>
+- </instancesSet>
+- <requesterId>854251627541</requesterId>
+- </item>
+- <item>
+- <reservationId>r-b67e30dd</reservationId>
+- <ownerId>999988887777</ownerId>
+- <groupSet>
+- <item>
+- <groupId>sg-67ad940e</groupId>
+- <groupName>default</groupName>
+- </item>
+- </groupSet>
+- <instancesSet>
+- <item>
+- <instanceId>i-d9cd56b3</instanceId>
+- <imageId>ami-1a2b3c4d</imageId>
+- <instanceState>
+- <code>16</code>
+- <name>running</name>
+- </instanceState>
+- <privateDnsName>domU-12-31-39-10-54-E5.compute-1.internal</privateDnsName>
+- <dnsName>ec2-184-73-58-78.compute-1.amazonaws.com</dnsName>
+- <reason/>
+- <keyName>GSG_Keypair</keyName>
+- <amiLaunchIndex>0</amiLaunchIndex>
+- <productCodes/>
+- <instanceType>m1.large</instanceType>
+- <launchTime>2010-08-17T01:15:19.000Z</launchTime>
+- <placement>
+- <availabilityZone>us-east-1b</availabilityZone>
+- <groupName/>
+- </placement>
+- <kernelId>aki-94c527fd</kernelId>
+- <ramdiskId>ari-96c527ff</ramdiskId>
+- <monitoring>
+- <state>disabled</state>
+- </monitoring>
+- <privateIpAddress>10.198.87.19</privateIpAddress>
+- <ipAddress>184.73.58.78</ipAddress>
+- <architecture>i386</architecture>
+- <rootDeviceType>ebs</rootDeviceType>
+- <rootDeviceName>/dev/sda1</rootDeviceName>
+- <blockDeviceMapping>
+- <item>
+- <deviceName>/dev/sda1</deviceName>
+- <ebs>
+- <volumeId>vol-a282c1cb</volumeId>
+- <status>attached</status>
+- <attachTime>2010-08-17T01:15:23.000Z</attachTime>
+- <deleteOnTermination>false</deleteOnTermination>
+- </ebs>
+- </item>
+- </blockDeviceMapping>
+- <instanceLifecycle>spot</instanceLifecycle>
+- <spotInstanceRequestId>sir-55a3aa02</spotInstanceRequestId>
+- <virtualizationType>paravirtual</virtualizationType>
+- <clientToken/>
+- <tagSet/>
+- <hypervisor>xen</hypervisor>
+- </item>
+- </instancesSet>
+- <requesterId>854251627541</requesterId>
+- </item>
+- </reservationSet>
+-</DescribeInstancesResponse>
+-`
-
--func TestCapturePanic(t *testing.T) {
-- tearDown()
-- Add(newPanicingService())
-- httpRequest, _ := http.NewRequest("GET", "http://here.com/fire", nil)
-- httpRequest.Header.Set("Accept", "*/*")
-- httpWriter := httptest.NewRecorder()
-- DefaultContainer.dispatch(httpWriter, httpRequest)
-- if 500 != httpWriter.Code {
-- t.Error("500 expected on fire")
-- }
--}
+-// http://goo.gl/mLbmw
+-var DescribeInstancesExample2 = `
+-<DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2011-12-15/">
+- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
+- <reservationSet>
+- <item>
+- <reservationId>r-bc7e30d7</reservationId>
+- <ownerId>999988887777</ownerId>
+- <groupSet>
+- <item>
+- <groupId>sg-67ad940e</groupId>
+- <groupName>default</groupName>
+- </item>
+- </groupSet>
+- <instancesSet>
+- <item>
+- <instanceId>i-c7cd56ad</instanceId>
+- <imageId>ami-b232d0db</imageId>
+- <instanceState>
+- <code>16</code>
+- <name>running</name>
+- </instanceState>
+- <privateDnsName>domU-12-31-39-01-76-06.compute-1.internal</privateDnsName>
+- <dnsName>ec2-72-44-52-124.compute-1.amazonaws.com</dnsName>
+- <keyName>GSG_Keypair</keyName>
+- <amiLaunchIndex>0</amiLaunchIndex>
+- <productCodes/>
+- <instanceType>m1.small</instanceType>
+- <launchTime>2010-08-17T01:15:16.000Z</launchTime>
+- <placement>
+- <availabilityZone>us-east-1b</availabilityZone>
+- </placement>
+- <kernelId>aki-94c527fd</kernelId>
+- <ramdiskId>ari-96c527ff</ramdiskId>
+- <monitoring>
+- <state>disabled</state>
+- </monitoring>
+- <privateIpAddress>10.255.121.240</privateIpAddress>
+- <ipAddress>72.44.52.124</ipAddress>
+- <architecture>i386</architecture>
+- <rootDeviceType>ebs</rootDeviceType>
+- <rootDeviceName>/dev/sda1</rootDeviceName>
+- <blockDeviceMapping>
+- <item>
+- <deviceName>/dev/sda1</deviceName>
+- <ebs>
+- <volumeId>vol-a482c1cd</volumeId>
+- <status>attached</status>
+- <attachTime>2010-08-17T01:15:26.000Z</attachTime>
+- <deleteOnTermination>true</deleteOnTermination>
+- </ebs>
+- </item>
+- </blockDeviceMapping>
+- <virtualizationType>paravirtual</virtualizationType>
+- <clientToken/>
+- <tagSet>
+- <item>
+- <key>webserver</key>
+- <value></value>
+- </item>
+- <item>
+- <key>stack</key>
+- <value>Production</value>
+- </item>
+- </tagSet>
+- <hypervisor>xen</hypervisor>
+- </item>
+- </instancesSet>
+- </item>
+- </reservationSet>
+-</DescribeInstancesResponse>
+-`
-
--func TestNotFound(t *testing.T) {
-- tearDown()
-- httpRequest, _ := http.NewRequest("GET", "http://here.com/missing", nil)
-- httpRequest.Header.Set("Accept", "*/*")
-- httpWriter := httptest.NewRecorder()
-- DefaultContainer.dispatch(httpWriter, httpRequest)
-- if 404 != httpWriter.Code {
-- t.Error("404 expected on missing")
-- }
--}
+-// http://goo.gl/cxU41
+-var CreateImageExample = `
+-<CreateImageResponse xmlns="http://ec2.amazonaws.com/doc/2013-02-01/">
+- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
+- <imageId>ami-4fa54026</imageId>
+-</CreateImageResponse>
+-`
-
--func TestMethodNotAllowed(t *testing.T) {
-- tearDown()
-- Add(newGetOnlyService())
-- httpRequest, _ := http.NewRequest("POST", "http://here.com/get", nil)
-- httpRequest.Header.Set("Accept", "*/*")
-- httpWriter := httptest.NewRecorder()
-- DefaultContainer.dispatch(httpWriter, httpRequest)
-- if 405 != httpWriter.Code {
-- t.Error("405 expected method not allowed")
-- }
--}
+-// http://goo.gl/V0U25
+-var DescribeImagesExample = `
+-<DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2012-08-15/">
+- <requestId>4a4a27a2-2e7c-475d-b35b-ca822EXAMPLE</requestId>
+- <imagesSet>
+- <item>
+- <imageId>ami-a2469acf</imageId>
+- <imageLocation>aws-marketplace/example-marketplace-amzn-ami.1</imageLocation>
+- <imageState>available</imageState>
+- <imageOwnerId>123456789999</imageOwnerId>
+- <isPublic>true</isPublic>
+- <productCodes>
+- <item>
+- <productCode>a1b2c3d4e5f6g7h8i9j10k11</productCode>
+- <type>marketplace</type>
+- </item>
+- </productCodes>
+- <architecture>i386</architecture>
+- <imageType>machine</imageType>
+- <kernelId>aki-805ea7e9</kernelId>
+- <imageOwnerAlias>aws-marketplace</imageOwnerAlias>
+- <name>example-marketplace-amzn-ami.1</name>
+- <description>Amazon Linux AMI i386 EBS</description>
+- <rootDeviceType>ebs</rootDeviceType>
+- <rootDeviceName>/dev/sda1</rootDeviceName>
+- <blockDeviceMapping>
+- <item>
+- <deviceName>/dev/sda1</deviceName>
+- <ebs>
+- <snapshotId>snap-787e9403</snapshotId>
+- <volumeSize>8</volumeSize>
+- <deleteOnTermination>true</deleteOnTermination>
+- </ebs>
+- </item>
+- </blockDeviceMapping>
+- <virtualizationType>paravirtual</virtualizationType>
+- <hypervisor>xen</hypervisor>
+- </item>
+- </imagesSet>
+-</DescribeImagesResponse>
+-`
-
--func TestSelectedRoutePath_Issue100(t *testing.T) {
-- tearDown()
-- Add(newSelectedRouteTestingService())
-- httpRequest, _ := http.NewRequest("GET", "http://here.com/get/232452/friends", nil)
-- httpRequest.Header.Set("Accept", "*/*")
-- httpWriter := httptest.NewRecorder()
-- DefaultContainer.dispatch(httpWriter, httpRequest)
-- if http.StatusOK != httpWriter.Code {
-- t.Error(http.StatusOK, "expected,", httpWriter.Code, "received.")
-- }
--}
+-// http://goo.gl/bHO3z
+-var ImageAttributeExample = `
+-<DescribeImageAttributeResponse xmlns="http://ec2.amazonaws.com/doc/2013-07-15/">
+- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
+- <imageId>ami-61a54008</imageId>
+- <launchPermission>
+- <item>
+- <group>all</group>
+- </item>
+- <item>
+- <userId>495219933132</userId>
+- </item>
+- </launchPermission>
+-</DescribeImageAttributeResponse>
+-`
-
--func newPanicingService() *WebService {
-- ws := new(WebService).Path("")
-- ws.Route(ws.GET("/fire").To(doPanic))
-- return ws
--}
+-// http://goo.gl/ttcda
+-var CreateSnapshotExample = `
+-<CreateSnapshotResponse xmlns="http://ec2.amazonaws.com/doc/2012-10-01/">
+- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
+- <snapshotId>snap-78a54011</snapshotId>
+- <volumeId>vol-4d826724</volumeId>
+- <status>pending</status>
+- <startTime>2008-05-07T12:51:50.000Z</startTime>
+- <progress>60%</progress>
+- <ownerId>111122223333</ownerId>
+- <volumeSize>10</volumeSize>
+- <description>Daily Backup</description>
+-</CreateSnapshotResponse>
+-`
-
--func newGetOnlyService() *WebService {
-- ws := new(WebService).Path("")
-- ws.Route(ws.GET("/get").To(doPanic))
-- return ws
--}
+-// http://goo.gl/vwU1y
+-var DeleteSnapshotExample = `
+-<DeleteSnapshotResponse xmlns="http://ec2.amazonaws.com/doc/2012-10-01/">
+- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
+- <return>true</return>
+-</DeleteSnapshotResponse>
+-`
-
--func newSelectedRouteTestingService() *WebService {
-- ws := new(WebService).Path("")
-- ws.Route(ws.GET(pathGetFriends).To(selectedRouteChecker))
-- return ws
--}
+-// http://goo.gl/nkovs
+-var DescribeSnapshotsExample = `
+-<DescribeSnapshotsResponse xmlns="http://ec2.amazonaws.com/doc/2012-10-01/">
+- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
+- <snapshotSet>
+- <item>
+- <snapshotId>snap-1a2b3c4d</snapshotId>
+- <volumeId>vol-8875daef</volumeId>
+- <status>pending</status>
+- <startTime>2010-07-29T04:12:01.000Z</startTime>
+- <progress>30%</progress>
+- <ownerId>111122223333</ownerId>
+- <volumeSize>15</volumeSize>
+- <description>Daily Backup</description>
+- <tagSet>
+- <item>
+- <key>Purpose</key>
+- <value>demo_db_14_backup</value>
+- </item>
+- </tagSet>
+- </item>
+- </snapshotSet>
+-</DescribeSnapshotsResponse>
+-`
-
--func selectedRouteChecker(req *Request, resp *Response) {
-- if req.SelectedRoutePath() != pathGetFriends {
-- resp.InternalServerError()
-- }
--}
+-// http://goo.gl/YUjO4G
+-var ModifyImageAttributeExample = `
+-<ModifyImageAttributeResponse xmlns="http://ec2.amazonaws.com/doc/2013-06-15/">
+- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
+- <return>true</return>
+-</ModifyImageAttributeResponse>
+-`
-
--func doPanic(req *Request, resp *Response) {
-- println("lightning...")
-- panic("fire")
--}
-diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/.travis.yml b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/.travis.yml
-deleted file mode 100644
-index ad1dff7..0000000
---- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/.travis.yml
-+++ /dev/null
-@@ -1,13 +0,0 @@
--language: go
--go:
-- - 1.1.2
-- - 1.2.2
-- - 1.3.1
-- - tip
--env:
-- - GOARCH=amd64
-- - GOARCH=386
--install:
-- - go get -d ./...
--script:
-- - go test ./...
-diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/AUTHORS b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/AUTHORS
-deleted file mode 100644
-index bb79881..0000000
---- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/AUTHORS
-+++ /dev/null
-@@ -1,44 +0,0 @@
--# This is the official list of go-dockerclient authors for copyright purposes.
+-// http://goo.gl/hQwPCK
+-var CopyImageExample = `
+-<CopyImageResponse xmlns="http://ec2.amazonaws.com/doc/2013-06-15/">
+- <requestId>60bc441d-fa2c-494d-b155-5d6a3EXAMPLE</requestId>
+- <imageId>ami-4d3c2b1a</imageId>
+-</CopyImageResponse>
+-`
-
--Aldrin Leal <aldrin at leal.eng.br>
--Andreas Jaekle <andreas at jaekle.net>
--Andrews Medina <andrewsmedina at gmail.com>
--Andy Goldstein <andy.goldstein at redhat.com>
--Ben McCann <benmccann.com>
--Carlos Diaz-Padron <cpadron at mozilla.com>
--Cezar Sa Espinola <cezar.sa at corp.globo.com>
--Cheah Chu Yeow <chuyeow at gmail.com>
--cheneydeng <cheneydeng at qq.com>
--CMGS <ilskdw at gmail.com>
--Daniel, Dao Quang Minh <dqminh89 at gmail.com>
--David Huie <dahuie at gmail.com>
--Ed <edrocksit at gmail.com>
--Eric Anderson <anderson at copperegg.com>
--Fabio Rehm <fgrehm at gmail.com>
--Flavia Missi <flaviamissi at gmail.com>
--Francisco Souza <f at souza.cc>
--Jari Kolehmainen <jari.kolehmainen at digia.com>
--Jason Wilder <jwilder at litl.com>
--Jean-Baptiste Dalido <jeanbaptiste at appgratis.com>
--Jeff Mitchell <jeffrey.mitchell at gmail.com>
--Jeffrey Hulten <jhulten at gmail.com>
--Johan Euphrosine <proppy at google.com>
--Karan Misra <kidoman at gmail.com>
--Kim, Hirokuni <hirokuni.kim at kvh.co.jp>
--Lucas Clemente <lucas at clemente.io>
--Omeid Matten <public at omeid.me>
--Paul Morie <pmorie at gmail.com>
--Peter Jihoon Kim <raingrove at gmail.com>
--Philippe Lafoucrière <philippe.lafoucriere at tech-angels.com>
--Rafe Colton <r.colton at modcloth.com>
--Robert Williamson <williamson.robert at gmail.com>
--Salvador Gironès <salvadorgirones at gmail.com>
--Simon Eskildsen <sirup at sirupsen.com>
--Simon Menke <simon.menke at gmail.com>
--Skolos <skolos at gopherlab.com>
--Soulou <leo at unbekandt.eu>
--Sridhar Ratnakumar <sridharr at activestate.com>
--Summer Mousa <smousa at zenoss.com>
--Tarsis Azevedo <tarsis at corp.globo.com>
--Tim Schindler <tim at catalyst-zero.com>
--Wiliam Souza <wiliamsouza83 at gmail.com>
-diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/DOCKER-LICENSE b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/DOCKER-LICENSE
-deleted file mode 100644
-index f4130a5..0000000
---- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/DOCKER-LICENSE
-+++ /dev/null
-@@ -1,6 +0,0 @@
-- Apache License
-- Version 2.0, January 2004
-- http://www.apache.org/licenses/
+-var CreateKeyPairExample = `
+-<CreateKeyPairResponse xmlns="http://ec2.amazonaws.com/doc/2013-02-01/">
+- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
+- <keyName>foo</keyName>
+- <keyFingerprint>
+- 00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00
+- </keyFingerprint>
+- <keyMaterial>---- BEGIN RSA PRIVATE KEY ----
+-MIICiTCCAfICCQD6m7oRw0uXOjANBgkqhkiG9w0BAQUFADCBiDELMAkGA1UEBhMC
+-VVMxCzAJBgNVBAgTAldBMRAwDgYDVQQHEwdTZWF0dGxlMQ8wDQYDVQQKEwZBbWF6
+-b24xFDASBgNVBAsTC0lBTSBDb25zb2xlMRIwEAYDVQQDEwlUZXN0Q2lsYWMxHzAd
+-BgkqhkiG9w0BCQEWEG5vb25lQGFtYXpvbi5jb20wHhcNMTEwNDI1MjA0NTIxWhcN
+-MTIwNDI0MjA0NTIxWjCBiDELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAldBMRAwDgYD
+-VQQHEwdTZWF0dGxlMQ8wDQYDVQQKEwZBbWF6b24xFDASBgNVBAsTC0lBTSBDb25z
+-b2xlMRIwEAYDVQQDEwlUZXN0Q2lsYWMxHzAdBgkqhkiG9w0BCQEWEG5vb25lQGFt
+-YXpvbi5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMaK0dn+a4GmWIWJ
+-21uUSfwfEvySWtC2XADZ4nB+BLYgVIk60CpiwsZ3G93vUEIO3IyNoH/f0wYK8m9T
+-rDHudUZg3qX4waLG5M43q7Wgc/MbQITxOUSQv7c7ugFFDzQGBzZswY6786m86gpE
+-Ibb3OhjZnzcvQAaRHhdlQWIMm2nrAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAtCu4
+-nUhVVxYUntneD9+h8Mg9q6q+auNKyExzyLwaxlAoo7TJHidbtS4J5iNmZgXL0Fkb
+-FFBjvSfpJIlJ00zbhNYS5f6GuoEDmFJl0ZxBHjJnyp378OD8uTs7fLvjx79LjSTb
+-NYiytVbZPQUQ5Yaxu2jXnimvw3rrszlaEXAMPLE=
+------END RSA PRIVATE KEY-----
+-</keyMaterial>
+-</CreateKeyPairResponse>
+-`
-
--You can find the Docker license int the following link:
--https://raw2.github.com/dotcloud/docker/master/LICENSE
-diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/LICENSE b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/LICENSE
-deleted file mode 100644
-index 7a6d8bb..0000000
---- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/LICENSE
-+++ /dev/null
-@@ -1,22 +0,0 @@
--Copyright (c) 2014, go-dockerclient authors
--All rights reserved.
+-var DeleteKeyPairExample = `
+-<DeleteKeyPairResponse xmlns="http://ec2.amazonaws.com/doc/2013-02-01/">
+- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
+- <return>true</return>
+-</DeleteKeyPairResponse>
+-`
-
--Redistribution and use in source and binary forms, with or without
--modification, are permitted provided that the following conditions are met:
+-// http://goo.gl/Eo7Yl
+-var CreateSecurityGroupExample = `
+-<CreateSecurityGroupResponse xmlns="http://ec2.amazonaws.com/doc/2011-12-15/">
+- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
+- <return>true</return>
+- <groupId>sg-67ad940e</groupId>
+-</CreateSecurityGroupResponse>
+-`
-
-- * Redistributions of source code must retain the above copyright notice,
--this list of conditions and the following disclaimer.
-- * Redistributions in binary form must reproduce the above copyright notice,
--this list of conditions and the following disclaimer in the documentation
--and/or other materials provided with the distribution.
+-// http://goo.gl/k12Uy
+-var DescribeSecurityGroupsExample = `
+-<DescribeSecurityGroupsResponse xmlns="http://ec2.amazonaws.com/doc/2011-12-15/">
+- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
+- <securityGroupInfo>
+- <item>
+- <ownerId>999988887777</ownerId>
+- <groupName>WebServers</groupName>
+- <groupId>sg-67ad940e</groupId>
+- <groupDescription>Web Servers</groupDescription>
+- <ipPermissions>
+- <item>
+- <ipProtocol>tcp</ipProtocol>
+- <fromPort>80</fromPort>
+- <toPort>80</toPort>
+- <groups/>
+- <ipRanges>
+- <item>
+- <cidrIp>0.0.0.0/0</cidrIp>
+- </item>
+- </ipRanges>
+- </item>
+- </ipPermissions>
+- </item>
+- <item>
+- <ownerId>999988887777</ownerId>
+- <groupName>RangedPortsBySource</groupName>
+- <groupId>sg-76abc467</groupId>
+- <groupDescription>Group A</groupDescription>
+- <ipPermissions>
+- <item>
+- <ipProtocol>tcp</ipProtocol>
+- <fromPort>6000</fromPort>
+- <toPort>7000</toPort>
+- <groups/>
+- <ipRanges/>
+- </item>
+- </ipPermissions>
+- </item>
+- </securityGroupInfo>
+-</DescribeSecurityGroupsResponse>
+-`
-
--THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
--ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
--WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
--DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
--FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
--DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
--SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
--CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
--OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
--OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/README.markdown b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/README.markdown
-deleted file mode 100644
-index 66cedca..0000000
---- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/README.markdown
-+++ /dev/null
-@@ -1,42 +0,0 @@
--#go-dockerclient
+-// A dump which includes groups within ip permissions.
+-var DescribeSecurityGroupsDump = `
+-<?xml version="1.0" encoding="UTF-8"?>
+-<DescribeSecurityGroupsResponse xmlns="http://ec2.amazonaws.com/doc/2011-12-15/">
+- <requestId>87b92b57-cc6e-48b2-943f-f6f0e5c9f46c</requestId>
+- <securityGroupInfo>
+- <item>
+- <ownerId>12345</ownerId>
+- <groupName>default</groupName>
+- <groupDescription>default group</groupDescription>
+- <ipPermissions>
+- <item>
+- <ipProtocol>icmp</ipProtocol>
+- <fromPort>-1</fromPort>
+- <toPort>-1</toPort>
+- <groups>
+- <item>
+- <userId>12345</userId>
+- <groupName>default</groupName>
+- <groupId>sg-67ad940e</groupId>
+- </item>
+- </groups>
+- <ipRanges/>
+- </item>
+- <item>
+- <ipProtocol>tcp</ipProtocol>
+- <fromPort>0</fromPort>
+- <toPort>65535</toPort>
+- <groups>
+- <item>
+- <userId>12345</userId>
+- <groupName>other</groupName>
+- <groupId>sg-76abc467</groupId>
+- </item>
+- </groups>
+- <ipRanges/>
+- </item>
+- </ipPermissions>
+- </item>
+- </securityGroupInfo>
+-</DescribeSecurityGroupsResponse>
+-`
-
--[](https://drone.io/github.com/fsouza/go-dockerclient/latest)
--[](https://travis-ci.org/fsouza/go-dockerclient)
+-// http://goo.gl/QJJDO
+-var DeleteSecurityGroupExample = `
+-<DeleteSecurityGroupResponse xmlns="http://ec2.amazonaws.com/doc/2011-12-15/">
+- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
+- <return>true</return>
+-</DeleteSecurityGroupResponse>
+-`
-
--[](http://godoc.org/github.com/fsouza/go-dockerclient)
+-// http://goo.gl/u2sDJ
+-var AuthorizeSecurityGroupIngressExample = `
+-<AuthorizeSecurityGroupIngressResponse xmlns="http://ec2.amazonaws.com/doc/2011-12-15/">
+- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
+- <return>true</return>
+-</AuthorizeSecurityGroupIngressResponse>
+-`
-
--This package presents a client for the Docker remote API.
+-// http://goo.gl/u2sDJ
+-var AuthorizeSecurityGroupEgressExample = `
+-<AuthorizeSecurityGroupEgressResponse xmlns="http://ec2.amazonaws.com/doc/2014-06-15/">
+- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
+- <return>true</return>
+-</AuthorizeSecurityGroupEgressResponse>
+-`
-
--For more details, check the [remote API documentation](http://docs.docker.io/en/latest/reference/api/docker_remote_api/).
+-// http://goo.gl/Mz7xr
+-var RevokeSecurityGroupIngressExample = `
+-<RevokeSecurityGroupIngressResponse xmlns="http://ec2.amazonaws.com/doc/2011-12-15/">
+- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
+- <return>true</return>
+-</RevokeSecurityGroupIngressResponse>
+-`
-
--## Example
+-// http://goo.gl/Vmkqc
+-var CreateTagsExample = `
+-<CreateTagsResponse xmlns="http://ec2.amazonaws.com/doc/2011-12-15/">
+- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
+- <return>true</return>
+-</CreateTagsResponse>
+-`
-
--```go
--package main
+-// http://goo.gl/awKeF
+-var StartInstancesExample = `
+-<StartInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2011-12-15/">
+- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
+- <instancesSet>
+- <item>
+- <instanceId>i-10a64379</instanceId>
+- <currentState>
+- <code>0</code>
+- <name>pending</name>
+- </currentState>
+- <previousState>
+- <code>80</code>
+- <name>stopped</name>
+- </previousState>
+- </item>
+- </instancesSet>
+-</StartInstancesResponse>
+-`
-
--import (
-- "fmt"
-- "github.com/fsouza/go-dockerclient"
--)
+-// http://goo.gl/436dJ
+-var StopInstancesExample = `
+-<StopInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2011-12-15/">
+- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
+- <instancesSet>
+- <item>
+- <instanceId>i-10a64379</instanceId>
+- <currentState>
+- <code>64</code>
+- <name>stopping</name>
+- </currentState>
+- <previousState>
+- <code>16</code>
+- <name>running</name>
+- </previousState>
+- </item>
+- </instancesSet>
+-</StopInstancesResponse>
+-`
-
--func main() {
-- endpoint := "unix:///var/run/docker.sock"
-- client, _ := docker.NewClient(endpoint)
-- imgs, _ := client.ListImages(true)
-- for _, img := range imgs {
-- fmt.Println("ID: ", img.ID)
-- fmt.Println("RepoTags: ", img.RepoTags)
-- fmt.Println("Created: ", img.Created)
-- fmt.Println("Size: ", img.Size)
-- fmt.Println("VirtualSize: ", img.VirtualSize)
-- fmt.Println("ParentId: ", img.ParentId)
-- }
--}
--```
+-// http://goo.gl/baoUf
+-var RebootInstancesExample = `
+-<RebootInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2011-12-15/">
+- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
+- <return>true</return>
+-</RebootInstancesResponse>
+-`
-
--## Developing
+-// http://goo.gl/9rprDN
+-var AllocateAddressExample = `
+-<AllocateAddressResponse xmlns="http://ec2.amazonaws.com/doc/2013-10-15/">
+- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
+- <publicIp>198.51.100.1</publicIp>
+- <domain>vpc</domain>
+- <allocationId>eipalloc-5723d13e</allocationId>
+-</AllocateAddressResponse>
+-`
-
--You can run the tests with:
+-// http://goo.gl/3Q0oCc
+-var ReleaseAddressExample = `
+-<ReleaseAddressResponse xmlns="http://ec2.amazonaws.com/doc/2013-10-15/">
+- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
+- <return>true</return>
+-</ReleaseAddressResponse>
+-`
-
-- go get -d ./...
-- go test ./...
-diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/change.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/change.go
-deleted file mode 100644
-index cafffad..0000000
---- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/change.go
-+++ /dev/null
-@@ -1,36 +0,0 @@
--// Copyright 2014 go-dockerclient authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
+-// http://goo.gl/uOSQE
+-var AssociateAddressExample = `
+-<AssociateAddressResponse xmlns="http://ec2.amazonaws.com/doc/2013-10-15/">
+- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
+- <return>true</return>
+- <associationId>eipassoc-fc5ca095</associationId>
+-</AssociateAddressResponse>
+-`
-
--package docker
+-// http://goo.gl/LrOa0
+-var DisassociateAddressExample = `
+-<DisassociateAddressResponse xmlns="http://ec2.amazonaws.com/doc/2013-10-15/">
+- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
+- <return>true</return>
+-</DisassociateAddressResponse>
+-`
-
--import "fmt"
+-// http://goo.gl/icuXh5
+-var ModifyInstanceExample = `
+-<ModifyImageAttributeResponse xmlns="http://ec2.amazonaws.com/doc/2013-06-15/">
+- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
+- <return>true</return>
+-</ModifyImageAttributeResponse>
+-`
-
--type ChangeType int
+-var CreateVpcExample = `
+-<CreateVpcResponse xmlns="http://ec2.amazonaws.com/doc/2014-06-15/">
+- <requestId>7a62c49f-347e-4fc4-9331-6e8eEXAMPLE</requestId>
+- <vpc>
+- <vpcId>vpc-1a2b3c4d</vpcId>
+- <state>pending</state>
+- <cidrBlock>10.0.0.0/16</cidrBlock>
+- <dhcpOptionsId>dopt-1a2b3c4d2</dhcpOptionsId>
+- <instanceTenancy>default</instanceTenancy>
+- <tagSet/>
+- </vpc>
+-</CreateVpcResponse>
+-`
-
--const (
-- ChangeModify ChangeType = iota
-- ChangeAdd
-- ChangeDelete
--)
+-var DescribeVpcsExample = `
+-<DescribeVpcsResponse xmlns="http://ec2.amazonaws.com/doc/2014-06-15/">
+- <requestId>7a62c49f-347e-4fc4-9331-6e8eEXAMPLE</requestId>
+- <vpcSet>
+- <item>
+- <vpcId>vpc-1a2b3c4d</vpcId>
+- <state>available</state>
+- <cidrBlock>10.0.0.0/23</cidrBlock>
+- <dhcpOptionsId>dopt-7a8b9c2d</dhcpOptionsId>
+- <instanceTenancy>default</instanceTenancy>
+- <isDefault>false</isDefault>
+- <tagSet/>
+- </item>
+- </vpcSet>
+-</DescribeVpcsResponse>
+-`
-
--// Change represents a change in a container.
--//
--// See http://goo.gl/QkW9sH for more details.
--type Change struct {
-- Path string
-- Kind ChangeType
--}
+-var CreateSubnetExample = `
+-<CreateSubnetResponse xmlns="http://ec2.amazonaws.com/doc/2014-06-15/">
+- <requestId>7a62c49f-347e-4fc4-9331-6e8eEXAMPLE</requestId>
+- <subnet>
+- <subnetId>subnet-9d4a7b6c</subnetId>
+- <state>pending</state>
+- <vpcId>vpc-1a2b3c4d</vpcId>
+- <cidrBlock>10.0.1.0/24</cidrBlock>
+- <availableIpAddressCount>251</availableIpAddressCount>
+- <availabilityZone>us-east-1a</availabilityZone>
+- <tagSet/>
+- </subnet>
+-</CreateSubnetResponse>
+-`
-
--func (change *Change) String() string {
-- var kind string
-- switch change.Kind {
-- case ChangeModify:
-- kind = "C"
-- case ChangeAdd:
-- kind = "A"
-- case ChangeDelete:
-- kind = "D"
-- }
-- return fmt.Sprintf("%s %s", kind, change.Path)
--}
-diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/change_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/change_test.go
+-// http://goo.gl/r6ZCPm
+-var ResetImageAttributeExample = `
+-<ResetImageAttributeResponse xmlns="http://ec2.amazonaws.com/doc/2014-06-15/">
+- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
+- <return>true</return>
+-</ResetImageAttributeResponse>
+-`
+diff --git a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/sign.go b/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/sign.go
deleted file mode 100644
-index 7c2ec30..0000000
---- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/change_test.go
+index bffc3c7..0000000
+--- a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/sign.go
+++ /dev/null
-@@ -1,26 +0,0 @@
--// Copyright 2014 go-dockerclient authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--package docker
+@@ -1,45 +0,0 @@
+-package ec2
-
-import (
-- "testing"
+- "crypto/hmac"
+- "crypto/sha256"
+- "encoding/base64"
+- "github.com/mitchellh/goamz/aws"
+- "sort"
+- "strings"
-)
-
--func TestChangeString(t *testing.T) {
-- var tests = []struct {
-- change Change
-- expected string
-- }{
-- {Change{"/etc/passwd", ChangeModify}, "C /etc/passwd"},
-- {Change{"/etc/passwd", ChangeAdd}, "A /etc/passwd"},
-- {Change{"/etc/passwd", ChangeDelete}, "D /etc/passwd"},
-- {Change{"/etc/passwd", 33}, " /etc/passwd"},
+-// ----------------------------------------------------------------------------
+-// EC2 signing (http://goo.gl/fQmAN)
+-
+-var b64 = base64.StdEncoding
+-
+-func sign(auth aws.Auth, method, path string, params map[string]string, host string) {
+- params["AWSAccessKeyId"] = auth.AccessKey
+- params["SignatureVersion"] = "2"
+- params["SignatureMethod"] = "HmacSHA256"
+- if auth.Token != "" {
+- params["SecurityToken"] = auth.Token
+- }
+-
+- // AWS specifies that the parameters in a signed request must
+- // be provided in the natural order of the keys. This is distinct
+- // from the natural order of the encoded value of key=value.
+- // Percent and equals affect the sorting order.
+- var keys, sarray []string
+- for k, _ := range params {
+- keys = append(keys, k)
- }
-- for _, tt := range tests {
-- if got := tt.change.String(); got != tt.expected {
-- t.Errorf("Change.String(): want %q. Got %q.", tt.expected, got)
-- }
+- sort.Strings(keys)
+- for _, k := range keys {
+- sarray = append(sarray, aws.Encode(k)+"="+aws.Encode(params[k]))
- }
+- joined := strings.Join(sarray, "&")
+- payload := method + "\n" + host + "\n" + path + "\n" + joined
+- hash := hmac.New(sha256.New, []byte(auth.SecretKey))
+- hash.Write([]byte(payload))
+- signature := make([]byte, b64.EncodedLen(hash.Size()))
+- b64.Encode(signature, hash.Sum(nil))
+-
+- params["Signature"] = string(signature)
-}
-diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/client.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/client.go
+diff --git a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/sign_test.go b/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/sign_test.go
deleted file mode 100644
-index e68a9ef..0000000
---- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/client.go
+index 86d203e..0000000
+--- a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/sign_test.go
+++ /dev/null
-@@ -1,546 +0,0 @@
--// Copyright 2014 go-dockerclient authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--// Package docker provides a client for the Docker remote API.
--//
--// See http://goo.gl/G3plxW for more details on the remote API.
--package docker
+@@ -1,68 +0,0 @@
+-package ec2_test
-
-import (
-- "bytes"
-- "encoding/json"
-- "errors"
-- "fmt"
-- "io"
-- "io/ioutil"
-- "net"
-- "net/http"
-- "net/http/httputil"
-- "net/url"
-- "reflect"
-- "strconv"
-- "strings"
+- "github.com/mitchellh/goamz/aws"
+- "github.com/mitchellh/goamz/ec2"
+- . "github.com/motain/gocheck"
-)
-
--const userAgent = "go-dockerclient"
--
--var (
-- // ErrInvalidEndpoint is returned when the endpoint is not a valid HTTP URL.
-- ErrInvalidEndpoint = errors.New("invalid endpoint")
--
-- // ErrConnectionRefused is returned when the client cannot connect to the given endpoint.
-- ErrConnectionRefused = errors.New("cannot connect to Docker endpoint")
+-// EC2 ReST authentication docs: http://goo.gl/fQmAN
-
-- apiVersion_1_12, _ = NewApiVersion("1.12")
--)
+-var testAuth = aws.Auth{"user", "secret", ""}
-
--// ApiVersion is an internal representation of a version of the Remote API.
--type ApiVersion []int
+-func (s *S) TestBasicSignature(c *C) {
+- params := map[string]string{}
+- ec2.Sign(testAuth, "GET", "/path", params, "localhost")
+- c.Assert(params["SignatureVersion"], Equals, "2")
+- c.Assert(params["SignatureMethod"], Equals, "HmacSHA256")
+- expected := "6lSe5QyXum0jMVc7cOUz32/52ZnL7N5RyKRk/09yiK4="
+- c.Assert(params["Signature"], Equals, expected)
+-}
-
--// NewApiVersion returns an instance of ApiVersion for the given string.
--//
--// The given string must be in the form <major>.<minor>.<patch>, where <major>,
--// <minor> and <patch> are integer numbers.
--func NewApiVersion(input string) (ApiVersion, error) {
-- if !strings.Contains(input, ".") {
-- return nil, fmt.Errorf("Unable to parse version %q", input)
-- }
-- arr := strings.Split(input, ".")
-- ret := make(ApiVersion, len(arr))
-- var err error
-- for i, val := range arr {
-- ret[i], err = strconv.Atoi(val)
-- if err != nil {
-- return nil, fmt.Errorf("Unable to parse version %q: %q is not an integer", input, val)
-- }
+-func (s *S) TestParamSignature(c *C) {
+- params := map[string]string{
+- "param1": "value1",
+- "param2": "value2",
+- "param3": "value3",
- }
-- return ret, nil
+- ec2.Sign(testAuth, "GET", "/path", params, "localhost")
+- expected := "XWOR4+0lmK8bD8CGDGZ4kfuSPbb2JibLJiCl/OPu1oU="
+- c.Assert(params["Signature"], Equals, expected)
-}
-
--func (version ApiVersion) String() string {
-- var str string
-- for i, val := range version {
-- str += strconv.Itoa(val)
-- if i < len(version)-1 {
-- str += "."
-- }
+-func (s *S) TestManyParams(c *C) {
+- params := map[string]string{
+- "param1": "value10",
+- "param2": "value2",
+- "param3": "value3",
+- "param4": "value4",
+- "param5": "value5",
+- "param6": "value6",
+- "param7": "value7",
+- "param8": "value8",
+- "param9": "value9",
+- "param10": "value1",
- }
-- return str
+- ec2.Sign(testAuth, "GET", "/path", params, "localhost")
+- expected := "di0sjxIvezUgQ1SIL6i+C/H8lL+U0CQ9frLIak8jkVg="
+- c.Assert(params["Signature"], Equals, expected)
-}
-
--func (version ApiVersion) LessThan(other ApiVersion) bool {
-- return version.compare(other) < 0
+-func (s *S) TestEscaping(c *C) {
+- params := map[string]string{"Nonce": "+ +"}
+- ec2.Sign(testAuth, "GET", "/path", params, "localhost")
+- c.Assert(params["Nonce"], Equals, "+ +")
+- expected := "bqffDELReIqwjg/W0DnsnVUmfLK4wXVLO4/LuG+1VFA="
+- c.Assert(params["Signature"], Equals, expected)
-}
-
--func (version ApiVersion) LessThanOrEqualTo(other ApiVersion) bool {
-- return version.compare(other) <= 0
+-func (s *S) TestSignatureExample1(c *C) {
+- params := map[string]string{
+- "Timestamp": "2009-02-01T12:53:20+00:00",
+- "Version": "2007-11-07",
+- "Action": "ListDomains",
+- }
+- ec2.Sign(aws.Auth{"access", "secret", ""}, "GET", "/", params, "sdb.amazonaws.com")
+- expected := "okj96/5ucWBSc1uR2zXVfm6mDHtgfNv657rRtt/aunQ="
+- c.Assert(params["Signature"], Equals, expected)
-}
+diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/LICENSE b/Godeps/_workspace/src/github.com/mitchellh/mapstructure/LICENSE
+deleted file mode 100644
+index f9c841a..0000000
+--- a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/LICENSE
++++ /dev/null
+@@ -1,21 +0,0 @@
+-The MIT License (MIT)
-
--func (version ApiVersion) GreaterThan(other ApiVersion) bool {
-- return version.compare(other) > 0
--}
+-Copyright (c) 2013 Mitchell Hashimoto
-
--func (version ApiVersion) GreaterThanOrEqualTo(other ApiVersion) bool {
-- return version.compare(other) >= 0
--}
+-Permission is hereby granted, free of charge, to any person obtaining a copy
+-of this software and associated documentation files (the "Software"), to deal
+-in the Software without restriction, including without limitation the rights
+-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+-copies of the Software, and to permit persons to whom the Software is
+-furnished to do so, subject to the following conditions:
-
--func (version ApiVersion) compare(other ApiVersion) int {
-- for i, v := range version {
-- if i <= len(other)-1 {
-- otherVersion := other[i]
+-The above copyright notice and this permission notice shall be included in
+-all copies or substantial portions of the Software.
-
-- if v < otherVersion {
-- return -1
-- } else if v > otherVersion {
-- return 1
-- }
-- }
-- }
-- if len(version) > len(other) {
-- return 1
-- }
-- if len(version) < len(other) {
-- return -1
-- }
-- return 0
--}
+-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+-THE SOFTWARE.
+diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/README.md b/Godeps/_workspace/src/github.com/mitchellh/mapstructure/README.md
+deleted file mode 100644
+index 659d688..0000000
+--- a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/README.md
++++ /dev/null
+@@ -1,46 +0,0 @@
+-# mapstructure
-
--// Client is the basic type of this package. It provides methods for
--// interaction with the API.
--type Client struct {
-- SkipServerVersionCheck bool
-- HTTPClient *http.Client
+-mapstructure is a Go library for decoding generic map values to structures
+-and vice versa, while providing helpful error handling.
-
-- endpoint string
-- endpointURL *url.URL
-- eventMonitor *eventMonitoringState
-- requestedApiVersion ApiVersion
-- serverApiVersion ApiVersion
-- expectedApiVersion ApiVersion
--}
+-This library is most useful when decoding values from some data stream (JSON,
+-Gob, etc.) where you don't _quite_ know the structure of the underlying data
+-until you read a part of it. You can therefore read a `map[string]interface{}`
+-and use this library to decode it into the proper underlying native Go
+-structure.
-
--// NewClient returns a Client instance ready for communication with the given
--// server endpoint. It will use the latest remote API version available in the
--// server.
--func NewClient(endpoint string) (*Client, error) {
-- client, err := NewVersionedClient(endpoint, "")
-- if err != nil {
-- return nil, err
-- }
-- client.SkipServerVersionCheck = true
-- return client, nil
--}
+-## Installation
-
--// NewVersionedClient returns a Client instance ready for communication with
--// the given server endpoint, using a specific remote API version.
--func NewVersionedClient(endpoint string, apiVersionString string) (*Client, error) {
-- u, err := parseEndpoint(endpoint)
-- if err != nil {
-- return nil, err
-- }
-- var requestedApiVersion ApiVersion
-- if strings.Contains(apiVersionString, ".") {
-- requestedApiVersion, err = NewApiVersion(apiVersionString)
-- if err != nil {
-- return nil, err
-- }
-- }
-- return &Client{
-- HTTPClient: http.DefaultClient,
-- endpoint: endpoint,
-- endpointURL: u,
-- eventMonitor: new(eventMonitoringState),
-- requestedApiVersion: requestedApiVersion,
-- }, nil
--}
+-Standard `go get`:
-
--func (c *Client) checkApiVersion() error {
-- serverApiVersionString, err := c.getServerApiVersionString()
-- if err != nil {
-- return err
-- }
-- c.serverApiVersion, err = NewApiVersion(serverApiVersionString)
-- if err != nil {
-- return err
-- }
-- if c.requestedApiVersion == nil {
-- c.expectedApiVersion = c.serverApiVersion
-- } else {
-- c.expectedApiVersion = c.requestedApiVersion
-- }
-- return nil
--}
+-```
+-$ go get github.com/mitchellh/mapstructure
+-```
-
--// Ping pings the docker server
--//
--// See http://goo.gl/stJENm for more details.
--func (c *Client) Ping() error {
-- path := "/_ping"
-- body, status, err := c.do("GET", path, nil)
-- if err != nil {
-- return err
-- }
-- if status != http.StatusOK {
-- return newError(status, body)
-- }
-- return nil
--}
+-## Usage & Example
-
--func (c *Client) getServerApiVersionString() (version string, err error) {
-- body, status, err := c.do("GET", "/version", nil)
-- if err != nil {
-- return "", err
-- }
-- if status != http.StatusOK {
-- return "", fmt.Errorf("Received unexpected status %d while trying to retrieve the server version", status)
-- }
-- var versionResponse map[string]string
-- err = json.Unmarshal(body, &versionResponse)
-- if err != nil {
-- return "", err
-- }
-- version = versionResponse["ApiVersion"]
-- return version, nil
--}
+-For usage and examples see the [Godoc](http://godoc.org/github.com/mitchellh/mapstructure).
-
--func (c *Client) do(method, path string, data interface{}) ([]byte, int, error) {
-- var params io.Reader
-- if data != nil {
-- buf, err := json.Marshal(data)
-- if err != nil {
-- return nil, -1, err
-- }
-- params = bytes.NewBuffer(buf)
-- }
-- if path != "/version" && !c.SkipServerVersionCheck && c.expectedApiVersion == nil {
-- err := c.checkApiVersion()
-- if err != nil {
-- return nil, -1, err
-- }
-- }
-- req, err := http.NewRequest(method, c.getURL(path), params)
-- if err != nil {
-- return nil, -1, err
-- }
-- req.Header.Set("User-Agent", userAgent)
-- if data != nil {
-- req.Header.Set("Content-Type", "application/json")
-- } else if method == "POST" {
-- req.Header.Set("Content-Type", "plain/text")
-- }
-- var resp *http.Response
-- protocol := c.endpointURL.Scheme
-- address := c.endpointURL.Path
-- if protocol == "unix" {
-- dial, err := net.Dial(protocol, address)
-- if err != nil {
-- return nil, -1, err
-- }
-- defer dial.Close()
-- clientconn := httputil.NewClientConn(dial, nil)
-- resp, err = clientconn.Do(req)
-- if err != nil {
-- return nil, -1, err
-- }
-- defer clientconn.Close()
-- } else {
-- resp, err = c.HTTPClient.Do(req)
-- }
-- if err != nil {
-- if strings.Contains(err.Error(), "connection refused") {
-- return nil, -1, ErrConnectionRefused
-- }
-- return nil, -1, err
-- }
-- defer resp.Body.Close()
-- body, err := ioutil.ReadAll(resp.Body)
-- if err != nil {
-- return nil, -1, err
-- }
-- if resp.StatusCode < 200 || resp.StatusCode >= 400 {
-- return nil, resp.StatusCode, newError(resp.StatusCode, body)
-- }
-- return body, resp.StatusCode, nil
+-The `Decode` function has examples associated with it there.
+-
+-## But Why?!
+-
+-Go offers fantastic standard libraries for decoding formats such as JSON.
+-The standard method is to have a struct pre-created, and populate that struct
+-from the bytes of the encoded format. This is great, but the problem is if
+-you have configuration or an encoding that changes slightly depending on
+-specific fields. For example, consider this JSON:
+-
+-```json
+-{
+- "type": "person",
+- "name": "Mitchell"
-}
+-```
-
--func (c *Client) stream(method, path string, setRawTerminal, rawJSONStream bool, headers map[string]string, in io.Reader, stdout, stderr io.Writer) error {
-- if (method == "POST" || method == "PUT") && in == nil {
-- in = bytes.NewReader(nil)
-- }
-- if path != "/version" && !c.SkipServerVersionCheck && c.expectedApiVersion == nil {
-- err := c.checkApiVersion()
-- if err != nil {
-- return err
-- }
-- }
-- req, err := http.NewRequest(method, c.getURL(path), in)
-- if err != nil {
-- return err
-- }
-- req.Header.Set("User-Agent", userAgent)
-- if method == "POST" {
-- req.Header.Set("Content-Type", "plain/text")
-- }
-- for key, val := range headers {
-- req.Header.Set(key, val)
-- }
-- var resp *http.Response
-- protocol := c.endpointURL.Scheme
-- address := c.endpointURL.Path
-- if stdout == nil {
-- stdout = ioutil.Discard
-- }
-- if stderr == nil {
-- stderr = ioutil.Discard
-- }
-- if protocol == "unix" {
-- dial, err := net.Dial(protocol, address)
-- if err != nil {
-- return err
-- }
-- clientconn := httputil.NewClientConn(dial, nil)
-- resp, err = clientconn.Do(req)
-- defer clientconn.Close()
-- } else {
-- resp, err = c.HTTPClient.Do(req)
-- }
-- if err != nil {
-- if strings.Contains(err.Error(), "connection refused") {
-- return ErrConnectionRefused
-- }
-- return err
-- }
-- defer resp.Body.Close()
-- if resp.StatusCode < 200 || resp.StatusCode >= 400 {
-- body, err := ioutil.ReadAll(resp.Body)
-- if err != nil {
-- return err
-- }
-- return newError(resp.StatusCode, body)
-- }
-- if resp.Header.Get("Content-Type") == "application/json" {
-- // if we want to get raw json stream, just copy it back to output
-- // without decoding it
-- if rawJSONStream {
-- _, err = io.Copy(stdout, resp.Body)
-- return err
-- }
-- dec := json.NewDecoder(resp.Body)
-- for {
-- var m jsonMessage
-- if err := dec.Decode(&m); err == io.EOF {
-- break
-- } else if err != nil {
-- return err
-- }
-- if m.Stream != "" {
-- fmt.Fprint(stdout, m.Stream)
-- } else if m.Progress != "" {
-- fmt.Fprintf(stdout, "%s %s\r", m.Status, m.Progress)
-- } else if m.Error != "" {
-- return errors.New(m.Error)
-- }
-- if m.Status != "" {
-- fmt.Fprintln(stdout, m.Status)
+-Perhaps we can't populate a specific structure without first reading
+-the "type" field from the JSON. We could always do two passes over the
+-decoding of the JSON (reading the "type" first, and the rest later).
+-However, it is much simpler to just decode this into a `map[string]interface{}`
+-structure, read the "type" key, then use something like this library
+-to decode it into the proper structure.
+diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/decode_hooks.go b/Godeps/_workspace/src/github.com/mitchellh/mapstructure/decode_hooks.go
+deleted file mode 100644
+index 087a392..0000000
+--- a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/decode_hooks.go
++++ /dev/null
+@@ -1,84 +0,0 @@
+-package mapstructure
+-
+-import (
+- "reflect"
+- "strconv"
+- "strings"
+-)
+-
+-// ComposeDecodeHookFunc creates a single DecodeHookFunc that
+-// automatically composes multiple DecodeHookFuncs.
+-//
+-// The composed funcs are called in order, with the result of the
+-// previous transformation.
+-func ComposeDecodeHookFunc(fs ...DecodeHookFunc) DecodeHookFunc {
+- return func(
+- f reflect.Kind,
+- t reflect.Kind,
+- data interface{}) (interface{}, error) {
+- var err error
+- for _, f1 := range fs {
+- data, err = f1(f, t, data)
+- if err != nil {
+- return nil, err
- }
+-
+- // Modify the from kind to be correct with the new data
+- f = getKind(reflect.ValueOf(data))
- }
-- } else {
-- if setRawTerminal {
-- _, err = io.Copy(stdout, resp.Body)
-- } else {
-- _, err = stdCopy(stdout, stderr, resp.Body)
-- }
-- return err
+-
+- return data, nil
- }
-- return nil
-}
-
--func (c *Client) hijack(method, path string, success chan struct{}, setRawTerminal bool, in io.Reader, stderr, stdout io.Writer, data interface{}) error {
-- if path != "/version" && !c.SkipServerVersionCheck && c.expectedApiVersion == nil {
-- err := c.checkApiVersion()
-- if err != nil {
-- return err
+-// StringToSliceHookFunc returns a DecodeHookFunc that converts
+-// string to []string by splitting on the given sep.
+-func StringToSliceHookFunc(sep string) DecodeHookFunc {
+- return func(
+- f reflect.Kind,
+- t reflect.Kind,
+- data interface{}) (interface{}, error) {
+- if f != reflect.String || t != reflect.Slice {
+- return data, nil
+- }
+-
+- raw := data.(string)
+- if raw == "" {
+- return []string{}, nil
- }
+-
+- return strings.Split(raw, sep), nil
- }
+-}
-
-- var params io.Reader
-- if data != nil {
-- buf, err := json.Marshal(data)
-- if err != nil {
-- return err
+-func WeaklyTypedHook(
+- f reflect.Kind,
+- t reflect.Kind,
+- data interface{}) (interface{}, error) {
+- dataVal := reflect.ValueOf(data)
+- switch t {
+- case reflect.String:
+- switch f {
+- case reflect.Bool:
+- if dataVal.Bool() {
+- return "1", nil
+- } else {
+- return "0", nil
+- }
+- case reflect.Float32:
+- return strconv.FormatFloat(dataVal.Float(), 'f', -1, 64), nil
+- case reflect.Int:
+- return strconv.FormatInt(dataVal.Int(), 10), nil
+- case reflect.Slice:
+- dataType := dataVal.Type()
+- elemKind := dataType.Elem().Kind()
+- if elemKind == reflect.Uint8 {
+- return string(dataVal.Interface().([]uint8)), nil
+- }
+- case reflect.Uint:
+- return strconv.FormatUint(dataVal.Uint(), 10), nil
- }
-- params = bytes.NewBuffer(buf)
- }
-
-- if stdout == nil {
-- stdout = ioutil.Discard
+- return data, nil
+-}
+diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/decode_hooks_test.go b/Godeps/_workspace/src/github.com/mitchellh/mapstructure/decode_hooks_test.go
+deleted file mode 100644
+index b417dee..0000000
+--- a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/decode_hooks_test.go
++++ /dev/null
+@@ -1,191 +0,0 @@
+-package mapstructure
+-
+-import (
+- "errors"
+- "reflect"
+- "testing"
+-)
+-
+-func TestComposeDecodeHookFunc(t *testing.T) {
+- f1 := func(
+- f reflect.Kind,
+- t reflect.Kind,
+- data interface{}) (interface{}, error) {
+- return data.(string) + "foo", nil
- }
-- if stderr == nil {
-- stderr = ioutil.Discard
+-
+- f2 := func(
+- f reflect.Kind,
+- t reflect.Kind,
+- data interface{}) (interface{}, error) {
+- return data.(string) + "bar", nil
- }
-- req, err := http.NewRequest(method, c.getURL(path), params)
+-
+- f := ComposeDecodeHookFunc(f1, f2)
+-
+- result, err := f(reflect.String, reflect.Slice, "")
- if err != nil {
-- return err
+- t.Fatalf("bad: %s", err)
- }
-- req.Header.Set("Content-Type", "plain/text")
-- protocol := c.endpointURL.Scheme
-- address := c.endpointURL.Path
-- if protocol != "unix" {
-- protocol = "tcp"
-- address = c.endpointURL.Host
+- if result.(string) != "foobar" {
+- t.Fatalf("bad: %#v", result)
- }
-- dial, err := net.Dial(protocol, address)
-- if err != nil {
-- return err
+-}
+-
+-func TestComposeDecodeHookFunc_err(t *testing.T) {
+- f1 := func(reflect.Kind, reflect.Kind, interface{}) (interface{}, error) {
+- return nil, errors.New("foo")
- }
-- defer dial.Close()
-- clientconn := httputil.NewClientConn(dial, nil)
-- clientconn.Do(req)
-- if success != nil {
-- success <- struct{}{}
-- <-success
+-
+- f2 := func(reflect.Kind, reflect.Kind, interface{}) (interface{}, error) {
+- panic("NOPE")
+- }
+-
+- f := ComposeDecodeHookFunc(f1, f2)
+-
+- _, err := f(reflect.String, reflect.Slice, 42)
+- if err.Error() != "foo" {
+- t.Fatalf("bad: %s", err)
- }
-- rwc, br := clientconn.Hijack()
-- errs := make(chan error, 2)
-- exit := make(chan bool)
-- go func() {
-- defer close(exit)
-- var err error
-- if setRawTerminal {
-- _, err = io.Copy(stdout, br)
-- } else {
-- _, err = stdCopy(stdout, stderr, br)
-- }
-- errs <- err
-- }()
-- go func() {
-- var err error
-- if in != nil {
-- _, err = io.Copy(rwc, in)
-- }
-- rwc.(interface {
-- CloseWrite() error
-- }).CloseWrite()
-- errs <- err
-- }()
-- <-exit
-- return <-errs
-}
-
--func (c *Client) getURL(path string) string {
-- urlStr := strings.TrimRight(c.endpointURL.String(), "/")
-- if c.endpointURL.Scheme == "unix" {
-- urlStr = ""
+-func TestComposeDecodeHookFunc_kinds(t *testing.T) {
+- var f2From reflect.Kind
+-
+- f1 := func(
+- f reflect.Kind,
+- t reflect.Kind,
+- data interface{}) (interface{}, error) {
+- return int(42), nil
- }
-
-- if c.requestedApiVersion != nil {
-- return fmt.Sprintf("%s/v%s%s", urlStr, c.requestedApiVersion, path)
-- } else {
-- return fmt.Sprintf("%s%s", urlStr, path)
+- f2 := func(
+- f reflect.Kind,
+- t reflect.Kind,
+- data interface{}) (interface{}, error) {
+- f2From = f
+- return data, nil
- }
--}
-
--type jsonMessage struct {
-- Status string `json:"status,omitempty"`
-- Progress string `json:"progress,omitempty"`
-- Error string `json:"error,omitempty"`
-- Stream string `json:"stream,omitempty"`
--}
+- f := ComposeDecodeHookFunc(f1, f2)
-
--func queryString(opts interface{}) string {
-- if opts == nil {
-- return ""
+- _, err := f(reflect.String, reflect.Slice, "")
+- if err != nil {
+- t.Fatalf("bad: %s", err)
- }
-- value := reflect.ValueOf(opts)
-- if value.Kind() == reflect.Ptr {
-- value = value.Elem()
+- if f2From != reflect.Int {
+- t.Fatalf("bad: %#v", f2From)
- }
-- if value.Kind() != reflect.Struct {
-- return ""
+-}
+-
+-func TestStringToSliceHookFunc(t *testing.T) {
+- f := StringToSliceHookFunc(",")
+-
+- cases := []struct {
+- f, t reflect.Kind
+- data interface{}
+- result interface{}
+- err bool
+- }{
+- {reflect.Slice, reflect.Slice, 42, 42, false},
+- {reflect.String, reflect.String, 42, 42, false},
+- {
+- reflect.String,
+- reflect.Slice,
+- "foo,bar,baz",
+- []string{"foo", "bar", "baz"},
+- false,
+- },
+- {
+- reflect.String,
+- reflect.Slice,
+- "",
+- []string{},
+- false,
+- },
- }
-- items := url.Values(map[string][]string{})
-- for i := 0; i < value.NumField(); i++ {
-- field := value.Type().Field(i)
-- if field.PkgPath != "" {
-- continue
-- }
-- key := field.Tag.Get("qs")
-- if key == "" {
-- key = strings.ToLower(field.Name)
-- } else if key == "-" {
-- continue
+-
+- for i, tc := range cases {
+- actual, err := f(tc.f, tc.t, tc.data)
+- if tc.err != (err != nil) {
+- t.Fatalf("case %d: expected err %#v", i, tc.err)
- }
-- v := value.Field(i)
-- switch v.Kind() {
-- case reflect.Bool:
-- if v.Bool() {
-- items.Add(key, "1")
-- }
-- case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-- if v.Int() > 0 {
-- items.Add(key, strconv.FormatInt(v.Int(), 10))
-- }
-- case reflect.Float32, reflect.Float64:
-- if v.Float() > 0 {
-- items.Add(key, strconv.FormatFloat(v.Float(), 'f', -1, 64))
-- }
-- case reflect.String:
-- if v.String() != "" {
-- items.Add(key, v.String())
-- }
-- case reflect.Ptr:
-- if !v.IsNil() {
-- if b, err := json.Marshal(v.Interface()); err == nil {
-- items.Add(key, string(b))
-- }
-- }
+- if !reflect.DeepEqual(actual, tc.result) {
+- t.Fatalf(
+- "case %d: expected %#v, got %#v",
+- i, tc.result, actual)
- }
- }
-- return items.Encode()
-}
-
--// Error represents failures in the API. It represents a failure from the API.
--type Error struct {
-- Status int
-- Message string
+-func TestWeaklyTypedHook(t *testing.T) {
+- var f DecodeHookFunc = WeaklyTypedHook
+-
+- cases := []struct {
+- f, t reflect.Kind
+- data interface{}
+- result interface{}
+- err bool
+- }{
+- // TO STRING
+- {
+- reflect.Bool,
+- reflect.String,
+- false,
+- "0",
+- false,
+- },
+-
+- {
+- reflect.Bool,
+- reflect.String,
+- true,
+- "1",
+- false,
+- },
+-
+- {
+- reflect.Float32,
+- reflect.String,
+- float32(7),
+- "7",
+- false,
+- },
+-
+- {
+- reflect.Int,
+- reflect.String,
+- int(7),
+- "7",
+- false,
+- },
+-
+- {
+- reflect.Slice,
+- reflect.String,
+- []uint8("foo"),
+- "foo",
+- false,
+- },
+-
+- {
+- reflect.Uint,
+- reflect.String,
+- uint(7),
+- "7",
+- false,
+- },
+- }
+-
+- for i, tc := range cases {
+- actual, err := f(tc.f, tc.t, tc.data)
+- if tc.err != (err != nil) {
+- t.Fatalf("case %d: expected err %#v", i, tc.err)
+- }
+- if !reflect.DeepEqual(actual, tc.result) {
+- t.Fatalf(
+- "case %d: expected %#v, got %#v",
+- i, tc.result, actual)
+- }
+- }
-}
+diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/error.go b/Godeps/_workspace/src/github.com/mitchellh/mapstructure/error.go
+deleted file mode 100644
+index 3460799..0000000
+--- a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/error.go
++++ /dev/null
+@@ -1,32 +0,0 @@
+-package mapstructure
-
--func newError(status int, body []byte) *Error {
-- return &Error{Status: status, Message: string(body)}
+-import (
+- "fmt"
+- "strings"
+-)
+-
+-// Error implements the error interface and can represents multiple
+-// errors that occur in the course of a single decode.
+-type Error struct {
+- Errors []string
-}
-
-func (e *Error) Error() string {
-- return fmt.Sprintf("API error (%d): %s", e.Status, e.Message)
+- points := make([]string, len(e.Errors))
+- for i, err := range e.Errors {
+- points[i] = fmt.Sprintf("* %s", err)
+- }
+-
+- return fmt.Sprintf(
+- "%d error(s) decoding:\n\n%s",
+- len(e.Errors), strings.Join(points, "\n"))
-}
-
--func parseEndpoint(endpoint string) (*url.URL, error) {
-- u, err := url.Parse(endpoint)
-- if err != nil {
-- return nil, ErrInvalidEndpoint
-- }
-- if u.Scheme == "tcp" {
-- u.Scheme = "http"
-- }
-- if u.Scheme != "http" && u.Scheme != "https" && u.Scheme != "unix" {
-- return nil, ErrInvalidEndpoint
-- }
-- if u.Scheme != "unix" {
-- _, port, err := net.SplitHostPort(u.Host)
-- if err != nil {
-- if e, ok := err.(*net.AddrError); ok {
-- if e.Err == "missing port in address" {
-- return u, nil
-- }
-- }
-- return nil, ErrInvalidEndpoint
-- }
-- number, err := strconv.ParseInt(port, 10, 64)
-- if err == nil && number > 0 && number < 65536 {
-- return u, nil
-- }
-- } else {
-- return u, nil // we don't need port when using a unix socket
+-func appendErrors(errors []string, err error) []string {
+- switch e := err.(type) {
+- case *Error:
+- return append(errors, e.Errors...)
+- default:
+- return append(errors, e.Error())
- }
-- return nil, ErrInvalidEndpoint
-}
-diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/client_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/client_test.go
+diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure.go b/Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure.go
deleted file mode 100644
-index 9def171..0000000
---- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/client_test.go
+index 381ba5d..0000000
+--- a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure.go
+++ /dev/null
-@@ -1,290 +0,0 @@
--// Copyright 2014 go-dockerclient authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
+@@ -1,704 +0,0 @@
+-// The mapstructure package exposes functionality to convert an
+-// abitrary map[string]interface{} into a native Go structure.
+-//
+-// The Go structure can be arbitrarily complex, containing slices,
+-// other structs, etc. and the decoder will properly decode nested
+-// maps and so on into the proper structures in the native Go struct.
+-// See the examples to see what the decoder is capable of.
+-package mapstructure
+-
+-import (
+- "errors"
+- "fmt"
+- "reflect"
+- "sort"
+- "strconv"
+- "strings"
+-)
+-
+-// DecodeHookFunc is the callback function that can be used for
+-// data transformations. See "DecodeHook" in the DecoderConfig
+-// struct.
+-type DecodeHookFunc func(
+- from reflect.Kind,
+- to reflect.Kind,
+- data interface{}) (interface{}, error)
+-
+-// DecoderConfig is the configuration that is used to create a new decoder
+-// and allows customization of various aspects of decoding.
+-type DecoderConfig struct {
+- // DecodeHook, if set, will be called before any decoding and any
+- // type conversion (if WeaklyTypedInput is on). This lets you modify
+- // the values before they're set down onto the resulting struct.
+- //
+- // If an error is returned, the entire decode will fail with that
+- // error.
+- DecodeHook DecodeHookFunc
+-
+- // If ErrorUnused is true, then it is an error for there to exist
+- // keys in the original map that were unused in the decoding process
+- // (extra keys).
+- ErrorUnused bool
+-
+- // If WeaklyTypedInput is true, the decoder will make the following
+- // "weak" conversions:
+- //
+- // - bools to string (true = "1", false = "0")
+- // - numbers to string (base 10)
+- // - bools to int/uint (true = 1, false = 0)
+- // - strings to int/uint (base implied by prefix)
+- // - int to bool (true if value != 0)
+- // - string to bool (accepts: 1, t, T, TRUE, true, True, 0, f, F,
+- // FALSE, false, False. Anything else is an error)
+- // - empty array = empty map and vice versa
+- //
+- WeaklyTypedInput bool
+-
+- // Metadata is the struct that will contain extra metadata about
+- // the decoding. If this is nil, then no metadata will be tracked.
+- Metadata *Metadata
+-
+- // Result is a pointer to the struct that will contain the decoded
+- // value.
+- Result interface{}
+-
+- // The tag name that mapstructure reads for field names. This
+- // defaults to "mapstructure"
+- TagName string
+-}
+-
+-// A Decoder takes a raw interface value and turns it into structured
+-// data, keeping track of rich error information along the way in case
+-// anything goes wrong. Unlike the basic top-level Decode method, you can
+-// more finely control how the Decoder behaves using the DecoderConfig
+-// structure. The top-level Decode method is just a convenience that sets
+-// up the most basic Decoder.
+-type Decoder struct {
+- config *DecoderConfig
+-}
+-
+-// Metadata contains information about decoding a structure that
+-// is tedious or difficult to get otherwise.
+-type Metadata struct {
+- // Keys are the keys of the structure which were successfully decoded
+- Keys []string
+-
+- // Unused is a slice of keys that were found in the raw value but
+- // weren't decoded since there was no matching field in the result interface
+- Unused []string
+-}
+-
+-// Decode takes a map and uses reflection to convert it into the
+-// given Go native structure. val must be a pointer to a struct.
+-func Decode(m interface{}, rawVal interface{}) error {
+- config := &DecoderConfig{
+- Metadata: nil,
+- Result: rawVal,
+- }
-
--package docker
+- decoder, err := NewDecoder(config)
+- if err != nil {
+- return err
+- }
-
--import (
-- "fmt"
-- "io/ioutil"
-- "net/http"
-- "net/url"
-- "reflect"
-- "strconv"
-- "strings"
-- "testing"
--)
+- return decoder.Decode(m)
+-}
-
--func TestNewAPIClient(t *testing.T) {
-- endpoint := "http://localhost:4243"
-- client, err := NewClient(endpoint)
-- if err != nil {
-- t.Fatal(err)
+-// WeakDecode is the same as Decode but is shorthand to enable
+-// WeaklyTypedInput. See DecoderConfig for more info.
+-func WeakDecode(input, output interface{}) error {
+- config := &DecoderConfig{
+- Metadata: nil,
+- Result: output,
+- WeaklyTypedInput: true,
- }
-- if client.endpoint != endpoint {
-- t.Errorf("Expected endpoint %s. Got %s.", endpoint, client.endpoint)
+-
+- decoder, err := NewDecoder(config)
+- if err != nil {
+- return err
- }
-- if client.HTTPClient != http.DefaultClient {
-- t.Errorf("Expected http.Client %#v. Got %#v.", http.DefaultClient, client.HTTPClient)
+-
+- return decoder.Decode(input)
+-}
+-
+-// NewDecoder returns a new decoder for the given configuration. Once
+-// a decoder has been returned, the same configuration must not be used
+-// again.
+-func NewDecoder(config *DecoderConfig) (*Decoder, error) {
+- val := reflect.ValueOf(config.Result)
+- if val.Kind() != reflect.Ptr {
+- return nil, errors.New("result must be a pointer")
- }
-- // test unix socket endpoints
-- endpoint = "unix:///var/run/docker.sock"
-- client, err = NewClient(endpoint)
-- if err != nil {
-- t.Fatal(err)
+-
+- val = val.Elem()
+- if !val.CanAddr() {
+- return nil, errors.New("result must be addressable (a pointer)")
- }
-- if client.endpoint != endpoint {
-- t.Errorf("Expected endpoint %s. Got %s.", endpoint, client.endpoint)
+-
+- if config.Metadata != nil {
+- if config.Metadata.Keys == nil {
+- config.Metadata.Keys = make([]string, 0)
+- }
+-
+- if config.Metadata.Unused == nil {
+- config.Metadata.Unused = make([]string, 0)
+- }
- }
-- if !client.SkipServerVersionCheck {
-- t.Error("Expected SkipServerVersionCheck to be true, got false")
+-
+- if config.TagName == "" {
+- config.TagName = "mapstructure"
- }
-- if client.requestedApiVersion != nil {
-- t.Errorf("Expected requestedApiVersion to be nil, got %#v.", client.requestedApiVersion)
+-
+- result := &Decoder{
+- config: config,
- }
+-
+- return result, nil
-}
-
--func TestNewVersionedClient(t *testing.T) {
-- endpoint := "http://localhost:4243"
-- client, err := NewVersionedClient(endpoint, "1.12")
-- if err != nil {
-- t.Fatal(err)
+-// Decode decodes the given raw interface to the target pointer specified
+-// by the configuration.
+-func (d *Decoder) Decode(raw interface{}) error {
+- return d.decode("", raw, reflect.ValueOf(d.config.Result).Elem())
+-}
+-
+-// Decodes an unknown data type into a specific reflection value.
+-func (d *Decoder) decode(name string, data interface{}, val reflect.Value) error {
+- if data == nil {
+- // If the data is nil, then we don't set anything.
+- return nil
- }
-- if client.endpoint != endpoint {
-- t.Errorf("Expected endpoint %s. Got %s.", endpoint, client.endpoint)
+-
+- dataVal := reflect.ValueOf(data)
+- if !dataVal.IsValid() {
+- // If the data value is invalid, then we just set the value
+- // to be the zero value.
+- val.Set(reflect.Zero(val.Type()))
+- return nil
- }
-- if client.HTTPClient != http.DefaultClient {
-- t.Errorf("Expected http.Client %#v. Got %#v.", http.DefaultClient, client.HTTPClient)
+-
+- if d.config.DecodeHook != nil {
+- // We have a DecodeHook, so let's pre-process the data.
+- var err error
+- data, err = d.config.DecodeHook(getKind(dataVal), getKind(val), data)
+- if err != nil {
+- return err
+- }
- }
-- if reqVersion := client.requestedApiVersion.String(); reqVersion != "1.12" {
-- t.Errorf("Wrong requestApiVersion. Want %q. Got %q.", "1.12", reqVersion)
+-
+- var err error
+- dataKind := getKind(val)
+- switch dataKind {
+- case reflect.Bool:
+- err = d.decodeBool(name, data, val)
+- case reflect.Interface:
+- err = d.decodeBasic(name, data, val)
+- case reflect.String:
+- err = d.decodeString(name, data, val)
+- case reflect.Int:
+- err = d.decodeInt(name, data, val)
+- case reflect.Uint:
+- err = d.decodeUint(name, data, val)
+- case reflect.Float32:
+- err = d.decodeFloat(name, data, val)
+- case reflect.Struct:
+- err = d.decodeStruct(name, data, val)
+- case reflect.Map:
+- err = d.decodeMap(name, data, val)
+- case reflect.Ptr:
+- err = d.decodePtr(name, data, val)
+- case reflect.Slice:
+- err = d.decodeSlice(name, data, val)
+- default:
+- // If we reached this point then we weren't able to decode it
+- return fmt.Errorf("%s: unsupported type: %s", name, dataKind)
- }
-- if client.SkipServerVersionCheck {
-- t.Error("Expected SkipServerVersionCheck to be false, got true")
+-
+- // If we reached here, then we successfully decoded SOMETHING, so
+- // mark the key as used if we're tracking metadata.
+- if d.config.Metadata != nil && name != "" {
+- d.config.Metadata.Keys = append(d.config.Metadata.Keys, name)
- }
+-
+- return err
-}
-
--func TestNewClientInvalidEndpoint(t *testing.T) {
-- cases := []string{
-- "htp://localhost:3243", "http://localhost:a", "localhost:8080",
-- "", "localhost", "http://localhost:8080:8383", "http://localhost:65536",
-- "https://localhost:-20",
+-// This decodes a basic type (bool, int, string, etc.) and sets the
+-// value to "data" of that type.
+-func (d *Decoder) decodeBasic(name string, data interface{}, val reflect.Value) error {
+- dataVal := reflect.ValueOf(data)
+- dataValType := dataVal.Type()
+- if !dataValType.AssignableTo(val.Type()) {
+- return fmt.Errorf(
+- "'%s' expected type '%s', got '%s'",
+- name, val.Type(), dataValType)
- }
-- for _, c := range cases {
-- client, err := NewClient(c)
-- if client != nil {
-- t.Errorf("Want <nil> client for invalid endpoint, got %#v.", client)
+-
+- val.Set(dataVal)
+- return nil
+-}
+-
+-func (d *Decoder) decodeString(name string, data interface{}, val reflect.Value) error {
+- dataVal := reflect.ValueOf(data)
+- dataKind := getKind(dataVal)
+-
+- converted := true
+- switch {
+- case dataKind == reflect.String:
+- val.SetString(dataVal.String())
+- case dataKind == reflect.Bool && d.config.WeaklyTypedInput:
+- if dataVal.Bool() {
+- val.SetString("1")
+- } else {
+- val.SetString("0")
- }
-- if !reflect.DeepEqual(err, ErrInvalidEndpoint) {
-- t.Errorf("NewClient(%q): Got invalid error for invalid endpoint. Want %#v. Got %#v.", c, ErrInvalidEndpoint, err)
+- case dataKind == reflect.Int && d.config.WeaklyTypedInput:
+- val.SetString(strconv.FormatInt(dataVal.Int(), 10))
+- case dataKind == reflect.Uint && d.config.WeaklyTypedInput:
+- val.SetString(strconv.FormatUint(dataVal.Uint(), 10))
+- case dataKind == reflect.Float32 && d.config.WeaklyTypedInput:
+- val.SetString(strconv.FormatFloat(dataVal.Float(), 'f', -1, 64))
+- case dataKind == reflect.Slice && d.config.WeaklyTypedInput:
+- dataType := dataVal.Type()
+- elemKind := dataType.Elem().Kind()
+- switch {
+- case elemKind == reflect.Uint8:
+- val.SetString(string(dataVal.Interface().([]uint8)))
+- default:
+- converted = false
- }
+- default:
+- converted = false
- }
--}
-
--func TestGetURL(t *testing.T) {
-- var tests = []struct {
-- endpoint string
-- path string
-- expected string
-- }{
-- {"http://localhost:4243/", "/", "http://localhost:4243/"},
-- {"http://localhost:4243", "/", "http://localhost:4243/"},
-- {"http://localhost:4243", "/containers/ps", "http://localhost:4243/containers/ps"},
-- {"tcp://localhost:4243", "/containers/ps", "http://localhost:4243/containers/ps"},
-- {"http://localhost:4243/////", "/", "http://localhost:4243/"},
-- {"unix:///var/run/docker.socket", "/containers", "/containers"},
+- if !converted {
+- return fmt.Errorf(
+- "'%s' expected type '%s', got unconvertible type '%s'",
+- name, val.Type(), dataVal.Type())
- }
-- for _, tt := range tests {
-- client, _ := NewClient(tt.endpoint)
-- client.endpoint = tt.endpoint
-- client.SkipServerVersionCheck = true
-- got := client.getURL(tt.path)
-- if got != tt.expected {
-- t.Errorf("getURL(%q): Got %s. Want %s.", tt.path, got, tt.expected)
+-
+- return nil
+-}
+-
+-func (d *Decoder) decodeInt(name string, data interface{}, val reflect.Value) error {
+- dataVal := reflect.ValueOf(data)
+- dataKind := getKind(dataVal)
+-
+- switch {
+- case dataKind == reflect.Int:
+- val.SetInt(dataVal.Int())
+- case dataKind == reflect.Uint:
+- val.SetInt(int64(dataVal.Uint()))
+- case dataKind == reflect.Float32:
+- val.SetInt(int64(dataVal.Float()))
+- case dataKind == reflect.Bool && d.config.WeaklyTypedInput:
+- if dataVal.Bool() {
+- val.SetInt(1)
+- } else {
+- val.SetInt(0)
+- }
+- case dataKind == reflect.String && d.config.WeaklyTypedInput:
+- i, err := strconv.ParseInt(dataVal.String(), 0, val.Type().Bits())
+- if err == nil {
+- val.SetInt(i)
+- } else {
+- return fmt.Errorf("cannot parse '%s' as int: %s", name, err)
- }
+- default:
+- return fmt.Errorf(
+- "'%s' expected type '%s', got unconvertible type '%s'",
+- name, val.Type(), dataVal.Type())
- }
+-
+- return nil
-}
-
--func TestError(t *testing.T) {
-- err := newError(400, []byte("bad parameter"))
-- expected := Error{Status: 400, Message: "bad parameter"}
-- if !reflect.DeepEqual(expected, *err) {
-- t.Errorf("Wrong error type. Want %#v. Got %#v.", expected, *err)
-- }
-- message := "API error (400): bad parameter"
-- if err.Error() != message {
-- t.Errorf("Wrong error message. Want %q. Got %q.", message, err.Error())
+-func (d *Decoder) decodeUint(name string, data interface{}, val reflect.Value) error {
+- dataVal := reflect.ValueOf(data)
+- dataKind := getKind(dataVal)
+-
+- switch {
+- case dataKind == reflect.Int:
+- val.SetUint(uint64(dataVal.Int()))
+- case dataKind == reflect.Uint:
+- val.SetUint(dataVal.Uint())
+- case dataKind == reflect.Float32:
+- val.SetUint(uint64(dataVal.Float()))
+- case dataKind == reflect.Bool && d.config.WeaklyTypedInput:
+- if dataVal.Bool() {
+- val.SetUint(1)
+- } else {
+- val.SetUint(0)
+- }
+- case dataKind == reflect.String && d.config.WeaklyTypedInput:
+- i, err := strconv.ParseUint(dataVal.String(), 0, val.Type().Bits())
+- if err == nil {
+- val.SetUint(i)
+- } else {
+- return fmt.Errorf("cannot parse '%s' as uint: %s", name, err)
+- }
+- default:
+- return fmt.Errorf(
+- "'%s' expected type '%s', got unconvertible type '%s'",
+- name, val.Type(), dataVal.Type())
- }
+-
+- return nil
-}
-
--func TestQueryString(t *testing.T) {
-- v := float32(2.4)
-- f32QueryString := fmt.Sprintf("w=%s&x=10&y=10.35", strconv.FormatFloat(float64(v), 'f', -1, 64))
-- jsonPerson := url.QueryEscape(`{"Name":"gopher","age":4}`)
-- var tests = []struct {
-- input interface{}
-- want string
-- }{
-- {&ListContainersOptions{All: true}, "all=1"},
-- {ListContainersOptions{All: true}, "all=1"},
-- {ListContainersOptions{Before: "something"}, "before=something"},
-- {ListContainersOptions{Before: "something", Since: "other"}, "before=something&since=other"},
-- {dumb{X: 10, Y: 10.35000}, "x=10&y=10.35"},
-- {dumb{W: v, X: 10, Y: 10.35000}, f32QueryString},
-- {dumb{X: 10, Y: 10.35000, Z: 10}, "x=10&y=10.35&zee=10"},
-- {dumb{v: 4, X: 10, Y: 10.35000}, "x=10&y=10.35"},
-- {dumb{T: 10, Y: 10.35000}, "y=10.35"},
-- {dumb{Person: &person{Name: "gopher", Age: 4}}, "p=" + jsonPerson},
-- {nil, ""},
-- {10, ""},
-- {"not_a_struct", ""},
-- }
-- for _, tt := range tests {
-- got := queryString(tt.input)
-- if got != tt.want {
-- t.Errorf("queryString(%v). Want %q. Got %q.", tt.input, tt.want, got)
+-func (d *Decoder) decodeBool(name string, data interface{}, val reflect.Value) error {
+- dataVal := reflect.ValueOf(data)
+- dataKind := getKind(dataVal)
+-
+- switch {
+- case dataKind == reflect.Bool:
+- val.SetBool(dataVal.Bool())
+- case dataKind == reflect.Int && d.config.WeaklyTypedInput:
+- val.SetBool(dataVal.Int() != 0)
+- case dataKind == reflect.Uint && d.config.WeaklyTypedInput:
+- val.SetBool(dataVal.Uint() != 0)
+- case dataKind == reflect.Float32 && d.config.WeaklyTypedInput:
+- val.SetBool(dataVal.Float() != 0)
+- case dataKind == reflect.String && d.config.WeaklyTypedInput:
+- b, err := strconv.ParseBool(dataVal.String())
+- if err == nil {
+- val.SetBool(b)
+- } else if dataVal.String() == "" {
+- val.SetBool(false)
+- } else {
+- return fmt.Errorf("cannot parse '%s' as bool: %s", name, err)
- }
+- default:
+- return fmt.Errorf(
+- "'%s' expected type '%s', got unconvertible type '%s'",
+- name, val.Type(), dataVal.Type())
- }
+-
+- return nil
-}
-
--func TestNewApiVersionFailures(t *testing.T) {
-- var tests = []struct {
-- input string
-- expectedError string
-- }{
-- {"1-0", `Unable to parse version "1-0"`},
-- {"1.0-beta", `Unable to parse version "1.0-beta": "0-beta" is not an integer`},
-- }
-- for _, tt := range tests {
-- v, err := NewApiVersion(tt.input)
-- if v != nil {
-- t.Errorf("Expected <nil> version, got %v.", v)
+-func (d *Decoder) decodeFloat(name string, data interface{}, val reflect.Value) error {
+- dataVal := reflect.ValueOf(data)
+- dataKind := getKind(dataVal)
+-
+- switch {
+- case dataKind == reflect.Int:
+- val.SetFloat(float64(dataVal.Int()))
+- case dataKind == reflect.Uint:
+- val.SetFloat(float64(dataVal.Uint()))
+- case dataKind == reflect.Float32:
+- val.SetFloat(float64(dataVal.Float()))
+- case dataKind == reflect.Bool && d.config.WeaklyTypedInput:
+- if dataVal.Bool() {
+- val.SetFloat(1)
+- } else {
+- val.SetFloat(0)
- }
-- if err.Error() != tt.expectedError {
-- t.Errorf("NewApiVersion(%q): wrong error. Want %q. Got %q", tt.input, tt.expectedError, err.Error())
+- case dataKind == reflect.String && d.config.WeaklyTypedInput:
+- f, err := strconv.ParseFloat(dataVal.String(), val.Type().Bits())
+- if err == nil {
+- val.SetFloat(f)
+- } else {
+- return fmt.Errorf("cannot parse '%s' as float: %s", name, err)
- }
+- default:
+- return fmt.Errorf(
+- "'%s' expected type '%s', got unconvertible type '%s'",
+- name, val.Type(), dataVal.Type())
- }
--}
-
--func TestApiVersions(t *testing.T) {
-- var tests = []struct {
-- a string
-- b string
-- expectedALessThanB bool
-- expectedALessThanOrEqualToB bool
-- expectedAGreaterThanB bool
-- expectedAGreaterThanOrEqualToB bool
-- }{
-- {"1.11", "1.11", false, true, false, true},
-- {"1.10", "1.11", true, true, false, false},
-- {"1.11", "1.10", false, false, true, true},
+- return nil
+-}
-
-- {"1.9", "1.11", true, true, false, false},
-- {"1.11", "1.9", false, false, true, true},
+-func (d *Decoder) decodeMap(name string, data interface{}, val reflect.Value) error {
+- valType := val.Type()
+- valKeyType := valType.Key()
+- valElemType := valType.Elem()
-
-- {"1.1.1", "1.1", false, false, true, true},
-- {"1.1", "1.1.1", true, true, false, false},
+- // Make a new map to hold our result
+- mapType := reflect.MapOf(valKeyType, valElemType)
+- valMap := reflect.MakeMap(mapType)
-
-- {"2.1", "1.1.1", false, false, true, true},
-- {"2.1", "1.3.1", false, false, true, true},
-- {"1.1.1", "2.1", true, true, false, false},
-- {"1.3.1", "2.1", true, true, false, false},
+- // Check input type
+- dataVal := reflect.Indirect(reflect.ValueOf(data))
+- if dataVal.Kind() != reflect.Map {
+- // Accept empty array/slice instead of an empty map in weakly typed mode
+- if d.config.WeaklyTypedInput &&
+- (dataVal.Kind() == reflect.Slice || dataVal.Kind() == reflect.Array) &&
+- dataVal.Len() == 0 {
+- val.Set(valMap)
+- return nil
+- } else {
+- return fmt.Errorf("'%s' expected a map, got '%s'", name, dataVal.Kind())
+- }
- }
-
-- for _, tt := range tests {
-- a, _ := NewApiVersion(tt.a)
-- b, _ := NewApiVersion(tt.b)
+- // Accumulate errors
+- errors := make([]string, 0)
-
-- if tt.expectedALessThanB && !a.LessThan(b) {
-- t.Errorf("Expected %#v < %#v", a, b)
-- }
-- if tt.expectedALessThanOrEqualToB && !a.LessThanOrEqualTo(b) {
-- t.Errorf("Expected %#v <= %#v", a, b)
+- for _, k := range dataVal.MapKeys() {
+- fieldName := fmt.Sprintf("%s[%s]", name, k)
+-
+- // First decode the key into the proper type
+- currentKey := reflect.Indirect(reflect.New(valKeyType))
+- if err := d.decode(fieldName, k.Interface(), currentKey); err != nil {
+- errors = appendErrors(errors, err)
+- continue
- }
-- if tt.expectedAGreaterThanB && !a.GreaterThan(b) {
-- t.Errorf("Expected %#v > %#v", a, b)
+-
+- // Next decode the data into the proper type
+- v := dataVal.MapIndex(k).Interface()
+- currentVal := reflect.Indirect(reflect.New(valElemType))
+- if err := d.decode(fieldName, v, currentVal); err != nil {
+- errors = appendErrors(errors, err)
+- continue
- }
-- if tt.expectedAGreaterThanOrEqualToB && !a.GreaterThanOrEqualTo(b) {
-- t.Errorf("Expected %#v >= %#v", a, b)
+-
+- valMap.SetMapIndex(currentKey, currentVal)
+- }
+-
+- // Set the built up map to the value
+- val.Set(valMap)
+-
+- // If we had errors, return those
+- if len(errors) > 0 {
+- return &Error{errors}
+- }
+-
+- return nil
+-}
+-
+-func (d *Decoder) decodePtr(name string, data interface{}, val reflect.Value) error {
+- // Create an element of the concrete (non pointer) type and decode
+- // into that. Then set the value of the pointer to this type.
+- valType := val.Type()
+- valElemType := valType.Elem()
+- realVal := reflect.New(valElemType)
+- if err := d.decode(name, data, reflect.Indirect(realVal)); err != nil {
+- return err
+- }
+-
+- val.Set(realVal)
+- return nil
+-}
+-
+-func (d *Decoder) decodeSlice(name string, data interface{}, val reflect.Value) error {
+- dataVal := reflect.Indirect(reflect.ValueOf(data))
+- dataValKind := dataVal.Kind()
+- valType := val.Type()
+- valElemType := valType.Elem()
+- sliceType := reflect.SliceOf(valElemType)
+-
+- // Check input type
+- if dataValKind != reflect.Array && dataValKind != reflect.Slice {
+- // Accept empty map instead of array/slice in weakly typed mode
+- if d.config.WeaklyTypedInput && dataVal.Kind() == reflect.Map && dataVal.Len() == 0 {
+- val.Set(reflect.MakeSlice(sliceType, 0, 0))
+- return nil
+- } else {
+- return fmt.Errorf(
+- "'%s': source data must be an array or slice, got %s", name, dataValKind)
- }
- }
--}
-
--func TestPing(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- err := client.Ping()
-- if err != nil {
-- t.Fatal(err)
-- }
--}
+- // Make a new slice to hold our result, same size as the original data.
+- valSlice := reflect.MakeSlice(sliceType, dataVal.Len(), dataVal.Len())
-
--func TestPingFailing(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "", status: http.StatusInternalServerError}
-- client := newTestClient(fakeRT)
-- err := client.Ping()
-- if err == nil {
-- t.Fatal("Expected non nil error, got nil")
-- }
-- expectedErrMsg := "API error (500): "
-- if err.Error() != expectedErrMsg {
-- t.Fatalf("Expected error to be %q, got: %q", expectedErrMsg, err.Error())
-- }
--}
+- // Accumulate any errors
+- errors := make([]string, 0)
-
--func TestPingFailingWrongStatus(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "", status: http.StatusAccepted}
-- client := newTestClient(fakeRT)
-- err := client.Ping()
-- if err == nil {
-- t.Fatal("Expected non nil error, got nil")
+- for i := 0; i < dataVal.Len(); i++ {
+- currentData := dataVal.Index(i).Interface()
+- currentField := valSlice.Index(i)
+-
+- fieldName := fmt.Sprintf("%s[%d]", name, i)
+- if err := d.decode(fieldName, currentData, currentField); err != nil {
+- errors = appendErrors(errors, err)
+- }
- }
-- expectedErrMsg := "API error (202): "
-- if err.Error() != expectedErrMsg {
-- t.Fatalf("Expected error to be %q, got: %q", expectedErrMsg, err.Error())
+-
+- // Finally, set the value to the slice we built up
+- val.Set(valSlice)
+-
+- // If there were errors, we return those
+- if len(errors) > 0 {
+- return &Error{errors}
- }
--}
-
--type FakeRoundTripper struct {
-- message string
-- status int
-- header map[string]string
-- requests []*http.Request
+- return nil
-}
-
--func (rt *FakeRoundTripper) RoundTrip(r *http.Request) (*http.Response, error) {
-- body := strings.NewReader(rt.message)
-- rt.requests = append(rt.requests, r)
-- res := &http.Response{
-- StatusCode: rt.status,
-- Body: ioutil.NopCloser(body),
-- Header: make(http.Header),
-- }
-- for k, v := range rt.header {
-- res.Header.Set(k, v)
+-func (d *Decoder) decodeStruct(name string, data interface{}, val reflect.Value) error {
+- dataVal := reflect.Indirect(reflect.ValueOf(data))
+- dataValKind := dataVal.Kind()
+- if dataValKind != reflect.Map {
+- return fmt.Errorf("'%s' expected a map, got '%s'", name, dataValKind)
- }
-- return res, nil
--}
-
--func (rt *FakeRoundTripper) Reset() {
-- rt.requests = nil
--}
+- dataValType := dataVal.Type()
+- if kind := dataValType.Key().Kind(); kind != reflect.String && kind != reflect.Interface {
+- return fmt.Errorf(
+- "'%s' needs a map with string keys, has '%s' keys",
+- name, dataValType.Key().Kind())
+- }
-
--type person struct {
-- Name string
-- Age int `json:"age"`
--}
+- dataValKeys := make(map[reflect.Value]struct{})
+- dataValKeysUnused := make(map[interface{}]struct{})
+- for _, dataValKey := range dataVal.MapKeys() {
+- dataValKeys[dataValKey] = struct{}{}
+- dataValKeysUnused[dataValKey.Interface()] = struct{}{}
+- }
-
--type dumb struct {
-- T int `qs:"-"`
-- v int
-- W float32
-- X int
-- Y float64
-- Z int `qs:"zee"`
-- Person *person `qs:"p"`
--}
+- errors := make([]string, 0)
-
--type fakeEndpointURL struct {
-- Scheme string
--}
-diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/container.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/container.go
-deleted file mode 100644
-index c649b5a..0000000
---- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/container.go
-+++ /dev/null
-@@ -1,731 +0,0 @@
--// Copyright 2014 go-dockerclient authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
+- // This slice will keep track of all the structs we'll be decoding.
+- // There can be more than one struct if there are embedded structs
+- // that are squashed.
+- structs := make([]reflect.Value, 1, 5)
+- structs[0] = val
-
--package docker
+- // Compile the list of all the fields that we're going to be decoding
+- // from all the structs.
+- fields := make(map[*reflect.StructField]reflect.Value)
+- for len(structs) > 0 {
+- structVal := structs[0]
+- structs = structs[1:]
-
--import (
-- "bytes"
-- "encoding/json"
-- "fmt"
-- "io"
-- "net/http"
-- "net/url"
-- "strconv"
-- "strings"
-- "time"
--)
+- structType := structVal.Type()
+- for i := 0; i < structType.NumField(); i++ {
+- fieldType := structType.Field(i)
-
--// ListContainersOptions specify parameters to the ListContainers function.
--//
--// See http://goo.gl/XqtcyU for more details.
--type ListContainersOptions struct {
-- All bool
-- Size bool
-- Limit int
-- Since string
-- Before string
--}
+- if fieldType.Anonymous {
+- fieldKind := fieldType.Type.Kind()
+- if fieldKind != reflect.Struct {
+- errors = appendErrors(errors,
+- fmt.Errorf("%s: unsupported type: %s", fieldType.Name, fieldKind))
+- continue
+- }
-
--type APIPort struct {
-- PrivatePort int64 `json:"PrivatePort,omitempty" yaml:"PrivatePort,omitempty"`
-- PublicPort int64 `json:"PublicPort,omitempty" yaml:"PublicPort,omitempty"`
-- Type string `json:"Type,omitempty" yaml:"Type,omitempty"`
-- IP string `json:"IP,omitempty" yaml:"IP,omitempty"`
--}
+- // We have an embedded field. We "squash" the fields down
+- // if specified in the tag.
+- squash := false
+- tagParts := strings.Split(fieldType.Tag.Get(d.config.TagName), ",")
+- for _, tag := range tagParts[1:] {
+- if tag == "squash" {
+- squash = true
+- break
+- }
+- }
-
--// APIContainers represents a container.
--//
--// See http://goo.gl/QeFH7U for more details.
--type APIContainers struct {
-- ID string `json:"Id" yaml:"Id"`
-- Image string `json:"Image,omitempty" yaml:"Image,omitempty"`
-- Command string `json:"Command,omitempty" yaml:"Command,omitempty"`
-- Created int64 `json:"Created,omitempty" yaml:"Created,omitempty"`
-- Status string `json:"Status,omitempty" yaml:"Status,omitempty"`
-- Ports []APIPort `json:"Ports,omitempty" yaml:"Ports,omitempty"`
-- SizeRw int64 `json:"SizeRw,omitempty" yaml:"SizeRw,omitempty"`
-- SizeRootFs int64 `json:"SizeRootFs,omitempty" yaml:"SizeRootFs,omitempty"`
-- Names []string `json:"Names,omitempty" yaml:"Names,omitempty"`
--}
+- if squash {
+- structs = append(structs, val.FieldByName(fieldType.Name))
+- continue
+- }
+- }
-
--// ListContainers returns a slice of containers matching the given criteria.
--//
--// See http://goo.gl/XqtcyU for more details.
--func (c *Client) ListContainers(opts ListContainersOptions) ([]APIContainers, error) {
-- path := "/containers/json?" + queryString(opts)
-- body, _, err := c.do("GET", path, nil)
-- if err != nil {
-- return nil, err
-- }
-- var containers []APIContainers
-- err = json.Unmarshal(body, &containers)
-- if err != nil {
-- return nil, err
+- // Normal struct field, store it away
+- fields[&fieldType] = structVal.Field(i)
+- }
- }
-- return containers, nil
--}
-
--// Port represents the port number and the protocol, in the form
--// <number>/<protocol>. For example: 80/tcp.
--type Port string
+- for fieldType, field := range fields {
+- fieldName := fieldType.Name
-
--// Port returns the number of the port.
--func (p Port) Port() string {
-- return strings.Split(string(p), "/")[0]
--}
+- tagValue := fieldType.Tag.Get(d.config.TagName)
+- tagValue = strings.SplitN(tagValue, ",", 2)[0]
+- if tagValue != "" {
+- fieldName = tagValue
+- }
-
--// Proto returns the name of the protocol.
--func (p Port) Proto() string {
-- parts := strings.Split(string(p), "/")
-- if len(parts) == 1 {
-- return "tcp"
-- }
-- return parts[1]
--}
+- rawMapKey := reflect.ValueOf(fieldName)
+- rawMapVal := dataVal.MapIndex(rawMapKey)
+- if !rawMapVal.IsValid() {
+- // Do a slower search by iterating over each key and
+- // doing case-insensitive search.
+- for dataValKey, _ := range dataValKeys {
+- mK, ok := dataValKey.Interface().(string)
+- if !ok {
+- // Not a string key
+- continue
+- }
-
--// State represents the state of a container.
--type State struct {
-- Running bool `json:"Running,omitempty" yaml:"Running,omitempty"`
-- Paused bool `json:"Paused,omitempty" yaml:"Paused,omitempty"`
-- Pid int `json:"Pid,omitempty" yaml:"Pid,omitempty"`
-- ExitCode int `json:"ExitCode,omitempty" yaml:"ExitCode,omitempty"`
-- StartedAt time.Time `json:"StartedAt,omitempty" yaml:"StartedAt,omitempty"`
-- FinishedAt time.Time `json:"FinishedAt,omitempty" yaml:"FinishedAt,omitempty"`
--}
+- if strings.EqualFold(mK, fieldName) {
+- rawMapKey = dataValKey
+- rawMapVal = dataVal.MapIndex(dataValKey)
+- break
+- }
+- }
-
--// String returns the string representation of a state.
--func (s *State) String() string {
-- if s.Running {
-- if s.Paused {
-- return "paused"
+- if !rawMapVal.IsValid() {
+- // There was no matching key in the map for the value in
+- // the struct. Just ignore.
+- continue
+- }
- }
-- return fmt.Sprintf("Up %s", time.Now().UTC().Sub(s.StartedAt))
-- }
-- return fmt.Sprintf("Exit %d", s.ExitCode)
--}
--
--type PortBinding struct {
-- HostIp string `json:"HostIP,omitempty" yaml:"HostIP,omitempty"`
-- HostPort string `json:"HostPort,omitempty" yaml:"HostPort,omitempty"`
--}
-
--type PortMapping map[string]string
+- // Delete the key we're using from the unused map so we stop tracking
+- delete(dataValKeysUnused, rawMapKey.Interface())
-
--type NetworkSettings struct {
-- IPAddress string `json:"IPAddress,omitempty" yaml:"IPAddress,omitempty"`
-- IPPrefixLen int `json:"IPPrefixLen,omitempty" yaml:"IPPrefixLen,omitempty"`
-- Gateway string `json:"Gateway,omitempty" yaml:"Gateway,omitempty"`
-- Bridge string `json:"Bridge,omitempty" yaml:"Bridge,omitempty"`
-- PortMapping map[string]PortMapping `json:"PortMapping,omitempty" yaml:"PortMapping,omitempty"`
-- Ports map[Port][]PortBinding `json:"Ports,omitempty" yaml:"Ports,omitempty"`
--}
+- if !field.IsValid() {
+- // This should never happen
+- panic("field is not valid")
+- }
-
--func (settings *NetworkSettings) PortMappingAPI() []APIPort {
-- var mapping []APIPort
-- for port, bindings := range settings.Ports {
-- p, _ := parsePort(port.Port())
-- if len(bindings) == 0 {
-- mapping = append(mapping, APIPort{
-- PublicPort: int64(p),
-- Type: port.Proto(),
-- })
+- // If we can't set the field, then it is unexported or something,
+- // and we just continue onwards.
+- if !field.CanSet() {
- continue
- }
-- for _, binding := range bindings {
-- p, _ := parsePort(port.Port())
-- h, _ := parsePort(binding.HostPort)
-- mapping = append(mapping, APIPort{
-- PrivatePort: int64(p),
-- PublicPort: int64(h),
-- Type: port.Proto(),
-- IP: binding.HostIp,
-- })
+-
+- // If the name is empty string, then we're at the root, and we
+- // don't dot-join the fields.
+- if name != "" {
+- fieldName = fmt.Sprintf("%s.%s", name, fieldName)
- }
-- }
-- return mapping
--}
-
--func parsePort(rawPort string) (int, error) {
-- port, err := strconv.ParseUint(rawPort, 10, 16)
-- if err != nil {
-- return 0, err
+- if err := d.decode(fieldName, rawMapVal.Interface(), field); err != nil {
+- errors = appendErrors(errors, err)
+- }
- }
-- return int(port), nil
--}
-
--type Config struct {
-- Hostname string `json:"Hostname,omitempty" yaml:"Hostname,omitempty"`
-- Domainname string `json:"Domainname,omitempty" yaml:"Domainname,omitempty"`
-- User string `json:"User,omitempty" yaml:"User,omitempty"`
-- Memory int64 `json:"Memory,omitempty" yaml:"Memory,omitempty"`
-- MemorySwap int64 `json:"MemorySwap,omitempty" yaml:"MemorySwap,omitempty"`
-- CpuShares int64 `json:"CpuShares,omitempty" yaml:"CpuShares,omitempty"`
-- CpuSet string `json:"CpuSet,omitempty" yaml:"CpuSet,omitempty"`
-- AttachStdin bool `json:"AttachStdin,omitempty" yaml:"AttachStdin,omitempty"`
-- AttachStdout bool `json:"AttachStdout,omitempty" yaml:"AttachStdout,omitempty"`
-- AttachStderr bool `json:"AttachStderr,omitempty" yaml:"AttachStderr,omitempty"`
-- PortSpecs []string `json:"PortSpecs,omitempty" yaml:"PortSpecs,omitempty"`
-- ExposedPorts map[Port]struct{} `json:"ExposedPorts,omitempty" yaml:"ExposedPorts,omitempty"`
-- Tty bool `json:"Tty,omitempty" yaml:"Tty,omitempty"`
-- OpenStdin bool `json:"OpenStdin,omitempty" yaml:"OpenStdin,omitempty"`
-- StdinOnce bool `json:"StdinOnce,omitempty" yaml:"StdinOnce,omitempty"`
-- Env []string `json:"Env,omitempty" yaml:"Env,omitempty"`
-- Cmd []string `json:"Cmd,omitempty" yaml:"Cmd,omitempty"`
-- Dns []string `json:"Dns,omitempty" yaml:"Dns,omitempty"` // For Docker API v1.9 and below only
-- Image string `json:"Image,omitempty" yaml:"Image,omitempty"`
-- Volumes map[string]struct{} `json:"Volumes,omitempty" yaml:"Volumes,omitempty"`
-- VolumesFrom string `json:"VolumesFrom,omitempty" yaml:"VolumesFrom,omitempty"`
-- WorkingDir string `json:"WorkingDir,omitempty" yaml:"WorkingDir,omitempty"`
-- Entrypoint []string `json:"Entrypoint,omitempty" yaml:"Entrypoint,omitempty"`
-- NetworkDisabled bool `json:"NetworkDisabled,omitempty" yaml:"NetworkDisabled,omitempty"`
--}
+- if d.config.ErrorUnused && len(dataValKeysUnused) > 0 {
+- keys := make([]string, 0, len(dataValKeysUnused))
+- for rawKey, _ := range dataValKeysUnused {
+- keys = append(keys, rawKey.(string))
+- }
+- sort.Strings(keys)
-
--type Container struct {
-- ID string `json:"Id" yaml:"Id"`
+- err := fmt.Errorf("'%s' has invalid keys: %s", name, strings.Join(keys, ", "))
+- errors = appendErrors(errors, err)
+- }
-
-- Created time.Time `json:"Created,omitempty" yaml:"Created,omitempty"`
+- if len(errors) > 0 {
+- return &Error{errors}
+- }
-
-- Path string `json:"Path,omitempty" yaml:"Path,omitempty"`
-- Args []string `json:"Args,omitempty" yaml:"Args,omitempty"`
+- // Add the unused keys to the list of unused keys if we're tracking metadata
+- if d.config.Metadata != nil {
+- for rawKey, _ := range dataValKeysUnused {
+- key := rawKey.(string)
+- if name != "" {
+- key = fmt.Sprintf("%s.%s", name, key)
+- }
-
-- Config *Config `json:"Config,omitempty" yaml:"Config,omitempty"`
-- State State `json:"State,omitempty" yaml:"State,omitempty"`
-- Image string `json:"Image,omitempty" yaml:"Image,omitempty"`
+- d.config.Metadata.Unused = append(d.config.Metadata.Unused, key)
+- }
+- }
-
-- NetworkSettings *NetworkSettings `json:"NetworkSettings,omitempty" yaml:"NetworkSettings,omitempty"`
+- return nil
+-}
-
-- SysInitPath string `json:"SysInitPath,omitempty" yaml:"SysInitPath,omitempty"`
-- ResolvConfPath string `json:"ResolvConfPath,omitempty" yaml:"ResolvConfPath,omitempty"`
-- HostnamePath string `json:"HostnamePath,omitempty" yaml:"HostnamePath,omitempty"`
-- HostsPath string `json:"HostsPath,omitempty" yaml:"HostsPath,omitempty"`
-- Name string `json:"Name,omitempty" yaml:"Name,omitempty"`
-- Driver string `json:"Driver,omitempty" yaml:"Driver,omitempty"`
+-func getKind(val reflect.Value) reflect.Kind {
+- kind := val.Kind()
-
-- Volumes map[string]string `json:"Volumes,omitempty" yaml:"Volumes,omitempty"`
-- VolumesRW map[string]bool `json:"VolumesRW,omitempty" yaml:"VolumesRW,omitempty"`
-- HostConfig *HostConfig `json:"HostConfig,omitempty" yaml:"HostConfig,omitempty"`
+- switch {
+- case kind >= reflect.Int && kind <= reflect.Int64:
+- return reflect.Int
+- case kind >= reflect.Uint && kind <= reflect.Uint64:
+- return reflect.Uint
+- case kind >= reflect.Float32 && kind <= reflect.Float64:
+- return reflect.Float32
+- default:
+- return kind
+- }
-}
+diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure_benchmark_test.go b/Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure_benchmark_test.go
+deleted file mode 100644
+index b50ac36..0000000
+--- a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure_benchmark_test.go
++++ /dev/null
+@@ -1,243 +0,0 @@
+-package mapstructure
-
--// InspectContainer returns information about a container by its ID.
--//
--// See http://goo.gl/CxVuJ5 for more details.
--func (c *Client) InspectContainer(id string) (*Container, error) {
-- path := "/containers/" + id + "/json"
-- body, status, err := c.do("GET", path, nil)
-- if status == http.StatusNotFound {
-- return nil, &NoSuchContainer{ID: id}
+-import (
+- "testing"
+-)
+-
+-func Benchmark_Decode(b *testing.B) {
+- type Person struct {
+- Name string
+- Age int
+- Emails []string
+- Extra map[string]string
- }
-- if err != nil {
-- return nil, err
+-
+- input := map[string]interface{}{
+- "name": "Mitchell",
+- "age": 91,
+- "emails": []string{"one", "two", "three"},
+- "extra": map[string]string{
+- "twitter": "mitchellh",
+- },
- }
-- var container Container
-- err = json.Unmarshal(body, &container)
-- if err != nil {
-- return nil, err
+-
+- var result Person
+- for i := 0; i < b.N; i++ {
+- Decode(input, &result)
- }
-- return &container, nil
-}
-
--// ContainerChanges returns changes in the filesystem of the given container.
--//
--// See http://goo.gl/QkW9sH for more details.
--func (c *Client) ContainerChanges(id string) ([]Change, error) {
-- path := "/containers/" + id + "/changes"
-- body, status, err := c.do("GET", path, nil)
-- if status == http.StatusNotFound {
-- return nil, &NoSuchContainer{ID: id}
-- }
-- if err != nil {
-- return nil, err
-- }
-- var changes []Change
-- err = json.Unmarshal(body, &changes)
-- if err != nil {
-- return nil, err
+-func Benchmark_DecodeBasic(b *testing.B) {
+- input := map[string]interface{}{
+- "vstring": "foo",
+- "vint": 42,
+- "Vuint": 42,
+- "vbool": true,
+- "Vfloat": 42.42,
+- "vsilent": true,
+- "vdata": 42,
- }
-- return changes, nil
--}
-
--// CreateContainerOptions specify parameters to the CreateContainer function.
--//
--// See http://goo.gl/mErxNp for more details.
--type CreateContainerOptions struct {
-- Name string
-- Config *Config `qs:"-"`
+- var result Basic
+- for i := 0; i < b.N; i++ {
+- Decode(input, &result)
+- }
-}
-
--// CreateContainer creates a new container, returning the container instance,
--// or an error in case of failure.
--//
--// See http://goo.gl/mErxNp for more details.
--func (c *Client) CreateContainer(opts CreateContainerOptions) (*Container, error) {
-- path := "/containers/create?" + queryString(opts)
-- body, status, err := c.do("POST", path, opts.Config)
-- if status == http.StatusNotFound {
-- return nil, ErrNoSuchImage
-- }
-- if err != nil {
-- return nil, err
-- }
-- var container Container
-- err = json.Unmarshal(body, &container)
-- if err != nil {
-- return nil, err
+-func Benchmark_DecodeEmbedded(b *testing.B) {
+- input := map[string]interface{}{
+- "vstring": "foo",
+- "Basic": map[string]interface{}{
+- "vstring": "innerfoo",
+- },
+- "vunique": "bar",
- }
-
-- container.Name = opts.Name
--
-- return &container, nil
+- var result Embedded
+- for i := 0; i < b.N; i++ {
+- Decode(input, &result)
+- }
-}
-
--type KeyValuePair struct {
-- Key string `json:"Key,omitempty" yaml:"Key,omitempty"`
-- Value string `json:"Value,omitempty" yaml:"Value,omitempty"`
--}
+-func Benchmark_DecodeTypeConversion(b *testing.B) {
+- input := map[string]interface{}{
+- "IntToFloat": 42,
+- "IntToUint": 42,
+- "IntToBool": 1,
+- "IntToString": 42,
+- "UintToInt": 42,
+- "UintToFloat": 42,
+- "UintToBool": 42,
+- "UintToString": 42,
+- "BoolToInt": true,
+- "BoolToUint": true,
+- "BoolToFloat": true,
+- "BoolToString": true,
+- "FloatToInt": 42.42,
+- "FloatToUint": 42.42,
+- "FloatToBool": 42.42,
+- "FloatToString": 42.42,
+- "StringToInt": "42",
+- "StringToUint": "42",
+- "StringToBool": "1",
+- "StringToFloat": "42.42",
+- "SliceToMap": []interface{}{},
+- "MapToSlice": map[string]interface{}{},
+- }
-
--// RestartPolicy represents the policy for automatically restarting a container.
--//
--// Possible values are:
--//
--// - always: the docker daemon will always restart the container
--// - on-failure: the docker daemon will restart the container on failures, at
--// most MaximumRetryCount times
--// - no: the docker daemon will not restart the container automatically
--type RestartPolicy struct {
-- Name string `json:"Name,omitempty" yaml:"Name,omitempty"`
-- MaximumRetryCount int `json:"MaximumRetryCount,omitempty" yaml:"MaximumRetryCount,omitempty"`
+- var resultStrict TypeConversionResult
+- for i := 0; i < b.N; i++ {
+- Decode(input, &resultStrict)
+- }
-}
-
--// AlwaysRestart returns a restart policy that tells the Docker daemon to
--// always restart the container.
--func AlwaysRestart() RestartPolicy {
-- return RestartPolicy{Name: "always"}
--}
+-func Benchmark_DecodeMap(b *testing.B) {
+- input := map[string]interface{}{
+- "vfoo": "foo",
+- "vother": map[interface{}]interface{}{
+- "foo": "foo",
+- "bar": "bar",
+- },
+- }
-
--// RestartOnFailure returns a restart policy that tells the Docker daemon to
--// restart the container on failures, trying at most maxRetry times.
--func RestartOnFailure(maxRetry int) RestartPolicy {
-- return RestartPolicy{Name: "on-failure", MaximumRetryCount: maxRetry}
+- var result Map
+- for i := 0; i < b.N; i++ {
+- Decode(input, &result)
+- }
-}
-
--// NeverRestart returns a restart policy that tells the Docker daemon to never
--// restart the container on failures.
--func NeverRestart() RestartPolicy {
-- return RestartPolicy{Name: "no"}
--}
+-func Benchmark_DecodeMapOfStruct(b *testing.B) {
+- input := map[string]interface{}{
+- "value": map[string]interface{}{
+- "foo": map[string]string{"vstring": "one"},
+- "bar": map[string]string{"vstring": "two"},
+- },
+- }
-
--type HostConfig struct {
-- Binds []string `json:"Binds,omitempty" yaml:"Binds,omitempty"`
-- CapAdd []string `json:"CapAdd,omitempty" yaml:"CapAdd,omitempty"`
-- CapDrop []string `json:"CapDrop,omitempty" yaml:"CapDrop,omitempty"`
-- ContainerIDFile string `json:"ContainerIDFile,omitempty" yaml:"ContainerIDFile,omitempty"`
-- LxcConf []KeyValuePair `json:"LxcConf,omitempty" yaml:"LxcConf,omitempty"`
-- Privileged bool `json:"Privileged,omitempty" yaml:"Privileged,omitempty"`
-- PortBindings map[Port][]PortBinding `json:"PortBindings,omitempty" yaml:"PortBindings,omitempty"`
-- Links []string `json:"Links,omitempty" yaml:"Links,omitempty"`
-- PublishAllPorts bool `json:"PublishAllPorts,omitempty" yaml:"PublishAllPorts,omitempty"`
-- Dns []string `json:"Dns,omitempty" yaml:"Dns,omitempty"` // For Docker API v1.10 and above only
-- DnsSearch []string `json:"DnsSearch,omitempty" yaml:"DnsSearch,omitempty"`
-- VolumesFrom []string `json:"VolumesFrom,omitempty" yaml:"VolumesFrom,omitempty"`
-- NetworkMode string `json:"NetworkMode,omitempty" yaml:"NetworkMode,omitempty"`
-- RestartPolicy RestartPolicy `json:"RestartPolicy,omitempty" yaml:"RestartPolicy,omitempty"`
+- var result MapOfStruct
+- for i := 0; i < b.N; i++ {
+- Decode(input, &result)
+- }
-}
-
--// StartContainer starts a container, returning an error in case of failure.
--//
--// See http://goo.gl/iM5GYs for more details.
--func (c *Client) StartContainer(id string, hostConfig *HostConfig) error {
-- if hostConfig == nil {
-- hostConfig = &HostConfig{}
+-func Benchmark_DecodeSlice(b *testing.B) {
+- input := map[string]interface{}{
+- "vfoo": "foo",
+- "vbar": []string{"foo", "bar", "baz"},
- }
-- path := "/containers/" + id + "/start"
-- _, status, err := c.do("POST", path, hostConfig)
-- if status == http.StatusNotFound {
-- return &NoSuchContainer{ID: id}
+-
+- var result Slice
+- for i := 0; i < b.N; i++ {
+- Decode(input, &result)
- }
-- if status == http.StatusNotModified {
-- return &ContainerAlreadyRunning{ID: id}
+-}
+-
+-func Benchmark_DecodeSliceOfStruct(b *testing.B) {
+- input := map[string]interface{}{
+- "value": []map[string]interface{}{
+- {"vstring": "one"},
+- {"vstring": "two"},
+- },
- }
-- if err != nil {
-- return err
+-
+- var result SliceOfStruct
+- for i := 0; i < b.N; i++ {
+- Decode(input, &result)
- }
-- return nil
-}
-
--// StopContainer stops a container, killing it after the given timeout (in
--// seconds).
--//
--// See http://goo.gl/EbcpXt for more details.
--func (c *Client) StopContainer(id string, timeout uint) error {
-- path := fmt.Sprintf("/containers/%s/stop?t=%d", id, timeout)
-- _, status, err := c.do("POST", path, nil)
-- if status == http.StatusNotFound {
-- return &NoSuchContainer{ID: id}
-- }
-- if status == http.StatusNotModified {
-- return &ContainerNotRunning{ID: id}
+-func Benchmark_DecodeWeaklyTypedInput(b *testing.B) {
+- type Person struct {
+- Name string
+- Age int
+- Emails []string
- }
-- if err != nil {
-- return err
+-
+- // This input can come from anywhere, but typically comes from
+- // something like decoding JSON, generated by a weakly typed language
+- // such as PHP.
+- input := map[string]interface{}{
+- "name": 123, // number => string
+- "age": "42", // string => number
+- "emails": map[string]interface{}{}, // empty map => empty array
- }
-- return nil
--}
-
--// RestartContainer stops a container, killing it after the given timeout (in
--// seconds), during the stop process.
--//
--// See http://goo.gl/VOzR2n for more details.
--func (c *Client) RestartContainer(id string, timeout uint) error {
-- path := fmt.Sprintf("/containers/%s/restart?t=%d", id, timeout)
-- _, status, err := c.do("POST", path, nil)
-- if status == http.StatusNotFound {
-- return &NoSuchContainer{ID: id}
+- var result Person
+- config := &DecoderConfig{
+- WeaklyTypedInput: true,
+- Result: &result,
- }
+-
+- decoder, err := NewDecoder(config)
- if err != nil {
-- return err
+- panic(err)
+- }
+-
+- for i := 0; i < b.N; i++ {
+- decoder.Decode(input)
- }
-- return nil
-}
-
--// PauseContainer pauses the given container.
--//
--// See http://goo.gl/AM5t42 for more details.
--func (c *Client) PauseContainer(id string) error {
-- path := fmt.Sprintf("/containers/%s/pause", id)
-- _, status, err := c.do("POST", path, nil)
-- if status == http.StatusNotFound {
-- return &NoSuchContainer{ID: id}
+-func Benchmark_DecodeMetadata(b *testing.B) {
+- type Person struct {
+- Name string
+- Age int
- }
-- if err != nil {
-- return err
+-
+- input := map[string]interface{}{
+- "name": "Mitchell",
+- "age": 91,
+- "email": "foo at bar.com",
- }
-- return nil
--}
-
--// UnpauseContainer pauses the given container.
--//
--// See http://goo.gl/eBrNSL for more details.
--func (c *Client) UnpauseContainer(id string) error {
-- path := fmt.Sprintf("/containers/%s/unpause", id)
-- _, status, err := c.do("POST", path, nil)
-- if status == http.StatusNotFound {
-- return &NoSuchContainer{ID: id}
+- var md Metadata
+- var result Person
+- config := &DecoderConfig{
+- Metadata: &md,
+- Result: &result,
- }
+-
+- decoder, err := NewDecoder(config)
- if err != nil {
-- return err
+- panic(err)
- }
-- return nil
--}
-
--// TopResult represents the list of processes running in a container, as
--// returned by /containers/<id>/top.
--//
--// See http://goo.gl/qu4gse for more details.
--type TopResult struct {
-- Titles []string
-- Processes [][]string
+- for i := 0; i < b.N; i++ {
+- decoder.Decode(input)
+- }
-}
-
--// TopContainer returns processes running inside a container
--//
--// See http://goo.gl/qu4gse for more details.
--func (c *Client) TopContainer(id string, psArgs string) (TopResult, error) {
-- var args string
-- var result TopResult
-- if psArgs != "" {
-- args = fmt.Sprintf("?ps_args=%s", psArgs)
+-func Benchmark_DecodeMetadataEmbedded(b *testing.B) {
+- input := map[string]interface{}{
+- "vstring": "foo",
+- "vunique": "bar",
- }
-- path := fmt.Sprintf("/containers/%s/top%s", id, args)
-- body, status, err := c.do("GET", path, nil)
-- if status == http.StatusNotFound {
-- return result, &NoSuchContainer{ID: id}
+-
+- var md Metadata
+- var result EmbeddedSquash
+- config := &DecoderConfig{
+- Metadata: &md,
+- Result: &result,
- }
+-
+- decoder, err := NewDecoder(config)
- if err != nil {
-- return result, err
+- b.Fatalf("err: %s", err)
- }
-- err = json.Unmarshal(body, &result)
-- if err != nil {
-- return result, err
+-
+- for i := 0; i < b.N; i++ {
+- decoder.Decode(input)
- }
-- return result, nil
-}
-
--// KillContainerOptions represents the set of options that can be used in a
--// call to KillContainer.
--//
--// See http://goo.gl/TFkECx for more details.
--type KillContainerOptions struct {
-- // The ID of the container.
-- ID string `qs:"-"`
+-func Benchmark_DecodeTagged(b *testing.B) {
+- input := map[string]interface{}{
+- "foo": "bar",
+- "bar": "value",
+- }
-
-- // The signal to send to the container. When omitted, Docker server
-- // will assume SIGKILL.
-- Signal Signal
+- var result Tagged
+- for i := 0; i < b.N; i++ {
+- Decode(input, &result)
+- }
-}
+diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure_bugs_test.go b/Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure_bugs_test.go
+deleted file mode 100644
+index 7054f1a..0000000
+--- a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure_bugs_test.go
++++ /dev/null
+@@ -1,47 +0,0 @@
+-package mapstructure
-
--// KillContainer kills a container, returning an error in case of failure.
--//
--// See http://goo.gl/TFkECx for more details.
--func (c *Client) KillContainer(opts KillContainerOptions) error {
-- path := "/containers/" + opts.ID + "/kill" + "?" + queryString(opts)
-- _, status, err := c.do("POST", path, nil)
-- if status == http.StatusNotFound {
-- return &NoSuchContainer{ID: opts.ID}
+-import "testing"
+-
+-// GH-1
+-func TestDecode_NilValue(t *testing.T) {
+- input := map[string]interface{}{
+- "vfoo": nil,
+- "vother": nil,
- }
+-
+- var result Map
+- err := Decode(input, &result)
- if err != nil {
-- return err
+- t.Fatalf("should not error: %s", err)
- }
-- return nil
--}
--
--// RemoveContainerOptions encapsulates options to remove a container.
--//
--// See http://goo.gl/ZB83ji for more details.
--type RemoveContainerOptions struct {
-- // The ID of the container.
-- ID string `qs:"-"`
-
-- // A flag that indicates whether Docker should remove the volumes
-- // associated to the container.
-- RemoveVolumes bool `qs:"v"`
+- if result.Vfoo != "" {
+- t.Fatalf("value should be default: %s", result.Vfoo)
+- }
-
-- // A flag that indicates whether Docker should remove the container
-- // even if it is currently running.
-- Force bool
+- if result.Vother != nil {
+- t.Fatalf("Vother should be nil: %s", result.Vother)
+- }
-}
-
--// RemoveContainer removes a container, returning an error in case of failure.
--//
--// See http://goo.gl/ZB83ji for more details.
--func (c *Client) RemoveContainer(opts RemoveContainerOptions) error {
-- path := "/containers/" + opts.ID + "?" + queryString(opts)
-- _, status, err := c.do("DELETE", path, nil)
-- if status == http.StatusNotFound {
-- return &NoSuchContainer{ID: opts.ID}
+-// GH-10
+-func TestDecode_mapInterfaceInterface(t *testing.T) {
+- input := map[interface{}]interface{}{
+- "vfoo": nil,
+- "vother": nil,
- }
+-
+- var result Map
+- err := Decode(input, &result)
- if err != nil {
-- return err
+- t.Fatalf("should not error: %s", err)
- }
-- return nil
--}
-
--// CopyFromContainerOptions is the set of options that can be used when copying
--// files or folders from a container.
--//
--// See http://goo.gl/rINMlw for more details.
--type CopyFromContainerOptions struct {
-- OutputStream io.Writer `json:"-"`
-- Container string `json:"-"`
-- Resource string
+- if result.Vfoo != "" {
+- t.Fatalf("value should be default: %s", result.Vfoo)
+- }
+-
+- if result.Vother != nil {
+- t.Fatalf("Vother should be nil: %s", result.Vother)
+- }
-}
+diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure_examples_test.go b/Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure_examples_test.go
+deleted file mode 100644
+index aa393cc..0000000
+--- a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure_examples_test.go
++++ /dev/null
+@@ -1,169 +0,0 @@
+-package mapstructure
-
--// CopyFromContainer copy files or folders from a container, using a given
--// resource.
--//
--// See http://goo.gl/rINMlw for more details.
--func (c *Client) CopyFromContainer(opts CopyFromContainerOptions) error {
-- if opts.Container == "" {
-- return &NoSuchContainer{ID: opts.Container}
+-import (
+- "fmt"
+-)
+-
+-func ExampleDecode() {
+- type Person struct {
+- Name string
+- Age int
+- Emails []string
+- Extra map[string]string
- }
-- url := fmt.Sprintf("/containers/%s/copy", opts.Container)
-- body, status, err := c.do("POST", url, opts)
-- if status == http.StatusNotFound {
-- return &NoSuchContainer{ID: opts.Container}
+-
+- // This input can come from anywhere, but typically comes from
+- // something like decoding JSON where we're not quite sure of the
+- // struct initially.
+- input := map[string]interface{}{
+- "name": "Mitchell",
+- "age": 91,
+- "emails": []string{"one", "two", "three"},
+- "extra": map[string]string{
+- "twitter": "mitchellh",
+- },
- }
+-
+- var result Person
+- err := Decode(input, &result)
- if err != nil {
-- return err
+- panic(err)
- }
-- io.Copy(opts.OutputStream, bytes.NewBuffer(body))
-- return nil
+-
+- fmt.Printf("%#v", result)
+- // Output:
+- // mapstructure.Person{Name:"Mitchell", Age:91, Emails:[]string{"one", "two", "three"}, Extra:map[string]string{"twitter":"mitchellh"}}
-}
-
--// WaitContainer blocks until the given container stops, return the exit code
--// of the container status.
--//
--// See http://goo.gl/J88DHU for more details.
--func (c *Client) WaitContainer(id string) (int, error) {
-- body, status, err := c.do("POST", "/containers/"+id+"/wait", nil)
-- if status == http.StatusNotFound {
-- return 0, &NoSuchContainer{ID: id}
+-func ExampleDecode_errors() {
+- type Person struct {
+- Name string
+- Age int
+- Emails []string
+- Extra map[string]string
- }
-- if err != nil {
-- return 0, err
+-
+- // This input can come from anywhere, but typically comes from
+- // something like decoding JSON where we're not quite sure of the
+- // struct initially.
+- input := map[string]interface{}{
+- "name": 123,
+- "age": "bad value",
+- "emails": []int{1, 2, 3},
- }
-- var r struct{ StatusCode int }
-- err = json.Unmarshal(body, &r)
-- if err != nil {
-- return 0, err
+-
+- var result Person
+- err := Decode(input, &result)
+- if err == nil {
+- panic("should have an error")
- }
-- return r.StatusCode, nil
--}
-
--// CommitContainerOptions aggregates parameters to the CommitContainer method.
--//
--// See http://goo.gl/Jn8pe8 for more details.
--type CommitContainerOptions struct {
-- Container string
-- Repository string `qs:"repo"`
-- Tag string
-- Message string `qs:"m"`
-- Author string
-- Run *Config `qs:"-"`
+- fmt.Println(err.Error())
+- // Output:
+- // 5 error(s) decoding:
+- //
+- // * 'Name' expected type 'string', got unconvertible type 'int'
+- // * 'Age' expected type 'int', got unconvertible type 'string'
+- // * 'Emails[0]' expected type 'string', got unconvertible type 'int'
+- // * 'Emails[1]' expected type 'string', got unconvertible type 'int'
+- // * 'Emails[2]' expected type 'string', got unconvertible type 'int'
-}
-
--// CommitContainer creates a new image from a container's changes.
--//
--// See http://goo.gl/Jn8pe8 for more details.
--func (c *Client) CommitContainer(opts CommitContainerOptions) (*Image, error) {
-- path := "/commit?" + queryString(opts)
-- body, status, err := c.do("POST", path, opts.Run)
-- if status == http.StatusNotFound {
-- return nil, &NoSuchContainer{ID: opts.Container}
+-func ExampleDecode_metadata() {
+- type Person struct {
+- Name string
+- Age int
- }
-- if err != nil {
-- return nil, err
+-
+- // This input can come from anywhere, but typically comes from
+- // something like decoding JSON where we're not quite sure of the
+- // struct initially.
+- input := map[string]interface{}{
+- "name": "Mitchell",
+- "age": 91,
+- "email": "foo at bar.com",
+- }
+-
+- // For metadata, we make a more advanced DecoderConfig so we can
+- // more finely configure the decoder that is used. In this case, we
+- // just tell the decoder we want to track metadata.
+- var md Metadata
+- var result Person
+- config := &DecoderConfig{
+- Metadata: &md,
+- Result: &result,
- }
-- var image Image
-- err = json.Unmarshal(body, &image)
+-
+- decoder, err := NewDecoder(config)
- if err != nil {
-- return nil, err
+- panic(err)
- }
-- return &image, nil
--}
--
--// AttachToContainerOptions is the set of options that can be used when
--// attaching to a container.
--//
--// See http://goo.gl/RRAhws for more details.
--type AttachToContainerOptions struct {
-- Container string `qs:"-"`
-- InputStream io.Reader `qs:"-"`
-- OutputStream io.Writer `qs:"-"`
-- ErrorStream io.Writer `qs:"-"`
--
-- // Get container logs, sending it to OutputStream.
-- Logs bool
--
-- // Stream the response?
-- Stream bool
-
-- // Attach to stdin, and use InputStream.
-- Stdin bool
+- if err := decoder.Decode(input); err != nil {
+- panic(err)
+- }
-
-- // Attach to stdout, and use OutputStream.
-- Stdout bool
+- fmt.Printf("Unused keys: %#v", md.Unused)
+- // Output:
+- // Unused keys: []string{"email"}
+-}
-
-- // Attach to stderr, and use ErrorStream.
-- Stderr bool
+-func ExampleDecode_weaklyTypedInput() {
+- type Person struct {
+- Name string
+- Age int
+- Emails []string
+- }
-
-- // If set, after a successful connect, a sentinel will be sent and then the
-- // client will block on receive before continuing.
-- //
-- // It must be an unbuffered channel. Using a buffered channel can lead
-- // to unexpected behavior.
-- Success chan struct{}
+- // This input can come from anywhere, but typically comes from
+- // something like decoding JSON, generated by a weakly typed language
+- // such as PHP.
+- input := map[string]interface{}{
+- "name": 123, // number => string
+- "age": "42", // string => number
+- "emails": map[string]interface{}{}, // empty map => empty array
+- }
-
-- // Use raw terminal? Usually true when the container contains a TTY.
-- RawTerminal bool `qs:"-"`
--}
+- var result Person
+- config := &DecoderConfig{
+- WeaklyTypedInput: true,
+- Result: &result,
+- }
-
--// AttachToContainer attaches to a container, using the given options.
--//
--// See http://goo.gl/RRAhws for more details.
--func (c *Client) AttachToContainer(opts AttachToContainerOptions) error {
-- if opts.Container == "" {
-- return &NoSuchContainer{ID: opts.Container}
+- decoder, err := NewDecoder(config)
+- if err != nil {
+- panic(err)
- }
-- path := "/containers/" + opts.Container + "/attach?" + queryString(opts)
-- return c.hijack("POST", path, opts.Success, opts.RawTerminal, opts.InputStream, opts.ErrorStream, opts.OutputStream, nil)
--}
-
--// LogsOptions represents the set of options used when getting logs from a
--// container.
--//
--// See http://goo.gl/rLhKSU for more details.
--type LogsOptions struct {
-- Container string `qs:"-"`
-- OutputStream io.Writer `qs:"-"`
-- ErrorStream io.Writer `qs:"-"`
-- Follow bool
-- Stdout bool
-- Stderr bool
-- Timestamps bool
-- Tail string
+- err = decoder.Decode(input)
+- if err != nil {
+- panic(err)
+- }
-
-- // Use raw terminal? Usually true when the container contains a TTY.
-- RawTerminal bool `qs:"-"`
+- fmt.Printf("%#v", result)
+- // Output: mapstructure.Person{Name:"123", Age:42, Emails:[]string{}}
-}
-
--// Logs gets stdout and stderr logs from the specified container.
--//
--// See http://goo.gl/rLhKSU for more details.
--func (c *Client) Logs(opts LogsOptions) error {
-- if opts.Container == "" {
-- return &NoSuchContainer{ID: opts.Container}
+-func ExampleDecode_tags() {
+- // Note that the mapstructure tags defined in the struct type
+- // can indicate which fields the values are mapped to.
+- type Person struct {
+- Name string `mapstructure:"person_name"`
+- Age int `mapstructure:"person_age"`
- }
-- if opts.Tail == "" {
-- opts.Tail = "all"
+-
+- input := map[string]interface{}{
+- "person_name": "Mitchell",
+- "person_age": 91,
- }
-- path := "/containers/" + opts.Container + "/logs?" + queryString(opts)
-- return c.stream("GET", path, opts.RawTerminal, false, nil, nil, opts.OutputStream, opts.ErrorStream)
--}
-
--// ResizeContainerTTY resizes the terminal to the given height and width.
--func (c *Client) ResizeContainerTTY(id string, height, width int) error {
-- params := make(url.Values)
-- params.Set("h", strconv.Itoa(height))
-- params.Set("w", strconv.Itoa(width))
-- _, _, err := c.do("POST", "/containers/"+id+"/resize?"+params.Encode(), nil)
-- return err
--}
+- var result Person
+- err := Decode(input, &result)
+- if err != nil {
+- panic(err)
+- }
-
--// ExportContainerOptions is the set of parameters to the ExportContainer
--// method.
--//
--// See http://goo.gl/hnzE62 for more details.
--type ExportContainerOptions struct {
-- ID string
-- OutputStream io.Writer
+- fmt.Printf("%#v", result)
+- // Output:
+- // mapstructure.Person{Name:"Mitchell", Age:91}
-}
+diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure_test.go b/Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure_test.go
+deleted file mode 100644
+index 23029c7..0000000
+--- a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure_test.go
++++ /dev/null
+@@ -1,828 +0,0 @@
+-package mapstructure
-
--// ExportContainer export the contents of container id as tar archive
--// and prints the exported contents to stdout.
--//
--// See http://goo.gl/hnzE62 for more details.
--func (c *Client) ExportContainer(opts ExportContainerOptions) error {
-- if opts.ID == "" {
-- return &NoSuchContainer{ID: opts.ID}
-- }
-- url := fmt.Sprintf("/containers/%s/export", opts.ID)
-- return c.stream("GET", url, true, false, nil, nil, opts.OutputStream, nil)
--}
+-import (
+- "reflect"
+- "sort"
+- "testing"
+-)
-
--// NoSuchContainer is the error returned when a given container does not exist.
--type NoSuchContainer struct {
-- ID string
+-type Basic struct {
+- Vstring string
+- Vint int
+- Vuint uint
+- Vbool bool
+- Vfloat float64
+- Vextra string
+- vsilent bool
+- Vdata interface{}
-}
-
--func (err *NoSuchContainer) Error() string {
-- return "No such container: " + err.ID
+-type Embedded struct {
+- Basic
+- Vunique string
-}
-
--// ContainerAlreadyRunning is the error returned when a given container is
--// already running.
--type ContainerAlreadyRunning struct {
-- ID string
+-type EmbeddedPointer struct {
+- *Basic
+- Vunique string
-}
-
--func (err *ContainerAlreadyRunning) Error() string {
-- return "Container already running: " + err.ID
+-type EmbeddedSquash struct {
+- Basic `mapstructure:",squash"`
+- Vunique string
-}
-
--// ContainerNotRunning is the error returned when a given container is not
--// running.
--type ContainerNotRunning struct {
-- ID string
+-type Map struct {
+- Vfoo string
+- Vother map[string]string
-}
-
--func (err *ContainerNotRunning) Error() string {
-- return "Container not running: " + err.ID
+-type MapOfStruct struct {
+- Value map[string]Basic
-}
-diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/container_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/container_test.go
-deleted file mode 100644
-index d80270b..0000000
---- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/container_test.go
-+++ /dev/null
-@@ -1,1495 +0,0 @@
--// Copyright 2014 go-dockerclient authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--package docker
--
--import (
-- "bytes"
-- "encoding/json"
-- "io/ioutil"
-- "net"
-- "net/http"
-- "net/http/httptest"
-- "net/url"
-- "os"
-- "reflect"
-- "regexp"
-- "runtime"
-- "strconv"
-- "strings"
-- "testing"
-- "time"
--)
-
--func TestStateString(t *testing.T) {
-- started := time.Now().Add(-3 * time.Hour)
-- var tests = []struct {
-- input State
-- expected string
-- }{
-- {State{Running: true, Paused: true}, "^paused$"},
-- {State{Running: true, StartedAt: started}, "^Up 3h.*$"},
-- {State{Running: false, ExitCode: 7}, "^Exit 7$"},
-- }
-- for _, tt := range tests {
-- re := regexp.MustCompile(tt.expected)
-- if got := tt.input.String(); !re.MatchString(got) {
-- t.Errorf("State.String(): wrong result. Want %q. Got %q.", tt.expected, got)
-- }
-- }
+-type Nested struct {
+- Vfoo string
+- Vbar Basic
-}
-
--func TestListContainers(t *testing.T) {
-- jsonContainers := `[
-- {
-- "Id": "8dfafdbc3a40",
-- "Image": "base:latest",
-- "Command": "echo 1",
-- "Created": 1367854155,
-- "Ports":[{"PrivatePort": 2222, "PublicPort": 3333, "Type": "tcp"}],
-- "Status": "Exit 0"
-- },
-- {
-- "Id": "9cd87474be90",
-- "Image": "base:latest",
-- "Command": "echo 222222",
-- "Created": 1367854155,
-- "Ports":[{"PrivatePort": 2222, "PublicPort": 3333, "Type": "tcp"}],
-- "Status": "Exit 0"
-- },
-- {
-- "Id": "3176a2479c92",
-- "Image": "base:latest",
-- "Command": "echo 3333333333333333",
-- "Created": 1367854154,
-- "Ports":[{"PrivatePort": 2221, "PublicPort": 3331, "Type": "tcp"}],
-- "Status": "Exit 0"
-- },
-- {
-- "Id": "4cb07b47f9fb",
-- "Image": "base:latest",
-- "Command": "echo 444444444444444444444444444444444",
-- "Ports":[{"PrivatePort": 2223, "PublicPort": 3332, "Type": "tcp"}],
-- "Created": 1367854152,
-- "Status": "Exit 0"
-- }
--]`
-- var expected []APIContainers
-- err := json.Unmarshal([]byte(jsonContainers), &expected)
-- if err != nil {
-- t.Fatal(err)
-- }
-- client := newTestClient(&FakeRoundTripper{message: jsonContainers, status: http.StatusOK})
-- containers, err := client.ListContainers(ListContainersOptions{})
-- if err != nil {
-- t.Fatal(err)
-- }
-- if !reflect.DeepEqual(containers, expected) {
-- t.Errorf("ListContainers: Expected %#v. Got %#v.", expected, containers)
-- }
+-type NestedPointer struct {
+- Vfoo string
+- Vbar *Basic
-}
-
--func TestListContainersParams(t *testing.T) {
-- var tests = []struct {
-- input ListContainersOptions
-- params map[string][]string
-- }{
-- {ListContainersOptions{}, map[string][]string{}},
-- {ListContainersOptions{All: true}, map[string][]string{"all": {"1"}}},
-- {ListContainersOptions{All: true, Limit: 10}, map[string][]string{"all": {"1"}, "limit": {"10"}}},
-- {
-- ListContainersOptions{All: true, Limit: 10, Since: "adf9983", Before: "abdeef"},
-- map[string][]string{"all": {"1"}, "limit": {"10"}, "since": {"adf9983"}, "before": {"abdeef"}},
-- },
-- }
-- fakeRT := &FakeRoundTripper{message: "[]", status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- u, _ := url.Parse(client.getURL("/containers/json"))
-- for _, tt := range tests {
-- client.ListContainers(tt.input)
-- got := map[string][]string(fakeRT.requests[0].URL.Query())
-- if !reflect.DeepEqual(got, tt.params) {
-- t.Errorf("Expected %#v, got %#v.", tt.params, got)
-- }
-- if path := fakeRT.requests[0].URL.Path; path != u.Path {
-- t.Errorf("Wrong path on request. Want %q. Got %q.", u.Path, path)
-- }
-- if meth := fakeRT.requests[0].Method; meth != "GET" {
-- t.Errorf("Wrong HTTP method. Want GET. Got %s.", meth)
-- }
-- fakeRT.Reset()
-- }
+-type Slice struct {
+- Vfoo string
+- Vbar []string
-}
-
--func TestListContainersFailure(t *testing.T) {
-- var tests = []struct {
-- status int
-- message string
-- }{
-- {400, "bad parameter"},
-- {500, "internal server error"},
-- }
-- for _, tt := range tests {
-- client := newTestClient(&FakeRoundTripper{message: tt.message, status: tt.status})
-- expected := Error{Status: tt.status, Message: tt.message}
-- containers, err := client.ListContainers(ListContainersOptions{})
-- if !reflect.DeepEqual(expected, *err.(*Error)) {
-- t.Errorf("Wrong error in ListContainers. Want %#v. Got %#v.", expected, err)
-- }
-- if len(containers) > 0 {
-- t.Errorf("ListContainers failure. Expected empty list. Got %#v.", containers)
-- }
-- }
+-type SliceOfStruct struct {
+- Value []Basic
-}
-
--func TestInspectContainer(t *testing.T) {
-- jsonContainer := `{
-- "Id": "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2",
-- "Created": "2013-05-07T14:51:42.087658+02:00",
-- "Path": "date",
-- "Args": [],
-- "Config": {
-- "Hostname": "4fa6e0f0c678",
-- "User": "",
-- "Memory": 17179869184,
-- "MemorySwap": 34359738368,
-- "AttachStdin": false,
-- "AttachStdout": true,
-- "AttachStderr": true,
-- "PortSpecs": null,
-- "Tty": false,
-- "OpenStdin": false,
-- "StdinOnce": false,
-- "Env": null,
-- "Cmd": [
-- "date"
-- ],
-- "Image": "base",
-- "Volumes": {},
-- "VolumesFrom": ""
-- },
-- "State": {
-- "Running": false,
-- "Pid": 0,
-- "ExitCode": 0,
-- "StartedAt": "2013-05-07T14:51:42.087658+02:00",
-- "Ghost": false
-- },
-- "Image": "b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc",
-- "NetworkSettings": {
-- "IpAddress": "",
-- "IpPrefixLen": 0,
-- "Gateway": "",
-- "Bridge": "",
-- "PortMapping": null
-- },
-- "SysInitPath": "/home/kitty/go/src/github.com/dotcloud/docker/bin/docker",
-- "ResolvConfPath": "/etc/resolv.conf",
-- "Volumes": {},
-- "HostConfig": {
-- "Binds": null,
-- "ContainerIDFile": "",
-- "LxcConf": [],
-- "Privileged": false,
-- "PortBindings": {
-- "80/tcp": [
-- {
-- "HostIp": "0.0.0.0",
-- "HostPort": "49153"
-- }
-- ]
-- },
-- "Links": null,
-- "PublishAllPorts": false
-- }
--}`
-- var expected Container
-- err := json.Unmarshal([]byte(jsonContainer), &expected)
-- if err != nil {
-- t.Fatal(err)
-- }
-- fakeRT := &FakeRoundTripper{message: jsonContainer, status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- id := "4fa6e0f0c678"
-- container, err := client.InspectContainer(id)
-- if err != nil {
-- t.Fatal(err)
-- }
-- if !reflect.DeepEqual(*container, expected) {
-- t.Errorf("InspectContainer(%q): Expected %#v. Got %#v.", id, expected, container)
-- }
-- expectedURL, _ := url.Parse(client.getURL("/containers/4fa6e0f0c678/json"))
-- if gotPath := fakeRT.requests[0].URL.Path; gotPath != expectedURL.Path {
-- t.Errorf("InspectContainer(%q): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
-- }
+-type Tagged struct {
+- Extra string `mapstructure:"bar,what,what"`
+- Value string `mapstructure:"foo"`
-}
-
--func TestInspectContainerNegativeSwap(t *testing.T) {
-- jsonContainer := `{
-- "Id": "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2",
-- "Created": "2013-05-07T14:51:42.087658+02:00",
-- "Path": "date",
-- "Args": [],
-- "Config": {
-- "Hostname": "4fa6e0f0c678",
-- "User": "",
-- "Memory": 17179869184,
-- "MemorySwap": -1,
-- "AttachStdin": false,
-- "AttachStdout": true,
-- "AttachStderr": true,
-- "PortSpecs": null,
-- "Tty": false,
-- "OpenStdin": false,
-- "StdinOnce": false,
-- "Env": null,
-- "Cmd": [
-- "date"
-- ],
-- "Image": "base",
-- "Volumes": {},
-- "VolumesFrom": ""
-- },
-- "State": {
-- "Running": false,
-- "Pid": 0,
-- "ExitCode": 0,
-- "StartedAt": "2013-05-07T14:51:42.087658+02:00",
-- "Ghost": false
-- },
-- "Image": "b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc",
-- "NetworkSettings": {
-- "IpAddress": "",
-- "IpPrefixLen": 0,
-- "Gateway": "",
-- "Bridge": "",
-- "PortMapping": null
-- },
-- "SysInitPath": "/home/kitty/go/src/github.com/dotcloud/docker/bin/docker",
-- "ResolvConfPath": "/etc/resolv.conf",
-- "Volumes": {},
-- "HostConfig": {
-- "Binds": null,
-- "ContainerIDFile": "",
-- "LxcConf": [],
-- "Privileged": false,
-- "PortBindings": {
-- "80/tcp": [
-- {
-- "HostIp": "0.0.0.0",
-- "HostPort": "49153"
-- }
-- ]
-- },
-- "Links": null,
-- "PublishAllPorts": false
-- }
--}`
-- var expected Container
-- err := json.Unmarshal([]byte(jsonContainer), &expected)
-- if err != nil {
-- t.Fatal(err)
+-type TypeConversionResult struct {
+- IntToFloat float32
+- IntToUint uint
+- IntToBool bool
+- IntToString string
+- UintToInt int
+- UintToFloat float32
+- UintToBool bool
+- UintToString string
+- BoolToInt int
+- BoolToUint uint
+- BoolToFloat float32
+- BoolToString string
+- FloatToInt int
+- FloatToUint uint
+- FloatToBool bool
+- FloatToString string
+- SliceUint8ToString string
+- StringToInt int
+- StringToUint uint
+- StringToBool bool
+- StringToFloat float32
+- SliceToMap map[string]interface{}
+- MapToSlice []interface{}
+-}
+-
+-func TestBasicTypes(t *testing.T) {
+- t.Parallel()
+-
+- input := map[string]interface{}{
+- "vstring": "foo",
+- "vint": 42,
+- "Vuint": 42,
+- "vbool": true,
+- "Vfloat": 42.42,
+- "vsilent": true,
+- "vdata": 42,
- }
-- fakeRT := &FakeRoundTripper{message: jsonContainer, status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- id := "4fa6e0f0c678"
-- container, err := client.InspectContainer(id)
+-
+- var result Basic
+- err := Decode(input, &result)
- if err != nil {
-- t.Fatal(err)
-- }
-- if !reflect.DeepEqual(*container, expected) {
-- t.Errorf("InspectContainer(%q): Expected %#v. Got %#v.", id, expected, container)
-- }
-- expectedURL, _ := url.Parse(client.getURL("/containers/4fa6e0f0c678/json"))
-- if gotPath := fakeRT.requests[0].URL.Path; gotPath != expectedURL.Path {
-- t.Errorf("InspectContainer(%q): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
+- t.Errorf("got an err: %s", err.Error())
+- t.FailNow()
- }
--}
-
--func TestInspectContainerFailure(t *testing.T) {
-- client := newTestClient(&FakeRoundTripper{message: "server error", status: 500})
-- expected := Error{Status: 500, Message: "server error"}
-- container, err := client.InspectContainer("abe033")
-- if container != nil {
-- t.Errorf("InspectContainer: Expected <nil> container, got %#v", container)
+- if result.Vstring != "foo" {
+- t.Errorf("vstring value should be 'foo': %#v", result.Vstring)
- }
-- if !reflect.DeepEqual(expected, *err.(*Error)) {
-- t.Errorf("InspectContainer: Wrong error information. Want %#v. Got %#v.", expected, err)
+-
+- if result.Vint != 42 {
+- t.Errorf("vint value should be 42: %#v", result.Vint)
- }
--}
-
--func TestInspectContainerNotFound(t *testing.T) {
-- client := newTestClient(&FakeRoundTripper{message: "no such container", status: 404})
-- container, err := client.InspectContainer("abe033")
-- if container != nil {
-- t.Errorf("InspectContainer: Expected <nil> container, got %#v", container)
+- if result.Vuint != 42 {
+- t.Errorf("vuint value should be 42: %#v", result.Vuint)
- }
-- expected := &NoSuchContainer{ID: "abe033"}
-- if !reflect.DeepEqual(err, expected) {
-- t.Errorf("InspectContainer: Wrong error information. Want %#v. Got %#v.", expected, err)
+-
+- if result.Vbool != true {
+- t.Errorf("vbool value should be true: %#v", result.Vbool)
- }
--}
-
--func TestContainerChanges(t *testing.T) {
-- jsonChanges := `[
-- {
-- "Path":"/dev",
-- "Kind":0
-- },
-- {
-- "Path":"/dev/kmsg",
-- "Kind":1
-- },
-- {
-- "Path":"/test",
-- "Kind":1
-- }
--]`
-- var expected []Change
-- err := json.Unmarshal([]byte(jsonChanges), &expected)
-- if err != nil {
-- t.Fatal(err)
+- if result.Vfloat != 42.42 {
+- t.Errorf("vfloat value should be 42.42: %#v", result.Vfloat)
- }
-- fakeRT := &FakeRoundTripper{message: jsonChanges, status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- id := "4fa6e0f0c678"
-- changes, err := client.ContainerChanges(id)
-- if err != nil {
-- t.Fatal(err)
+-
+- if result.Vextra != "" {
+- t.Errorf("vextra value should be empty: %#v", result.Vextra)
- }
-- if !reflect.DeepEqual(changes, expected) {
-- t.Errorf("ContainerChanges(%q): Expected %#v. Got %#v.", id, expected, changes)
+-
+- if result.vsilent != false {
+- t.Error("vsilent should not be set, it is unexported")
- }
-- expectedURL, _ := url.Parse(client.getURL("/containers/4fa6e0f0c678/changes"))
-- if gotPath := fakeRT.requests[0].URL.Path; gotPath != expectedURL.Path {
-- t.Errorf("ContainerChanges(%q): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
+-
+- if result.Vdata != 42 {
+- t.Error("vdata should be valid")
- }
-}
-
--func TestContainerChangesFailure(t *testing.T) {
-- client := newTestClient(&FakeRoundTripper{message: "server error", status: 500})
-- expected := Error{Status: 500, Message: "server error"}
-- changes, err := client.ContainerChanges("abe033")
-- if changes != nil {
-- t.Errorf("ContainerChanges: Expected <nil> changes, got %#v", changes)
+-func TestBasic_IntWithFloat(t *testing.T) {
+- t.Parallel()
+-
+- input := map[string]interface{}{
+- "vint": float64(42),
- }
-- if !reflect.DeepEqual(expected, *err.(*Error)) {
-- t.Errorf("ContainerChanges: Wrong error information. Want %#v. Got %#v.", expected, err)
+-
+- var result Basic
+- err := Decode(input, &result)
+- if err != nil {
+- t.Fatalf("got an err: %s", err)
- }
-}
-
--func TestContainerChangesNotFound(t *testing.T) {
-- client := newTestClient(&FakeRoundTripper{message: "no such container", status: 404})
-- changes, err := client.ContainerChanges("abe033")
-- if changes != nil {
-- t.Errorf("ContainerChanges: Expected <nil> changes, got %#v", changes)
-- }
-- expected := &NoSuchContainer{ID: "abe033"}
-- if !reflect.DeepEqual(err, expected) {
-- t.Errorf("ContainerChanges: Wrong error information. Want %#v. Got %#v.", expected, err)
+-func TestDecode_Embedded(t *testing.T) {
+- t.Parallel()
+-
+- input := map[string]interface{}{
+- "vstring": "foo",
+- "Basic": map[string]interface{}{
+- "vstring": "innerfoo",
+- },
+- "vunique": "bar",
- }
--}
-
--func TestCreateContainer(t *testing.T) {
-- jsonContainer := `{
-- "Id": "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2",
-- "Warnings": []
--}`
-- var expected Container
-- err := json.Unmarshal([]byte(jsonContainer), &expected)
+- var result Embedded
+- err := Decode(input, &result)
- if err != nil {
-- t.Fatal(err)
+- t.Fatalf("got an err: %s", err.Error())
- }
-- fakeRT := &FakeRoundTripper{message: jsonContainer, status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- config := Config{AttachStdout: true, AttachStdin: true}
-- opts := CreateContainerOptions{Name: "TestCreateContainer", Config: &config}
-- container, err := client.CreateContainer(opts)
-- if err != nil {
-- t.Fatal(err)
+-
+- if result.Vstring != "innerfoo" {
+- t.Errorf("vstring value should be 'innerfoo': %#v", result.Vstring)
- }
-- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
-- if container.ID != id {
-- t.Errorf("CreateContainer: wrong ID. Want %q. Got %q.", id, container.ID)
+-
+- if result.Vunique != "bar" {
+- t.Errorf("vunique value should be 'bar': %#v", result.Vunique)
- }
-- req := fakeRT.requests[0]
-- if req.Method != "POST" {
-- t.Errorf("CreateContainer: wrong HTTP method. Want %q. Got %q.", "POST", req.Method)
+-}
+-
+-func TestDecode_EmbeddedPointer(t *testing.T) {
+- t.Parallel()
+-
+- input := map[string]interface{}{
+- "vstring": "foo",
+- "Basic": map[string]interface{}{
+- "vstring": "innerfoo",
+- },
+- "vunique": "bar",
- }
-- expectedURL, _ := url.Parse(client.getURL("/containers/create"))
-- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
-- t.Errorf("CreateContainer: Wrong path in request. Want %q. Got %q.", expectedURL.Path, gotPath)
+-
+- var result EmbeddedPointer
+- err := Decode(input, &result)
+- if err == nil {
+- t.Fatal("should get error")
- }
-- var gotBody Config
-- err = json.NewDecoder(req.Body).Decode(&gotBody)
+-}
+-
+-func TestDecode_EmbeddedSquash(t *testing.T) {
+- t.Parallel()
+-
+- input := map[string]interface{}{
+- "vstring": "foo",
+- "vunique": "bar",
+- }
+-
+- var result EmbeddedSquash
+- err := Decode(input, &result)
- if err != nil {
-- t.Fatal(err)
+- t.Fatalf("got an err: %s", err.Error())
- }
--}
-
--func TestCreateContainerImageNotFound(t *testing.T) {
-- client := newTestClient(&FakeRoundTripper{message: "No such image", status: http.StatusNotFound})
-- config := Config{AttachStdout: true, AttachStdin: true}
-- container, err := client.CreateContainer(CreateContainerOptions{Config: &config})
-- if container != nil {
-- t.Errorf("CreateContainer: expected <nil> container, got %#v.", container)
+- if result.Vstring != "foo" {
+- t.Errorf("vstring value should be 'foo': %#v", result.Vstring)
- }
-- if !reflect.DeepEqual(err, ErrNoSuchImage) {
-- t.Errorf("CreateContainer: Wrong error type. Want %#v. Got %#v.", ErrNoSuchImage, err)
+-
+- if result.Vunique != "bar" {
+- t.Errorf("vunique value should be 'bar': %#v", result.Vunique)
- }
-}
-
--func TestStartContainer(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
-- err := client.StartContainer(id, &HostConfig{})
-- if err != nil {
-- t.Fatal(err)
+-func TestDecode_DecodeHook(t *testing.T) {
+- t.Parallel()
+-
+- input := map[string]interface{}{
+- "vint": "WHAT",
- }
-- req := fakeRT.requests[0]
-- if req.Method != "POST" {
-- t.Errorf("StartContainer(%q): wrong HTTP method. Want %q. Got %q.", id, "POST", req.Method)
+-
+- decodeHook := func(from reflect.Kind, to reflect.Kind, v interface{}) (interface{}, error) {
+- if from == reflect.String && to != reflect.String {
+- return 5, nil
+- }
+-
+- return v, nil
- }
-- expectedURL, _ := url.Parse(client.getURL("/containers/" + id + "/start"))
-- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
-- t.Errorf("StartContainer(%q): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
+-
+- var result Basic
+- config := &DecoderConfig{
+- DecodeHook: decodeHook,
+- Result: &result,
- }
-- expectedContentType := "application/json"
-- if contentType := req.Header.Get("Content-Type"); contentType != expectedContentType {
-- t.Errorf("StartContainer(%q): Wrong content-type in request. Want %q. Got %q.", id, expectedContentType, contentType)
+-
+- decoder, err := NewDecoder(config)
+- if err != nil {
+- t.Fatalf("err: %s", err)
- }
--}
-
--func TestStartContainerNilHostConfig(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
-- err := client.StartContainer(id, nil)
+- err = decoder.Decode(input)
- if err != nil {
-- t.Fatal(err)
+- t.Fatalf("got an err: %s", err)
- }
-- req := fakeRT.requests[0]
-- if req.Method != "POST" {
-- t.Errorf("StartContainer(%q): wrong HTTP method. Want %q. Got %q.", id, "POST", req.Method)
+-
+- if result.Vint != 5 {
+- t.Errorf("vint should be 5: %#v", result.Vint)
- }
-- expectedURL, _ := url.Parse(client.getURL("/containers/" + id + "/start"))
-- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
-- t.Errorf("StartContainer(%q): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
+-}
+-
+-func TestDecode_Nil(t *testing.T) {
+- t.Parallel()
+-
+- var input interface{} = nil
+- result := Basic{
+- Vstring: "foo",
- }
-- expectedContentType := "application/json"
-- if contentType := req.Header.Get("Content-Type"); contentType != expectedContentType {
-- t.Errorf("StartContainer(%q): Wrong content-type in request. Want %q. Got %q.", id, expectedContentType, contentType)
+-
+- err := Decode(input, &result)
+- if err != nil {
+- t.Fatalf("err: %s", err)
- }
--}
-
--func TestStartContainerNotFound(t *testing.T) {
-- client := newTestClient(&FakeRoundTripper{message: "no such container", status: http.StatusNotFound})
-- err := client.StartContainer("a2344", &HostConfig{})
-- expected := &NoSuchContainer{ID: "a2344"}
-- if !reflect.DeepEqual(err, expected) {
-- t.Errorf("StartContainer: Wrong error returned. Want %#v. Got %#v.", expected, err)
+- if result.Vstring != "foo" {
+- t.Fatalf("bad: %#v", result.Vstring)
- }
-}
-
--func TestStartContainerAlreadyRunning(t *testing.T) {
-- client := newTestClient(&FakeRoundTripper{message: "container already running", status: http.StatusNotModified})
-- err := client.StartContainer("a2334", &HostConfig{})
-- expected := &ContainerAlreadyRunning{ID: "a2334"}
-- if !reflect.DeepEqual(err, expected) {
-- t.Errorf("StartContainer: Wrong error returned. Want %#v. Got %#v.", expected, err)
+-func TestDecode_NonStruct(t *testing.T) {
+- t.Parallel()
+-
+- input := map[string]interface{}{
+- "foo": "bar",
+- "bar": "baz",
- }
--}
-
--func TestStopContainer(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "", status: http.StatusNoContent}
-- client := newTestClient(fakeRT)
-- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
-- err := client.StopContainer(id, 10)
+- var result map[string]string
+- err := Decode(input, &result)
- if err != nil {
-- t.Fatal(err)
-- }
-- req := fakeRT.requests[0]
-- if req.Method != "POST" {
-- t.Errorf("StopContainer(%q, 10): wrong HTTP method. Want %q. Got %q.", id, "POST", req.Method)
+- t.Fatalf("err: %s", err)
- }
-- expectedURL, _ := url.Parse(client.getURL("/containers/" + id + "/stop"))
-- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
-- t.Errorf("StopContainer(%q, 10): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
+-
+- if result["foo"] != "bar" {
+- t.Fatal("foo is not bar")
- }
-}
-
--func TestStopContainerNotFound(t *testing.T) {
-- client := newTestClient(&FakeRoundTripper{message: "no such container", status: http.StatusNotFound})
-- err := client.StopContainer("a2334", 10)
-- expected := &NoSuchContainer{ID: "a2334"}
-- if !reflect.DeepEqual(err, expected) {
-- t.Errorf("StopContainer: Wrong error returned. Want %#v. Got %#v.", expected, err)
+-func TestDecode_TypeConversion(t *testing.T) {
+- input := map[string]interface{}{
+- "IntToFloat": 42,
+- "IntToUint": 42,
+- "IntToBool": 1,
+- "IntToString": 42,
+- "UintToInt": 42,
+- "UintToFloat": 42,
+- "UintToBool": 42,
+- "UintToString": 42,
+- "BoolToInt": true,
+- "BoolToUint": true,
+- "BoolToFloat": true,
+- "BoolToString": true,
+- "FloatToInt": 42.42,
+- "FloatToUint": 42.42,
+- "FloatToBool": 42.42,
+- "FloatToString": 42.42,
+- "SliceUint8ToString": []uint8("foo"),
+- "StringToInt": "42",
+- "StringToUint": "42",
+- "StringToBool": "1",
+- "StringToFloat": "42.42",
+- "SliceToMap": []interface{}{},
+- "MapToSlice": map[string]interface{}{},
- }
--}
-
--func TestStopContainerNotRunning(t *testing.T) {
-- client := newTestClient(&FakeRoundTripper{message: "container not running", status: http.StatusNotModified})
-- err := client.StopContainer("a2334", 10)
-- expected := &ContainerNotRunning{ID: "a2334"}
-- if !reflect.DeepEqual(err, expected) {
-- t.Errorf("StopContainer: Wrong error returned. Want %#v. Got %#v.", expected, err)
+- expectedResultStrict := TypeConversionResult{
+- IntToFloat: 42.0,
+- IntToUint: 42,
+- UintToInt: 42,
+- UintToFloat: 42,
+- BoolToInt: 0,
+- BoolToUint: 0,
+- BoolToFloat: 0,
+- FloatToInt: 42,
+- FloatToUint: 42,
- }
--}
-
--func TestRestartContainer(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "", status: http.StatusNoContent}
-- client := newTestClient(fakeRT)
-- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
-- err := client.RestartContainer(id, 10)
-- if err != nil {
-- t.Fatal(err)
+- expectedResultWeak := TypeConversionResult{
+- IntToFloat: 42.0,
+- IntToUint: 42,
+- IntToBool: true,
+- IntToString: "42",
+- UintToInt: 42,
+- UintToFloat: 42,
+- UintToBool: true,
+- UintToString: "42",
+- BoolToInt: 1,
+- BoolToUint: 1,
+- BoolToFloat: 1,
+- BoolToString: "1",
+- FloatToInt: 42,
+- FloatToUint: 42,
+- FloatToBool: true,
+- FloatToString: "42.42",
+- SliceUint8ToString: "foo",
+- StringToInt: 42,
+- StringToUint: 42,
+- StringToBool: true,
+- StringToFloat: 42.42,
+- SliceToMap: map[string]interface{}{},
+- MapToSlice: []interface{}{},
- }
-- req := fakeRT.requests[0]
-- if req.Method != "POST" {
-- t.Errorf("RestartContainer(%q, 10): wrong HTTP method. Want %q. Got %q.", id, "POST", req.Method)
+-
+- // Test strict type conversion
+- var resultStrict TypeConversionResult
+- err := Decode(input, &resultStrict)
+- if err == nil {
+- t.Errorf("should return an error")
- }
-- expectedURL, _ := url.Parse(client.getURL("/containers/" + id + "/restart"))
-- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
-- t.Errorf("RestartContainer(%q, 10): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
+- if !reflect.DeepEqual(resultStrict, expectedResultStrict) {
+- t.Errorf("expected %v, got: %v", expectedResultStrict, resultStrict)
- }
--}
-
--func TestRestartContainerNotFound(t *testing.T) {
-- client := newTestClient(&FakeRoundTripper{message: "no such container", status: http.StatusNotFound})
-- err := client.RestartContainer("a2334", 10)
-- expected := &NoSuchContainer{ID: "a2334"}
-- if !reflect.DeepEqual(err, expected) {
-- t.Errorf("RestartContainer: Wrong error returned. Want %#v. Got %#v.", expected, err)
+- // Test weak type conversion
+- var decoder *Decoder
+- var resultWeak TypeConversionResult
+-
+- config := &DecoderConfig{
+- WeaklyTypedInput: true,
+- Result: &resultWeak,
- }
--}
-
--func TestPauseContainer(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "", status: http.StatusNoContent}
-- client := newTestClient(fakeRT)
-- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
-- err := client.PauseContainer(id)
+- decoder, err = NewDecoder(config)
- if err != nil {
-- t.Fatal(err)
-- }
-- req := fakeRT.requests[0]
-- if req.Method != "POST" {
-- t.Errorf("PauseContainer(%q): wrong HTTP method. Want %q. Got %q.", id, "POST", req.Method)
+- t.Fatalf("err: %s", err)
- }
-- expectedURL, _ := url.Parse(client.getURL("/containers/" + id + "/pause"))
-- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
-- t.Errorf("PauseContainer(%q): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
+-
+- err = decoder.Decode(input)
+- if err != nil {
+- t.Fatalf("got an err: %s", err)
- }
--}
-
--func TestPauseContainerNotFound(t *testing.T) {
-- client := newTestClient(&FakeRoundTripper{message: "no such container", status: http.StatusNotFound})
-- err := client.PauseContainer("a2334")
-- expected := &NoSuchContainer{ID: "a2334"}
-- if !reflect.DeepEqual(err, expected) {
-- t.Errorf("PauseContainer: Wrong error returned. Want %#v. Got %#v.", expected, err)
+- if !reflect.DeepEqual(resultWeak, expectedResultWeak) {
+- t.Errorf("expected \n%#v, got: \n%#v", expectedResultWeak, resultWeak)
- }
-}
-
--func TestUnpauseContainer(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "", status: http.StatusNoContent}
-- client := newTestClient(fakeRT)
-- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
-- err := client.UnpauseContainer(id)
-- if err != nil {
-- t.Fatal(err)
+-func TestDecoder_ErrorUnused(t *testing.T) {
+- t.Parallel()
+-
+- input := map[string]interface{}{
+- "vstring": "hello",
+- "foo": "bar",
- }
-- req := fakeRT.requests[0]
-- if req.Method != "POST" {
-- t.Errorf("PauseContainer(%q): wrong HTTP method. Want %q. Got %q.", id, "POST", req.Method)
+-
+- var result Basic
+- config := &DecoderConfig{
+- ErrorUnused: true,
+- Result: &result,
- }
-- expectedURL, _ := url.Parse(client.getURL("/containers/" + id + "/unpause"))
-- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
-- t.Errorf("PauseContainer(%q): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
+-
+- decoder, err := NewDecoder(config)
+- if err != nil {
+- t.Fatalf("err: %s", err)
- }
--}
-
--func TestUnpauseContainerNotFound(t *testing.T) {
-- client := newTestClient(&FakeRoundTripper{message: "no such container", status: http.StatusNotFound})
-- err := client.UnpauseContainer("a2334")
-- expected := &NoSuchContainer{ID: "a2334"}
-- if !reflect.DeepEqual(err, expected) {
-- t.Errorf("PauseContainer: Wrong error returned. Want %#v. Got %#v.", expected, err)
+- err = decoder.Decode(input)
+- if err == nil {
+- t.Fatal("expected error")
- }
-}
-
--func TestKillContainer(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "", status: http.StatusNoContent}
-- client := newTestClient(fakeRT)
-- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
-- err := client.KillContainer(KillContainerOptions{ID: id})
+-func TestMap(t *testing.T) {
+- t.Parallel()
+-
+- input := map[string]interface{}{
+- "vfoo": "foo",
+- "vother": map[interface{}]interface{}{
+- "foo": "foo",
+- "bar": "bar",
+- },
+- }
+-
+- var result Map
+- err := Decode(input, &result)
- if err != nil {
-- t.Fatal(err)
+- t.Fatalf("got an error: %s", err)
- }
-- req := fakeRT.requests[0]
-- if req.Method != "POST" {
-- t.Errorf("KillContainer(%q): wrong HTTP method. Want %q. Got %q.", id, "POST", req.Method)
+-
+- if result.Vfoo != "foo" {
+- t.Errorf("vfoo value should be 'foo': %#v", result.Vfoo)
- }
-- expectedURL, _ := url.Parse(client.getURL("/containers/" + id + "/kill"))
-- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
-- t.Errorf("KillContainer(%q): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
+-
+- if result.Vother == nil {
+- t.Fatal("vother should not be nil")
- }
--}
-
--func TestKillContainerSignal(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "", status: http.StatusNoContent}
-- client := newTestClient(fakeRT)
-- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
-- err := client.KillContainer(KillContainerOptions{ID: id, Signal: SIGTERM})
-- if err != nil {
-- t.Fatal(err)
+- if len(result.Vother) != 2 {
+- t.Error("vother should have two items")
- }
-- req := fakeRT.requests[0]
-- if req.Method != "POST" {
-- t.Errorf("KillContainer(%q): wrong HTTP method. Want %q. Got %q.", id, "POST", req.Method)
+-
+- if result.Vother["foo"] != "foo" {
+- t.Errorf("'foo' key should be foo, got: %#v", result.Vother["foo"])
- }
-- if signal := req.URL.Query().Get("signal"); signal != "15" {
-- t.Errorf("KillContainer(%q): Wrong query string in request. Want %q. Got %q.", id, "15", signal)
+-
+- if result.Vother["bar"] != "bar" {
+- t.Errorf("'bar' key should be bar, got: %#v", result.Vother["bar"])
- }
-}
-
--func TestKillContainerNotFound(t *testing.T) {
-- client := newTestClient(&FakeRoundTripper{message: "no such container", status: http.StatusNotFound})
-- err := client.KillContainer(KillContainerOptions{ID: "a2334"})
-- expected := &NoSuchContainer{ID: "a2334"}
-- if !reflect.DeepEqual(err, expected) {
-- t.Errorf("KillContainer: Wrong error returned. Want %#v. Got %#v.", expected, err)
+-func TestMapOfStruct(t *testing.T) {
+- t.Parallel()
+-
+- input := map[string]interface{}{
+- "value": map[string]interface{}{
+- "foo": map[string]string{"vstring": "one"},
+- "bar": map[string]string{"vstring": "two"},
+- },
- }
--}
-
--func TestRemoveContainer(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
-- opts := RemoveContainerOptions{ID: id}
-- err := client.RemoveContainer(opts)
+- var result MapOfStruct
+- err := Decode(input, &result)
- if err != nil {
-- t.Fatal(err)
+- t.Fatalf("got an err: %s", err)
- }
-- req := fakeRT.requests[0]
-- if req.Method != "DELETE" {
-- t.Errorf("RemoveContainer(%q): wrong HTTP method. Want %q. Got %q.", id, "DELETE", req.Method)
+-
+- if result.Value == nil {
+- t.Fatal("value should not be nil")
- }
-- expectedURL, _ := url.Parse(client.getURL("/containers/" + id))
-- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
-- t.Errorf("RemoveContainer(%q): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
+-
+- if len(result.Value) != 2 {
+- t.Error("value should have two items")
- }
--}
-
--func TestRemoveContainerRemoveVolumes(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
-- opts := RemoveContainerOptions{ID: id, RemoveVolumes: true}
-- err := client.RemoveContainer(opts)
-- if err != nil {
-- t.Fatal(err)
+- if result.Value["foo"].Vstring != "one" {
+- t.Errorf("foo value should be 'one', got: %s", result.Value["foo"].Vstring)
- }
-- req := fakeRT.requests[0]
-- params := map[string][]string(req.URL.Query())
-- expected := map[string][]string{"v": {"1"}}
-- if !reflect.DeepEqual(params, expected) {
-- t.Errorf("RemoveContainer(%q): wrong parameters. Want %#v. Got %#v.", id, expected, params)
+-
+- if result.Value["bar"].Vstring != "two" {
+- t.Errorf("bar value should be 'two', got: %s", result.Value["bar"].Vstring)
- }
-}
-
--func TestRemoveContainerNotFound(t *testing.T) {
-- client := newTestClient(&FakeRoundTripper{message: "no such container", status: http.StatusNotFound})
-- err := client.RemoveContainer(RemoveContainerOptions{ID: "a2334"})
-- expected := &NoSuchContainer{ID: "a2334"}
-- if !reflect.DeepEqual(err, expected) {
-- t.Errorf("RemoveContainer: Wrong error returned. Want %#v. Got %#v.", expected, err)
+-func TestNestedType(t *testing.T) {
+- t.Parallel()
+-
+- input := map[string]interface{}{
+- "vfoo": "foo",
+- "vbar": map[string]interface{}{
+- "vstring": "foo",
+- "vint": 42,
+- "vbool": true,
+- },
- }
--}
-
--func TestResizeContainerTTY(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
-- err := client.ResizeContainerTTY(id, 40, 80)
+- var result Nested
+- err := Decode(input, &result)
- if err != nil {
-- t.Fatal(err)
-- }
-- req := fakeRT.requests[0]
-- if req.Method != "POST" {
-- t.Errorf("ResizeContainerTTY(%q): wrong HTTP method. Want %q. Got %q.", id, "POST", req.Method)
-- }
-- expectedURL, _ := url.Parse(client.getURL("/containers/" + id + "/resize"))
-- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
-- t.Errorf("ResizeContainerTTY(%q): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
-- }
-- got := map[string][]string(req.URL.Query())
-- expectedParams := map[string][]string{
-- "w": {"80"},
-- "h": {"40"},
+- t.Fatalf("got an err: %s", err.Error())
- }
-- if !reflect.DeepEqual(got, expectedParams) {
-- t.Errorf("Expected %#v, got %#v.", expectedParams, got)
+-
+- if result.Vfoo != "foo" {
+- t.Errorf("vfoo value should be 'foo': %#v", result.Vfoo)
- }
--}
-
--func TestWaitContainer(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: `{"StatusCode": 56}`, status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
-- status, err := client.WaitContainer(id)
-- if err != nil {
-- t.Fatal(err)
+- if result.Vbar.Vstring != "foo" {
+- t.Errorf("vstring value should be 'foo': %#v", result.Vbar.Vstring)
- }
-- if status != 56 {
-- t.Errorf("WaitContainer(%q): wrong return. Want 56. Got %d.", id, status)
+-
+- if result.Vbar.Vint != 42 {
+- t.Errorf("vint value should be 42: %#v", result.Vbar.Vint)
- }
-- req := fakeRT.requests[0]
-- if req.Method != "POST" {
-- t.Errorf("WaitContainer(%q): wrong HTTP method. Want %q. Got %q.", id, "POST", req.Method)
+-
+- if result.Vbar.Vbool != true {
+- t.Errorf("vbool value should be true: %#v", result.Vbar.Vbool)
- }
-- expectedURL, _ := url.Parse(client.getURL("/containers/" + id + "/wait"))
-- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
-- t.Errorf("WaitContainer(%q): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
+-
+- if result.Vbar.Vextra != "" {
+- t.Errorf("vextra value should be empty: %#v", result.Vbar.Vextra)
- }
-}
-
--func TestWaitContainerNotFound(t *testing.T) {
-- client := newTestClient(&FakeRoundTripper{message: "no such container", status: http.StatusNotFound})
-- _, err := client.WaitContainer("a2334")
-- expected := &NoSuchContainer{ID: "a2334"}
-- if !reflect.DeepEqual(err, expected) {
-- t.Errorf("WaitContainer: Wrong error returned. Want %#v. Got %#v.", expected, err)
+-func TestNestedTypePointer(t *testing.T) {
+- t.Parallel()
+-
+- input := map[string]interface{}{
+- "vfoo": "foo",
+- "vbar": &map[string]interface{}{
+- "vstring": "foo",
+- "vint": 42,
+- "vbool": true,
+- },
- }
--}
-
--func TestCommitContainer(t *testing.T) {
-- response := `{"Id":"596069db4bf5"}`
-- client := newTestClient(&FakeRoundTripper{message: response, status: http.StatusOK})
-- id := "596069db4bf5"
-- image, err := client.CommitContainer(CommitContainerOptions{})
+- var result NestedPointer
+- err := Decode(input, &result)
- if err != nil {
-- t.Fatal(err)
+- t.Fatalf("got an err: %s", err.Error())
- }
-- if image.ID != id {
-- t.Errorf("CommitContainer: Wrong image id. Want %q. Got %q.", id, image.ID)
+-
+- if result.Vfoo != "foo" {
+- t.Errorf("vfoo value should be 'foo': %#v", result.Vfoo)
- }
--}
-
--func TestCommitContainerParams(t *testing.T) {
-- cfg := Config{Memory: 67108864}
-- json, _ := json.Marshal(&cfg)
-- var tests = []struct {
-- input CommitContainerOptions
-- params map[string][]string
-- body []byte
-- }{
-- {CommitContainerOptions{}, map[string][]string{}, nil},
-- {CommitContainerOptions{Container: "44c004db4b17"}, map[string][]string{"container": {"44c004db4b17"}}, nil},
-- {
-- CommitContainerOptions{Container: "44c004db4b17", Repository: "tsuru/python", Message: "something"},
-- map[string][]string{"container": {"44c004db4b17"}, "repo": {"tsuru/python"}, "m": {"something"}},
-- nil,
-- },
-- {
-- CommitContainerOptions{Container: "44c004db4b17", Run: &cfg},
-- map[string][]string{"container": {"44c004db4b17"}},
-- json,
-- },
+- if result.Vbar.Vstring != "foo" {
+- t.Errorf("vstring value should be 'foo': %#v", result.Vbar.Vstring)
- }
-- fakeRT := &FakeRoundTripper{message: "[]", status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- u, _ := url.Parse(client.getURL("/commit"))
-- for _, tt := range tests {
-- client.CommitContainer(tt.input)
-- got := map[string][]string(fakeRT.requests[0].URL.Query())
-- if !reflect.DeepEqual(got, tt.params) {
-- t.Errorf("Expected %#v, got %#v.", tt.params, got)
-- }
-- if path := fakeRT.requests[0].URL.Path; path != u.Path {
-- t.Errorf("Wrong path on request. Want %q. Got %q.", u.Path, path)
-- }
-- if meth := fakeRT.requests[0].Method; meth != "POST" {
-- t.Errorf("Wrong HTTP method. Want POST. Got %s.", meth)
-- }
-- if tt.body != nil {
-- if requestBody, err := ioutil.ReadAll(fakeRT.requests[0].Body); err == nil {
-- if bytes.Compare(requestBody, tt.body) != 0 {
-- t.Errorf("Expected body %#v, got %#v", tt.body, requestBody)
-- }
-- } else {
-- t.Errorf("Error reading request body: %#v", err)
-- }
-- }
-- fakeRT.Reset()
+-
+- if result.Vbar.Vint != 42 {
+- t.Errorf("vint value should be 42: %#v", result.Vbar.Vint)
- }
--}
-
--func TestCommitContainerFailure(t *testing.T) {
-- client := newTestClient(&FakeRoundTripper{message: "no such container", status: http.StatusInternalServerError})
-- _, err := client.CommitContainer(CommitContainerOptions{})
-- if err == nil {
-- t.Error("Expected non-nil error, got <nil>.")
+- if result.Vbar.Vbool != true {
+- t.Errorf("vbool value should be true: %#v", result.Vbar.Vbool)
- }
--}
-
--func TestCommitContainerNotFound(t *testing.T) {
-- client := newTestClient(&FakeRoundTripper{message: "no such container", status: http.StatusNotFound})
-- _, err := client.CommitContainer(CommitContainerOptions{})
-- expected := &NoSuchContainer{ID: ""}
-- if !reflect.DeepEqual(err, expected) {
-- t.Errorf("CommitContainer: Wrong error returned. Want %#v. Got %#v.", expected, err)
+- if result.Vbar.Vextra != "" {
+- t.Errorf("vextra value should be empty: %#v", result.Vbar.Vextra)
- }
-}
-
--func TestAttachToContainerLogs(t *testing.T) {
-- var req http.Request
-- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-- w.Write([]byte{1, 0, 0, 0, 0, 0, 0, 19})
-- w.Write([]byte("something happened!"))
-- req = *r
-- }))
-- defer server.Close()
-- client, _ := NewClient(server.URL)
-- client.SkipServerVersionCheck = true
-- var buf bytes.Buffer
-- opts := AttachToContainerOptions{
-- Container: "a123456",
-- OutputStream: &buf,
-- Stdout: true,
-- Stderr: true,
-- Logs: true,
-- }
-- err := client.AttachToContainer(opts)
-- if err != nil {
-- t.Fatal(err)
-- }
-- expected := "something happened!"
-- if buf.String() != expected {
-- t.Errorf("AttachToContainer for logs: wrong output. Want %q. Got %q.", expected, buf.String())
+-func TestSlice(t *testing.T) {
+- t.Parallel()
+-
+- inputStringSlice := map[string]interface{}{
+- "vfoo": "foo",
+- "vbar": []string{"foo", "bar", "baz"},
- }
-- if req.Method != "POST" {
-- t.Errorf("AttachToContainer: wrong HTTP method. Want POST. Got %s.", req.Method)
+-
+- inputStringSlicePointer := map[string]interface{}{
+- "vfoo": "foo",
+- "vbar": &[]string{"foo", "bar", "baz"},
- }
-- u, _ := url.Parse(client.getURL("/containers/a123456/attach"))
-- if req.URL.Path != u.Path {
-- t.Errorf("AttachToContainer for logs: wrong HTTP path. Want %q. Got %q.", u.Path, req.URL.Path)
+-
+- outputStringSlice := &Slice{
+- "foo",
+- []string{"foo", "bar", "baz"},
- }
-- expectedQs := map[string][]string{
-- "logs": {"1"},
-- "stdout": {"1"},
-- "stderr": {"1"},
+-
+- testSliceInput(t, inputStringSlice, outputStringSlice)
+- testSliceInput(t, inputStringSlicePointer, outputStringSlice)
+-}
+-
+-func TestInvalidSlice(t *testing.T) {
+- t.Parallel()
+-
+- input := map[string]interface{}{
+- "vfoo": "foo",
+- "vbar": 42,
- }
-- got := map[string][]string(req.URL.Query())
-- if !reflect.DeepEqual(got, expectedQs) {
-- t.Errorf("AttachToContainer: wrong query string. Want %#v. Got %#v.", expectedQs, got)
+-
+- result := Slice{}
+- err := Decode(input, &result)
+- if err == nil {
+- t.Errorf("expected failure")
- }
-}
-
--func TestAttachToContainer(t *testing.T) {
-- var reader = strings.NewReader("send value")
-- var req http.Request
-- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-- w.Write([]byte{1, 0, 0, 0, 0, 0, 0, 5})
-- w.Write([]byte("hello"))
-- req = *r
-- }))
-- defer server.Close()
-- client, _ := NewClient(server.URL)
-- client.SkipServerVersionCheck = true
-- var stdout, stderr bytes.Buffer
-- opts := AttachToContainerOptions{
-- Container: "a123456",
-- OutputStream: &stdout,
-- ErrorStream: &stderr,
-- InputStream: reader,
-- Stdin: true,
-- Stdout: true,
-- Stderr: true,
-- Stream: true,
-- RawTerminal: true,
+-func TestSliceOfStruct(t *testing.T) {
+- t.Parallel()
+-
+- input := map[string]interface{}{
+- "value": []map[string]interface{}{
+- {"vstring": "one"},
+- {"vstring": "two"},
+- },
- }
-- err := client.AttachToContainer(opts)
+-
+- var result SliceOfStruct
+- err := Decode(input, &result)
- if err != nil {
-- t.Fatal(err)
+- t.Fatalf("got unexpected error: %s", err)
- }
-- expected := map[string][]string{
-- "stdin": {"1"},
-- "stdout": {"1"},
-- "stderr": {"1"},
-- "stream": {"1"},
+-
+- if len(result.Value) != 2 {
+- t.Fatalf("expected two values, got %d", len(result.Value))
- }
-- got := map[string][]string(req.URL.Query())
-- if !reflect.DeepEqual(got, expected) {
-- t.Errorf("AttachToContainer: wrong query string. Want %#v. Got %#v.", expected, got)
+-
+- if result.Value[0].Vstring != "one" {
+- t.Errorf("first value should be 'one', got: %s", result.Value[0].Vstring)
- }
--}
-
--func TestAttachToContainerSentinel(t *testing.T) {
-- var reader = strings.NewReader("send value")
-- var req http.Request
-- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-- w.Write([]byte{1, 0, 0, 0, 0, 0, 0, 5})
-- w.Write([]byte("hello"))
-- req = *r
-- }))
-- defer server.Close()
-- client, _ := NewClient(server.URL)
-- client.SkipServerVersionCheck = true
-- var stdout, stderr bytes.Buffer
-- success := make(chan struct{})
-- opts := AttachToContainerOptions{
-- Container: "a123456",
-- OutputStream: &stdout,
-- ErrorStream: &stderr,
-- InputStream: reader,
-- Stdin: true,
-- Stdout: true,
-- Stderr: true,
-- Stream: true,
-- RawTerminal: true,
-- Success: success,
+- if result.Value[1].Vstring != "two" {
+- t.Errorf("second value should be 'two', got: %s", result.Value[1].Vstring)
- }
-- go client.AttachToContainer(opts)
-- success <- <-success
-}
-
--func TestAttachToContainerNilStdout(t *testing.T) {
-- var reader = strings.NewReader("send value")
-- var req http.Request
-- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-- w.Write([]byte{1, 0, 0, 0, 0, 0, 0, 5})
-- w.Write([]byte("hello"))
-- req = *r
-- }))
-- defer server.Close()
-- client, _ := NewClient(server.URL)
-- client.SkipServerVersionCheck = true
-- var stderr bytes.Buffer
-- opts := AttachToContainerOptions{
-- Container: "a123456",
-- OutputStream: nil,
-- ErrorStream: &stderr,
-- InputStream: reader,
-- Stdin: true,
-- Stdout: true,
-- Stderr: true,
-- Stream: true,
-- RawTerminal: true,
+-func TestInvalidType(t *testing.T) {
+- t.Parallel()
+-
+- input := map[string]interface{}{
+- "vstring": 42,
- }
-- err := client.AttachToContainer(opts)
-- if err != nil {
-- t.Fatal(err)
+-
+- var result Basic
+- err := Decode(input, &result)
+- if err == nil {
+- t.Fatal("error should exist")
+- }
+-
+- derr, ok := err.(*Error)
+- if !ok {
+- t.Fatalf("error should be kind of Error, instead: %#v", err)
+- }
+-
+- if derr.Errors[0] != "'Vstring' expected type 'string', got unconvertible type 'int'" {
+- t.Errorf("got unexpected error: %s", err)
- }
-}
-
--func TestAttachToContainerNilStderr(t *testing.T) {
-- var reader = strings.NewReader("send value")
-- var req http.Request
-- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-- w.Write([]byte{1, 0, 0, 0, 0, 0, 0, 5})
-- w.Write([]byte("hello"))
-- req = *r
-- }))
-- defer server.Close()
-- client, _ := NewClient(server.URL)
-- client.SkipServerVersionCheck = true
-- var stdout bytes.Buffer
-- opts := AttachToContainerOptions{
-- Container: "a123456",
-- OutputStream: &stdout,
-- InputStream: reader,
-- Stdin: true,
-- Stdout: true,
-- Stderr: true,
-- Stream: true,
-- RawTerminal: true,
+-func TestMetadata(t *testing.T) {
+- t.Parallel()
+-
+- input := map[string]interface{}{
+- "vfoo": "foo",
+- "vbar": map[string]interface{}{
+- "vstring": "foo",
+- "Vuint": 42,
+- "foo": "bar",
+- },
+- "bar": "nil",
+- }
+-
+- var md Metadata
+- var result Nested
+- config := &DecoderConfig{
+- Metadata: &md,
+- Result: &result,
- }
-- err := client.AttachToContainer(opts)
+-
+- decoder, err := NewDecoder(config)
- if err != nil {
-- t.Fatal(err)
+- t.Fatalf("err: %s", err)
+- }
+-
+- err = decoder.Decode(input)
+- if err != nil {
+- t.Fatalf("err: %s", err.Error())
+- }
+-
+- expectedKeys := []string{"Vfoo", "Vbar.Vstring", "Vbar.Vuint", "Vbar"}
+- if !reflect.DeepEqual(md.Keys, expectedKeys) {
+- t.Fatalf("bad keys: %#v", md.Keys)
+- }
+-
+- expectedUnused := []string{"Vbar.foo", "bar"}
+- if !reflect.DeepEqual(md.Unused, expectedUnused) {
+- t.Fatalf("bad unused: %#v", md.Unused)
- }
-}
-
--func TestAttachToContainerRawTerminalFalse(t *testing.T) {
-- input := strings.NewReader("send value")
-- var req http.Request
-- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-- prefix := []byte{1, 0, 0, 0, 0, 0, 0, 5}
-- w.Write(prefix)
-- w.Write([]byte("hello"))
-- req = *r
-- }))
-- defer server.Close()
-- client, _ := NewClient(server.URL)
-- client.SkipServerVersionCheck = true
-- var stdout, stderr bytes.Buffer
-- opts := AttachToContainerOptions{
-- Container: "a123456",
-- OutputStream: &stdout,
-- ErrorStream: &stderr,
-- InputStream: input,
-- Stdin: true,
-- Stdout: true,
-- Stderr: true,
-- Stream: true,
-- RawTerminal: false,
+-func TestMetadata_Embedded(t *testing.T) {
+- t.Parallel()
+-
+- input := map[string]interface{}{
+- "vstring": "foo",
+- "vunique": "bar",
- }
-- err := client.AttachToContainer(opts)
+-
+- var md Metadata
+- var result EmbeddedSquash
+- config := &DecoderConfig{
+- Metadata: &md,
+- Result: &result,
+- }
+-
+- decoder, err := NewDecoder(config)
- if err != nil {
-- t.Fatal(err)
+- t.Fatalf("err: %s", err)
- }
-- expected := map[string][]string{
-- "stdin": {"1"},
-- "stdout": {"1"},
-- "stderr": {"1"},
-- "stream": {"1"},
+-
+- err = decoder.Decode(input)
+- if err != nil {
+- t.Fatalf("err: %s", err.Error())
- }
-- got := map[string][]string(req.URL.Query())
-- if !reflect.DeepEqual(got, expected) {
-- t.Errorf("AttachToContainer: wrong query string. Want %#v. Got %#v.", expected, got)
+-
+- expectedKeys := []string{"Vstring", "Vunique"}
+-
+- sort.Strings(md.Keys)
+- if !reflect.DeepEqual(md.Keys, expectedKeys) {
+- t.Fatalf("bad keys: %#v", md.Keys)
- }
-- t.Log(stderr.String())
-- t.Log(stdout.String())
-- if stdout.String() != "hello" {
-- t.Errorf("AttachToContainer: wrong content written to stdout. Want %q. Got %q.", "hello", stderr.String())
+-
+- expectedUnused := []string{}
+- if !reflect.DeepEqual(md.Unused, expectedUnused) {
+- t.Fatalf("bad unused: %#v", md.Unused)
- }
-}
-
--func TestAttachToContainerWithoutContainer(t *testing.T) {
-- var client Client
-- err := client.AttachToContainer(AttachToContainerOptions{})
-- expected := &NoSuchContainer{ID: ""}
-- if !reflect.DeepEqual(err, expected) {
-- t.Errorf("AttachToContainer: wrong error. Want %#v. Got %#v.", expected, err)
+-func TestNonPtrValue(t *testing.T) {
+- t.Parallel()
+-
+- err := Decode(map[string]interface{}{}, Basic{})
+- if err == nil {
+- t.Fatal("error should exist")
+- }
+-
+- if err.Error() != "result must be a pointer" {
+- t.Errorf("got unexpected error: %s", err)
- }
-}
-
--func TestLogs(t *testing.T) {
-- var req http.Request
-- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-- prefix := []byte{1, 0, 0, 0, 0, 0, 0, 19}
-- w.Write(prefix)
-- w.Write([]byte("something happened!"))
-- req = *r
-- }))
-- defer server.Close()
-- client, _ := NewClient(server.URL)
-- client.SkipServerVersionCheck = true
-- var buf bytes.Buffer
-- opts := LogsOptions{
-- Container: "a123456",
-- OutputStream: &buf,
-- Follow: true,
-- Stdout: true,
-- Stderr: true,
-- Timestamps: true,
+-func TestTagged(t *testing.T) {
+- t.Parallel()
+-
+- input := map[string]interface{}{
+- "foo": "bar",
+- "bar": "value",
- }
-- err := client.Logs(opts)
+-
+- var result Tagged
+- err := Decode(input, &result)
- if err != nil {
-- t.Fatal(err)
+- t.Fatalf("unexpected error: %s", err)
- }
-- expected := "something happened!"
-- if buf.String() != expected {
-- t.Errorf("Logs: wrong output. Want %q. Got %q.", expected, buf.String())
+-
+- if result.Value != "bar" {
+- t.Errorf("value should be 'bar', got: %#v", result.Value)
- }
-- if req.Method != "GET" {
-- t.Errorf("Logs: wrong HTTP method. Want GET. Got %s.", req.Method)
+-
+- if result.Extra != "value" {
+- t.Errorf("extra should be 'value', got: %#v", result.Extra)
- }
-- u, _ := url.Parse(client.getURL("/containers/a123456/logs"))
-- if req.URL.Path != u.Path {
-- t.Errorf("AttachToContainer for logs: wrong HTTP path. Want %q. Got %q.", u.Path, req.URL.Path)
+-}
+-
+-func TestWeakDecode(t *testing.T) {
+- t.Parallel()
+-
+- input := map[string]interface{}{
+- "foo": "4",
+- "bar": "value",
- }
-- expectedQs := map[string][]string{
-- "follow": {"1"},
-- "stdout": {"1"},
-- "stderr": {"1"},
-- "timestamps": {"1"},
-- "tail": {"all"},
+-
+- var result struct {
+- Foo int
+- Bar string
- }
-- got := map[string][]string(req.URL.Query())
-- if !reflect.DeepEqual(got, expectedQs) {
-- t.Errorf("Logs: wrong query string. Want %#v. Got %#v.", expectedQs, got)
+-
+- if err := WeakDecode(input, &result); err != nil {
+- t.Fatalf("err: %s", err)
+- }
+- if result.Foo != 4 {
+- t.Fatalf("bad: %#v", result)
+- }
+- if result.Bar != "value" {
+- t.Fatalf("bad: %#v", result)
- }
-}
-
--func TestLogsNilStdoutDoesntFail(t *testing.T) {
-- var req http.Request
-- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-- prefix := []byte{1, 0, 0, 0, 0, 0, 0, 19}
-- w.Write(prefix)
-- w.Write([]byte("something happened!"))
-- req = *r
-- }))
-- defer server.Close()
-- client, _ := NewClient(server.URL)
-- client.SkipServerVersionCheck = true
-- opts := LogsOptions{
-- Container: "a123456",
-- Follow: true,
-- Stdout: true,
-- Stderr: true,
-- Timestamps: true,
-- }
-- err := client.Logs(opts)
+-func testSliceInput(t *testing.T, input map[string]interface{}, expected *Slice) {
+- var result Slice
+- err := Decode(input, &result)
- if err != nil {
-- t.Fatal(err)
+- t.Fatalf("got error: %s", err)
- }
--}
-
--func TestLogsNilStderrDoesntFail(t *testing.T) {
-- var req http.Request
-- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-- prefix := []byte{2, 0, 0, 0, 0, 0, 0, 19}
-- w.Write(prefix)
-- w.Write([]byte("something happened!"))
-- req = *r
-- }))
-- defer server.Close()
-- client, _ := NewClient(server.URL)
-- client.SkipServerVersionCheck = true
-- opts := LogsOptions{
-- Container: "a123456",
-- Follow: true,
-- Stdout: true,
-- Stderr: true,
-- Timestamps: true,
+- if result.Vfoo != expected.Vfoo {
+- t.Errorf("Vfoo expected '%s', got '%s'", expected.Vfoo, result.Vfoo)
- }
-- err := client.Logs(opts)
-- if err != nil {
-- t.Fatal(err)
+-
+- if result.Vbar == nil {
+- t.Fatalf("Vbar a slice, got '%#v'", result.Vbar)
+- }
+-
+- if len(result.Vbar) != len(expected.Vbar) {
+- t.Errorf("Vbar length should be %d, got %d", len(expected.Vbar), len(result.Vbar))
+- }
+-
+- for i, v := range result.Vbar {
+- if v != expected.Vbar[i] {
+- t.Errorf(
+- "Vbar[%d] should be '%#v', got '%#v'",
+- i, expected.Vbar[i], v)
+- }
- }
-}
+diff --git a/Godeps/_workspace/src/github.com/racker/perigee/.gitignore b/Godeps/_workspace/src/github.com/racker/perigee/.gitignore
+deleted file mode 100644
+index 49ca32a..0000000
+--- a/Godeps/_workspace/src/github.com/racker/perigee/.gitignore
++++ /dev/null
+@@ -1,2 +0,0 @@
+-bin/*
+-pkg/*
+diff --git a/Godeps/_workspace/src/github.com/racker/perigee/LICENSE b/Godeps/_workspace/src/github.com/racker/perigee/LICENSE
+deleted file mode 100644
+index d645695..0000000
+--- a/Godeps/_workspace/src/github.com/racker/perigee/LICENSE
++++ /dev/null
+@@ -1,202 +0,0 @@
+-
+- Apache License
+- Version 2.0, January 2004
+- http://www.apache.org/licenses/
+-
+- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+-
+- 1. Definitions.
+-
+- "License" shall mean the terms and conditions for use, reproduction,
+- and distribution as defined by Sections 1 through 9 of this document.
+-
+- "Licensor" shall mean the copyright owner or entity authorized by
+- the copyright owner that is granting the License.
+-
+- "Legal Entity" shall mean the union of the acting entity and all
+- other entities that control, are controlled by, or are under common
+- control with that entity. For the purposes of this definition,
+- "control" means (i) the power, direct or indirect, to cause the
+- direction or management of such entity, whether by contract or
+- otherwise, or (ii) ownership of fifty percent (50%) or more of the
+- outstanding shares, or (iii) beneficial ownership of such entity.
+-
+- "You" (or "Your") shall mean an individual or Legal Entity
+- exercising permissions granted by this License.
+-
+- "Source" form shall mean the preferred form for making modifications,
+- including but not limited to software source code, documentation
+- source, and configuration files.
+-
+- "Object" form shall mean any form resulting from mechanical
+- transformation or translation of a Source form, including but
+- not limited to compiled object code, generated documentation,
+- and conversions to other media types.
+-
+- "Work" shall mean the work of authorship, whether in Source or
+- Object form, made available under the License, as indicated by a
+- copyright notice that is included in or attached to the work
+- (an example is provided in the Appendix below).
+-
+- "Derivative Works" shall mean any work, whether in Source or Object
+- form, that is based on (or derived from) the Work and for which the
+- editorial revisions, annotations, elaborations, or other modifications
+- represent, as a whole, an original work of authorship. For the purposes
+- of this License, Derivative Works shall not include works that remain
+- separable from, or merely link (or bind by name) to the interfaces of,
+- the Work and Derivative Works thereof.
+-
+- "Contribution" shall mean any work of authorship, including
+- the original version of the Work and any modifications or additions
+- to that Work or Derivative Works thereof, that is intentionally
+- submitted to Licensor for inclusion in the Work by the copyright owner
+- or by an individual or Legal Entity authorized to submit on behalf of
+- the copyright owner. For the purposes of this definition, "submitted"
+- means any form of electronic, verbal, or written communication sent
+- to the Licensor or its representatives, including but not limited to
+- communication on electronic mailing lists, source code control systems,
+- and issue tracking systems that are managed by, or on behalf of, the
+- Licensor for the purpose of discussing and improving the Work, but
+- excluding communication that is conspicuously marked or otherwise
+- designated in writing by the copyright owner as "Not a Contribution."
+-
+- "Contributor" shall mean Licensor and any individual or Legal Entity
+- on behalf of whom a Contribution has been received by Licensor and
+- subsequently incorporated within the Work.
+-
+- 2. Grant of Copyright License. Subject to the terms and conditions of
+- this License, each Contributor hereby grants to You a perpetual,
+- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+- copyright license to reproduce, prepare Derivative Works of,
+- publicly display, publicly perform, sublicense, and distribute the
+- Work and such Derivative Works in Source or Object form.
+-
+- 3. Grant of Patent License. Subject to the terms and conditions of
+- this License, each Contributor hereby grants to You a perpetual,
+- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+- (except as stated in this section) patent license to make, have made,
+- use, offer to sell, sell, import, and otherwise transfer the Work,
+- where such license applies only to those patent claims licensable
+- by such Contributor that are necessarily infringed by their
+- Contribution(s) alone or by combination of their Contribution(s)
+- with the Work to which such Contribution(s) was submitted. If You
+- institute patent litigation against any entity (including a
+- cross-claim or counterclaim in a lawsuit) alleging that the Work
+- or a Contribution incorporated within the Work constitutes direct
+- or contributory patent infringement, then any patent licenses
+- granted to You under this License for that Work shall terminate
+- as of the date such litigation is filed.
+-
+- 4. Redistribution. You may reproduce and distribute copies of the
+- Work or Derivative Works thereof in any medium, with or without
+- modifications, and in Source or Object form, provided that You
+- meet the following conditions:
+-
+- (a) You must give any other recipients of the Work or
+- Derivative Works a copy of this License; and
+-
+- (b) You must cause any modified files to carry prominent notices
+- stating that You changed the files; and
+-
+- (c) You must retain, in the Source form of any Derivative Works
+- that You distribute, all copyright, patent, trademark, and
+- attribution notices from the Source form of the Work,
+- excluding those notices that do not pertain to any part of
+- the Derivative Works; and
+-
+- (d) If the Work includes a "NOTICE" text file as part of its
+- distribution, then any Derivative Works that You distribute must
+- include a readable copy of the attribution notices contained
+- within such NOTICE file, excluding those notices that do not
+- pertain to any part of the Derivative Works, in at least one
+- of the following places: within a NOTICE text file distributed
+- as part of the Derivative Works; within the Source form or
+- documentation, if provided along with the Derivative Works; or,
+- within a display generated by the Derivative Works, if and
+- wherever such third-party notices normally appear. The contents
+- of the NOTICE file are for informational purposes only and
+- do not modify the License. You may add Your own attribution
+- notices within Derivative Works that You distribute, alongside
+- or as an addendum to the NOTICE text from the Work, provided
+- that such additional attribution notices cannot be construed
+- as modifying the License.
+-
+- You may add Your own copyright statement to Your modifications and
+- may provide additional or different license terms and conditions
+- for use, reproduction, or distribution of Your modifications, or
+- for any such Derivative Works as a whole, provided Your use,
+- reproduction, and distribution of the Work otherwise complies with
+- the conditions stated in this License.
+-
+- 5. Submission of Contributions. Unless You explicitly state otherwise,
+- any Contribution intentionally submitted for inclusion in the Work
+- by You to the Licensor shall be under the terms and conditions of
+- this License, without any additional terms or conditions.
+- Notwithstanding the above, nothing herein shall supersede or modify
+- the terms of any separate license agreement you may have executed
+- with Licensor regarding such Contributions.
+-
+- 6. Trademarks. This License does not grant permission to use the trade
+- names, trademarks, service marks, or product names of the Licensor,
+- except as required for reasonable and customary use in describing the
+- origin of the Work and reproducing the content of the NOTICE file.
+-
+- 7. Disclaimer of Warranty. Unless required by applicable law or
+- agreed to in writing, Licensor provides the Work (and each
+- Contributor provides its Contributions) on an "AS IS" BASIS,
+- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+- implied, including, without limitation, any warranties or conditions
+- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+- PARTICULAR PURPOSE. You are solely responsible for determining the
+- appropriateness of using or redistributing the Work and assume any
+- risks associated with Your exercise of permissions under this License.
+-
+- 8. Limitation of Liability. In no event and under no legal theory,
+- whether in tort (including negligence), contract, or otherwise,
+- unless required by applicable law (such as deliberate and grossly
+- negligent acts) or agreed to in writing, shall any Contributor be
+- liable to You for damages, including any direct, indirect, special,
+- incidental, or consequential damages of any character arising as a
+- result of this License or out of the use or inability to use the
+- Work (including but not limited to damages for loss of goodwill,
+- work stoppage, computer failure or malfunction, or any and all
+- other commercial damages or losses), even if such Contributor
+- has been advised of the possibility of such damages.
+-
+- 9. Accepting Warranty or Additional Liability. While redistributing
+- the Work or Derivative Works thereof, You may choose to offer,
+- and charge a fee for, acceptance of support, warranty, indemnity,
+- or other liability obligations and/or rights consistent with this
+- License. However, in accepting such obligations, You may act only
+- on Your own behalf and on Your sole responsibility, not on behalf
+- of any other Contributor, and only if You agree to indemnify,
+- defend, and hold each Contributor harmless for any liability
+- incurred by, or claims asserted against, such Contributor by reason
+- of your accepting any such warranty or additional liability.
+-
+- END OF TERMS AND CONDITIONS
+-
+- APPENDIX: How to apply the Apache License to your work.
+-
+- To apply the Apache License to your work, attach the following
+- boilerplate notice, with the fields enclosed by brackets "[]"
+- replaced with your own identifying information. (Don't include
+- the brackets!) The text should be enclosed in the appropriate
+- comment syntax for the file format. We also recommend that a
+- file or class name and description of purpose be included on the
+- same "printed page" as the copyright notice for easier
+- identification within third-party archives.
+-
+- Copyright [yyyy] [name of copyright owner]
+-
+- Licensed under the Apache License, Version 2.0 (the "License");
+- you may not use this file except in compliance with the License.
+- You may obtain a copy of the License at
+-
+- http://www.apache.org/licenses/LICENSE-2.0
+-
+- Unless required by applicable law or agreed to in writing, software
+- distributed under the License is distributed on an "AS IS" BASIS,
+- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- See the License for the specific language governing permissions and
+- limitations under the License.
+diff --git a/Godeps/_workspace/src/github.com/racker/perigee/README.md b/Godeps/_workspace/src/github.com/racker/perigee/README.md
+deleted file mode 100644
+index 81cbf4a..0000000
+--- a/Godeps/_workspace/src/github.com/racker/perigee/README.md
++++ /dev/null
+@@ -1,120 +0,0 @@
+-# perigee
+-
+-Perigee provides a REST client that, while it should be generic enough to use with most any RESTful API, is nonetheless optimized to the needs of the OpenStack APIs.
+-Perigee grew out of the need to refactor out common API access code from the [gorax](http://github.com/racker/gorax) project.
+-
+-Several things influenced the name of the project.
+-Numerous elements of the OpenStack ecosystem are named after astronomical artifacts.
+-Additionally, perigee occurs when two orbiting bodies are closest to each other.
+-Perigee seemed appropriate for something aiming to bring OpenStack and other RESTful services closer to the end-user.
+-
+-**This library is still in the very early stages of development. Unless you want to contribute, it probably isn't what you want**
+-
+-## Installation and Testing
+-
+-To install:
+-
+-```bash
+-go get github.com/racker/perigee
+-```
+-
+-To run unit tests:
+-
+-```bash
+-go test github.com/racker/perigee
+-```
+-
+-## Contributing
+-
+-The following guidelines are preliminary, as this project is just starting out.
+-However, this should serve as a working first-draft.
+-
+-### Branching
+-
+-The master branch must always be a valid build.
+-The `go get` command will not work otherwise.
+-Therefore, development must occur on a different branch.
+-
+-When creating a feature branch, do so off the master branch:
+-
+-```bash
+-git checkout master
+-git pull
+-git checkout -b featureBranch
+-git checkout -b featureBranch-wip # optional
+-```
-
--func TestLogsSpecifyingTail(t *testing.T) {
-- var req http.Request
-- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-- prefix := []byte{1, 0, 0, 0, 0, 0, 0, 19}
-- w.Write(prefix)
-- w.Write([]byte("something happened!"))
-- req = *r
-- }))
-- defer server.Close()
-- client, _ := NewClient(server.URL)
-- client.SkipServerVersionCheck = true
-- var buf bytes.Buffer
-- opts := LogsOptions{
-- Container: "a123456",
-- OutputStream: &buf,
-- Follow: true,
-- Stdout: true,
-- Stderr: true,
-- Timestamps: true,
-- Tail: "100",
-- }
-- err := client.Logs(opts)
-- if err != nil {
-- t.Fatal(err)
-- }
-- expected := "something happened!"
-- if buf.String() != expected {
-- t.Errorf("Logs: wrong output. Want %q. Got %q.", expected, buf.String())
-- }
-- if req.Method != "GET" {
-- t.Errorf("Logs: wrong HTTP method. Want GET. Got %s.", req.Method)
-- }
-- u, _ := url.Parse(client.getURL("/containers/a123456/logs"))
-- if req.URL.Path != u.Path {
-- t.Errorf("AttachToContainer for logs: wrong HTTP path. Want %q. Got %q.", u.Path, req.URL.Path)
-- }
-- expectedQs := map[string][]string{
-- "follow": {"1"},
-- "stdout": {"1"},
-- "stderr": {"1"},
-- "timestamps": {"1"},
-- "tail": {"100"},
-- }
-- got := map[string][]string(req.URL.Query())
-- if !reflect.DeepEqual(got, expectedQs) {
-- t.Errorf("Logs: wrong query string. Want %#v. Got %#v.", expectedQs, got)
-- }
--}
+-Perform all your editing and testing in the WIP-branch.
+-Feel free to make as many commits as you see fit.
+-You may even open "WIP" pull requests from your feature branch to seek feedback.
+-WIP pull requests will **never** be merged, however.
-
--func TestLogsRawTerminal(t *testing.T) {
-- var req http.Request
-- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-- w.Write([]byte("something happened!"))
-- req = *r
-- }))
-- defer server.Close()
-- client, _ := NewClient(server.URL)
-- client.SkipServerVersionCheck = true
-- var buf bytes.Buffer
-- opts := LogsOptions{
-- Container: "a123456",
-- OutputStream: &buf,
-- Follow: true,
-- RawTerminal: true,
-- Stdout: true,
-- Stderr: true,
-- Timestamps: true,
-- Tail: "100",
-- }
-- err := client.Logs(opts)
-- if err != nil {
-- t.Fatal(err)
-- }
-- expected := "something happened!"
-- if buf.String() != expected {
-- t.Errorf("Logs: wrong output. Want %q. Got %q.", expected, buf.String())
-- }
--}
+-To get code merged, you'll need to "squash" your changes into one or more clean commits in the feature branch.
+-These steps should be followed:
-
--func TestLogsNoContainer(t *testing.T) {
-- var client Client
-- err := client.Logs(LogsOptions{})
-- expected := &NoSuchContainer{ID: ""}
-- if !reflect.DeepEqual(err, expected) {
-- t.Errorf("AttachToContainer: wrong error. Want %#v. Got %#v.", expected, err)
-- }
--}
+-```bash
+-git checkout featureBranch
+-git merge --squash featureBranch-wip
+-git commit -a
+-git push origin featureBranch
+-```
-
--func TestNoSuchContainerError(t *testing.T) {
-- var err error = &NoSuchContainer{ID: "i345"}
-- expected := "No such container: i345"
-- if got := err.Error(); got != expected {
-- t.Errorf("NoSuchContainer: wrong message. Want %q. Got %q.", expected, got)
-- }
--}
+-You may now open a nice, clean, self-contained pull request from featureBranch to master.
-
--func TestExportContainer(t *testing.T) {
-- content := "exported container tar content"
-- out := stdoutMock{bytes.NewBufferString(content)}
-- client := newTestClient(&FakeRoundTripper{status: http.StatusOK})
-- opts := ExportContainerOptions{ID: "4fa6e0f0c678", OutputStream: out}
-- err := client.ExportContainer(opts)
-- if err != nil {
-- t.Errorf("ExportContainer: caugh error %#v while exporting container, expected nil", err.Error())
-- }
-- if out.String() != content {
-- t.Errorf("ExportContainer: wrong stdout. Want %#v. Got %#v.", content, out.String())
-- }
--}
+-The `git commit -a` command above will open a text editor so that
+-you may provide a comprehensive description of the changes.
-
--func TestExportContainerViaUnixSocket(t *testing.T) {
-- if runtime.GOOS != "darwin" {
-- t.Skip("skipping test on %q", runtime.GOOS)
-- }
-- content := "exported container tar content"
-- var buf []byte
-- out := bytes.NewBuffer(buf)
-- tempSocket := tempfile("export_socket")
-- defer os.Remove(tempSocket)
-- endpoint := "unix://" + tempSocket
-- u, _ := parseEndpoint(endpoint)
-- client := Client{
-- HTTPClient: http.DefaultClient,
-- endpoint: endpoint,
-- endpointURL: u,
-- SkipServerVersionCheck: true,
-- }
-- listening := make(chan string)
-- done := make(chan int)
-- go runStreamConnServer(t, "unix", tempSocket, listening, done)
-- <-listening // wait for server to start
-- opts := ExportContainerOptions{ID: "4fa6e0f0c678", OutputStream: out}
-- err := client.ExportContainer(opts)
-- <-done // make sure server stopped
-- if err != nil {
-- t.Errorf("ExportContainer: caugh error %#v while exporting container, expected nil", err.Error())
-- }
-- if out.String() != content {
-- t.Errorf("ExportContainer: wrong stdout. Want %#v. Got %#v.", content, out.String())
-- }
--}
+-In general, when submitting a pull request against master,
+-be sure to answer the following questions:
-
--func runStreamConnServer(t *testing.T, network, laddr string, listening chan<- string, done chan<- int) {
-- defer close(done)
-- l, err := net.Listen(network, laddr)
-- if err != nil {
-- t.Errorf("Listen(%q, %q) failed: %v", network, laddr, err)
-- listening <- "<nil>"
-- return
-- }
-- defer l.Close()
-- listening <- l.Addr().String()
-- c, err := l.Accept()
-- if err != nil {
-- t.Logf("Accept failed: %v", err)
-- return
-- }
-- c.Write([]byte("HTTP/1.1 200 OK\n\nexported container tar content"))
-- c.Close()
--}
+-- What is the problem?
+-- Why is it a problem?
+-- What is your solution?
+-- How does your solution work? (Recommended for non-trivial changes.)
+-- Why should we use your solution over someone elses? (Recommended especially if multiple solutions being discussed.)
-
--func tempfile(filename string) string {
-- return os.TempDir() + "/" + filename + "." + strconv.Itoa(os.Getpid())
--}
+-Remember that monster-sized pull requests are a bear to code-review,
+-so having helpful commit logs are an absolute must to review changes as quickly as possible.
-
--func TestExportContainerNoId(t *testing.T) {
-- client := Client{}
-- out := stdoutMock{bytes.NewBufferString("")}
-- err := client.ExportContainer(ExportContainerOptions{OutputStream: out})
-- e, ok := err.(*NoSuchContainer)
-- if !ok {
-- t.Errorf("ExportContainer: wrong error. Want NoSuchContainer. Got %#v.", e)
-- }
-- if e.ID != "" {
-- t.Errorf("ExportContainer: wrong ID. Want %q. Got %q", "", e.ID)
-- }
--}
+-Finally, (s)he who breaks master is ultimately responsible for fixing master.
-
--func TestCopyFromContainer(t *testing.T) {
-- content := "File content"
-- out := stdoutMock{bytes.NewBufferString(content)}
-- client := newTestClient(&FakeRoundTripper{status: http.StatusOK})
-- opts := CopyFromContainerOptions{
-- Container: "a123456",
-- OutputStream: out,
-- }
-- err := client.CopyFromContainer(opts)
-- if err != nil {
-- t.Errorf("CopyFromContainer: caugh error %#v while copying from container, expected nil", err.Error())
-- }
-- if out.String() != content {
-- t.Errorf("CopyFromContainer: wrong stdout. Want %#v. Got %#v.", content, out.String())
-- }
--}
+-### Source Representation
-
--func TestCopyFromContainerEmptyContainer(t *testing.T) {
-- client := newTestClient(&FakeRoundTripper{status: http.StatusOK})
-- err := client.CopyFromContainer(CopyFromContainerOptions{})
-- _, ok := err.(*NoSuchContainer)
-- if !ok {
-- t.Errorf("CopyFromContainer: invalid error returned. Want NoSuchContainer, got %#v.", err)
-- }
--}
+-The Go community firmly believes in a consistent representation for all Go source code.
+-We do too.
+-Make sure all source code is passed through "go fmt" *before* you create your pull request.
-
--func TestPassingNameOptToCreateContainerReturnsItInContainer(t *testing.T) {
-- jsonContainer := `{
-- "Id": "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2",
-- "Warnings": []
--}`
-- fakeRT := &FakeRoundTripper{message: jsonContainer, status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- config := Config{AttachStdout: true, AttachStdin: true}
-- opts := CreateContainerOptions{Name: "TestCreateContainer", Config: &config}
-- container, err := client.CreateContainer(opts)
-- if err != nil {
-- t.Fatal(err)
-- }
-- if container.Name != "TestCreateContainer" {
-- t.Errorf("Container name expected to be TestCreateContainer, was %s", container.Name)
-- }
--}
+-Please note, however, that we fully acknowledge and recognize that we no longer rely upon punch-cards for representing source files.
+-Therefore, no 80-column limit exists.
+-However, if a line exceeds 132 columns, you may want to consider splitting the line.
-
--func TestAlwaysRestart(t *testing.T) {
-- policy := AlwaysRestart()
-- if policy.Name != "always" {
-- t.Errorf("AlwaysRestart(): wrong policy name. Want %q. Got %q", "always", policy.Name)
-- }
-- if policy.MaximumRetryCount != 0 {
-- t.Errorf("AlwaysRestart(): wrong MaximumRetryCount. Want 0. Got %d", policy.MaximumRetryCount)
-- }
--}
+-### Unit and Integration Tests
-
--func TestRestartOnFailure(t *testing.T) {
-- const retry = 5
-- policy := RestartOnFailure(retry)
-- if policy.Name != "on-failure" {
-- t.Errorf("RestartOnFailure(%d): wrong policy name. Want %q. Got %q", retry, "on-failure", policy.Name)
-- }
-- if policy.MaximumRetryCount != retry {
-- t.Errorf("RestartOnFailure(%d): wrong MaximumRetryCount. Want %d. Got %d", retry, retry, policy.MaximumRetryCount)
-- }
--}
+-Pull requests that include non-trivial code changes without accompanying unit tests will be flatly rejected.
+-While we have no way of enforcing this practice,
+-you can ensure your code is thoroughly tested by always [writing tests first by intention.](http://en.wikipedia.org/wiki/Test-driven_development)
-
--func TestNeverRestart(t *testing.T) {
-- policy := NeverRestart()
-- if policy.Name != "no" {
-- t.Errorf("NeverRestart(): wrong policy name. Want %q. Got %q", "always", policy.Name)
-- }
-- if policy.MaximumRetryCount != 0 {
-- t.Errorf("NeverRestart(): wrong MaximumRetryCount. Want 0. Got %d", policy.MaximumRetryCount)
-- }
--}
+-When creating a pull request, if even one test fails, the PR will be rejected.
+-Make sure all unit tests pass.
+-Make sure all integration tests pass.
-
--func TestTopContainer(t *testing.T) {
-- jsonTop := `{
-- "Processes": [
-- [
-- "ubuntu",
-- "3087",
-- "815",
-- "0",
-- "01:44",
-- "?",
-- "00:00:00",
-- "cmd1"
-- ],
-- [
-- "root",
-- "3158",
-- "3087",
-- "0",
-- "01:44",
-- "?",
-- "00:00:01",
-- "cmd2"
-- ]
-- ],
-- "Titles": [
-- "UID",
-- "PID",
-- "PPID",
-- "C",
-- "STIME",
-- "TTY",
-- "TIME",
-- "CMD"
-- ]
--}`
-- var expected TopResult
-- err := json.Unmarshal([]byte(jsonTop), &expected)
-- if err != nil {
-- t.Fatal(err)
-- }
-- id := "4fa6e0f0"
-- fakeRT := &FakeRoundTripper{message: jsonTop, status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- processes, err := client.TopContainer(id, "")
-- if err != nil {
-- t.Fatal(err)
-- }
-- if !reflect.DeepEqual(processes, expected) {
-- t.Errorf("TopContainer: Expected %#v. Got %#v.", expected, processes)
-- }
-- if len(processes.Processes) != 2 || len(processes.Processes[0]) != 8 ||
-- processes.Processes[0][7] != "cmd1" {
-- t.Errorf("TopContainer: Process list to include cmd1. Got %#v.", expected, processes)
-- }
-- expectedURI := "/containers/" + id + "/top"
-- if !strings.HasSuffix(fakeRT.requests[0].URL.String(), expectedURI) {
-- t.Errorf("TopContainer: Expected URI to have %q. Got %q.", expectedURI, fakeRT.requests[0].URL.String())
-- }
--}
+-### Documentation
-
--func TestTopContainerNotFound(t *testing.T) {
-- client := newTestClient(&FakeRoundTripper{message: "no such container", status: http.StatusNotFound})
-- _, err := client.TopContainer("abef348", "")
-- expected := &NoSuchContainer{ID: "abef348"}
-- if !reflect.DeepEqual(err, expected) {
-- t.Errorf("StopContainer: Wrong error returned. Want %#v. Got %#v.", expected, err)
-- }
--}
+-Private functions and methods which are obvious to anyone unfamiliar with gorax needn't be accompanied by documentation.
+-However, this is a code-smell; if submitting a PR, expect to justify your decision.
-
--func TestTopContainerWithPsArgs(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "no such container", status: http.StatusNotFound}
-- client := newTestClient(fakeRT)
-- client.TopContainer("abef348", "aux")
-- expectedURI := "/containers/abef348/top?ps_args=aux"
-- if !strings.HasSuffix(fakeRT.requests[0].URL.String(), expectedURI) {
-- t.Errorf("TopContainer: Expected URI to have %q. Got %q.", expectedURI, fakeRT.requests[0].URL.String())
-- }
--}
-diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/env.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/env.go
+-Public functions, regardless of how obvious, **must** have accompanying godoc-style documentation.
+-This is not to suggest you should provide a tome for each function, however.
+-Sometimes a link to more information is more appropriate, provided the link is stable, reliable, and pertinent.
+-
+-Changing documentation often results in bizarre diffs in pull requests, due to text often spanning multiple lines.
+-To work around this, put [one logical thought or sentence on a single line.](http://rhodesmill.org/brandon/2012/one-sentence-per-line/)
+-While this looks weird in a plain-text editor,
+-remember that both godoc and HTML viewers will reflow text.
+-The source code and its comments should be easy to edit with minimal diff pollution.
+-Let software dedicated to presenting the documentation to human readers deal with its presentation.
+-
+-## Examples
+-
+-t.b.d.
+-
+diff --git a/Godeps/_workspace/src/github.com/racker/perigee/api.go b/Godeps/_workspace/src/github.com/racker/perigee/api.go
deleted file mode 100644
-index c54b0b0..0000000
---- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/env.go
+index 0fcbadb..0000000
+--- a/Godeps/_workspace/src/github.com/racker/perigee/api.go
+++ /dev/null
-@@ -1,168 +0,0 @@
--// Copyright 2014 Docker authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the DOCKER-LICENSE file.
+@@ -1,269 +0,0 @@
+-// vim: ts=8 sw=8 noet ai
-
--package docker
+-package perigee
-
-import (
- "encoding/json"
- "fmt"
- "io"
-- "strconv"
+- "io/ioutil"
+- "log"
+- "net/http"
- "strings"
-)
-
--// Env represents a list of key-pair represented in the form KEY=VALUE.
--type Env []string
--
--// Get returns the string value of the given key.
--func (env *Env) Get(key string) (value string) {
-- return env.Map()[key]
+-// The UnexpectedResponseCodeError structure represents a mismatch in understanding between server and client in terms of response codes.
+-// Most often, this is due to an actual error condition (e.g., getting a 404 for a resource when you expect a 200).
+-// However, it needn't always be the case (e.g., getting a 204 (No Content) response back when a 200 is expected).
+-type UnexpectedResponseCodeError struct {
+- Url string
+- Expected []int
+- Actual int
+- Body []byte
-}
-
--// Exists checks whether the given key is defined in the internal Env
--// representation.
--func (env *Env) Exists(key string) bool {
-- _, exists := env.Map()[key]
-- return exists
+-func (err *UnexpectedResponseCodeError) Error() string {
+- return fmt.Sprintf("Expected HTTP response code %d when accessing URL(%s); got %d instead with the following body:\n%s", err.Expected, err.Url, err.Actual, string(err.Body))
-}
-
--// GetBool returns a boolean representation of the given key. The key is false
--// whenever its value if 0, no, false, none or an empty string. Any other value
--// will be interpreted as true.
--func (env *Env) GetBool(key string) (value bool) {
-- s := strings.ToLower(strings.Trim(env.Get(key), " \t"))
-- if s == "" || s == "0" || s == "no" || s == "false" || s == "none" {
-- return false
+-// Request issues an HTTP request, marshaling parameters, and unmarshaling results, as configured in the provided Options parameter.
+-// The Response structure returned, if any, will include accumulated results recovered from the HTTP server.
+-// See the Response structure for more details.
+-func Request(method string, url string, opts Options) (*Response, error) {
+- var body io.Reader
+- var response Response
+-
+- client := opts.CustomClient
+- if client == nil {
+- client = new(http.Client)
- }
-- return true
--}
-
--// SetBool defines a boolean value to the given key.
--func (env *Env) SetBool(key string, value bool) {
-- if value {
-- env.Set(key, "1")
-- } else {
-- env.Set(key, "0")
+- contentType := opts.ContentType
+-
+- body = nil
+- if opts.ReqBody != nil {
+- if contentType == "" {
+- contentType = "application/json"
+- }
+-
+- if contentType == "application/json" {
+- bodyText, err := json.Marshal(opts.ReqBody)
+- if err != nil {
+- return nil, err
+- }
+- body = strings.NewReader(string(bodyText))
+- if opts.DumpReqJson {
+- log.Printf("Making request:\n%#v\n", string(bodyText))
+- }
+- } else {
+- // assume opts.ReqBody implements the correct interface
+- body = opts.ReqBody.(io.Reader)
+- }
- }
--}
-
--// GetInt returns the value of the provided key, converted to int.
--//
--// It the value cannot be represented as an integer, it returns -1.
--func (env *Env) GetInt(key string) int {
-- return int(env.GetInt64(key))
--}
+- req, err := http.NewRequest(method, url, body)
+- if err != nil {
+- return nil, err
+- }
-
--// SetInt defines an integer value to the given key.
--func (env *Env) SetInt(key string, value int) {
-- env.Set(key, strconv.Itoa(value))
--}
+- if contentType != "" {
+- req.Header.Add("Content-Type", contentType)
+- }
+-
+- if opts.ContentLength > 0 {
+- req.ContentLength = opts.ContentLength
+- req.Header.Add("Content-Length", string(opts.ContentLength))
+- }
+-
+- if opts.MoreHeaders != nil {
+- for k, v := range opts.MoreHeaders {
+- req.Header.Add(k, v)
+- }
+- }
+-
+- if accept := req.Header.Get("Accept"); accept == "" {
+- accept = opts.Accept
+- if accept == "" {
+- accept = "application/json"
+- }
+- req.Header.Add("Accept", accept)
+- }
+-
+- if opts.SetHeaders != nil {
+- err = opts.SetHeaders(req)
+- if err != nil {
+- return &response, err
+- }
+- }
+-
+- httpResponse, err := client.Do(req)
+- if httpResponse != nil {
+- response.HttpResponse = *httpResponse
+- response.StatusCode = httpResponse.StatusCode
+- }
-
--// GetInt64 returns the value of the provided key, converted to int64.
--//
--// It the value cannot be represented as an integer, it returns -1.
--func (env *Env) GetInt64(key string) int64 {
-- s := strings.Trim(env.Get(key), " \t")
-- val, err := strconv.ParseInt(s, 10, 64)
- if err != nil {
-- return -1
+- return &response, err
+- }
+- // This if-statement is legacy code, preserved for backward compatibility.
+- if opts.StatusCode != nil {
+- *opts.StatusCode = httpResponse.StatusCode
- }
-- return val
--}
-
--// SetInt64 defines an integer (64-bit wide) value to the given key.
--func (env *Env) SetInt64(key string, value int64) {
-- env.Set(key, strconv.FormatInt(value, 10))
--}
+- acceptableResponseCodes := opts.OkCodes
+- if len(acceptableResponseCodes) != 0 {
+- if not_in(httpResponse.StatusCode, acceptableResponseCodes) {
+- b, _ := ioutil.ReadAll(httpResponse.Body)
+- httpResponse.Body.Close()
+- return &response, &UnexpectedResponseCodeError{
+- Url: url,
+- Expected: acceptableResponseCodes,
+- Actual: httpResponse.StatusCode,
+- Body: b,
+- }
+- }
+- }
+- if opts.Results != nil {
+- defer httpResponse.Body.Close()
+- jsonResult, err := ioutil.ReadAll(httpResponse.Body)
+- response.JsonResult = jsonResult
+- if err != nil {
+- return &response, err
+- }
-
--// GetJSON unmarshals the value of the provided key in the provided iface.
--//
--// iface is a value that can be provided to the json.Unmarshal function.
--func (env *Env) GetJSON(key string, iface interface{}) error {
-- sval := env.Get(key)
-- if sval == "" {
-- return nil
+- err = json.Unmarshal(jsonResult, opts.Results)
+- // This if-statement is legacy code, preserved for backward compatibility.
+- if opts.ResponseJson != nil {
+- *opts.ResponseJson = jsonResult
+- }
- }
-- return json.Unmarshal([]byte(sval), iface)
+- return &response, err
-}
-
--// SetJSON marshals the given value to JSON format and stores it using the
--// provided key.
--func (env *Env) SetJSON(key string, value interface{}) error {
-- sval, err := json.Marshal(value)
-- if err != nil {
-- return err
+-// not_in returns false if, and only if, the provided needle is _not_
+-// in the given set of integers.
+-func not_in(needle int, haystack []int) bool {
+- for _, straw := range haystack {
+- if needle == straw {
+- return false
+- }
- }
-- env.Set(key, string(sval))
-- return nil
+- return true
-}
-
--// GetList returns a list of strings matching the provided key. It handles the
--// list as a JSON representation of a list of strings.
--//
--// If the given key matches to a single string, it will return a list
--// containing only the value that matches the key.
--func (env *Env) GetList(key string) []string {
-- sval := env.Get(key)
-- if sval == "" {
-- return nil
-- }
-- var l []string
-- if err := json.Unmarshal([]byte(sval), &l); err != nil {
-- l = append(l, sval)
+-// Post makes a POST request against a server using the provided HTTP client.
+-// The url must be a fully-formed URL string.
+-// DEPRECATED. Use Request() instead.
+-func Post(url string, opts Options) error {
+- r, err := Request("POST", url, opts)
+- if opts.Response != nil {
+- *opts.Response = r
- }
-- return l
+- return err
-}
-
--// SetList stores the given list in the provided key, after serializing it to
--// JSON format.
--func (env *Env) SetList(key string, value []string) error {
-- return env.SetJSON(key, value)
+-// Get makes a GET request against a server using the provided HTTP client.
+-// The url must be a fully-formed URL string.
+-// DEPRECATED. Use Request() instead.
+-func Get(url string, opts Options) error {
+- r, err := Request("GET", url, opts)
+- if opts.Response != nil {
+- *opts.Response = r
+- }
+- return err
-}
-
--// Set defines the value of a key to the given string.
--func (env *Env) Set(key, value string) {
-- *env = append(*env, key+"="+value)
+-// Delete makes a DELETE request against a server using the provided HTTP client.
+-// The url must be a fully-formed URL string.
+-// DEPRECATED. Use Request() instead.
+-func Delete(url string, opts Options) error {
+- r, err := Request("DELETE", url, opts)
+- if opts.Response != nil {
+- *opts.Response = r
+- }
+- return err
-}
-
--// Decode decodes `src` as a json dictionary, and adds each decoded key-value
--// pair to the environment.
--//
--// If `src` cannot be decoded as a json dictionary, an error is returned.
--func (env *Env) Decode(src io.Reader) error {
-- m := make(map[string]interface{})
-- if err := json.NewDecoder(src).Decode(&m); err != nil {
-- return err
-- }
-- for k, v := range m {
-- env.SetAuto(k, v)
+-// Put makes a PUT request against a server using the provided HTTP client.
+-// The url must be a fully-formed URL string.
+-// DEPRECATED. Use Request() instead.
+-func Put(url string, opts Options) error {
+- r, err := Request("PUT", url, opts)
+- if opts.Response != nil {
+- *opts.Response = r
- }
-- return nil
+- return err
-}
-
--// SetAuto will try to define the Set* method to call based on the given value.
--func (env *Env) SetAuto(key string, value interface{}) {
-- if fval, ok := value.(float64); ok {
-- env.SetInt64(key, int64(fval))
-- } else if sval, ok := value.(string); ok {
-- env.Set(key, sval)
-- } else if val, err := json.Marshal(value); err == nil {
-- env.Set(key, string(val))
-- } else {
-- env.Set(key, fmt.Sprintf("%v", value))
-- }
+-// Options describes a set of optional parameters to the various request calls.
+-//
+-// The custom client can be used for a variety of purposes beyond selecting encrypted versus unencrypted channels.
+-// Transports can be defined to provide augmented logging, header manipulation, et. al.
+-//
+-// If the ReqBody field is provided, it will be embedded as a JSON object.
+-// Otherwise, provide nil.
+-//
+-// If JSON output is to be expected from the response,
+-// provide either a pointer to the container structure in Results,
+-// or a pointer to a nil-initialized pointer variable.
+-// The latter method will cause the unmarshaller to allocate the container type for you.
+-// If no response is expected, provide a nil Results value.
+-//
+-// The MoreHeaders map, if non-nil or empty, provides a set of headers to add to those
+-// already present in the request. At present, only Accepted and Content-Type are set
+-// by default.
+-//
+-// OkCodes provides a set of acceptable, positive responses.
+-//
+-// If provided, StatusCode specifies a pointer to an integer, which will receive the
+-// returned HTTP status code, successful or not. DEPRECATED; use the Response.StatusCode field instead for new software.
+-//
+-// ResponseJson, if specified, provides a means for returning the raw JSON. This is
+-// most useful for diagnostics. DEPRECATED; use the Response.JsonResult field instead for new software.
+-//
+-// DumpReqJson, if set to true, will cause the request to appear to stdout for debugging purposes.
+-// This attribute may be removed at any time in the future; DO NOT use this attribute in production software.
+-//
+-// Response, if set, provides a way to communicate the complete set of HTTP response, raw JSON, status code, and
+-// other useful attributes back to the caller. Note that the Request() method returns a Response structure as part
+-// of its public interface; you don't need to set the Response field here to use this structure. The Response field
+-// exists primarily for legacy or deprecated functions.
+-//
+-// SetHeaders allows the caller to provide code to set any custom headers programmatically. Typically, this
+-// facility can invoke, e.g., SetBasicAuth() on the request to easily set up authentication.
+-// Any error generated will terminate the request and will propegate back to the caller.
+-type Options struct {
+- CustomClient *http.Client
+- ReqBody interface{}
+- Results interface{}
+- MoreHeaders map[string]string
+- OkCodes []int
+- StatusCode *int `DEPRECATED`
+- DumpReqJson bool `UNSUPPORTED`
+- ResponseJson *[]byte `DEPRECATED`
+- Response **Response
+- ContentType string `json:"Content-Type,omitempty"`
+- ContentLength int64 `json:"Content-Length,omitempty"`
+- Accept string `json:"Accept,omitempty"`
+- SetHeaders func(r *http.Request) error
-}
-
--// Map returns the map representation of the env.
--func (env *Env) Map() map[string]string {
-- if len(*env) == 0 {
-- return nil
-- }
-- m := make(map[string]string)
-- for _, kv := range *env {
-- parts := strings.SplitN(kv, "=", 2)
-- m[parts[0]] = parts[1]
-- }
-- return m
+-// Response contains return values from the various request calls.
+-//
+-// HttpResponse will return the http response from the request call.
+-// Note: HttpResponse.Body is always closed and will not be available from this return value.
+-//
+-// StatusCode specifies the returned HTTP status code, successful or not.
+-//
+-// If Results is specified in the Options:
+-// - JsonResult will contain the raw return from the request call
+-// This is most useful for diagnostics.
+-// - Result will contain the unmarshalled json either in the Result passed in
+-// or the unmarshaller will allocate the container type for you.
+-
+-type Response struct {
+- HttpResponse http.Response
+- JsonResult []byte
+- Results interface{}
+- StatusCode int
-}
-diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/env_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/env_test.go
+diff --git a/Godeps/_workspace/src/github.com/racker/perigee/api_test.go b/Godeps/_workspace/src/github.com/racker/perigee/api_test.go
deleted file mode 100644
-index 6d03d7b..0000000
---- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/env_test.go
+index da943b2..0000000
+--- a/Godeps/_workspace/src/github.com/racker/perigee/api_test.go
+++ /dev/null
-@@ -1,349 +0,0 @@
--// Copyright 2014 go-dockerclient authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the DOCKER-LICENSE file.
--
--package docker
+@@ -1,226 +0,0 @@
+-package perigee
-
-import (
- "bytes"
-- "errors"
-- "reflect"
-- "sort"
+- "fmt"
+- "net/http"
+- "net/http/httptest"
+- "strings"
- "testing"
-)
-
--func TestGet(t *testing.T) {
-- var tests = []struct {
-- input []string
-- query string
-- expected string
-- }{
-- {[]string{"PATH=/usr/bin:/bin", "PYTHONPATH=/usr/local"}, "PATH", "/usr/bin:/bin"},
-- {[]string{"PATH=/usr/bin:/bin", "PYTHONPATH=/usr/local"}, "PYTHONPATH", "/usr/local"},
-- {[]string{"PATH=/usr/bin:/bin", "PYTHONPATH=/usr/local"}, "PYTHONPATHI", ""},
-- {[]string{"WAT="}, "WAT", ""},
-- }
-- for _, tt := range tests {
-- env := Env(tt.input)
-- got := env.Get(tt.query)
-- if got != tt.expected {
-- t.Errorf("Env.Get(%q): wrong result. Want %q. Got %q", tt.query, tt.expected, got)
-- }
-- }
--}
+-func TestNormal(t *testing.T) {
+- handler := http.HandlerFunc(
+- func(w http.ResponseWriter, r *http.Request) {
+- w.Write([]byte("testing"))
+- })
+- ts := httptest.NewServer(handler)
+- defer ts.Close()
-
--func TestExists(t *testing.T) {
-- var tests = []struct {
-- input []string
-- query string
-- expected bool
-- }{
-- {[]string{"WAT=", "PYTHONPATH=/usr/local"}, "WAT", true},
-- {[]string{"PATH=/usr/bin:/bin", "PYTHONPATH=/usr/local"}, "PYTHONPATH", true},
-- {[]string{"PATH=/usr/bin:/bin", "PYTHONPATH=/usr/local"}, "PYTHONPATHI", false},
+- response, err := Request("GET", ts.URL, Options{})
+- if err != nil {
+- t.Fatalf("should not have error: %s", err)
- }
-- for _, tt := range tests {
-- env := Env(tt.input)
-- got := env.Exists(tt.query)
-- if got != tt.expected {
-- t.Errorf("Env.Exists(%q): wrong result. Want %v. Got %v", tt.query, tt.expected, got)
-- }
+- if response.StatusCode != 200 {
+- t.Fatalf("response code %d is not 200", response.StatusCode)
- }
-}
-
--func TestGetBool(t *testing.T) {
-- var tests = []struct {
-- input string
-- expected bool
-- }{
-- {"EMTPY_VAR", false}, {"ZERO_VAR", false}, {"NO_VAR", false},
-- {"FALSE_VAR", false}, {"NONE_VAR", false}, {"TRUE_VAR", true},
-- {"WAT", true}, {"PATH", true}, {"ONE_VAR", true}, {"NO_VAR_TAB", false},
-- }
-- env := Env([]string{
-- "EMPTY_VAR=", "ZERO_VAR=0", "NO_VAR=no", "FALSE_VAR=false",
-- "NONE_VAR=none", "TRUE_VAR=true", "WAT=wat", "PATH=/usr/bin:/bin",
-- "ONE_VAR=1", "NO_VAR_TAB=0 \t\t\t",
-- })
-- for _, tt := range tests {
-- got := env.GetBool(tt.input)
-- if got != tt.expected {
-- t.Errorf("Env.GetBool(%q): wrong result. Want %v. Got %v.", tt.input, tt.expected, got)
-- }
-- }
--}
+-func TestOKCodes(t *testing.T) {
+- expectCode := 201
+- handler := http.HandlerFunc(
+- func(w http.ResponseWriter, r *http.Request) {
+- w.WriteHeader(expectCode)
+- w.Write([]byte("testing"))
+- })
+- ts := httptest.NewServer(handler)
+- defer ts.Close()
-
--func TestSetBool(t *testing.T) {
-- var tests = []struct {
-- input bool
-- expected string
-- }{
-- {true, "1"}, {false, "0"},
-- }
-- for _, tt := range tests {
-- var env Env
-- env.SetBool("SOME", tt.input)
-- if got := env.Get("SOME"); got != tt.expected {
-- t.Errorf("Env.SetBool(%v): wrong result. Want %q. Got %q", tt.input, tt.expected, got)
-- }
+- options := Options{
+- OkCodes: []int{expectCode},
- }
--}
--
--func TestGetInt(t *testing.T) {
-- var tests = []struct {
-- input string
-- expected int
-- }{
-- {"NEGATIVE_INTEGER", -10}, {"NON_INTEGER", -1}, {"ONE", 1}, {"TWO", 2},
+- results, err := Request("GET", ts.URL, options)
+- if err != nil {
+- t.Fatalf("should not have error: %s", err)
- }
-- env := Env([]string{"NEGATIVE_INTEGER=-10", "NON_INTEGER=wat", "ONE=1", "TWO=2"})
-- for _, tt := range tests {
-- got := env.GetInt(tt.input)
-- if got != tt.expected {
-- t.Errorf("Env.GetInt(%q): wrong result. Want %d. Got %d", tt.input, tt.expected, got)
-- }
+- if results.StatusCode != expectCode {
+- t.Fatalf("response code %d is not %d", results.StatusCode, expectCode)
- }
-}
-
--func TestSetInt(t *testing.T) {
-- var tests = []struct {
-- input int
-- expected string
-- }{
-- {10, "10"}, {13, "13"}, {7, "7"}, {33, "33"},
-- {0, "0"}, {-34, "-34"},
-- }
-- for _, tt := range tests {
-- var env Env
-- env.SetInt("SOME", tt.input)
-- if got := env.Get("SOME"); got != tt.expected {
-- t.Errorf("Env.SetBool(%d): wrong result. Want %q. Got %q", tt.input, tt.expected, got)
-- }
-- }
--}
+-func TestLocation(t *testing.T) {
+- newLocation := "http://www.example.com"
+- handler := http.HandlerFunc(
+- func(w http.ResponseWriter, r *http.Request) {
+- w.Header().Set("Location", newLocation)
+- w.Write([]byte("testing"))
+- })
+- ts := httptest.NewServer(handler)
+- defer ts.Close()
-
--func TestGetInt64(t *testing.T) {
-- var tests = []struct {
-- input string
-- expected int64
-- }{
-- {"NEGATIVE_INTEGER", -10}, {"NON_INTEGER", -1}, {"ONE", 1}, {"TWO", 2},
-- }
-- env := Env([]string{"NEGATIVE_INTEGER=-10", "NON_INTEGER=wat", "ONE=1", "TWO=2"})
-- for _, tt := range tests {
-- got := env.GetInt64(tt.input)
-- if got != tt.expected {
-- t.Errorf("Env.GetInt64(%q): wrong result. Want %d. Got %d", tt.input, tt.expected, got)
-- }
+- response, err := Request("GET", ts.URL, Options{})
+- if err != nil {
+- t.Fatalf("should not have error: %s", err)
- }
--}
-
--func TestSetInt64(t *testing.T) {
-- var tests = []struct {
-- input int64
-- expected string
-- }{
-- {10, "10"}, {13, "13"}, {7, "7"}, {33, "33"},
-- {0, "0"}, {-34, "-34"},
+- location, err := response.HttpResponse.Location()
+- if err != nil {
+- t.Fatalf("should not have error: %s", err)
- }
-- for _, tt := range tests {
-- var env Env
-- env.SetInt64("SOME", tt.input)
-- if got := env.Get("SOME"); got != tt.expected {
-- t.Errorf("Env.SetBool(%d): wrong result. Want %q. Got %q", tt.input, tt.expected, got)
-- }
+-
+- if location.String() != newLocation {
+- t.Fatalf("location returned \"%s\" is not \"%s\"", location.String(), newLocation)
- }
-}
-
--func TestGetJSON(t *testing.T) {
-- var p struct {
-- Name string `json:"name"`
-- Age int `json:"age"`
-- }
-- var env Env
-- env.Set("person", `{"name":"Gopher","age":5}`)
-- err := env.GetJSON("person", &p)
+-func TestHeaders(t *testing.T) {
+- newLocation := "http://www.example.com"
+- handler := http.HandlerFunc(
+- func(w http.ResponseWriter, r *http.Request) {
+- w.Header().Set("Location", newLocation)
+- w.Write([]byte("testing"))
+- })
+- ts := httptest.NewServer(handler)
+- defer ts.Close()
+-
+- response, err := Request("GET", ts.URL, Options{})
- if err != nil {
-- t.Error(err)
+- t.Fatalf("should not have error: %s", err)
- }
-- if p.Name != "Gopher" {
-- t.Errorf("Env.GetJSON(%q): wrong name. Want %q. Got %q", "person", "Gopher", p.Name)
+-
+- location := response.HttpResponse.Header.Get("Location")
+- if location == "" {
+- t.Fatalf("Location should not empty")
- }
-- if p.Age != 5 {
-- t.Errorf("Env.GetJSON(%q): wrong age. Want %d. Got %d", "person", 5, p.Age)
+-
+- if location != newLocation {
+- t.Fatalf("location returned \"%s\" is not \"%s\"", location, newLocation)
- }
-}
-
--func TestGetJSONAbsent(t *testing.T) {
-- var l []string
-- var env Env
-- err := env.GetJSON("person", &l)
+-func TestCustomHeaders(t *testing.T) {
+- var contentType, accept, contentLength string
+-
+- handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+- m := map[string][]string(r.Header)
+- contentType = m["Content-Type"][0]
+- accept = m["Accept"][0]
+- contentLength = m["Content-Length"][0]
+- })
+- ts := httptest.NewServer(handler)
+- defer ts.Close()
+-
+- _, err := Request("GET", ts.URL, Options{
+- ContentLength: 5,
+- ContentType: "x-application/vb",
+- Accept: "x-application/c",
+- ReqBody: strings.NewReader("Hello"),
+- })
- if err != nil {
-- t.Error(err)
+- t.Fatalf(err.Error())
- }
-- if l != nil {
-- t.Errorf("Env.GetJSON(): get unexpected list %v", l)
+-
+- if contentType != "x-application/vb" {
+- t.Fatalf("I expected x-application/vb; got ", contentType)
- }
--}
-
--func TestGetJSONFailure(t *testing.T) {
-- var p []string
-- var env Env
-- env.Set("list-person", `{"name":"Gopher","age":5}`)
-- err := env.GetJSON("list-person", &p)
-- if err == nil {
-- t.Errorf("Env.GetJSON(%q): got unexpected <nil> error.", "list-person")
+- if contentLength != "5" {
+- t.Fatalf("I expected 5 byte content length; got ", contentLength)
- }
--}
-
--func TestSetJSON(t *testing.T) {
-- var p1 = struct {
-- Name string `json:"name"`
-- Age int `json:"age"`
-- }{Name: "Gopher", Age: 5}
-- var env Env
-- err := env.SetJSON("person", p1)
-- if err != nil {
-- t.Error(err)
+- if accept != "x-application/c" {
+- t.Fatalf("I expected x-application/c; got ", accept)
- }
-- var p2 struct {
-- Name string `json:"name"`
-- Age int `json:"age"`
+-}
+-
+-func TestJson(t *testing.T) {
+- newLocation := "http://www.example.com"
+- jsonBytes := []byte(`{"foo": {"bar": "baz"}}`)
+- handler := http.HandlerFunc(
+- func(w http.ResponseWriter, r *http.Request) {
+- w.Header().Set("Location", newLocation)
+- w.Write(jsonBytes)
+- })
+- ts := httptest.NewServer(handler)
+- defer ts.Close()
+-
+- type Data struct {
+- Foo struct {
+- Bar string `json:"bar"`
+- } `json:"foo"`
- }
-- err = env.GetJSON("person", &p2)
+- var data Data
+-
+- response, err := Request("GET", ts.URL, Options{Results: &data})
- if err != nil {
-- t.Error(err)
-- }
-- if !reflect.DeepEqual(p1, p2) {
-- t.Errorf("Env.SetJSON(%q): wrong result. Want %v. Got %v", "person", p1, p2)
+- t.Fatalf("should not have error: %s", err)
- }
--}
-
--func TestSetJSONFailure(t *testing.T) {
-- var env Env
-- err := env.SetJSON("person", unmarshable{})
-- if err == nil {
-- t.Error("Env.SetJSON(): got unexpected <nil> error")
-- }
-- if env.Exists("person") {
-- t.Errorf("Env.SetJSON(): should not define the key %q, but did", "person")
+- if bytes.Compare(jsonBytes, response.JsonResult) != 0 {
+- t.Fatalf("json returned \"%s\" is not \"%s\"", response.JsonResult, jsonBytes)
- }
--}
-
--func TestGetList(t *testing.T) {
-- var tests = []struct {
-- input string
-- expected []string
-- }{
-- {"WAT=wat", []string{"wat"}},
-- {`WAT=["wat","wet","wit","wot","wut"]`, []string{"wat", "wet", "wit", "wot", "wut"}},
-- {"WAT=", nil},
-- }
-- for _, tt := range tests {
-- env := Env([]string{tt.input})
-- got := env.GetList("WAT")
-- if !reflect.DeepEqual(got, tt.expected) {
-- t.Errorf("Env.GetList(%q): wrong result. Want %v. Got %v", "WAT", tt.expected, got)
-- }
+- if data.Foo.Bar != "baz" {
+- t.Fatalf("Results returned %v", data)
- }
-}
-
--func TestSetList(t *testing.T) {
-- list := []string{"a", "b", "c"}
-- var env Env
-- env.SetList("SOME", list)
-- if got := env.GetList("SOME"); !reflect.DeepEqual(got, list) {
-- t.Errorf("Env.SetList(%v): wrong result. Got %v", list, got)
-- }
--}
+-func TestSetHeaders(t *testing.T) {
+- var wasCalled bool
+- handler := http.HandlerFunc(
+- func(w http.ResponseWriter, r *http.Request) {
+- w.Write([]byte("Hi"))
+- })
+- ts := httptest.NewServer(handler)
+- defer ts.Close()
-
--func TestSet(t *testing.T) {
-- var env Env
-- env.Set("PATH", "/home/bin:/bin")
-- env.Set("SOMETHING", "/usr/bin")
-- env.Set("PATH", "/bin")
-- if expected, got := "/usr/bin", env.Get("SOMETHING"); got != expected {
-- t.Errorf("Env.Set(%q): wrong result. Want %q. Got %q", expected, expected, got)
+- _, err := Request("GET", ts.URL, Options{
+- SetHeaders: func(r *http.Request) error {
+- wasCalled = true
+- return nil
+- },
+- })
+-
+- if err != nil {
+- t.Fatal(err)
- }
-- if expected, got := "/bin", env.Get("PATH"); got != expected {
-- t.Errorf("Env.Set(%q): wrong result. Want %q. Got %q", expected, expected, got)
+-
+- if !wasCalled {
+- t.Fatal("I expected header setter callback to be called, but it wasn't")
- }
--}
-
--func TestDecode(t *testing.T) {
-- var tests = []struct {
-- input string
-- expectedOut []string
-- expectedErr string
-- }{
-- {
-- `{"PATH":"/usr/bin:/bin","containers":54,"wat":["123","345"]}`,
-- []string{"PATH=/usr/bin:/bin", "containers=54", `wat=["123","345"]`},
-- "",
+- myError := fmt.Errorf("boo")
+-
+- _, err = Request("GET", ts.URL, Options{
+- SetHeaders: func(r *http.Request) error {
+- return myError
- },
-- {"}}", nil, "invalid character '}' looking for beginning of value"},
-- {`{}`, nil, ""},
-- }
-- for _, tt := range tests {
-- var env Env
-- err := env.Decode(bytes.NewBufferString(tt.input))
-- if tt.expectedErr == "" {
-- if err != nil {
-- t.Error(err)
-- }
-- } else if tt.expectedErr != err.Error() {
-- t.Errorf("Env.Decode(): invalid error. Want %q. Got %q.", tt.expectedErr, err)
-- }
-- got := []string(env)
-- sort.Strings(got)
-- sort.Strings(tt.expectedOut)
-- if !reflect.DeepEqual(got, tt.expectedOut) {
-- t.Errorf("Env.Decode(): wrong result. Want %v. Got %v.", tt.expectedOut, got)
-- }
+- })
+-
+- if err != myError {
+- t.Fatal("I expected errors to propegate back to the caller.")
- }
-}
-
--func TestSetAuto(t *testing.T) {
-- buf := bytes.NewBufferString("oi")
-- var tests = []struct {
-- input interface{}
-- expected string
-- }{
-- {10, "10"},
-- {10.3, "10"},
-- {"oi", "oi"},
-- {buf, "{}"},
-- {unmarshable{}, "{}"},
-- }
-- for _, tt := range tests {
-- var env Env
-- env.SetAuto("SOME", tt.input)
-- if got := env.Get("SOME"); got != tt.expected {
-- t.Errorf("Env.SetAuto(%v): wrong result. Want %q. Got %q", tt.input, tt.expected, got)
-- }
+-func TestBodilessMethodsAreSentWithoutContentHeaders(t *testing.T) {
+- var h map[string][]string
+-
+- handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+- h = r.Header
+- })
+- ts := httptest.NewServer(handler)
+- defer ts.Close()
+-
+- _, err := Request("GET", ts.URL, Options{})
+- if err != nil {
+- t.Fatalf(err.Error())
- }
--}
-
--func TestMap(t *testing.T) {
-- var tests = []struct {
-- input []string
-- expected map[string]string
-- }{
-- {[]string{"PATH=/usr/bin:/bin", "PYTHONPATH=/usr/local"}, map[string]string{"PATH": "/usr/bin:/bin", "PYTHONPATH": "/usr/local"}},
-- {nil, nil},
+- if len(h["Content-Type"]) != 0 {
+- t.Fatalf("I expected nothing for Content-Type but got ", h["Content-Type"])
- }
-- for _, tt := range tests {
-- env := Env(tt.input)
-- got := env.Map()
-- if !reflect.DeepEqual(got, tt.expected) {
-- t.Errorf("Env.Map(): wrong result. Want %v. Got %v", tt.expected, got)
-- }
+-
+- if len(h["Content-Length"]) != 0 {
+- t.Fatalf("I expected nothing for Content-Length but got ", h["Content-Length"])
- }
-}
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/.editorconfig b/Godeps/_workspace/src/github.com/rackspace/gophercloud/.editorconfig
+deleted file mode 100644
+index 2655ebc..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/.editorconfig
++++ /dev/null
+@@ -1,16 +0,0 @@
+-# EditorConfig is awesome: http://EditorConfig.org
-
--type unmarshable struct {
--}
+-# top-most EditorConfig file
+-root = true
-
--func (unmarshable) MarshalJSON() ([]byte, error) {
-- return nil, errors.New("cannot marshal")
--}
-diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/event.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/event.go
+-# All files
+-[*]
+-end_of_line = lf
+-insert_final_newline = true
+-charset = utf-8
+-trim_trailing_whitespace = true
+-
+-# Golang
+-[*.go]
+-indent_style = tab
+-indent_size = 2
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/.travis.yml b/Godeps/_workspace/src/github.com/rackspace/gophercloud/.travis.yml
deleted file mode 100644
-index 262d4ee..0000000
---- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/event.go
+index 6e1dbd0..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/.travis.yml
+++ /dev/null
-@@ -1,278 +0,0 @@
--// Copyright 2014 go-dockerclient authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
+@@ -1,14 +0,0 @@
+-language: go
+-install:
+- - go get -v .
+-go:
+- - 1.1
+- - 1.2
+- - tip
+-after_success:
+- - go get code.google.com/p/go.tools/cmd/cover
+- - go get github.com/axw/gocov/gocov
+- - go get github.com/mattn/goveralls
+- - export PATH=$PATH:$HOME/gopath/bin/
+- - goveralls 2k7PTU3xa474Hymwgdj6XjqenNfGTNkO8
-
--package docker
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/CONTRIBUTORS.md b/Godeps/_workspace/src/github.com/rackspace/gophercloud/CONTRIBUTORS.md
+deleted file mode 100644
+index 9076695..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/CONTRIBUTORS.md
++++ /dev/null
+@@ -1,6 +0,0 @@
+-Contributors
+-============
-
--import (
-- "encoding/json"
-- "errors"
-- "fmt"
-- "io"
-- "math"
-- "net"
-- "net/http"
-- "net/http/httputil"
-- "sync"
-- "sync/atomic"
-- "time"
--)
+-Samuel A. Falvo II <sam.falvo at rackspace.com>
+-Glen Campbell <glen.campbell at rackspace.com>
+-Jesse Noller <jesse.noller at rackspace.com>
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/LICENSE b/Godeps/_workspace/src/github.com/rackspace/gophercloud/LICENSE
+deleted file mode 100644
+index fbbbc9e..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/LICENSE
++++ /dev/null
+@@ -1,191 +0,0 @@
+-Copyright 2012-2013 Rackspace, Inc.
-
--// APIEvents represents an event returned by the API.
--type APIEvents struct {
-- Status string `json:"Status,omitempty" yaml:"Status,omitempty"`
-- ID string `json:"ID,omitempty" yaml:"ID,omitempty"`
-- From string `json:"From,omitempty" yaml:"From,omitempty"`
-- Time int64 `json:"Time,omitempty" yaml:"Time,omitempty"`
--}
+-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+-this file except in compliance with the License. You may obtain a copy of the
+-License at
-
--type eventMonitoringState struct {
-- sync.RWMutex
-- sync.WaitGroup
-- enabled bool
-- lastSeen *int64
-- C chan *APIEvents
-- errC chan error
-- listeners []chan<- *APIEvents
--}
+- http://www.apache.org/licenses/LICENSE-2.0
-
--const (
-- maxMonitorConnRetries = 5
-- retryInitialWaitTime = 10.
--)
+-Unless required by applicable law or agreed to in writing, software distributed
+-under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+-CONDITIONS OF ANY KIND, either express or implied. See the License for the
+-specific language governing permissions and limitations under the License.
-
--var (
-- // ErrNoListeners is the error returned when no listeners are available
-- // to receive an event.
-- ErrNoListeners = errors.New("no listeners present to receive event")
+-------
+-
+- Apache License
+- Version 2.0, January 2004
+- http://www.apache.org/licenses/
-
-- // ErrListenerAlreadyExists is the error returned when the listerner already
-- // exists.
-- ErrListenerAlreadyExists = errors.New("listener already exists for docker events")
--)
+- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
--// AddEventListener adds a new listener to container events in the Docker API.
--//
--// The parameter is a channel through which events will be sent.
--func (c *Client) AddEventListener(listener chan<- *APIEvents) error {
-- var err error
-- if !c.eventMonitor.isEnabled() {
-- err = c.eventMonitor.enableEventMonitoring(c)
-- if err != nil {
-- return err
-- }
-- }
-- err = c.eventMonitor.addListener(listener)
-- if err != nil {
-- return err
-- }
-- return nil
--}
+- 1. Definitions.
-
--// RemoveEventListener removes a listener from the monitor.
--func (c *Client) RemoveEventListener(listener chan *APIEvents) error {
-- err := c.eventMonitor.removeListener(listener)
-- if err != nil {
-- return err
-- }
-- if len(c.eventMonitor.listeners) == 0 {
-- err = c.eventMonitor.disableEventMonitoring()
-- if err != nil {
-- return err
-- }
-- }
-- return nil
--}
+- "License" shall mean the terms and conditions for use, reproduction,
+- and distribution as defined by Sections 1 through 9 of this document.
+-
+- "Licensor" shall mean the copyright owner or entity authorized by
+- the copyright owner that is granting the License.
+-
+- "Legal Entity" shall mean the union of the acting entity and all
+- other entities that control, are controlled by, or are under common
+- control with that entity. For the purposes of this definition,
+- "control" means (i) the power, direct or indirect, to cause the
+- direction or management of such entity, whether by contract or
+- otherwise, or (ii) ownership of fifty percent (50%) or more of the
+- outstanding shares, or (iii) beneficial ownership of such entity.
+-
+- "You" (or "Your") shall mean an individual or Legal Entity
+- exercising permissions granted by this License.
+-
+- "Source" form shall mean the preferred form for making modifications,
+- including but not limited to software source code, documentation
+- source, and configuration files.
+-
+- "Object" form shall mean any form resulting from mechanical
+- transformation or translation of a Source form, including but
+- not limited to compiled object code, generated documentation,
+- and conversions to other media types.
+-
+- "Work" shall mean the work of authorship, whether in Source or
+- Object form, made available under the License, as indicated by a
+- copyright notice that is included in or attached to the work
+- (an example is provided in the Appendix below).
+-
+- "Derivative Works" shall mean any work, whether in Source or Object
+- form, that is based on (or derived from) the Work and for which the
+- editorial revisions, annotations, elaborations, or other modifications
+- represent, as a whole, an original work of authorship. For the purposes
+- of this License, Derivative Works shall not include works that remain
+- separable from, or merely link (or bind by name) to the interfaces of,
+- the Work and Derivative Works thereof.
+-
+- "Contribution" shall mean any work of authorship, including
+- the original version of the Work and any modifications or additions
+- to that Work or Derivative Works thereof, that is intentionally
+- submitted to Licensor for inclusion in the Work by the copyright owner
+- or by an individual or Legal Entity authorized to submit on behalf of
+- the copyright owner. For the purposes of this definition, "submitted"
+- means any form of electronic, verbal, or written communication sent
+- to the Licensor or its representatives, including but not limited to
+- communication on electronic mailing lists, source code control systems,
+- and issue tracking systems that are managed by, or on behalf of, the
+- Licensor for the purpose of discussing and improving the Work, but
+- excluding communication that is conspicuously marked or otherwise
+- designated in writing by the copyright owner as "Not a Contribution."
+-
+- "Contributor" shall mean Licensor and any individual or Legal Entity
+- on behalf of whom a Contribution has been received by Licensor and
+- subsequently incorporated within the Work.
+-
+- 2. Grant of Copyright License. Subject to the terms and conditions of
+- this License, each Contributor hereby grants to You a perpetual,
+- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+- copyright license to reproduce, prepare Derivative Works of,
+- publicly display, publicly perform, sublicense, and distribute the
+- Work and such Derivative Works in Source or Object form.
+-
+- 3. Grant of Patent License. Subject to the terms and conditions of
+- this License, each Contributor hereby grants to You a perpetual,
+- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+- (except as stated in this section) patent license to make, have made,
+- use, offer to sell, sell, import, and otherwise transfer the Work,
+- where such license applies only to those patent claims licensable
+- by such Contributor that are necessarily infringed by their
+- Contribution(s) alone or by combination of their Contribution(s)
+- with the Work to which such Contribution(s) was submitted. If You
+- institute patent litigation against any entity (including a
+- cross-claim or counterclaim in a lawsuit) alleging that the Work
+- or a Contribution incorporated within the Work constitutes direct
+- or contributory patent infringement, then any patent licenses
+- granted to You under this License for that Work shall terminate
+- as of the date such litigation is filed.
+-
+- 4. Redistribution. You may reproduce and distribute copies of the
+- Work or Derivative Works thereof in any medium, with or without
+- modifications, and in Source or Object form, provided that You
+- meet the following conditions:
+-
+- (a) You must give any other recipients of the Work or
+- Derivative Works a copy of this License; and
+-
+- (b) You must cause any modified files to carry prominent notices
+- stating that You changed the files; and
+-
+- (c) You must retain, in the Source form of any Derivative Works
+- that You distribute, all copyright, patent, trademark, and
+- attribution notices from the Source form of the Work,
+- excluding those notices that do not pertain to any part of
+- the Derivative Works; and
+-
+- (d) If the Work includes a "NOTICE" text file as part of its
+- distribution, then any Derivative Works that You distribute must
+- include a readable copy of the attribution notices contained
+- within such NOTICE file, excluding those notices that do not
+- pertain to any part of the Derivative Works, in at least one
+- of the following places: within a NOTICE text file distributed
+- as part of the Derivative Works; within the Source form or
+- documentation, if provided along with the Derivative Works; or,
+- within a display generated by the Derivative Works, if and
+- wherever such third-party notices normally appear. The contents
+- of the NOTICE file are for informational purposes only and
+- do not modify the License. You may add Your own attribution
+- notices within Derivative Works that You distribute, alongside
+- or as an addendum to the NOTICE text from the Work, provided
+- that such additional attribution notices cannot be construed
+- as modifying the License.
+-
+- You may add Your own copyright statement to Your modifications and
+- may provide additional or different license terms and conditions
+- for use, reproduction, or distribution of Your modifications, or
+- for any such Derivative Works as a whole, provided Your use,
+- reproduction, and distribution of the Work otherwise complies with
+- the conditions stated in this License.
+-
+- 5. Submission of Contributions. Unless You explicitly state otherwise,
+- any Contribution intentionally submitted for inclusion in the Work
+- by You to the Licensor shall be under the terms and conditions of
+- this License, without any additional terms or conditions.
+- Notwithstanding the above, nothing herein shall supersede or modify
+- the terms of any separate license agreement you may have executed
+- with Licensor regarding such Contributions.
+-
+- 6. Trademarks. This License does not grant permission to use the trade
+- names, trademarks, service marks, or product names of the Licensor,
+- except as required for reasonable and customary use in describing the
+- origin of the Work and reproducing the content of the NOTICE file.
+-
+- 7. Disclaimer of Warranty. Unless required by applicable law or
+- agreed to in writing, Licensor provides the Work (and each
+- Contributor provides its Contributions) on an "AS IS" BASIS,
+- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+- implied, including, without limitation, any warranties or conditions
+- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+- PARTICULAR PURPOSE. You are solely responsible for determining the
+- appropriateness of using or redistributing the Work and assume any
+- risks associated with Your exercise of permissions under this License.
+-
+- 8. Limitation of Liability. In no event and under no legal theory,
+- whether in tort (including negligence), contract, or otherwise,
+- unless required by applicable law (such as deliberate and grossly
+- negligent acts) or agreed to in writing, shall any Contributor be
+- liable to You for damages, including any direct, indirect, special,
+- incidental, or consequential damages of any character arising as a
+- result of this License or out of the use or inability to use the
+- Work (including but not limited to damages for loss of goodwill,
+- work stoppage, computer failure or malfunction, or any and all
+- other commercial damages or losses), even if such Contributor
+- has been advised of the possibility of such damages.
+-
+- 9. Accepting Warranty or Additional Liability. While redistributing
+- the Work or Derivative Works thereof, You may choose to offer,
+- and charge a fee for, acceptance of support, warranty, indemnity,
+- or other liability obligations and/or rights consistent with this
+- License. However, in accepting such obligations, You may act only
+- on Your own behalf and on Your sole responsibility, not on behalf
+- of any other Contributor, and only if You agree to indemnify,
+- defend, and hold each Contributor harmless for any liability
+- incurred by, or claims asserted against, such Contributor by reason
+- of your accepting any such warranty or additional liability.
+-
+- END OF TERMS AND CONDITIONS
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/README.asciidoc b/Godeps/_workspace/src/github.com/rackspace/gophercloud/README.asciidoc
+deleted file mode 100644
+index b7a7c01..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/README.asciidoc
++++ /dev/null
+@@ -1,44 +0,0 @@
+-== Gophercloud -- V0.1.0 image:https://secure.travis-ci.org/rackspace/gophercloud.png?branch=master["build status",link="https://travis-ci.org/rackspace/gophercloud"]
+-
+-Gophercloud currently lets you authenticate with OpenStack providers to create and manage servers.
+-We are working on extending the API to further include cloud files, block storage, DNS, databases, security groups, and other features.
+-
+-WARNING: This library is still in the very early stages of development. Unless you want to contribute, it probably isn't what you want. Yet.
+-
+-=== Outstanding Features
+-
+-1. Apache 2.0 License, making Gophercloud friendly to commercial and open-source enterprises alike.
+-2. Gophercloud is one of the most actively maintained Go SDKs for OpenStack.
+-3. Gophercloud supports Identity V2 and Nova V2 APIs. More coming soon!
+-4. The up-coming Gophercloud 0.2.0 release supports API extensions, and makes writing support for new extensions easy.
+-5. Gophercloud supports automatic reauthentication upon auth token timeout, if enabled by your software.
+-6. Gophercloud is the only SDK implementation with actual acceptance-level integration tests.
+-
+-=== What Does it Look Like?
-
--func (eventState *eventMonitoringState) addListener(listener chan<- *APIEvents) error {
-- eventState.Lock()
-- defer eventState.Unlock()
-- if listenerExists(listener, &eventState.listeners) {
-- return ErrListenerAlreadyExists
-- }
-- eventState.Add(1)
-- eventState.listeners = append(eventState.listeners, listener)
-- return nil
--}
+-The Gophercloud 0.1.0 and earlier APIs are now deprecated and obsolete.
+-No new feature development will occur for 0.1.0 or 0.0.0.
+-However, we will accept and provide bug fixes for these APIs.
+-Please refer to the acceptance tests in the master brach for code examples using the v0.1.0 API.
+-The most up to date documentation for version 0.1.x can be found at link:http://godoc.org/github.com/rackspace/gophercloud[our Godoc.org documentation].
-
--func (eventState *eventMonitoringState) removeListener(listener chan<- *APIEvents) error {
-- eventState.Lock()
-- defer eventState.Unlock()
-- if listenerExists(listener, &eventState.listeners) {
-- var newListeners []chan<- *APIEvents
-- for _, l := range eventState.listeners {
-- if l != listener {
-- newListeners = append(newListeners, l)
-- }
-- }
-- eventState.listeners = newListeners
-- eventState.Add(-1)
-- }
-- return nil
--}
+-We are working on a new API that provides much better support for extensions, pagination, and other features that proved difficult to implement before.
+-This new API will be substantially more Go-idiomatic as well; one of the complaints received about 0.1.x and earlier is that it didn't "feel" right.
+-To see what this new API is going to look like, you can look at the code examples up on the link:http://gophercloud.io/docs.html[Gophercloud website].
+-If you're interested in tracking progress, note that features for version 0.2.0 will appear in the `v0.2.0` branch until merged to master.
-
--func listenerExists(a chan<- *APIEvents, list *[]chan<- *APIEvents) bool {
-- for _, b := range *list {
-- if b == a {
-- return true
-- }
-- }
-- return false
--}
+-=== How can I Contribute?
-
--func (eventState *eventMonitoringState) enableEventMonitoring(c *Client) error {
-- eventState.Lock()
-- defer eventState.Unlock()
-- if !eventState.enabled {
-- eventState.enabled = true
-- var lastSeenDefault = int64(0)
-- eventState.lastSeen = &lastSeenDefault
-- eventState.C = make(chan *APIEvents, 100)
-- eventState.errC = make(chan error, 1)
-- go eventState.monitorEvents(c)
-- }
-- return nil
--}
+-After using Gophercloud for a while, you might find that it lacks some useful feature, or that existing behavior seems buggy. We welcome contributions
+-from our users for both missing functionality as well as for bug fixes. We encourage contributors to collaborate with the
+-link:http://gophercloud.io/community.html[Gophercloud community.]
-
--func (eventState *eventMonitoringState) disableEventMonitoring() error {
-- eventState.Wait()
-- eventState.Lock()
-- defer eventState.Unlock()
-- if eventState.enabled {
-- eventState.enabled = false
-- close(eventState.C)
-- close(eventState.errC)
-- }
-- return nil
--}
+-Finally, Gophercloud maintains its own link:http://gophercloud.io[announcements and updates blog.]
+-Feel free to check back now and again to see what's new.
-
--func (eventState *eventMonitoringState) monitorEvents(c *Client) {
-- var err error
-- for eventState.noListeners() {
-- time.Sleep(10 * time.Millisecond)
-- }
-- if err = eventState.connectWithRetry(c); err != nil {
-- eventState.terminate(err)
-- }
-- for eventState.isEnabled() {
-- timeout := time.After(100 * time.Millisecond)
-- select {
-- case ev, ok := <-eventState.C:
-- if !ok {
-- return
-- }
-- go eventState.sendEvent(ev)
-- go eventState.updateLastSeen(ev)
-- case err = <-eventState.errC:
-- if err == ErrNoListeners {
-- eventState.terminate(nil)
-- return
-- } else if err != nil {
-- defer func() { go eventState.monitorEvents(c) }()
-- return
-- }
-- case <-timeout:
-- continue
-- }
-- }
--}
+-== License
-
--func (eventState *eventMonitoringState) connectWithRetry(c *Client) error {
-- var retries int
-- var err error
-- for err = c.eventHijack(atomic.LoadInt64(eventState.lastSeen), eventState.C, eventState.errC); err != nil && retries < maxMonitorConnRetries; retries++ {
-- waitTime := int64(retryInitialWaitTime * math.Pow(2, float64(retries)))
-- time.Sleep(time.Duration(waitTime) * time.Millisecond)
-- err = c.eventHijack(atomic.LoadInt64(eventState.lastSeen), eventState.C, eventState.errC)
-- }
-- return err
--}
+-Copyright (C) 2013, 2014 Rackspace, Inc.
-
--func (eventState *eventMonitoringState) noListeners() bool {
-- eventState.RLock()
-- defer eventState.RUnlock()
-- return len(eventState.listeners) == 0
--}
+-Licensed under the Apache License, Version 2.0
-
--func (eventState *eventMonitoringState) isEnabled() bool {
-- eventState.RLock()
-- defer eventState.RUnlock()
-- return eventState.enabled
--}
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/00-authentication.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/00-authentication.go
+deleted file mode 100644
+index 6467203..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/00-authentication.go
++++ /dev/null
+@@ -1,30 +0,0 @@
+-// +build acceptance,old
-
--func (eventState *eventMonitoringState) sendEvent(event *APIEvents) {
-- eventState.RLock()
-- defer eventState.RUnlock()
-- eventState.Add(1)
-- defer eventState.Done()
-- if eventState.isEnabled() {
-- if eventState.noListeners() {
-- eventState.errC <- ErrNoListeners
-- return
-- }
+-package main
-
-- for _, listener := range eventState.listeners {
-- listener <- event
-- }
+-import (
+- "fmt"
+- "github.com/rackspace/gophercloud"
+- "os"
+- "strings"
+-)
+-
+-func main() {
+- provider, username, _, apiKey := getCredentials()
+-
+- if !strings.Contains(provider, "rackspace") {
+- fmt.Fprintf(os.Stdout, "Skipping test because provider doesn't support API_KEYs\n")
+- return
- }
--}
-
--func (eventState *eventMonitoringState) updateLastSeen(e *APIEvents) {
-- eventState.Lock()
-- defer eventState.Unlock()
-- if atomic.LoadInt64(eventState.lastSeen) < e.Time {
-- atomic.StoreInt64(eventState.lastSeen, e.Time)
+- _, err := gophercloud.Authenticate(
+- provider,
+- gophercloud.AuthOptions{
+- Username: username,
+- ApiKey: apiKey,
+- },
+- )
+- if err != nil {
+- panic(err)
- }
-}
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/01-authentication.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/01-authentication.go
+deleted file mode 100644
+index 5cc9d38..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/01-authentication.go
++++ /dev/null
+@@ -1,22 +0,0 @@
+-// +build acceptance,old
-
--func (eventState *eventMonitoringState) terminate(err error) {
-- eventState.disableEventMonitoring()
--}
+-package main
-
--func (c *Client) eventHijack(startTime int64, eventChan chan *APIEvents, errChan chan error) error {
-- uri := "/events"
-- if startTime != 0 {
-- uri += fmt.Sprintf("?since=%d", startTime)
-- }
-- protocol := c.endpointURL.Scheme
-- address := c.endpointURL.Path
-- if protocol != "unix" {
-- protocol = "tcp"
-- address = c.endpointURL.Host
-- }
-- dial, err := net.Dial(protocol, address)
-- if err != nil {
-- return err
-- }
-- conn := httputil.NewClientConn(dial, nil)
-- req, err := http.NewRequest("GET", uri, nil)
-- if err != nil {
-- return err
-- }
-- res, err := conn.Do(req)
+-import (
+- "github.com/rackspace/gophercloud"
+-)
+-
+-func main() {
+- provider, username, password, _ := getCredentials()
+-
+- _, err := gophercloud.Authenticate(
+- provider,
+- gophercloud.AuthOptions{
+- Username: username,
+- Password: password,
+- },
+- )
- if err != nil {
-- return err
+- panic(err)
- }
-- go func(res *http.Response, conn *httputil.ClientConn) {
-- defer conn.Close()
-- defer res.Body.Close()
-- decoder := json.NewDecoder(res.Body)
-- for {
-- var event APIEvents
-- if err = decoder.Decode(&event); err != nil {
-- if err == io.EOF || err == io.ErrUnexpectedEOF {
-- break
-- }
-- errChan <- err
-- }
-- if event.Time == 0 {
-- continue
-- }
-- if !c.eventMonitor.isEnabled() {
-- return
-- }
-- c.eventMonitor.C <- &event
-- }
-- }(res, conn)
-- return nil
-}
-diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/event_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/event_test.go
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/02-list-servers.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/02-list-servers.go
deleted file mode 100644
-index cb54f4a..0000000
---- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/event_test.go
+index 772852e..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/02-list-servers.go
+++ /dev/null
-@@ -1,93 +0,0 @@
--// Copyright 2014 go-dockerclient authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
+@@ -1,62 +0,0 @@
+-// +build acceptance,old
-
--package docker
+-package main
-
-import (
-- "bufio"
+- "flag"
- "fmt"
-- "net/http"
-- "net/http/httptest"
-- "strings"
-- "testing"
-- "time"
+- "github.com/rackspace/gophercloud"
-)
-
--func TestEventListeners(t *testing.T) {
-- response := `{"status":"create","id":"dfdf82bd3881","from":"base:latest","time":1374067924}
--{"status":"start","id":"dfdf82bd3881","from":"base:latest","time":1374067924}
--{"status":"stop","id":"dfdf82bd3881","from":"base:latest","time":1374067966}
--{"status":"destroy","id":"dfdf82bd3881","from":"base:latest","time":1374067970}
--`
--
-- var req http.Request
-- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-- rsc := bufio.NewScanner(strings.NewReader(response))
-- for rsc.Scan() {
-- w.Write([]byte(rsc.Text()))
-- w.(http.Flusher).Flush()
-- time.Sleep(10 * time.Millisecond)
-- }
-- req = *r
-- }))
-- defer server.Close()
+-var quiet = flag.Bool("quiet", false, "Quiet mode, for acceptance testing. $? still indicates errors though.")
-
-- client, err := NewClient(server.URL)
-- if err != nil {
-- t.Errorf("Failed to create client: %s", err)
-- }
-- client.SkipServerVersionCheck = true
+-func main() {
+- flag.Parse()
-
-- listener := make(chan *APIEvents, 10)
-- defer func() { time.Sleep(10 * time.Millisecond); client.RemoveEventListener(listener) }()
+- withIdentity(false, func(acc gophercloud.AccessProvider) {
+- withServerApi(acc, func(api gophercloud.CloudServersProvider) {
+- tryFullDetails(api)
+- tryLinksOnly(api)
+- })
+- })
+-}
-
-- err = client.AddEventListener(listener)
+-func tryLinksOnly(api gophercloud.CloudServersProvider) {
+- servers, err := api.ListServersLinksOnly()
- if err != nil {
-- t.Errorf("Failed to add event listener: %s", err)
+- panic(err)
- }
-
-- timeout := time.After(1 * time.Second)
-- var count int
+- if !*quiet {
+- fmt.Println("Id,Name")
+- for _, s := range servers {
+- if s.AccessIPv4 != "" {
+- panic("IPv4 not expected")
+- }
-
-- for {
-- select {
-- case msg := <-listener:
-- t.Logf("Recieved: %s", *msg)
-- count++
-- err = checkEvent(count, msg)
-- if err != nil {
-- t.Fatalf("Check event failed: %s", err)
+- if s.Status != "" {
+- panic("Status not expected")
- }
-- if count == 4 {
-- return
+-
+- if s.Progress != 0 {
+- panic("Progress not expected")
- }
-- case <-timeout:
-- t.Fatal("TestAddEventListener timed out waiting on events")
+-
+- fmt.Printf("%s,\"%s\"\n", s.Id, s.Name)
- }
- }
-}
-
--func checkEvent(index int, event *APIEvents) error {
-- if event.ID != "dfdf82bd3881" {
-- return fmt.Errorf("event ID did not match. Expected dfdf82bd3881 got %s", event.ID)
-- }
-- if event.From != "base:latest" {
-- return fmt.Errorf("event from did not match. Expected base:latest got %s", event.From)
-- }
-- var status string
-- switch index {
-- case 1:
-- status = "create"
-- case 2:
-- status = "start"
-- case 3:
-- status = "stop"
-- case 4:
-- status = "destroy"
+-func tryFullDetails(api gophercloud.CloudServersProvider) {
+- servers, err := api.ListServers()
+- if err != nil {
+- panic(err)
- }
-- if event.Status != status {
-- return fmt.Errorf("event status did not match. Expected %s got %s", status, event.Status)
+-
+- if !*quiet {
+- fmt.Println("Id,Name,AccessIPv4,Status,Progress")
+- for _, s := range servers {
+- fmt.Printf("%s,\"%s\",%s,%s,%d\n", s.Id, s.Name, s.AccessIPv4, s.Status, s.Progress)
+- }
- }
-- return nil
-}
-diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/example_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/example_test.go
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/03-get-server-details.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/03-get-server-details.go
deleted file mode 100644
-index 8c2c719..0000000
---- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/example_test.go
+index 01140a9..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/03-get-server-details.go
+++ /dev/null
-@@ -1,168 +0,0 @@
--// Copyright 2014 go-dockerclient authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
+@@ -1,134 +0,0 @@
+-// +build acceptance,old
-
--package docker_test
+-package main
-
-import (
-- "archive/tar"
-- "bytes"
+- "flag"
- "fmt"
-- "io"
-- "log"
-- "time"
--
-- "github.com/fsouza/go-dockerclient"
+- "github.com/rackspace/gophercloud"
+- "os"
+- "github.com/racker/perigee"
-)
-
--func ExampleClient_AttachToContainer() {
-- client, err := docker.NewClient("http://localhost:4243")
-- if err != nil {
-- log.Fatal(err)
-- }
-- client.SkipServerVersionCheck = true
-- // Reading logs from container a84849 and sending them to buf.
-- var buf bytes.Buffer
-- err = client.AttachToContainer(docker.AttachToContainerOptions{
-- Container: "a84849",
-- OutputStream: &buf,
-- Logs: true,
-- Stdout: true,
-- Stderr: true,
-- })
-- if err != nil {
-- log.Fatal(err)
-- }
-- log.Println(buf.String())
-- buf.Reset()
-- err = client.AttachToContainer(docker.AttachToContainerOptions{
-- Container: "a84849",
-- OutputStream: &buf,
-- Stdout: true,
-- Stream: true,
-- })
-- if err != nil {
-- log.Fatal(err)
-- }
-- log.Println(buf.String())
--}
+-var id = flag.String("i", "", "Server ID to get info on. Defaults to first server in your account if unspecified.")
+-var rgn = flag.String("r", "", "Datacenter region. Leave blank for default region.")
+-var quiet = flag.Bool("quiet", false, "Run quietly, for acceptance testing. $? non-zero if issue.")
-
--func ExampleClient_CopyFromContainer() {
-- client, err := docker.NewClient("http://localhost:4243")
-- if err != nil {
-- log.Fatal(err)
-- }
-- cid := "a84849"
-- var buf bytes.Buffer
-- filename := "/tmp/output.txt"
-- err = client.CopyFromContainer(docker.CopyFromContainerOptions{
-- Container: cid,
-- Resource: filename,
-- OutputStream: &buf,
+-func main() {
+- flag.Parse()
+-
+- resultCode := 0
+- withIdentity(false, func(auth gophercloud.AccessProvider) {
+- withServerApi(auth, func(servers gophercloud.CloudServersProvider) {
+- var (
+- err error
+- serverId string
+- deleteAfterwards bool
+- )
+-
+- // Figure out which server to provide server details for.
+- if *id == "" {
+- deleteAfterwards, serverId, err = locateAServer(servers)
+- if err != nil {
+- panic(err)
+- }
+- if deleteAfterwards {
+- defer servers.DeleteServerById(serverId)
+- }
+- } else {
+- serverId = *id
+- }
+-
+- // Grab server details by ID, and provide a report.
+- s, err := servers.ServerById(serverId)
+- if err != nil {
+- panic(err)
+- }
+-
+- configs := []string{
+- "Access IPv4: %s\n",
+- "Access IPv6: %s\n",
+- " Created: %s\n",
+- " Flavor: %s\n",
+- " Host ID: %s\n",
+- " ID: %s\n",
+- " Image: %s\n",
+- " Name: %s\n",
+- " Progress: %s\n",
+- " Status: %s\n",
+- " Tenant ID: %s\n",
+- " Updated: %s\n",
+- " User ID: %s\n",
+- }
+-
+- values := []string{
+- s.AccessIPv4,
+- s.AccessIPv6,
+- s.Created,
+- s.Flavor.Id,
+- s.HostId,
+- s.Id,
+- s.Image.Id,
+- s.Name,
+- fmt.Sprintf("%d", s.Progress),
+- s.Status,
+- s.TenantId,
+- s.Updated,
+- s.UserId,
+- }
+-
+- if !*quiet {
+- fmt.Println("Server info:")
+- for i, _ := range configs {
+- fmt.Printf(configs[i], values[i])
+- }
+- }
+- })
+-
+- // Negative test -- We should absolutely never panic for a server that doesn't exist.
+- withServerApi(auth, func(servers gophercloud.CloudServersProvider) {
+- _, err := servers.ServerById(randomString("garbage", 32))
+- if err == nil {
+- fmt.Printf("Expected a 404 response when looking for a server known not to exist\n")
+- resultCode = 1
+- }
+- perigeeError, ok := err.(*perigee.UnexpectedResponseCodeError)
+- if !ok {
+- fmt.Printf("Unexpected error type\n")
+- resultCode = 1
+- } else {
+- if perigeeError.Actual != 404 {
+- fmt.Printf("Expected a 404 error code\n")
+- }
+- }
+- })
- })
-- if err != nil {
-- log.Fatalf("Error while copying from %s: %s\n", cid, err)
-- }
-- content := new(bytes.Buffer)
-- r := bytes.NewReader(buf.Bytes())
-- tr := tar.NewReader(r)
-- tr.Next()
-- if err != nil && err != io.EOF {
-- log.Fatal(err)
-- }
-- if _, err := io.Copy(content, tr); err != nil {
-- log.Fatal(err)
-- }
-- log.Println(buf.String())
+- os.Exit(resultCode)
-}
-
--func ExampleClient_BuildImage() {
-- client, err := docker.NewClient("http://localhost:4243")
+-// locateAServer queries the set of servers owned by the user. If at least one
+-// exists, the first found is picked, and its ID is returned. Otherwise, a new
+-// server will be created, and its ID returned.
+-//
+-// deleteAfter will be true if the caller should schedule a call to DeleteServerById()
+-// to clean up.
+-func locateAServer(servers gophercloud.CloudServersProvider) (deleteAfter bool, id string, err error) {
+- ss, err := servers.ListServers()
- if err != nil {
-- log.Fatal(err)
-- }
--
-- t := time.Now()
-- inputbuf, outputbuf := bytes.NewBuffer(nil), bytes.NewBuffer(nil)
-- tr := tar.NewWriter(inputbuf)
-- tr.WriteHeader(&tar.Header{Name: "Dockerfile", Size: 10, ModTime: t, AccessTime: t, ChangeTime: t})
-- tr.Write([]byte("FROM base\n"))
-- tr.Close()
-- opts := docker.BuildImageOptions{
-- Name: "test",
-- InputStream: inputbuf,
-- OutputStream: outputbuf,
-- }
-- if err := client.BuildImage(opts); err != nil {
-- log.Fatal(err)
+- return false, "", err
- }
--}
-
--func ExampleClient_ListenEvents() {
-- client, err := docker.NewClient("http://localhost:4243")
-- if err != nil {
-- log.Fatal(err)
+- if len(ss) > 0 {
+- // We could just cheat and dump the server details from ss[0].
+- // But, that tests ListServers(), and not ServerById(). So, we
+- // elect not to cheat.
+- return false, ss[0].Id, nil
- }
-
-- listener := make(chan *docker.APIEvents)
-- err = client.AddEventListener(listener)
+- serverId, err := createServer(servers, "", "", "", "")
- if err != nil {
-- log.Fatal(err)
+- return false, "", err
- }
+- err = waitForServerState(servers, serverId, "ACTIVE")
+- return true, serverId, err
+-}
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/04-create-server.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/04-create-server.go
+deleted file mode 100644
+index 03fd606..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/04-create-server.go
++++ /dev/null
+@@ -1,47 +0,0 @@
+-// +build acceptance,old
-
-- defer func() {
--
-- err = client.RemoveEventListener(listener)
-- if err != nil {
-- log.Fatal(err)
-- }
+-package main
-
-- }()
+-import (
+- "flag"
+- "fmt"
+- "github.com/rackspace/gophercloud"
+-)
-
-- timeout := time.After(1 * time.Second)
+-var region, serverName, imageRef, flavorRef *string
+-var adminPass = flag.String("a", "", "Administrator password (auto-assigned if none)")
+-var quiet = flag.Bool("quiet", false, "Quiet mode for acceptance tests. $? non-zero if error.")
-
-- for {
-- select {
-- case msg := <-listener:
-- log.Println(msg)
-- case <-timeout:
-- break
-- }
-- }
+-func configure() {
+- region = flag.String("r", "", "Region in which to create the server. Leave blank for provider-default region.")
+- serverName = flag.String("n", randomString("ACPTTEST--", 16), "Server name (what you see in the control panel)")
+- imageRef = flag.String("i", "", "ID of image to deploy onto the server")
+- flavorRef = flag.String("f", "", "Flavor of server to deploy image upon")
-
+- flag.Parse()
-}
-
--func ExampleEnv_Map() {
-- e := docker.Env([]string{"A=1", "B=2", "C=3"})
-- envs := e.Map()
-- for k, v := range envs {
-- fmt.Printf("%s=%q\n", k, v)
-- }
--}
+-func main() {
+- configure()
-
--func ExampleEnv_SetJSON() {
-- type Person struct {
-- Name string
-- Age int
-- }
-- p := Person{Name: "Gopher", Age: 4}
-- var e docker.Env
-- err := e.SetJSON("person", p)
-- if err != nil {
-- log.Fatal(err)
-- }
--}
+- withIdentity(false, func(auth gophercloud.AccessProvider) {
+- withServerApi(auth, func(servers gophercloud.CloudServersProvider) {
+- _, err := createServer(servers, *imageRef, *flavorRef, *serverName, *adminPass)
+- if err != nil {
+- panic(err)
+- }
-
--func ExampleEnv_GetJSON() {
-- type Person struct {
-- Name string
-- Age int
-- }
-- p := Person{Name: "Gopher", Age: 4}
-- var e docker.Env
-- e.Set("person", `{"name":"Gopher","age":4}`)
-- err := e.GetJSON("person", &p)
-- if err != nil {
-- log.Fatal(err)
-- }
+- allServers, err := servers.ListServers()
+- if err != nil {
+- panic(err)
+- }
+-
+- if !*quiet {
+- fmt.Printf("ID,Name,Status,Progress\n")
+- for _, i := range allServers {
+- fmt.Printf("%s,\"%s\",%s,%d\n", i.Id, i.Name, i.Status, i.Progress)
+- }
+- }
+- })
+- })
-}
-diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/exec.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/exec.go
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/05-list-images.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/05-list-images.go
deleted file mode 100644
-index 62a0a80..0000000
---- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/exec.go
+index 5ead18b..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/05-list-images.go
+++ /dev/null
-@@ -1,126 +0,0 @@
--// Copyright 2014 go-dockerclient authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--// Docs can currently be found at https://github.com/docker/docker/blob/master/docs/sources/reference/api/docker_remote_api_v1.15.md#exec-create
+@@ -1,32 +0,0 @@
+-// +build acceptance,old
-
--package docker
+-package main
-
-import (
-- "encoding/json"
+- "flag"
- "fmt"
-- "io"
-- "net/http"
-- "net/url"
-- "strconv"
+- "github.com/rackspace/gophercloud"
-)
-
--// CreateExecOptions specify parameters to the CreateExecContainer function.
--//
--// See http://goo.gl/8izrzI for more details
--type CreateExecOptions struct {
-- AttachStdin bool `json:"AttachStdin,omitempty" yaml:"AttachStdin,omitempty"`
-- AttachStdout bool `json:"AttachStdout,omitempty" yaml:"AttachStdout,omitempty"`
-- AttachStderr bool `json:"AttachStderr,omitempty" yaml:"AttachStderr,omitempty"`
-- Tty bool `json:"Tty,omitempty" yaml:"Tty,omitempty"`
-- Cmd []string `json:"Cmd,omitempty" yaml:"Cmd,omitempty"`
-- Container string `json:"Container,omitempty" yaml:"Container,omitempty"`
--}
+-var quiet = flag.Bool("quiet", false, "Quiet mode for acceptance testing. $? non-zero on error though.")
+-var rgn = flag.String("r", "", "Datacenter region to interrogate. Leave blank for provider-default region.")
-
--// StartExecOptions specify parameters to the StartExecContainer function.
--//
--// See http://goo.gl/JW8Lxl for more details
--type StartExecOptions struct {
-- Detach bool `json:"Detach,omitempty" yaml:"Detach,omitempty"`
+-func main() {
+- flag.Parse()
-
-- Tty bool `json:"Tty,omitempty" yaml:"Tty,omitempty"`
+- withIdentity(false, func(auth gophercloud.AccessProvider) {
+- withServerApi(auth, func(servers gophercloud.CloudServersProvider) {
+- images, err := servers.ListImages()
+- if err != nil {
+- panic(err)
+- }
-
-- InputStream io.Reader `qs:"-"`
-- OutputStream io.Writer `qs:"-"`
-- ErrorStream io.Writer `qs:"-"`
+- if !*quiet {
+- fmt.Println("ID,Name,MinRam,MinDisk")
+- for _, image := range images {
+- fmt.Printf("%s,\"%s\",%d,%d\n", image.Id, image.Name, image.MinRam, image.MinDisk)
+- }
+- }
+- })
+- })
+-}
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/06-list-flavors.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/06-list-flavors.go
+deleted file mode 100644
+index 65db7da..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/06-list-flavors.go
++++ /dev/null
+@@ -1,32 +0,0 @@
+-// +build acceptance,old
-
-- // Use raw terminal? Usually true when the container contains a TTY.
-- RawTerminal bool `qs:"-"`
+-package main
-
-- // If set, after a successful connect, a sentinel will be sent and then the
-- // client will block on receive before continuing.
-- //
-- // It must be an unbuffered channel. Using a buffered channel can lead
-- // to unexpected behavior.
-- Success chan struct{} `json:"-"`
--}
+-import (
+- "flag"
+- "fmt"
+- "github.com/rackspace/gophercloud"
+-)
-
--type Exec struct {
-- Id string `json:"Id,omitempty" yaml:"Id,omitempty"`
--}
+-var quiet = flag.Bool("quiet", false, "Quiet mode for acceptance testing. $? non-zero on error though.")
+-var rgn = flag.String("r", "", "Datacenter region to interrogate. Leave blank for provider-default region.")
-
--// CreateExec sets up an exec instance in a running container `id`, returning the exec
--// instance, or an error in case of failure.
--//
--// See http://goo.gl/8izrzI for more details
--func (c *Client) CreateExec(opts CreateExecOptions) (*Exec, error) {
-- path := fmt.Sprintf("/containers/%s/exec", opts.Container)
-- body, status, err := c.do("POST", path, opts)
-- if status == http.StatusNotFound {
-- return nil, &NoSuchContainer{ID: opts.Container}
-- }
-- if err != nil {
-- return nil, err
-- }
-- var exec Exec
-- err = json.Unmarshal(body, &exec)
-- if err != nil {
-- return nil, err
-- }
+-func main() {
+- flag.Parse()
-
-- return &exec, nil
+- withIdentity(false, func(auth gophercloud.AccessProvider) {
+- withServerApi(auth, func(servers gophercloud.CloudServersProvider) {
+- flavors, err := servers.ListFlavors()
+- if err != nil {
+- panic(err)
+- }
+-
+- if !*quiet {
+- fmt.Println("ID,Name,MinRam,MinDisk")
+- for _, f := range flavors {
+- fmt.Printf("%s,\"%s\",%d,%d\n", f.Id, f.Name, f.Ram, f.Disk)
+- }
+- }
+- })
+- })
-}
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/07-change-admin-password.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/07-change-admin-password.go
+deleted file mode 100644
+index 880fbe8..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/07-change-admin-password.go
++++ /dev/null
+@@ -1,49 +0,0 @@
+-// +build acceptance,old
-
--// Starts a previously set up exec instance id. If opts.Detach is true, it returns
--// after starting the exec command. Otherwise, it sets up an interactive session
--// with the exec command.
--//
--// See http://goo.gl/JW8Lxl for more details
--func (c *Client) StartExec(id string, opts StartExecOptions) error {
-- if id == "" {
-- return &NoSuchExec{ID: id}
-- }
+-package main
-
-- path := fmt.Sprintf("/exec/%s/start", id)
+-import (
+- "flag"
+- "fmt"
+- "github.com/rackspace/gophercloud"
+-)
-
-- if opts.Detach {
-- _, status, err := c.do("POST", path, opts)
-- if status == http.StatusNotFound {
-- return &NoSuchExec{ID: id}
-- }
-- if err != nil {
-- return err
-- }
-- return nil
-- }
+-var quiet = flag.Bool("quiet", false, "Quiet mode, for acceptance testing. $? still indicates errors though.")
+-var serverId = flag.String("i", "", "ID of server whose admin password is to be changed.")
+-var newPass = flag.String("p", "", "New password for the server.")
-
-- return c.hijack("POST", path, opts.Success, opts.RawTerminal, opts.InputStream, opts.ErrorStream, opts.OutputStream, opts)
--}
+-func main() {
+- flag.Parse()
-
--// Resizes the tty session used by the exec command id. This API is valid only
--// if Tty was specified as part of creating and starting the exec command.
--//
--// See http://goo.gl/YDSx1f for more details
--func (c *Client) ResizeExecTTY(id string, height, width int) error {
-- params := make(url.Values)
-- params.Set("h", strconv.Itoa(height))
-- params.Set("w", strconv.Itoa(width))
+- withIdentity(false, func(acc gophercloud.AccessProvider) {
+- withServerApi(acc, func(api gophercloud.CloudServersProvider) {
+- // If user doesn't explicitly provide a server ID, create one dynamically.
+- if *serverId == "" {
+- var err error
+- *serverId, err = createServer(api, "", "", "", "")
+- if err != nil {
+- panic(err)
+- }
+- waitForServerState(api, *serverId, "ACTIVE")
+- }
-
-- path := fmt.Sprintf("/exec/%s/resize?%s", id, params.Encode())
-- _, _, err := c.do("POST", path, nil)
-- return err
--}
+- // If no password is provided, create one dynamically.
+- if *newPass == "" {
+- *newPass = randomString("", 16)
+- }
-
--// NoSuchExec is the error returned when a given exec instance does not exist.
--type NoSuchExec struct {
-- ID string
--}
+- // Submit the request for changing the admin password.
+- // Note that we don't verify this actually completes;
+- // doing so is beyond the scope of the SDK, and should be
+- // the responsibility of your specific OpenStack provider.
+- err := api.SetAdminPassword(*serverId, *newPass)
+- if err != nil {
+- panic(err)
+- }
-
--func (err *NoSuchExec) Error() string {
-- return "No such exec instance: " + err.ID
+- if !*quiet {
+- fmt.Println("Password change request submitted.")
+- }
+- })
+- })
-}
-diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/exec_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/exec_test.go
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/08-reauthentication.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/08-reauthentication.go
deleted file mode 100644
-index 70fa64b..0000000
---- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/exec_test.go
+index c46f5bb..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/08-reauthentication.go
+++ /dev/null
-@@ -1,128 +0,0 @@
--// Copyright 2014 go-dockerclient authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
+@@ -1,50 +0,0 @@
+-// +build acceptance,old
-
--package docker
+-package main
-
-import (
-- "bytes"
-- "encoding/json"
-- "net/http"
-- "net/http/httptest"
-- "net/url"
-- "strings"
-- "testing"
+- "flag"
+- "fmt"
+- "github.com/rackspace/gophercloud"
-)
-
--func TestExecCreate(t *testing.T) {
-- jsonContainer := `{"Id": "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"}`
-- var expected struct{ Id string }
-- err := json.Unmarshal([]byte(jsonContainer), &expected)
-- if err != nil {
-- t.Fatal(err)
-- }
-- fakeRT := &FakeRoundTripper{message: jsonContainer, status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- config := CreateExecOptions{
-- Container: "test",
-- AttachStdin: true,
-- AttachStdout: true,
-- AttachStderr: false,
-- Tty: false,
-- Cmd: []string{"touch", "/tmp/file"},
-- }
-- execObj, err := client.CreateExec(config)
-- if err != nil {
-- t.Fatal(err)
-- }
-- expectedId := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
-- if execObj.Id != expectedId {
-- t.Errorf("ExecCreate: wrong ID. Want %q. Got %q.", expectedId, execObj.Id)
-- }
-- req := fakeRT.requests[0]
-- if req.Method != "POST" {
-- t.Errorf("ExecCreate: wrong HTTP method. Want %q. Got %q.", "POST", req.Method)
-- }
-- expectedURL, _ := url.Parse(client.getURL("/containers/test/exec"))
-- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
-- t.Errorf("ExecCreate: Wrong path in request. Want %q. Got %q.", expectedURL.Path, gotPath)
-- }
-- var gotBody struct{ Id string }
-- err = json.NewDecoder(req.Body).Decode(&gotBody)
-- if err != nil {
-- t.Fatal(err)
-- }
--}
+-var quiet = flag.Bool("quiet", false, "Quiet mode for acceptance testing. $? non-zero on error though.")
+-var rgn = flag.String("r", "", "Datacenter region to interrogate. Leave blank for provider-default region.")
-
--func TestExecStartDetached(t *testing.T) {
-- execId := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
-- fakeRT := &FakeRoundTripper{status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- config := StartExecOptions{
-- Detach: true,
-- }
-- err := client.StartExec(execId, config)
-- if err != nil {
-- t.Fatal(err)
-- }
-- req := fakeRT.requests[0]
-- if req.Method != "POST" {
-- t.Errorf("ExecStart: wrong HTTP method. Want %q. Got %q.", "POST", req.Method)
-- }
-- expectedURL, _ := url.Parse(client.getURL("/exec/" + execId + "/start"))
-- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
-- t.Errorf("ExecCreate: Wrong path in request. Want %q. Got %q.", expectedURL.Path, gotPath)
-- }
-- t.Log(req.Body)
-- var gotBody struct{ Detach bool }
-- err = json.NewDecoder(req.Body).Decode(&gotBody)
-- if err != nil {
-- t.Fatal(err)
-- }
-- if !gotBody.Detach {
-- t.Fatal("Expected Detach in StartExecOptions to be true")
-- }
--}
+-func main() {
+- flag.Parse()
-
--func TestExecStartAndAttach(t *testing.T) {
-- var reader = strings.NewReader("send value")
-- var req http.Request
-- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-- w.Write([]byte{1, 0, 0, 0, 0, 0, 0, 5})
-- w.Write([]byte("hello"))
-- req = *r
-- }))
-- defer server.Close()
-- client, _ := NewClient(server.URL)
-- client.SkipServerVersionCheck = true
-- var stdout, stderr bytes.Buffer
-- success := make(chan struct{})
-- execId := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
-- opts := StartExecOptions{
-- OutputStream: &stdout,
-- ErrorStream: &stderr,
-- InputStream: reader,
-- RawTerminal: true,
-- Success: success,
-- }
-- go client.StartExec(execId, opts)
-- <-success
--}
+- // Invoke withIdentity such that re-auth is enabled.
+- withIdentity(true, func(auth gophercloud.AccessProvider) {
+- token1 := auth.AuthToken()
+-
+- withServerApi(auth, func(servers gophercloud.CloudServersProvider) {
+- // Just to confirm everything works, we should be able to list images without error.
+- _, err := servers.ListImages()
+- if err != nil {
+- panic(err)
+- }
+-
+- // Revoke our current authentication token.
+- auth.Revoke(auth.AuthToken())
+-
+- // Attempt to list images again. This should _succeed_, because we enabled re-authentication.
+- _, err = servers.ListImages()
+- if err != nil {
+- panic(err)
+- }
+-
+- // However, our new authentication token should differ.
+- token2 := auth.AuthToken()
-
--func TestExecResize(t *testing.T) {
-- execId := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
-- fakeRT := &FakeRoundTripper{status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- err := client.ResizeExecTTY(execId, 10, 20)
-- if err != nil {
-- t.Fatal(err)
-- }
-- req := fakeRT.requests[0]
-- if req.Method != "POST" {
-- t.Errorf("ExecStart: wrong HTTP method. Want %q. Got %q.", "POST", req.Method)
-- }
-- expectedURL, _ := url.Parse(client.getURL("/exec/" + execId + "/resize?h=10&w=20"))
-- if gotPath := req.URL.RequestURI(); gotPath != expectedURL.RequestURI() {
-- t.Errorf("ExecCreate: Wrong path in request. Want %q. Got %q.", expectedURL.Path, gotPath)
-- }
+- if !*quiet {
+- fmt.Println("Old authentication token: ", token1)
+- fmt.Println("New authentication token: ", token2)
+- }
+-
+- if token1 == token2 {
+- panic("Tokens should differ")
+- }
+- })
+- })
-}
-diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/image.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/image.go
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/09-resize-server.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/09-resize-server.go
deleted file mode 100644
-index e1fbb23..0000000
---- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/image.go
+index a2ef3c8..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/09-resize-server.go
+++ /dev/null
-@@ -1,417 +0,0 @@
--// Copyright 2014 go-dockerclient authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
+@@ -1,102 +0,0 @@
+-// +build acceptance,old
-
--package docker
+-package main
-
-import (
-- "bytes"
-- "encoding/base64"
-- "encoding/json"
-- "errors"
+- "flag"
- "fmt"
-- "io"
-- "io/ioutil"
-- "net/http"
-- "net/url"
-- "os"
+- "github.com/rackspace/gophercloud"
- "time"
-)
-
--// APIImages represent an image returned in the ListImages call.
--type APIImages struct {
-- ID string `json:"Id" yaml:"Id"`
-- RepoTags []string `json:"RepoTags,omitempty" yaml:"RepoTags,omitempty"`
-- Created int64 `json:"Created,omitempty" yaml:"Created,omitempty"`
-- Size int64 `json:"Size,omitempty" yaml:"Size,omitempty"`
-- VirtualSize int64 `json:"VirtualSize,omitempty" yaml:"VirtualSize,omitempty"`
-- ParentId string `json:"ParentId,omitempty" yaml:"ParentId,omitempty"`
--}
+-var quiet = flag.Bool("quiet", false, "Quiet mode, for acceptance testing. $? still indicates errors though.")
-
--type Image struct {
-- ID string `json:"Id" yaml:"Id"`
-- Parent string `json:"Parent,omitempty" yaml:"Parent,omitempty"`
-- Comment string `json:"Comment,omitempty" yaml:"Comment,omitempty"`
-- Created time.Time `json:"Created,omitempty" yaml:"Created,omitempty"`
-- Container string `json:"Container,omitempty" yaml:"Container,omitempty"`
-- ContainerConfig Config `json:"ContainerConfig,omitempty" yaml:"ContainerConfig,omitempty"`
-- DockerVersion string `json:"DockerVersion,omitempty" yaml:"DockerVersion,omitempty"`
-- Author string `json:"Author,omitempty" yaml:"Author,omitempty"`
-- Config *Config `json:"Config,omitempty" yaml:"Config,omitempty"`
-- Architecture string `json:"Architecture,omitempty" yaml:"Architecture,omitempty"`
-- Size int64 `json:"Size,omitempty" yaml:"Size,omitempty"`
--}
+-func main() {
+- flag.Parse()
-
--// ImageHistory represent a layer in an image's history returned by the
--// ImageHistory call.
--type ImageHistory struct {
-- ID string `json:"Id" yaml:"Id"`
-- Tags []string `json:"Tags,omitempty" yaml:"Tags,omitempty"`
-- Created int64 `json:"Created,omitempty" yaml:"Created,omitempty"`
-- CreatedBy string `json:"CreatedBy,omitempty" yaml:"CreatedBy,omitempty"`
-- Size int64 `json:"Size,omitempty" yaml:"Size,omitempty"`
--}
+- withIdentity(false, func(acc gophercloud.AccessProvider) {
+- withServerApi(acc, func(api gophercloud.CloudServersProvider) {
+- // These tests are going to take some time to complete.
+- // So, we'll do two tests at the same time to help amortize test time.
+- done := make(chan bool)
+- go resizeRejectTest(api, done)
+- go resizeAcceptTest(api, done)
+- _ = <-done
+- _ = <-done
-
--type ImagePre012 struct {
-- ID string `json:"id"`
-- Parent string `json:"parent,omitempty"`
-- Comment string `json:"comment,omitempty"`
-- Created time.Time `json:"created"`
-- Container string `json:"container,omitempty"`
-- ContainerConfig Config `json:"container_config,omitempty"`
-- DockerVersion string `json:"docker_version,omitempty"`
-- Author string `json:"author,omitempty"`
-- Config *Config `json:"config,omitempty"`
-- Architecture string `json:"architecture,omitempty"`
-- Size int64 `json:"size,omitempty"`
+- if !*quiet {
+- fmt.Println("Done.")
+- }
+- })
+- })
-}
-
--var (
-- // ErrNoSuchImage is the error returned when the image does not exist.
-- ErrNoSuchImage = errors.New("no such image")
--
-- // ErrMissingRepo is the error returned when the remote repository is
-- // missing.
-- ErrMissingRepo = errors.New("missing remote repository e.g. 'github.com/user/repo'")
+-// Perform the resize test, but reject the resize request.
+-func resizeRejectTest(api gophercloud.CloudServersProvider, done chan bool) {
+- withServer(api, func(id string) {
+- newFlavorId := findAlternativeFlavor()
+- err := api.ResizeServer(id, randomString("ACPTTEST", 24), newFlavorId, "")
+- if err != nil {
+- panic(err)
+- }
-
-- // ErrMissingOutputStream is the error returned when no output stream
-- // is provided to some calls, like BuildImage.
-- ErrMissingOutputStream = errors.New("missing output stream")
--)
+- waitForServerState(api, id, "VERIFY_RESIZE")
-
--// ListImages returns the list of available images in the server.
--//
--// See http://goo.gl/VmcR6v for more details.
--func (c *Client) ListImages(all bool) ([]APIImages, error) {
-- path := "/images/json?all="
-- if all {
-- path += "1"
-- } else {
-- path += "0"
-- }
-- body, _, err := c.do("GET", path, nil)
-- if err != nil {
-- return nil, err
-- }
-- var images []APIImages
-- err = json.Unmarshal(body, &images)
-- if err != nil {
-- return nil, err
-- }
-- return images, nil
+- err = api.RevertResize(id)
+- if err != nil {
+- panic(err)
+- }
+- })
+- done <- true
-}
-
--// ImageHistory returns the history of the image by its name or ID.
--//
--// See http://goo.gl/2oJmNs for more details.
--func (c *Client) ImageHistory(name string) ([]ImageHistory, error) {
-- body, status, err := c.do("GET", "/images/"+name+"/history", nil)
-- if status == http.StatusNotFound {
-- return nil, ErrNoSuchImage
-- }
-- if err != nil {
-- return nil, err
-- }
-- var history []ImageHistory
-- err = json.Unmarshal(body, &history)
-- if err != nil {
-- return nil, err
-- }
-- return history, nil
--}
+-// Perform the resize test, but accept the resize request.
+-func resizeAcceptTest(api gophercloud.CloudServersProvider, done chan bool) {
+- withServer(api, func(id string) {
+- newFlavorId := findAlternativeFlavor()
+- err := api.ResizeServer(id, randomString("ACPTTEST", 24), newFlavorId, "")
+- if err != nil {
+- panic(err)
+- }
-
--// RemoveImage removes an image by its name or ID.
--//
--// See http://goo.gl/znj0wM for more details.
--func (c *Client) RemoveImage(name string) error {
-- _, status, err := c.do("DELETE", "/images/"+name, nil)
-- if status == http.StatusNotFound {
-- return ErrNoSuchImage
-- }
-- return err
+- waitForServerState(api, id, "VERIFY_RESIZE")
+-
+- err = api.ConfirmResize(id)
+- if err != nil {
+- panic(err)
+- }
+- })
+- done <- true
-}
-
--// InspectImage returns an image by its name or ID.
--//
--// See http://goo.gl/Q112NY for more details.
--func (c *Client) InspectImage(name string) (*Image, error) {
-- body, status, err := c.do("GET", "/images/"+name+"/json", nil)
-- if status == http.StatusNotFound {
-- return nil, ErrNoSuchImage
-- }
+-func withServer(api gophercloud.CloudServersProvider, f func(string)) {
+- id, err := createServer(api, "", "", "", "")
- if err != nil {
-- return nil, err
+- panic(err)
- }
-
-- var image Image
--
-- // if the caller elected to skip checking the server's version, assume it's the latest
-- if c.SkipServerVersionCheck || c.expectedApiVersion.GreaterThanOrEqualTo(apiVersion_1_12) {
-- err = json.Unmarshal(body, &image)
+- for {
+- s, err := api.ServerById(id)
- if err != nil {
-- return nil, err
+- panic(err)
- }
-- } else {
-- var imagePre012 ImagePre012
-- err = json.Unmarshal(body, &imagePre012)
-- if err != nil {
-- return nil, err
+- if s.Status == "ACTIVE" {
+- break
- }
--
-- image.ID = imagePre012.ID
-- image.Parent = imagePre012.Parent
-- image.Comment = imagePre012.Comment
-- image.Created = imagePre012.Created
-- image.Container = imagePre012.Container
-- image.ContainerConfig = imagePre012.ContainerConfig
-- image.DockerVersion = imagePre012.DockerVersion
-- image.Author = imagePre012.Author
-- image.Config = imagePre012.Config
-- image.Architecture = imagePre012.Architecture
-- image.Size = imagePre012.Size
+- time.Sleep(10 * time.Second)
- }
-
-- return &image, nil
+- f(id)
+-
+- // I've learned that resizing an instance can fail if a delete request
+- // comes in prior to its completion. This ends up leaving the server
+- // in an error state, and neither the resize NOR the delete complete.
+- // This is a bug in OpenStack, as far as I'm concerned, but thankfully,
+- // there's an easy work-around -- just wait for your server to return to
+- // active state first!
+- waitForServerState(api, id, "ACTIVE")
+- err = api.DeleteServerById(id)
+- if err != nil {
+- panic(err)
+- }
-}
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/10-reboot-server.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/10-reboot-server.go
+deleted file mode 100644
+index ba6215a..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/10-reboot-server.go
++++ /dev/null
+@@ -1,45 +0,0 @@
+-// +build acceptance,old
-
--// PushImageOptions represents options to use in the PushImage method.
--//
--// See http://goo.gl/pN8A3P for more details.
--type PushImageOptions struct {
-- // Name of the image
-- Name string
+-package main
-
-- // Tag of the image
-- Tag string
+-import (
+- "flag"
+- "fmt"
+- "github.com/rackspace/gophercloud"
+-)
-
-- // Registry server to push the image
-- Registry string
+-var quiet = flag.Bool("quiet", false, "Quiet mode, for acceptance testing. $? still indicates errors though.")
-
-- OutputStream io.Writer `qs:"-"`
-- RawJSONStream bool `qs:"-"`
--}
+-func main() {
+- flag.Parse()
-
--// AuthConfiguration represents authentication options to use in the PushImage
--// method. It represents the authentication in the Docker index server.
--type AuthConfiguration struct {
-- Username string `json:"username,omitempty"`
-- Password string `json:"password,omitempty"`
-- Email string `json:"email,omitempty"`
+- withIdentity(false, func(acc gophercloud.AccessProvider) {
+- withServerApi(acc, func(servers gophercloud.CloudServersProvider) {
+- log("Creating server")
+- serverId, err := createServer(servers, "", "", "", "")
+- if err != nil {
+- panic(err)
+- }
+- waitForServerState(servers, serverId, "ACTIVE")
+-
+- log("Soft-rebooting server")
+- servers.RebootServer(serverId, false)
+- waitForServerState(servers, serverId, "REBOOT")
+- waitForServerState(servers, serverId, "ACTIVE")
+-
+- log("Hard-rebooting server")
+- servers.RebootServer(serverId, true)
+- waitForServerState(servers, serverId, "HARD_REBOOT")
+- waitForServerState(servers, serverId, "ACTIVE")
+-
+- log("Done")
+- servers.DeleteServerById(serverId)
+- })
+- })
-}
-
--// PushImage pushes an image to a remote registry, logging progress to w.
--//
--// An empty instance of AuthConfiguration may be used for unauthenticated
--// pushes.
--//
--// See http://goo.gl/pN8A3P for more details.
--func (c *Client) PushImage(opts PushImageOptions, auth AuthConfiguration) error {
-- if opts.Name == "" {
-- return ErrNoSuchImage
+-func log(s string) {
+- if !*quiet {
+- fmt.Println(s)
- }
-- name := opts.Name
-- opts.Name = ""
-- path := "/images/" + name + "/push?" + queryString(&opts)
-- var headers = make(map[string]string)
-- var buf bytes.Buffer
-- json.NewEncoder(&buf).Encode(auth)
+-}
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/11-rescue-unrescue-server.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/11-rescue-unrescue-server.go
+deleted file mode 100644
+index 008ad9d..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/11-rescue-unrescue-server.go
++++ /dev/null
+@@ -1,52 +0,0 @@
+-// +build acceptance,old
-
-- headers["X-Registry-Auth"] = base64.URLEncoding.EncodeToString(buf.Bytes())
+-package main
-
-- return c.stream("POST", path, true, opts.RawJSONStream, headers, nil, opts.OutputStream, nil)
--}
+-import (
+- "flag"
+- "fmt"
+- "github.com/rackspace/gophercloud"
+-)
-
--// PullImageOptions present the set of options available for pulling an image
--// from a registry.
--//
--// See http://goo.gl/ACyYNS for more details.
--type PullImageOptions struct {
-- Repository string `qs:"fromImage"`
-- Registry string
-- Tag string
-- OutputStream io.Writer `qs:"-"`
-- RawJSONStream bool `qs:"-"`
+-var quiet = flag.Bool("quiet", false, "Quiet mode, for acceptance testing. $? still indicates errors though.")
+-
+-func main() {
+- flag.Parse()
+- withIdentity(false, func(acc gophercloud.AccessProvider) {
+- withServerApi(acc, func(servers gophercloud.CloudServersProvider) {
+- log("Creating server")
+- id, err := createServer(servers, "", "", "", "")
+- if err != nil {
+- panic(err)
+- }
+- waitForServerState(servers, id, "ACTIVE")
+- defer servers.DeleteServerById(id)
+-
+- log("Rescuing server")
+- adminPass, err := servers.RescueServer(id)
+- if err != nil {
+- panic(err)
+- }
+- log(" Admin password = " + adminPass)
+- if len(adminPass) < 1 {
+- panic("Empty admin password")
+- }
+- waitForServerState(servers, id, "RESCUE")
+-
+- log("Unrescuing server")
+- err = servers.UnrescueServer(id)
+- if err != nil {
+- panic(err)
+- }
+- waitForServerState(servers, id, "ACTIVE")
+-
+- log("Done")
+- })
+- })
-}
-
--// PullImage pulls an image from a remote registry, logging progress to w.
--//
--// See http://goo.gl/ACyYNS for more details.
--func (c *Client) PullImage(opts PullImageOptions, auth AuthConfiguration) error {
-- if opts.Repository == "" {
-- return ErrNoSuchImage
+-func log(s string) {
+- if !*quiet {
+- fmt.Println(s)
- }
+-}
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/12-update-server.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/12-update-server.go
+deleted file mode 100644
+index c0191f1..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/12-update-server.go
++++ /dev/null
+@@ -1,46 +0,0 @@
+-// +build acceptance,old
-
-- var headers = make(map[string]string)
-- var buf bytes.Buffer
-- json.NewEncoder(&buf).Encode(auth)
-- headers["X-Registry-Auth"] = base64.URLEncoding.EncodeToString(buf.Bytes())
+-package main
-
-- return c.createImage(queryString(&opts), headers, nil, opts.OutputStream, opts.RawJSONStream)
--}
+-import (
+- "flag"
+- "fmt"
+- "github.com/rackspace/gophercloud"
+-)
-
--func (c *Client) createImage(qs string, headers map[string]string, in io.Reader, w io.Writer, rawJSONStream bool) error {
-- path := "/images/create?" + qs
-- return c.stream("POST", path, true, rawJSONStream, headers, in, w, nil)
+-var quiet = flag.Bool("quiet", false, "Quiet mode, for acceptance testing. $? still indicates errors though.")
+-
+-func main() {
+- flag.Parse()
+- withIdentity(false, func(acc gophercloud.AccessProvider) {
+- withServerApi(acc, func(servers gophercloud.CloudServersProvider) {
+- log("Creating server")
+- id, err := createServer(servers, "", "", "", "")
+- if err != nil {
+- panic(err)
+- }
+- waitForServerState(servers, id, "ACTIVE")
+- defer servers.DeleteServerById(id)
+-
+- log("Updating name of server")
+- newName := randomString("ACPTTEST", 32)
+- newDetails, err := servers.UpdateServer(id, gophercloud.NewServerSettings{
+- Name: newName,
+- })
+- if err != nil {
+- panic(err)
+- }
+- if newDetails.Name != newName {
+- panic("Name change didn't appear to take")
+- }
+-
+- log("Done")
+- })
+- })
-}
-
--// LoadImageOptions represents the options for LoadImage Docker API Call
--//
--// See http://goo.gl/Y8NNCq for more details.
--type LoadImageOptions struct {
-- InputStream io.Reader
+-func log(s string) {
+- if !*quiet {
+- fmt.Println(s)
+- }
-}
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/13-rebuild-server.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/13-rebuild-server.go
+deleted file mode 100644
+index ae7e19f..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/13-rebuild-server.go
++++ /dev/null
+@@ -1,46 +0,0 @@
+-// +build acceptance,old
-
--// LoadImage imports a tarball docker image
--//
--// See http://goo.gl/Y8NNCq for more details.
--func (c *Client) LoadImage(opts LoadImageOptions) error {
-- return c.stream("POST", "/images/load", true, false, nil, opts.InputStream, nil, nil)
+-package main
+-
+-import (
+- "flag"
+- "fmt"
+- "github.com/rackspace/gophercloud"
+-)
+-
+-var quiet = flag.Bool("quiet", false, "Quiet mode, for acceptance testing. $? still indicates errors though.")
+-
+-func main() {
+- flag.Parse()
+- withIdentity(false, func(acc gophercloud.AccessProvider) {
+- withServerApi(acc, func(servers gophercloud.CloudServersProvider) {
+- log("Creating server")
+- id, err := createServer(servers, "", "", "", "")
+- if err != nil {
+- panic(err)
+- }
+- waitForServerState(servers, id, "ACTIVE")
+- defer servers.DeleteServerById(id)
+-
+- log("Rebuilding server")
+- newDetails, err := servers.RebuildServer(id, gophercloud.NewServer{
+- Name: randomString("ACPTTEST", 32),
+- ImageRef: findAlternativeImage(),
+- FlavorRef: findAlternativeFlavor(),
+- AdminPass: randomString("", 16),
+- })
+- if err != nil {
+- panic(err)
+- }
+- waitForServerState(servers, newDetails.Id, "ACTIVE")
+-
+- log("Done")
+- })
+- })
-}
-
--// ExportImageOptions represent the options for ExportImage Docker API call
--//
--// See http://goo.gl/mi6kvk for more details.
--type ExportImageOptions struct {
-- Name string
-- OutputStream io.Writer
+-func log(s string) {
+- if !*quiet {
+- fmt.Println(s)
+- }
-}
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/14-list-addresses.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/14-list-addresses.go
+deleted file mode 100644
+index 1d7d26b..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/14-list-addresses.go
++++ /dev/null
+@@ -1,66 +0,0 @@
+-// +build acceptance,old
-
--// ExportImage exports an image (as a tar file) into the stream
--//
--// See http://goo.gl/mi6kvk for more details.
--func (c *Client) ExportImage(opts ExportImageOptions) error {
-- return c.stream("GET", fmt.Sprintf("/images/%s/get", opts.Name), true, false, nil, nil, opts.OutputStream, nil)
--}
+-package main
-
--// ImportImageOptions present the set of informations available for importing
--// an image from a source file or the stdin.
--//
--// See http://goo.gl/PhBKnS for more details.
--type ImportImageOptions struct {
-- Repository string `qs:"repo"`
-- Source string `qs:"fromSrc"`
-- Tag string `qs:"tag"`
+-import (
+- "flag"
+- "fmt"
+- "github.com/rackspace/gophercloud"
+-)
-
-- InputStream io.Reader `qs:"-"`
-- OutputStream io.Writer `qs:"-"`
+-var quiet = flag.Bool("quiet", false, "Quiet mode, for acceptance testing. $? still indicates errors though.")
+-
+-func main() {
+- flag.Parse()
+- withIdentity(false, func(acc gophercloud.AccessProvider) {
+- withServerApi(acc, func(api gophercloud.CloudServersProvider) {
+- log("Creating server")
+- id, err := createServer(api, "", "", "", "")
+- if err != nil {
+- panic(err)
+- }
+- waitForServerState(api, id, "ACTIVE")
+- defer api.DeleteServerById(id)
+-
+- tryAllAddresses(id, api)
+- tryAddressesByNetwork("private", id, api)
+-
+- log("Done")
+- })
+- })
-}
-
--// ImportImage imports an image from a url, a file or stdin
--//
--// See http://goo.gl/PhBKnS for more details.
--func (c *Client) ImportImage(opts ImportImageOptions) error {
-- if opts.Repository == "" {
-- return ErrNoSuchImage
+-func tryAllAddresses(id string, api gophercloud.CloudServersProvider) {
+- log("Getting list of all addresses...")
+- addresses, err := api.ListAddresses(id)
+- if (err != nil) && (err != gophercloud.WarnUnauthoritative) {
+- panic(err)
- }
-- if opts.Source != "-" {
-- opts.InputStream = nil
+- if err == gophercloud.WarnUnauthoritative {
+- log("Uh oh -- got a response back, but it's not authoritative for some reason.")
- }
-- if opts.Source != "-" && !isURL(opts.Source) {
-- f, err := os.Open(opts.Source)
-- if err != nil {
-- return err
-- }
-- b, err := ioutil.ReadAll(f)
-- opts.InputStream = bytes.NewBuffer(b)
-- opts.Source = "-"
+- if !*quiet {
+- fmt.Println("Addresses:")
+- fmt.Printf("%+v\n", addresses)
- }
-- return c.createImage(queryString(&opts), nil, opts.InputStream, opts.OutputStream, false)
--}
--
--// BuildImageOptions present the set of informations available for building an
--// image from a tarfile with a Dockerfile in it.
--//
--// For more details about the Docker building process, see
--// http://goo.gl/tlPXPu.
--type BuildImageOptions struct {
-- Name string `qs:"t"`
-- NoCache bool `qs:"nocache"`
-- SuppressOutput bool `qs:"q"`
-- RmTmpContainer bool `qs:"rm"`
-- ForceRmTmpContainer bool `qs:"forcerm"`
-- InputStream io.Reader `qs:"-"`
-- OutputStream io.Writer `qs:"-"`
-- RawJSONStream bool `qs:"-"`
-- Remote string `qs:"remote"`
-}
-
--// BuildImage builds an image from a tarball's url or a Dockerfile in the input
--// stream.
--//
--// See http://goo.gl/wRsW76 for more details.
--func (c *Client) BuildImage(opts BuildImageOptions) error {
-- if opts.OutputStream == nil {
-- return ErrMissingOutputStream
+-func tryAddressesByNetwork(networkLabel string, id string, api gophercloud.CloudServersProvider) {
+- log("Getting list of addresses on", networkLabel, "network...")
+- network, err := api.ListAddressesByNetwork(id, networkLabel)
+- if (err != nil) && (err != gophercloud.WarnUnauthoritative) {
+- panic(err)
- }
-- var headers map[string]string
-- if opts.Remote != "" && opts.Name == "" {
-- opts.Name = opts.Remote
+- if err == gophercloud.WarnUnauthoritative {
+- log("Uh oh -- got a response back, but it's not authoritative for some reason.")
- }
-- if opts.InputStream != nil {
-- headers = map[string]string{"Content-Type": "application/tar"}
-- } else if opts.Remote == "" {
-- return ErrMissingRepo
+- for _, addr := range network[networkLabel] {
+- log("Address:", addr.Addr, " IPv", addr.Version)
- }
-- return c.stream("POST", fmt.Sprintf("/build?%s",
-- queryString(&opts)), true, opts.RawJSONStream, headers, opts.InputStream, opts.OutputStream, nil)
-}
-
--// TagImageOptions present the set of options to tag an image.
--//
--// See http://goo.gl/5g6qFy for more details.
--type TagImageOptions struct {
-- Repo string
-- Tag string
-- Force bool
+-func log(s ...interface{}) {
+- if !*quiet {
+- fmt.Println(s...)
+- }
-}
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/15-list-keypairs.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/15-list-keypairs.go
+deleted file mode 100644
+index 1a617ed..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/15-list-keypairs.go
++++ /dev/null
+@@ -1,32 +0,0 @@
+-// +build acceptance,old
-
--// TagImage adds a tag to the image identified by the given name.
--//
--// See http://goo.gl/5g6qFy for more details.
--func (c *Client) TagImage(name string, opts TagImageOptions) error {
-- if name == "" {
-- return ErrNoSuchImage
-- }
-- _, status, err := c.do("POST", fmt.Sprintf("/images/"+name+"/tag?%s",
-- queryString(&opts)), nil)
-- if status == http.StatusNotFound {
-- return ErrNoSuchImage
-- }
+-package main
-
-- return err
--}
+-import (
+- "flag"
+- "fmt"
+- "github.com/rackspace/gophercloud"
+-)
-
--func isURL(u string) bool {
-- p, err := url.Parse(u)
-- if err != nil {
-- return false
-- }
-- return p.Scheme == "http" || p.Scheme == "https"
--}
+-var quiet = flag.Bool("quiet", false, "Quiet mode for acceptance testing. $? non-zero on error though.")
+-var rgn = flag.String("r", "", "Datacenter region to interrogate. Leave blank for provider-default region.")
-
--// APIImageSearch reflect the result of a search on the dockerHub
--//
--// See http://goo.gl/xI5lLZ for more details.
--type APIImageSearch struct {
-- Description string `json:"description,omitempty" yaml:"description,omitempty"`
-- IsOfficial bool `json:"is_official,omitempty" yaml:"is_official,omitempty"`
-- IsAutomated bool `json:"is_automated,omitempty" yaml:"is_automated,omitempty"`
-- Name string `json:"name,omitempty" yaml:"name,omitempty"`
-- StarCount int `json:"star_count,omitempty" yaml:"star_count,omitempty"`
--}
+-func main() {
+- flag.Parse()
-
--// SearchImages search the docker hub with a specific given term.
--//
--// See http://goo.gl/xI5lLZ for more details.
--func (c *Client) SearchImages(term string) ([]APIImageSearch, error) {
-- body, _, err := c.do("GET", "/images/search?term="+term, nil)
-- if err != nil {
-- return nil, err
-- }
-- var searchResult []APIImageSearch
-- err = json.Unmarshal(body, &searchResult)
-- if err != nil {
-- return nil, err
-- }
-- return searchResult, nil
+- withIdentity(false, func(auth gophercloud.AccessProvider) {
+- withServerApi(auth, func(servers gophercloud.CloudServersProvider) {
+- keypairs, err := servers.ListKeyPairs()
+- if err != nil {
+- panic(err)
+- }
+-
+- if !*quiet {
+- fmt.Println("name,fingerprint,publickey")
+- for _, key := range keypairs {
+- fmt.Printf("%s,%s,%s\n", key.Name, key.FingerPrint, key.PublicKey)
+- }
+- }
+- })
+- })
-}
-diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/image_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/image_test.go
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/16-create-delete-keypair.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/16-create-delete-keypair.go
deleted file mode 100644
-index 5a7b2de..0000000
---- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/image_test.go
+index f59e51c..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/16-create-delete-keypair.go
+++ /dev/null
-@@ -1,861 +0,0 @@
--// Copyright 2014 go-dockerclient authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
+@@ -1,45 +0,0 @@
+-// +build acceptance,old
-
--package docker
+-package main
-
-import (
-- "bytes"
-- "encoding/base64"
-- "encoding/json"
-- "io/ioutil"
-- "net/http"
-- "net/url"
-- "os"
-- "reflect"
-- "strings"
-- "testing"
+- "flag"
+- "fmt"
+- "github.com/rackspace/gophercloud"
-)
-
--func newTestClient(rt *FakeRoundTripper) Client {
-- endpoint := "http://localhost:4243"
-- u, _ := parseEndpoint("http://localhost:4243")
-- client := Client{
-- HTTPClient: &http.Client{Transport: rt},
-- endpoint: endpoint,
-- endpointURL: u,
-- SkipServerVersionCheck: true,
-- }
-- return client
--}
+-var quiet = flag.Bool("quiet", false, "Quiet mode for acceptance testing. $? non-zero on error though.")
+-var rgn = flag.String("r", "", "Datacenter region to interrogate. Leave blank for provider-default region.")
-
--type stdoutMock struct {
-- *bytes.Buffer
--}
+-func main() {
+- flag.Parse()
-
--func (m stdoutMock) Close() error {
-- return nil
--}
+- withIdentity(false, func(auth gophercloud.AccessProvider) {
+- withServerApi(auth, func(servers gophercloud.CloudServersProvider) {
+- name := randomString("ACPTTEST", 16)
+- kp := gophercloud.NewKeyPair{
+- Name: name,
+- }
+- keypair, err := servers.CreateKeyPair(kp)
+- if err != nil {
+- panic(err)
+- }
+- if !*quiet {
+- fmt.Printf("%s,%s,%s\n", keypair.Name, keypair.FingerPrint, keypair.PublicKey)
+- }
-
--type stdinMock struct {
-- *bytes.Buffer
--}
+- keypair, err = servers.ShowKeyPair(name)
+- if err != nil {
+- panic(err)
+- }
+- if !*quiet {
+- fmt.Printf("%s,%s,%s\n", keypair.Name, keypair.FingerPrint, keypair.PublicKey)
+- }
-
--func (m stdinMock) Close() error {
-- return nil
+- err = servers.DeleteKeyPair(name)
+- if err != nil {
+- panic(err)
+- }
+- })
+- })
-}
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/17-create-delete-image.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/17-create-delete-image.go
+deleted file mode 100644
+index b3d80a3..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/17-create-delete-image.go
++++ /dev/null
+@@ -1,52 +0,0 @@
+-// +build acceptance,old
-
--func TestListImages(t *testing.T) {
-- body := `[
-- {
-- "Repository":"base",
-- "Tag":"ubuntu-12.10",
-- "Id":"b750fe79269d",
-- "Created":1364102658
-- },
-- {
-- "Repository":"base",
-- "Tag":"ubuntu-quantal",
-- "Id":"b750fe79269d",
-- "Created":1364102658
-- },
-- {
-- "RepoTag": [
-- "ubuntu:12.04",
-- "ubuntu:precise",
-- "ubuntu:latest"
-- ],
-- "Id": "8dbd9e392a964c",
-- "Created": 1365714795,
-- "Size": 131506275,
-- "VirtualSize": 131506275
-- },
-- {
-- "RepoTag": [
-- "ubuntu:12.10",
-- "ubuntu:quantal"
-- ],
-- "ParentId": "27cf784147099545",
-- "Id": "b750fe79269d2e",
-- "Created": 1364102658,
-- "Size": 24653,
-- "VirtualSize": 180116135
-- }
--]`
-- var expected []APIImages
-- err := json.Unmarshal([]byte(body), &expected)
-- if err != nil {
-- t.Fatal(err)
-- }
-- client := newTestClient(&FakeRoundTripper{message: body, status: http.StatusOK})
-- images, err := client.ListImages(false)
-- if err != nil {
-- t.Error(err)
-- }
-- if !reflect.DeepEqual(images, expected) {
-- t.Errorf("ListImages: Wrong return value. Want %#v. Got %#v.", expected, images)
-- }
--}
+-package main
-
--func TestListImagesParameters(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "null", status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- _, err := client.ListImages(false)
-- if err != nil {
-- t.Fatal(err)
-- }
-- req := fakeRT.requests[0]
-- if req.Method != "GET" {
-- t.Errorf("ListImages(false: Wrong HTTP method. Want GET. Got %s.", req.Method)
-- }
-- if all := req.URL.Query().Get("all"); all != "0" {
-- t.Errorf("ListImages(false): Wrong parameter. Want all=0. Got all=%s", all)
-- }
-- fakeRT.Reset()
-- _, err = client.ListImages(true)
-- if err != nil {
-- t.Fatal(err)
-- }
-- req = fakeRT.requests[0]
-- if all := req.URL.Query().Get("all"); all != "1" {
-- t.Errorf("ListImages(true): Wrong parameter. Want all=1. Got all=%s", all)
-- }
--}
+-import (
+- "flag"
+- "fmt"
+- "github.com/rackspace/gophercloud"
+-)
-
--func TestImageHistory(t *testing.T) {
-- body := `[
-- {
-- "Id": "25daec02219d2d852f7526137213a9b199926b4b24e732eab5b8bc6c49bd470e",
-- "Tags": [
-- "debian:7.6",
-- "debian:latest",
-- "debian:7",
-- "debian:wheezy"
-- ],
-- "Created": 1409856216,
-- "CreatedBy": "/bin/sh -c #(nop) CMD [/bin/bash]"
-- },
-- {
-- "Id": "41026a5347fb5be6ed16115bf22df8569697139f246186de9ae8d4f67c335dce",
-- "Created": 1409856213,
-- "CreatedBy": "/bin/sh -c #(nop) ADD file:1ee9e97209d00e3416a4543b23574cc7259684741a46bbcbc755909b8a053a38 in /",
-- "Size": 85178663
-- },
-- {
-- "Id": "511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158",
-- "Tags": [
-- "scratch:latest"
-- ],
-- "Created": 1371157430
-- }
--]`
-- var expected []ImageHistory
-- err := json.Unmarshal([]byte(body), &expected)
-- if err != nil {
-- t.Fatal(err)
-- }
-- client := newTestClient(&FakeRoundTripper{message: body, status: http.StatusOK})
-- history, err := client.ImageHistory("debian:latest")
-- if err != nil {
-- t.Error(err)
-- }
-- if !reflect.DeepEqual(history, expected) {
-- t.Errorf("ImageHistory: Wrong return value. Want %#v. Got %#v.", expected, history)
-- }
--}
+-var quiet = flag.Bool("quiet", false, "Quiet mode for acceptance testing. $? non-zero on error though.")
+-var rgn = flag.String("r", "", "Datacenter region to interrogate. Leave blank for provider-default region.")
-
--func TestRemoveImage(t *testing.T) {
-- name := "test"
-- fakeRT := &FakeRoundTripper{message: "", status: http.StatusNoContent}
-- client := newTestClient(fakeRT)
-- err := client.RemoveImage(name)
-- if err != nil {
-- t.Fatal(err)
-- }
-- req := fakeRT.requests[0]
-- expectedMethod := "DELETE"
-- if req.Method != expectedMethod {
-- t.Errorf("RemoveImage(%q): Wrong HTTP method. Want %s. Got %s.", name, expectedMethod, req.Method)
-- }
-- u, _ := url.Parse(client.getURL("/images/" + name))
-- if req.URL.Path != u.Path {
-- t.Errorf("RemoveImage(%q): Wrong request path. Want %q. Got %q.", name, u.Path, req.URL.Path)
-- }
--}
+-func main() {
+- flag.Parse()
-
--func TestRemoveImageNotFound(t *testing.T) {
-- client := newTestClient(&FakeRoundTripper{message: "no such image", status: http.StatusNotFound})
-- err := client.RemoveImage("test:")
-- if err != ErrNoSuchImage {
-- t.Errorf("RemoveImage: wrong error. Want %#v. Got %#v.", ErrNoSuchImage, err)
-- }
+- withIdentity(false, func(auth gophercloud.AccessProvider) {
+- withServerApi(auth, func(servers gophercloud.CloudServersProvider) {
+- log("Creating server")
+- serverId, err := createServer(servers, "", "", "", "")
+- if err != nil {
+- panic(err)
+- }
+- waitForServerState(servers, serverId, "ACTIVE")
+-
+- log("Creating image")
+- name := randomString("ACPTTEST", 16)
+- createImage := gophercloud.CreateImage{
+- Name: name,
+- }
+- imageId, err := servers.CreateImage(serverId, createImage)
+- if err != nil {
+- panic(err)
+- }
+- waitForImageState(servers, imageId, "ACTIVE")
+-
+- log("Deleting server")
+- servers.DeleteServerById(serverId)
+-
+- log("Deleting image")
+- servers.DeleteImageById(imageId)
+-
+- log("Done")
+- })
+- })
-}
-
--func TestInspectImage(t *testing.T) {
-- body := `{
-- "id":"b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc",
-- "parent":"27cf784147099545",
-- "created":"2013-03-23T22:24:18.818426-07:00",
-- "container":"3d67245a8d72ecf13f33dffac9f79dcdf70f75acb84d308770391510e0c23ad0",
-- "container_config":{"Memory":0}
--}`
-- var expected Image
-- json.Unmarshal([]byte(body), &expected)
-- fakeRT := &FakeRoundTripper{message: body, status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- image, err := client.InspectImage(expected.ID)
-- if err != nil {
-- t.Fatal(err)
-- }
-- if !reflect.DeepEqual(*image, expected) {
-- t.Errorf("InspectImage(%q): Wrong image returned. Want %#v. Got %#v.", expected.ID, expected, *image)
-- }
-- req := fakeRT.requests[0]
-- if req.Method != "GET" {
-- t.Errorf("InspectImage(%q): Wrong HTTP method. Want GET. Got %s.", expected.ID, req.Method)
-- }
-- u, _ := url.Parse(client.getURL("/images/" + expected.ID + "/json"))
-- if req.URL.Path != u.Path {
-- t.Errorf("InspectImage(%q): Wrong request URL. Want %q. Got %q.", expected.ID, u.Path, req.URL.Path)
+-func log(s string) {
+- if !*quiet {
+- fmt.Println(s)
- }
-}
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/18-osutil-authentication.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/18-osutil-authentication.go
+deleted file mode 100644
+index 01ff4e9..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/18-osutil-authentication.go
++++ /dev/null
+@@ -1,19 +0,0 @@
+-// +build acceptance,old
-
--func TestInspectImageNotFound(t *testing.T) {
-- client := newTestClient(&FakeRoundTripper{message: "no such image", status: http.StatusNotFound})
-- name := "test"
-- image, err := client.InspectImage(name)
-- if image != nil {
-- t.Errorf("InspectImage(%q): expected <nil> image, got %#v.", name, image)
-- }
-- if err != ErrNoSuchImage {
-- t.Errorf("InspectImage(%q): wrong error. Want %#v. Got %#v.", name, ErrNoSuchImage, err)
-- }
--}
+-package main
-
--func TestPushImage(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "Pushing 1/100", status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- var buf bytes.Buffer
-- err := client.PushImage(PushImageOptions{Name: "test", OutputStream: &buf}, AuthConfiguration{})
-- if err != nil {
-- t.Fatal(err)
-- }
-- expected := "Pushing 1/100"
-- if buf.String() != expected {
-- t.Errorf("PushImage: Wrong output. Want %q. Got %q.", expected, buf.String())
-- }
-- req := fakeRT.requests[0]
-- if req.Method != "POST" {
-- t.Errorf("PushImage: Wrong HTTP method. Want POST. Got %s.", req.Method)
-- }
-- u, _ := url.Parse(client.getURL("/images/test/push"))
-- if req.URL.Path != u.Path {
-- t.Errorf("PushImage: Wrong request path. Want %q. Got %q.", u.Path, req.URL.Path)
-- }
-- if query := req.URL.Query().Encode(); query != "" {
-- t.Errorf("PushImage: Wrong query string. Want no parameters, got %q.", query)
-- }
+-import (
+- "github.com/rackspace/gophercloud"
+- "github.com/rackspace/gophercloud/osutil"
+-)
-
-- auth, err := base64.URLEncoding.DecodeString(req.Header.Get("X-Registry-Auth"))
+-func main() {
+- provider, authOptions, err := osutil.AuthOptions()
- if err != nil {
-- t.Errorf("PushImage: caught error decoding auth. %#v", err.Error())
+- panic(err)
- }
-- if strings.TrimSpace(string(auth)) != "{}" {
-- t.Errorf("PushImage: wrong body. Want %q. Got %q.",
-- base64.URLEncoding.EncodeToString([]byte("{}")), req.Header.Get("X-Registry-Auth"))
+- _, err = gophercloud.Authenticate(provider, authOptions)
+- if err != nil {
+- panic(err)
- }
-}
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/19-list-addresses-0.1.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/19-list-addresses-0.1.go
+deleted file mode 100644
+index d60557b..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/19-list-addresses-0.1.go
++++ /dev/null
+@@ -1,58 +0,0 @@
+-// +build acceptance,old
-
--func TestPushImageWithRawJSON(t *testing.T) {
-- body := `
-- {"status":"Pushing..."}
-- {"status":"Pushing", "progress":"1/? (n/a)", "progressDetail":{"current":1}}}
-- {"status":"Image successfully pushed"}
-- `
-- fakeRT := &FakeRoundTripper{
-- message: body,
-- status: http.StatusOK,
-- header: map[string]string{
-- "Content-Type": "application/json",
-- },
-- }
-- client := newTestClient(fakeRT)
-- var buf bytes.Buffer
+-package main
-
-- err := client.PushImage(PushImageOptions{
-- Name: "test",
-- OutputStream: &buf,
-- RawJSONStream: true,
-- }, AuthConfiguration{})
-- if err != nil {
-- t.Fatal(err)
-- }
-- if buf.String() != body {
-- t.Errorf("PushImage: Wrong raw output. Want %q. Got %q.", body, buf.String())
-- }
+-import (
+- "flag"
+- "fmt"
+- "github.com/rackspace/gophercloud"
+-)
+-
+-var quiet = flag.Bool("quiet", false, "Quiet mode, for acceptance testing. $? still indicates errors though.")
+-
+-func main() {
+- flag.Parse()
+- withIdentity(false, func(acc gophercloud.AccessProvider) {
+- withServerApi(acc, func(api gophercloud.CloudServersProvider) {
+- log("Creating server")
+- id, err := createServer(api, "", "", "", "")
+- if err != nil {
+- panic(err)
+- }
+- waitForServerState(api, id, "ACTIVE")
+- defer api.DeleteServerById(id)
+-
+- tryAllAddresses(id, api)
+-
+- log("Done")
+- })
+- })
-}
-
--func TestPushImageWithAuthentication(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "Pushing 1/100", status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- var buf bytes.Buffer
-- inputAuth := AuthConfiguration{
-- Username: "gopher",
-- Password: "gopher123",
-- Email: "gopher at tsuru.io",
-- }
-- err := client.PushImage(PushImageOptions{Name: "test", OutputStream: &buf}, inputAuth)
+-func tryAllAddresses(id string, api gophercloud.CloudServersProvider) {
+- log("Getting the server instance")
+- s, err := api.ServerById(id)
- if err != nil {
-- t.Fatal(err)
+- panic(err)
- }
-- req := fakeRT.requests[0]
-- var gotAuth AuthConfiguration
-
-- auth, err := base64.URLEncoding.DecodeString(req.Header.Get("X-Registry-Auth"))
+- log("Getting the complete set of pools")
+- ps, err := s.AllAddressPools()
- if err != nil {
-- t.Errorf("PushImage: caught error decoding auth. %#v", err.Error())
+- panic(err)
- }
-
-- err = json.Unmarshal(auth, &gotAuth)
-- if err != nil {
-- t.Fatal(err)
-- }
-- if !reflect.DeepEqual(gotAuth, inputAuth) {
-- t.Errorf("PushImage: wrong auth configuration. Want %#v. Got %#v.", inputAuth, gotAuth)
+- log("Listing IPs for each pool")
+- for k, v := range ps {
+- log(fmt.Sprintf(" Pool %s", k))
+- for _, a := range v {
+- log(fmt.Sprintf(" IP: %s, Version: %d", a.Addr, a.Version))
+- }
- }
-}
-
--func TestPushImageCustomRegistry(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "Pushing 1/100", status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- var authConfig AuthConfiguration
-- var buf bytes.Buffer
-- opts := PushImageOptions{
-- Name: "test", Registry: "docker.tsuru.io",
-- OutputStream: &buf,
-- }
-- err := client.PushImage(opts, authConfig)
-- if err != nil {
-- t.Fatal(err)
-- }
-- req := fakeRT.requests[0]
-- expectedQuery := "registry=docker.tsuru.io"
-- if query := req.URL.Query().Encode(); query != expectedQuery {
-- t.Errorf("PushImage: Wrong query string. Want %q. Got %q.", expectedQuery, query)
+-func log(s ...interface{}) {
+- if !*quiet {
+- fmt.Println(s...)
- }
-}
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/99-delete-server.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/99-delete-server.go
+deleted file mode 100644
+index 3e38ba4..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/99-delete-server.go
++++ /dev/null
+@@ -1,48 +0,0 @@
+-// +build acceptance,old
-
--func TestPushImageNoName(t *testing.T) {
-- client := Client{}
-- err := client.PushImage(PushImageOptions{}, AuthConfiguration{})
-- if err != ErrNoSuchImage {
-- t.Errorf("PushImage: got wrong error. Want %#v. Got %#v.", ErrNoSuchImage, err)
-- }
--}
+-package main
-
--func TestPullImage(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "Pulling 1/100", status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- var buf bytes.Buffer
-- err := client.PullImage(PullImageOptions{Repository: "base", OutputStream: &buf},
-- AuthConfiguration{})
-- if err != nil {
-- t.Fatal(err)
-- }
-- expected := "Pulling 1/100"
-- if buf.String() != expected {
-- t.Errorf("PullImage: Wrong output. Want %q. Got %q.", expected, buf.String())
-- }
-- req := fakeRT.requests[0]
-- if req.Method != "POST" {
-- t.Errorf("PullImage: Wrong HTTP method. Want POST. Got %s.", req.Method)
-- }
-- u, _ := url.Parse(client.getURL("/images/create"))
-- if req.URL.Path != u.Path {
-- t.Errorf("PullImage: Wrong request path. Want %q. Got %q.", u.Path, req.URL.Path)
-- }
-- expectedQuery := "fromImage=base"
-- if query := req.URL.Query().Encode(); query != expectedQuery {
-- t.Errorf("PullImage: Wrong query strin. Want %q. Got %q.", expectedQuery, query)
-- }
--}
+-import (
+- "flag"
+- "fmt"
+- "github.com/rackspace/gophercloud"
+-)
-
--func TestPullImageWithRawJSON(t *testing.T) {
-- body := `
-- {"status":"Pulling..."}
-- {"status":"Pulling", "progress":"1 B/ 100 B", "progressDetail":{"current":1, "total":100}}
-- `
-- fakeRT := &FakeRoundTripper{
-- message: body,
-- status: http.StatusOK,
-- header: map[string]string{
-- "Content-Type": "application/json",
-- },
-- }
-- client := newTestClient(fakeRT)
-- var buf bytes.Buffer
-- err := client.PullImage(PullImageOptions{
-- Repository: "base",
-- OutputStream: &buf,
-- RawJSONStream: true,
-- }, AuthConfiguration{})
-- if err != nil {
-- t.Fatal(err)
-- }
-- if buf.String() != body {
-- t.Errorf("PullImage: Wrong raw output. Want %q. Got %q", body, buf.String())
-- }
--}
+-var quiet = flag.Bool("quiet", false, "Quiet operation for acceptance tests. $? non-zero if problem.")
+-var region = flag.String("r", "", "Datacenter region. Leave blank for provider-default region.")
-
--func TestPullImageWithoutOutputStream(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "Pulling 1/100", status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- opts := PullImageOptions{
-- Repository: "base",
-- Registry: "docker.tsuru.io",
-- }
-- err := client.PullImage(opts, AuthConfiguration{})
-- if err != nil {
-- t.Fatal(err)
-- }
-- req := fakeRT.requests[0]
-- expected := map[string][]string{"fromImage": {"base"}, "registry": {"docker.tsuru.io"}}
-- got := map[string][]string(req.URL.Query())
-- if !reflect.DeepEqual(got, expected) {
-- t.Errorf("PullImage: wrong query string. Want %#v. Got %#v.", expected, got)
-- }
--}
+-func main() {
+- flag.Parse()
-
--func TestPullImageCustomRegistry(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "Pulling 1/100", status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- var buf bytes.Buffer
-- opts := PullImageOptions{
-- Repository: "base",
-- Registry: "docker.tsuru.io",
-- OutputStream: &buf,
-- }
-- err := client.PullImage(opts, AuthConfiguration{})
-- if err != nil {
-- t.Fatal(err)
-- }
-- req := fakeRT.requests[0]
-- expected := map[string][]string{"fromImage": {"base"}, "registry": {"docker.tsuru.io"}}
-- got := map[string][]string(req.URL.Query())
-- if !reflect.DeepEqual(got, expected) {
-- t.Errorf("PullImage: wrong query string. Want %#v. Got %#v.", expected, got)
-- }
--}
+- withIdentity(false, func(auth gophercloud.AccessProvider) {
+- withServerApi(auth, func(servers gophercloud.CloudServersProvider) {
+- // Grab a listing of all servers.
+- ss, err := servers.ListServers()
+- if err != nil {
+- panic(err)
+- }
-
--func TestPullImageTag(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "Pulling 1/100", status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- var buf bytes.Buffer
-- opts := PullImageOptions{
-- Repository: "base",
-- Registry: "docker.tsuru.io",
-- Tag: "latest",
-- OutputStream: &buf,
-- }
-- err := client.PullImage(opts, AuthConfiguration{})
-- if err != nil {
-- t.Fatal(err)
-- }
-- req := fakeRT.requests[0]
-- expected := map[string][]string{"fromImage": {"base"}, "registry": {"docker.tsuru.io"}, "tag": {"latest"}}
-- got := map[string][]string(req.URL.Query())
-- if !reflect.DeepEqual(got, expected) {
-- t.Errorf("PullImage: wrong query string. Want %#v. Got %#v.", expected, got)
-- }
--}
+- // And for each one that starts with the ACPTTEST prefix, delete it.
+- // These are likely left-overs from previously running acceptance tests.
+- // Note that 04-create-servers.go is intended to leak servers by intention,
+- // so as to test this code. :)
+- n := 0
+- for _, s := range ss {
+- if len(s.Name) < 8 {
+- continue
+- }
+- if s.Name[0:8] == "ACPTTEST" {
+- err := servers.DeleteServerById(s.Id)
+- if err != nil {
+- panic(err)
+- }
+- n++
+- }
+- }
-
--func TestPullImageNoRepository(t *testing.T) {
-- var opts PullImageOptions
-- client := Client{}
-- err := client.PullImage(opts, AuthConfiguration{})
-- if err != ErrNoSuchImage {
-- t.Errorf("PullImage: got wrong error. Want %#v. Got %#v.", ErrNoSuchImage, err)
-- }
+- if !*quiet {
+- fmt.Printf("%d servers removed.\n", n)
+- }
+- })
+- })
-}
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/libargs.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/libargs.go
+deleted file mode 100644
+index cf234e7..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/libargs.go
++++ /dev/null
+@@ -1,239 +0,0 @@
+-// +build acceptance,old
-
--func TestImportImageFromUrl(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- var buf bytes.Buffer
-- opts := ImportImageOptions{
-- Source: "http://mycompany.com/file.tar",
-- Repository: "testimage",
-- Tag: "tag",
-- OutputStream: &buf,
-- }
-- err := client.ImportImage(opts)
-- if err != nil {
-- t.Fatal(err)
-- }
-- req := fakeRT.requests[0]
-- expected := map[string][]string{"fromSrc": {opts.Source}, "repo": {opts.Repository}, "tag": {opts.Tag}}
-- got := map[string][]string(req.URL.Query())
-- if !reflect.DeepEqual(got, expected) {
-- t.Errorf("ImportImage: wrong query string. Want %#v. Got %#v.", expected, got)
-- }
--}
+-package main
-
--func TestImportImageFromInput(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- in := bytes.NewBufferString("tar content")
-- var buf bytes.Buffer
-- opts := ImportImageOptions{
-- Source: "-", Repository: "testimage",
-- InputStream: in, OutputStream: &buf,
-- Tag: "tag",
-- }
-- err := client.ImportImage(opts)
-- if err != nil {
-- t.Fatal(err)
-- }
-- req := fakeRT.requests[0]
-- expected := map[string][]string{"fromSrc": {opts.Source}, "repo": {opts.Repository}, "tag": {opts.Tag}}
-- got := map[string][]string(req.URL.Query())
-- if !reflect.DeepEqual(got, expected) {
-- t.Errorf("ImportImage: wrong query string. Want %#v. Got %#v.", expected, got)
-- }
-- body, err := ioutil.ReadAll(req.Body)
-- if err != nil {
-- t.Errorf("ImportImage: caugth error while reading body %#v", err.Error())
+-import (
+- "crypto/rand"
+- "fmt"
+- "github.com/rackspace/gophercloud"
+- "os"
+- "strings"
+- "time"
+-)
+-
+-// getCredentials will verify existence of needed credential information
+-// provided through environment variables. This function will not return
+-// if at least one piece of required information is missing.
+-func getCredentials() (provider, username, password, apiKey string) {
+- provider = os.Getenv("SDK_PROVIDER")
+- username = os.Getenv("SDK_USERNAME")
+- password = os.Getenv("SDK_PASSWORD")
+- apiKey = os.Getenv("SDK_API_KEY")
+- var authURL = os.Getenv("OS_AUTH_URL")
+-
+- if (provider == "") || (username == "") || (password == "") {
+- fmt.Fprintf(os.Stderr, "One or more of the following environment variables aren't set:\n")
+- fmt.Fprintf(os.Stderr, " SDK_PROVIDER=\"%s\"\n", provider)
+- fmt.Fprintf(os.Stderr, " SDK_USERNAME=\"%s\"\n", username)
+- fmt.Fprintf(os.Stderr, " SDK_PASSWORD=\"%s\"\n", password)
+- os.Exit(1)
- }
-- e := "tar content"
-- if string(body) != e {
-- t.Errorf("ImportImage: wrong body. Want %#v. Got %#v.", e, string(body))
+-
+- if strings.Contains(provider, "rackspace") && (authURL != "") {
+- provider = authURL + "/v2.0/tokens"
- }
+-
+- return
-}
-
--func TestImportImageDoesNotPassesInputIfSourceIsNotDash(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- var buf bytes.Buffer
-- in := bytes.NewBufferString("foo")
-- opts := ImportImageOptions{
-- Source: "http://test.com/container.tar", Repository: "testimage",
-- InputStream: in, OutputStream: &buf,
-- }
-- err := client.ImportImage(opts)
-- if err != nil {
-- t.Fatal(err)
-- }
-- req := fakeRT.requests[0]
-- expected := map[string][]string{"fromSrc": {opts.Source}, "repo": {opts.Repository}}
-- got := map[string][]string(req.URL.Query())
-- if !reflect.DeepEqual(got, expected) {
-- t.Errorf("ImportImage: wrong query string. Want %#v. Got %#v.", expected, got)
-- }
-- body, err := ioutil.ReadAll(req.Body)
-- if err != nil {
-- t.Errorf("ImportImage: caugth error while reading body %#v", err.Error())
-- }
-- if string(body) != "" {
-- t.Errorf("ImportImage: wrong body. Want nothing. Got %#v.", string(body))
+-// randomString generates a string of given length, but random content.
+-// All content will be within the ASCII graphic character set.
+-// (Implementation from Even Shaw's contribution on
+-// http://stackoverflow.com/questions/12771930/what-is-the-fastest-way-to-generate-a-long-random-string-in-go).
+-func randomString(prefix string, n int) string {
+- const alphanum = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
+- var bytes = make([]byte, n)
+- rand.Read(bytes)
+- for i, b := range bytes {
+- bytes[i] = alphanum[b%byte(len(alphanum))]
- }
+- return prefix + string(bytes)
-}
-
--func TestImportImageShouldPassTarContentToBodyWhenSourceIsFilePath(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- var buf bytes.Buffer
-- tarPath := "testing/data/container.tar"
-- opts := ImportImageOptions{
-- Source: tarPath, Repository: "testimage",
-- OutputStream: &buf,
-- }
-- err := client.ImportImage(opts)
-- if err != nil {
-- t.Fatal(err)
-- }
-- tar, err := os.Open(tarPath)
-- if err != nil {
-- t.Fatal(err)
-- }
-- req := fakeRT.requests[0]
-- tarContent, err := ioutil.ReadAll(tar)
-- body, err := ioutil.ReadAll(req.Body)
+-// aSuitableImage finds a minimal image for use in dynamically creating servers.
+-// If none can be found, this function will panic.
+-func aSuitableImage(api gophercloud.CloudServersProvider) string {
+- images, err := api.ListImages()
- if err != nil {
-- t.Fatal(err)
-- }
-- if !reflect.DeepEqual(tarContent, body) {
-- t.Errorf("ImportImage: wrong body. Want %#v content. Got %#v.", tarPath, body)
+- panic(err)
- }
--}
-
--func TestImportImageShouldChangeSourceToDashWhenItsAFilePath(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- var buf bytes.Buffer
-- tarPath := "testing/data/container.tar"
-- opts := ImportImageOptions{
-- Source: tarPath, Repository: "testimage",
-- OutputStream: &buf,
+- // TODO(sfalvo):
+- // Works for Rackspace, might not work for your provider!
+- // Need to figure out why ListImages() provides 0 values for
+- // Ram and Disk fields.
+- //
+- // Until then, just return Ubuntu 12.04 LTS.
+- for i := 0; i < len(images); i++ {
+- if strings.Contains(images[i].Name, "Ubuntu 12.04 LTS") {
+- return images[i].Id
+- }
- }
-- err := client.ImportImage(opts)
+- panic("Image for Ubuntu 12.04 LTS not found.")
+-}
+-
+-// aSuitableFlavor finds the minimum flavor capable of running the test image
+-// chosen by aSuitableImage. If none can be found, this function will panic.
+-func aSuitableFlavor(api gophercloud.CloudServersProvider) string {
+- flavors, err := api.ListFlavors()
- if err != nil {
-- t.Fatal(err)
+- panic(err)
- }
-- req := fakeRT.requests[0]
-- expected := map[string][]string{"fromSrc": {"-"}, "repo": {opts.Repository}}
-- got := map[string][]string(req.URL.Query())
-- if !reflect.DeepEqual(got, expected) {
-- t.Errorf("ImportImage: wrong query string. Want %#v. Got %#v.", expected, got)
+-
+- // TODO(sfalvo):
+- // Works for Rackspace, might not work for your provider!
+- // Need to figure out why ListFlavors() provides 0 values for
+- // Ram and Disk fields.
+- //
+- // Until then, just return Ubuntu 12.04 LTS.
+- for i := 0; i < len(flavors); i++ {
+- if flavors[i].Id == "2" {
+- return flavors[i].Id
+- }
- }
+- panic("Flavor 2 (512MB 1-core 20GB machine) not found.")
-}
-
--func TestBuildImageParameters(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- var buf bytes.Buffer
-- opts := BuildImageOptions{
-- Name: "testImage",
-- NoCache: true,
-- SuppressOutput: true,
-- RmTmpContainer: true,
-- ForceRmTmpContainer: true,
-- InputStream: &buf,
-- OutputStream: &buf,
+-// createServer creates a new server in a manner compatible with acceptance testing.
+-// In particular, it ensures that the name of the server always starts with "ACPTTEST--",
+-// which the delete servers acceptance test relies on to identify servers to delete.
+-// Passing in empty image and flavor references will force the use of reasonable defaults.
+-// An empty name string will result in a dynamically created name prefixed with "ACPTTEST--".
+-// A blank admin password will cause a password to be automatically generated; however,
+-// at present no means of recovering this password exists, as no acceptance tests yet require
+-// this data.
+-func createServer(servers gophercloud.CloudServersProvider, imageRef, flavorRef, name, adminPass string) (string, error) {
+- if imageRef == "" {
+- imageRef = aSuitableImage(servers)
- }
-- err := client.BuildImage(opts)
-- if err != nil && strings.Index(err.Error(), "build image fail") == -1 {
-- t.Fatal(err)
+-
+- if flavorRef == "" {
+- flavorRef = aSuitableFlavor(servers)
- }
-- req := fakeRT.requests[0]
-- expected := map[string][]string{"t": {opts.Name}, "nocache": {"1"}, "q": {"1"}, "rm": {"1"}, "forcerm": {"1"}}
-- got := map[string][]string(req.URL.Query())
-- if !reflect.DeepEqual(got, expected) {
-- t.Errorf("BuildImage: wrong query string. Want %#v. Got %#v.", expected, got)
+-
+- if len(name) < 1 {
+- name = randomString("ACPTTEST", 16)
- }
--}
-
--func TestBuildImageParametersForRemoteBuild(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- var buf bytes.Buffer
-- opts := BuildImageOptions{
-- Name: "testImage",
-- Remote: "testing/data/container.tar",
-- SuppressOutput: true,
-- OutputStream: &buf,
+- if (len(name) < 8) || (name[0:8] != "ACPTTEST") {
+- name = fmt.Sprintf("ACPTTEST--%s", name)
- }
-- err := client.BuildImage(opts)
+-
+- newServer, err := servers.CreateServer(gophercloud.NewServer{
+- Name: name,
+- ImageRef: imageRef,
+- FlavorRef: flavorRef,
+- AdminPass: adminPass,
+- })
+-
- if err != nil {
-- t.Fatal(err)
-- }
-- req := fakeRT.requests[0]
-- expected := map[string][]string{"t": {opts.Name}, "remote": {opts.Remote}, "q": {"1"}}
-- got := map[string][]string(req.URL.Query())
-- if !reflect.DeepEqual(got, expected) {
-- t.Errorf("BuildImage: wrong query string. Want %#v. Got %#v.", expected, got)
+- return "", err
- }
+-
+- return newServer.Id, nil
-}
-
--func TestBuildImageMissingRepoAndNilInput(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- var buf bytes.Buffer
-- opts := BuildImageOptions{
-- Name: "testImage",
-- SuppressOutput: true,
-- OutputStream: &buf,
-- }
-- err := client.BuildImage(opts)
-- if err != ErrMissingRepo {
-- t.Errorf("BuildImage: wrong error returned. Want %#v. Got %#v.", ErrMissingRepo, err)
-- }
+-// findAlternativeFlavor locates a flavor to resize a server to. It is guaranteed to be different
+-// than what aSuitableFlavor() returns. If none could be found, this function will panic.
+-func findAlternativeFlavor() string {
+- return "3" // 1GB image, up from 512MB image
-}
-
--func TestBuildImageMissingOutputStream(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- opts := BuildImageOptions{Name: "testImage"}
-- err := client.BuildImage(opts)
-- if err != ErrMissingOutputStream {
-- t.Errorf("BuildImage: wrong error returned. Want %#v. Got %#v.", ErrMissingOutputStream, err)
+-// findAlternativeImage locates an image to resize or rebuild a server with. It is guaranteed to be
+-// different than what aSuitableImage() returns. If none could be found, this function will panic.
+-func findAlternativeImage() string {
+- return "c6f9c411-e708-4952-91e5-62ded5ea4d3e"
+-}
+-
+-// withIdentity authenticates the user against the provider's identity service, and provides an
+-// accessor for additional services.
+-func withIdentity(ar bool, f func(gophercloud.AccessProvider)) {
+- _, _, _, apiKey := getCredentials()
+- if len(apiKey) == 0 {
+- withPasswordIdentity(ar, f)
+- } else {
+- withAPIKeyIdentity(ar, f)
- }
-}
-
--func TestBuildImageWithRawJSON(t *testing.T) {
-- body := `
-- {"stream":"Step 0 : FROM ubuntu:latest\n"}
-- {"stream":" ---\u003e 4300eb9d3c8d\n"}
-- {"stream":"Step 1 : MAINTAINER docker <eng at docker.com>\n"}
-- {"stream":" ---\u003e Using cache\n"}
-- {"stream":" ---\u003e 3a3ed758c370\n"}
-- {"stream":"Step 2 : CMD /usr/bin/top\n"}
-- {"stream":" ---\u003e Running in 36b1479cc2e4\n"}
-- {"stream":" ---\u003e 4b6188aebe39\n"}
-- {"stream":"Removing intermediate container 36b1479cc2e4\n"}
-- {"stream":"Successfully built 4b6188aebe39\n"}
-- `
-- fakeRT := &FakeRoundTripper{
-- message: body,
-- status: http.StatusOK,
-- header: map[string]string{
-- "Content-Type": "application/json",
+-func withPasswordIdentity(ar bool, f func(gophercloud.AccessProvider)) {
+- provider, username, password, _ := getCredentials()
+- acc, err := gophercloud.Authenticate(
+- provider,
+- gophercloud.AuthOptions{
+- Username: username,
+- Password: password,
+- AllowReauth: ar,
- },
-- }
-- client := newTestClient(fakeRT)
-- var buf bytes.Buffer
-- opts := BuildImageOptions{
-- Name: "testImage",
-- RmTmpContainer: true,
-- InputStream: &buf,
-- OutputStream: &buf,
-- RawJSONStream: true,
-- }
-- err := client.BuildImage(opts)
+- )
- if err != nil {
-- t.Fatal(err)
-- }
-- if buf.String() != body {
-- t.Errorf("BuildImage: Wrong raw output. Want %q. Got %q.", body, buf.String())
+- panic(err)
- }
+-
+- f(acc)
-}
-
--func TestBuildImageRemoteWithoutName(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- var buf bytes.Buffer
-- opts := BuildImageOptions{
-- Remote: "testing/data/container.tar",
-- SuppressOutput: true,
-- OutputStream: &buf,
-- }
-- err := client.BuildImage(opts)
+-func withAPIKeyIdentity(ar bool, f func(gophercloud.AccessProvider)) {
+- provider, username, _, apiKey := getCredentials()
+- acc, err := gophercloud.Authenticate(
+- provider,
+- gophercloud.AuthOptions{
+- Username: username,
+- ApiKey: apiKey,
+- AllowReauth: ar,
+- },
+- )
- if err != nil {
-- t.Fatal(err)
-- }
-- req := fakeRT.requests[0]
-- expected := map[string][]string{"t": {opts.Remote}, "remote": {opts.Remote}, "q": {"1"}}
-- got := map[string][]string(req.URL.Query())
-- if !reflect.DeepEqual(got, expected) {
-- t.Errorf("BuildImage: wrong query string. Want %#v. Got %#v.", expected, got)
+- panic(err)
- }
+-
+- f(acc)
-}
-
--func TestTagImageParameters(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- opts := TagImageOptions{Repo: "testImage"}
-- err := client.TagImage("base", opts)
-- if err != nil && strings.Index(err.Error(), "tag image fail") == -1 {
-- t.Fatal(err)
-- }
-- req := fakeRT.requests[0]
-- expected := "http://localhost:4243/images/base/tag?repo=testImage"
-- got := req.URL.String()
-- if !reflect.DeepEqual(got, expected) {
-- t.Errorf("TagImage: wrong query string. Want %#v. Got %#v.", expected, got)
+-// withServerApi acquires the cloud servers API.
+-func withServerApi(acc gophercloud.AccessProvider, f func(gophercloud.CloudServersProvider)) {
+- api, err := gophercloud.ServersApi(acc, gophercloud.ApiCriteria{
+- Name: "cloudServersOpenStack",
+- VersionId: "2",
+- UrlChoice: gophercloud.PublicURL,
+- })
+- if err != nil {
+- panic(err)
- }
+-
+- f(api)
-}
-
--func TestTagImageMissingRepo(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- opts := TagImageOptions{Repo: "testImage"}
-- err := client.TagImage("", opts)
-- if err != ErrNoSuchImage {
-- t.Errorf("TestTag: wrong error returned. Want %#v. Got %#v.",
-- ErrNoSuchImage, err)
+-// waitForServerState polls, every 10 seconds, for a given server to appear in the indicated state.
+-// This call will block forever if it never appears in the desired state, so if a timeout is required,
+-// make sure to call this function in a goroutine.
+-func waitForServerState(api gophercloud.CloudServersProvider, id, state string) error {
+- for {
+- s, err := api.ServerById(id)
+- if err != nil {
+- return err
+- }
+- if s.Status == state {
+- return nil
+- }
+- time.Sleep(10 * time.Second)
- }
+- panic("Impossible")
-}
-
--func TestIsUrl(t *testing.T) {
-- url := "http://foo.bar/"
-- result := isURL(url)
-- if !result {
-- t.Errorf("isURL: wrong match. Expected %#v to be a url. Got %#v.", url, result)
-- }
-- url = "/foo/bar.tar"
-- result = isURL(url)
-- if result {
-- t.Errorf("isURL: wrong match. Expected %#v to not be a url. Got %#v", url, result)
+-// waitForImageState polls, every 10 seconds, for a given image to appear in the indicated state.
+-// This call will block forever if it never appears in the desired state, so if a timeout is required,
+-// make sure to call this function in a goroutine.
+-func waitForImageState(api gophercloud.CloudServersProvider, id, state string) error {
+- for {
+- s, err := api.ImageById(id)
+- if err != nil {
+- return err
+- }
+- if s.Status == state {
+- return nil
+- }
+- time.Sleep(10 * time.Second)
- }
+- panic("Impossible")
-}
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/api_fetch.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/api_fetch.go
+deleted file mode 100644
+index 196047e..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/api_fetch.go
++++ /dev/null
+@@ -1,49 +0,0 @@
+-package gophercloud
-
--func TestLoadImage(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- tar, err := os.Open("testing/data/container.tar")
-- if err != nil {
-- t.Fatal(err)
-- } else {
-- defer tar.Close()
-- }
-- opts := LoadImageOptions{InputStream: tar}
-- err = client.LoadImage(opts)
-- if nil != err {
-- t.Error(err)
-- }
-- req := fakeRT.requests[0]
-- if req.Method != "POST" {
-- t.Errorf("LoadImage: wrong method. Expected %q. Got %q.", "POST", req.Method)
-- }
-- if req.URL.Path != "/images/load" {
-- t.Errorf("LoadImage: wrong URL. Expected %q. Got %q.", "/images/load", req.URL.Path)
-- }
+-import(
+- "fmt"
+- "github.com/mitchellh/mapstructure"
+-)
+-
+-//The default generic openstack api
+-var OpenstackApi = map[string]interface{}{
+- "Type": "compute",
+- "UrlChoice": PublicURL,
-}
-
--func TestExportImage(t *testing.T) {
-- var buf bytes.Buffer
-- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
-- client := newTestClient(fakeRT)
-- opts := ExportImageOptions{Name: "testimage", OutputStream: &buf}
-- err := client.ExportImage(opts)
-- if nil != err {
-- t.Error(err)
-- }
-- req := fakeRT.requests[0]
-- if req.Method != "GET" {
-- t.Errorf("ExportImage: wrong method. Expected %q. Got %q.", "GET", req.Method)
-- }
-- expectedPath := "/images/testimage/get"
-- if req.URL.Path != expectedPath {
-- t.Errorf("ExportIMage: wrong path. Expected %q. Got %q.", expectedPath, req.URL.Path)
-- }
+-// Api for use with rackspace
+-var RackspaceApi = map[string]interface{}{
+- "Name": "cloudServersOpenStack",
+- "VersionId": "2",
+- "UrlChoice": PublicURL,
-}
-
--func TestSearchImages(t *testing.T) {
-- body := `[
-- {
-- "description":"A container with Cassandra 2.0.3",
-- "is_official":true,
-- "is_automated":true,
-- "name":"poklet/cassandra",
-- "star_count":17
-- },
-- {
-- "description":"A container with Cassandra 2.0.3",
-- "is_official":true,
-- "is_automated":false,
-- "name":"poklet/cassandra",
-- "star_count":17
-- }
-- ,
-- {
-- "description":"A container with Cassandra 2.0.3",
-- "is_official":false,
-- "is_automated":true,
-- "name":"poklet/cassandra",
-- "star_count":17
-- }
--]`
-- var expected []APIImageSearch
-- err := json.Unmarshal([]byte(body), &expected)
-- if err != nil {
-- t.Fatal(err)
-- }
-- client := newTestClient(&FakeRoundTripper{message: body, status: http.StatusOK})
-- result, err := client.SearchImages("cassandra")
-- if err != nil {
-- t.Error(err)
-- }
-- if !reflect.DeepEqual(result, expected) {
-- t.Errorf("SearchImages: Wrong return value. Want %#v. Got %#v.", expected, result)
+-
+-//Populates an ApiCriteria struct with the api values
+-//from one of the api maps
+-func PopulateApi(variant string) (ApiCriteria, error){
+- var Api ApiCriteria
+- var variantMap map[string]interface{}
+-
+- switch variant {
+- case "":
+- variantMap = OpenstackApi
+-
+- case "openstack":
+- variantMap = OpenstackApi
+-
+- case "rackspace":
+- variantMap = RackspaceApi
+-
+- default:
+- var err = fmt.Errorf(
+- "PopulateApi: Unknown variant %# v; legal values: \"openstack\", \"rackspace\"", variant)
+- return Api, err
- }
+-
+- err := mapstructure.Decode(variantMap,&Api)
+- if err != nil{
+- return Api,err
+- }
+- return Api, err
-}
-diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/misc.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/misc.go
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/authenticate.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/authenticate.go
deleted file mode 100644
-index 2678ab5..0000000
---- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/misc.go
+index ff609aa..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/authenticate.go
+++ /dev/null
-@@ -1,59 +0,0 @@
--// Copyright 2014 go-dockerclient authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--package docker
+@@ -1,257 +0,0 @@
+-package gophercloud
-
-import (
-- "bytes"
-- "strings"
+- "fmt"
+- "github.com/racker/perigee"
-)
-
--// Version returns version information about the docker server.
--//
--// See http://goo.gl/BOZrF5 for more details.
--func (c *Client) Version() (*Env, error) {
-- body, _, err := c.do("GET", "/version", nil)
-- if err != nil {
-- return nil, err
-- }
-- var env Env
-- if err := env.Decode(bytes.NewReader(body)); err != nil {
-- return nil, err
-- }
-- return &env, nil
+-// AuthOptions lets anyone calling Authenticate() supply the required access credentials.
+-// At present, only Identity V2 API support exists; therefore, only Username, Password,
+-// and optionally, TenantId are provided. If future Identity API versions become available,
+-// alternative fields unique to those versions may appear here.
+-type AuthOptions struct {
+- // Username and Password are required if using Identity V2 API.
+- // Consult with your provider's control panel to discover your
+- // account's username and password.
+- Username, Password string
+-
+- // ApiKey used for providers that support Api Key authentication
+- ApiKey string
+-
+- // The TenantId field is optional for the Identity V2 API.
+- TenantId string
+-
+- // The TenantName can be specified instead of the TenantId
+- TenantName string
+-
+- // AllowReauth should be set to true if you grant permission for Gophercloud to cache
+- // your credentials in memory, and to allow Gophercloud to attempt to re-authenticate
+- // automatically if/when your token expires. If you set it to false, it will not cache
+- // these settings, but re-authentication will not be possible. This setting defaults
+- // to false.
+- AllowReauth bool
-}
-
--// Info returns system-wide information about the Docker server.
--//
--// See http://goo.gl/wmqZsW for more details.
--func (c *Client) Info() (*Env, error) {
-- body, _, err := c.do("GET", "/info", nil)
-- if err != nil {
-- return nil, err
-- }
-- var info Env
-- err = info.Decode(bytes.NewReader(body))
-- if err != nil {
-- return nil, err
-- }
-- return &info, nil
+-// AuthContainer provides a JSON encoding wrapper for passing credentials to the Identity
+-// service. You will not work with this structure directly.
+-type AuthContainer struct {
+- Auth Auth `json:"auth"`
+-}
+-
+-// Auth provides a JSON encoding wrapper for passing credentials to the Identity
+-// service. You will not work with this structure directly.
+-type Auth struct {
+- PasswordCredentials *PasswordCredentials `json:"passwordCredentials,omitempty"`
+- ApiKeyCredentials *ApiKeyCredentials `json:"RAX-KSKEY:apiKeyCredentials,omitempty"`
+- TenantId string `json:"tenantId,omitempty"`
+- TenantName string `json:"tenantName,omitempty"`
+-}
+-
+-// PasswordCredentials provides a JSON encoding wrapper for passing credentials to the Identity
+-// service. You will not work with this structure directly.
+-type PasswordCredentials struct {
+- Username string `json:"username"`
+- Password string `json:"password"`
+-}
+-
+-type ApiKeyCredentials struct {
+- Username string `json:"username"`
+- ApiKey string `json:"apiKey"`
+-}
+-
+-// Access encapsulates the API token and its relevant fields, as well as the
+-// services catalog that Identity API returns once authenticated.
+-type Access struct {
+- Token Token
+- ServiceCatalog []CatalogEntry
+- User User
+- provider Provider `json:"-"`
+- options AuthOptions `json:"-"`
+- context *Context `json:"-"`
+-}
+-
+-// Token encapsulates an authentication token and when it expires. It also includes
+-// tenant information if available.
+-type Token struct {
+- Id, Expires string
+- Tenant Tenant
-}
-
--// ParseRepositoryTag gets the name of the repository and returns it splitted
--// in two parts: the repository and the tag.
--//
--// Some examples:
--//
--// localhost.localdomain:5000/samalba/hipache:latest -> localhost.localdomain:5000/samalba/hipache, latest
--// localhost.localdomain:5000/samalba/hipache -> localhost.localdomain:5000/samalba/hipache, ""
--func ParseRepositoryTag(repoTag string) (repository string, tag string) {
-- n := strings.LastIndex(repoTag, ":")
-- if n < 0 {
-- return repoTag, ""
-- }
-- if tag := repoTag[n+1:]; !strings.Contains(tag, "/") {
-- return repoTag[:n], tag
-- }
-- return repoTag, ""
+-// Tenant encapsulates tenant authentication information. If, after authentication,
+-// no tenant information is supplied, both Id and Name will be "".
+-type Tenant struct {
+- Id, Name string
-}
-diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/misc_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/misc_test.go
-deleted file mode 100644
-index ceaf076..0000000
---- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/misc_test.go
-+++ /dev/null
-@@ -1,159 +0,0 @@
--// Copyright 2014 go-dockerclient authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
-
--package docker
+-// User encapsulates the user credentials, and provides visibility in what
+-// the user can do through its role assignments.
+-type User struct {
+- Id, Name string
+- XRaxDefaultRegion string `json:"RAX-AUTH:defaultRegion"`
+- Roles []Role
+-}
-
--import (
-- "net/http"
-- "net/url"
-- "reflect"
-- "sort"
-- "testing"
--)
+-// Role encapsulates a permission that a user can rely on.
+-type Role struct {
+- Description, Id, Name string
+-}
-
--type DockerVersion struct {
-- Version string
-- GitCommit string
-- GoVersion string
+-// CatalogEntry encapsulates a service catalog record.
+-type CatalogEntry struct {
+- Name, Type string
+- Endpoints []EntryEndpoint
-}
-
--func TestVersion(t *testing.T) {
-- body := `{
-- "Version":"0.2.2",
-- "GitCommit":"5a2a5cc+CHANGES",
-- "GoVersion":"go1.0.3"
--}`
-- fakeRT := FakeRoundTripper{message: body, status: http.StatusOK}
-- client := newTestClient(&fakeRT)
-- expected := DockerVersion{
-- Version: "0.2.2",
-- GitCommit: "5a2a5cc+CHANGES",
-- GoVersion: "go1.0.3",
-- }
-- version, err := client.Version()
-- if err != nil {
-- t.Fatal(err)
-- }
+-// EntryEndpoint encapsulates how to get to the API of some service.
+-type EntryEndpoint struct {
+- Region, TenantId string
+- PublicURL, InternalURL string
+- VersionId, VersionInfo, VersionList string
+-}
-
-- if result := version.Get("Version"); result != expected.Version {
-- t.Errorf("Version(): Wrong result. Want %#v. Got %#v.", expected.Version, version.Get("Version"))
-- }
-- if result := version.Get("GitCommit"); result != expected.GitCommit {
-- t.Errorf("GitCommit(): Wrong result. Want %#v. Got %#v.", expected.GitCommit, version.Get("GitCommit"))
-- }
-- if result := version.Get("GoVersion"); result != expected.GoVersion {
-- t.Errorf("GoVersion(): Wrong result. Want %#v. Got %#v.", expected.GoVersion, version.Get("GoVersion"))
-- }
-- req := fakeRT.requests[0]
-- if req.Method != "GET" {
-- t.Errorf("Version(): wrong request method. Want GET. Got %s.", req.Method)
-- }
-- u, _ := url.Parse(client.getURL("/version"))
-- if req.URL.Path != u.Path {
-- t.Errorf("Version(): wrong request path. Want %q. Got %q.", u.Path, req.URL.Path)
-- }
+-type AuthError struct {
+- StatusCode int
-}
-
--func TestVersionError(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "internal error", status: http.StatusInternalServerError}
-- client := newTestClient(fakeRT)
-- version, err := client.Version()
-- if version != nil {
-- t.Errorf("Version(): expected <nil> value, got %#v.", version)
-- }
-- if err == nil {
-- t.Error("Version(): unexpected <nil> error")
+-func (ae *AuthError) Error() string {
+- switch ae.StatusCode {
+- case 401:
+- return "Auth failed. Bad credentials."
+-
+- default:
+- return fmt.Sprintf("Auth failed. Status code is: %s.", ae.StatusCode)
- }
-}
-
--func TestInfo(t *testing.T) {
-- body := `{
-- "Containers":11,
-- "Images":16,
-- "Debug":0,
-- "NFd":11,
-- "NGoroutines":21,
-- "MemoryLimit":1,
-- "SwapLimit":0
--}`
-- fakeRT := FakeRoundTripper{message: body, status: http.StatusOK}
-- client := newTestClient(&fakeRT)
-- expected := Env{}
-- expected.SetInt("Containers", 11)
-- expected.SetInt("Images", 16)
-- expected.SetBool("Debug", false)
-- expected.SetInt("NFd", 11)
-- expected.SetInt("NGoroutines", 21)
-- expected.SetBool("MemoryLimit", true)
-- expected.SetBool("SwapLimit", false)
-- info, err := client.Info()
-- if err != nil {
-- t.Fatal(err)
-- }
-- infoSlice := []string(*info)
-- expectedSlice := []string(expected)
-- sort.Strings(infoSlice)
-- sort.Strings(expectedSlice)
-- if !reflect.DeepEqual(expectedSlice, infoSlice) {
-- t.Errorf("Info(): Wrong result.\nWant %#v.\nGot %#v.", expected, *info)
-- }
-- req := fakeRT.requests[0]
-- if req.Method != "GET" {
-- t.Errorf("Info(): Wrong HTTP method. Want GET. Got %s.", req.Method)
-- }
-- u, _ := url.Parse(client.getURL("/info"))
-- if req.URL.Path != u.Path {
-- t.Errorf("Info(): Wrong request path. Want %q. Got %q.", u.Path, req.URL.Path)
+-//
+-func getAuthCredentials(options AuthOptions) Auth {
+- if options.ApiKey == "" {
+- return Auth{
+- PasswordCredentials: &PasswordCredentials{
+- Username: options.Username,
+- Password: options.Password,
+- },
+- TenantId: options.TenantId,
+- TenantName: options.TenantName,
+- }
+- } else {
+- return Auth{
+- ApiKeyCredentials: &ApiKeyCredentials{
+- Username: options.Username,
+- ApiKey: options.ApiKey,
+- },
+- TenantId: options.TenantId,
+- TenantName: options.TenantName,
+- }
- }
-}
-
--func TestInfoError(t *testing.T) {
-- fakeRT := &FakeRoundTripper{message: "internal error", status: http.StatusInternalServerError}
-- client := newTestClient(fakeRT)
-- version, err := client.Info()
-- if version != nil {
-- t.Errorf("Info(): expected <nil> value, got %#v.", version)
-- }
-- if err == nil {
-- t.Error("Info(): unexpected <nil> error")
+-// papersPlease contains the common logic between authentication and re-authentication.
+-// The name, obviously a joke on the process of authentication, was chosen because
+-// of how many other entities exist in the program containing the word Auth or Authorization.
+-// I didn't need another one.
+-func (c *Context) papersPlease(p Provider, options AuthOptions) (*Access, error) {
+- var access *Access
+- access = new(Access)
+-
+- if (options.Username == "") || (options.Password == "" && options.ApiKey == "") {
+- return nil, ErrCredentials
- }
--}
-
--func TestParseRepositoryTag(t *testing.T) {
-- var tests = []struct {
-- input string
-- expectedRepo string
-- expectedTag string
-- }{
-- {
-- "localhost.localdomain:5000/samalba/hipache:latest",
-- "localhost.localdomain:5000/samalba/hipache",
-- "latest",
-- },
-- {
-- "localhost.localdomain:5000/samalba/hipache",
-- "localhost.localdomain:5000/samalba/hipache",
-- "",
-- },
-- {
-- "tsuru/python",
-- "tsuru/python",
-- "",
+- resp, err := perigee.Request("POST", p.AuthEndpoint, perigee.Options{
+- CustomClient: c.httpClient,
+- ReqBody: &AuthContainer{
+- Auth: getAuthCredentials(options),
- },
-- {
-- "tsuru/python:2.7",
-- "tsuru/python",
-- "2.7",
+- Results: &struct {
+- Access **Access `json:"access"`
+- }{
+- &access,
- },
-- }
-- for _, tt := range tests {
-- repo, tag := ParseRepositoryTag(tt.input)
-- if repo != tt.expectedRepo {
-- t.Errorf("ParseRepositoryTag(%q): wrong repository. Want %q. Got %q", tt.input, tt.expectedRepo, repo)
-- }
-- if tag != tt.expectedTag {
-- t.Errorf("ParseRepositoryTag(%q): wrong tag. Want %q. Got %q", tt.input, tt.expectedTag, tag)
+- })
+-
+- if err == nil {
+- switch resp.StatusCode {
+- case 200:
+- access.options = options
+- access.provider = p
+- access.context = c
+-
+- default:
+- err = &AuthError {
+- StatusCode: resp.StatusCode,
+- }
- }
- }
--}
-diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/signal.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/signal.go
-deleted file mode 100644
-index 16aa003..0000000
---- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/signal.go
-+++ /dev/null
-@@ -1,49 +0,0 @@
--// Copyright 2014 go-dockerclient authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
-
--package docker
+- return access, err
+-}
-
--// Signal represents a signal that can be send to the container on
--// KillContainer call.
--type Signal int
+-// Authenticate() grants access to the OpenStack-compatible provider API.
+-//
+-// Providers are identified through a unique key string.
+-// See the RegisterProvider() method for more details.
+-//
+-// The supplied AuthOptions instance allows the client to specify only those credentials
+-// relevant for the authentication request. At present, support exists for OpenStack
+-// Identity V2 API only; support for V3 will become available as soon as documentation for it
+-// becomes readily available.
+-//
+-// For Identity V2 API requirements, you must provide at least the Username and Password
+-// options. The TenantId field is optional, and defaults to "".
+-func (c *Context) Authenticate(provider string, options AuthOptions) (*Access, error) {
+- p, err := c.ProviderByName(provider)
+- if err != nil {
+- return nil, err
+- }
+- return c.papersPlease(p, options)
+-}
-
--// These values represent all signals available on Linux, where containers will
--// be running.
--const (
-- SIGABRT = Signal(0x6)
-- SIGALRM = Signal(0xe)
-- SIGBUS = Signal(0x7)
-- SIGCHLD = Signal(0x11)
-- SIGCLD = Signal(0x11)
-- SIGCONT = Signal(0x12)
-- SIGFPE = Signal(0x8)
-- SIGHUP = Signal(0x1)
-- SIGILL = Signal(0x4)
-- SIGINT = Signal(0x2)
-- SIGIO = Signal(0x1d)
-- SIGIOT = Signal(0x6)
-- SIGKILL = Signal(0x9)
-- SIGPIPE = Signal(0xd)
-- SIGPOLL = Signal(0x1d)
-- SIGPROF = Signal(0x1b)
-- SIGPWR = Signal(0x1e)
-- SIGQUIT = Signal(0x3)
-- SIGSEGV = Signal(0xb)
-- SIGSTKFLT = Signal(0x10)
-- SIGSTOP = Signal(0x13)
-- SIGSYS = Signal(0x1f)
-- SIGTERM = Signal(0xf)
-- SIGTRAP = Signal(0x5)
-- SIGTSTP = Signal(0x14)
-- SIGTTIN = Signal(0x15)
-- SIGTTOU = Signal(0x16)
-- SIGUNUSED = Signal(0x1f)
-- SIGURG = Signal(0x17)
-- SIGUSR1 = Signal(0xa)
-- SIGUSR2 = Signal(0xc)
-- SIGVTALRM = Signal(0x1a)
-- SIGWINCH = Signal(0x1c)
-- SIGXCPU = Signal(0x18)
-- SIGXFSZ = Signal(0x19)
--)
-diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/stdcopy.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/stdcopy.go
-deleted file mode 100644
-index 3782f3d..0000000
---- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/stdcopy.go
-+++ /dev/null
-@@ -1,91 +0,0 @@
--// Copyright 2014 Docker authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the DOCKER-LICENSE file.
+-// Reauthenticate attempts to reauthenticate using the configured access credentials, if
+-// allowed. This method takes no action unless your AuthOptions has the AllowReauth flag
+-// set to true.
+-func (a *Access) Reauthenticate() error {
+- var other *Access
+- var err error
-
--package docker
+- if a.options.AllowReauth {
+- other, err = a.context.papersPlease(a.provider, a.options)
+- if err == nil {
+- *a = *other
+- }
+- }
+- return err
+-}
-
--import (
-- "encoding/binary"
-- "errors"
-- "io"
--)
+-// See AccessProvider interface definition for details.
+-func (a *Access) FirstEndpointUrlByCriteria(ac ApiCriteria) string {
+- ep := FindFirstEndpointByCriteria(a.ServiceCatalog, ac)
+- urls := []string{ep.PublicURL, ep.InternalURL}
+- return urls[ac.UrlChoice]
+-}
-
--const (
-- stdWriterPrefixLen = 8
-- stdWriterFdIndex = 0
-- stdWriterSizeIndex = 4
--)
+-// See AccessProvider interface definition for details.
+-func (a *Access) AuthToken() string {
+- return a.Token.Id
+-}
-
--var errInvalidStdHeader = errors.New("Unrecognized input header")
+-// See AccessProvider interface definition for details.
+-func (a *Access) Revoke(tok string) error {
+- url := a.provider.AuthEndpoint + "/" + tok
+- err := perigee.Delete(url, perigee.Options{
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": a.AuthToken(),
+- },
+- OkCodes: []int{204},
+- })
+- return err
+-}
-
--func stdCopy(dstout, dsterr io.Writer, src io.Reader) (written int64, err error) {
-- var (
-- buf = make([]byte, 32*1024+stdWriterPrefixLen+1)
-- bufLen = len(buf)
-- nr, nw int
-- er, ew error
-- out io.Writer
-- frameSize int
-- )
-- for {
-- for nr < stdWriterPrefixLen {
-- var nr2 int
-- nr2, er = src.Read(buf[nr:])
-- if er == io.EOF {
-- if nr < stdWriterPrefixLen && nr2 < stdWriterPrefixLen {
-- return written, nil
-- }
-- nr += nr2
-- break
-- } else if er != nil {
-- return 0, er
-- }
-- nr += nr2
-- }
-- switch buf[stdWriterFdIndex] {
-- case 0:
-- fallthrough
-- case 1:
-- out = dstout
-- case 2:
-- out = dsterr
-- default:
-- return 0, errInvalidStdHeader
-- }
-- frameSize = int(binary.BigEndian.Uint32(buf[stdWriterSizeIndex : stdWriterSizeIndex+4]))
-- if frameSize+stdWriterPrefixLen > bufLen {
-- buf = append(buf, make([]byte, frameSize+stdWriterPrefixLen-len(buf)+1)...)
-- bufLen = len(buf)
-- }
-- for nr < frameSize+stdWriterPrefixLen {
-- var nr2 int
-- nr2, er = src.Read(buf[nr:])
-- if er == io.EOF {
-- if nr == 0 {
-- return written, nil
-- }
-- nr += nr2
-- break
-- } else if er != nil {
-- return 0, er
-- }
-- nr += nr2
-- }
-- bound := frameSize + stdWriterPrefixLen
-- if bound > nr {
-- bound = nr
-- }
-- nw, ew = out.Write(buf[stdWriterPrefixLen:bound])
-- if nw > 0 {
-- written += int64(nw)
-- }
-- if ew != nil {
-- return 0, ew
-- }
-- if nw != frameSize {
-- return written, io.ErrShortWrite
-- }
-- copy(buf, buf[frameSize+stdWriterPrefixLen:])
-- nr -= frameSize + stdWriterPrefixLen
-- }
+-// See ServiceCatalogerForIdentityV2 interface definition for details.
+-// Note that the raw slice is returend; be careful not to alter the fields of any members,
+-// for other components of Gophercloud may depend upon them.
+-// If this becomes a problem in the future,
+-// a future revision may return a deep-copy of the service catalog instead.
+-func (a *Access) V2ServiceCatalog() []CatalogEntry {
+- return a.ServiceCatalog
-}
-diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/stdcopy_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/stdcopy_test.go
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/authenticate_test.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/authenticate_test.go
deleted file mode 100644
-index 75b8922..0000000
---- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/stdcopy_test.go
+index b05c780..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/authenticate_test.go
+++ /dev/null
-@@ -1,255 +0,0 @@
--// Copyright 2014 go-dockerclient authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the DOCKER-LICENSE file.
--
--package docker
+@@ -1,264 +0,0 @@
+-package gophercloud
-
-import (
-- "bytes"
-- "encoding/binary"
-- "errors"
-- "io"
-- "strings"
+- "net/http"
- "testing"
-- "testing/iotest"
-)
-
--type errorWriter struct {
+-const SUCCESSFUL_RESPONSE = `{
+- "access": {
+- "serviceCatalog": [{
+- "endpoints": [{
+- "publicURL": "https://ord.servers.api.rackspacecloud.com/v2/12345",
+- "region": "ORD",
+- "tenantId": "12345",
+- "versionId": "2",
+- "versionInfo": "https://ord.servers.api.rackspacecloud.com/v2",
+- "versionList": "https://ord.servers.api.rackspacecloud.com/"
+- },{
+- "publicURL": "https://dfw.servers.api.rackspacecloud.com/v2/12345",
+- "region": "DFW",
+- "tenantId": "12345",
+- "versionId": "2",
+- "versionInfo": "https://dfw.servers.api.rackspacecloud.com/v2",
+- "versionList": "https://dfw.servers.api.rackspacecloud.com/"
+- }],
+- "name": "cloudServersOpenStack",
+- "type": "compute"
+- },{
+- "endpoints": [{
+- "publicURL": "https://ord.databases.api.rackspacecloud.com/v1.0/12345",
+- "region": "ORD",
+- "tenantId": "12345"
+- }],
+- "name": "cloudDatabases",
+- "type": "rax:database"
+- }],
+- "token": {
+- "expires": "2012-04-13T13:15:00.000-05:00",
+- "id": "aaaaa-bbbbb-ccccc-dddd"
+- },
+- "user": {
+- "RAX-AUTH:defaultRegion": "DFW",
+- "id": "161418",
+- "name": "demoauthor",
+- "roles": [{
+- "description": "User Admin Role.",
+- "id": "3",
+- "name": "identity:user-admin"
+- }]
+- }
+- }
-}
+-`
-
--func (errorWriter) Write([]byte) (int, error) {
-- return 0, errors.New("something went wrong")
--}
+-func TestAuthProvider(t *testing.T) {
+- tt := newTransport().WithResponse(SUCCESSFUL_RESPONSE)
+- c := TestContext().UseCustomClient(&http.Client{
+- Transport: tt,
+- })
-
--func TestStdCopy(t *testing.T) {
-- var input, stdout, stderr bytes.Buffer
-- input.Write([]byte{2, 0, 0, 0, 0, 0, 0, 19})
-- input.Write([]byte("something happened!"))
-- input.Write([]byte{1, 0, 0, 0, 0, 0, 0, 12})
-- input.Write([]byte("just kidding"))
-- input.Write([]byte{0, 0, 0, 0, 0, 0, 0, 6})
-- input.Write([]byte("\nyeah!"))
-- n, err := stdCopy(&stdout, &stderr, &input)
-- if err != nil {
-- t.Fatal(err)
-- }
-- if expected := int64(19 + 12 + 6); n != expected {
-- t.Errorf("Wrong number of bytes. Want %d. Got %d.", expected, n)
-- }
-- if got := stderr.String(); got != "something happened!" {
-- t.Errorf("stdCopy: wrong stderr. Want %q. Got %q.", "something happened!", got)
+- _, err := c.Authenticate("", AuthOptions{})
+- if err == nil {
+- t.Error("Expected error for empty provider string")
+- return
- }
-- if got := stdout.String(); got != "just kidding\nyeah!" {
-- t.Errorf("stdCopy: wrong stdout. Want %q. Got %q.", "just kidding\nyeah!", got)
+- _, err = c.Authenticate("unknown-provider", AuthOptions{Username: "u", Password: "p"})
+- if err == nil {
+- t.Error("Expected error for unknown service provider")
+- return
- }
--}
-
--func TestStdCopyStress(t *testing.T) {
-- var input, stdout, stderr bytes.Buffer
-- value := strings.Repeat("something ", 4096)
-- writer := newStdWriter(&input, Stdout)
-- writer.Write([]byte(value))
-- n, err := stdCopy(&stdout, &stderr, &input)
+- err = c.RegisterProvider("provider", Provider{AuthEndpoint: "/"})
- if err != nil {
-- t.Fatal(err)
-- }
-- if n != 40960 {
-- t.Errorf("Wrong number of bytes. Want 40960. Got %d.", n)
+- t.Error(err)
+- return
- }
-- if got := stderr.String(); got != "" {
-- t.Errorf("stdCopy: wrong stderr. Want empty string. Got %q", got)
+- _, err = c.Authenticate("provider", AuthOptions{Username: "u", Password: "p"})
+- if err != nil {
+- t.Error(err)
+- return
- }
-- if got := stdout.String(); got != value {
-- t.Errorf("stdCopy: wrong stdout. Want %q. Got %q", value, got)
+- if tt.called != 1 {
+- t.Error("Expected transport to be called once.")
+- return
- }
-}
-
--func TestStdCopyInvalidStdHeader(t *testing.T) {
-- var input, stdout, stderr bytes.Buffer
-- input.Write([]byte{3, 0, 0, 0, 0, 0, 0, 19})
-- n, err := stdCopy(&stdout, &stderr, &input)
-- if n != 0 {
-- t.Errorf("stdCopy: wrong number of bytes. Want 0. Got %d", n)
-- }
-- if err != errInvalidStdHeader {
-- t.Errorf("stdCopy: wrong error. Want ErrInvalidStdHeader. Got %#v", err)
-- }
--}
+-func TestTenantIdEncoding(t *testing.T) {
+- tt := newTransport().WithResponse(SUCCESSFUL_RESPONSE)
+- c := TestContext().
+- UseCustomClient(&http.Client{
+- Transport: tt,
+- }).
+- WithProvider("provider", Provider{AuthEndpoint: "/"})
-
--func TestStdCopyBigFrame(t *testing.T) {
-- var input, stdout, stderr bytes.Buffer
-- input.Write([]byte{2, 0, 0, 0, 0, 0, 0, 18})
-- input.Write([]byte("something happened!"))
-- n, err := stdCopy(&stdout, &stderr, &input)
+- tt.IgnoreTenantId()
+- _, err := c.Authenticate("provider", AuthOptions{
+- Username: "u",
+- Password: "p",
+- })
- if err != nil {
-- t.Fatal(err)
+- t.Error(err)
+- return
- }
-- if expected := int64(18); n != expected {
-- t.Errorf("Wrong number of bytes. Want %d. Got %d.", expected, n)
+- if tt.tenantIdFound {
+- t.Error("Tenant ID should not have been encoded")
+- return
- }
-- if got := stderr.String(); got != "something happened" {
-- t.Errorf("stdCopy: wrong stderr. Want %q. Got %q.", "something happened", got)
+-
+- tt.ExpectTenantId()
+- _, err = c.Authenticate("provider", AuthOptions{
+- Username: "u",
+- Password: "p",
+- TenantId: "t",
+- })
+- if err != nil {
+- t.Error(err)
+- return
- }
-- if got := stdout.String(); got != "" {
-- t.Errorf("stdCopy: wrong stdout. Want %q. Got %q.", "", got)
+- if !tt.tenantIdFound {
+- t.Error("Tenant ID should have been encoded")
+- return
- }
-}
-
--func TestStdCopySmallFrame(t *testing.T) {
-- var input, stdout, stderr bytes.Buffer
-- input.Write([]byte{2, 0, 0, 0, 0, 0, 0, 20})
-- input.Write([]byte("something happened!"))
-- n, err := stdCopy(&stdout, &stderr, &input)
-- if err != io.ErrShortWrite {
-- t.Errorf("stdCopy: wrong error. Want ShortWrite. Got %#v", err)
-- }
-- if expected := int64(19); n != expected {
-- t.Errorf("Wrong number of bytes. Want %d. Got %d.", expected, n)
-- }
-- if got := stderr.String(); got != "something happened!" {
-- t.Errorf("stdCopy: wrong stderr. Want %q. Got %q.", "something happened", got)
+-func TestUserNameAndPassword(t *testing.T) {
+- c := TestContext().
+- WithProvider("provider", Provider{AuthEndpoint: "http://localhost/"}).
+- UseCustomClient(&http.Client{Transport: newTransport().WithResponse(SUCCESSFUL_RESPONSE)})
+-
+- credentials := []AuthOptions{
+- {},
+- {Username: "u"},
+- {Password: "p"},
- }
-- if got := stdout.String(); got != "" {
-- t.Errorf("stdCopy: wrong stdout. Want %q. Got %q.", "", got)
+- for i, auth := range credentials {
+- _, err := c.Authenticate("provider", auth)
+- if err == nil {
+- t.Error("Expected error from missing credentials (%d)", i)
+- return
+- }
- }
--}
-
--func TestStdCopyEmpty(t *testing.T) {
-- var input, stdout, stderr bytes.Buffer
-- n, err := stdCopy(&stdout, &stderr, &input)
+- _, err := c.Authenticate("provider", AuthOptions{Username: "u", Password: "p"})
- if err != nil {
-- t.Fatal(err)
-- }
-- if n != 0 {
-- t.Errorf("stdCopy: wrong number of bytes. Want 0. Got %d.", n)
+- t.Error(err)
+- return
- }
-}
-
--func TestStdCopyCorruptedHeader(t *testing.T) {
-- var input, stdout, stderr bytes.Buffer
-- input.Write([]byte{2, 0, 0, 0, 0})
-- n, err := stdCopy(&stdout, &stderr, &input)
-- if err != nil {
-- t.Fatal(err)
+-func TestUserNameAndApiKey(t *testing.T) {
+- c := TestContext().
+- WithProvider("provider", Provider{AuthEndpoint: "http://localhost/"}).
+- UseCustomClient(&http.Client{Transport: newTransport().WithResponse(SUCCESSFUL_RESPONSE)})
+-
+- credentials := []AuthOptions{
+- {},
+- {Username: "u"},
+- {ApiKey: "a"},
- }
-- if n != 0 {
-- t.Errorf("stdCopy: wrong number of bytes. Want 0. Got %d.", n)
+- for i, auth := range credentials {
+- _, err := c.Authenticate("provider", auth)
+- if err == nil {
+- t.Error("Expected error from missing credentials (%d)", i)
+- return
+- }
- }
--}
-
--func TestStdCopyTruncateWriter(t *testing.T) {
-- var input, stdout, stderr bytes.Buffer
-- input.Write([]byte{2, 0, 0, 0, 0, 0, 0, 19})
-- input.Write([]byte("something happened!"))
-- n, err := stdCopy(&stdout, iotest.TruncateWriter(&stderr, 7), &input)
+- _, err := c.Authenticate("provider", AuthOptions{Username: "u", ApiKey: "a"})
- if err != nil {
-- t.Fatal(err)
-- }
-- if expected := int64(19); n != expected {
-- t.Errorf("Wrong number of bytes. Want %d. Got %d.", expected, n)
-- }
-- if got := stderr.String(); got != "somethi" {
-- t.Errorf("stdCopy: wrong stderr. Want %q. Got %q.", "somethi", got)
-- }
-- if got := stdout.String(); got != "" {
-- t.Errorf("stdCopy: wrong stdout. Want %q. Got %q.", "", got)
+- t.Error(err)
+- return
- }
-}
-
--func TestStdCopyHeaderOnly(t *testing.T) {
-- var input, stdout, stderr bytes.Buffer
-- input.Write([]byte{2, 0, 0, 0, 0, 0, 0, 19})
-- n, err := stdCopy(&stdout, iotest.TruncateWriter(&stderr, 7), &input)
-- if err != io.ErrShortWrite {
-- t.Errorf("stdCopy: wrong error. Want ShortWrite. Got %#v", err)
-- }
-- if n != 0 {
-- t.Errorf("Wrong number of bytes. Want 0. Got %d.", n)
-- }
-- if got := stderr.String(); got != "" {
-- t.Errorf("stdCopy: wrong stderr. Want %q. Got %q.", "", got)
+-func TestTokenAcquisition(t *testing.T) {
+- c := TestContext().
+- UseCustomClient(&http.Client{Transport: newTransport().WithResponse(SUCCESSFUL_RESPONSE)}).
+- WithProvider("provider", Provider{AuthEndpoint: "http://localhost/"})
+-
+- acc, err := c.Authenticate("provider", AuthOptions{Username: "u", Password: "p"})
+- if err != nil {
+- t.Error(err)
+- return
- }
-- if got := stdout.String(); got != "" {
-- t.Errorf("stdCopy: wrong stdout. Want %q. Got %q.", "", got)
+-
+- tok := acc.Token
+- if (tok.Id == "") || (tok.Expires == "") {
+- t.Error("Expected a valid token for successful login; got %s, %s", tok.Id, tok.Expires)
+- return
- }
-}
-
--func TestStdCopyDataErrReader(t *testing.T) {
-- var input, stdout, stderr bytes.Buffer
-- input.Write([]byte{2, 0, 0, 0, 0, 0, 0, 19})
-- input.Write([]byte("something happened!"))
-- n, err := stdCopy(&stdout, &stderr, iotest.DataErrReader(&input))
+-func TestServiceCatalogAcquisition(t *testing.T) {
+- c := TestContext().
+- UseCustomClient(&http.Client{Transport: newTransport().WithResponse(SUCCESSFUL_RESPONSE)}).
+- WithProvider("provider", Provider{AuthEndpoint: "http://localhost/"})
+-
+- acc, err := c.Authenticate("provider", AuthOptions{Username: "u", Password: "p"})
- if err != nil {
-- t.Fatal(err)
-- }
-- if expected := int64(19); n != expected {
-- t.Errorf("Wrong number of bytes. Want %d. Got %d.", expected, n)
-- }
-- if got := stderr.String(); got != "something happened!" {
-- t.Errorf("stdCopy: wrong stderr. Want %q. Got %q.", "something happened!", got)
-- }
-- if got := stdout.String(); got != "" {
-- t.Errorf("stdCopy: wrong stdout. Want %q. Got %q.", "", got)
+- t.Error(err)
+- return
- }
--}
-
--func TestStdCopyTimeoutReader(t *testing.T) {
-- var input, stdout, stderr bytes.Buffer
-- input.Write([]byte{2, 0, 0, 0, 0, 0, 0, 19})
-- input.Write([]byte("something happened!"))
-- _, err := stdCopy(&stdout, &stderr, iotest.TimeoutReader(&input))
-- if err != iotest.ErrTimeout {
-- t.Errorf("stdCopy: wrong error. Want ErrTimeout. Got %#v.", err)
+- svcs := acc.ServiceCatalog
+- if len(svcs) < 2 {
+- t.Error("Expected 2 service catalog entries; got %d", len(svcs))
+- return
- }
--}
-
--func TestStdCopyWriteError(t *testing.T) {
-- var input bytes.Buffer
-- input.Write([]byte{2, 0, 0, 0, 0, 0, 0, 19})
-- input.Write([]byte("something happened!"))
-- var stdout, stderr errorWriter
-- n, err := stdCopy(stdout, stderr, &input)
-- if err.Error() != "something went wrong" {
-- t.Errorf("stdCopy: wrong error. Want %q. Got %q", "something went wrong", err)
+- types := map[string]bool{
+- "compute": true,
+- "rax:database": true,
- }
-- if n != 0 {
-- t.Errorf("stdCopy: wrong number of bytes. Want 0. Got %d.", n)
+- for _, entry := range svcs {
+- if !types[entry.Type] {
+- t.Error("Expected to find type %s.", entry.Type)
+- return
+- }
- }
-}
-
--type StdType [8]byte
--
--var (
-- Stdin = StdType{0: 0}
-- Stdout = StdType{0: 1}
-- Stderr = StdType{0: 2}
--)
--
--type StdWriter struct {
-- io.Writer
-- prefix StdType
-- sizeBuf []byte
--}
--
--func (w *StdWriter) Write(buf []byte) (n int, err error) {
-- if w == nil || w.Writer == nil {
-- return 0, errors.New("Writer not instanciated")
-- }
-- binary.BigEndian.PutUint32(w.prefix[4:], uint32(len(buf)))
-- buf = append(w.prefix[:], buf...)
--
-- n, err = w.Writer.Write(buf)
-- return n - 8, err
--}
+-func TestUserAcquisition(t *testing.T) {
+- c := TestContext().
+- UseCustomClient(&http.Client{Transport: newTransport().WithResponse(SUCCESSFUL_RESPONSE)}).
+- WithProvider("provider", Provider{AuthEndpoint: "http://localhost/"})
-
--func newStdWriter(w io.Writer, t StdType) *StdWriter {
-- if len(t) != 8 {
-- return nil
+- acc, err := c.Authenticate("provider", AuthOptions{Username: "u", Password: "p"})
+- if err != nil {
+- t.Error(err)
+- return
- }
-
-- return &StdWriter{
-- Writer: w,
-- prefix: t,
-- sizeBuf: make([]byte, 4),
+- u := acc.User
+- if u.Id != "161418" {
+- t.Error("Expected user ID of 16148; got", u.Id)
+- return
- }
-}
-diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/Dockerfile b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/Dockerfile
-deleted file mode 100644
-index 0948dcf..0000000
---- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/Dockerfile
-+++ /dev/null
-@@ -1,15 +0,0 @@
--# this file describes how to build tsuru python image
--# to run it:
--# 1- install docker
--# 2- run: $ docker build -t tsuru/python https://raw.github.com/tsuru/basebuilder/master/python/Dockerfile
--
--from base:ubuntu-quantal
--run apt-get install wget -y --force-yes
--run wget http://github.com/tsuru/basebuilder/tarball/master -O basebuilder.tar.gz --no-check-certificate
--run mkdir /var/lib/tsuru
--run tar -xvf basebuilder.tar.gz -C /var/lib/tsuru --strip 1
--run cp /var/lib/tsuru/python/deploy /var/lib/tsuru
--run cp /var/lib/tsuru/base/restart /var/lib/tsuru
--run cp /var/lib/tsuru/base/start /var/lib/tsuru
--run /var/lib/tsuru/base/install
--run /var/lib/tsuru/base/setup
-diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/container.tar b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/container.tar
-deleted file mode 100644
-index e4b066e3b6df8cb78ac445a34234f3780d164cf4..0000000000000000000000000000000000000000
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 2048
-zcmeH_Q3``F42FH)DgF~kTC`qZ7s*`9%A^%r$Bu89Fp<6NMew1akmheFe?H>)Y5N#5
-z`(UT)m>?q4G^iwZ#(XmAwH8Ujv`|_rQd)Ig3sQ!(szArs+5bAH%#&Di1HU}iJx_zp
-z+3uU9k~Zgl)J<3?S%)LS_Hgc7e)t4AX&%Rz>>WAcX2Ec>82D}md=O1Y)p%bo=N_rJ
-OD+CIGLZA@%gTMmt=q{T8
-
-diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/dockerfile.tar b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/dockerfile.tar
-deleted file mode 100644
-index 32c9ce64704835cd096b85ac44c35b5087b5ccdd..0000000000000000000000000000000000000000
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 2560
-zcmeHGy>8<$49;3V1%d0TNOs}`$a>xT46-c8LTt+?QB8ACf0XPiQll-<p+kUZFvXvb
-z{76$zR-LqKOs7{rc7zbS?G{!f_q$z^qL_3tiM%LE$cs&}-<R8RFF at p*a#OBA{1~IF
-z#KEI<M2)`Q_$$ZaN?}d2uwARM6CtMNqP&sw3$QgF;sQXey>h0~9$I?_v`_`p)qp;@
-z0OJK)JAmosQD=m*-~y?5ASGvD1{zS;L7n!AYz2z}2Y8%Kb25fgK0fDb5l4UE+{yF$
-zXs`{{TG^hbn!J);Cl1>2UV0=k!T8hL+GbhfZ2u5L51|SJ2KFb&fyiW3|3Qw(jvC+i
-zouk4oz*u9Q((Iyric9uLhPZsmgZ8ANMrS_2p5cn+n!M}dU&=mMrdq8|OlgOvF-oFN
-zh5A!%9Pk(EcxS4q(c~Z~u-BL7!+gIN2&&-GnGy1YRpY|{e@?X?J9}9;KY_$PxYO}H
-o;5QJT#=q||{Y*ZuNn-Gk-)jtGb|Y`+PV+v2`vmS2xaA4_1I+dVl>h($
-
-diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/server.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/server.go
-deleted file mode 100644
-index e2ca1d9..0000000
---- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/server.go
-+++ /dev/null
-@@ -1,692 +0,0 @@
--// Copyright 2014 go-dockerclient authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--// Package testing provides a fake implementation of the Docker API, useful for
--// testing purpose.
--package testing
--
--import (
-- "archive/tar"
-- "crypto/rand"
-- "encoding/json"
-- "errors"
-- "fmt"
-- mathrand "math/rand"
-- "net"
-- "net/http"
-- "regexp"
-- "strconv"
-- "strings"
-- "sync"
-- "time"
--
-- "github.com/fsouza/go-dockerclient"
-- "github.com/gorilla/mux"
--)
-
--// DockerServer represents a programmable, concurrent (not much), HTTP server
--// implementing a fake version of the Docker remote API.
--//
--// It can used in standalone mode, listening for connections or as an arbitrary
--// HTTP handler.
--//
--// For more details on the remote API, check http://goo.gl/G3plxW.
--type DockerServer struct {
-- containers []*docker.Container
-- cMut sync.RWMutex
-- images []docker.Image
-- iMut sync.RWMutex
-- imgIDs map[string]string
-- listener net.Listener
-- mux *mux.Router
-- hook func(*http.Request)
-- failures map[string]string
-- customHandlers map[string]http.Handler
-- handlerMutex sync.RWMutex
-- cChan chan<- *docker.Container
--}
+-func TestAuthenticationNeverReauths(t *testing.T) {
+- tt := newTransport().WithError(401)
+- c := TestContext().
+- UseCustomClient(&http.Client{Transport: tt}).
+- WithProvider("provider", Provider{AuthEndpoint: "http://localhost"})
-
--// NewServer returns a new instance of the fake server, in standalone mode. Use
--// the method URL to get the URL of the server.
--//
--// It receives the bind address (use 127.0.0.1:0 for getting an available port
--// on the host), a channel of containers and a hook function, that will be
--// called on every request.
--//
--// The fake server will send containers in the channel whenever the container
--// changes its state, via the HTTP API (i.e.: create, start and stop). This
--// channel may be nil, which means that the server won't notify on state
--// changes.
--func NewServer(bind string, containerChan chan<- *docker.Container, hook func(*http.Request)) (*DockerServer, error) {
-- listener, err := net.Listen("tcp", bind)
-- if err != nil {
-- return nil, err
+- _, err := c.Authenticate("provider", AuthOptions{Username: "u", Password: "p"})
+- if err == nil {
+- t.Error("Expected an error from a 401 Unauthorized response")
+- return
- }
-- server := DockerServer{
-- listener: listener,
-- imgIDs: make(map[string]string),
-- hook: hook,
-- failures: make(map[string]string),
-- customHandlers: make(map[string]http.Handler),
-- cChan: containerChan,
+-
+- rc, _ := ActualResponseCode(err)
+- if rc != 401 {
+- t.Error("Expected a 401 error code")
+- return
- }
-- server.buildMuxer()
-- go http.Serve(listener, &server)
-- return &server, nil
--}
-
--func (s *DockerServer) notify(container *docker.Container) {
-- if s.cChan != nil {
-- s.cChan <- container
+- err = tt.VerifyCalls(t, 1)
+- if err != nil {
+- // Test object already flagged.
+- return
- }
-}
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/common_types.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/common_types.go
+deleted file mode 100644
+index 044b308..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/common_types.go
++++ /dev/null
+@@ -1,24 +0,0 @@
+-package gophercloud
-
--func (s *DockerServer) buildMuxer() {
-- s.mux = mux.NewRouter()
-- s.mux.Path("/commit").Methods("POST").HandlerFunc(s.handlerWrapper(s.commitContainer))
-- s.mux.Path("/containers/json").Methods("GET").HandlerFunc(s.handlerWrapper(s.listContainers))
-- s.mux.Path("/containers/create").Methods("POST").HandlerFunc(s.handlerWrapper(s.createContainer))
-- s.mux.Path("/containers/{id:.*}/json").Methods("GET").HandlerFunc(s.handlerWrapper(s.inspectContainer))
-- s.mux.Path("/containers/{id:.*}/top").Methods("GET").HandlerFunc(s.handlerWrapper(s.topContainer))
-- s.mux.Path("/containers/{id:.*}/start").Methods("POST").HandlerFunc(s.handlerWrapper(s.startContainer))
-- s.mux.Path("/containers/{id:.*}/stop").Methods("POST").HandlerFunc(s.handlerWrapper(s.stopContainer))
-- s.mux.Path("/containers/{id:.*}/pause").Methods("POST").HandlerFunc(s.handlerWrapper(s.pauseContainer))
-- s.mux.Path("/containers/{id:.*}/unpause").Methods("POST").HandlerFunc(s.handlerWrapper(s.unpauseContainer))
-- s.mux.Path("/containers/{id:.*}/wait").Methods("POST").HandlerFunc(s.handlerWrapper(s.waitContainer))
-- s.mux.Path("/containers/{id:.*}/attach").Methods("POST").HandlerFunc(s.handlerWrapper(s.attachContainer))
-- s.mux.Path("/containers/{id:.*}").Methods("DELETE").HandlerFunc(s.handlerWrapper(s.removeContainer))
-- s.mux.Path("/images/create").Methods("POST").HandlerFunc(s.handlerWrapper(s.pullImage))
-- s.mux.Path("/build").Methods("POST").HandlerFunc(s.handlerWrapper(s.buildImage))
-- s.mux.Path("/images/json").Methods("GET").HandlerFunc(s.handlerWrapper(s.listImages))
-- s.mux.Path("/images/{id:.*}").Methods("DELETE").HandlerFunc(s.handlerWrapper(s.removeImage))
-- s.mux.Path("/images/{name:.*}/json").Methods("GET").HandlerFunc(s.handlerWrapper(s.inspectImage))
-- s.mux.Path("/images/{name:.*}/push").Methods("POST").HandlerFunc(s.handlerWrapper(s.pushImage))
-- s.mux.Path("/events").Methods("GET").HandlerFunc(s.listEvents)
-- s.mux.Path("/_ping").Methods("GET").HandlerFunc(s.handlerWrapper(s.pingDocker))
-- s.mux.Path("/images/load").Methods("POST").HandlerFunc(s.handlerWrapper(s.loadImage))
-- s.mux.Path("/images/{id:.*}/get").Methods("GET").HandlerFunc(s.handlerWrapper(s.getImage))
+-// Link is used for JSON (un)marshalling.
+-// It provides RESTful links to a resource.
+-type Link struct {
+- Href string `json:"href"`
+- Rel string `json:"rel"`
+- Type string `json:"type"`
-}
-
--// PrepareFailure adds a new expected failure based on a URL regexp it receives
--// an id for the failure.
--func (s *DockerServer) PrepareFailure(id string, urlRegexp string) {
-- s.failures[id] = urlRegexp
+-// FileConfig structures represent a blob of data which must appear at a
+-// a specific location in a server's filesystem. The file contents are
+-// base-64 encoded.
+-type FileConfig struct {
+- Path string `json:"path"`
+- Contents string `json:"contents"`
-}
-
--// ResetFailure removes an expected failure identified by the given id.
--func (s *DockerServer) ResetFailure(id string) {
-- delete(s.failures, id)
+-// NetworkConfig structures represent an affinity between a server and a
+-// specific, uniquely identified network. Networks are identified through
+-// universally unique IDs.
+-type NetworkConfig struct {
+- Uuid string `json:"uuid"`
-}
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/context.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/context.go
+deleted file mode 100644
+index e753c8b..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/context.go
++++ /dev/null
+@@ -1,150 +0,0 @@
+-package gophercloud
-
--// CustomHandler registers a custom handler for a specific path.
--//
--// For example:
+-import (
+- "net/http"
+- "strings"
+- "fmt"
+- "github.com/tonnerre/golang-pretty"
+-)
+-
+-// Provider structures exist for each tangible provider of OpenStack service.
+-// For example, Rackspace, Hewlett-Packard, and NASA might have their own instance of this structure.
-//
--// server.CustomHandler("/containers/json", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
--// http.Error(w, "Something wrong is not right", http.StatusInternalServerError)
--// }))
--func (s *DockerServer) CustomHandler(path string, handler http.Handler) {
-- s.handlerMutex.Lock()
-- s.customHandlers[path] = handler
-- s.handlerMutex.Unlock()
+-// At a minimum, a provider must expose an authentication endpoint.
+-type Provider struct {
+- AuthEndpoint string
-}
-
--// MutateContainer changes the state of a container, returning an error if the
--// given id does not match to any container "running" in the server.
--func (s *DockerServer) MutateContainer(id string, state docker.State) error {
-- for _, container := range s.containers {
-- if container.ID == id {
-- container.State = state
-- return nil
-- }
-- }
-- return errors.New("container not found")
--}
+-// ReauthHandlerFunc functions are responsible for somehow performing the task of
+-// reauthentication.
+-type ReauthHandlerFunc func(AccessProvider) error
-
--// Stop stops the server.
--func (s *DockerServer) Stop() {
-- if s.listener != nil {
-- s.listener.Close()
-- }
--}
+-// Context structures encapsulate Gophercloud-global state in a manner which
+-// facilitates easier unit testing. As a user of this SDK, you'll never
+-// have to use this structure, except when contributing new code to the SDK.
+-type Context struct {
+- // providerMap serves as a directory of supported providers.
+- providerMap map[string]Provider
-
--// URL returns the HTTP URL of the server.
--func (s *DockerServer) URL() string {
-- if s.listener == nil {
-- return ""
-- }
-- return "http://" + s.listener.Addr().String() + "/"
+- // httpClient refers to the current HTTP client interface to use.
+- httpClient *http.Client
+-
+- // reauthHandler provides the functionality needed to re-authenticate
+- // if that feature is enabled. Note: in order to allow for automatic
+- // re-authentication, the Context object will need to remember your
+- // username, password, and tenant ID as provided in the initial call
+- // to Authenticate(). If you do not desire this, you'll need to handle
+- // reauthentication yourself through other means. Two methods exist:
+- // the first approach is to just handle errors yourself at the application
+- // layer, and the other is through a custom reauthentication handler
+- // set through the WithReauthHandler() method.
+- reauthHandler ReauthHandlerFunc
-}
-
--// ServeHTTP handles HTTP requests sent to the server.
--func (s *DockerServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-- s.handlerMutex.RLock()
-- defer s.handlerMutex.RUnlock()
-- if handler, ok := s.customHandlers[r.URL.Path]; ok {
-- handler.ServeHTTP(w, r)
-- return
-- }
-- s.mux.ServeHTTP(w, r)
-- if s.hook != nil {
-- s.hook(r)
+-// TestContext yields a new Context instance, pre-initialized with a barren
+-// state suitable for per-unit-test customization. This configuration consists
+-// of:
+-//
+-// * An empty provider map.
+-//
+-// * An HTTP client built by the net/http package (see http://godoc.org/net/http#Client).
+-func TestContext() *Context {
+- return &Context{
+- providerMap: make(map[string]Provider),
+- httpClient: &http.Client{},
+- reauthHandler: func(acc AccessProvider) error {
+- return acc.Reauthenticate()
+- },
- }
-}
-
--// Returns default http.Handler mux, it allows customHandlers to call the
--// default behavior if wanted.
--func (s *DockerServer) DefaultHandler() http.Handler {
-- return s.mux
+-// UseCustomClient configures the context to use a customized HTTP client
+-// instance. By default, TestContext() will return a Context which uses
+-// the net/http package's default client instance.
+-func (c *Context) UseCustomClient(hc *http.Client) *Context {
+- c.httpClient = hc
+- return c
-}
-
--func (s *DockerServer) handlerWrapper(f func(http.ResponseWriter, *http.Request)) func(http.ResponseWriter, *http.Request) {
-- return func(w http.ResponseWriter, r *http.Request) {
-- for errorID, urlRegexp := range s.failures {
-- matched, err := regexp.MatchString(urlRegexp, r.URL.Path)
-- if err != nil {
-- http.Error(w, err.Error(), http.StatusBadRequest)
-- return
-- }
-- if !matched {
-- continue
-- }
-- http.Error(w, errorID, http.StatusBadRequest)
-- return
-- }
-- f(w, r)
+-// RegisterProvider allows a unit test to register a mythical provider convenient for testing.
+-// If the provider structure lacks adequate configuration, or the configuration given has some
+-// detectable error, an ErrConfiguration error will result.
+-func (c *Context) RegisterProvider(name string, p Provider) error {
+- if p.AuthEndpoint == "" {
+- return ErrConfiguration
- }
+-
+- c.providerMap[name] = p
+- return nil
-}
-
--func (s *DockerServer) listContainers(w http.ResponseWriter, r *http.Request) {
-- all := r.URL.Query().Get("all")
-- s.cMut.RLock()
-- result := make([]docker.APIContainers, len(s.containers))
-- for i, container := range s.containers {
-- if all == "1" || container.State.Running {
-- result[i] = docker.APIContainers{
-- ID: container.ID,
-- Image: container.Image,
-- Command: fmt.Sprintf("%s %s", container.Path, strings.Join(container.Args, " ")),
-- Created: container.Created.Unix(),
-- Status: container.State.String(),
-- Ports: container.NetworkSettings.PortMappingAPI(),
-- }
-- }
+-// WithProvider offers convenience for unit tests.
+-func (c *Context) WithProvider(name string, p Provider) *Context {
+- err := c.RegisterProvider(name, p)
+- if err != nil {
+- panic(err)
- }
-- s.cMut.RUnlock()
-- w.Header().Set("Content-Type", "application/json")
-- w.WriteHeader(http.StatusOK)
-- json.NewEncoder(w).Encode(result)
+- return c
-}
-
--func (s *DockerServer) listImages(w http.ResponseWriter, r *http.Request) {
-- s.cMut.RLock()
-- result := make([]docker.APIImages, len(s.images))
-- for i, image := range s.images {
-- result[i] = docker.APIImages{
-- ID: image.ID,
-- Created: image.Created.Unix(),
+-// ProviderByName will locate a provider amongst those previously registered, if it exists.
+-// If the named provider has not been registered, an ErrProvider error will result.
+-//
+-// You may also specify a custom Identity API URL.
+-// Any provider name that contains the characters "://", in that order, will be treated as a custom Identity API URL.
+-// Custom URLs, important for private cloud deployments, overrides all provider configurations.
+-func (c *Context) ProviderByName(name string) (p Provider, err error) {
+- for provider, descriptor := range c.providerMap {
+- if name == provider {
+- return descriptor, nil
- }
-- for tag, id := range s.imgIDs {
-- if id == image.ID {
-- result[i].RepoTags = append(result[i].RepoTags, tag)
-- }
+- }
+- if strings.Contains(name, "://") {
+- p = Provider{
+- AuthEndpoint: name,
- }
+- return p, nil
- }
-- s.cMut.RUnlock()
-- w.Header().Set("Content-Type", "application/json")
-- w.WriteHeader(http.StatusOK)
-- json.NewEncoder(w).Encode(result)
+- return Provider{}, ErrProvider
-}
-
--func (s *DockerServer) findImage(id string) (string, error) {
-- s.iMut.RLock()
-- defer s.iMut.RUnlock()
-- image, ok := s.imgIDs[id]
-- if ok {
-- return image, nil
+-func getServiceCatalogFromAccessProvider(provider AccessProvider) ([]CatalogEntry) {
+- access, found := provider.(*Access)
+- if found {
+- return access.ServiceCatalog
+- } else {
+- return nil
- }
-- image, _, err := s.findImageByID(id)
-- return image, err
-}
-
--func (s *DockerServer) findImageByID(id string) (string, int, error) {
-- s.iMut.RLock()
-- defer s.iMut.RUnlock()
-- for i, image := range s.images {
-- if image.ID == id {
-- return image.ID, i, nil
-- }
+-// Instantiates a Cloud Servers API for the provider given.
+-func (c *Context) ServersApi(provider AccessProvider, criteria ApiCriteria) (CloudServersProvider, error) {
+- url := provider.FirstEndpointUrlByCriteria(criteria)
+- if url == "" {
+- var err = fmt.Errorf(
+- "Missing endpoint, or insufficient privileges to access endpoint; criteria = %# v; serviceCatalog = %# v",
+- pretty.Formatter(criteria),
+- pretty.Formatter(getServiceCatalogFromAccessProvider(provider)))
+- return nil, err
- }
-- return "", -1, errors.New("No such image")
+-
+- gcp := &genericServersProvider{
+- endpoint: url,
+- context: c,
+- access: provider,
+- }
+-
+- return gcp, nil
-}
-
--func (s *DockerServer) createContainer(w http.ResponseWriter, r *http.Request) {
-- var config docker.Config
-- defer r.Body.Close()
-- err := json.NewDecoder(r.Body).Decode(&config)
-- if err != nil {
-- http.Error(w, err.Error(), http.StatusBadRequest)
+-// WithReauthHandler configures the context to handle reauthentication attempts using the supplied
+-// funtion. By default, reauthentication happens by invoking Authenticate(), which is unlikely to be
+-// useful in a unit test.
+-//
+-// Do not confuse this function with WithReauth()! Although they work together to support reauthentication,
+-// WithReauth() actually contains the decision-making logic to determine when to perform a reauth,
+-// while WithReauthHandler() is used to configure what a reauth actually entails.
+-func (c *Context) WithReauthHandler(f ReauthHandlerFunc) *Context {
+- c.reauthHandler = f
+- return c
+-}
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/context_test.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/context_test.go
+deleted file mode 100644
+index 2936526..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/context_test.go
++++ /dev/null
+@@ -1,28 +0,0 @@
+-package gophercloud
+-
+-import (
+- "testing"
+-)
+-
+-func TestProviderRegistry(t *testing.T) {
+- c := TestContext()
+-
+- _, err := c.ProviderByName("aProvider")
+- if err == nil {
+- t.Error("Expected error when looking for a provider by non-existant name")
- return
- }
-- image, err := s.findImage(config.Image)
-- if err != nil {
-- http.Error(w, err.Error(), http.StatusNotFound)
+-
+- err = c.RegisterProvider("aProvider", Provider{})
+- if err != ErrConfiguration {
+- t.Error("Unexpected error/nil when registering a provider w/out an auth endpoint\n %s", err)
- return
- }
-- w.WriteHeader(http.StatusCreated)
-- ports := map[docker.Port][]docker.PortBinding{}
-- for port := range config.ExposedPorts {
-- ports[port] = []docker.PortBinding{{
-- HostIp: "0.0.0.0",
-- HostPort: strconv.Itoa(mathrand.Int() % 65536),
-- }}
-- }
-
-- //the container may not have cmd when using a Dockerfile
-- var path string
-- var args []string
-- if len(config.Cmd) == 1 {
-- path = config.Cmd[0]
-- } else if len(config.Cmd) > 1 {
-- path = config.Cmd[0]
-- args = config.Cmd[1:]
+- _ = c.RegisterProvider("aProvider", Provider{AuthEndpoint: "http://localhost/auth"})
+- _, err = c.ProviderByName("aProvider")
+- if err != nil {
+- t.Error(err)
+- return
- }
+-}
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/errors.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/errors.go
+deleted file mode 100644
+index 726ba7e..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/errors.go
++++ /dev/null
+@@ -1,39 +0,0 @@
+-package gophercloud
-
-- container := docker.Container{
-- ID: s.generateID(),
-- Created: time.Now(),
-- Path: path,
-- Args: args,
-- Config: &config,
-- State: docker.State{
-- Running: false,
-- Pid: mathrand.Int() % 50000,
-- ExitCode: 0,
-- StartedAt: time.Now(),
-- },
-- Image: image,
-- NetworkSettings: &docker.NetworkSettings{
-- IPAddress: fmt.Sprintf("172.16.42.%d", mathrand.Int()%250+2),
-- IPPrefixLen: 24,
-- Gateway: "172.16.42.1",
-- Bridge: "docker0",
-- Ports: ports,
-- },
+-import (
+- "fmt"
+-)
+-
+-// ErrNotImplemented should be used only while developing new SDK features.
+-// No established function or method will ever produce this error.
+-var ErrNotImplemented = fmt.Errorf("Not implemented")
+-
+-// ErrProvider errors occur when attempting to reference an unsupported
+-// provider. More often than not, this error happens due to a typo in
+-// the name.
+-var ErrProvider = fmt.Errorf("Missing or incorrect provider")
+-
+-// ErrCredentials errors happen when attempting to authenticate using a
+-// set of credentials not recognized by the Authenticate() method.
+-// For example, not providing a username or password when attempting to
+-// authenticate against an Identity V2 API.
+-var ErrCredentials = fmt.Errorf("Missing or incomplete credentials")
+-
+-// ErrConfiguration errors happen when attempting to add a new provider, and
+-// the provider added lacks a correct or consistent configuration.
+-// For example, all providers must expose at least an Identity V2 API
+-// for authentication; if this endpoint isn't specified, you may receive
+-// this error when attempting to register it against a context.
+-var ErrConfiguration = fmt.Errorf("Missing or incomplete configuration")
+-
+-// ErrError errors happen when you attempt to discover the response code
+-// responsible for a previous request bombing with an error, but pass in an
+-// error interface which doesn't belong to the web client.
+-var ErrError = fmt.Errorf("Attempt to solicit actual HTTP response code from error entity which doesn't know")
+-
+-// WarnUnauthoritative warnings happen when a service believes its response
+-// to be correct, but is not in a position of knowing for sure at the moment.
+-// For example, the service could be responding with cached data that has
+-// exceeded its time-to-live setting, but which has not yet received an official
+-// update from an authoritative source.
+-var WarnUnauthoritative = fmt.Errorf("Unauthoritative data")
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/flavors.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/flavors.go
+deleted file mode 100644
+index eb864d5..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/flavors.go
++++ /dev/null
+@@ -1,55 +0,0 @@
+-package gophercloud
+-
+-import (
+- "github.com/racker/perigee"
+-)
+-
+-// See CloudServersProvider interface for details.
+-func (gsp *genericServersProvider) ListFlavors() ([]Flavor, error) {
+- var fs []Flavor
+-
+- err := gsp.context.WithReauth(gsp.access, func() error {
+- url := gsp.endpoint + "/flavors/detail"
+- return perigee.Get(url, perigee.Options{
+- CustomClient: gsp.context.httpClient,
+- Results: &struct{ Flavors *[]Flavor }{&fs},
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gsp.access.AuthToken(),
+- },
+- })
+- })
+- return fs, err
+-}
+-
+-// FlavorLink provides a reference to a flavor by either ID or by direct URL.
+-// Some services use just the ID, others use just the URL.
+-// This structure provides a common means of expressing both in a single field.
+-type FlavorLink struct {
+- Id string `json:"id"`
+- Links []Link `json:"links"`
+-}
+-
+-// Flavor records represent (virtual) hardware configurations for server resources in a region.
+-//
+-// The Id field contains the flavor's unique identifier.
+-// For example, this identifier will be useful when specifying which hardware configuration to use for a new server instance.
+-//
+-// The Disk and Ram fields provide a measure of storage space offered by the flavor, in GB and MB, respectively.
+-//
+-// The Name field provides a human-readable moniker for the flavor.
+-//
+-// Swap indicates how much space is reserved for swap.
+-// If not provided, this field will be set to 0.
+-//
+-// VCpus indicates how many (virtual) CPUs are available for this flavor.
+-type Flavor struct {
+- OsFlvDisabled bool `json:"OS-FLV-DISABLED:disabled"`
+- Disk int `json:"disk"`
+- Id string `json:"id"`
+- Links []Link `json:"links"`
+- Name string `json:"name"`
+- Ram int `json:"ram"`
+- RxTxFactor float64 `json:"rxtx_factor"`
+- Swap int `json:"swap"`
+- VCpus int `json:"vcpus"`
+-}
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/floating_ips.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/floating_ips.go
+deleted file mode 100644
+index 1163667..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/floating_ips.go
++++ /dev/null
+@@ -1,88 +0,0 @@
+-package gophercloud
+-
+-import (
+- "errors"
+- "fmt"
+- "github.com/racker/perigee"
+-)
+-
+-func (gsp *genericServersProvider) ListFloatingIps() ([]FloatingIp, error) {
+- var fips []FloatingIp
+-
+- err := gsp.context.WithReauth(gsp.access, func() error {
+- url := gsp.endpoint + "/os-floating-ips"
+- return perigee.Get(url, perigee.Options{
+- CustomClient: gsp.context.httpClient,
+- Results: &struct {
+- FloatingIps *[]FloatingIp `json:"floating_ips"`
+- }{&fips},
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gsp.access.AuthToken(),
+- },
+- })
+- })
+- return fips, err
+-}
+-
+-func (gsp *genericServersProvider) CreateFloatingIp(pool string) (FloatingIp, error) {
+- fip := new(FloatingIp)
+-
+- err := gsp.context.WithReauth(gsp.access, func() error {
+- url := gsp.endpoint + "/os-floating-ips"
+- return perigee.Post(url, perigee.Options{
+- CustomClient: gsp.context.httpClient,
+- ReqBody: map[string]string{
+- "pool": pool,
+- },
+- Results: &struct {
+- FloatingIp **FloatingIp `json:"floating_ip"`
+- }{&fip},
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gsp.access.AuthToken(),
+- },
+- })
+- })
+-
+- if fip.Ip == "" {
+- return *fip, errors.New("Error creating floating IP")
- }
-- s.cMut.Lock()
-- s.containers = append(s.containers, &container)
-- s.cMut.Unlock()
-- s.notify(&container)
-- var c = struct{ ID string }{ID: container.ID}
-- json.NewEncoder(w).Encode(c)
+-
+- return *fip, err
+-}
+-
+-func (gsp *genericServersProvider) AssociateFloatingIp(serverId string, ip FloatingIp) error {
+- return gsp.context.WithReauth(gsp.access, func() error {
+- ep := fmt.Sprintf("%s/servers/%s/action", gsp.endpoint, serverId)
+- return perigee.Post(ep, perigee.Options{
+- CustomClient: gsp.context.httpClient,
+- ReqBody: map[string](map[string]string){
+- "addFloatingIp": map[string]string{"address": ip.Ip},
+- },
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gsp.access.AuthToken(),
+- },
+- OkCodes: []int{202},
+- })
+- })
-}
-
--func (s *DockerServer) generateID() string {
-- var buf [16]byte
-- rand.Read(buf[:])
-- return fmt.Sprintf("%x", buf)
+-func (gsp *genericServersProvider) DeleteFloatingIp(ip FloatingIp) error {
+- return gsp.context.WithReauth(gsp.access, func() error {
+- ep := fmt.Sprintf("%s/os-floating-ips/%d", gsp.endpoint, ip.Id)
+- return perigee.Delete(ep, perigee.Options{
+- CustomClient: gsp.context.httpClient,
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gsp.access.AuthToken(),
+- },
+- OkCodes: []int{202},
+- })
+- })
-}
-
--func (s *DockerServer) inspectContainer(w http.ResponseWriter, r *http.Request) {
-- id := mux.Vars(r)["id"]
-- container, _, err := s.findContainer(id)
-- if err != nil {
-- http.Error(w, err.Error(), http.StatusNotFound)
-- return
-- }
-- w.Header().Set("Content-Type", "application/json")
-- w.WriteHeader(http.StatusOK)
-- json.NewEncoder(w).Encode(container)
+-type FloatingIp struct {
+- Id int `json:"id"`
+- Pool string `json:"pool"`
+- Ip string `json:"ip"`
+- FixedIp string `json:"fixed_ip"`
+- InstanceId string `json:"instance_id"`
-}
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/global_context.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/global_context.go
+deleted file mode 100644
+index 89d283b..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/global_context.go
++++ /dev/null
+@@ -1,67 +0,0 @@
+-package gophercloud
-
--func (s *DockerServer) topContainer(w http.ResponseWriter, r *http.Request) {
-- id := mux.Vars(r)["id"]
-- container, _, err := s.findContainer(id)
-- if err != nil {
-- http.Error(w, err.Error(), http.StatusNotFound)
-- return
-- }
-- if !container.State.Running {
-- w.WriteHeader(http.StatusInternalServerError)
-- fmt.Fprintf(w, "Container %s is not running", id)
-- return
-- }
-- w.Header().Set("Content-Type", "application/json")
-- w.WriteHeader(http.StatusOK)
-- result := docker.TopResult{
-- Titles: []string{"UID", "PID", "PPID", "C", "STIME", "TTY", "TIME", "CMD"},
-- Processes: [][]string{
-- {"root", "7535", "7516", "0", "03:20", "?", "00:00:00", container.Path + " " + strings.Join(container.Args, " ")},
-- },
-- }
-- json.NewEncoder(w).Encode(result)
--}
+-import (
+- "github.com/racker/perigee"
+-)
-
--func (s *DockerServer) startContainer(w http.ResponseWriter, r *http.Request) {
-- id := mux.Vars(r)["id"]
-- container, _, err := s.findContainer(id)
-- if err != nil {
-- http.Error(w, err.Error(), http.StatusNotFound)
-- return
-- }
-- s.cMut.Lock()
-- defer s.cMut.Unlock()
-- if container.State.Running {
-- http.Error(w, "Container already running", http.StatusBadRequest)
-- return
-- }
-- container.State.Running = true
-- s.notify(container)
--}
+-// globalContext is the, well, "global context."
+-// Most of this SDK is written in a manner to facilitate easier testing,
+-// which doesn't require all the configuration a real-world application would require.
+-// However, for real-world deployments, applications should be able to rely on a consistent configuration of providers, etc.
+-var globalContext *Context
-
--func (s *DockerServer) stopContainer(w http.ResponseWriter, r *http.Request) {
-- id := mux.Vars(r)["id"]
-- container, _, err := s.findContainer(id)
-- if err != nil {
-- http.Error(w, err.Error(), http.StatusNotFound)
-- return
-- }
-- s.cMut.Lock()
-- defer s.cMut.Unlock()
-- if !container.State.Running {
-- http.Error(w, "Container not running", http.StatusBadRequest)
-- return
-- }
-- w.WriteHeader(http.StatusNoContent)
-- container.State.Running = false
-- s.notify(container)
+-// providers is the set of supported providers.
+-var providers = map[string]Provider{
+- "rackspace-us": {
+- AuthEndpoint: "https://identity.api.rackspacecloud.com/v2.0/tokens",
+- },
+- "rackspace-uk": {
+- AuthEndpoint: "https://lon.identity.api.rackspacecloud.com/v2.0/tokens",
+- },
-}
-
--func (s *DockerServer) pauseContainer(w http.ResponseWriter, r *http.Request) {
-- id := mux.Vars(r)["id"]
-- container, _, err := s.findContainer(id)
-- if err != nil {
-- http.Error(w, err.Error(), http.StatusNotFound)
-- return
-- }
-- s.cMut.Lock()
-- defer s.cMut.Unlock()
-- if container.State.Paused {
-- http.Error(w, "Container already paused", http.StatusBadRequest)
-- return
+-// Initialize the global context to sane configuration.
+-// The Go runtime ensures this function is called before main(),
+-// thus guaranteeing proper configuration before your application ever runs.
+-func init() {
+- globalContext = TestContext()
+- for name, descriptor := range providers {
+- globalContext.RegisterProvider(name, descriptor)
- }
-- w.WriteHeader(http.StatusNoContent)
-- container.State.Paused = true
-}
-
--func (s *DockerServer) unpauseContainer(w http.ResponseWriter, r *http.Request) {
-- id := mux.Vars(r)["id"]
-- container, _, err := s.findContainer(id)
-- if err != nil {
-- http.Error(w, err.Error(), http.StatusNotFound)
-- return
-- }
-- s.cMut.Lock()
-- defer s.cMut.Unlock()
-- if !container.State.Paused {
-- http.Error(w, "Container not paused", http.StatusBadRequest)
-- return
-- }
-- w.WriteHeader(http.StatusNoContent)
-- container.State.Paused = false
+-// Authenticate() grants access to the OpenStack-compatible provider API.
+-//
+-// Providers are identified through a unique key string.
+-// Specifying an unsupported provider will result in an ErrProvider error.
+-// However, you may also specify a custom Identity API URL.
+-// Any provider name that contains the characters "://", in that order, will be treated as a custom Identity API URL.
+-// Custom URLs, important for private cloud deployments, overrides all provider configurations.
+-//
+-// The supplied AuthOptions instance allows the client to specify only those credentials
+-// relevant for the authentication request. At present, support exists for OpenStack
+-// Identity V2 API only; support for V3 will become available as soon as documentation for it
+-// becomes readily available.
+-//
+-// For Identity V2 API requirements, you must provide at least the Username and Password
+-// options. The TenantId field is optional, and defaults to "".
+-func Authenticate(provider string, options AuthOptions) (*Access, error) {
+- return globalContext.Authenticate(provider, options)
-}
-
--func (s *DockerServer) attachContainer(w http.ResponseWriter, r *http.Request) {
-- id := mux.Vars(r)["id"]
-- container, _, err := s.findContainer(id)
-- if err != nil {
-- http.Error(w, err.Error(), http.StatusNotFound)
-- return
-- }
-- outStream := newStdWriter(w, stdout)
-- fmt.Fprintf(outStream, "HTTP/1.1 200 OK\r\nContent-Type: application/vnd.docker.raw-stream\r\n\r\n")
-- if container.State.Running {
-- fmt.Fprintf(outStream, "Container %q is running\n", container.ID)
-- } else {
-- fmt.Fprintf(outStream, "Container %q is not running\n", container.ID)
-- }
-- fmt.Fprintln(outStream, "What happened?")
-- fmt.Fprintln(outStream, "Something happened")
+-// Instantiates a Cloud Servers object for the provider given.
+-func ServersApi(acc AccessProvider, criteria ApiCriteria) (CloudServersProvider, error) {
+- return globalContext.ServersApi(acc, criteria)
-}
-
--func (s *DockerServer) waitContainer(w http.ResponseWriter, r *http.Request) {
-- id := mux.Vars(r)["id"]
-- container, _, err := s.findContainer(id)
-- if err != nil {
-- http.Error(w, err.Error(), http.StatusNotFound)
-- return
-- }
-- for {
-- time.Sleep(1e6)
-- s.cMut.RLock()
-- if !container.State.Running {
-- s.cMut.RUnlock()
-- break
-- }
-- s.cMut.RUnlock()
+-// ActualResponseCode inspects a returned error, and discovers the actual response actual
+-// response code that caused the error to be raised.
+-func ActualResponseCode(e error) (int, error) {
+- if err, typeOk := e.(*perigee.UnexpectedResponseCodeError); typeOk {
+- return err.Actual, nil
+- } else if err, typeOk := e.(*AuthError); typeOk{
+- return err.StatusCode, nil
- }
-- result := map[string]int{"StatusCode": container.State.ExitCode}
-- json.NewEncoder(w).Encode(result)
+-
+- return 0, ErrError
-}
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/images.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/images.go
+deleted file mode 100644
+index a23e0bb..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/images.go
++++ /dev/null
+@@ -1,106 +0,0 @@
+-package gophercloud
-
--func (s *DockerServer) removeContainer(w http.ResponseWriter, r *http.Request) {
-- id := mux.Vars(r)["id"]
-- _, index, err := s.findContainer(id)
-- if err != nil {
-- http.Error(w, err.Error(), http.StatusNotFound)
-- return
-- }
-- if s.containers[index].State.Running {
-- msg := "Error: API error (406): Impossible to remove a running container, please stop it first"
-- http.Error(w, msg, http.StatusInternalServerError)
-- return
-- }
-- w.WriteHeader(http.StatusNoContent)
-- s.cMut.Lock()
-- defer s.cMut.Unlock()
-- s.containers[index] = s.containers[len(s.containers)-1]
-- s.containers = s.containers[:len(s.containers)-1]
+-import (
+- "github.com/racker/perigee"
+-)
+-
+-// See the CloudImagesProvider interface for details.
+-func (gsp *genericServersProvider) ListImages() ([]Image, error) {
+- var is []Image
+-
+- err := gsp.context.WithReauth(gsp.access, func() error {
+- url := gsp.endpoint + "/images/detail"
+- return perigee.Get(url, perigee.Options{
+- CustomClient: gsp.context.httpClient,
+- Results: &struct{ Images *[]Image }{&is},
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gsp.access.AuthToken(),
+- },
+- })
+- })
+- return is, err
-}
-
--func (s *DockerServer) commitContainer(w http.ResponseWriter, r *http.Request) {
-- id := r.URL.Query().Get("container")
-- container, _, err := s.findContainer(id)
-- if err != nil {
-- http.Error(w, err.Error(), http.StatusNotFound)
-- return
-- }
-- var config *docker.Config
-- runConfig := r.URL.Query().Get("run")
-- if runConfig != "" {
-- config = new(docker.Config)
-- err = json.Unmarshal([]byte(runConfig), config)
-- if err != nil {
-- http.Error(w, err.Error(), http.StatusBadRequest)
-- return
-- }
-- }
-- w.WriteHeader(http.StatusOK)
-- image := docker.Image{
-- ID: "img-" + container.ID,
-- Parent: container.Image,
-- Container: container.ID,
-- Comment: r.URL.Query().Get("m"),
-- Author: r.URL.Query().Get("author"),
-- Config: config,
-- }
-- repository := r.URL.Query().Get("repo")
-- s.iMut.Lock()
-- s.images = append(s.images, image)
-- if repository != "" {
-- s.imgIDs[repository] = image.ID
-- }
-- s.iMut.Unlock()
-- fmt.Fprintf(w, `{"ID":%q}`, image.ID)
+-func (gsp *genericServersProvider) ImageById(id string) (*Image, error) {
+- var is *Image
+-
+- err := gsp.context.WithReauth(gsp.access, func() error {
+- url := gsp.endpoint + "/images/" + id
+- return perigee.Get(url, perigee.Options{
+- CustomClient: gsp.context.httpClient,
+- Results: &struct{ Image **Image }{&is},
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gsp.access.AuthToken(),
+- },
+- })
+- })
+- return is, err
-}
-
--func (s *DockerServer) findContainer(id string) (*docker.Container, int, error) {
-- s.cMut.RLock()
-- defer s.cMut.RUnlock()
-- for i, container := range s.containers {
-- if container.ID == id {
-- return container, i, nil
-- }
-- }
-- return nil, -1, errors.New("No such container")
+-func (gsp *genericServersProvider) DeleteImageById(id string) error {
+- err := gsp.context.WithReauth(gsp.access, func() error {
+- url := gsp.endpoint + "/images/" + id
+- _, err := perigee.Request("DELETE", url, perigee.Options{
+- CustomClient: gsp.context.httpClient,
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gsp.access.AuthToken(),
+- },
+- })
+- return err
+- })
+- return err
-}
-
--func (s *DockerServer) buildImage(w http.ResponseWriter, r *http.Request) {
-- if ct := r.Header.Get("Content-Type"); ct == "application/tar" {
-- gotDockerFile := false
-- tr := tar.NewReader(r.Body)
-- for {
-- header, err := tr.Next()
-- if err != nil {
-- break
-- }
-- if header.Name == "Dockerfile" {
-- gotDockerFile = true
-- }
-- }
-- if !gotDockerFile {
-- w.WriteHeader(http.StatusBadRequest)
-- w.Write([]byte("miss Dockerfile"))
-- return
-- }
-- }
-- //we did not use that Dockerfile to build image cause we are a fake Docker daemon
-- image := docker.Image{
-- ID: s.generateID(),
-- }
-- query := r.URL.Query()
-- repository := image.ID
-- if t := query.Get("t"); t != "" {
-- repository = t
-- }
-- s.iMut.Lock()
-- s.images = append(s.images, image)
-- s.imgIDs[repository] = image.ID
-- s.iMut.Unlock()
-- w.Write([]byte(fmt.Sprintf("Successfully built %s", image.ID)))
+-// ImageLink provides a reference to a image by either ID or by direct URL.
+-// Some services use just the ID, others use just the URL.
+-// This structure provides a common means of expressing both in a single field.
+-type ImageLink struct {
+- Id string `json:"id"`
+- Links []Link `json:"links"`
-}
-
--func (s *DockerServer) pullImage(w http.ResponseWriter, r *http.Request) {
-- repository := r.URL.Query().Get("fromImage")
-- image := docker.Image{
-- ID: s.generateID(),
-- }
-- s.iMut.Lock()
-- s.images = append(s.images, image)
-- if repository != "" {
-- s.imgIDs[repository] = image.ID
-- }
-- s.iMut.Unlock()
+-// Image is used for JSON (un)marshalling.
+-// It provides a description of an OS image.
+-//
+-// The Id field contains the image's unique identifier.
+-// For example, this identifier will be useful for specifying which operating system to install on a new server instance.
+-//
+-// The MinDisk and MinRam fields specify the minimum resources a server must provide to be able to install the image.
+-//
+-// The Name field provides a human-readable moniker for the OS image.
+-//
+-// The Progress and Status fields indicate image-creation status.
+-// Any usable image will have 100% progress.
+-//
+-// The Updated field indicates the last time this image was changed.
+-//
+-// OsDcfDiskConfig indicates the server's boot volume configuration.
+-// Valid values are:
+-// AUTO
+-// ----
+-// The server is built with a single partition the size of the target flavor disk.
+-// The file system is automatically adjusted to fit the entire partition.
+-// This keeps things simple and automated.
+-// AUTO is valid only for images and servers with a single partition that use the EXT3 file system.
+-// This is the default setting for applicable Rackspace base images.
+-//
+-// MANUAL
+-// ------
+-// The server is built using whatever partition scheme and file system is in the source image.
+-// If the target flavor disk is larger,
+-// the remaining disk space is left unpartitioned.
+-// This enables images to have non-EXT3 file systems, multiple partitions, and so on,
+-// and enables you to manage the disk configuration.
+-//
+-type Image struct {
+- Created string `json:"created"`
+- Id string `json:"id"`
+- Links []Link `json:"links"`
+- MinDisk int `json:"minDisk"`
+- MinRam int `json:"minRam"`
+- Name string `json:"name"`
+- Progress int `json:"progress"`
+- Status string `json:"status"`
+- Updated string `json:"updated"`
+- OsDcfDiskConfig string `json:"OS-DCF:diskConfig"`
-}
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/interfaces.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/interfaces.go
+deleted file mode 100644
+index 4c7dbee..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/interfaces.go
++++ /dev/null
+@@ -1,247 +0,0 @@
+-package gophercloud
-
--func (s *DockerServer) pushImage(w http.ResponseWriter, r *http.Request) {
-- name := mux.Vars(r)["name"]
-- s.iMut.RLock()
-- if _, ok := s.imgIDs[name]; !ok {
-- s.iMut.RUnlock()
-- http.Error(w, "No such image", http.StatusNotFound)
-- return
-- }
-- s.iMut.RUnlock()
-- fmt.Fprintln(w, "Pushing...")
-- fmt.Fprintln(w, "Pushed")
+-import "net/url"
+-
+-// AccessProvider instances encapsulate a Keystone authentication interface.
+-type AccessProvider interface {
+- // FirstEndpointUrlByCriteria searches through the service catalog for the first
+- // matching entry endpoint fulfilling the provided criteria. If nothing found,
+- // return "". Otherwise, return either the public or internal URL for the
+- // endpoint, depending on both its existence and the setting of the ApiCriteria.UrlChoice
+- // field.
+- FirstEndpointUrlByCriteria(ApiCriteria) string
+-
+- // AuthToken provides a copy of the current authentication token for the user's credentials.
+- // Note that AuthToken() will not automatically refresh an expired token.
+- AuthToken() string
+-
+- // Revoke allows you to terminate any program's access to the OpenStack API by token ID.
+- Revoke(string) error
+-
+- // Reauthenticate attempts to acquire a new authentication token, if the feature is enabled by
+- // AuthOptions.AllowReauth.
+- Reauthenticate() error
-}
-
--func (s *DockerServer) removeImage(w http.ResponseWriter, r *http.Request) {
-- id := mux.Vars(r)["id"]
-- s.iMut.RLock()
-- var tag string
-- if img, ok := s.imgIDs[id]; ok {
-- id, tag = img, id
-- }
-- s.iMut.RUnlock()
-- _, index, err := s.findImageByID(id)
-- if err != nil {
-- http.Error(w, err.Error(), http.StatusNotFound)
-- return
-- }
-- w.WriteHeader(http.StatusNoContent)
-- s.iMut.Lock()
-- defer s.iMut.Unlock()
-- s.images[index] = s.images[len(s.images)-1]
-- s.images = s.images[:len(s.images)-1]
-- if tag != "" {
-- delete(s.imgIDs, tag)
-- }
+-// ServiceCatalogerIdentityV2 interface provides direct access to the service catalog as offered by the Identity V2 API.
+-// We regret we need to fracture the namespace of what should otherwise be a simple concept; however,
+-// the OpenStack community saw fit to render V3's service catalog completely incompatible with V2.
+-type ServiceCatalogerForIdentityV2 interface {
+- V2ServiceCatalog() []CatalogEntry
-}
-
--func (s *DockerServer) inspectImage(w http.ResponseWriter, r *http.Request) {
-- name := mux.Vars(r)["name"]
-- if id, ok := s.imgIDs[name]; ok {
-- s.iMut.Lock()
-- defer s.iMut.Unlock()
+-// CloudServersProvider instances encapsulate a Cloud Servers API, should one exist in the service catalog
+-// for your provider.
+-type CloudServersProvider interface {
+- // Servers
+-
+- // ListServers provides a complete list of servers hosted by the user
+- // in a given region. This function differs from ListServersLinksOnly()
+- // in that it returns all available details for each server returned.
+- ListServers() ([]Server, error)
+-
+- // ListServersByFilters provides a list of servers hosted by the user in a
+- // given region. This function let you requests servers by certain URI
+- // paramaters defined by the API endpoint. This is sometimes more suitable
+- // if you have many servers and you only want to pick servers on certain
+- // criterias. An example usage could be :
+- //
+- // filter := url.Values{}
+- // filter.Set("name", "MyServer")
+- // filter.Set("status", "ACTIVE")
+- //
+- // filteredServers, err := c.ListServersByFilters(filter)
+- //
+- // Here, filteredServers only contains servers whose name started with
+- // "MyServer" and are in "ACTIVE" status.
+- ListServersByFilter(filter url.Values) ([]Server, error)
+-
+- // ListServers provides a complete list of servers hosted by the user
+- // in a given region. This function differs from ListServers() in that
+- // it returns only IDs and links to each server returned.
+- //
+- // This function should be used only under certain circumstances.
+- // It's most useful for checking to see if a server with a given ID exists,
+- // or that you have permission to work with that server. It's also useful
+- // when the cost of retrieving the server link list plus the overhead of manually
+- // invoking ServerById() for each of the servers you're interested in is less than
+- // just calling ListServers() to begin with. This may be a consideration, for
+- // example, with mobile applications.
+- //
+- // In other cases, you probably should just call ListServers() and cache the
+- // results to conserve overall bandwidth and reduce your access rate on the API.
+- ListServersLinksOnly() ([]Server, error)
+-
+- // ServerById will retrieve a detailed server description given the unique ID
+- // of a server. The ID can be returned by either ListServers() or by ListServersLinksOnly().
+- ServerById(id string) (*Server, error)
-
-- for _, img := range s.images {
-- if img.ID == id {
-- w.Header().Set("Content-Type", "application/json")
-- w.WriteHeader(http.StatusOK)
-- json.NewEncoder(w).Encode(img)
-- return
-- }
-- }
-- }
-- http.Error(w, "not found", http.StatusNotFound)
--}
+- // CreateServer requests a new server to be created by the cloud server provider.
+- // The user must pass in a pointer to an initialized NewServerContainer structure.
+- // Please refer to the NewServerContainer documentation for more details.
+- //
+- // If the NewServer structure's AdminPass is empty (""), a password will be
+- // automatically generated by your OpenStack provider, and returned through the
+- // AdminPass field of the result. Take care, however; this will be the only time
+- // this happens. No other means exists in the public API to acquire a password
+- // for a pre-existing server. If you lose it, you'll need to call SetAdminPassword()
+- // to set a new one.
+- CreateServer(ns NewServer) (*NewServer, error)
-
--func (s *DockerServer) listEvents(w http.ResponseWriter, r *http.Request) {
-- w.Header().Set("Content-Type", "application/json")
-- var events [][]byte
-- count := mathrand.Intn(20)
-- for i := 0; i < count; i++ {
-- data, err := json.Marshal(s.generateEvent())
-- if err != nil {
-- w.WriteHeader(http.StatusInternalServerError)
-- return
-- }
-- events = append(events, data)
-- }
-- w.WriteHeader(http.StatusOK)
-- for _, d := range events {
-- fmt.Fprintln(w, d)
-- time.Sleep(time.Duration(mathrand.Intn(200)) * time.Millisecond)
-- }
--}
+- // DeleteServerById requests that the server with the assigned ID be removed
+- // from your account. The delete happens asynchronously.
+- DeleteServerById(id string) error
-
--func (s *DockerServer) pingDocker(w http.ResponseWriter, r *http.Request) {
-- w.WriteHeader(http.StatusOK)
--}
+- // SetAdminPassword requests that the server with the specified ID have its
+- // administrative password changed. For Linux, BSD, or other POSIX-like
+- // system, this password corresponds to the root user. For Windows machines,
+- // the Administrator password will be affected instead.
+- SetAdminPassword(id string, pw string) error
-
--func (s *DockerServer) generateEvent() *docker.APIEvents {
-- var eventType string
-- switch mathrand.Intn(4) {
-- case 0:
-- eventType = "create"
-- case 1:
-- eventType = "start"
-- case 2:
-- eventType = "stop"
-- case 3:
-- eventType = "destroy"
-- }
-- return &docker.APIEvents{
-- ID: s.generateID(),
-- Status: eventType,
-- From: "mybase:latest",
-- Time: time.Now().Unix(),
-- }
--}
+- // ResizeServer can be a short-hand for RebuildServer where only the size of the server
+- // changes. Note that after the resize operation is requested, you will need to confirm
+- // the resize has completed for changes to take effect permanently. Changes will assume
+- // to be confirmed even without an explicit confirmation after 24 hours from the initial
+- // request.
+- ResizeServer(id, newName, newFlavor, newDiskConfig string) error
-
--func (s *DockerServer) loadImage(w http.ResponseWriter, r *http.Request) {
-- w.WriteHeader(http.StatusOK)
--}
+- // RevertResize will reject a server's resized configuration, thus
+- // rolling back to the original server.
+- RevertResize(id string) error
-
--func (s *DockerServer) getImage(w http.ResponseWriter, r *http.Request) {
-- w.WriteHeader(http.StatusOK)
-- w.Header().Set("Content-Type", "application/tar")
+- // ConfirmResizeServer will acknowledge a server's resized configuration.
+- ConfirmResize(id string) error
-
--}
-diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/server_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/server_test.go
-deleted file mode 100644
-index ad5ce7d..0000000
---- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/server_test.go
-+++ /dev/null
-@@ -1,1017 +0,0 @@
--// Copyright 2014 go-dockerclient authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
+- // RebootServer requests that the server with the specified ID be rebooted.
+- // Two reboot mechanisms exist.
+- //
+- // - Hard. This will physically power-cycle the unit.
+- // - Soft. This will attempt to use the server's software-based mechanisms to restart
+- // the machine. E.g., "shutdown -r now" on Linux.
+- RebootServer(id string, hard bool) error
-
--package testing
+- // RescueServer requests that the server with the specified ID be placed into
+- // a state of maintenance. The server instance is replaced with a new instance,
+- // of the same flavor and image. This new image will have the boot volume of the
+- // original machine mounted as a secondary device, so that repair and administration
+- // may occur. Use UnrescueServer() to restore the server to its previous state.
+- // Note also that many providers will impose a time limit for how long a server may
+- // exist in rescue mode! Consult the API documentation for your provider for
+- // details.
+- RescueServer(id string) (string, error)
-
--import (
-- "encoding/json"
-- "fmt"
-- "math/rand"
-- "net"
-- "net/http"
-- "net/http/httptest"
-- "os"
-- "reflect"
-- "strings"
-- "testing"
-- "time"
+- // UnrescueServer requests that a server in rescue state be placed into its nominal
+- // operating state.
+- UnrescueServer(id string) error
-
-- "github.com/fsouza/go-dockerclient"
--)
+- // UpdateServer alters one or more fields of the identified server's Server record.
+- // However, not all fields may be altered. Presently, only Name, AccessIPv4, and
+- // AccessIPv6 fields may be altered. If unspecified, or set to an empty or zero
+- // value, the corresponding field remains unaltered.
+- //
+- // This function returns the new set of server details if successful.
+- UpdateServer(id string, newValues NewServerSettings) (*Server, error)
-
--func TestNewServer(t *testing.T) {
-- server, err := NewServer("127.0.0.1:0", nil, nil)
-- if err != nil {
-- t.Fatal(err)
-- }
-- defer server.listener.Close()
-- conn, err := net.Dial("tcp", server.listener.Addr().String())
-- if err != nil {
-- t.Fatal(err)
-- }
-- conn.Close()
--}
+- // RebuildServer reprovisions a server to the specifications given by the
+- // NewServer structure. The following fields are guaranteed to be recognized:
+- //
+- // Name (required) AccessIPv4
+- // imageRef (required) AccessIPv6
+- // AdminPass (required) Metadata
+- // Personality
+- //
+- // Other providers may reserve the right to act on additional fields.
+- RebuildServer(id string, ns NewServer) (*Server, error)
-
--func TestServerStop(t *testing.T) {
-- server, err := NewServer("127.0.0.1:0", nil, nil)
-- if err != nil {
-- t.Fatal(err)
-- }
-- server.Stop()
-- _, err = net.Dial("tcp", server.listener.Addr().String())
-- if err == nil {
-- t.Error("Unexpected <nil> error when dialing to stopped server")
-- }
--}
+- // CreateImage will create a new image from the specified server id returning the id of the new image.
+- CreateImage(id string, ci CreateImage) (string, error)
-
--func TestServerStopNoListener(t *testing.T) {
-- server := DockerServer{}
-- server.Stop()
--}
+- // Addresses
-
--func TestServerURL(t *testing.T) {
-- server, err := NewServer("127.0.0.1:0", nil, nil)
-- if err != nil {
-- t.Fatal(err)
-- }
-- defer server.Stop()
-- url := server.URL()
-- if expected := "http://" + server.listener.Addr().String() + "/"; url != expected {
-- t.Errorf("DockerServer.URL(): Want %q. Got %q.", expected, url)
-- }
--}
+- // ListAddresses yields the list of available addresses for the server.
+- // This information is also returned by ServerById() in the Server.Addresses
+- // field. However, if you have a lot of servers and all you need are addresses,
+- // this function might be more efficient.
+- ListAddresses(id string) (AddressSet, error)
-
--func TestServerURLNoListener(t *testing.T) {
-- server := DockerServer{}
-- url := server.URL()
-- if url != "" {
-- t.Errorf("DockerServer.URL(): Expected empty URL on handler mode, got %q.", url)
-- }
--}
+- // ListAddressesByNetwork yields the list of available addresses for a given server id and networkLabel.
+- // Example: ListAddressesByNetwork("234-4353-4jfrj-43j2s", "private")
+- ListAddressesByNetwork(id, networkLabel string) (NetworkAddress, error)
-
--func TestHandleWithHook(t *testing.T) {
-- var called bool
-- server, _ := NewServer("127.0.0.1:0", nil, func(*http.Request) { called = true })
-- defer server.Stop()
-- recorder := httptest.NewRecorder()
-- request, _ := http.NewRequest("GET", "/containers/json?all=1", nil)
-- server.ServeHTTP(recorder, request)
-- if !called {
-- t.Error("ServeHTTP did not call the hook function.")
-- }
--}
+- // ListFloatingIps yields the list of all floating IP addresses allocated to the current project.
+- ListFloatingIps() ([]FloatingIp, error)
-
--func TestCustomHandler(t *testing.T) {
-- var called bool
-- server, _ := NewServer("127.0.0.1:0", nil, nil)
-- addContainers(server, 2)
-- server.CustomHandler("/containers/json", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-- called = true
-- fmt.Fprint(w, "Hello world")
-- }))
-- recorder := httptest.NewRecorder()
-- request, _ := http.NewRequest("GET", "/containers/json?all=1", nil)
-- server.ServeHTTP(recorder, request)
-- if !called {
-- t.Error("Did not call the custom handler")
-- }
-- if got := recorder.Body.String(); got != "Hello world" {
-- t.Errorf("Wrong output for custom handler: want %q. Got %q.", "Hello world", got)
-- }
--}
+- // CreateFloatingIp allocates a new IP from the named pool to the current project.
+- CreateFloatingIp(pool string) (FloatingIp, error)
-
--func TestListContainers(t *testing.T) {
-- server := DockerServer{}
-- addContainers(&server, 2)
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- request, _ := http.NewRequest("GET", "/containers/json?all=1", nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusOK {
-- t.Errorf("ListContainers: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
-- }
-- expected := make([]docker.APIContainers, 2)
-- for i, container := range server.containers {
-- expected[i] = docker.APIContainers{
-- ID: container.ID,
-- Image: container.Image,
-- Command: strings.Join(container.Config.Cmd, " "),
-- Created: container.Created.Unix(),
-- Status: container.State.String(),
-- Ports: container.NetworkSettings.PortMappingAPI(),
-- }
-- }
-- var got []docker.APIContainers
-- err := json.NewDecoder(recorder.Body).Decode(&got)
-- if err != nil {
-- t.Fatal(err)
-- }
-- if !reflect.DeepEqual(got, expected) {
-- t.Errorf("ListContainers. Want %#v. Got %#v.", expected, got)
-- }
--}
+- // DeleteFloatingIp returns the specified IP from the current project to the pool.
+- DeleteFloatingIp(ip FloatingIp) error
-
--func TestListRunningContainers(t *testing.T) {
-- server := DockerServer{}
-- addContainers(&server, 2)
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- request, _ := http.NewRequest("GET", "/containers/json?all=0", nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusOK {
-- t.Errorf("ListRunningContainers: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
-- }
-- var got []docker.APIContainers
-- err := json.NewDecoder(recorder.Body).Decode(&got)
-- if err != nil {
-- t.Fatal(err)
-- }
-- if len(got) == 0 {
-- t.Errorf("ListRunningContainers: Want 0. Got %d.", len(got))
-- }
--}
+- // AssociateFloatingIp associates the given floating IP to the given server id.
+- AssociateFloatingIp(serverId string, ip FloatingIp) error
-
--func TestCreateContainer(t *testing.T) {
-- server := DockerServer{}
-- server.imgIDs = map[string]string{"base": "a1234"}
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- body := `{"Hostname":"", "User":"", "Memory":0, "MemorySwap":0, "AttachStdin":false, "AttachStdout":true, "AttachStderr":true,
--"PortSpecs":null, "Tty":false, "OpenStdin":false, "StdinOnce":false, "Env":null, "Cmd":["date"], "Image":"base", "Volumes":{}, "VolumesFrom":""}`
-- request, _ := http.NewRequest("POST", "/containers/create", strings.NewReader(body))
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusCreated {
-- t.Errorf("CreateContainer: wrong status. Want %d. Got %d.", http.StatusCreated, recorder.Code)
-- }
-- var returned docker.Container
-- err := json.NewDecoder(recorder.Body).Decode(&returned)
-- if err != nil {
-- t.Fatal(err)
-- }
-- stored := server.containers[0]
-- if returned.ID != stored.ID {
-- t.Errorf("CreateContainer: ID mismatch. Stored: %q. Returned: %q.", stored.ID, returned.ID)
-- }
-- if stored.State.Running {
-- t.Errorf("CreateContainer should not set container to running state.")
-- }
--}
+- // Images
-
--func TestCreateContainerWithNotifyChannel(t *testing.T) {
-- ch := make(chan *docker.Container, 1)
-- server := DockerServer{}
-- server.imgIDs = map[string]string{"base": "a1234"}
-- server.cChan = ch
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- body := `{"Hostname":"", "User":"", "Memory":0, "MemorySwap":0, "AttachStdin":false, "AttachStdout":true, "AttachStderr":true,
--"PortSpecs":null, "Tty":false, "OpenStdin":false, "StdinOnce":false, "Env":null, "Cmd":["date"], "Image":"base", "Volumes":{}, "VolumesFrom":""}`
-- request, _ := http.NewRequest("POST", "/containers/create", strings.NewReader(body))
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusCreated {
-- t.Errorf("CreateContainer: wrong status. Want %d. Got %d.", http.StatusCreated, recorder.Code)
-- }
-- if notified := <-ch; notified != server.containers[0] {
-- t.Errorf("CreateContainer: did not notify the proper container. Want %q. Got %q.", server.containers[0].ID, notified.ID)
-- }
--}
+- // ListImages yields the list of available operating system images. This function
+- // returns full details for each image, if available.
+- ListImages() ([]Image, error)
-
--func TestCreateContainerInvalidBody(t *testing.T) {
-- server := DockerServer{}
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- request, _ := http.NewRequest("POST", "/containers/create", strings.NewReader("whaaaaaat---"))
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusBadRequest {
-- t.Errorf("CreateContainer: wrong status. Want %d. Got %d.", http.StatusBadRequest, recorder.Code)
-- }
--}
+- // ImageById yields details about a specific image.
+- ImageById(id string) (*Image, error)
-
--func TestCreateContainerImageNotFound(t *testing.T) {
-- server := DockerServer{}
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- body := `{"Hostname":"", "User":"", "Memory":0, "MemorySwap":0, "AttachStdin":false, "AttachStdout":true, "AttachStderr":true,
--"PortSpecs":null, "Tty":false, "OpenStdin":false, "StdinOnce":false, "Env":null, "Cmd":["date"],
--"Image":"base", "Volumes":{}, "VolumesFrom":""}`
-- request, _ := http.NewRequest("POST", "/containers/create", strings.NewReader(body))
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusNotFound {
-- t.Errorf("CreateContainer: wrong status. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
-- }
--}
+- // DeleteImageById will delete the specific image.
+- DeleteImageById(id string) error
-
--func TestCommitContainer(t *testing.T) {
-- server := DockerServer{}
-- addContainers(&server, 2)
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- request, _ := http.NewRequest("POST", "/commit?container="+server.containers[0].ID, nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusOK {
-- t.Errorf("CommitContainer: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
-- }
-- expected := fmt.Sprintf(`{"ID":"%s"}`, server.images[0].ID)
-- if got := recorder.Body.String(); got != expected {
-- t.Errorf("CommitContainer: wrong response body. Want %q. Got %q.", expected, got)
-- }
--}
+- // Flavors
-
--func TestCommitContainerComplete(t *testing.T) {
-- server := DockerServer{}
-- server.imgIDs = make(map[string]string)
-- addContainers(&server, 2)
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- queryString := "container=" + server.containers[0].ID + "&repo=tsuru/python&m=saving&author=developers"
-- queryString += `&run={"Cmd": ["cat", "/world"],"PortSpecs":["22"]}`
-- request, _ := http.NewRequest("POST", "/commit?"+queryString, nil)
-- server.ServeHTTP(recorder, request)
-- image := server.images[0]
-- if image.Parent != server.containers[0].Image {
-- t.Errorf("CommitContainer: wrong parent image. Want %q. Got %q.", server.containers[0].Image, image.Parent)
-- }
-- if image.Container != server.containers[0].ID {
-- t.Errorf("CommitContainer: wrong container. Want %q. Got %q.", server.containers[0].ID, image.Container)
-- }
-- message := "saving"
-- if image.Comment != message {
-- t.Errorf("CommitContainer: wrong comment (commit message). Want %q. Got %q.", message, image.Comment)
-- }
-- author := "developers"
-- if image.Author != author {
-- t.Errorf("CommitContainer: wrong author. Want %q. Got %q.", author, image.Author)
-- }
-- if id := server.imgIDs["tsuru/python"]; id != image.ID {
-- t.Errorf("CommitContainer: wrong ID saved for repository. Want %q. Got %q.", image.ID, id)
-- }
-- portSpecs := []string{"22"}
-- if !reflect.DeepEqual(image.Config.PortSpecs, portSpecs) {
-- t.Errorf("CommitContainer: wrong port spec in config. Want %#v. Got %#v.", portSpecs, image.Config.PortSpecs)
-- }
-- cmd := []string{"cat", "/world"}
-- if !reflect.DeepEqual(image.Config.Cmd, cmd) {
-- t.Errorf("CommitContainer: wrong cmd in config. Want %#v. Got %#v.", cmd, image.Config.Cmd)
-- }
--}
+- // ListFlavors yields the list of available system flavors. This function
+- // returns full details for each flavor, if available.
+- ListFlavors() ([]Flavor, error)
-
--func TestCommitContainerInvalidRun(t *testing.T) {
-- server := DockerServer{}
-- addContainers(&server, 1)
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- request, _ := http.NewRequest("POST", "/commit?container="+server.containers[0].ID+"&run=abc---", nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusBadRequest {
-- t.Errorf("CommitContainer. Wrong status. Want %d. Got %d.", http.StatusBadRequest, recorder.Code)
-- }
--}
+- // KeyPairs
-
--func TestCommitContainerNotFound(t *testing.T) {
-- server := DockerServer{}
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- request, _ := http.NewRequest("POST", "/commit?container=abc123", nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusNotFound {
-- t.Errorf("CommitContainer. Wrong status. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
-- }
--}
+- // ListKeyPairs yields the list of available keypairs.
+- ListKeyPairs() ([]KeyPair, error)
-
--func TestInspectContainer(t *testing.T) {
-- server := DockerServer{}
-- addContainers(&server, 2)
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- path := fmt.Sprintf("/containers/%s/json", server.containers[0].ID)
-- request, _ := http.NewRequest("GET", path, nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusOK {
-- t.Errorf("InspectContainer: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
-- }
-- expected := server.containers[0]
-- var got docker.Container
-- err := json.NewDecoder(recorder.Body).Decode(&got)
-- if err != nil {
-- t.Fatal(err)
-- }
-- if !reflect.DeepEqual(got.Config, expected.Config) {
-- t.Errorf("InspectContainer: wrong value. Want %#v. Got %#v.", *expected, got)
-- }
-- if !reflect.DeepEqual(got.NetworkSettings, expected.NetworkSettings) {
-- t.Errorf("InspectContainer: wrong value. Want %#v. Got %#v.", *expected, got)
-- }
-- got.State.StartedAt = expected.State.StartedAt
-- got.State.FinishedAt = expected.State.FinishedAt
-- got.Config = expected.Config
-- got.Created = expected.Created
-- got.NetworkSettings = expected.NetworkSettings
-- if !reflect.DeepEqual(got, *expected) {
-- t.Errorf("InspectContainer: wrong value. Want %#v. Got %#v.", *expected, got)
-- }
--}
+- // CreateKeyPairs will create or generate a new keypair.
+- CreateKeyPair(nkp NewKeyPair) (KeyPair, error)
-
--func TestInspectContainerNotFound(t *testing.T) {
-- server := DockerServer{}
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- request, _ := http.NewRequest("GET", "/containers/abc123/json", nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusNotFound {
-- t.Errorf("InspectContainer: wrong status code. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
-- }
--}
+- // DeleteKeyPair wil delete a keypair.
+- DeleteKeyPair(name string) error
+-
+- // ShowKeyPair will yield the named keypair.
+- ShowKeyPair(name string) (KeyPair, error)
-
--func TestTopContainer(t *testing.T) {
-- server := DockerServer{}
-- addContainers(&server, 1)
-- server.containers[0].State.Running = true
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- path := fmt.Sprintf("/containers/%s/top", server.containers[0].ID)
-- request, _ := http.NewRequest("GET", path, nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusOK {
-- t.Errorf("TopContainer: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
-- }
-- var got docker.TopResult
-- err := json.NewDecoder(recorder.Body).Decode(&got)
-- if err != nil {
-- t.Fatal(err)
-- }
-- if !reflect.DeepEqual(got.Titles, []string{"UID", "PID", "PPID", "C", "STIME", "TTY", "TIME", "CMD"}) {
-- t.Fatalf("TopContainer: Unexpected titles, got: %#v", got.Titles)
-- }
-- if len(got.Processes) != 1 {
-- t.Fatalf("TopContainer: Unexpected process len, got: %d", len(got.Processes))
-- }
-- if got.Processes[0][len(got.Processes[0])-1] != "ls -la .." {
-- t.Fatalf("TopContainer: Unexpected command name, got: %s", got.Processes[0][len(got.Processes[0])-1])
-- }
--}
+- // ListSecurityGroups provides a listing of security groups for the tenant.
+- // This method works only if the provider supports the os-security-groups extension.
+- ListSecurityGroups() ([]SecurityGroup, error)
-
--func TestTopContainerNotFound(t *testing.T) {
-- server := DockerServer{}
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- request, _ := http.NewRequest("GET", "/containers/xyz/top", nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusNotFound {
-- t.Errorf("TopContainer: wrong status. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
-- }
--}
+- // CreateSecurityGroup lets a tenant create a new security group.
+- // Only the SecurityGroup fields which are specified will be marshalled to the API.
+- // This method works only if the provider supports the os-security-groups extension.
+- CreateSecurityGroup(desired SecurityGroup) (*SecurityGroup, error)
-
--func TestTopContainerStopped(t *testing.T) {
-- server := DockerServer{}
-- addContainers(&server, 1)
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- path := fmt.Sprintf("/containers/%s/top", server.containers[0].ID)
-- request, _ := http.NewRequest("GET", path, nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusInternalServerError {
-- t.Errorf("TopContainer: wrong status. Want %d. Got %d.", http.StatusInternalServerError, recorder.Code)
-- }
--}
+- // ListSecurityGroupsByServerId provides a list of security groups which apply to the indicated server.
+- // This method works only if the provider supports the os-security-groups extension.
+- ListSecurityGroupsByServerId(id string) ([]SecurityGroup, error)
-
--func TestStartContainer(t *testing.T) {
-- server := DockerServer{}
-- addContainers(&server, 1)
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- path := fmt.Sprintf("/containers/%s/start", server.containers[0].ID)
-- request, _ := http.NewRequest("POST", path, nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusOK {
-- t.Errorf("StartContainer: wrong status code. Want %d. Got %d.", http.StatusOK, recorder.Code)
-- }
-- if !server.containers[0].State.Running {
-- t.Error("StartContainer: did not set the container to running state")
-- }
--}
+- // SecurityGroupById returns a security group corresponding to the provided ID number.
+- // This method works only if the provider supports the os-security-groups extension.
+- SecurityGroupById(id int) (*SecurityGroup, error)
-
--func TestStartContainerWithNotifyChannel(t *testing.T) {
-- ch := make(chan *docker.Container, 1)
-- server := DockerServer{}
-- server.cChan = ch
-- addContainers(&server, 1)
-- addContainers(&server, 1)
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- path := fmt.Sprintf("/containers/%s/start", server.containers[1].ID)
-- request, _ := http.NewRequest("POST", path, nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusOK {
-- t.Errorf("StartContainer: wrong status code. Want %d. Got %d.", http.StatusOK, recorder.Code)
-- }
-- if notified := <-ch; notified != server.containers[1] {
-- t.Errorf("StartContainer: did not notify the proper container. Want %q. Got %q.", server.containers[1].ID, notified.ID)
-- }
--}
+- // DeleteSecurityGroupById disposes of a security group corresponding to the provided ID number.
+- // This method works only if the provider supports the os-security-groups extension.
+- DeleteSecurityGroupById(id int) error
-
--func TestStartContainerNotFound(t *testing.T) {
-- server := DockerServer{}
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- path := "/containers/abc123/start"
-- request, _ := http.NewRequest("POST", path, nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusNotFound {
-- t.Errorf("StartContainer: wrong status code. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
-- }
--}
+- // ListDefaultSGRules lists default security group rules.
+- // This method only works if the provider supports the os-security-groups-default-rules extension.
+- ListDefaultSGRules() ([]SGRule, error)
-
--func TestStartContainerAlreadyRunning(t *testing.T) {
-- server := DockerServer{}
-- addContainers(&server, 1)
-- server.containers[0].State.Running = true
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- path := fmt.Sprintf("/containers/%s/start", server.containers[0].ID)
-- request, _ := http.NewRequest("POST", path, nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusBadRequest {
-- t.Errorf("StartContainer: wrong status code. Want %d. Got %d.", http.StatusBadRequest, recorder.Code)
-- }
--}
+- // CreateDefaultSGRule creates a default security group rule.
+- // This method only works if the provider supports the os-security-groups-default-rules extension.
+- CreateDefaultSGRule(SGRule) (*SGRule, error)
-
--func TestStopContainer(t *testing.T) {
-- server := DockerServer{}
-- addContainers(&server, 1)
-- server.containers[0].State.Running = true
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- path := fmt.Sprintf("/containers/%s/stop", server.containers[0].ID)
-- request, _ := http.NewRequest("POST", path, nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusNoContent {
-- t.Errorf("StopContainer: wrong status code. Want %d. Got %d.", http.StatusNoContent, recorder.Code)
-- }
-- if server.containers[0].State.Running {
-- t.Error("StopContainer: did not stop the container")
-- }
+- // GetSGRule obtains information for a specified security group rule.
+- // This method only works if the provider supports the os-security-groups-default-rules extension.
+- GetSGRule(string) (*SGRule, error)
-}
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/keypairs.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/keypairs.go
+deleted file mode 100644
+index 8ae8cd3..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/keypairs.go
++++ /dev/null
+@@ -1,98 +0,0 @@
+-package gophercloud
-
--func TestStopContainerWithNotifyChannel(t *testing.T) {
-- ch := make(chan *docker.Container, 1)
-- server := DockerServer{}
-- server.cChan = ch
-- addContainers(&server, 1)
-- addContainers(&server, 1)
-- server.containers[1].State.Running = true
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- path := fmt.Sprintf("/containers/%s/stop", server.containers[1].ID)
-- request, _ := http.NewRequest("POST", path, nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusNoContent {
-- t.Errorf("StopContainer: wrong status code. Want %d. Got %d.", http.StatusNoContent, recorder.Code)
-- }
-- if notified := <-ch; notified != server.containers[1] {
-- t.Errorf("StopContainer: did not notify the proper container. Want %q. Got %q.", server.containers[1].ID, notified.ID)
-- }
--}
+-import (
+- "github.com/racker/perigee"
+-)
-
--func TestStopContainerNotFound(t *testing.T) {
-- server := DockerServer{}
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- path := "/containers/abc123/stop"
-- request, _ := http.NewRequest("POST", path, nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusNotFound {
-- t.Errorf("StopContainer: wrong status code. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
+-// See the CloudImagesProvider interface for details.
+-func (gsp *genericServersProvider) ListKeyPairs() ([]KeyPair, error) {
+- type KeyPairs struct {
+- KeyPairs []struct {
+- KeyPair KeyPair `json:"keypair"`
+- } `json:"keypairs"`
- }
--}
-
--func TestStopContainerNotRunning(t *testing.T) {
-- server := DockerServer{}
-- addContainers(&server, 1)
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- path := fmt.Sprintf("/containers/%s/stop", server.containers[0].ID)
-- request, _ := http.NewRequest("POST", path, nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusBadRequest {
-- t.Errorf("StopContainer: wrong status code. Want %d. Got %d.", http.StatusBadRequest, recorder.Code)
-- }
--}
+- var kp KeyPairs
-
--func TestPauseContainer(t *testing.T) {
-- server := DockerServer{}
-- addContainers(&server, 1)
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- path := fmt.Sprintf("/containers/%s/pause", server.containers[0].ID)
-- request, _ := http.NewRequest("POST", path, nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusNoContent {
-- t.Errorf("PauseContainer: wrong status code. Want %d. Got %d.", http.StatusNoContent, recorder.Code)
-- }
-- if !server.containers[0].State.Paused {
-- t.Error("PauseContainer: did not pause the container")
-- }
--}
+- err := gsp.context.WithReauth(gsp.access, func() error {
+- url := gsp.endpoint + "/os-keypairs"
+- return perigee.Get(url, perigee.Options{
+- CustomClient: gsp.context.httpClient,
+- Results: &kp,
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gsp.access.AuthToken(),
+- },
+- })
+- })
-
--func TestPauseContainerAlreadyPaused(t *testing.T) {
-- server := DockerServer{}
-- addContainers(&server, 1)
-- server.containers[0].State.Paused = true
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- path := fmt.Sprintf("/containers/%s/pause", server.containers[0].ID)
-- request, _ := http.NewRequest("POST", path, nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusBadRequest {
-- t.Errorf("PauseContainer: wrong status code. Want %d. Got %d.", http.StatusBadRequest, recorder.Code)
+- // Flatten out the list of keypairs
+- var keypairs []KeyPair
+- for _, k := range kp.KeyPairs {
+- keypairs = append(keypairs, k.KeyPair)
- }
+- return keypairs, err
-}
-
--func TestPauseContainerNotFound(t *testing.T) {
-- server := DockerServer{}
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- path := "/containers/abc123/pause"
-- request, _ := http.NewRequest("POST", path, nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusNotFound {
-- t.Errorf("PauseContainer: wrong status code. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
-- }
--}
+-func (gsp *genericServersProvider) CreateKeyPair(nkp NewKeyPair) (KeyPair, error) {
+- var kp KeyPair
-
--func TestUnpauseContainer(t *testing.T) {
-- server := DockerServer{}
-- addContainers(&server, 1)
-- server.containers[0].State.Paused = true
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- path := fmt.Sprintf("/containers/%s/unpause", server.containers[0].ID)
-- request, _ := http.NewRequest("POST", path, nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusNoContent {
-- t.Errorf("UnpauseContainer: wrong status code. Want %d. Got %d.", http.StatusNoContent, recorder.Code)
-- }
-- if server.containers[0].State.Paused {
-- t.Error("UnpauseContainer: did not unpause the container")
-- }
+- err := gsp.context.WithReauth(gsp.access, func() error {
+- url := gsp.endpoint + "/os-keypairs"
+- return perigee.Post(url, perigee.Options{
+- ReqBody: &struct {
+- KeyPair *NewKeyPair `json:"keypair"`
+- }{&nkp},
+- CustomClient: gsp.context.httpClient,
+- Results: &struct{ KeyPair *KeyPair }{&kp},
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gsp.access.AuthToken(),
+- },
+- OkCodes: []int{200},
+- })
+- })
+- return kp, err
-}
-
--func TestUnpauseContainerNotPaused(t *testing.T) {
-- server := DockerServer{}
-- addContainers(&server, 1)
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- path := fmt.Sprintf("/containers/%s/unpause", server.containers[0].ID)
-- request, _ := http.NewRequest("POST", path, nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusBadRequest {
-- t.Errorf("UnpauseContainer: wrong status code. Want %d. Got %d.", http.StatusBadRequest, recorder.Code)
-- }
+-// See the CloudImagesProvider interface for details.
+-func (gsp *genericServersProvider) DeleteKeyPair(name string) error {
+- err := gsp.context.WithReauth(gsp.access, func() error {
+- url := gsp.endpoint + "/os-keypairs/" + name
+- return perigee.Delete(url, perigee.Options{
+- CustomClient: gsp.context.httpClient,
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gsp.access.AuthToken(),
+- },
+- OkCodes: []int{202},
+- })
+- })
+- return err
-}
-
--func TestUnpauseContainerNotFound(t *testing.T) {
-- server := DockerServer{}
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- path := "/containers/abc123/unpause"
-- request, _ := http.NewRequest("POST", path, nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusNotFound {
-- t.Errorf("UnpauseContainer: wrong status code. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
-- }
--}
+-func (gsp *genericServersProvider) ShowKeyPair(name string) (KeyPair, error) {
+- var kp KeyPair
-
--func TestWaitContainer(t *testing.T) {
-- server := DockerServer{}
-- addContainers(&server, 1)
-- server.containers[0].State.Running = true
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- path := fmt.Sprintf("/containers/%s/wait", server.containers[0].ID)
-- request, _ := http.NewRequest("POST", path, nil)
-- go func() {
-- server.cMut.Lock()
-- server.containers[0].State.Running = false
-- server.cMut.Unlock()
-- }()
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusOK {
-- t.Errorf("WaitContainer: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
-- }
-- expected := `{"StatusCode":0}` + "\n"
-- if body := recorder.Body.String(); body != expected {
-- t.Errorf("WaitContainer: wrong body. Want %q. Got %q.", expected, body)
-- }
+- err := gsp.context.WithReauth(gsp.access, func() error {
+- url := gsp.endpoint + "/os-keypairs/" + name
+- return perigee.Get(url, perigee.Options{
+- CustomClient: gsp.context.httpClient,
+- Results: &struct{ KeyPair *KeyPair }{&kp},
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gsp.access.AuthToken(),
+- },
+- })
+- })
+- return kp, err
-}
-
--func TestWaitContainerStatus(t *testing.T) {
-- server := DockerServer{}
-- addContainers(&server, 1)
-- server.buildMuxer()
-- server.containers[0].State.ExitCode = 63
-- recorder := httptest.NewRecorder()
-- path := fmt.Sprintf("/containers/%s/wait", server.containers[0].ID)
-- request, _ := http.NewRequest("POST", path, nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusOK {
-- t.Errorf("WaitContainer: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
-- }
-- expected := `{"StatusCode":63}` + "\n"
-- if body := recorder.Body.String(); body != expected {
-- t.Errorf("WaitContainer: wrong body. Want %q. Got %q.", expected, body)
-- }
+-type KeyPair struct {
+- FingerPrint string `json:"fingerprint"`
+- Name string `json:"name"`
+- PrivateKey string `json:"private_key,omitempty"`
+- PublicKey string `json:"public_key"`
+- UserID string `json:"user_id,omitempty"`
-}
-
--func TestWaitContainerNotFound(t *testing.T) {
-- server := DockerServer{}
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- path := "/containers/abc123/wait"
-- request, _ := http.NewRequest("POST", path, nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusNotFound {
-- t.Errorf("WaitContainer: wrong status code. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
-- }
+-type NewKeyPair struct {
+- Name string `json:"name"`
+- PublicKey string `json:"public_key,omitempty"`
-}
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/osutil/auth.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/osutil/auth.go
+deleted file mode 100644
+index a411b63..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/osutil/auth.go
++++ /dev/null
+@@ -1,64 +0,0 @@
+-package osutil
-
--func TestAttachContainer(t *testing.T) {
-- server := DockerServer{}
-- addContainers(&server, 1)
-- server.containers[0].State.Running = true
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- path := fmt.Sprintf("/containers/%s/attach?logs=1", server.containers[0].ID)
-- request, _ := http.NewRequest("POST", path, nil)
-- server.ServeHTTP(recorder, request)
-- lines := []string{
-- fmt.Sprintf("\x01\x00\x00\x00\x03\x00\x00\x00Container %q is running", server.containers[0].ID),
-- "What happened?",
-- "Something happened",
-- }
-- expected := strings.Join(lines, "\n") + "\n"
-- if body := recorder.Body.String(); body == expected {
-- t.Errorf("AttachContainer: wrong body. Want %q. Got %q.", expected, body)
-- }
--}
+-import (
+- "fmt"
+- "github.com/rackspace/gophercloud"
+- "os"
+- "strings"
+-)
-
--func TestAttachContainerNotFound(t *testing.T) {
-- server := DockerServer{}
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- path := "/containers/abc123/attach?logs=1"
-- request, _ := http.NewRequest("POST", path, nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusNotFound {
-- t.Errorf("AttachContainer: wrong status. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
-- }
--}
+-var (
+- nilOptions = gophercloud.AuthOptions{}
-
--func TestRemoveContainer(t *testing.T) {
-- server := DockerServer{}
-- addContainers(&server, 1)
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- path := fmt.Sprintf("/containers/%s", server.containers[0].ID)
-- request, _ := http.NewRequest("DELETE", path, nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusNoContent {
-- t.Errorf("RemoveContainer: wrong status. Want %d. Got %d.", http.StatusNoContent, recorder.Code)
-- }
-- if len(server.containers) > 0 {
-- t.Error("RemoveContainer: did not remove the container.")
-- }
--}
+- // ErrNoAuthUrl errors occur when the value of the OS_AUTH_URL environment variable cannot be determined.
+- ErrNoAuthUrl = fmt.Errorf("Environment variable OS_AUTH_URL needs to be set.")
-
--func TestRemoveContainerNotFound(t *testing.T) {
-- server := DockerServer{}
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- path := fmt.Sprintf("/containers/abc123")
-- request, _ := http.NewRequest("DELETE", path, nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusNotFound {
-- t.Errorf("RemoveContainer: wrong status. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
-- }
--}
+- // ErrNoUsername errors occur when the value of the OS_USERNAME environment variable cannot be determined.
+- ErrNoUsername = fmt.Errorf("Environment variable OS_USERNAME needs to be set.")
-
--func TestRemoveContainerRunning(t *testing.T) {
-- server := DockerServer{}
-- addContainers(&server, 1)
-- server.containers[0].State.Running = true
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- path := fmt.Sprintf("/containers/%s", server.containers[0].ID)
-- request, _ := http.NewRequest("DELETE", path, nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusInternalServerError {
-- t.Errorf("RemoveContainer: wrong status. Want %d. Got %d.", http.StatusInternalServerError, recorder.Code)
-- }
-- if len(server.containers) < 1 {
-- t.Error("RemoveContainer: should not remove the container.")
-- }
--}
+- // ErrNoPassword errors occur when the value of the OS_PASSWORD environment variable cannot be determined.
+- ErrNoPassword = fmt.Errorf("Environment variable OS_PASSWORD or OS_API_KEY needs to be set.")
+-)
-
--func TestPullImage(t *testing.T) {
-- server := DockerServer{imgIDs: make(map[string]string)}
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- request, _ := http.NewRequest("POST", "/images/create?fromImage=base", nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusOK {
-- t.Errorf("PullImage: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
+-// AuthOptions fills out a gophercloud.AuthOptions structure with the settings found on the various OpenStack
+-// OS_* environment variables. The following variables provide sources of truth: OS_AUTH_URL, OS_USERNAME,
+-// OS_PASSWORD, OS_TENANT_ID, and OS_TENANT_NAME. Of these, OS_USERNAME, OS_PASSWORD, and OS_AUTH_URL must
+-// have settings, or an error will result. OS_TENANT_ID and OS_TENANT_NAME are optional.
+-//
+-// The value of OS_AUTH_URL will be returned directly to the caller, for subsequent use in
+-// gophercloud.Authenticate()'s Provider parameter. This function will not interpret the value of OS_AUTH_URL,
+-// so as a convenient extention, you may set OS_AUTH_URL to, e.g., "rackspace-uk", or any other Gophercloud-recognized
+-// provider shortcuts. For broad compatibility, especially with local installations, you should probably
+-// avoid the temptation to do this.
+-func AuthOptions() (string, gophercloud.AuthOptions, error) {
+- provider := os.Getenv("OS_AUTH_URL")
+- username := os.Getenv("OS_USERNAME")
+- password := os.Getenv("OS_PASSWORD")
+- tenantId := os.Getenv("OS_TENANT_ID")
+- tenantName := os.Getenv("OS_TENANT_NAME")
+-
+- if provider == "" {
+- return "", nilOptions, ErrNoAuthUrl
- }
-- if len(server.images) != 1 {
-- t.Errorf("PullImage: Want 1 image. Got %d.", len(server.images))
+-
+- if username == "" {
+- return "", nilOptions, ErrNoUsername
- }
-- if _, ok := server.imgIDs["base"]; !ok {
-- t.Error("PullImage: Repository should not be empty.")
+-
+- if password == "" {
+- return "", nilOptions, ErrNoPassword
- }
--}
-
--func TestPushImage(t *testing.T) {
-- server := DockerServer{imgIDs: map[string]string{"tsuru/python": "a123"}}
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- request, _ := http.NewRequest("POST", "/images/tsuru/python/push", nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusOK {
-- t.Errorf("PushImage: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
+- ao := gophercloud.AuthOptions{
+- Username: username,
+- Password: password,
+- TenantId: tenantId,
+- TenantName: tenantName,
- }
--}
-
--func TestPushImageNotFound(t *testing.T) {
-- server := DockerServer{}
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- request, _ := http.NewRequest("POST", "/images/tsuru/python/push", nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusNotFound {
-- t.Errorf("PushImage: wrong status. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
+- if !strings.HasSuffix(provider, "/tokens") {
+- provider += "/tokens"
- }
+-
+- return provider, ao, nil
-}
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/osutil/region.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/osutil/region.go
+deleted file mode 100644
+index f7df507..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/osutil/region.go
++++ /dev/null
+@@ -1,9 +0,0 @@
+-package osutil
-
--func addContainers(server *DockerServer, n int) {
-- server.cMut.Lock()
-- defer server.cMut.Unlock()
-- for i := 0; i < n; i++ {
-- date := time.Now().Add(time.Duration((rand.Int() % (i + 1))) * time.Hour)
-- container := docker.Container{
-- ID: fmt.Sprintf("%x", rand.Int()%10000),
-- Created: date,
-- Path: "ls",
-- Args: []string{"-la", ".."},
-- Config: &docker.Config{
-- Hostname: fmt.Sprintf("docker-%d", i),
-- AttachStdout: true,
-- AttachStderr: true,
-- Env: []string{"ME=you", fmt.Sprintf("NUMBER=%d", i)},
-- Cmd: []string{"ls", "-la", ".."},
-- Image: "base",
-- },
-- State: docker.State{
-- Running: false,
-- Pid: 400 + i,
-- ExitCode: 0,
-- StartedAt: date,
-- },
-- Image: "b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc",
-- NetworkSettings: &docker.NetworkSettings{
-- IPAddress: fmt.Sprintf("10.10.10.%d", i+2),
-- IPPrefixLen: 24,
-- Gateway: "10.10.10.1",
-- Bridge: "docker0",
-- PortMapping: map[string]docker.PortMapping{
-- "Tcp": {"8888": fmt.Sprintf("%d", 49600+i)},
-- },
-- },
-- ResolvConfPath: "/etc/resolv.conf",
+-import "os"
+-
+-// Region provides a means of querying the OS_REGION_NAME environment variable.
+-// At present, you may also use os.Getenv("OS_REGION_NAME") as well.
+-func Region() string {
+- return os.Getenv("OS_REGION_NAME")
+-}
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/package.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/package.go
+deleted file mode 100644
+index 396e523..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/package.go
++++ /dev/null
+@@ -1,7 +0,0 @@
+-// Gophercloud provides a multi-vendor interface to OpenStack-compatible clouds which attempts to follow
+-// established Go community coding standards and social norms.
+-//
+-// Unless you intend on contributing code to the SDK, you will almost certainly never have to use any
+-// Context structures or any of its methods. Contextual methods exist for easier unit testing only.
+-// Stick with the global functions unless you know exactly what you're doing, and why.
+-package gophercloud
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/reauth.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/reauth.go
+deleted file mode 100644
+index 342aca4..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/reauth.go
++++ /dev/null
+@@ -1,36 +0,0 @@
+-package gophercloud
+-
+-import (
+- "github.com/racker/perigee"
+-)
+-
+-// WithReauth wraps a Perigee request fragment with logic to perform re-authentication
+-// if it's deemed necessary.
+-//
+-// Do not confuse this function with WithReauth()! Although they work together to support reauthentication,
+-// WithReauth() actually contains the decision-making logic to determine when to perform a reauth,
+-// while WithReauthHandler() is used to configure what a reauth actually entails.
+-func (c *Context) WithReauth(ap AccessProvider, f func() error) error {
+- err := f()
+- cause, ok := err.(*perigee.UnexpectedResponseCodeError)
+- if ok && cause.Actual == 401 {
+- err = c.reauthHandler(ap)
+- if err == nil {
+- err = f()
- }
-- server.containers = append(server.containers, &container)
- }
+- return err
-}
-
--func addImages(server *DockerServer, n int, repo bool) {
-- server.iMut.Lock()
-- defer server.iMut.Unlock()
-- if server.imgIDs == nil {
-- server.imgIDs = make(map[string]string)
-- }
-- for i := 0; i < n; i++ {
-- date := time.Now().Add(time.Duration((rand.Int() % (i + 1))) * time.Hour)
-- image := docker.Image{
-- ID: fmt.Sprintf("%x", rand.Int()%10000),
-- Created: date,
-- }
-- server.images = append(server.images, image)
-- if repo {
-- repo := "docker/python-" + image.ID
-- server.imgIDs[repo] = image.ID
+-// This is like WithReauth above but returns a perigee Response object
+-func (c *Context) ResponseWithReauth(ap AccessProvider, f func() (*perigee.Response, error)) (*perigee.Response, error) {
+- response, err := f()
+- cause, ok := err.(*perigee.UnexpectedResponseCodeError)
+- if ok && cause.Actual == 401 {
+- err = c.reauthHandler(ap)
+- if err == nil {
+- response, err = f()
- }
- }
+- return response, err
-}
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/reauth_test.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/reauth_test.go
+deleted file mode 100644
+index e3501b8..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/reauth_test.go
++++ /dev/null
+@@ -1,133 +0,0 @@
+-package gophercloud
-
--func TestListImages(t *testing.T) {
-- server := DockerServer{}
-- addImages(&server, 2, true)
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- request, _ := http.NewRequest("GET", "/images/json?all=1", nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusOK {
-- t.Errorf("ListImages: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
-- }
-- expected := make([]docker.APIImages, 2)
-- for i, image := range server.images {
-- expected[i] = docker.APIImages{
-- ID: image.ID,
-- Created: image.Created.Unix(),
-- RepoTags: []string{"docker/python-" + image.ID},
+-import (
+- "github.com/racker/perigee"
+- "testing"
+-)
+-
+-// This reauth-handler does nothing, and returns no error.
+-func doNothing(_ AccessProvider) error {
+- return nil
+-}
+-
+-func TestOtherErrorsPropegate(t *testing.T) {
+- calls := 0
+- c := TestContext().WithReauthHandler(doNothing)
+-
+- err := c.WithReauth(nil, func() error {
+- calls++
+- return &perigee.UnexpectedResponseCodeError{
+- Expected: []int{204},
+- Actual: 404,
- }
+- })
+-
+- if err == nil {
+- t.Error("Expected MyError to be returned; got nil instead.")
+- return
- }
-- var got []docker.APIImages
-- err := json.NewDecoder(recorder.Body).Decode(&got)
-- if err != nil {
-- t.Fatal(err)
+- if _, ok := err.(*perigee.UnexpectedResponseCodeError); !ok {
+- t.Error("Expected UnexpectedResponseCodeError; got %#v", err)
+- return
- }
-- if !reflect.DeepEqual(got, expected) {
-- t.Errorf("ListImages. Want %#v. Got %#v.", expected, got)
+- if calls != 1 {
+- t.Errorf("Expected the body to be invoked once; found %d calls instead", calls)
+- return
- }
-}
-
--func TestRemoveImage(t *testing.T) {
-- server := DockerServer{}
-- addImages(&server, 1, false)
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- path := fmt.Sprintf("/images/%s", server.images[0].ID)
-- request, _ := http.NewRequest("DELETE", path, nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusNoContent {
-- t.Errorf("RemoveImage: wrong status. Want %d. Got %d.", http.StatusNoContent, recorder.Code)
+-func Test401ErrorCausesBodyInvokation2ndTime(t *testing.T) {
+- calls := 0
+- c := TestContext().WithReauthHandler(doNothing)
+-
+- err := c.WithReauth(nil, func() error {
+- calls++
+- return &perigee.UnexpectedResponseCodeError{
+- Expected: []int{204},
+- Actual: 401,
+- }
+- })
+-
+- if err == nil {
+- t.Error("Expected MyError to be returned; got nil instead.")
+- return
- }
-- if len(server.images) > 0 {
-- t.Error("RemoveImage: did not remove the image.")
+- if calls != 2 {
+- t.Errorf("Expected the body to be invoked once; found %d calls instead", calls)
+- return
- }
-}
-
--func TestRemoveImageByName(t *testing.T) {
-- server := DockerServer{}
-- addImages(&server, 1, true)
-- server.buildMuxer()
-- recorder := httptest.NewRecorder()
-- imgName := "docker/python-" + server.images[0].ID
-- path := "/images/" + imgName
-- request, _ := http.NewRequest("DELETE", path, nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusNoContent {
-- t.Errorf("RemoveImage: wrong status. Want %d. Got %d.", http.StatusNoContent, recorder.Code)
-- }
-- if len(server.images) > 0 {
-- t.Error("RemoveImage: did not remove the image.")
-- }
-- _, ok := server.imgIDs[imgName]
-- if ok {
-- t.Error("RemoveImage: did not remove image tag name.")
+-func TestReauthAttemptShouldHappen(t *testing.T) {
+- calls := 0
+- c := TestContext().WithReauthHandler(func(_ AccessProvider) error {
+- calls++
+- return nil
+- })
+- c.WithReauth(nil, func() error {
+- return &perigee.UnexpectedResponseCodeError{
+- Expected: []int{204},
+- Actual: 401,
+- }
+- })
+-
+- if calls != 1 {
+- t.Errorf("Expected Reauthenticator to be called once; found %d instead", calls)
+- return
- }
-}
-
--func TestPrepareFailure(t *testing.T) {
-- server := DockerServer{failures: make(map[string]string)}
-- server.buildMuxer()
-- errorID := "my_error"
-- server.PrepareFailure(errorID, "containers/json")
-- recorder := httptest.NewRecorder()
-- request, _ := http.NewRequest("GET", "/containers/json?all=1", nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusBadRequest {
-- t.Errorf("PrepareFailure: wrong status. Want %d. Got %d.", http.StatusBadRequest, recorder.Code)
-- }
-- if recorder.Body.String() != errorID+"\n" {
-- t.Errorf("PrepareFailure: wrong message. Want %s. Got %s.", errorID, recorder.Body.String())
-- }
+-type MyError struct{}
+-
+-func (*MyError) Error() string {
+- return "MyError instance"
-}
-
--func TestRemoveFailure(t *testing.T) {
-- server := DockerServer{failures: make(map[string]string)}
-- server.buildMuxer()
-- errorID := "my_error"
-- server.PrepareFailure(errorID, "containers/json")
-- recorder := httptest.NewRecorder()
-- request, _ := http.NewRequest("GET", "/containers/json?all=1", nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusBadRequest {
-- t.Errorf("PrepareFailure: wrong status. Want %d. Got %d.", http.StatusBadRequest, recorder.Code)
-- }
-- server.ResetFailure(errorID)
-- recorder = httptest.NewRecorder()
-- request, _ = http.NewRequest("GET", "/containers/json?all=1", nil)
-- server.ServeHTTP(recorder, request)
-- if recorder.Code != http.StatusOK {
-- t.Errorf("RemoveFailure: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
+-func TestReauthErrorShouldPropegate(t *testing.T) {
+- c := TestContext().WithReauthHandler(func(_ AccessProvider) error {
+- return &MyError{}
+- })
+-
+- err := c.WithReauth(nil, func() error {
+- return &perigee.UnexpectedResponseCodeError{
+- Expected: []int{204},
+- Actual: 401,
+- }
+- })
+-
+- if _, ok := err.(*MyError); !ok {
+- t.Errorf("Expected a MyError; got %#v", err)
+- return
- }
-}
-
--func TestMutateContainer(t *testing.T) {
-- server := DockerServer{failures: make(map[string]string)}
-- server.buildMuxer()
-- server.containers = append(server.containers, &docker.Container{ID: "id123"})
-- state := docker.State{Running: false, ExitCode: 1}
-- err := server.MutateContainer("id123", state)
-- if err != nil {
-- t.Fatal(err)
-- }
-- if !reflect.DeepEqual(server.containers[0].State, state) {
-- t.Errorf("Wrong state after mutation.\nWant %#v.\nGot %#v.",
-- state, server.containers[0].State)
-- }
+-type MyAccess struct{}
+-
+-func (my *MyAccess) FirstEndpointUrlByCriteria(ApiCriteria) string {
+- return ""
+-}
+-func (my *MyAccess) AuthToken() string {
+- return ""
+-}
+-func (my *MyAccess) Revoke(string) error {
+- return nil
+-}
+-func (my *MyAccess) Reauthenticate() error {
+- return nil
-}
-
--func TestMutateContainerNotFound(t *testing.T) {
-- server := DockerServer{failures: make(map[string]string)}
-- server.buildMuxer()
-- state := docker.State{Running: false, ExitCode: 1}
-- err := server.MutateContainer("id123", state)
-- if err == nil {
-- t.Error("Unexpected <nil> error")
-- }
-- if err.Error() != "container not found" {
-- t.Errorf("wrong error message. Want %q. Got %q.", "container not found", err)
-- }
+-func TestReauthHandlerUsesSameAccessProvider(t *testing.T) {
+- fakeAccess := &MyAccess{}
+- c := TestContext().WithReauthHandler(func(acc AccessProvider) error {
+- if acc != fakeAccess {
+- t.Errorf("Expected acc = fakeAccess")
+- }
+- return nil
+- })
+- c.WithReauth(fakeAccess, func() error {
+- return &perigee.UnexpectedResponseCodeError{
+- Expected: []int{204},
+- Actual: 401,
+- }
+- })
+-}
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/scripts/create-environment.sh b/Godeps/_workspace/src/github.com/rackspace/gophercloud/scripts/create-environment.sh
+deleted file mode 100644
+index 6bae6e8..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/scripts/create-environment.sh
++++ /dev/null
+@@ -1,26 +0,0 @@
+-#!/bin/bash
+-#
+-# This script helps new contributors set up their local workstation for
+-# gophercloud development and contributions.
+-
+-# Create the environment
+-export GOPATH=$HOME/go/gophercloud
+-mkdir -p $GOPATH
+-
+-# Download gophercloud into that environment
+-go get github.com/rackspace/gophercloud
+-cd $GOPATH/src/github.com/rackspace/gophercloud
+-git checkout master
+-
+-# Write out the env.sh convenience file.
+-cd $GOPATH
+-cat <<EOF >env.sh
+-#!/bin/bash
+-export GOPATH=$(pwd)
+-export GOPHERCLOUD=$GOPATH/src/github.com/rackspace/gophercloud
+-EOF
+-chmod a+x env.sh
+-
+-# Make changes immediately available as a convenience.
+-. ./env.sh
+-
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/scripts/test-all.sh b/Godeps/_workspace/src/github.com/rackspace/gophercloud/scripts/test-all.sh
+deleted file mode 100644
+index 096736f..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/scripts/test-all.sh
++++ /dev/null
+@@ -1,37 +0,0 @@
+-#!/bin/bash
+-#
+-# This script is responsible for executing all the acceptance tests found in
+-# the acceptance/ directory.
+-
+-# Find where _this_ script is running from.
+-SCRIPTS=$(dirname $0)
+-SCRIPTS=$(cd $SCRIPTS; pwd)
+-
+-# Locate the acceptance test / examples directory.
+-ACCEPTANCE=$(cd $SCRIPTS/../acceptance; pwd)
+-
+-# Go workspace path
+-WS=$(cd $SCRIPTS/..; pwd)
+-
+-# In order to run Go code interactively, we need the GOPATH environment
+-# to be set.
+-if [ "x$GOPATH" == "x" ]; then
+- export GOPATH=$WS
+- echo "WARNING: You didn't have your GOPATH environment variable set."
+- echo " I'm assuming $GOPATH as its value."
+-fi
+-
+-# Run all acceptance tests sequentially.
+-# If any test fails, we fail fast.
+-LIBS=$(ls $ACCEPTANCE/lib*.go)
+-for T in $(ls -1 $ACCEPTANCE/[0-9][0-9]*.go); do
+- if ! [ -x $T ]; then
+- CMD="go run $T $LIBS -quiet"
+- echo "$CMD ..."
+- if ! $CMD ; then
+- echo "- FAILED. Try re-running w/out the -quiet option to see output."
+- exit 1
+- fi
+- fi
+-done
+-
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/servers.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/servers.go
+deleted file mode 100644
+index 1f6a7a4..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/servers.go
++++ /dev/null
+@@ -1,807 +0,0 @@
+-// TODO(sfalvo): Remove Rackspace-specific Server structure fields and refactor them into a provider-specific access method.
+-// Be sure to update godocs accordingly.
+-
+-package gophercloud
+-
+-import (
+- "fmt"
+- "net/url"
+- "strings"
+-
+- "github.com/mitchellh/mapstructure"
+- "github.com/racker/perigee"
+-)
+-
+-// genericServersProvider structures provide the implementation for generic OpenStack-compatible
+-// CloudServersProvider interfaces.
+-type genericServersProvider struct {
+- // endpoint refers to the provider's API endpoint base URL. This will be used to construct
+- // and issue queries.
+- endpoint string
+-
+- // Test context (if any) in which to issue requests.
+- context *Context
+-
+- // access associates this API provider with a set of credentials,
+- // which may be automatically renewed if they near expiration.
+- access AccessProvider
-}
-
--func TestBuildImageWithContentTypeTar(t *testing.T) {
-- server := DockerServer{imgIDs: make(map[string]string)}
-- imageName := "teste"
-- recorder := httptest.NewRecorder()
-- tarFile, err := os.Open("data/dockerfile.tar")
-- if err != nil {
-- t.Fatal(err)
-- }
-- defer tarFile.Close()
-- request, _ := http.NewRequest("POST", "/build?t=teste", tarFile)
-- request.Header.Add("Content-Type", "application/tar")
-- server.buildImage(recorder, request)
-- if recorder.Body.String() == "miss Dockerfile" {
-- t.Errorf("BuildImage: miss Dockerfile")
-- return
-- }
-- if _, ok := server.imgIDs[imageName]; ok == false {
-- t.Errorf("BuildImage: image %s not builded", imageName)
-- }
+-// See the CloudServersProvider interface for details.
+-func (gcp *genericServersProvider) ListServersByFilter(filter url.Values) ([]Server, error) {
+- var ss []Server
+-
+- err := gcp.context.WithReauth(gcp.access, func() error {
+- url := gcp.endpoint + "/servers/detail?" + filter.Encode()
+- return perigee.Get(url, perigee.Options{
+- CustomClient: gcp.context.httpClient,
+- Results: &struct{ Servers *[]Server }{&ss},
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gcp.access.AuthToken(),
+- },
+- })
+- })
+- return ss, err
-}
-
--func TestBuildImageWithRemoteDockerfile(t *testing.T) {
-- server := DockerServer{imgIDs: make(map[string]string)}
-- imageName := "teste"
-- recorder := httptest.NewRecorder()
-- request, _ := http.NewRequest("POST", "/build?t=teste&remote=http://localhost/Dockerfile", nil)
-- server.buildImage(recorder, request)
-- if _, ok := server.imgIDs[imageName]; ok == false {
-- t.Errorf("BuildImage: image %s not builded", imageName)
-- }
--}
+-// See the CloudServersProvider interface for details.
+-func (gcp *genericServersProvider) ListServersLinksOnly() ([]Server, error) {
+- var ss []Server
-
--func TestPing(t *testing.T) {
-- server := DockerServer{}
-- recorder := httptest.NewRecorder()
-- request, _ := http.NewRequest("GET", "/_ping", nil)
-- server.pingDocker(recorder, request)
-- if recorder.Body.String() != "" {
-- t.Errorf("Ping: Unexpected body: %s", recorder.Body.String())
-- }
-- if recorder.Code != http.StatusOK {
-- t.Errorf("Ping: Expected code %d, got: %d", http.StatusOK, recorder.Code)
-- }
+- err := gcp.context.WithReauth(gcp.access, func() error {
+- url := gcp.endpoint + "/servers"
+- return perigee.Get(url, perigee.Options{
+- CustomClient: gcp.context.httpClient,
+- Results: &struct{ Servers *[]Server }{&ss},
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gcp.access.AuthToken(),
+- },
+- })
+- })
+- return ss, err
-}
-
--func TestDefaultHandler(t *testing.T) {
-- server, err := NewServer("127.0.0.1:0", nil, nil)
+-// See the CloudServersProvider interface for details.
+-func (gcp *genericServersProvider) ListServers() ([]Server, error) {
+- var ss []Server
+-
+- err := gcp.context.WithReauth(gcp.access, func() error {
+- url := gcp.endpoint + "/servers/detail"
+- return perigee.Get(url, perigee.Options{
+- CustomClient: gcp.context.httpClient,
+- Results: &struct{ Servers *[]Server }{&ss},
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gcp.access.AuthToken(),
+- },
+- })
+- })
+-
+- // Compatibility with v0.0.x -- we "map" our public and private
+- // addresses into a legacy structure field for the benefit of
+- // earlier software.
+-
- if err != nil {
-- t.Fatal(err)
+- return ss, err
- }
-- defer server.listener.Close()
-- if server.mux != server.DefaultHandler() {
-- t.Fatalf("DefaultHandler: Expected to return server.mux, got: %#v", server.DefaultHandler())
+-
+- for _, s := range ss {
+- err = mapstructure.Decode(s.RawAddresses, &s.Addresses)
+- if err != nil {
+- return ss, err
+- }
- }
+-
+- return ss, err
-}
-diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/writer.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/writer.go
-deleted file mode 100644
-index 42752b0..0000000
---- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/writer.go
-+++ /dev/null
-@@ -1,43 +0,0 @@
--// Copyright 2014 go-dockerclient authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
-
--package testing
+-// See the CloudServersProvider interface for details.
+-func (gsp *genericServersProvider) ServerById(id string) (*Server, error) {
+- var s *Server
-
--import (
-- "encoding/binary"
-- "errors"
-- "io"
--)
+- err := gsp.context.WithReauth(gsp.access, func() error {
+- url := gsp.endpoint + "/servers/" + id
+- return perigee.Get(url, perigee.Options{
+- Results: &struct{ Server **Server }{&s},
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gsp.access.AuthToken(),
+- },
+- OkCodes: []int{200},
+- })
+- })
-
--type stdType [8]byte
+- // Compatibility with v0.0.x -- we "map" our public and private
+- // addresses into a legacy structure field for the benefit of
+- // earlier software.
-
--var (
-- stdin stdType = stdType{0: 0}
-- stdout stdType = stdType{0: 1}
-- stderr stdType = stdType{0: 2}
--)
+- if err != nil {
+- return s, err
+- }
-
--type stdWriter struct {
-- io.Writer
-- prefix stdType
-- sizeBuf []byte
+- err = mapstructure.Decode(s.RawAddresses, &s.Addresses)
+-
+- return s, err
-}
-
--func (w *stdWriter) Write(buf []byte) (n int, err error) {
-- if w == nil || w.Writer == nil {
-- return 0, errors.New("Writer not instanciated")
-- }
-- binary.BigEndian.PutUint32(w.prefix[4:], uint32(len(buf)))
-- buf = append(w.prefix[:], buf...)
+-// See the CloudServersProvider interface for details.
+-func (gsp *genericServersProvider) CreateServer(ns NewServer) (*NewServer, error) {
+- var s *NewServer
-
-- n, err = w.Writer.Write(buf)
-- return n - 8, err
--}
+- err := gsp.context.WithReauth(gsp.access, func() error {
+- ep := gsp.endpoint + "/servers"
+- return perigee.Post(ep, perigee.Options{
+- ReqBody: &struct {
+- Server *NewServer `json:"server"`
+- }{&ns},
+- Results: &struct{ Server **NewServer }{&s},
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gsp.access.AuthToken(),
+- },
+- OkCodes: []int{202},
+- })
+- })
-
--func newStdWriter(w io.Writer, t stdType) *stdWriter {
-- if len(t) != 8 {
-- return nil
-- }
-- return &stdWriter{Writer: w, prefix: t, sizeBuf: make([]byte, 4)}
+- return s, err
-}
-diff --git a/Godeps/_workspace/src/github.com/golang/glog/LICENSE b/Godeps/_workspace/src/github.com/golang/glog/LICENSE
-deleted file mode 100644
-index 37ec93a..0000000
---- a/Godeps/_workspace/src/github.com/golang/glog/LICENSE
-+++ /dev/null
-@@ -1,191 +0,0 @@
--Apache License
--Version 2.0, January 2004
--http://www.apache.org/licenses/
--
--TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
--1. Definitions.
+-// See the CloudServersProvider interface for details.
+-func (gsp *genericServersProvider) DeleteServerById(id string) error {
+- err := gsp.context.WithReauth(gsp.access, func() error {
+- url := gsp.endpoint + "/servers/" + id
+- return perigee.Delete(url, perigee.Options{
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gsp.access.AuthToken(),
+- },
+- OkCodes: []int{204},
+- })
+- })
+- return err
+-}
-
--"License" shall mean the terms and conditions for use, reproduction, and
--distribution as defined by Sections 1 through 9 of this document.
+-// See the CloudServersProvider interface for details.
+-func (gsp *genericServersProvider) SetAdminPassword(id, pw string) error {
+- err := gsp.context.WithReauth(gsp.access, func() error {
+- url := fmt.Sprintf("%s/servers/%s/action", gsp.endpoint, id)
+- return perigee.Post(url, perigee.Options{
+- ReqBody: &struct {
+- ChangePassword struct {
+- AdminPass string `json:"adminPass"`
+- } `json:"changePassword"`
+- }{
+- struct {
+- AdminPass string `json:"adminPass"`
+- }{pw},
+- },
+- OkCodes: []int{202},
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gsp.access.AuthToken(),
+- },
+- })
+- })
+- return err
+-}
-
--"Licensor" shall mean the copyright owner or entity authorized by the copyright
--owner that is granting the License.
+-// See the CloudServersProvider interface for details.
+-func (gsp *genericServersProvider) ResizeServer(id, newName, newFlavor, newDiskConfig string) error {
+- err := gsp.context.WithReauth(gsp.access, func() error {
+- url := fmt.Sprintf("%s/servers/%s/action", gsp.endpoint, id)
+- rr := ResizeRequest{
+- Name: newName,
+- FlavorRef: newFlavor,
+- DiskConfig: newDiskConfig,
+- }
+- return perigee.Post(url, perigee.Options{
+- ReqBody: &struct {
+- Resize ResizeRequest `json:"resize"`
+- }{rr},
+- OkCodes: []int{202},
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gsp.access.AuthToken(),
+- },
+- })
+- })
+- return err
+-}
-
--"Legal Entity" shall mean the union of the acting entity and all other entities
--that control, are controlled by, or are under common control with that entity.
--For the purposes of this definition, "control" means (i) the power, direct or
--indirect, to cause the direction or management of such entity, whether by
--contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
--outstanding shares, or (iii) beneficial ownership of such entity.
+-// See the CloudServersProvider interface for details.
+-func (gsp *genericServersProvider) RevertResize(id string) error {
+- err := gsp.context.WithReauth(gsp.access, func() error {
+- url := fmt.Sprintf("%s/servers/%s/action", gsp.endpoint, id)
+- return perigee.Post(url, perigee.Options{
+- ReqBody: &struct {
+- RevertResize *int `json:"revertResize"`
+- }{nil},
+- OkCodes: []int{202},
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gsp.access.AuthToken(),
+- },
+- })
+- })
+- return err
+-}
-
--"You" (or "Your") shall mean an individual or Legal Entity exercising
--permissions granted by this License.
+-// See the CloudServersProvider interface for details.
+-func (gsp *genericServersProvider) ConfirmResize(id string) error {
+- err := gsp.context.WithReauth(gsp.access, func() error {
+- url := fmt.Sprintf("%s/servers/%s/action", gsp.endpoint, id)
+- return perigee.Post(url, perigee.Options{
+- ReqBody: &struct {
+- ConfirmResize *int `json:"confirmResize"`
+- }{nil},
+- OkCodes: []int{204},
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gsp.access.AuthToken(),
+- },
+- })
+- })
+- return err
+-}
-
--"Source" form shall mean the preferred form for making modifications, including
--but not limited to software source code, documentation source, and configuration
--files.
+-// See the CloudServersProvider interface for details
+-func (gsp *genericServersProvider) RebootServer(id string, hard bool) error {
+- return gsp.context.WithReauth(gsp.access, func() error {
+- url := fmt.Sprintf("%s/servers/%s/action", gsp.endpoint, id)
+- types := map[bool]string{false: "SOFT", true: "HARD"}
+- return perigee.Post(url, perigee.Options{
+- ReqBody: &struct {
+- Reboot struct {
+- Type string `json:"type"`
+- } `json:"reboot"`
+- }{
+- struct {
+- Type string `json:"type"`
+- }{types[hard]},
+- },
+- OkCodes: []int{202},
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gsp.access.AuthToken(),
+- },
+- })
+- })
+-}
-
--"Object" form shall mean any form resulting from mechanical transformation or
--translation of a Source form, including but not limited to compiled object code,
--generated documentation, and conversions to other media types.
+-// See the CloudServersProvider interface for details
+-func (gsp *genericServersProvider) RescueServer(id string) (string, error) {
+- var pw *string
-
--"Work" shall mean the work of authorship, whether in Source or Object form, made
--available under the License, as indicated by a copyright notice that is included
--in or attached to the work (an example is provided in the Appendix below).
+- err := gsp.context.WithReauth(gsp.access, func() error {
+- url := fmt.Sprintf("%s/servers/%s/action", gsp.endpoint, id)
+- return perigee.Post(url, perigee.Options{
+- ReqBody: &struct {
+- Rescue string `json:"rescue"`
+- }{"none"},
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gsp.access.AuthToken(),
+- },
+- Results: &struct {
+- AdminPass **string `json:"adminPass"`
+- }{&pw},
+- })
+- })
+- return *pw, err
+-}
-
--"Derivative Works" shall mean any work, whether in Source or Object form, that
--is based on (or derived from) the Work and for which the editorial revisions,
--annotations, elaborations, or other modifications represent, as a whole, an
--original work of authorship. For the purposes of this License, Derivative Works
--shall not include works that remain separable from, or merely link (or bind by
--name) to the interfaces of, the Work and Derivative Works thereof.
+-// See the CloudServersProvider interface for details
+-func (gsp *genericServersProvider) UnrescueServer(id string) error {
+- return gsp.context.WithReauth(gsp.access, func() error {
+- url := fmt.Sprintf("%s/servers/%s/action", gsp.endpoint, id)
+- return perigee.Post(url, perigee.Options{
+- ReqBody: &struct {
+- Unrescue *int `json:"unrescue"`
+- }{nil},
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gsp.access.AuthToken(),
+- },
+- OkCodes: []int{202},
+- })
+- })
+-}
-
--"Contribution" shall mean any work of authorship, including the original version
--of the Work and any modifications or additions to that Work or Derivative Works
--thereof, that is intentionally submitted to Licensor for inclusion in the Work
--by the copyright owner or by an individual or Legal Entity authorized to submit
--on behalf of the copyright owner. For the purposes of this definition,
--"submitted" means any form of electronic, verbal, or written communication sent
--to the Licensor or its representatives, including but not limited to
--communication on electronic mailing lists, source code control systems, and
--issue tracking systems that are managed by, or on behalf of, the Licensor for
--the purpose of discussing and improving the Work, but excluding communication
--that is conspicuously marked or otherwise designated in writing by the copyright
--owner as "Not a Contribution."
+-// See the CloudServersProvider interface for details
+-func (gsp *genericServersProvider) UpdateServer(id string, changes NewServerSettings) (*Server, error) {
+- var svr *Server
+- err := gsp.context.WithReauth(gsp.access, func() error {
+- url := fmt.Sprintf("%s/servers/%s", gsp.endpoint, id)
+- return perigee.Put(url, perigee.Options{
+- ReqBody: &struct {
+- Server NewServerSettings `json:"server"`
+- }{changes},
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gsp.access.AuthToken(),
+- },
+- Results: &struct {
+- Server **Server `json:"server"`
+- }{&svr},
+- })
+- })
+- return svr, err
+-}
-
--"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
--of whom a Contribution has been received by Licensor and subsequently
--incorporated within the Work.
+-// See the CloudServersProvider interface for details.
+-func (gsp *genericServersProvider) RebuildServer(id string, ns NewServer) (*Server, error) {
+- var s *Server
-
--2. Grant of Copyright License.
+- err := gsp.context.WithReauth(gsp.access, func() error {
+- ep := fmt.Sprintf("%s/servers/%s/action", gsp.endpoint, id)
+- return perigee.Post(ep, perigee.Options{
+- ReqBody: &struct {
+- Rebuild *NewServer `json:"rebuild"`
+- }{&ns},
+- Results: &struct{ Server **Server }{&s},
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gsp.access.AuthToken(),
+- },
+- OkCodes: []int{202},
+- })
+- })
-
--Subject to the terms and conditions of this License, each Contributor hereby
--grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
--irrevocable copyright license to reproduce, prepare Derivative Works of,
--publicly display, publicly perform, sublicense, and distribute the Work and such
--Derivative Works in Source or Object form.
+- return s, err
+-}
-
--3. Grant of Patent License.
+-// See the CloudServersProvider interface for details.
+-func (gsp *genericServersProvider) ListAddresses(id string) (AddressSet, error) {
+- var pas *AddressSet
+- var statusCode int
-
--Subject to the terms and conditions of this License, each Contributor hereby
--grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
--irrevocable (except as stated in this section) patent license to make, have
--made, use, offer to sell, sell, import, and otherwise transfer the Work, where
--such license applies only to those patent claims licensable by such Contributor
--that are necessarily infringed by their Contribution(s) alone or by combination
--of their Contribution(s) with the Work to which such Contribution(s) was
--submitted. If You institute patent litigation against any entity (including a
--cross-claim or counterclaim in a lawsuit) alleging that the Work or a
--Contribution incorporated within the Work constitutes direct or contributory
--patent infringement, then any patent licenses granted to You under this License
--for that Work shall terminate as of the date such litigation is filed.
+- err := gsp.context.WithReauth(gsp.access, func() error {
+- ep := fmt.Sprintf("%s/servers/%s/ips", gsp.endpoint, id)
+- return perigee.Get(ep, perigee.Options{
+- Results: &struct{ Addresses **AddressSet }{&pas},
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gsp.access.AuthToken(),
+- },
+- OkCodes: []int{200, 203},
+- StatusCode: &statusCode,
+- })
+- })
-
--4. Redistribution.
+- if err != nil {
+- if statusCode == 203 {
+- err = WarnUnauthoritative
+- }
+- }
-
--You may reproduce and distribute copies of the Work or Derivative Works thereof
--in any medium, with or without modifications, and in Source or Object form,
--provided that You meet the following conditions:
+- return *pas, err
+-}
-
--You must give any other recipients of the Work or Derivative Works a copy of
--this License; and
--You must cause any modified files to carry prominent notices stating that You
--changed the files; and
--You must retain, in the Source form of any Derivative Works that You distribute,
--all copyright, patent, trademark, and attribution notices from the Source form
--of the Work, excluding those notices that do not pertain to any part of the
--Derivative Works; and
--If the Work includes a "NOTICE" text file as part of its distribution, then any
--Derivative Works that You distribute must include a readable copy of the
--attribution notices contained within such NOTICE file, excluding those notices
--that do not pertain to any part of the Derivative Works, in at least one of the
--following places: within a NOTICE text file distributed as part of the
--Derivative Works; within the Source form or documentation, if provided along
--with the Derivative Works; or, within a display generated by the Derivative
--Works, if and wherever such third-party notices normally appear. The contents of
--the NOTICE file are for informational purposes only and do not modify the
--License. You may add Your own attribution notices within Derivative Works that
--You distribute, alongside or as an addendum to the NOTICE text from the Work,
--provided that such additional attribution notices cannot be construed as
--modifying the License.
--You may add Your own copyright statement to Your modifications and may provide
--additional or different license terms and conditions for use, reproduction, or
--distribution of Your modifications, or for any such Derivative Works as a whole,
--provided Your use, reproduction, and distribution of the Work otherwise complies
--with the conditions stated in this License.
+-// See the CloudServersProvider interface for details.
+-func (gsp *genericServersProvider) ListAddressesByNetwork(id, networkLabel string) (NetworkAddress, error) {
+- pas := make(NetworkAddress)
+- var statusCode int
-
--5. Submission of Contributions.
+- err := gsp.context.WithReauth(gsp.access, func() error {
+- ep := fmt.Sprintf("%s/servers/%s/ips/%s", gsp.endpoint, id, networkLabel)
+- return perigee.Get(ep, perigee.Options{
+- Results: &pas,
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gsp.access.AuthToken(),
+- },
+- OkCodes: []int{200, 203},
+- StatusCode: &statusCode,
+- })
+- })
-
--Unless You explicitly state otherwise, any Contribution intentionally submitted
--for inclusion in the Work by You to the Licensor shall be under the terms and
--conditions of this License, without any additional terms or conditions.
--Notwithstanding the above, nothing herein shall supersede or modify the terms of
--any separate license agreement you may have executed with Licensor regarding
--such Contributions.
+- if err != nil {
+- if statusCode == 203 {
+- err = WarnUnauthoritative
+- }
+- }
-
--6. Trademarks.
+- return pas, err
+-}
-
--This License does not grant permission to use the trade names, trademarks,
--service marks, or product names of the Licensor, except as required for
--reasonable and customary use in describing the origin of the Work and
--reproducing the content of the NOTICE file.
+-// See the CloudServersProvider interface for details.
+-func (gsp *genericServersProvider) CreateImage(id string, ci CreateImage) (string, error) {
+- response, err := gsp.context.ResponseWithReauth(gsp.access, func() (*perigee.Response, error) {
+- ep := fmt.Sprintf("%s/servers/%s/action", gsp.endpoint, id)
+- return perigee.Request("POST", ep, perigee.Options{
+- ReqBody: &struct {
+- CreateImage *CreateImage `json:"createImage"`
+- }{&ci},
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gsp.access.AuthToken(),
+- },
+- OkCodes: []int{200, 202},
+- })
+- })
-
--7. Disclaimer of Warranty.
+- if err != nil {
+- return "", err
+- }
+- location, err := response.HttpResponse.Location()
+- if err != nil {
+- return "", err
+- }
-
--Unless required by applicable law or agreed to in writing, Licensor provides the
--Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
--WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
--including, without limitation, any warranties or conditions of TITLE,
--NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
--solely responsible for determining the appropriateness of using or
--redistributing the Work and assume any risks associated with Your exercise of
--permissions under this License.
+- // Return the last element of the location which is the image id
+- locationArr := strings.Split(location.Path, "/")
+- return locationArr[len(locationArr)-1], err
+-}
-
--8. Limitation of Liability.
+-// See the CloudServersProvider interface for details.
+-func (gsp *genericServersProvider) ListSecurityGroups() ([]SecurityGroup, error) {
+- var sgs []SecurityGroup
-
--In no event and under no legal theory, whether in tort (including negligence),
--contract, or otherwise, unless required by applicable law (such as deliberate
--and grossly negligent acts) or agreed to in writing, shall any Contributor be
--liable to You for damages, including any direct, indirect, special, incidental,
--or consequential damages of any character arising as a result of this License or
--out of the use or inability to use the Work (including but not limited to
--damages for loss of goodwill, work stoppage, computer failure or malfunction, or
--any and all other commercial damages or losses), even if such Contributor has
--been advised of the possibility of such damages.
+- err := gsp.context.WithReauth(gsp.access, func() error {
+- ep := fmt.Sprintf("%s/os-security-groups", gsp.endpoint)
+- return perigee.Get(ep, perigee.Options{
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gsp.access.AuthToken(),
+- },
+- Results: &struct {
+- SecurityGroups *[]SecurityGroup `json:"security_groups"`
+- }{&sgs},
+- })
+- })
+- return sgs, err
+-}
-
--9. Accepting Warranty or Additional Liability.
+-// See the CloudServersProvider interface for details.
+-func (gsp *genericServersProvider) CreateSecurityGroup(desired SecurityGroup) (*SecurityGroup, error) {
+- var actual *SecurityGroup
-
--While redistributing the Work or Derivative Works thereof, You may choose to
--offer, and charge a fee for, acceptance of support, warranty, indemnity, or
--other liability obligations and/or rights consistent with this License. However,
--in accepting such obligations, You may act only on Your own behalf and on Your
--sole responsibility, not on behalf of any other Contributor, and only if You
--agree to indemnify, defend, and hold each Contributor harmless for any liability
--incurred by, or claims asserted against, such Contributor by reason of your
--accepting any such warranty or additional liability.
+- err := gsp.context.WithReauth(gsp.access, func() error {
+- ep := fmt.Sprintf("%s/os-security-groups", gsp.endpoint)
+- return perigee.Post(ep, perigee.Options{
+- ReqBody: struct {
+- AddSecurityGroup SecurityGroup `json:"security_group"`
+- }{desired},
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gsp.access.AuthToken(),
+- },
+- Results: &struct {
+- SecurityGroup **SecurityGroup `json:"security_group"`
+- }{&actual},
+- })
+- })
+- return actual, err
+-}
-
--END OF TERMS AND CONDITIONS
+-// See the CloudServersProvider interface for details.
+-func (gsp *genericServersProvider) ListSecurityGroupsByServerId(id string) ([]SecurityGroup, error) {
+- var sgs []SecurityGroup
-
--APPENDIX: How to apply the Apache License to your work
+- err := gsp.context.WithReauth(gsp.access, func() error {
+- ep := fmt.Sprintf("%s/servers/%s/os-security-groups", gsp.endpoint, id)
+- return perigee.Get(ep, perigee.Options{
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gsp.access.AuthToken(),
+- },
+- Results: &struct {
+- SecurityGroups *[]SecurityGroup `json:"security_groups"`
+- }{&sgs},
+- })
+- })
+- return sgs, err
+-}
-
--To apply the Apache License to your work, attach the following boilerplate
--notice, with the fields enclosed by brackets "[]" replaced with your own
--identifying information. (Don't include the brackets!) The text should be
--enclosed in the appropriate comment syntax for the file format. We also
--recommend that a file or class name and description of purpose be included on
--the same "printed page" as the copyright notice for easier identification within
--third-party archives.
+-// See the CloudServersProvider interface for details.
+-func (gsp *genericServersProvider) SecurityGroupById(id int) (*SecurityGroup, error) {
+- var actual *SecurityGroup
-
-- Copyright [yyyy] [name of copyright owner]
+- err := gsp.context.WithReauth(gsp.access, func() error {
+- ep := fmt.Sprintf("%s/os-security-groups/%d", gsp.endpoint, id)
+- return perigee.Get(ep, perigee.Options{
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gsp.access.AuthToken(),
+- },
+- Results: &struct {
+- SecurityGroup **SecurityGroup `json:"security_group"`
+- }{&actual},
+- })
+- })
+- return actual, err
+-}
-
-- Licensed under the Apache License, Version 2.0 (the "License");
-- you may not use this file except in compliance with the License.
-- You may obtain a copy of the License at
+-// See the CloudServersProvider interface for details.
+-func (gsp *genericServersProvider) DeleteSecurityGroupById(id int) error {
+- err := gsp.context.WithReauth(gsp.access, func() error {
+- ep := fmt.Sprintf("%s/os-security-groups/%d", gsp.endpoint, id)
+- return perigee.Delete(ep, perigee.Options{
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gsp.access.AuthToken(),
+- },
+- OkCodes: []int{202},
+- })
+- })
+- return err
+-}
-
-- http://www.apache.org/licenses/LICENSE-2.0
+-// See the CloudServersProvider interface for details.
+-func (gsp *genericServersProvider) ListDefaultSGRules() ([]SGRule, error) {
+- var sgrs []SGRule
+- err := gsp.context.WithReauth(gsp.access, func() error {
+- ep := fmt.Sprintf("%s/os-security-group-default-rules", gsp.endpoint)
+- return perigee.Get(ep, perigee.Options{
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gsp.access.AuthToken(),
+- },
+- Results: &struct{ Security_group_default_rules *[]SGRule }{&sgrs},
+- })
+- })
+- return sgrs, err
+-}
-
-- Unless required by applicable law or agreed to in writing, software
-- distributed under the License is distributed on an "AS IS" BASIS,
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- See the License for the specific language governing permissions and
-- limitations under the License.
-diff --git a/Godeps/_workspace/src/github.com/golang/glog/README b/Godeps/_workspace/src/github.com/golang/glog/README
-deleted file mode 100644
-index 5f9c114..0000000
---- a/Godeps/_workspace/src/github.com/golang/glog/README
-+++ /dev/null
-@@ -1,44 +0,0 @@
--glog
--====
+-// See the CloudServersProvider interface for details.
+-func (gsp *genericServersProvider) CreateDefaultSGRule(r SGRule) (*SGRule, error) {
+- var sgr *SGRule
+- err := gsp.context.WithReauth(gsp.access, func() error {
+- ep := fmt.Sprintf("%s/os-security-group-default-rules", gsp.endpoint)
+- return perigee.Post(ep, perigee.Options{
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gsp.access.AuthToken(),
+- },
+- Results: &struct{ Security_group_default_rule **SGRule }{&sgr},
+- ReqBody: struct {
+- Security_group_default_rule SGRule `json:"security_group_default_rule"`
+- }{r},
+- })
+- })
+- return sgr, err
+-}
-
--Leveled execution logs for Go.
+-// See the CloudServersProvider interface for details.
+-func (gsp *genericServersProvider) GetSGRule(id string) (*SGRule, error) {
+- var sgr *SGRule
+- err := gsp.context.WithReauth(gsp.access, func() error {
+- ep := fmt.Sprintf("%s/os-security-group-default-rules/%s", gsp.endpoint, id)
+- return perigee.Get(ep, perigee.Options{
+- MoreHeaders: map[string]string{
+- "X-Auth-Token": gsp.access.AuthToken(),
+- },
+- Results: &struct{ Security_group_default_rule **SGRule }{&sgr},
+- })
+- })
+- return sgr, err
+-}
-
--This is an efficient pure Go implementation of leveled logs in the
--manner of the open source C++ package
-- http://code.google.com/p/google-glog
+-// SecurityGroup provides a description of a security group, including all its rules.
+-type SecurityGroup struct {
+- Description string `json:"description,omitempty"`
+- Id int `json:"id,omitempty"`
+- Name string `json:"name,omitempty"`
+- Rules []SGRule `json:"rules,omitempty"`
+- TenantId string `json:"tenant_id,omitempty"`
+-}
-
--By binding methods to booleans it is possible to use the log package
--without paying the expense of evaluating the arguments to the log.
--Through the -vmodule flag, the package also provides fine-grained
--control over logging at the file level.
+-// SGRule encapsulates a single rule which applies to a security group.
+-// This definition is just a guess, based on the documentation found in another extension here: http://docs.openstack.org/api/openstack-compute/2/content/GET_os-security-group-default-rules-v2_listSecGroupDefaultRules_v2__tenant_id__os-security-group-rules_ext-os-security-group-default-rules.html
+-type SGRule struct {
+- FromPort int `json:"from_port,omitempty"`
+- Id int `json:"id,omitempty"`
+- IpProtocol string `json:"ip_protocol,omitempty"`
+- IpRange map[string]interface{} `json:"ip_range,omitempty"`
+- ToPort int `json:"to_port,omitempty"`
+-}
-
--The comment from glog.go introduces the ideas:
+-// RaxBandwidth provides measurement of server bandwidth consumed over a given audit interval.
+-type RaxBandwidth struct {
+- AuditPeriodEnd string `json:"audit_period_end"`
+- AuditPeriodStart string `json:"audit_period_start"`
+- BandwidthInbound int64 `json:"bandwidth_inbound"`
+- BandwidthOutbound int64 `json:"bandwidth_outbound"`
+- Interface string `json:"interface"`
+-}
-
-- Package glog implements logging analogous to the Google-internal
-- C++ INFO/ERROR/V setup. It provides functions Info, Warning,
-- Error, Fatal, plus formatting variants such as Infof. It
-- also provides V-style logging controlled by the -v and
-- -vmodule=file=2 flags.
--
-- Basic examples:
--
-- glog.Info("Prepare to repel boarders")
--
-- glog.Fatalf("Initialization failed: %s", err)
--
-- See the documentation for the V function for an explanation
-- of these examples:
--
-- if glog.V(2) {
-- glog.Info("Starting transaction...")
-- }
--
-- glog.V(2).Infoln("Processed", nItems, "elements")
+-// A VersionedAddress denotes either an IPv4 or IPv6 (depending on version indicated)
+-// address.
+-type VersionedAddress struct {
+- Addr string `json:"addr"`
+- Version int `json:"version"`
+-}
-
+-// An AddressSet provides a set of public and private IP addresses for a resource.
+-// Each address has a version to identify if IPv4 or IPv6.
+-type AddressSet struct {
+- Public []VersionedAddress `json:"public"`
+- Private []VersionedAddress `json:"private"`
+-}
-
--The repository contains an open source version of the log package
--used inside Google. The master copy of the source lives inside
--Google, not here. The code in this repo is for export only and is not itself
--under development. Feature requests will be ignored.
+-type NetworkAddress map[string][]VersionedAddress
-
--Send bug reports to golang-nuts at googlegroups.com.
-diff --git a/Godeps/_workspace/src/github.com/golang/glog/glog.go b/Godeps/_workspace/src/github.com/golang/glog/glog.go
-deleted file mode 100644
-index 3e63fff..0000000
---- a/Godeps/_workspace/src/github.com/golang/glog/glog.go
-+++ /dev/null
-@@ -1,1177 +0,0 @@
--// Go support for leveled logs, analogous to https://code.google.com/p/google-glog/
+-// Server records represent (virtual) hardware instances (not configurations) accessible by the user.
-//
--// Copyright 2013 Google Inc. All Rights Reserved.
+-// The AccessIPv4 / AccessIPv6 fields provides IP addresses for the server in the IPv4 or IPv6 format, respectively.
-//
--// Licensed under the Apache License, Version 2.0 (the "License");
--// you may not use this file except in compliance with the License.
--// You may obtain a copy of the License at
+-// Addresses provides addresses for any attached isolated networks.
+-// The version field indicates whether the IP address is version 4 or 6.
+-// Note: only public and private pools appear here.
+-// To get the complete set, use the AllAddressPools() method instead.
-//
--// http://www.apache.org/licenses/LICENSE-2.0
+-// Created tells when the server entity was created.
-//
--// Unless required by applicable law or agreed to in writing, software
--// distributed under the License is distributed on an "AS IS" BASIS,
--// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--// See the License for the specific language governing permissions and
--// limitations under the License.
+-// The Flavor field includes the flavor ID and flavor links.
+-//
+-// The compute provisioning algorithm has an anti-affinity property that
+-// attempts to spread customer VMs across hosts.
+-// Under certain situations,
+-// VMs from the same customer might be placed on the same host.
+-// The HostId field represents the host your server runs on and
+-// can be used to determine this scenario if it is relevant to your application.
+-// Note that HostId is unique only per account; it is not globally unique.
+-//
+-// Id provides the server's unique identifier.
+-// This field must be treated opaquely.
+-//
+-// Image indicates which image is installed on the server.
+-//
+-// Links provides one or more means of accessing the server.
+-//
+-// Metadata provides a small key-value store for application-specific information.
+-//
+-// Name provides a human-readable name for the server.
+-//
+-// Progress indicates how far along it is towards being provisioned.
+-// 100 represents complete, while 0 represents just beginning.
+-//
+-// Status provides an indication of what the server's doing at the moment.
+-// A server will be in ACTIVE state if it's ready for use.
+-//
+-// OsDcfDiskConfig indicates the server's boot volume configuration.
+-// Valid values are:
+-// AUTO
+-// ----
+-// The server is built with a single partition the size of the target flavor disk.
+-// The file system is automatically adjusted to fit the entire partition.
+-// This keeps things simple and automated.
+-// AUTO is valid only for images and servers with a single partition that use the EXT3 file system.
+-// This is the default setting for applicable Rackspace base images.
+-//
+-// MANUAL
+-// ------
+-// The server is built using whatever partition scheme and file system is in the source image.
+-// If the target flavor disk is larger,
+-// the remaining disk space is left unpartitioned.
+-// This enables images to have non-EXT3 file systems, multiple partitions, and so on,
+-// and enables you to manage the disk configuration.
+-//
+-// RaxBandwidth provides measures of the server's inbound and outbound bandwidth per interface.
+-//
+-// OsExtStsPowerState provides an indication of the server's power.
+-// This field appears to be a set of flag bits:
+-//
+-// ... 4 3 2 1 0
+-// +--//--+---+---+---+---+
+-// | .... | 0 | S | 0 | I |
+-// +--//--+---+---+---+---+
+-// | |
+-// | +--- 0=Instance is down.
+-// | 1=Instance is up.
+-// |
+-// +----------- 0=Server is switched ON.
+-// 1=Server is switched OFF.
+-// (note reverse logic.)
+-//
+-// Unused bits should be ignored when read, and written as 0 for future compatibility.
+-//
+-// OsExtStsTaskState and OsExtStsVmState work together
+-// to provide visibility in the provisioning process for the instance.
+-// Consult Rackspace documentation at
+-// http://docs.rackspace.com/servers/api/v2/cs-devguide/content/ch_extensions.html#ext_status
+-// for more details. It's too lengthy to include here.
+-type Server struct {
+- AccessIPv4 string `json:"accessIPv4"`
+- AccessIPv6 string `json:"accessIPv6"`
+- Addresses AddressSet
+- Created string `json:"created"`
+- Flavor FlavorLink `json:"flavor"`
+- HostId string `json:"hostId"`
+- Id string `json:"id"`
+- Image ImageLink `json:"image"`
+- Links []Link `json:"links"`
+- Metadata map[string]string `json:"metadata"`
+- Name string `json:"name"`
+- Progress int `json:"progress"`
+- Status string `json:"status"`
+- TenantId string `json:"tenant_id"`
+- Updated string `json:"updated"`
+- UserId string `json:"user_id"`
+- OsDcfDiskConfig string `json:"OS-DCF:diskConfig"`
+- RaxBandwidth []RaxBandwidth `json:"rax-bandwidth:bandwidth"`
+- OsExtStsPowerState int `json:"OS-EXT-STS:power_state"`
+- OsExtStsTaskState string `json:"OS-EXT-STS:task_state"`
+- OsExtStsVmState string `json:"OS-EXT-STS:vm_state"`
-
--// Package glog implements logging analogous to the Google-internal C++ INFO/ERROR/V setup.
--// It provides functions Info, Warning, Error, Fatal, plus formatting variants such as
--// Infof. It also provides V-style logging controlled by the -v and -vmodule=file=2 flags.
+- RawAddresses map[string]interface{} `json:"addresses"`
+-}
+-
+-// AllAddressPools returns a complete set of address pools available on the server.
+-// The name of each pool supported keys the map.
+-// The value of the map contains the addresses provided in the corresponding pool.
+-func (s *Server) AllAddressPools() (map[string][]VersionedAddress, error) {
+- pools := make(map[string][]VersionedAddress, 0)
+- for pool, subtree := range s.RawAddresses {
+- addresses := make([]VersionedAddress, 0)
+- err := mapstructure.Decode(subtree, &addresses)
+- if err != nil {
+- return nil, err
+- }
+- pools[pool] = addresses
+- }
+- return pools, nil
+-}
+-
+-// NewServerSettings structures record those fields of the Server structure to change
+-// when updating a server (see UpdateServer method).
+-type NewServerSettings struct {
+- Name string `json:"name,omitempty"`
+- AccessIPv4 string `json:"accessIPv4,omitempty"`
+- AccessIPv6 string `json:"accessIPv6,omitempty"`
+-}
+-
+-// NewServer structures are used for both requests and responses.
+-// The fields discussed below are relevent for server-creation purposes.
-//
--// Basic examples:
+-// The Name field contains the desired name of the server.
+-// Note that (at present) Rackspace permits more than one server with the same name;
+-// however, software should not depend on this.
+-// Not only will Rackspace support thank you, so will your own devops engineers.
+-// A name is required.
-//
--// glog.Info("Prepare to repel boarders")
+-// The ImageRef field contains the ID of the desired software image to place on the server.
+-// This ID must be found in the image slice returned by the Images() function.
+-// This field is required.
-//
--// glog.Fatalf("Initialization failed: %s", err)
+-// The FlavorRef field contains the ID of the server configuration desired for deployment.
+-// This ID must be found in the flavor slice returned by the Flavors() function.
+-// This field is required.
-//
--// See the documentation for the V function for an explanation of these examples:
+-// For OsDcfDiskConfig, refer to the Image or Server structure documentation.
+-// This field defaults to "AUTO" if not explicitly provided.
-//
--// if glog.V(2) {
--// glog.Info("Starting transaction...")
--// }
+-// Metadata contains a small key/value association of arbitrary data.
+-// Neither Rackspace nor OpenStack places significance on this field in any way.
+-// This field defaults to an empty map if not provided.
-//
--// glog.V(2).Infoln("Processed", nItems, "elements")
+-// Personality specifies the contents of certain files in the server's filesystem.
+-// The files and their contents are mapped through a slice of FileConfig structures.
+-// If not provided, all filesystem entities retain their image-specific configuration.
-//
--// Log output is buffered and written periodically using Flush. Programs
--// should call Flush before exiting to guarantee all log output is written.
+-// Networks specifies an affinity for the server's various networks and interfaces.
+-// Networks are identified through UUIDs; see NetworkConfig structure documentation for more details.
+-// If not provided, network affinity is determined automatically.
-//
--// By default, all log statements write to files in a temporary directory.
--// This package provides several flags that modify this behavior.
--// As a result, flag.Parse must be called before any logging is done.
+-// The AdminPass field may be used to provide a root- or administrator-password
+-// during the server provisioning process.
+-// If not provided, a random password will be automatically generated and returned in this field.
-//
--// -logtostderr=false
--// Logs are written to standard error instead of to files.
--// -alsologtostderr=false
--// Logs are written to standard error as well as to files.
--// -stderrthreshold=ERROR
--// Log events at or above this severity are logged to standard
--// error as well as to files.
--// -log_dir=""
--// Log files will be written to this directory instead of the
--// default temporary directory.
+-// The following fields are intended to be used to communicate certain results about the server being provisioned.
+-// When attempting to create a new server, these fields MUST not be provided.
+-// They'll be filled in by the response received from the Rackspace APIs.
-//
--// Other flags provide aids to debugging.
+-// The Id field contains the server's unique identifier.
+-// The identifier's scope is best assumed to be bound by the user's account, unless other arrangements have been made with Rackspace.
-//
--// -log_backtrace_at=""
--// When set to a file and line number holding a logging statement,
--// such as
--// -log_backtrace_at=gopherflakes.go:234
--// a stack trace will be written to the Info log whenever execution
--// hits that statement. (Unlike with -vmodule, the ".go" must be
--// present.)
--// -v=0
--// Enable V-leveled logging at the specified level.
--// -vmodule=""
--// The syntax of the argument is a comma-separated list of pattern=N,
--// where pattern is a literal file name (minus the ".go" suffix) or
--// "glob" pattern and N is a V level. For instance,
--// -vmodule=gopher*=3
--// sets the V level to 3 in all Go files whose names begin "gopher".
+-// The SecurityGroup field allows the user to specify a security group at launch.
-//
--package glog
+-// Any Links provided are used to refer to the server specifically by URL.
+-// These links are useful for making additional REST calls not explicitly supported by Gorax.
+-type NewServer struct {
+- Name string `json:"name,omitempty"`
+- ImageRef string `json:"imageRef,omitempty"`
+- FlavorRef string `json:"flavorRef,omitempty"`
+- Metadata map[string]string `json:"metadata,omitempty"`
+- Personality []FileConfig `json:"personality,omitempty"`
+- Networks []NetworkConfig `json:"networks,omitempty"`
+- AdminPass string `json:"adminPass,omitempty"`
+- KeyPairName string `json:"key_name,omitempty"`
+- Id string `json:"id,omitempty"`
+- Links []Link `json:"links,omitempty"`
+- OsDcfDiskConfig string `json:"OS-DCF:diskConfig,omitempty"`
+- SecurityGroup []map[string]interface{} `json:"security_groups,omitempty"`
+- ConfigDrive bool `json:"config_drive"`
+- UserData string `json:"user_data"`
+-}
-
--import (
-- "bufio"
-- "bytes"
-- "errors"
-- "flag"
-- "fmt"
-- "io"
-- stdLog "log"
-- "os"
-- "path/filepath"
-- "runtime"
-- "strconv"
-- "strings"
-- "sync"
-- "sync/atomic"
-- "time"
--)
+-// ResizeRequest structures are used internally to encode to JSON the parameters required to resize a server instance.
+-// Client applications will not use this structure (no API accepts an instance of this structure).
+-// See the Region method ResizeServer() for more details on how to resize a server.
+-type ResizeRequest struct {
+- Name string `json:"name,omitempty"`
+- FlavorRef string `json:"flavorRef"`
+- DiskConfig string `json:"OS-DCF:diskConfig,omitempty"`
+-}
-
--// severity identifies the sort of log: info, warning etc. It also implements
--// the flag.Value interface. The -stderrthreshold flag is of type severity and
--// should be modified only through the flag.Value interface. The values match
--// the corresponding constants in C++.
--type severity int32 // sync/atomic int32
+-type CreateImage struct {
+- Name string `json:"name"`
+- Metadata map[string]string `json:"metadata,omitempty"`
+-}
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/servers_test.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/servers_test.go
+deleted file mode 100644
+index 60c71c8..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/servers_test.go
++++ /dev/null
+@@ -1,54 +0,0 @@
+-package gophercloud
-
--// These constants identify the log levels in order of increasing severity.
--// A message written to a high-severity log file is also written to each
--// lower-severity log file.
--const (
-- infoLog severity = iota
-- warningLog
-- errorLog
-- fatalLog
-- numSeverity = 4
+-import (
+- "net/http"
+- "testing"
-)
-
--const severityChar = "IWEF"
--
--var severityName = []string{
-- infoLog: "INFO",
-- warningLog: "WARNING",
-- errorLog: "ERROR",
-- fatalLog: "FATAL",
+-type testAccess struct {
+- public, internal string
+- calledFirstEndpointByCriteria int
-}
-
--// get returns the value of the severity.
--func (s *severity) get() severity {
-- return severity(atomic.LoadInt32((*int32)(s)))
+-func (ta *testAccess) FirstEndpointUrlByCriteria(ac ApiCriteria) string {
+- ta.calledFirstEndpointByCriteria++
+- urls := []string{ta.public, ta.internal}
+- return urls[ac.UrlChoice]
-}
-
--// set sets the value of the severity.
--func (s *severity) set(val severity) {
-- atomic.StoreInt32((*int32)(s), int32(val))
+-func (ta *testAccess) AuthToken() string {
+- return ""
-}
-
--// String is part of the flag.Value interface.
--func (s *severity) String() string {
-- return strconv.FormatInt(int64(*s), 10)
+-func (ta *testAccess) Revoke(string) error {
+- return nil
-}
-
--// Get is part of the flag.Value interface.
--func (s *severity) Get() interface{} {
-- return *s
+-func (ta *testAccess) Reauthenticate() error {
+- return nil
-}
-
--// Set is part of the flag.Value interface.
--func (s *severity) Set(value string) error {
-- var threshold severity
-- // Is it a known name?
-- if v, ok := severityByName(value); ok {
-- threshold = v
-- } else {
-- v, err := strconv.Atoi(value)
-- if err != nil {
-- return err
-- }
-- threshold = severity(v)
+-func TestGetServersApi(t *testing.T) {
+- c := TestContext().UseCustomClient(&http.Client{Transport: newTransport().WithResponse("Hello")})
+-
+- acc := &testAccess{
+- public: "http://localhost:8080",
+- internal: "http://localhost:8086",
- }
-- logging.stderrThreshold.set(threshold)
-- return nil
--}
-
--func severityByName(s string) (severity, bool) {
-- s = strings.ToUpper(s)
-- for i, name := range severityName {
-- if name == s {
-- return severity(i), true
-- }
+- _, err := c.ServersApi(acc, ApiCriteria{
+- Name: "cloudComputeOpenStack",
+- Region: "dfw",
+- VersionId: "2",
+- })
+-
+- if err != nil {
+- t.Error(err)
+- return
- }
-- return 0, false
--}
-
--// OutputStats tracks the number of output lines and bytes written.
--type OutputStats struct {
-- lines int64
-- bytes int64
+- if acc.calledFirstEndpointByCriteria != 1 {
+- t.Error("Expected FirstEndpointByCriteria to be called")
+- return
+- }
-}
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/service_catalog.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/service_catalog.go
+deleted file mode 100644
+index e6cf4a0..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/service_catalog.go
++++ /dev/null
+@@ -1,75 +0,0 @@
+-package gophercloud
-
--// Lines returns the number of lines written.
--func (s *OutputStats) Lines() int64 {
-- return atomic.LoadInt64(&s.lines)
--}
+-import (
+- "os"
+- "strings"
+-)
-
--// Bytes returns the number of bytes written.
--func (s *OutputStats) Bytes() int64 {
-- return atomic.LoadInt64(&s.bytes)
+-// ApiCriteria provides one or more criteria for the SDK to look for appropriate endpoints.
+-// Fields left unspecified or otherwise set to their zero-values are assumed to not be
+-// relevant, and do not participate in the endpoint search.
+-//
+-// Name specifies the desired service catalog entry name.
+-// Type specifies the desired service catalog entry type.
+-// Region specifies the desired endpoint region.
+-// If unset, Gophercloud will try to use the region set in the
+-// OS_REGION_NAME environment variable. If that's not set,
+-// region comparison will not occur. If OS_REGION_NAME is set
+-// and IgnoreEnvVars is also set, OS_REGION_NAME will be ignored.
+-// VersionId specifies the desired version of the endpoint.
+-// Note that this field is matched exactly, and is (at present)
+-// opaque to Gophercloud. Thus, requesting a version 2
+-// endpoint will _not_ match a version 3 endpoint.
+-// The UrlChoice field inidicates whether or not gophercloud
+-// should use the public or internal endpoint URL if a
+-// candidate endpoint is found.
+-// IgnoreEnvVars instructs Gophercloud to ignore helpful environment variables.
+-type ApiCriteria struct {
+- Name string
+- Type string
+- Region string
+- VersionId string
+- UrlChoice int
+- IgnoreEnvVars bool
-}
-
--// Stats tracks the number of lines of output and number of bytes
--// per severity level. Values must be read with atomic.LoadInt64.
--var Stats struct {
-- Info, Warning, Error OutputStats
--}
+-// The choices available for UrlChoice. See the ApiCriteria structure for details.
+-const (
+- PublicURL = iota
+- InternalURL
+-)
-
--var severityStats = [numSeverity]*OutputStats{
-- infoLog: &Stats.Info,
-- warningLog: &Stats.Warning,
-- errorLog: &Stats.Error,
--}
+-// Given a set of criteria to match on, locate the first candidate endpoint
+-// in the provided service catalog.
+-//
+-// If nothing found, the result will be a zero-valued EntryEndpoint (all URLs
+-// set to "").
+-func FindFirstEndpointByCriteria(entries []CatalogEntry, ac ApiCriteria) EntryEndpoint {
+- rgn := strings.ToUpper(ac.Region)
+- if (rgn == "") && !ac.IgnoreEnvVars {
+- rgn = os.Getenv("OS_REGION_NAME")
+- }
-
--// Level is exported because it appears in the arguments to V and is
--// the type of the v flag, which can be set programmatically.
--// It's a distinct type because we want to discriminate it from logType.
--// Variables of type level are only changed under logging.mu.
--// The -v flag is read only with atomic ops, so the state of the logging
--// module is consistent.
+- for _, entry := range entries {
+- if (ac.Name != "") && (ac.Name != entry.Name) {
+- continue
+- }
-
--// Level is treated as a sync/atomic int32.
+- if (ac.Type != "") && (ac.Type != entry.Type) {
+- continue
+- }
-
--// Level specifies a level of verbosity for V logs. *Level implements
--// flag.Value; the -v flag is of type Level and should be modified
--// only through the flag.Value interface.
--type Level int32
+- for _, endpoint := range entry.Endpoints {
+- if (rgn != "") && (rgn != strings.ToUpper(endpoint.Region)) {
+- continue
+- }
-
--// get returns the value of the Level.
--func (l *Level) get() Level {
-- return Level(atomic.LoadInt32((*int32)(l)))
--}
+- if (ac.VersionId != "") && (ac.VersionId != endpoint.VersionId) {
+- continue
+- }
-
--// set sets the value of the Level.
--func (l *Level) set(val Level) {
-- atomic.StoreInt32((*int32)(l), int32(val))
+- return endpoint
+- }
+- }
+- return EntryEndpoint{}
-}
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/service_catalog_test.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/service_catalog_test.go
+deleted file mode 100644
+index b78f01f..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/service_catalog_test.go
++++ /dev/null
+@@ -1,190 +0,0 @@
+-package gophercloud
-
--// String is part of the flag.Value interface.
--func (l *Level) String() string {
-- return strconv.FormatInt(int64(*l), 10)
--}
+-import (
+- "os"
+- "testing"
+-)
-
--// Get is part of the flag.Value interface.
--func (l *Level) Get() interface{} {
-- return *l
--}
+-// TestFFEBCViaEnvVariable exercises only those calls where a region
+-// parameter is required, but is provided by an environment variable.
+-func TestFFEBCViaEnvVariable(t *testing.T) {
+- changeRegion("RGN")
-
--// Set is part of the flag.Value interface.
--func (l *Level) Set(value string) error {
-- v, err := strconv.Atoi(value)
-- if err != nil {
-- return err
+- endpoint := FindFirstEndpointByCriteria(
+- catalog("test", "compute", "http://localhost", "", ""),
+- ApiCriteria{Name: "test"},
+- )
+- if endpoint.PublicURL != "" {
+- t.Error("If provided, the Region qualifier must exclude endpoints with missing or mismatching regions.")
+- return
- }
-- logging.mu.Lock()
-- defer logging.mu.Unlock()
-- logging.setVState(Level(v), logging.vmodule.filter, false)
-- return nil
--}
-
--// moduleSpec represents the setting of the -vmodule flag.
--type moduleSpec struct {
-- filter []modulePat
--}
+- endpoint = FindFirstEndpointByCriteria(
+- catalog("test", "compute", "http://localhost", "rgn", ""),
+- ApiCriteria{Name: "test"},
+- )
+- if endpoint.PublicURL != "http://localhost" {
+- t.Error("Regions are case insensitive.")
+- return
+- }
-
--// modulePat contains a filter for the -vmodule flag.
--// It holds a verbosity level and a file pattern to match.
--type modulePat struct {
-- pattern string
-- literal bool // The pattern is a literal string
-- level Level
--}
+- endpoint = FindFirstEndpointByCriteria(
+- catalog("test", "compute", "http://localhost", "rgn", ""),
+- ApiCriteria{Name: "test", VersionId: "2"},
+- )
+- if endpoint.PublicURL != "" {
+- t.Error("Missing version ID means no match.")
+- return
+- }
-
--// match reports whether the file matches the pattern. It uses a string
--// comparison if the pattern contains no metacharacters.
--func (m *modulePat) match(file string) bool {
-- if m.literal {
-- return file == m.pattern
+- endpoint = FindFirstEndpointByCriteria(
+- catalog("test", "compute", "http://localhost", "rgn", "3"),
+- ApiCriteria{Name: "test", VersionId: "2"},
+- )
+- if endpoint.PublicURL != "" {
+- t.Error("Mismatched version ID means no match.")
+- return
- }
-- match, _ := filepath.Match(m.pattern, file)
-- return match
--}
-
--func (m *moduleSpec) String() string {
-- // Lock because the type is not atomic. TODO: clean this up.
-- logging.mu.Lock()
-- defer logging.mu.Unlock()
-- var b bytes.Buffer
-- for i, f := range m.filter {
-- if i > 0 {
-- b.WriteRune(',')
-- }
-- fmt.Fprintf(&b, "%s=%d", f.pattern, f.level)
+- endpoint = FindFirstEndpointByCriteria(
+- catalog("test", "compute", "http://localhost", "rgn", "2"),
+- ApiCriteria{Name: "test", VersionId: "2"},
+- )
+- if endpoint.PublicURL != "http://localhost" {
+- t.Error("All search criteria met; endpoint expected.")
+- return
- }
-- return b.String()
-}
-
--// Get is part of the (Go 1.2) flag.Getter interface. It always returns nil for this flag type since the
--// struct is not exported.
--func (m *moduleSpec) Get() interface{} {
-- return nil
--}
+-// TestFFEBCViaRegionOption exercises only those calls where a region
+-// parameter is specified explicitly. The region option overrides
+-// any defined OS_REGION_NAME environment setting.
+-func TestFFEBCViaRegionOption(t *testing.T) {
+- changeRegion("Starfleet Command")
-
--var errVmoduleSyntax = errors.New("syntax error: expect comma-separated list of filename=N")
+- endpoint := FindFirstEndpointByCriteria(
+- catalog("test", "compute", "http://localhost", "", ""),
+- ApiCriteria{Name: "test", Region: "RGN"},
+- )
+- if endpoint.PublicURL != "" {
+- t.Error("If provided, the Region qualifier must exclude endpoints with missing or mismatching regions.")
+- return
+- }
-
--// Syntax: -vmodule=recordio=2,file=1,gfs*=3
--func (m *moduleSpec) Set(value string) error {
-- var filter []modulePat
-- for _, pat := range strings.Split(value, ",") {
-- if len(pat) == 0 {
-- // Empty strings such as from a trailing comma can be ignored.
-- continue
-- }
-- patLev := strings.Split(pat, "=")
-- if len(patLev) != 2 || len(patLev[0]) == 0 || len(patLev[1]) == 0 {
-- return errVmoduleSyntax
-- }
-- pattern := patLev[0]
-- v, err := strconv.Atoi(patLev[1])
-- if err != nil {
-- return errors.New("syntax error: expect comma-separated list of filename=N")
-- }
-- if v < 0 {
-- return errors.New("negative value for vmodule level")
-- }
-- if v == 0 {
-- continue // Ignore. It's harmless but no point in paying the overhead.
-- }
-- // TODO: check syntax of filter?
-- filter = append(filter, modulePat{pattern, isLiteral(pattern), Level(v)})
+- endpoint = FindFirstEndpointByCriteria(
+- catalog("test", "compute", "http://localhost", "rgn", ""),
+- ApiCriteria{Name: "test", Region: "RGN"},
+- )
+- if endpoint.PublicURL != "http://localhost" {
+- t.Error("Regions are case insensitive.")
+- return
- }
-- logging.mu.Lock()
-- defer logging.mu.Unlock()
-- logging.setVState(logging.verbosity, filter, true)
-- return nil
--}
-
--// isLiteral reports whether the pattern is a literal string, that is, has no metacharacters
--// that require filepath.Match to be called to match the pattern.
--func isLiteral(pattern string) bool {
-- return !strings.ContainsAny(pattern, `\*?[]`)
--}
+- endpoint = FindFirstEndpointByCriteria(
+- catalog("test", "compute", "http://localhost", "rgn", ""),
+- ApiCriteria{Name: "test", Region: "RGN", VersionId: "2"},
+- )
+- if endpoint.PublicURL != "" {
+- t.Error("Missing version ID means no match.")
+- return
+- }
-
--// traceLocation represents the setting of the -log_backtrace_at flag.
--type traceLocation struct {
-- file string
-- line int
+- endpoint = FindFirstEndpointByCriteria(
+- catalog("test", "compute", "http://localhost", "rgn", "3"),
+- ApiCriteria{Name: "test", Region: "RGN", VersionId: "2"},
+- )
+- if endpoint.PublicURL != "" {
+- t.Error("Mismatched version ID means no match.")
+- return
+- }
+-
+- endpoint = FindFirstEndpointByCriteria(
+- catalog("test", "compute", "http://localhost", "rgn", "2"),
+- ApiCriteria{Name: "test", Region: "RGN", VersionId: "2"},
+- )
+- if endpoint.PublicURL != "http://localhost" {
+- t.Error("All search criteria met; endpoint expected.")
+- return
+- }
-}
-
--// isSet reports whether the trace location has been specified.
--// logging.mu is held.
--func (t *traceLocation) isSet() bool {
-- return t.line > 0
+-// TestFFEBCWithoutRegion exercises only those calls where a region
+-// is irrelevant. Just to make sure, though, we enforce Gophercloud
+-// from paying any attention to OS_REGION_NAME if it happens to be set.
+-func TestFindFirstEndpointByCriteria(t *testing.T) {
+- endpoint := FindFirstEndpointByCriteria([]CatalogEntry{}, ApiCriteria{Name: "test", IgnoreEnvVars: true})
+- if endpoint.PublicURL != "" {
+- t.Error("Not expecting to find anything in an empty service catalog.")
+- return
+- }
+-
+- endpoint = FindFirstEndpointByCriteria(
+- []CatalogEntry{
+- {Name: "test"},
+- },
+- ApiCriteria{Name: "test", IgnoreEnvVars: true},
+- )
+- if endpoint.PublicURL != "" {
+- t.Error("Even though we have a matching entry, no endpoints exist")
+- return
+- }
+-
+- endpoint = FindFirstEndpointByCriteria(
+- catalog("test", "compute", "http://localhost", "", ""),
+- ApiCriteria{Name: "test", IgnoreEnvVars: true},
+- )
+- if endpoint.PublicURL != "http://localhost" {
+- t.Error("Looking for an endpoint by name but without region or version ID should match first entry endpoint.")
+- return
+- }
+-
+- endpoint = FindFirstEndpointByCriteria(
+- catalog("test", "compute", "http://localhost", "", ""),
+- ApiCriteria{Type: "compute", IgnoreEnvVars: true},
+- )
+- if endpoint.PublicURL != "http://localhost" {
+- t.Error("Looking for an endpoint by type but without region or version ID should match first entry endpoint.")
+- return
+- }
+-
+- endpoint = FindFirstEndpointByCriteria(
+- catalog("test", "compute", "http://localhost", "", ""),
+- ApiCriteria{Type: "identity", IgnoreEnvVars: true},
+- )
+- if endpoint.PublicURL != "" {
+- t.Error("Returned mismatched type.")
+- return
+- }
+-
+- endpoint = FindFirstEndpointByCriteria(
+- catalog("test", "compute", "http://localhost", "ord", "2"),
+- ApiCriteria{Name: "test", VersionId: "2", IgnoreEnvVars: true},
+- )
+- if endpoint.PublicURL != "http://localhost" {
+- t.Error("Sometimes, you might not care what region your stuff is in.")
+- return
+- }
-}
-
--// match reports whether the specified file and line matches the trace location.
--// The argument file name is the full path, not the basename specified in the flag.
--// logging.mu is held.
--func (t *traceLocation) match(file string, line int) bool {
-- if t.line != line {
-- return false
+-func catalog(name, entry_type, url, region, version string) []CatalogEntry {
+- return []CatalogEntry{
+- {
+- Name: name,
+- Type: entry_type,
+- Endpoints: []EntryEndpoint{
+- {
+- PublicURL: url,
+- Region: region,
+- VersionId: version,
+- },
+- },
+- },
- }
-- if i := strings.LastIndex(file, "/"); i >= 0 {
-- file = file[i+1:]
+-}
+-
+-func changeRegion(r string) {
+- err := os.Setenv("OS_REGION_NAME", r)
+- if err != nil {
+- panic(err)
- }
-- return t.file == file
-}
+diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/transport_double_test.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/transport_double_test.go
+deleted file mode 100644
+index ef7f19a..0000000
+--- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/transport_double_test.go
++++ /dev/null
+@@ -1,103 +0,0 @@
+-package gophercloud
+-
+-import (
+- "encoding/json"
+- "fmt"
+- "io/ioutil"
+- "net/http"
+- "strings"
+- "testing"
+-)
-
--func (t *traceLocation) String() string {
-- // Lock because the type is not atomic. TODO: clean this up.
-- logging.mu.Lock()
-- defer logging.mu.Unlock()
-- return fmt.Sprintf("%s:%d", t.file, t.line)
+-type transport struct {
+- called int
+- response string
+- expectTenantId bool
+- tenantIdFound bool
+- status int
-}
-
--// Get is part of the (Go 1.2) flag.Getter interface. It always returns nil for this flag type since the
--// struct is not exported
--func (t *traceLocation) Get() interface{} {
-- return nil
--}
+-func (t *transport) RoundTrip(req *http.Request) (rsp *http.Response, err error) {
+- var authContainer *AuthContainer
-
--var errTraceSyntax = errors.New("syntax error: expect file.go:234")
+- t.called++
-
--// Syntax: -log_backtrace_at=gopherflakes.go:234
--// Note that unlike vmodule the file extension is included here.
--func (t *traceLocation) Set(value string) error {
-- if value == "" {
-- // Unset.
-- t.line = 0
-- t.file = ""
+- headers := make(http.Header)
+- headers.Add("Content-Type", "application/xml; charset=UTF-8")
+-
+- body := ioutil.NopCloser(strings.NewReader(t.response))
+-
+- if t.status == 0 {
+- t.status = 200
- }
-- fields := strings.Split(value, ":")
-- if len(fields) != 2 {
-- return errTraceSyntax
+- statusMsg := "OK"
+- if (t.status < 200) || (299 < t.status) {
+- statusMsg = "Error"
- }
-- file, line := fields[0], fields[1]
-- if !strings.Contains(file, ".") {
-- return errTraceSyntax
+-
+- rsp = &http.Response{
+- Status: fmt.Sprintf("%d %s", t.status, statusMsg),
+- StatusCode: t.status,
+- Proto: "HTTP/1.1",
+- ProtoMajor: 1,
+- ProtoMinor: 1,
+- Header: headers,
+- Body: body,
+- ContentLength: -1,
+- TransferEncoding: nil,
+- Close: true,
+- Trailer: nil,
+- Request: req,
- }
-- v, err := strconv.Atoi(line)
+-
+- bytes, err := ioutil.ReadAll(req.Body)
- if err != nil {
-- return errTraceSyntax
+- return nil, err
- }
-- if v <= 0 {
-- return errors.New("negative or zero value for level")
+- err = json.Unmarshal(bytes, &authContainer)
+- if err != nil {
+- return nil, err
- }
-- logging.mu.Lock()
-- defer logging.mu.Unlock()
-- t.line = v
-- t.file = file
-- return nil
--}
+- t.tenantIdFound = (authContainer.Auth.TenantId != "")
-
--// flushSyncWriter is the interface satisfied by logging destinations.
--type flushSyncWriter interface {
-- Flush() error
-- Sync() error
-- io.Writer
+- if t.tenantIdFound != t.expectTenantId {
+- rsp.Status = "500 Internal Server Error"
+- rsp.StatusCode = 500
+- }
+- return
-}
-
--func init() {
-- flag.BoolVar(&logging.toStderr, "logtostderr", false, "log to standard error instead of files")
-- flag.BoolVar(&logging.alsoToStderr, "alsologtostderr", false, "log to standard error as well as files")
-- flag.Var(&logging.verbosity, "v", "log level for V logs")
-- flag.Var(&logging.stderrThreshold, "stderrthreshold", "logs at or above this threshold go to stderr")
-- flag.Var(&logging.vmodule, "vmodule", "comma-separated list of pattern=N settings for file-filtered logging")
-- flag.Var(&logging.traceLocation, "log_backtrace_at", "when logging hits line file:N, emit a stack trace")
--
-- // Default stderrThreshold is ERROR.
-- logging.stderrThreshold = errorLog
--
-- logging.setVState(0, nil, false)
-- go logging.flushDaemon()
+-func newTransport() *transport {
+- return &transport{}
-}
-
--// Flush flushes all pending log I/O.
--func Flush() {
-- logging.lockAndFlushAll()
+-func (t *transport) IgnoreTenantId() *transport {
+- t.expectTenantId = false
+- return t
-}
-
--// loggingT collects all the global state of the logging setup.
--type loggingT struct {
-- // Boolean flags. Not handled atomically because the flag.Value interface
-- // does not let us avoid the =true, and that shorthand is necessary for
-- // compatibility. TODO: does this matter enough to fix? Seems unlikely.
-- toStderr bool // The -logtostderr flag.
-- alsoToStderr bool // The -alsologtostderr flag.
--
-- // Level flag. Handled atomically.
-- stderrThreshold severity // The -stderrthreshold flag.
+-func (t *transport) ExpectTenantId() *transport {
+- t.expectTenantId = true
+- return t
+-}
-
-- // freeList is a list of byte buffers, maintained under freeListMu.
-- freeList *buffer
-- // freeListMu maintains the free list. It is separate from the main mutex
-- // so buffers can be grabbed and printed to without holding the main lock,
-- // for better parallelization.
-- freeListMu sync.Mutex
+-func (t *transport) WithResponse(r string) *transport {
+- t.response = r
+- t.status = 200
+- return t
+-}
-
-- // mu protects the remaining elements of this structure and is
-- // used to synchronize logging.
-- mu sync.Mutex
-- // file holds writer for each of the log types.
-- file [numSeverity]flushSyncWriter
-- // pcs is used in V to avoid an allocation when computing the caller's PC.
-- pcs [1]uintptr
-- // vmap is a cache of the V Level for each V() call site, identified by PC.
-- // It is wiped whenever the vmodule flag changes state.
-- vmap map[uintptr]Level
-- // filterLength stores the length of the vmodule filter chain. If greater
-- // than zero, it means vmodule is enabled. It may be read safely
-- // using sync.LoadInt32, but is only modified under mu.
-- filterLength int32
-- // traceLocation is the state of the -log_backtrace_at flag.
-- traceLocation traceLocation
-- // These flags are modified only under lock, although verbosity may be fetched
-- // safely using atomic.LoadInt32.
-- vmodule moduleSpec // The state of the -vmodule flag.
-- verbosity Level // V logging level, the value of the -v flag/
+-func (t *transport) WithError(code int) *transport {
+- t.response = fmt.Sprintf("Error %d", code)
+- t.status = code
+- return t
-}
-
--// buffer holds a byte Buffer for reuse. The zero value is ready for use.
--type buffer struct {
-- bytes.Buffer
-- tmp [64]byte // temporary byte array for creating headers.
-- next *buffer
+-func (t *transport) VerifyCalls(test *testing.T, n int) error {
+- if t.called != n {
+- err := fmt.Errorf("Expected Transport to be called %d times; found %d instead", n, t.called)
+- test.Error(err)
+- return err
+- }
+- return nil
-}
+diff --git a/Godeps/_workspace/src/github.com/skratchdot/LICENSE-MIT b/Godeps/_workspace/src/github.com/skratchdot/LICENSE-MIT
+deleted file mode 100644
+index afd04c8..0000000
+--- a/Godeps/_workspace/src/github.com/skratchdot/LICENSE-MIT
++++ /dev/null
+@@ -1,22 +0,0 @@
+-Copyright (c) 2013 skratchdot
-
--var logging loggingT
+-Permission is hereby granted, free of charge, to any person
+-obtaining a copy of this software and associated documentation
+-files (the "Software"), to deal in the Software without
+-restriction, including without limitation the rights to use,
+-copy, modify, merge, publish, distribute, sublicense, and/or sell
+-copies of the Software, and to permit persons to whom the
+-Software is furnished to do so, subject to the following
+-conditions:
-
--// setVState sets a consistent state for V logging.
--// l.mu is held.
--func (l *loggingT) setVState(verbosity Level, filter []modulePat, setFilter bool) {
-- // Turn verbosity off so V will not fire while we are in transition.
-- logging.verbosity.set(0)
-- // Ditto for filter length.
-- atomic.StoreInt32(&logging.filterLength, 0)
+-The above copyright notice and this permission notice shall be
+-included in all copies or substantial portions of the Software.
-
-- // Set the new filters and wipe the pc->Level map if the filter has changed.
-- if setFilter {
-- logging.vmodule.filter = filter
-- logging.vmap = make(map[uintptr]Level)
-- }
+-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+-OTHER DEALINGS IN THE SOFTWARE.
+diff --git a/Godeps/_workspace/src/github.com/skratchdot/open-golang/open/exec.go b/Godeps/_workspace/src/github.com/skratchdot/open-golang/open/exec.go
+deleted file mode 100644
+index cc37339..0000000
+--- a/Godeps/_workspace/src/github.com/skratchdot/open-golang/open/exec.go
++++ /dev/null
+@@ -1,15 +0,0 @@
+-// +build !windows,!darwin
-
-- // Things are consistent now, so enable filtering and verbosity.
-- // They are enabled in order opposite to that in V.
-- atomic.StoreInt32(&logging.filterLength, int32(len(filter)))
-- logging.verbosity.set(verbosity)
--}
+-package open
-
--// getBuffer returns a new, ready-to-use buffer.
--func (l *loggingT) getBuffer() *buffer {
-- l.freeListMu.Lock()
-- b := l.freeList
-- if b != nil {
-- l.freeList = b.next
-- }
-- l.freeListMu.Unlock()
-- if b == nil {
-- b = new(buffer)
-- } else {
-- b.next = nil
-- b.Reset()
-- }
-- return b
+-import (
+- "os/exec"
+-)
+-
+-func open(input string) *exec.Cmd {
+- return exec.Command("xdg-open", input)
-}
-
--// putBuffer returns a buffer to the free list.
--func (l *loggingT) putBuffer(b *buffer) {
-- if b.Len() >= 256 {
-- // Let big buffers die a natural death.
-- return
-- }
-- l.freeListMu.Lock()
-- b.next = l.freeList
-- l.freeList = b
-- l.freeListMu.Unlock()
+-func openWith(input string, appName string) *exec.Cmd {
+- return exec.Command(appName, input)
-}
+diff --git a/Godeps/_workspace/src/github.com/skratchdot/open-golang/open/exec_darwin.go b/Godeps/_workspace/src/github.com/skratchdot/open-golang/open/exec_darwin.go
+deleted file mode 100644
+index 16160e6..0000000
+--- a/Godeps/_workspace/src/github.com/skratchdot/open-golang/open/exec_darwin.go
++++ /dev/null
+@@ -1,15 +0,0 @@
+-// +build darwin
-
--var timeNow = time.Now // Stubbed out for testing.
+-package open
-
--/*
--header formats a log header as defined by the C++ implementation.
--It returns a buffer containing the formatted header and the user's file and line number.
--The depth specifies how many stack frames above lives the source line to be identified in the log message.
+-import (
+- "os/exec"
+-)
-
--Log lines have this form:
-- Lmmdd hh:mm:ss.uuuuuu threadid file:line] msg...
--where the fields are defined as follows:
-- L A single character, representing the log level (eg 'I' for INFO)
-- mm The month (zero padded; ie May is '05')
-- dd The day (zero padded)
-- hh:mm:ss.uuuuuu Time in hours, minutes and fractional seconds
-- threadid The space-padded thread ID as returned by GetTID()
-- file The file name
-- line The line number
-- msg The user-supplied message
--*/
--func (l *loggingT) header(s severity, depth int) (*buffer, string, int) {
-- _, file, line, ok := runtime.Caller(3 + depth)
-- if !ok {
-- file = "???"
-- line = 1
-- } else {
-- slash := strings.LastIndex(file, "/")
-- if slash >= 0 {
-- file = file[slash+1:]
-- }
-- }
-- return l.formatHeader(s, file, line), file, line
+-func open(input string) *exec.Cmd {
+- return exec.Command("open", input)
-}
-
--// formatHeader formats a log header using the provided file name and line number.
--func (l *loggingT) formatHeader(s severity, file string, line int) *buffer {
-- now := timeNow()
-- if line < 0 {
-- line = 0 // not a real line number, but acceptable to someDigits
-- }
-- if s > fatalLog {
-- s = infoLog // for safety.
-- }
-- buf := l.getBuffer()
--
-- // Avoid Fprintf, for speed. The format is so simple that we can do it quickly by hand.
-- // It's worth about 3X. Fprintf is hard.
-- _, month, day := now.Date()
-- hour, minute, second := now.Clock()
-- // Lmmdd hh:mm:ss.uuuuuu threadid file:line]
-- buf.tmp[0] = severityChar[s]
-- buf.twoDigits(1, int(month))
-- buf.twoDigits(3, day)
-- buf.tmp[5] = ' '
-- buf.twoDigits(6, hour)
-- buf.tmp[8] = ':'
-- buf.twoDigits(9, minute)
-- buf.tmp[11] = ':'
-- buf.twoDigits(12, second)
-- buf.tmp[14] = '.'
-- buf.nDigits(6, 15, now.Nanosecond()/1000, '0')
-- buf.tmp[21] = ' '
-- buf.nDigits(7, 22, pid, ' ') // TODO: should be TID
-- buf.tmp[29] = ' '
-- buf.Write(buf.tmp[:30])
-- buf.WriteString(file)
-- buf.tmp[0] = ':'
-- n := buf.someDigits(1, line)
-- buf.tmp[n+1] = ']'
-- buf.tmp[n+2] = ' '
-- buf.Write(buf.tmp[:n+3])
-- return buf
+-func openWith(input string, appName string) *exec.Cmd {
+- return exec.Command("open", "-a", appName, input)
-}
+diff --git a/Godeps/_workspace/src/github.com/skratchdot/open-golang/open/exec_windows.go b/Godeps/_workspace/src/github.com/skratchdot/open-golang/open/exec_windows.go
+deleted file mode 100644
+index ac44cfa..0000000
+--- a/Godeps/_workspace/src/github.com/skratchdot/open-golang/open/exec_windows.go
++++ /dev/null
+@@ -1,21 +0,0 @@
+-// +build windows
-
--// Some custom tiny helper functions to print the log header efficiently.
+-package open
-
--const digits = "0123456789"
+-import (
+- "os/exec"
+- "strings"
+-)
-
--// twoDigits formats a zero-prefixed two-digit integer at buf.tmp[i].
--func (buf *buffer) twoDigits(i, d int) {
-- buf.tmp[i+1] = digits[d%10]
-- d /= 10
-- buf.tmp[i] = digits[d%10]
+-func cleaninput(input string) string {
+- r := strings.NewReplacer("&", "^&")
+- return r.Replace(input)
-}
-
--// nDigits formats an n-digit integer at buf.tmp[i],
--// padding with pad on the left.
--// It assumes d >= 0.
--func (buf *buffer) nDigits(n, i, d int, pad byte) {
-- j := n - 1
-- for ; j >= 0 && d > 0; j-- {
-- buf.tmp[i+j] = digits[d%10]
-- d /= 10
-- }
-- for ; j >= 0; j-- {
-- buf.tmp[i+j] = pad
-- }
+-func open(input string) *exec.Cmd {
+- return exec.Command("cmd", "/C", "start", "", cleaninput(input))
-}
-
--// someDigits formats a zero-prefixed variable-width integer at buf.tmp[i].
--func (buf *buffer) someDigits(i, d int) int {
-- // Print into the top, then copy down. We know there's space for at least
-- // a 10-digit number.
-- j := len(buf.tmp)
-- for {
-- j--
-- buf.tmp[j] = digits[d%10]
-- d /= 10
-- if d == 0 {
-- break
-- }
-- }
-- return copy(buf.tmp[i:], buf.tmp[j:])
+-func openWith(input string, appName string) *exec.Cmd {
+- return exec.Command("cmd", "/C", "start", "", appName, cleaninput(input))
-}
+diff --git a/Godeps/_workspace/src/github.com/skratchdot/open-golang/open/open.go b/Godeps/_workspace/src/github.com/skratchdot/open-golang/open/open.go
+deleted file mode 100644
+index b1f648f..0000000
+--- a/Godeps/_workspace/src/github.com/skratchdot/open-golang/open/open.go
++++ /dev/null
+@@ -1,50 +0,0 @@
+-/*
-
--func (l *loggingT) println(s severity, args ...interface{}) {
-- buf, file, line := l.header(s, 0)
-- fmt.Fprintln(buf, args...)
-- l.output(s, buf, file, line, false)
--}
+- Open a file, directory, or URI using the OS's default
+- application for that object type. Optionally, you can
+- specify an application to use.
-
--func (l *loggingT) print(s severity, args ...interface{}) {
-- l.printDepth(s, 1, args...)
--}
+- This is a proxy for the following commands:
-
--func (l *loggingT) printDepth(s severity, depth int, args ...interface{}) {
-- buf, file, line := l.header(s, depth)
-- fmt.Fprint(buf, args...)
-- if buf.Bytes()[buf.Len()-1] != '\n' {
-- buf.WriteByte('\n')
-- }
-- l.output(s, buf, file, line, false)
--}
+- OSX: "open"
+- Windows: "start"
+- Linux/Other: "xdg-open"
-
--func (l *loggingT) printf(s severity, format string, args ...interface{}) {
-- buf, file, line := l.header(s, 0)
-- fmt.Fprintf(buf, format, args...)
-- if buf.Bytes()[buf.Len()-1] != '\n' {
-- buf.WriteByte('\n')
-- }
-- l.output(s, buf, file, line, false)
--}
+- This is a golang port of the node.js module: https://github.com/pwnall/node-open
-
--// printWithFileLine behaves like print but uses the provided file and line number. If
--// alsoLogToStderr is true, the log message always appears on standard error; it
--// will also appear in the log file unless --logtostderr is set.
--func (l *loggingT) printWithFileLine(s severity, file string, line int, alsoToStderr bool, args ...interface{}) {
-- buf := l.formatHeader(s, file, line)
-- fmt.Fprint(buf, args...)
-- if buf.Bytes()[buf.Len()-1] != '\n' {
-- buf.WriteByte('\n')
-- }
-- l.output(s, buf, file, line, alsoToStderr)
--}
+-*/
+-package open
-
--// output writes the data to the log files and releases the buffer.
--func (l *loggingT) output(s severity, buf *buffer, file string, line int, alsoToStderr bool) {
-- l.mu.Lock()
-- if l.traceLocation.isSet() {
-- if l.traceLocation.match(file, line) {
-- buf.Write(stacks(false))
-- }
-- }
-- data := buf.Bytes()
-- if l.toStderr {
-- os.Stderr.Write(data)
-- } else {
-- if alsoToStderr || l.alsoToStderr || s >= l.stderrThreshold.get() {
-- os.Stderr.Write(data)
-- }
-- if l.file[s] == nil {
-- if err := l.createFiles(s); err != nil {
-- os.Stderr.Write(data) // Make sure the message appears somewhere.
-- l.exit(err)
-- }
-- }
-- switch s {
-- case fatalLog:
-- l.file[fatalLog].Write(data)
-- fallthrough
-- case errorLog:
-- l.file[errorLog].Write(data)
-- fallthrough
-- case warningLog:
-- l.file[warningLog].Write(data)
-- fallthrough
-- case infoLog:
-- l.file[infoLog].Write(data)
-- }
-- }
-- if s == fatalLog {
-- // If we got here via Exit rather than Fatal, print no stacks.
-- if atomic.LoadUint32(&fatalNoStacks) > 0 {
-- l.mu.Unlock()
-- timeoutFlush(10 * time.Second)
-- os.Exit(1)
-- }
-- // Dump all goroutine stacks before exiting.
-- // First, make sure we see the trace for the current goroutine on standard error.
-- // If -logtostderr has been specified, the loop below will do that anyway
-- // as the first stack in the full dump.
-- if !l.toStderr {
-- os.Stderr.Write(stacks(false))
-- }
-- // Write the stack trace for all goroutines to the files.
-- trace := stacks(true)
-- logExitFunc = func(error) {} // If we get a write error, we'll still exit below.
-- for log := fatalLog; log >= infoLog; log-- {
-- if f := l.file[log]; f != nil { // Can be nil if -logtostderr is set.
-- f.Write(trace)
-- }
-- }
-- l.mu.Unlock()
-- timeoutFlush(10 * time.Second)
-- os.Exit(255) // C++ uses -1, which is silly because it's anded with 255 anyway.
-- }
-- l.putBuffer(buf)
-- l.mu.Unlock()
-- if stats := severityStats[s]; stats != nil {
-- atomic.AddInt64(&stats.lines, 1)
-- atomic.AddInt64(&stats.bytes, int64(len(data)))
-- }
+-/*
+- Open a file, directory, or URI using the OS's default
+- application for that object type. Wait for the open
+- command to complete.
+-*/
+-func Run(input string) error {
+- return open(input).Run()
+-}
+-
+-/*
+- Open a file, directory, or URI using the OS's default
+- application for that object type. Don't wait for the
+- open command to complete.
+-*/
+-func Start(input string) error {
+- return open(input).Start()
-}
-
--// timeoutFlush calls Flush and returns when it completes or after timeout
--// elapses, whichever happens first. This is needed because the hooks invoked
--// by Flush may deadlock when glog.Fatal is called from a hook that holds
--// a lock.
--func timeoutFlush(timeout time.Duration) {
-- done := make(chan bool, 1)
-- go func() {
-- Flush() // calls logging.lockAndFlushAll()
-- done <- true
-- }()
-- select {
-- case <-done:
-- case <-time.After(timeout):
-- fmt.Fprintln(os.Stderr, "glog: Flush took longer than", timeout)
-- }
+-/*
+- Open a file, directory, or URI using the specified application.
+- Wait for the open command to complete.
+-*/
+-func RunWith(input string, appName string) error {
+- return openWith(input, appName).Run()
-}
-
--// stacks is a wrapper for runtime.Stack that attempts to recover the data for all goroutines.
--func stacks(all bool) []byte {
-- // We don't know how big the traces are, so grow a few times if they don't fit. Start large, though.
-- n := 10000
-- if all {
-- n = 100000
-- }
-- var trace []byte
-- for i := 0; i < 5; i++ {
-- trace = make([]byte, n)
-- nbytes := runtime.Stack(trace, all)
-- if nbytes < len(trace) {
-- return trace[:nbytes]
-- }
-- n *= 2
-- }
-- return trace
+-/*
+- Open a file, directory, or URI using the specified application.
+- Don't wait for the open command to complete.
+-*/
+-func StartWith(input string, appName string) error {
+- return openWith(input, appName).Start()
-}
+diff --git a/Godeps/_workspace/src/github.com/skratchdot/open-golang/open/open_test.go b/Godeps/_workspace/src/github.com/skratchdot/open-golang/open/open_test.go
+deleted file mode 100644
+index 5db2da2..0000000
+--- a/Godeps/_workspace/src/github.com/skratchdot/open-golang/open/open_test.go
++++ /dev/null
+@@ -1,70 +0,0 @@
+-package open
-
--// logExitFunc provides a simple mechanism to override the default behavior
--// of exiting on error. Used in testing and to guarantee we reach a required exit
--// for fatal logs. Instead, exit could be a function rather than a method but that
--// would make its use clumsier.
--var logExitFunc func(error)
+-import "testing"
-
--// exit is called if there is trouble creating or writing log files.
--// It flushes the logs and exits the program; there's no point in hanging around.
--// l.mu is held.
--func (l *loggingT) exit(err error) {
-- fmt.Fprintf(os.Stderr, "log: exiting because of error: %s\n", err)
-- // If logExitFunc is set, we do that instead of exiting.
-- if logExitFunc != nil {
-- logExitFunc(err)
-- return
+-func TestRun(t *testing.T) {
+- // shouldn't error
+- input := "https://google.com/"
+- err := Run(input)
+- if err != nil {
+- t.Errorf("open.Run(\"%s\") threw an error: %s", input, err)
- }
-- l.flushAll()
-- os.Exit(2)
--}
--
--// syncBuffer joins a bufio.Writer to its underlying file, providing access to the
--// file's Sync method and providing a wrapper for the Write method that provides log
--// file rotation. There are conflicting methods, so the file cannot be embedded.
--// l.mu is held for all its methods.
--type syncBuffer struct {
-- logger *loggingT
-- *bufio.Writer
-- file *os.File
-- sev severity
-- nbytes uint64 // The number of bytes written to this file
--}
-
--func (sb *syncBuffer) Sync() error {
-- return sb.file.Sync()
+- // should error
+- input = "xxxxxxxxxxxxxxx"
+- err = Run(input)
+- if err == nil {
+- t.Errorf("Run(\"%s\") did not throw an error as expected", input)
+- }
-}
-
--func (sb *syncBuffer) Write(p []byte) (n int, err error) {
-- if sb.nbytes+uint64(len(p)) >= MaxSize {
-- if err := sb.rotateFile(time.Now()); err != nil {
-- sb.logger.exit(err)
-- }
+-func TestStart(t *testing.T) {
+- // shouldn't error
+- input := "https://google.com/"
+- err := Start(input)
+- if err != nil {
+- t.Errorf("open.Start(\"%s\") threw an error: %s", input, err)
- }
-- n, err = sb.Writer.Write(p)
-- sb.nbytes += uint64(n)
+-
+- // shouldn't error
+- input = "xxxxxxxxxxxxxxx"
+- err = Start(input)
- if err != nil {
-- sb.logger.exit(err)
+- t.Errorf("open.Start(\"%s\") shouldn't even fail on invalid input: %s", input, err)
- }
-- return
-}
-
--// rotateFile closes the syncBuffer's file and starts a new one.
--func (sb *syncBuffer) rotateFile(now time.Time) error {
-- if sb.file != nil {
-- sb.Flush()
-- sb.file.Close()
-- }
-- var err error
-- sb.file, _, err = create(severityName[sb.sev], now)
-- sb.nbytes = 0
+-func TestRunWith(t *testing.T) {
+- // shouldn't error
+- input := "https://google.com/"
+- app := "firefox"
+- err := RunWith(input, app)
- if err != nil {
-- return err
+- t.Errorf("open.RunWith(\"%s\", \"%s\") threw an error: %s", input, app, err)
- }
-
-- sb.Writer = bufio.NewWriterSize(sb.file, bufferSize)
--
-- // Write header.
-- var buf bytes.Buffer
-- fmt.Fprintf(&buf, "Log file created at: %s\n", now.Format("2006/01/02 15:04:05"))
-- fmt.Fprintf(&buf, "Running on machine: %s\n", host)
-- fmt.Fprintf(&buf, "Binary: Built with %s %s for %s/%s\n", runtime.Compiler, runtime.Version(), runtime.GOOS, runtime.GOARCH)
-- fmt.Fprintf(&buf, "Log line format: [IWEF]mmdd hh:mm:ss.uuuuuu threadid file:line] msg\n")
-- n, err := sb.file.Write(buf.Bytes())
-- sb.nbytes += uint64(n)
-- return err
+- // should error
+- app = "xxxxxxxxxxxxxxx"
+- err = RunWith(input, app)
+- if err == nil {
+- t.Errorf("RunWith(\"%s\", \"%s\") did not throw an error as expected", input, app)
+- }
-}
-
--// bufferSize sizes the buffer associated with each log file. It's large
--// so that log records can accumulate without the logging thread blocking
--// on disk I/O. The flushDaemon will block instead.
--const bufferSize = 256 * 1024
+-func TestStartWith(t *testing.T) {
+- // shouldn't error
+- input := "https://google.com/"
+- app := "firefox"
+- err := StartWith(input, app)
+- if err != nil {
+- t.Errorf("open.StartWith(\"%s\", \"%s\") threw an error: %s", input, app, err)
+- }
-
--// createFiles creates all the log files for severity from sev down to infoLog.
--// l.mu is held.
--func (l *loggingT) createFiles(sev severity) error {
-- now := time.Now()
-- // Files are created in decreasing severity order, so as soon as we find one
-- // has already been created, we can stop.
-- for s := sev; s >= infoLog && l.file[s] == nil; s-- {
-- sb := &syncBuffer{
-- logger: l,
-- sev: s,
-- }
-- if err := sb.rotateFile(now); err != nil {
-- return err
-- }
-- l.file[s] = sb
+- // shouldn't error
+- input = "[<Invalid URL>]"
+- err = StartWith(input, app)
+- if err != nil {
+- t.Errorf("StartWith(\"%s\", \"%s\") shouldn't even fail on invalid input: %s", input, app, err)
- }
-- return nil
+-
-}
+diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/.gitignore b/Godeps/_workspace/src/github.com/spf13/cobra/.gitignore
+deleted file mode 100644
+index 36d1a84..0000000
+--- a/Godeps/_workspace/src/github.com/spf13/cobra/.gitignore
++++ /dev/null
+@@ -1,24 +0,0 @@
+-# Compiled Object files, Static and Dynamic libs (Shared Objects)
+-*.o
+-*.a
+-*.so
-
--const flushInterval = 30 * time.Second
+-# Folders
+-_obj
+-_test
-
--// flushDaemon periodically flushes the log file buffers.
--func (l *loggingT) flushDaemon() {
-- for _ = range time.NewTicker(flushInterval).C {
-- l.lockAndFlushAll()
-- }
--}
+-# Architecture specific extensions/prefixes
+-*.[568vq]
+-[568vq].out
-
--// lockAndFlushAll is like flushAll but locks l.mu first.
--func (l *loggingT) lockAndFlushAll() {
-- l.mu.Lock()
-- l.flushAll()
-- l.mu.Unlock()
--}
+-*.cgo1.go
+-*.cgo2.c
+-_cgo_defun.c
+-_cgo_gotypes.go
+-_cgo_export.*
-
--// flushAll flushes all the logs and attempts to "sync" their data to disk.
--// l.mu is held.
--func (l *loggingT) flushAll() {
-- // Flush from fatal down, in case there's trouble flushing.
-- for s := fatalLog; s >= infoLog; s-- {
-- file := l.file[s]
-- if file != nil {
-- file.Flush() // ignore error
-- file.Sync() // ignore error
-- }
-- }
--}
+-_testmain.go
-
--// CopyStandardLogTo arranges for messages written to the Go "log" package's
--// default logs to also appear in the Google logs for the named and lower
--// severities. Subsequent changes to the standard log's default output location
--// or format may break this behavior.
--//
--// Valid names are "INFO", "WARNING", "ERROR", and "FATAL". If the name is not
--// recognized, CopyStandardLogTo panics.
--func CopyStandardLogTo(name string) {
-- sev, ok := severityByName(name)
-- if !ok {
-- panic(fmt.Sprintf("log.CopyStandardLogTo(%q): unrecognized severity name", name))
-- }
-- // Set a log format that captures the user's file and line:
-- // d.go:23: message
-- stdLog.SetFlags(stdLog.Lshortfile)
-- stdLog.SetOutput(logBridge(sev))
--}
+-*.exe
-
--// logBridge provides the Write method that enables CopyStandardLogTo to connect
--// Go's standard logs to the logs provided by this package.
--type logBridge severity
+-cobra.test
+diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/.travis.yml b/Godeps/_workspace/src/github.com/spf13/cobra/.travis.yml
+deleted file mode 100644
+index 6de9ac2..0000000
+--- a/Godeps/_workspace/src/github.com/spf13/cobra/.travis.yml
++++ /dev/null
+@@ -1,6 +0,0 @@
+-language: go
+-go:
+- - 1.1
+-script:
+- - go test ./...
+- - go build
+diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/LICENSE.txt b/Godeps/_workspace/src/github.com/spf13/cobra/LICENSE.txt
+deleted file mode 100644
+index 298f0e2..0000000
+--- a/Godeps/_workspace/src/github.com/spf13/cobra/LICENSE.txt
++++ /dev/null
+@@ -1,174 +0,0 @@
+- Apache License
+- Version 2.0, January 2004
+- http://www.apache.org/licenses/
-
--// Write parses the standard logging line and passes its components to the
--// logger for severity(lb).
--func (lb logBridge) Write(b []byte) (n int, err error) {
-- var (
-- file = "???"
-- line = 1
-- text string
-- )
-- // Split "d.go:23: message" into "d.go", "23", and "message".
-- if parts := bytes.SplitN(b, []byte{':'}, 3); len(parts) != 3 || len(parts[0]) < 1 || len(parts[2]) < 1 {
-- text = fmt.Sprintf("bad log format: %s", b)
-- } else {
-- file = string(parts[0])
-- text = string(parts[2][1:]) // skip leading space
-- line, err = strconv.Atoi(string(parts[1]))
-- if err != nil {
-- text = fmt.Sprintf("bad line number: %s", b)
-- line = 1
-- }
-- }
-- // printWithFileLine with alsoToStderr=true, so standard log messages
-- // always appear on standard error.
-- logging.printWithFileLine(severity(lb), file, line, true, text)
-- return len(b), nil
--}
+- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
--// setV computes and remembers the V level for a given PC
--// when vmodule is enabled.
--// File pattern matching takes the basename of the file, stripped
--// of its .go suffix, and uses filepath.Match, which is a little more
--// general than the *? matching used in C++.
--// l.mu is held.
--func (l *loggingT) setV(pc uintptr) Level {
-- fn := runtime.FuncForPC(pc)
-- file, _ := fn.FileLine(pc)
-- // The file is something like /a/b/c/d.go. We want just the d.
-- if strings.HasSuffix(file, ".go") {
-- file = file[:len(file)-3]
-- }
-- if slash := strings.LastIndex(file, "/"); slash >= 0 {
-- file = file[slash+1:]
-- }
-- for _, filter := range l.vmodule.filter {
-- if filter.match(file) {
-- l.vmap[pc] = filter.level
-- return filter.level
-- }
-- }
-- l.vmap[pc] = 0
-- return 0
--}
+- 1. Definitions.
+-
+- "License" shall mean the terms and conditions for use, reproduction,
+- and distribution as defined by Sections 1 through 9 of this document.
+-
+- "Licensor" shall mean the copyright owner or entity authorized by
+- the copyright owner that is granting the License.
+-
+- "Legal Entity" shall mean the union of the acting entity and all
+- other entities that control, are controlled by, or are under common
+- control with that entity. For the purposes of this definition,
+- "control" means (i) the power, direct or indirect, to cause the
+- direction or management of such entity, whether by contract or
+- otherwise, or (ii) ownership of fifty percent (50%) or more of the
+- outstanding shares, or (iii) beneficial ownership of such entity.
+-
+- "You" (or "Your") shall mean an individual or Legal Entity
+- exercising permissions granted by this License.
+-
+- "Source" form shall mean the preferred form for making modifications,
+- including but not limited to software source code, documentation
+- source, and configuration files.
+-
+- "Object" form shall mean any form resulting from mechanical
+- transformation or translation of a Source form, including but
+- not limited to compiled object code, generated documentation,
+- and conversions to other media types.
+-
+- "Work" shall mean the work of authorship, whether in Source or
+- Object form, made available under the License, as indicated by a
+- copyright notice that is included in or attached to the work
+- (an example is provided in the Appendix below).
+-
+- "Derivative Works" shall mean any work, whether in Source or Object
+- form, that is based on (or derived from) the Work and for which the
+- editorial revisions, annotations, elaborations, or other modifications
+- represent, as a whole, an original work of authorship. For the purposes
+- of this License, Derivative Works shall not include works that remain
+- separable from, or merely link (or bind by name) to the interfaces of,
+- the Work and Derivative Works thereof.
+-
+- "Contribution" shall mean any work of authorship, including
+- the original version of the Work and any modifications or additions
+- to that Work or Derivative Works thereof, that is intentionally
+- submitted to Licensor for inclusion in the Work by the copyright owner
+- or by an individual or Legal Entity authorized to submit on behalf of
+- the copyright owner. For the purposes of this definition, "submitted"
+- means any form of electronic, verbal, or written communication sent
+- to the Licensor or its representatives, including but not limited to
+- communication on electronic mailing lists, source code control systems,
+- and issue tracking systems that are managed by, or on behalf of, the
+- Licensor for the purpose of discussing and improving the Work, but
+- excluding communication that is conspicuously marked or otherwise
+- designated in writing by the copyright owner as "Not a Contribution."
+-
+- "Contributor" shall mean Licensor and any individual or Legal Entity
+- on behalf of whom a Contribution has been received by Licensor and
+- subsequently incorporated within the Work.
+-
+- 2. Grant of Copyright License. Subject to the terms and conditions of
+- this License, each Contributor hereby grants to You a perpetual,
+- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+- copyright license to reproduce, prepare Derivative Works of,
+- publicly display, publicly perform, sublicense, and distribute the
+- Work and such Derivative Works in Source or Object form.
+-
+- 3. Grant of Patent License. Subject to the terms and conditions of
+- this License, each Contributor hereby grants to You a perpetual,
+- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+- (except as stated in this section) patent license to make, have made,
+- use, offer to sell, sell, import, and otherwise transfer the Work,
+- where such license applies only to those patent claims licensable
+- by such Contributor that are necessarily infringed by their
+- Contribution(s) alone or by combination of their Contribution(s)
+- with the Work to which such Contribution(s) was submitted. If You
+- institute patent litigation against any entity (including a
+- cross-claim or counterclaim in a lawsuit) alleging that the Work
+- or a Contribution incorporated within the Work constitutes direct
+- or contributory patent infringement, then any patent licenses
+- granted to You under this License for that Work shall terminate
+- as of the date such litigation is filed.
+-
+- 4. Redistribution. You may reproduce and distribute copies of the
+- Work or Derivative Works thereof in any medium, with or without
+- modifications, and in Source or Object form, provided that You
+- meet the following conditions:
+-
+- (a) You must give any other recipients of the Work or
+- Derivative Works a copy of this License; and
+-
+- (b) You must cause any modified files to carry prominent notices
+- stating that You changed the files; and
+-
+- (c) You must retain, in the Source form of any Derivative Works
+- that You distribute, all copyright, patent, trademark, and
+- attribution notices from the Source form of the Work,
+- excluding those notices that do not pertain to any part of
+- the Derivative Works; and
+-
+- (d) If the Work includes a "NOTICE" text file as part of its
+- distribution, then any Derivative Works that You distribute must
+- include a readable copy of the attribution notices contained
+- within such NOTICE file, excluding those notices that do not
+- pertain to any part of the Derivative Works, in at least one
+- of the following places: within a NOTICE text file distributed
+- as part of the Derivative Works; within the Source form or
+- documentation, if provided along with the Derivative Works; or,
+- within a display generated by the Derivative Works, if and
+- wherever such third-party notices normally appear. The contents
+- of the NOTICE file are for informational purposes only and
+- do not modify the License. You may add Your own attribution
+- notices within Derivative Works that You distribute, alongside
+- or as an addendum to the NOTICE text from the Work, provided
+- that such additional attribution notices cannot be construed
+- as modifying the License.
+-
+- You may add Your own copyright statement to Your modifications and
+- may provide additional or different license terms and conditions
+- for use, reproduction, or distribution of Your modifications, or
+- for any such Derivative Works as a whole, provided Your use,
+- reproduction, and distribution of the Work otherwise complies with
+- the conditions stated in this License.
+-
+- 5. Submission of Contributions. Unless You explicitly state otherwise,
+- any Contribution intentionally submitted for inclusion in the Work
+- by You to the Licensor shall be under the terms and conditions of
+- this License, without any additional terms or conditions.
+- Notwithstanding the above, nothing herein shall supersede or modify
+- the terms of any separate license agreement you may have executed
+- with Licensor regarding such Contributions.
+-
+- 6. Trademarks. This License does not grant permission to use the trade
+- names, trademarks, service marks, or product names of the Licensor,
+- except as required for reasonable and customary use in describing the
+- origin of the Work and reproducing the content of the NOTICE file.
+-
+- 7. Disclaimer of Warranty. Unless required by applicable law or
+- agreed to in writing, Licensor provides the Work (and each
+- Contributor provides its Contributions) on an "AS IS" BASIS,
+- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+- implied, including, without limitation, any warranties or conditions
+- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+- PARTICULAR PURPOSE. You are solely responsible for determining the
+- appropriateness of using or redistributing the Work and assume any
+- risks associated with Your exercise of permissions under this License.
+-
+- 8. Limitation of Liability. In no event and under no legal theory,
+- whether in tort (including negligence), contract, or otherwise,
+- unless required by applicable law (such as deliberate and grossly
+- negligent acts) or agreed to in writing, shall any Contributor be
+- liable to You for damages, including any direct, indirect, special,
+- incidental, or consequential damages of any character arising as a
+- result of this License or out of the use or inability to use the
+- Work (including but not limited to damages for loss of goodwill,
+- work stoppage, computer failure or malfunction, or any and all
+- other commercial damages or losses), even if such Contributor
+- has been advised of the possibility of such damages.
+-
+- 9. Accepting Warranty or Additional Liability. While redistributing
+- the Work or Derivative Works thereof, You may choose to offer,
+- and charge a fee for, acceptance of support, warranty, indemnity,
+- or other liability obligations and/or rights consistent with this
+- License. However, in accepting such obligations, You may act only
+- on Your own behalf and on Your sole responsibility, not on behalf
+- of any other Contributor, and only if You agree to indemnify,
+- defend, and hold each Contributor harmless for any liability
+- incurred by, or claims asserted against, such Contributor by reason
+- of your accepting any such warranty or additional liability.
+diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/README.md b/Godeps/_workspace/src/github.com/spf13/cobra/README.md
+deleted file mode 100644
+index 67c4eff..0000000
+--- a/Godeps/_workspace/src/github.com/spf13/cobra/README.md
++++ /dev/null
+@@ -1,397 +0,0 @@
+-# Cobra
+-
+-A Commander for modern go CLI interactions
+-
+-[](https://travis-ci.org/spf13/cobra)
+-
+-## Overview
-
--// Verbose is a boolean type that implements Infof (like Printf) etc.
--// See the documentation of V for more information.
--type Verbose bool
+-Cobra is a commander providing a simple interface to create powerful modern CLI
+-interfaces similar to git & go tools. In addition to providing an interface, Cobra
+-simultaneously provides a controller to organize your application code.
-
--// V reports whether verbosity at the call site is at least the requested level.
--// The returned value is a boolean of type Verbose, which implements Info, Infoln
--// and Infof. These methods will write to the Info log if called.
--// Thus, one may write either
--// if glog.V(2) { glog.Info("log this") }
--// or
--// glog.V(2).Info("log this")
--// The second form is shorter but the first is cheaper if logging is off because it does
--// not evaluate its arguments.
--//
--// Whether an individual call to V generates a log record depends on the setting of
--// the -v and --vmodule flags; both are off by default. If the level in the call to
--// V is at least the value of -v, or of -vmodule for the source file containing the
--// call, the V call will log.
--func V(level Level) Verbose {
-- // This function tries hard to be cheap unless there's work to do.
-- // The fast path is two atomic loads and compares.
+-Inspired by go, go-Commander, gh and subcommand, Cobra improves on these by
+-providing **fully posix compliant flags** (including short & long versions),
+-**nesting commands**, and the ability to **define your own help and usage** for any or
+-all commands.
-
-- // Here is a cheap but safe test to see if V logging is enabled globally.
-- if logging.verbosity.get() >= level {
-- return Verbose(true)
-- }
+-Cobra has an exceptionally clean interface and simple design without needless
+-constructors or initialization methods.
-
-- // It's off globally but it vmodule may still be set.
-- // Here is another cheap but safe test to see if vmodule is enabled.
-- if atomic.LoadInt32(&logging.filterLength) > 0 {
-- // Now we need a proper lock to use the logging structure. The pcs field
-- // is shared so we must lock before accessing it. This is fairly expensive,
-- // but if V logging is enabled we're slow anyway.
-- logging.mu.Lock()
-- defer logging.mu.Unlock()
-- if runtime.Callers(2, logging.pcs[:]) == 0 {
-- return Verbose(false)
-- }
-- v, ok := logging.vmap[logging.pcs[0]]
-- if !ok {
-- v = logging.setV(logging.pcs[0])
-- }
-- return Verbose(v >= level)
-- }
-- return Verbose(false)
--}
+-Applications built with Cobra commands are designed to be as user friendly as
+-possible. Flags can be placed before or after the command (as long as a
+-confusing space isn’t provided). Both short and long flags can be used. A
+-command need not even be fully typed. The shortest unambiguous string will
+-suffice. Help is automatically generated and available for the application or
+-for a specific command using either the help command or the --help flag.
-
--// Info is equivalent to the global Info function, guarded by the value of v.
--// See the documentation of V for usage.
--func (v Verbose) Info(args ...interface{}) {
-- if v {
-- logging.print(infoLog, args...)
-- }
--}
+-## Concepts
-
--// Infoln is equivalent to the global Infoln function, guarded by the value of v.
--// See the documentation of V for usage.
--func (v Verbose) Infoln(args ...interface{}) {
-- if v {
-- logging.println(infoLog, args...)
-- }
--}
+-Cobra is built on a structure of commands & flags.
-
--// Infof is equivalent to the global Infof function, guarded by the value of v.
--// See the documentation of V for usage.
--func (v Verbose) Infof(format string, args ...interface{}) {
-- if v {
-- logging.printf(infoLog, format, args...)
-- }
--}
+-**Commands** represent actions and **Flags** are modifiers for those actions.
-
--// Info logs to the INFO log.
--// Arguments are handled in the manner of fmt.Print; a newline is appended if missing.
--func Info(args ...interface{}) {
-- logging.print(infoLog, args...)
--}
+-In the following example 'server' is a command and 'port' is a flag.
-
--// InfoDepth acts as Info but uses depth to determine which call frame to log.
--// InfoDepth(0, "msg") is the same as Info("msg").
--func InfoDepth(depth int, args ...interface{}) {
-- logging.printDepth(infoLog, depth, args...)
--}
+- hugo server --port=1313
-
--// Infoln logs to the INFO log.
--// Arguments are handled in the manner of fmt.Println; a newline is appended if missing.
--func Infoln(args ...interface{}) {
-- logging.println(infoLog, args...)
--}
+-### Commands
-
--// Infof logs to the INFO log.
--// Arguments are handled in the manner of fmt.Printf; a newline is appended if missing.
--func Infof(format string, args ...interface{}) {
-- logging.printf(infoLog, format, args...)
--}
+-Command is the central point of the application. Each interaction that
+-the application supports will be contained in a Command. A command can
+-have children commands and optionally run an action.
-
--// Warning logs to the WARNING and INFO logs.
--// Arguments are handled in the manner of fmt.Print; a newline is appended if missing.
--func Warning(args ...interface{}) {
-- logging.print(warningLog, args...)
--}
+-In the example above 'server' is the command
-
--// WarningDepth acts as Warning but uses depth to determine which call frame to log.
--// WarningDepth(0, "msg") is the same as Warning("msg").
--func WarningDepth(depth int, args ...interface{}) {
-- logging.printDepth(warningLog, depth, args...)
--}
+-A Command has the following structure:
-
--// Warningln logs to the WARNING and INFO logs.
--// Arguments are handled in the manner of fmt.Println; a newline is appended if missing.
--func Warningln(args ...interface{}) {
-- logging.println(warningLog, args...)
--}
+- type Command struct {
+- Use string // The one-line usage message.
+- Short string // The short description shown in the 'help' output.
+- Long string // The long message shown in the 'help <this-command>' output.
+- Run func(cmd *Command, args []string) // Run runs the command.
+- }
-
--// Warningf logs to the WARNING and INFO logs.
--// Arguments are handled in the manner of fmt.Printf; a newline is appended if missing.
--func Warningf(format string, args ...interface{}) {
-- logging.printf(warningLog, format, args...)
--}
+-### Flags
-
--// Error logs to the ERROR, WARNING, and INFO logs.
--// Arguments are handled in the manner of fmt.Print; a newline is appended if missing.
--func Error(args ...interface{}) {
-- logging.print(errorLog, args...)
--}
+-A Flag is a way to modify the behavior of an command. Cobra supports
+-fully posix compliant flags as well as the go flag package.
+-A Cobra command can define flags that persist through to children commands
+-and flags that are only available to that command.
-
--// ErrorDepth acts as Error but uses depth to determine which call frame to log.
--// ErrorDepth(0, "msg") is the same as Error("msg").
--func ErrorDepth(depth int, args ...interface{}) {
-- logging.printDepth(errorLog, depth, args...)
--}
+-In the example above 'port' is the flag.
-
--// Errorln logs to the ERROR, WARNING, and INFO logs.
--// Arguments are handled in the manner of fmt.Println; a newline is appended if missing.
--func Errorln(args ...interface{}) {
-- logging.println(errorLog, args...)
--}
+-Flag functionality is provided by the [pflag
+-libary](https://github.com/ogier/pflag), a fork of the flag standard library
+-which maintains the same interface while adding posix compliance.
-
--// Errorf logs to the ERROR, WARNING, and INFO logs.
--// Arguments are handled in the manner of fmt.Printf; a newline is appended if missing.
--func Errorf(format string, args ...interface{}) {
-- logging.printf(errorLog, format, args...)
--}
+-## Usage
-
--// Fatal logs to the FATAL, ERROR, WARNING, and INFO logs,
--// including a stack trace of all running goroutines, then calls os.Exit(255).
--// Arguments are handled in the manner of fmt.Print; a newline is appended if missing.
--func Fatal(args ...interface{}) {
-- logging.print(fatalLog, args...)
--}
+-Cobra works by creating a set of commands and then organizing them into a tree.
+-The tree defines the structure of the application.
-
--// FatalDepth acts as Fatal but uses depth to determine which call frame to log.
--// FatalDepth(0, "msg") is the same as Fatal("msg").
--func FatalDepth(depth int, args ...interface{}) {
-- logging.printDepth(fatalLog, depth, args...)
--}
+-Once each command is defined with it's corresponding flags, then the
+-tree is assigned to the commander which is finally executed.
-
--// Fatalln logs to the FATAL, ERROR, WARNING, and INFO logs,
--// including a stack trace of all running goroutines, then calls os.Exit(255).
--// Arguments are handled in the manner of fmt.Println; a newline is appended if missing.
--func Fatalln(args ...interface{}) {
-- logging.println(fatalLog, args...)
--}
+-### Installing
+-Using Cobra is easy. First use go get to install the latest version
+-of the library.
-
--// Fatalf logs to the FATAL, ERROR, WARNING, and INFO logs,
--// including a stack trace of all running goroutines, then calls os.Exit(255).
--// Arguments are handled in the manner of fmt.Printf; a newline is appended if missing.
--func Fatalf(format string, args ...interface{}) {
-- logging.printf(fatalLog, format, args...)
--}
+- $ go get github.com/spf13/cobra
-
--// fatalNoStacks is non-zero if we are to exit without dumping goroutine stacks.
--// It allows Exit and relatives to use the Fatal logs.
--var fatalNoStacks uint32
+-Next include cobra in your application.
-
--// Exit logs to the FATAL, ERROR, WARNING, and INFO logs, then calls os.Exit(1).
--// Arguments are handled in the manner of fmt.Print; a newline is appended if missing.
--func Exit(args ...interface{}) {
-- atomic.StoreUint32(&fatalNoStacks, 1)
-- logging.print(fatalLog, args...)
--}
+- import "github.com/spf13/cobra"
-
--// ExitDepth acts as Exit but uses depth to determine which call frame to log.
--// ExitDepth(0, "msg") is the same as Exit("msg").
--func ExitDepth(depth int, args ...interface{}) {
-- atomic.StoreUint32(&fatalNoStacks, 1)
-- logging.printDepth(fatalLog, depth, args...)
--}
+-### Create the root command
-
--// Exitln logs to the FATAL, ERROR, WARNING, and INFO logs, then calls os.Exit(1).
--func Exitln(args ...interface{}) {
-- atomic.StoreUint32(&fatalNoStacks, 1)
-- logging.println(fatalLog, args...)
--}
+-The root command represents your binary itself.
-
--// Exitf logs to the FATAL, ERROR, WARNING, and INFO logs, then calls os.Exit(1).
--// Arguments are handled in the manner of fmt.Printf; a newline is appended if missing.
--func Exitf(format string, args ...interface{}) {
-- atomic.StoreUint32(&fatalNoStacks, 1)
-- logging.printf(fatalLog, format, args...)
--}
-diff --git a/Godeps/_workspace/src/github.com/golang/glog/glog_file.go b/Godeps/_workspace/src/github.com/golang/glog/glog_file.go
-deleted file mode 100644
-index 65075d2..0000000
---- a/Godeps/_workspace/src/github.com/golang/glog/glog_file.go
-+++ /dev/null
-@@ -1,124 +0,0 @@
--// Go support for leveled logs, analogous to https://code.google.com/p/google-glog/
--//
--// Copyright 2013 Google Inc. All Rights Reserved.
--//
--// Licensed under the Apache License, Version 2.0 (the "License");
--// you may not use this file except in compliance with the License.
--// You may obtain a copy of the License at
--//
--// http://www.apache.org/licenses/LICENSE-2.0
--//
--// Unless required by applicable law or agreed to in writing, software
--// distributed under the License is distributed on an "AS IS" BASIS,
--// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--// See the License for the specific language governing permissions and
--// limitations under the License.
+-Cobra doesn't require any special constructors. Simply create your commands.
-
--// File I/O for logs.
+- var HugoCmd = &cobra.Command{
+- Use: "hugo",
+- Short: "Hugo is a very fast static site generator",
+- Long: `A Fast and Flexible Static Site Generator built with
+- love by spf13 and friends in Go.
+- Complete documentation is available at http://hugo.spf13.com`,
+- Run: func(cmd *cobra.Command, args []string) {
+- // Do Stuff Here
+- },
+- }
-
--package glog
+-### Create additional commands
-
--import (
-- "errors"
-- "flag"
-- "fmt"
-- "os"
-- "os/user"
-- "path/filepath"
-- "strings"
-- "sync"
-- "time"
--)
+-Additional commands can be defined.
-
--// MaxSize is the maximum size of a log file in bytes.
--var MaxSize uint64 = 1024 * 1024 * 1800
+- var versionCmd = &cobra.Command{
+- Use: "version",
+- Short: "Print the version number of Hugo",
+- Long: `All software has versions. This is Hugo's`,
+- Run: func(cmd *cobra.Command, args []string) {
+- fmt.Println("Hugo Static Site Generator v0.9 -- HEAD")
+- },
+- }
-
--// logDirs lists the candidate directories for new log files.
--var logDirs []string
+-### Attach command to its parent
+-In this example we are attaching it to the root, but commands can be attached at any level.
-
--// If non-empty, overrides the choice of directory in which to write logs.
--// See createLogDirs for the full list of possible destinations.
--var logDir = flag.String("log_dir", "", "If non-empty, write log files in this directory")
+- HugoCmd.AddCommand(versionCmd)
-
--func createLogDirs() {
-- if *logDir != "" {
-- logDirs = append(logDirs, *logDir)
-- }
-- logDirs = append(logDirs, os.TempDir())
--}
+-### Assign flags to a command
-
--var (
-- pid = os.Getpid()
-- program = filepath.Base(os.Args[0])
-- host = "unknownhost"
-- userName = "unknownuser"
--)
+-Since the flags are defined and used in different locations, we need to define a variable outside with the correct scope to assign the flag to work with.
-
--func init() {
-- h, err := os.Hostname()
-- if err == nil {
-- host = shortHostname(h)
-- }
+- var Verbose bool
+- var Source string
-
-- current, err := user.Current()
-- if err == nil {
-- userName = current.Username
-- }
+-There are two different approaches to assign a flag.
-
-- // Sanitize userName since it may contain filepath separators on Windows.
-- userName = strings.Replace(userName, `\`, "_", -1)
--}
+-#### Persistent Flags
-
--// shortHostname returns its argument, truncating at the first period.
--// For instance, given "www.google.com" it returns "www".
--func shortHostname(hostname string) string {
-- if i := strings.Index(hostname, "."); i >= 0 {
-- return hostname[:i]
-- }
-- return hostname
--}
+-A flag can be 'persistent' meaning that this flag will be available to the
+-command it's assigned to as well as every command under that command. For
+-global flags assign a flag as a persistent flag on the root.
-
--// logName returns a new log file name containing tag, with start time t, and
--// the name for the symlink for tag.
--func logName(tag string, t time.Time) (name, link string) {
-- name = fmt.Sprintf("%s.%s.%s.log.%s.%04d%02d%02d-%02d%02d%02d.%d",
-- program,
-- host,
-- userName,
-- tag,
-- t.Year(),
-- t.Month(),
-- t.Day(),
-- t.Hour(),
-- t.Minute(),
-- t.Second(),
-- pid)
-- return name, program + "." + tag
--}
+- HugoCmd.PersistentFlags().BoolVarP(&Verbose, "verbose", "v", false, "verbose output")
-
--var onceLogDirs sync.Once
+-#### Local Flags
-
--// create creates a new log file and returns the file and its filename, which
--// contains tag ("INFO", "FATAL", etc.) and t. If the file is created
--// successfully, create also attempts to update the symlink for that tag, ignoring
--// errors.
--func create(tag string, t time.Time) (f *os.File, filename string, err error) {
-- onceLogDirs.Do(createLogDirs)
-- if len(logDirs) == 0 {
-- return nil, "", errors.New("log: no log dirs")
-- }
-- name, link := logName(tag, t)
-- var lastErr error
-- for _, dir := range logDirs {
-- fname := filepath.Join(dir, name)
-- f, err := os.Create(fname)
-- if err == nil {
-- symlink := filepath.Join(dir, link)
-- os.Remove(symlink) // ignore err
-- os.Symlink(name, symlink) // ignore err
-- return f, fname, nil
-- }
-- lastErr = err
-- }
-- return nil, "", fmt.Errorf("log: cannot create log: %v", lastErr)
--}
-diff --git a/Godeps/_workspace/src/github.com/golang/glog/glog_test.go b/Godeps/_workspace/src/github.com/golang/glog/glog_test.go
-deleted file mode 100644
-index 0fb376e..0000000
---- a/Godeps/_workspace/src/github.com/golang/glog/glog_test.go
-+++ /dev/null
-@@ -1,415 +0,0 @@
--// Go support for leveled logs, analogous to https://code.google.com/p/google-glog/
--//
--// Copyright 2013 Google Inc. All Rights Reserved.
--//
--// Licensed under the Apache License, Version 2.0 (the "License");
--// you may not use this file except in compliance with the License.
--// You may obtain a copy of the License at
--//
--// http://www.apache.org/licenses/LICENSE-2.0
--//
--// Unless required by applicable law or agreed to in writing, software
--// distributed under the License is distributed on an "AS IS" BASIS,
--// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--// See the License for the specific language governing permissions and
--// limitations under the License.
+-A flag can also be assigned locally which will only apply to that specific command.
-
--package glog
+- HugoCmd.Flags().StringVarP(&Source, "source", "s", "", "Source directory to read from")
-
--import (
-- "bytes"
-- "fmt"
-- stdLog "log"
-- "path/filepath"
-- "runtime"
-- "strconv"
-- "strings"
-- "testing"
-- "time"
--)
+-### Once all commands and flags are defined, Execute the commands
-
--// Test that shortHostname works as advertised.
--func TestShortHostname(t *testing.T) {
-- for hostname, expect := range map[string]string{
-- "": "",
-- "host": "host",
-- "host.google.com": "host",
-- } {
-- if got := shortHostname(hostname); expect != got {
-- t.Errorf("shortHostname(%q): expected %q, got %q", hostname, expect, got)
-- }
-- }
--}
+-Execute should be run on the root for clarity, though it can be called on any command.
-
--// flushBuffer wraps a bytes.Buffer to satisfy flushSyncWriter.
--type flushBuffer struct {
-- bytes.Buffer
--}
+- HugoCmd.Execute()
-
--func (f *flushBuffer) Flush() error {
-- return nil
--}
+-## Example
-
--func (f *flushBuffer) Sync() error {
-- return nil
--}
+-In the example below we have defined three commands. Two are at the top level
+-and one (cmdTimes) is a child of one of the top commands. In this case the root
+-is not executable meaning that a subcommand is required. This is accomplished
+-by not providing a 'Run' for the 'rootCmd'.
-
--// swap sets the log writers and returns the old array.
--func (l *loggingT) swap(writers [numSeverity]flushSyncWriter) (old [numSeverity]flushSyncWriter) {
-- l.mu.Lock()
-- defer l.mu.Unlock()
-- old = l.file
-- for i, w := range writers {
-- logging.file[i] = w
-- }
-- return
--}
+-We have only defined one flag for a single command.
-
--// newBuffers sets the log writers to all new byte buffers and returns the old array.
--func (l *loggingT) newBuffers() [numSeverity]flushSyncWriter {
-- return l.swap([numSeverity]flushSyncWriter{new(flushBuffer), new(flushBuffer), new(flushBuffer), new(flushBuffer)})
--}
+-More documentation about flags is available at https://github.com/spf13/pflag
-
--// contents returns the specified log value as a string.
--func contents(s severity) string {
-- return logging.file[s].(*flushBuffer).String()
--}
+- import(
+- "github.com/spf13/cobra"
+- "fmt"
+- "strings"
+- )
-
--// contains reports whether the string is contained in the log.
--func contains(s severity, str string, t *testing.T) bool {
-- return strings.Contains(contents(s), str)
--}
+- func main() {
-
--// setFlags configures the logging flags how the test expects them.
--func setFlags() {
-- logging.toStderr = false
--}
+- var echoTimes int
-
--// Test that Info works as advertised.
--func TestInfo(t *testing.T) {
-- setFlags()
-- defer logging.swap(logging.newBuffers())
-- Info("test")
-- if !contains(infoLog, "I", t) {
-- t.Errorf("Info has wrong character: %q", contents(infoLog))
-- }
-- if !contains(infoLog, "test", t) {
-- t.Error("Info failed")
-- }
--}
+- var cmdPrint = &cobra.Command{
+- Use: "print [string to print]",
+- Short: "Print anything to the screen",
+- Long: `print is for printing anything back to the screen.
+- For many years people have printed back to the screen.
+- `,
+- Run: func(cmd *cobra.Command, args []string) {
+- fmt.Println("Print: " + strings.Join(args, " "))
+- },
+- }
+-
+- var cmdEcho = &cobra.Command{
+- Use: "echo [string to echo]",
+- Short: "Echo anything to the screen",
+- Long: `echo is for echoing anything back.
+- Echo works a lot like print, except it has a child command.
+- `,
+- Run: func(cmd *cobra.Command, args []string) {
+- fmt.Println("Print: " + strings.Join(args, " "))
+- },
+- }
+-
+- var cmdTimes = &cobra.Command{
+- Use: "times [# times] [string to echo]",
+- Short: "Echo anything to the screen more times",
+- Long: `echo things multiple times back to the user by providing
+- a count and a string.`,
+- Run: func(cmd *cobra.Command, args []string) {
+- for i:=0; i < echoTimes; i++ {
+- fmt.Println("Echo: " + strings.Join(args, " "))
+- }
+- },
+- }
-
--func TestInfoDepth(t *testing.T) {
-- setFlags()
-- defer logging.swap(logging.newBuffers())
+- cmdTimes.Flags().IntVarP(&echoTimes, "times", "t", 1, "times to echo the input")
-
-- f := func() { InfoDepth(1, "depth-test1") }
+- var rootCmd = &cobra.Command{Use: "app"}
+- rootCmd.AddCommand(cmdPrint, cmdEcho)
+- cmdEcho.AddCommand(cmdTimes)
+- rootCmd.Execute()
+- }
-
-- // The next three lines must stay together
-- _, _, wantLine, _ := runtime.Caller(0)
-- InfoDepth(0, "depth-test0")
-- f()
+-For a more complete example of a larger application, please checkout [Hugo](http://hugo.spf13.com)
-
-- msgs := strings.Split(strings.TrimSuffix(contents(infoLog), "\n"), "\n")
-- if len(msgs) != 2 {
-- t.Fatalf("Got %d lines, expected 2", len(msgs))
-- }
+-## The Help Command
-
-- for i, m := range msgs {
-- if !strings.HasPrefix(m, "I") {
-- t.Errorf("InfoDepth[%d] has wrong character: %q", i, m)
-- }
-- w := fmt.Sprintf("depth-test%d", i)
-- if !strings.Contains(m, w) {
-- t.Errorf("InfoDepth[%d] missing %q: %q", i, w, m)
-- }
+-Cobra automatically adds a help command to your application.
+-This will be called when a user runs 'app help'. Additionally help will also
+-support all other commands as input. Say for instance you have a command called
+-'create' without any additional configuration cobra will work when 'app help
+-create' is called.
-
-- // pull out the line number (between : and ])
-- msg := m[strings.LastIndex(m, ":")+1:]
-- x := strings.Index(msg, "]")
-- if x < 0 {
-- t.Errorf("InfoDepth[%d]: missing ']': %q", i, m)
-- continue
-- }
-- line, err := strconv.Atoi(msg[:x])
-- if err != nil {
-- t.Errorf("InfoDepth[%d]: bad line number: %q", i, m)
-- continue
-- }
-- wantLine++
-- if wantLine != line {
-- t.Errorf("InfoDepth[%d]: got line %d, want %d", i, line, wantLine)
-- }
-- }
--}
+-### Example
-
--func init() {
-- CopyStandardLogTo("INFO")
--}
+-The following output is automatically generated by cobra. Nothing beyond the
+-command and flag definitions are needed.
-
--// Test that CopyStandardLogTo panics on bad input.
--func TestCopyStandardLogToPanic(t *testing.T) {
-- defer func() {
-- if s, ok := recover().(string); !ok || !strings.Contains(s, "LOG") {
-- t.Errorf(`CopyStandardLogTo("LOG") should have panicked: %v`, s)
-- }
-- }()
-- CopyStandardLogTo("LOG")
--}
+- > hugo help
-
--// Test that using the standard log package logs to INFO.
--func TestStandardLog(t *testing.T) {
-- setFlags()
-- defer logging.swap(logging.newBuffers())
-- stdLog.Print("test")
-- if !contains(infoLog, "I", t) {
-- t.Errorf("Info has wrong character: %q", contents(infoLog))
-- }
-- if !contains(infoLog, "test", t) {
-- t.Error("Info failed")
-- }
--}
+- A Fast and Flexible Static Site Generator built with
+- love by spf13 and friends in Go.
-
--// Test that the header has the correct format.
--func TestHeader(t *testing.T) {
-- setFlags()
-- defer logging.swap(logging.newBuffers())
-- defer func(previous func() time.Time) { timeNow = previous }(timeNow)
-- timeNow = func() time.Time {
-- return time.Date(2006, 1, 2, 15, 4, 5, .067890e9, time.Local)
-- }
-- pid = 1234
-- Info("test")
-- var line int
-- format := "I0102 15:04:05.067890 1234 glog_test.go:%d] test\n"
-- n, err := fmt.Sscanf(contents(infoLog), format, &line)
-- if n != 1 || err != nil {
-- t.Errorf("log format error: %d elements, error %s:\n%s", n, err, contents(infoLog))
-- }
-- // Scanf treats multiple spaces as equivalent to a single space,
-- // so check for correct space-padding also.
-- want := fmt.Sprintf(format, line)
-- if contents(infoLog) != want {
-- t.Errorf("log format error: got:\n\t%q\nwant:\t%q", contents(infoLog), want)
-- }
--}
+- Complete documentation is available at http://hugo.spf13.com
-
--// Test that an Error log goes to Warning and Info.
--// Even in the Info log, the source character will be E, so the data should
--// all be identical.
--func TestError(t *testing.T) {
-- setFlags()
-- defer logging.swap(logging.newBuffers())
-- Error("test")
-- if !contains(errorLog, "E", t) {
-- t.Errorf("Error has wrong character: %q", contents(errorLog))
-- }
-- if !contains(errorLog, "test", t) {
-- t.Error("Error failed")
-- }
-- str := contents(errorLog)
-- if !contains(warningLog, str, t) {
-- t.Error("Warning failed")
-- }
-- if !contains(infoLog, str, t) {
-- t.Error("Info failed")
-- }
--}
+- Usage:
+- hugo [flags]
+- hugo [command]
-
--// Test that a Warning log goes to Info.
--// Even in the Info log, the source character will be W, so the data should
--// all be identical.
--func TestWarning(t *testing.T) {
-- setFlags()
-- defer logging.swap(logging.newBuffers())
-- Warning("test")
-- if !contains(warningLog, "W", t) {
-- t.Errorf("Warning has wrong character: %q", contents(warningLog))
-- }
-- if !contains(warningLog, "test", t) {
-- t.Error("Warning failed")
-- }
-- str := contents(warningLog)
-- if !contains(infoLog, str, t) {
-- t.Error("Info failed")
-- }
--}
+- Available Commands:
+- server :: Hugo runs it's own a webserver to render the files
+- version :: Print the version number of Hugo
+- check :: Check content in the source directory
+- benchmark :: Benchmark hugo by building a site a number of times
+- help [command] :: Help about any command
-
--// Test that a V log goes to Info.
--func TestV(t *testing.T) {
-- setFlags()
-- defer logging.swap(logging.newBuffers())
-- logging.verbosity.Set("2")
-- defer logging.verbosity.Set("0")
-- V(2).Info("test")
-- if !contains(infoLog, "I", t) {
-- t.Errorf("Info has wrong character: %q", contents(infoLog))
-- }
-- if !contains(infoLog, "test", t) {
-- t.Error("Info failed")
-- }
--}
+- Available Flags:
+- -b, --base-url="": hostname (and path) to the root eg. http://spf13.com/
+- -D, --build-drafts=false: include content marked as draft
+- --config="": config file (default is path/config.yaml|json|toml)
+- -d, --destination="": filesystem path to write files to
+- -s, --source="": filesystem path to read files relative from
+- --stepAnalysis=false: display memory and timing of different steps of the program
+- --uglyurls=false: if true, use /filename.html instead of /filename/
+- -v, --verbose=false: verbose output
+- -w, --watch=false: watch filesystem for changes and recreate as needed
-
--// Test that a vmodule enables a log in this file.
--func TestVmoduleOn(t *testing.T) {
-- setFlags()
-- defer logging.swap(logging.newBuffers())
-- logging.vmodule.Set("glog_test=2")
-- defer logging.vmodule.Set("")
-- if !V(1) {
-- t.Error("V not enabled for 1")
-- }
-- if !V(2) {
-- t.Error("V not enabled for 2")
-- }
-- if V(3) {
-- t.Error("V enabled for 3")
-- }
-- V(2).Info("test")
-- if !contains(infoLog, "I", t) {
-- t.Errorf("Info has wrong character: %q", contents(infoLog))
-- }
-- if !contains(infoLog, "test", t) {
-- t.Error("Info failed")
-- }
--}
+- Use "hugo help [command]" for more information about that command.
-
--// Test that a vmodule of another file does not enable a log in this file.
--func TestVmoduleOff(t *testing.T) {
-- setFlags()
-- defer logging.swap(logging.newBuffers())
-- logging.vmodule.Set("notthisfile=2")
-- defer logging.vmodule.Set("")
-- for i := 1; i <= 3; i++ {
-- if V(Level(i)) {
-- t.Errorf("V enabled for %d", i)
-- }
-- }
-- V(2).Info("test")
-- if contents(infoLog) != "" {
-- t.Error("V logged incorrectly")
-- }
--}
-
--// vGlobs are patterns that match/don't match this file at V=2.
--var vGlobs = map[string]bool{
-- // Easy to test the numeric match here.
-- "glog_test=1": false, // If -vmodule sets V to 1, V(2) will fail.
-- "glog_test=2": true,
-- "glog_test=3": true, // If -vmodule sets V to 1, V(3) will succeed.
-- // These all use 2 and check the patterns. All are true.
-- "*=2": true,
-- "?l*=2": true,
-- "????_*=2": true,
-- "??[mno]?_*t=2": true,
-- // These all use 2 and check the patterns. All are false.
-- "*x=2": false,
-- "m*=2": false,
-- "??_*=2": false,
-- "?[abc]?_*t=2": false,
--}
-
--// Test that vmodule globbing works as advertised.
--func testVmoduleGlob(pat string, match bool, t *testing.T) {
-- setFlags()
-- defer logging.swap(logging.newBuffers())
-- defer logging.vmodule.Set("")
-- logging.vmodule.Set(pat)
-- if V(2) != Verbose(match) {
-- t.Errorf("incorrect match for %q: got %t expected %t", pat, V(2), match)
-- }
--}
+-Help is just a command like any other. There is no special logic or behavior
+-around it. In fact you can provide your own if you want.
-
--// Test that a vmodule globbing works as advertised.
--func TestVmoduleGlob(t *testing.T) {
-- for glob, match := range vGlobs {
-- testVmoduleGlob(glob, match, t)
-- }
--}
+-### Defining your own help
-
--func TestRollover(t *testing.T) {
-- setFlags()
-- var err error
-- defer func(previous func(error)) { logExitFunc = previous }(logExitFunc)
-- logExitFunc = func(e error) {
-- err = e
-- }
-- defer func(previous uint64) { MaxSize = previous }(MaxSize)
-- MaxSize = 512
+-You can provide your own Help command or you own template for the default command to use.
-
-- Info("x") // Be sure we have a file.
-- info, ok := logging.file[infoLog].(*syncBuffer)
-- if !ok {
-- t.Fatal("info wasn't created")
-- }
-- if err != nil {
-- t.Fatalf("info has initial error: %v", err)
-- }
-- fname0 := info.file.Name()
-- Info(strings.Repeat("x", int(MaxSize))) // force a rollover
-- if err != nil {
-- t.Fatalf("info has error after big write: %v", err)
-- }
+-The default help command is
-
-- // Make sure the next log file gets a file name with a different
-- // time stamp.
-- //
-- // TODO: determine whether we need to support subsecond log
-- // rotation. C++ does not appear to handle this case (nor does it
-- // handle Daylight Savings Time properly).
-- time.Sleep(1 * time.Second)
+- func (c *Command) initHelp() {
+- if c.helpCommand == nil {
+- c.helpCommand = &Command{
+- Use: "help [command]",
+- Short: "Help about any command",
+- Long: `Help provides help for any command in the application.
+- Simply type ` + c.Name() + ` help [path to command] for full details.`,
+- Run: c.HelpFunc(),
+- }
+- }
+- c.AddCommand(c.helpCommand)
+- }
-
-- Info("x") // create a new file
-- if err != nil {
-- t.Fatalf("error after rotation: %v", err)
-- }
-- fname1 := info.file.Name()
-- if fname0 == fname1 {
-- t.Errorf("info.f.Name did not change: %v", fname0)
-- }
-- if info.nbytes >= MaxSize {
-- t.Errorf("file size was not reset: %d", info.nbytes)
-- }
--}
+-You can provide your own command, function or template through the following methods.
-
--func TestLogBacktraceAt(t *testing.T) {
-- setFlags()
-- defer logging.swap(logging.newBuffers())
-- // The peculiar style of this code simplifies line counting and maintenance of the
-- // tracing block below.
-- var infoLine string
-- setTraceLocation := func(file string, line int, ok bool, delta int) {
-- if !ok {
-- t.Fatal("could not get file:line")
-- }
-- _, file = filepath.Split(file)
-- infoLine = fmt.Sprintf("%s:%d", file, line+delta)
-- err := logging.traceLocation.Set(infoLine)
-- if err != nil {
-- t.Fatal("error setting log_backtrace_at: ", err)
-- }
-- }
-- {
-- // Start of tracing block. These lines know about each other's relative position.
-- _, file, line, ok := runtime.Caller(0)
-- setTraceLocation(file, line, ok, +2) // Two lines between Caller and Info calls.
-- Info("we want a stack trace here")
-- }
-- numAppearances := strings.Count(contents(infoLog), infoLine)
-- if numAppearances < 2 {
-- // Need 2 appearances, one in the log header and one in the trace:
-- // log_test.go:281: I0511 16:36:06.952398 02238 log_test.go:280] we want a stack trace here
-- // ...
-- // github.com/glog/glog_test.go:280 (0x41ba91)
-- // ...
-- // We could be more precise but that would require knowing the details
-- // of the traceback format, which may not be dependable.
-- t.Fatal("got no trace back; log is ", contents(infoLog))
-- }
--}
+- command.SetHelpCommand(cmd *Command)
-
--func BenchmarkHeader(b *testing.B) {
-- for i := 0; i < b.N; i++ {
-- buf, _, _ := logging.header(infoLog, 0)
-- logging.putBuffer(buf)
-- }
--}
-diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/client/README.md b/Godeps/_workspace/src/github.com/google/cadvisor/client/README.md
-deleted file mode 100644
-index fededef..0000000
---- a/Godeps/_workspace/src/github.com/google/cadvisor/client/README.md
-+++ /dev/null
-@@ -1,54 +0,0 @@
--# Example REST API Client
+- command.SetHelpFunc(f func(*Command, []string))
-
--This is an implementation of a cAdvisor REST API in Go. You can use it like this:
+- command.SetHelpTemplate(s string)
-
--```go
--client, err := client.NewClient("http://192.168.59.103:8080/")
--```
+-The latter two will also apply to any children commands.
-
--Obviously, replace the URL with the path to your actual cAdvisor REST endpoint.
+-## Usage
-
+-When the user provides an invalid flag or invalid command Cobra responds by
+-showing the user the 'usage'
-
--### MachineInfo
+-### Example
+-You may recognize this from the help above. That's because the default help
+-embeds the usage as part of it's output.
-
--```go
--client.MachineInfo()
--```
+- Usage:
+- hugo [flags]
+- hugo [command]
-
--This method returns a cadvisor/info.MachineInfo struct with all the fields filled in. Here is an example return value:
+- Available Commands:
+- server Hugo runs it's own a webserver to render the files
+- version Print the version number of Hugo
+- check Check content in the source directory
+- benchmark Benchmark hugo by building a site a number of times
+- help [command] Help about any command
-
--```
--(*info.MachineInfo)(0xc208022b10)({
-- NumCores: (int) 4,
-- MemoryCapacity: (int64) 2106028032,
-- Filesystems: ([]info.FsInfo) (len=1 cap=4) {
-- (info.FsInfo) {
-- Device: (string) (len=9) "/dev/sda1",
-- Capacity: (uint64) 19507089408
-- }
-- }
--})
--```
+- Available Flags:
+- -b, --base-url="": hostname (and path) to the root eg. http://spf13.com/
+- -D, --build-drafts=false: include content marked as draft
+- --config="": config file (default is path/config.yaml|json|toml)
+- -d, --destination="": filesystem path to write files to
+- -s, --source="": filesystem path to read files relative from
+- --stepAnalysis=false: display memory and timing of different steps of the program
+- --uglyurls=false: if true, use /filename.html instead of /filename/
+- -v, --verbose=false: verbose output
+- -w, --watch=false: watch filesystem for changes and recreate as needed
-
--You can see the full specification of the [MachineInfo struct in the source](../info/container.go)
+-### Defining your own usage
+-You can provide your own usage function or template for cobra to use.
-
--### ContainerInfo
+-The default usage function is
-
--Given a container name and a ContainerInfoRequest, will return all information about the specified container. The ContainerInfoRequest struct just has one field, NumStats, which is the number of stat entries that you want returned.
+- return func(c *Command) error {
+- err := tmpl(c.Out(), c.UsageTemplate(), c)
+- return err
+- }
-
--```go
--request := info.ContainerInfoRequest{10}
--sInfo, err := client.ContainerInfo("/docker/d9d3eb10179e6f93a...", &request)
--```
--Returns a [ContainerInfo struct](../info/container.go)
+-Like help the function and template are over ridable through public methods.
-
--### SubcontainersInfo
+- command.SetUsageFunc(f func(*Command) error)
-
--Given a container name and a ContainerInfoRequest, will recursively return all info about the container and all subcontainers contained within the container. The ContainerInfoRequest struct just has one field, NumStats, which is the number of stat entries that you want returned.
+- command.SetUsageTemplate(s string)
-
--```go
--request := info.ContainerInfoRequest{10}
--sInfo, err := client.SubcontainersInfo("/docker", &request)
--```
-
--Returns a [ContainerInfo struct](../info/container.go) with the Subcontainers field populated.
-diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/client/client.go b/Godeps/_workspace/src/github.com/google/cadvisor/client/client.go
-deleted file mode 100644
-index c1117d2..0000000
---- a/Godeps/_workspace/src/github.com/google/cadvisor/client/client.go
-+++ /dev/null
-@@ -1,123 +0,0 @@
--// Copyright 2014 Google Inc. All Rights Reserved.
--//
--// Licensed under the Apache License, Version 2.0 (the "License");
--// you may not use this file except in compliance with the License.
--// You may obtain a copy of the License at
--//
--// http://www.apache.org/licenses/LICENSE-2.0
--//
--// Unless required by applicable law or agreed to in writing, software
--// distributed under the License is distributed on an "AS IS" BASIS,
--// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--// See the License for the specific language governing permissions and
--// limitations under the License.
+-## Debugging
-
--// TODO(cAdvisor): Package comment.
--package client
+-Cobra provides a ‘DebugFlags’ method on a command which when called will print
+-out everything Cobra knows about the flags for each command
-
--import (
-- "bytes"
-- "encoding/json"
-- "fmt"
-- "io/ioutil"
-- "net/http"
-- "path"
-- "strings"
+-### Example
-
-- "github.com/google/cadvisor/info"
--)
+- command.DebugFlags()
-
--// Client represents the base URL for a cAdvisor client.
--type Client struct {
-- baseUrl string
--}
+-## Release Notes
+-* **0.9.0** June 17, 2014
+- * flags can appears anywhere in the args (provided they are unambiguous)
+- * --help prints usage screen for app or command
+- * Prefix matching for commands
+- * Cleaner looking help and usage output
+- * Extensive test suite
+-* **0.8.0** Nov 5, 2013
+- * Reworked interface to remove commander completely
+- * Command now primary structure
+- * No initialization needed
+- * Usage & Help templates & functions definable at any level
+- * Updated Readme
+-* **0.7.0** Sept 24, 2013
+- * Needs more eyes
+- * Test suite
+- * Support for automatic error messages
+- * Support for help command
+- * Support for printing to any io.Writer instead of os.Stderr
+- * Support for persistent flags which cascade down tree
+- * Ready for integration into Hugo
+-* **0.1.0** Sept 3, 2013
+- * Implement first draft
-
--// NewClient returns a new client with the specified base URL.
--func NewClient(url string) (*Client, error) {
-- if !strings.HasSuffix(url, "/") {
-- url += "/"
-- }
+-## ToDo
+-* Launch proper documentation site
-
-- return &Client{
-- baseUrl: fmt.Sprintf("%sapi/v1.1/", url),
-- }, nil
--}
+-## Contributing
-
--// MachineInfo returns the JSON machine information for this client.
--// A non-nil error result indicates a problem with obtaining
--// the JSON machine information data.
--func (self *Client) MachineInfo() (minfo *info.MachineInfo, err error) {
-- u := self.machineInfoUrl()
-- ret := new(info.MachineInfo)
-- if err = self.httpGetJsonData(ret, nil, u, "machine info"); err != nil {
-- return
-- }
-- minfo = ret
-- return
--}
+-1. Fork it
+-2. Create your feature branch (`git checkout -b my-new-feature`)
+-3. Commit your changes (`git commit -am 'Add some feature'`)
+-4. Push to the branch (`git push origin my-new-feature`)
+-5. Create new Pull Request
-
--// ContainerInfo returns the JSON container information for the specified
--// container and request.
--func (self *Client) ContainerInfo(name string, query *info.ContainerInfoRequest) (cinfo *info.ContainerInfo, err error) {
-- u := self.containerInfoUrl(name)
-- ret := new(info.ContainerInfo)
-- if err = self.httpGetJsonData(ret, query, u, fmt.Sprintf("container info for %q", name)); err != nil {
-- return
-- }
-- cinfo = ret
-- return
--}
+-## Contributors
-
--// Returns the information about all subcontainers (recursive) of the specified container (including itself).
--func (self *Client) SubcontainersInfo(name string, query *info.ContainerInfoRequest) ([]info.ContainerInfo, error) {
-- var response []info.ContainerInfo
-- url := self.subcontainersInfoUrl(name)
-- err := self.httpGetJsonData(&response, query, url, fmt.Sprintf("subcontainers container info for %q", name))
-- if err != nil {
-- return []info.ContainerInfo{}, err
+-Names in no particular order:
-
-- }
-- return response, nil
--}
+-* [spf13](https://github.com/spf13)
-
--func (self *Client) machineInfoUrl() string {
-- return self.baseUrl + path.Join("machine")
--}
+-## License
-
--func (self *Client) containerInfoUrl(name string) string {
-- return self.baseUrl + path.Join("containers", name)
--}
+-Cobra is released under the Apache 2.0 license. See [LICENSE.txt](https://github.com/spf13/cobra/blob/master/LICENSE.txt)
-
--func (self *Client) subcontainersInfoUrl(name string) string {
-- return self.baseUrl + path.Join("subcontainers", name)
--}
-
--func (self *Client) httpGetJsonData(data, postData interface{}, url, infoName string) error {
-- var resp *http.Response
-- var err error
+-[](https://bitdeli.com/free "Bitdeli Badge")
-
-- if postData != nil {
-- data, err := json.Marshal(postData)
-- if err != nil {
-- return fmt.Errorf("unable to marshal data: %v", err)
-- }
-- resp, err = http.Post(url, "application/json", bytes.NewBuffer(data))
-- } else {
-- resp, err = http.Get(url)
-- }
-- if err != nil {
-- err = fmt.Errorf("unable to get %v: %v", infoName, err)
-- return err
-- }
-- defer resp.Body.Close()
-- body, err := ioutil.ReadAll(resp.Body)
-- if err != nil {
-- err = fmt.Errorf("unable to read all %v: %v", infoName, err)
-- return err
-- }
-- if err = json.Unmarshal(body, data); err != nil {
-- err = fmt.Errorf("unable to unmarshal %v (%v): %v", infoName, string(body), err)
-- return err
-- }
-- return nil
--}
-diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/client/client_test.go b/Godeps/_workspace/src/github.com/google/cadvisor/client/client_test.go
+diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/cobra.go b/Godeps/_workspace/src/github.com/spf13/cobra/cobra.go
deleted file mode 100644
-index 35a75ad..0000000
---- a/Godeps/_workspace/src/github.com/google/cadvisor/client/client_test.go
+index e03b496..0000000
+--- a/Godeps/_workspace/src/github.com/spf13/cobra/cobra.go
+++ /dev/null
-@@ -1,154 +0,0 @@
--// Copyright 2014 Google Inc. All Rights Reserved.
+@@ -1,98 +0,0 @@
+-// Copyright © 2013 Steve Francia <spf at spf13.com>.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
--//
--// http://www.apache.org/licenses/LICENSE-2.0
+-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
@@ -93432,34960 +79191,49377 @@ index 35a75ad..0000000
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
--package client
+-// Commands similar to git, go tools and other modern CLI tools
+-// inspired by go, go-Commander, gh and subcommand
+-
+-package cobra
-
-import (
-- "encoding/json"
- "fmt"
-- "net/http"
-- "net/http/httptest"
-- "path"
+- "io"
- "reflect"
-- "testing"
-- "time"
--
-- "github.com/google/cadvisor/info"
-- itest "github.com/google/cadvisor/info/test"
-- "github.com/kr/pretty"
+- "strconv"
+- "strings"
+- "text/template"
-)
-
--func testGetJsonData(
-- expected interface{},
-- f func() (interface{}, error),
--) error {
-- reply, err := f()
-- if err != nil {
-- return fmt.Errorf("unable to retrieve data: %v", err)
-- }
-- if !reflect.DeepEqual(reply, expected) {
-- return pretty.Errorf("retrieved wrong data: %# v != %# v", reply, expected)
-- }
-- return nil
--}
+-var initializers []func()
-
--func cadvisorTestClient(path string, expectedPostObj, expectedPostObjEmpty, replyObj interface{}, t *testing.T) (*Client, *httptest.Server, error) {
-- ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-- if r.URL.Path == path {
-- if expectedPostObj != nil {
-- decoder := json.NewDecoder(r.Body)
-- if err := decoder.Decode(expectedPostObjEmpty); err != nil {
-- t.Errorf("Received invalid object: %v", err)
-- }
-- if !reflect.DeepEqual(expectedPostObj, expectedPostObjEmpty) {
-- t.Errorf("Received unexpected object: %+v", expectedPostObjEmpty)
-- }
-- }
-- encoder := json.NewEncoder(w)
-- encoder.Encode(replyObj)
-- } else if r.URL.Path == "/api/v1.1/machine" {
-- fmt.Fprint(w, `{"num_cores":8,"memory_capacity":31625871360}`)
-- } else {
-- w.WriteHeader(http.StatusNotFound)
-- fmt.Fprintf(w, "Page not found.")
-- }
-- }))
-- client, err := NewClient(ts.URL)
-- if err != nil {
-- ts.Close()
-- return nil, nil, err
-- }
-- return client, ts, err
--}
+-// automatic prefix matching can be a dangerous thing to automatically enable in CLI tools.
+-// Set this to true to enable it
+-var EnablePrefixMatching bool = false
-
--// TestGetMachineInfo performs one test to check if MachineInfo()
--// in a cAdvisor client returns the correct result.
--func TestGetMachineinfo(t *testing.T) {
-- minfo := &info.MachineInfo{
-- NumCores: 8,
-- MemoryCapacity: 31625871360,
-- }
-- client, server, err := cadvisorTestClient("/api/v1.1/machine", nil, nil, minfo, t)
-- if err != nil {
-- t.Fatalf("unable to get a client %v", err)
-- }
-- defer server.Close()
-- returned, err := client.MachineInfo()
-- if err != nil {
-- t.Fatal(err)
-- }
-- if !reflect.DeepEqual(returned, minfo) {
-- t.Fatalf("received unexpected machine info")
+-func OnInitialize(y ...func()) {
+- for _, x := range y {
+- initializers = append(initializers, x)
- }
-}
-
--// TestGetContainerInfo generates a random container information object
--// and then checks that ContainerInfo returns the expected result.
--func TestGetContainerInfo(t *testing.T) {
-- query := &info.ContainerInfoRequest{
-- NumStats: 3,
-- }
-- containerName := "/some/container"
-- cinfo := itest.GenerateRandomContainerInfo(containerName, 4, query, 1*time.Second)
-- client, server, err := cadvisorTestClient(fmt.Sprintf("/api/v1.1/containers%v", containerName), query, &info.ContainerInfoRequest{}, cinfo, t)
-- if err != nil {
-- t.Fatalf("unable to get a client %v", err)
-- }
-- defer server.Close()
-- returned, err := client.ContainerInfo(containerName, query)
-- if err != nil {
-- t.Fatal(err)
-- }
+-func Gt(a interface{}, b interface{}) bool {
+- var left, right int64
+- av := reflect.ValueOf(a)
-
-- if !returned.Eq(cinfo) {
-- t.Error("received unexpected ContainerInfo")
+- switch av.Kind() {
+- case reflect.Array, reflect.Chan, reflect.Map, reflect.Slice:
+- left = int64(av.Len())
+- case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+- left = av.Int()
+- case reflect.String:
+- left, _ = strconv.ParseInt(av.String(), 10, 64)
- }
--}
-
--func TestGetSubcontainersInfo(t *testing.T) {
-- query := &info.ContainerInfoRequest{
-- NumStats: 3,
-- }
-- containerName := "/some/container"
-- cinfo := itest.GenerateRandomContainerInfo(containerName, 4, query, 1*time.Second)
-- cinfo1 := itest.GenerateRandomContainerInfo(path.Join(containerName, "sub1"), 4, query, 1*time.Second)
-- cinfo2 := itest.GenerateRandomContainerInfo(path.Join(containerName, "sub2"), 4, query, 1*time.Second)
-- response := []info.ContainerInfo{
-- *cinfo,
-- *cinfo1,
-- *cinfo2,
-- }
-- client, server, err := cadvisorTestClient(fmt.Sprintf("/api/v1.1/subcontainers%v", containerName), query, &info.ContainerInfoRequest{}, response, t)
-- if err != nil {
-- t.Fatalf("unable to get a client %v", err)
-- }
-- defer server.Close()
-- returned, err := client.SubcontainersInfo(containerName, query)
-- if err != nil {
-- t.Fatal(err)
-- }
+- bv := reflect.ValueOf(b)
-
-- if len(returned) != 3 {
-- t.Errorf("unexpected number of results: got %d, expected 3", len(returned))
-- }
-- if !returned[0].Eq(cinfo) {
-- t.Error("received unexpected ContainerInfo")
-- }
-- if !returned[1].Eq(cinfo1) {
-- t.Error("received unexpected ContainerInfo")
-- }
-- if !returned[2].Eq(cinfo2) {
-- t.Error("received unexpected ContainerInfo")
+- switch bv.Kind() {
+- case reflect.Array, reflect.Chan, reflect.Map, reflect.Slice:
+- right = int64(bv.Len())
+- case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+- right = bv.Int()
+- case reflect.String:
+- right, _ = strconv.ParseInt(bv.String(), 10, 64)
- }
--}
-diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/info/advice.go b/Godeps/_workspace/src/github.com/google/cadvisor/info/advice.go
-deleted file mode 100644
-index 8084cf4..0000000
---- a/Godeps/_workspace/src/github.com/google/cadvisor/info/advice.go
-+++ /dev/null
-@@ -1,34 +0,0 @@
--// Copyright 2014 Google Inc. All Rights Reserved.
--//
--// Licensed under the Apache License, Version 2.0 (the "License");
--// you may not use this file except in compliance with the License.
--// You may obtain a copy of the License at
--//
--// http://www.apache.org/licenses/LICENSE-2.0
--//
--// Unless required by applicable law or agreed to in writing, software
--// distributed under the License is distributed on an "AS IS" BASIS,
--// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--// See the License for the specific language governing permissions and
--// limitations under the License.
-
--package info
+- return left > right
+-}
-
--// This struct describes one type of relationship between containers: One
--// container, antagonist, interferes the performance of other
--// containers, victims.
--type Interference struct {
-- // Absolute name of the antagonist container name. This field
-- // should not be empty.
-- Antagonist string `json:"antagonist"`
+-func Eq(a interface{}, b interface{}) bool {
+- av := reflect.ValueOf(a)
+- bv := reflect.ValueOf(b)
-
-- // The absolute path of the victims. This field should not be empty.
-- Victims []string `json:"victims"`
+- switch av.Kind() {
+- case reflect.Array, reflect.Chan, reflect.Map, reflect.Slice:
+- panic("Eq called on unsupported type")
+- case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+- return av.Int() == bv.Int()
+- case reflect.String:
+- return av.String() == bv.String()
+- }
+- return false
+-}
-
-- // The name of the detector used to detect this antagonism. This field
-- // should not be empty
-- Detector string `json:"detector"`
+-func rpad(s string, padding int) string {
+- template := fmt.Sprintf("%%-%ds", padding)
+- return fmt.Sprintf(template, s)
+-}
-
-- // Human readable description of this interference
-- Description string `json:"description,omitempty"`
+-// tmpl executes the given template text on data, writing the result to w.
+-func tmpl(w io.Writer, text string, data interface{}) error {
+- t := template.New("top")
+- t.Funcs(template.FuncMap{
+- "trim": strings.TrimSpace,
+- "rpad": rpad,
+- "gt": Gt,
+- "eq": Eq,
+- })
+- template.Must(t.Parse(text))
+- return t.Execute(w, data)
-}
-diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/info/container.go b/Godeps/_workspace/src/github.com/google/cadvisor/info/container.go
+diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/cobra_test.go b/Godeps/_workspace/src/github.com/spf13/cobra/cobra_test.go
deleted file mode 100644
-index 5eaacb5..0000000
---- a/Godeps/_workspace/src/github.com/google/cadvisor/info/container.go
+index 05d18d0..0000000
+--- a/Godeps/_workspace/src/github.com/spf13/cobra/cobra_test.go
+++ /dev/null
-@@ -1,346 +0,0 @@
--// Copyright 2014 Google Inc. All Rights Reserved.
--//
--// Licensed under the Apache License, Version 2.0 (the "License");
--// you may not use this file except in compliance with the License.
--// You may obtain a copy of the License at
--//
--// http://www.apache.org/licenses/LICENSE-2.0
--//
--// Unless required by applicable law or agreed to in writing, software
--// distributed under the License is distributed on an "AS IS" BASIS,
--// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--// See the License for the specific language governing permissions and
--// limitations under the License.
--
--package info
+@@ -1,507 +0,0 @@
+-package cobra
-
-import (
-- "reflect"
-- "time"
+- "bytes"
+- "fmt"
+- "strings"
+- "testing"
-)
-
--type CpuSpec struct {
-- Limit uint64 `json:"limit"`
-- MaxLimit uint64 `json:"max_limit"`
-- Mask string `json:"mask,omitempty"`
--}
--
--type MemorySpec struct {
-- // The amount of memory requested. Default is unlimited (-1).
-- // Units: bytes.
-- Limit uint64 `json:"limit,omitempty"`
--
-- // The amount of guaranteed memory. Default is 0.
-- // Units: bytes.
-- Reservation uint64 `json:"reservation,omitempty"`
--
-- // The amount of swap space requested. Default is unlimited (-1).
-- // Units: bytes.
-- SwapLimit uint64 `json:"swap_limit,omitempty"`
--}
--
--type ContainerSpec struct {
-- HasCpu bool `json:"has_cpu"`
-- Cpu CpuSpec `json:"cpu,omitempty"`
--
-- HasMemory bool `json:"has_memory"`
-- Memory MemorySpec `json:"memory,omitempty"`
+-var _ = fmt.Println
-
-- HasNetwork bool `json:"has_network"`
+-var tp, te, tt, t1 []string
+-var flagb1, flagb2, flagb3, flagbr bool
+-var flags1, flags2, flags3 string
+-var flagi1, flagi2, flagi3, flagir int
+-var globalFlag1 bool
+-var flagEcho, rootcalled bool
-
-- HasFilesystem bool `json:"has_filesystem"`
+-var cmdPrint = &Command{
+- Use: "print [string to print]",
+- Short: "Print anything to the screen",
+- Long: `an utterly useless command for testing.`,
+- Run: func(cmd *Command, args []string) {
+- tp = args
+- },
-}
-
--// Container reference contains enough information to uniquely identify a container
--type ContainerReference struct {
-- // The absolute name of the container.
-- Name string `json:"name"`
--
-- Aliases []string `json:"aliases,omitempty"`
+-var cmdEcho = &Command{
+- Use: "echo [string to echo]",
+- Aliases: []string{"say"},
+- Short: "Echo anything to the screen",
+- Long: `an utterly useless command for testing.`,
+- Run: func(cmd *Command, args []string) {
+- te = args
+- },
-}
-
--// ContainerInfoQuery is used when users check a container info from the REST api.
--// It specifies how much data users want to get about a container
--type ContainerInfoRequest struct {
-- // Max number of stats to return.
-- NumStats int `json:"num_stats,omitempty"`
+-var cmdTimes = &Command{
+- Use: "times [# times] [string to echo]",
+- Short: "Echo anything to the screen more times",
+- Long: `an slightly useless command for testing.`,
+- Run: func(cmd *Command, args []string) {
+- tt = args
+- },
-}
-
--type ContainerInfo struct {
-- ContainerReference
--
-- // The direct subcontainers of the current container.
-- Subcontainers []ContainerReference `json:"subcontainers,omitempty"`
--
-- // The isolation used in the container.
-- Spec ContainerSpec `json:"spec,omitempty"`
--
-- // Historical statistics gathered from the container.
-- Stats []*ContainerStats `json:"stats,omitempty"`
+-var cmdRootNoRun = &Command{
+- Use: "cobra-test",
+- Short: "The root can run it's own function",
+- Long: "The root description for help",
-}
-
--// ContainerInfo may be (un)marshaled by json or other en/decoder. In that
--// case, the Timestamp field in each stats/sample may not be precisely
--// en/decoded. This will lead to small but acceptable differences between a
--// ContainerInfo and its encode-then-decode version. Eq() is used to compare
--// two ContainerInfo accepting small difference (<10ms) of Time fields.
--func (self *ContainerInfo) Eq(b *ContainerInfo) bool {
--
-- // If both self and b are nil, then Eq() returns true
-- if self == nil {
-- return b == nil
-- }
-- if b == nil {
-- return self == nil
-- }
--
-- // For fields other than time.Time, we will compare them precisely.
-- // This would require that any slice should have same order.
-- if !reflect.DeepEqual(self.ContainerReference, b.ContainerReference) {
-- return false
-- }
-- if !reflect.DeepEqual(self.Subcontainers, b.Subcontainers) {
-- return false
-- }
-- if !reflect.DeepEqual(self.Spec, b.Spec) {
-- return false
-- }
--
-- for i, expectedStats := range b.Stats {
-- selfStats := self.Stats[i]
-- if !expectedStats.Eq(selfStats) {
-- return false
-- }
-- }
--
-- return true
+-var cmdRootSameName = &Command{
+- Use: "print",
+- Short: "Root with the same name as a subcommand",
+- Long: "The root description for help",
-}
-
--func (self *ContainerInfo) StatsAfter(ref time.Time) []*ContainerStats {
-- n := len(self.Stats) + 1
-- for i, s := range self.Stats {
-- if s.Timestamp.After(ref) {
-- n = i
-- break
-- }
-- }
-- if n > len(self.Stats) {
-- return nil
-- }
-- return self.Stats[n:]
+-var cmdRootWithRun = &Command{
+- Use: "cobra-test",
+- Short: "The root can run it's own function",
+- Long: "The root description for help",
+- Run: func(cmd *Command, args []string) {
+- rootcalled = true
+- },
-}
-
--func (self *ContainerInfo) StatsStartTime() time.Time {
-- var ret time.Time
-- for _, s := range self.Stats {
-- if s.Timestamp.Before(ret) || ret.IsZero() {
-- ret = s.Timestamp
-- }
-- }
-- return ret
+-func flagInit() {
+- cmdEcho.ResetFlags()
+- cmdPrint.ResetFlags()
+- cmdTimes.ResetFlags()
+- cmdRootNoRun.ResetFlags()
+- cmdRootSameName.ResetFlags()
+- cmdRootWithRun.ResetFlags()
+- cmdEcho.Flags().IntVarP(&flagi1, "intone", "i", 123, "help message for flag intone")
+- cmdTimes.Flags().IntVarP(&flagi2, "inttwo", "j", 234, "help message for flag inttwo")
+- cmdPrint.Flags().IntVarP(&flagi3, "intthree", "i", 345, "help message for flag intthree")
+- cmdEcho.PersistentFlags().StringVarP(&flags1, "strone", "s", "one", "help message for flag strone")
+- cmdTimes.PersistentFlags().StringVarP(&flags2, "strtwo", "t", "two", "help message for flag strtwo")
+- cmdPrint.PersistentFlags().StringVarP(&flags3, "strthree", "s", "three", "help message for flag strthree")
+- cmdEcho.Flags().BoolVarP(&flagb1, "boolone", "b", true, "help message for flag boolone")
+- cmdTimes.Flags().BoolVarP(&flagb2, "booltwo", "c", false, "help message for flag booltwo")
+- cmdPrint.Flags().BoolVarP(&flagb3, "boolthree", "b", true, "help message for flag boolthree")
-}
-
--func (self *ContainerInfo) StatsEndTime() time.Time {
-- var ret time.Time
-- for i := len(self.Stats) - 1; i >= 0; i-- {
-- s := self.Stats[i]
-- if s.Timestamp.After(ret) {
-- ret = s.Timestamp
-- }
-- }
-- return ret
+-func commandInit() {
+- cmdEcho.ResetCommands()
+- cmdPrint.ResetCommands()
+- cmdTimes.ResetCommands()
+- cmdRootNoRun.ResetCommands()
+- cmdRootSameName.ResetCommands()
+- cmdRootWithRun.ResetCommands()
-}
-
--// All CPU usage metrics are cumulative from the creation of the container
--type CpuStats struct {
-- Usage struct {
-- // Total CPU usage.
-- // Units: nanoseconds
-- Total uint64 `json:"total"`
--
-- // Per CPU/core usage of the container.
-- // Unit: nanoseconds.
-- PerCpu []uint64 `json:"per_cpu_usage,omitempty"`
--
-- // Time spent in user space.
-- // Unit: nanoseconds
-- User uint64 `json:"user"`
--
-- // Time spent in kernel space.
-- // Unit: nanoseconds
-- System uint64 `json:"system"`
-- } `json:"usage"`
-- Load int32 `json:"load"`
+-func initialize() *Command {
+- tt, tp, te = nil, nil, nil
+- var c = cmdRootNoRun
+- flagInit()
+- commandInit()
+- return c
-}
-
--type PerDiskStats struct {
-- Major uint64 `json:"major"`
-- Minor uint64 `json:"minor"`
-- Stats map[string]uint64 `json:"stats"`
+-func initializeWithSameName() *Command {
+- tt, tp, te = nil, nil, nil
+- var c = cmdRootSameName
+- flagInit()
+- commandInit()
+- return c
-}
-
--type DiskIoStats struct {
-- IoServiceBytes []PerDiskStats `json:"io_service_bytes,omitempty"`
-- IoServiced []PerDiskStats `json:"io_serviced,omitempty"`
-- IoQueued []PerDiskStats `json:"io_queued,omitempty"`
-- Sectors []PerDiskStats `json:"sectors,omitempty"`
+-func initializeWithRootCmd() *Command {
+- cmdRootWithRun.ResetCommands()
+- tt, tp, te, rootcalled = nil, nil, nil, false
+- flagInit()
+- cmdRootWithRun.Flags().BoolVarP(&flagbr, "boolroot", "b", false, "help message for flag boolroot")
+- cmdRootWithRun.Flags().IntVarP(&flagir, "introot", "i", 321, "help message for flag introot")
+- commandInit()
+- return cmdRootWithRun
-}
-
--type MemoryStats struct {
-- // Memory limit, equivalent to "limit" in MemorySpec.
-- // Units: Bytes.
-- Limit uint64 `json:"limit,omitempty"`
+-type resulter struct {
+- Error error
+- Output string
+- Command *Command
+-}
-
-- // Usage statistics.
+-func fullSetupTest(input string) resulter {
+- c := initializeWithRootCmd()
-
-- // Current memory usage, this includes all memory regardless of when it was
-- // accessed.
-- // Units: Bytes.
-- Usage uint64 `json:"usage,omitempty"`
+- return fullTester(c, input)
+-}
-
-- // The amount of working set memory, this includes recently accessed memory,
-- // dirty memory, and kernel memory. Working set is <= "usage".
-- // Units: Bytes.
-- WorkingSet uint64 `json:"working_set,omitempty"`
+-func noRRSetupTest(input string) resulter {
+- c := initialize()
-
-- ContainerData MemoryStatsMemoryData `json:"container_data,omitempty"`
-- HierarchicalData MemoryStatsMemoryData `json:"hierarchical_data,omitempty"`
+- return fullTester(c, input)
-}
-
--type MemoryStatsMemoryData struct {
-- Pgfault uint64 `json:"pgfault,omitempty"`
-- Pgmajfault uint64 `json:"pgmajfault,omitempty"`
--}
+-func fullTester(c *Command, input string) resulter {
+- buf := new(bytes.Buffer)
+- // Testing flag with invalid input
+- c.SetOutput(buf)
+- cmdEcho.AddCommand(cmdTimes)
+- c.AddCommand(cmdPrint, cmdEcho)
+- c.SetArgs(strings.Split(input, " "))
-
--type NetworkStats struct {
-- // Cumulative count of bytes received.
-- RxBytes uint64 `json:"rx_bytes"`
-- // Cumulative count of packets received.
-- RxPackets uint64 `json:"rx_packets"`
-- // Cumulative count of receive errors encountered.
-- RxErrors uint64 `json:"rx_errors"`
-- // Cumulative count of packets dropped while receiving.
-- RxDropped uint64 `json:"rx_dropped"`
-- // Cumulative count of bytes transmitted.
-- TxBytes uint64 `json:"tx_bytes"`
-- // Cumulative count of packets transmitted.
-- TxPackets uint64 `json:"tx_packets"`
-- // Cumulative count of transmit errors encountered.
-- TxErrors uint64 `json:"tx_errors"`
-- // Cumulative count of packets dropped while transmitting.
-- TxDropped uint64 `json:"tx_dropped"`
+- err := c.Execute()
+- output := buf.String()
+-
+- return resulter{err, output, c}
-}
-
--type FsStats struct {
-- // The block device name associated with the filesystem.
-- Device string `json:"device,omitempty"`
+-func checkResultContains(t *testing.T, x resulter, check string) {
+- if !strings.Contains(x.Output, check) {
+- t.Errorf("Unexpected response.\nExpecting to contain: \n %q\nGot:\n %q\n", check, x.Output)
+- }
+-}
-
-- // Number of bytes that can be consumed by the container on this filesystem.
-- Limit uint64 `json:"capacity"`
+-func checkOutputContains(t *testing.T, c *Command, check string) {
+- buf := new(bytes.Buffer)
+- c.SetOutput(buf)
+- c.Execute()
-
-- // Number of bytes that is consumed by the container on this filesystem.
-- Usage uint64 `json:"usage"`
+- if !strings.Contains(buf.String(), check) {
+- t.Errorf("Unexpected response.\nExpecting to contain: \n %q\nGot:\n %q\n", check, buf.String())
+- }
-}
-
--type ContainerStats struct {
-- // The time of this stat point.
-- Timestamp time.Time `json:"timestamp"`
-- Cpu *CpuStats `json:"cpu,omitempty"`
-- DiskIo DiskIoStats `json:"diskio,omitempty"`
-- Memory *MemoryStats `json:"memory,omitempty"`
-- Network *NetworkStats `json:"network,omitempty"`
-- // Filesystem statistics
-- Filesystem []FsStats `json:"filesystem,omitempty"`
--}
+-func TestSingleCommand(t *testing.T) {
+- noRRSetupTest("print one two")
-
--// Makes a deep copy of the ContainerStats and returns a pointer to the new
--// copy. Copy() will allocate a new ContainerStats object if dst is nil.
--func (self *ContainerStats) Copy(dst *ContainerStats) *ContainerStats {
-- if dst == nil {
-- dst = new(ContainerStats)
+- if te != nil || tt != nil {
+- t.Error("Wrong command called")
- }
-- dst.Timestamp = self.Timestamp
-- if self.Cpu != nil {
-- if dst.Cpu == nil {
-- dst.Cpu = new(CpuStats)
-- }
-- // To make a deep copy of a slice, we need to copy every value
-- // in the slice. To make less memory allocation, we would like
-- // to reuse the slice in dst if possible.
-- percpu := dst.Cpu.Usage.PerCpu
-- if len(percpu) != len(self.Cpu.Usage.PerCpu) {
-- percpu = make([]uint64, len(self.Cpu.Usage.PerCpu))
-- }
-- dst.Cpu.Usage = self.Cpu.Usage
-- dst.Cpu.Load = self.Cpu.Load
-- copy(percpu, self.Cpu.Usage.PerCpu)
-- dst.Cpu.Usage.PerCpu = percpu
-- } else {
-- dst.Cpu = nil
+- if tp == nil {
+- t.Error("Wrong command called")
- }
-- if self.Memory != nil {
-- if dst.Memory == nil {
-- dst.Memory = new(MemoryStats)
-- }
-- *dst.Memory = *self.Memory
-- } else {
-- dst.Memory = nil
+- if strings.Join(tp, " ") != "one two" {
+- t.Error("Command didn't parse correctly")
- }
-- return dst
-}
-
--func timeEq(t1, t2 time.Time, tolerance time.Duration) bool {
-- // t1 should not be later than t2
-- if t1.After(t2) {
-- t1, t2 = t2, t1
+-func TestChildCommand(t *testing.T) {
+- noRRSetupTest("echo times one two")
+-
+- if te != nil || tp != nil {
+- t.Error("Wrong command called")
- }
-- diff := t2.Sub(t1)
-- if diff <= tolerance {
-- return true
+- if tt == nil {
+- t.Error("Wrong command called")
+- }
+- if strings.Join(tt, " ") != "one two" {
+- t.Error("Command didn't parse correctly")
- }
-- return false
-}
-
--func durationEq(a, b time.Duration, tolerance time.Duration) bool {
-- if a > b {
-- a, b = b, a
+-func TestCommandAlias(t *testing.T) {
+- noRRSetupTest("say times one two")
+-
+- if te != nil || tp != nil {
+- t.Error("Wrong command called")
- }
-- diff := a - b
-- if diff <= tolerance {
-- return true
+- if tt == nil {
+- t.Error("Wrong command called")
+- }
+- if strings.Join(tt, " ") != "one two" {
+- t.Error("Command didn't parse correctly")
- }
-- return false
-}
-
--const (
-- // 10ms, i.e. 0.01s
-- timePrecision time.Duration = 10 * time.Millisecond
--)
+-func TestPrefixMatching(t *testing.T) {
+- EnablePrefixMatching = true
+- noRRSetupTest("ech times one two")
-
--// This function is useful because we do not require precise time
--// representation.
--func (a *ContainerStats) Eq(b *ContainerStats) bool {
-- if !timeEq(a.Timestamp, b.Timestamp, timePrecision) {
-- return false
+- if te != nil || tp != nil {
+- t.Error("Wrong command called")
- }
-- return a.StatsEq(b)
--}
--
--// Checks equality of the stats values.
--func (a *ContainerStats) StatsEq(b *ContainerStats) bool {
-- if !reflect.DeepEqual(a.Cpu, b.Cpu) {
-- return false
+- if tt == nil {
+- t.Error("Wrong command called")
- }
-- if !reflect.DeepEqual(a.Memory, b.Memory) {
-- return false
+- if strings.Join(tt, " ") != "one two" {
+- t.Error("Command didn't parse correctly")
- }
-- return true
+-
+- EnablePrefixMatching = false
-}
-
--// Saturate CPU usage to 0.
--func calculateCpuUsage(prev, cur uint64) uint64 {
-- if prev > cur {
-- return 0
+-func TestNoPrefixMatching(t *testing.T) {
+- EnablePrefixMatching = false
+-
+- noRRSetupTest("ech times one two")
+-
+- if !(tt == nil && te == nil && tp == nil) {
+- t.Error("Wrong command called")
- }
-- return cur - prev
-}
-diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/info/container_test.go b/Godeps/_workspace/src/github.com/google/cadvisor/info/container_test.go
-deleted file mode 100644
-index bd730c1..0000000
---- a/Godeps/_workspace/src/github.com/google/cadvisor/info/container_test.go
-+++ /dev/null
-@@ -1,101 +0,0 @@
--// Copyright 2014 Google Inc. All Rights Reserved.
--//
--// Licensed under the Apache License, Version 2.0 (the "License");
--// you may not use this file except in compliance with the License.
--// You may obtain a copy of the License at
--//
--// http://www.apache.org/licenses/LICENSE-2.0
--//
--// Unless required by applicable law or agreed to in writing, software
--// distributed under the License is distributed on an "AS IS" BASIS,
--// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--// See the License for the specific language governing permissions and
--// limitations under the License.
-
--package info
--
--import (
-- "reflect"
-- "testing"
-- "time"
--)
+-func TestAliasPrefixMatching(t *testing.T) {
+- EnablePrefixMatching = true
+- noRRSetupTest("sa times one two")
-
--func TestStatsStartTime(t *testing.T) {
-- N := 10
-- stats := make([]*ContainerStats, 0, N)
-- ct := time.Now()
-- for i := 0; i < N; i++ {
-- s := &ContainerStats{
-- Timestamp: ct.Add(time.Duration(i) * time.Second),
-- }
-- stats = append(stats, s)
+- if te != nil || tp != nil {
+- t.Error("Wrong command called")
- }
-- cinfo := &ContainerInfo{
-- ContainerReference: ContainerReference{
-- Name: "/some/container",
-- },
-- Stats: stats,
+- if tt == nil {
+- t.Error("Wrong command called")
- }
-- ref := ct.Add(time.Duration(N-1) * time.Second)
-- end := cinfo.StatsEndTime()
--
-- if !ref.Equal(end) {
-- t.Errorf("end time is %v; should be %v", end, ref)
+- if strings.Join(tt, " ") != "one two" {
+- t.Error("Command didn't parse correctly")
- }
+- EnablePrefixMatching = false
-}
-
--func TestStatsEndTime(t *testing.T) {
-- N := 10
-- stats := make([]*ContainerStats, 0, N)
-- ct := time.Now()
-- for i := 0; i < N; i++ {
-- s := &ContainerStats{
-- Timestamp: ct.Add(time.Duration(i) * time.Second),
-- }
-- stats = append(stats, s)
+-func TestChildSameName(t *testing.T) {
+- c := initializeWithSameName()
+- c.AddCommand(cmdPrint, cmdEcho)
+- c.SetArgs(strings.Split("print one two", " "))
+- c.Execute()
+-
+- if te != nil || tt != nil {
+- t.Error("Wrong command called")
- }
-- cinfo := &ContainerInfo{
-- ContainerReference: ContainerReference{
-- Name: "/some/container",
-- },
-- Stats: stats,
+- if tp == nil {
+- t.Error("Wrong command called")
- }
-- ref := ct
-- start := cinfo.StatsStartTime()
--
-- if !ref.Equal(start) {
-- t.Errorf("start time is %v; should be %v", start, ref)
+- if strings.Join(tp, " ") != "one two" {
+- t.Error("Command didn't parse correctly")
- }
-}
-
--func createStats(cpuUsage, memUsage uint64, timestamp time.Time) *ContainerStats {
-- stats := &ContainerStats{
-- Cpu: &CpuStats{},
-- Memory: &MemoryStats{},
+-func TestFlagLong(t *testing.T) {
+- noRRSetupTest("echo --intone=13 something here")
+-
+- if strings.Join(te, " ") != "something here" {
+- t.Errorf("flags didn't leave proper args remaining..%s given", te)
+- }
+- if flagi1 != 13 {
+- t.Errorf("int flag didn't get correct value, had %d", flagi1)
+- }
+- if flagi2 != 234 {
+- t.Errorf("default flag value changed, 234 expected, %d given", flagi2)
- }
-- stats.Cpu.Usage.PerCpu = []uint64{cpuUsage}
-- stats.Cpu.Usage.Total = cpuUsage
-- stats.Cpu.Usage.System = 0
-- stats.Cpu.Usage.User = cpuUsage
-- stats.Memory.Usage = memUsage
-- stats.Timestamp = timestamp
-- return stats
-}
-
--func TestContainerStatsCopy(t *testing.T) {
-- stats := createStats(100, 101, time.Now())
-- shadowStats := stats.Copy(nil)
-- if !reflect.DeepEqual(stats, shadowStats) {
-- t.Errorf("Copy() returned different object")
+-func TestFlagShort(t *testing.T) {
+- noRRSetupTest("echo -i13 something here")
+-
+- if strings.Join(te, " ") != "something here" {
+- t.Errorf("flags didn't leave proper args remaining..%s given", te)
- }
-- stats.Cpu.Usage.PerCpu[0] = shadowStats.Cpu.Usage.PerCpu[0] + 1
-- stats.Cpu.Load = shadowStats.Cpu.Load + 1
-- stats.Memory.Usage = shadowStats.Memory.Usage + 1
-- if reflect.DeepEqual(stats, shadowStats) {
-- t.Errorf("Copy() did not deeply copy the object")
+- if flagi1 != 13 {
+- t.Errorf("int flag didn't get correct value, had %d", flagi1)
- }
-- stats = shadowStats.Copy(stats)
-- if !reflect.DeepEqual(stats, shadowStats) {
-- t.Errorf("Copy() returned different object")
+- if flagi2 != 234 {
+- t.Errorf("default flag value changed, 234 expected, %d given", flagi2)
- }
--}
-diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/info/machine.go b/Godeps/_workspace/src/github.com/google/cadvisor/info/machine.go
-deleted file mode 100644
-index 0e73a8e..0000000
---- a/Godeps/_workspace/src/github.com/google/cadvisor/info/machine.go
-+++ /dev/null
-@@ -1,53 +0,0 @@
--// Copyright 2014 Google Inc. All Rights Reserved.
--//
--// Licensed under the Apache License, Version 2.0 (the "License");
--// you may not use this file except in compliance with the License.
--// You may obtain a copy of the License at
--//
--// http://www.apache.org/licenses/LICENSE-2.0
--//
--// Unless required by applicable law or agreed to in writing, software
--// distributed under the License is distributed on an "AS IS" BASIS,
--// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--// See the License for the specific language governing permissions and
--// limitations under the License.
-
--package info
+- noRRSetupTest("echo -i 13 something here")
-
--type FsInfo struct {
-- // Block device associated with the filesystem.
-- Device string `json:"device"`
+- if strings.Join(te, " ") != "something here" {
+- t.Errorf("flags didn't leave proper args remaining..%s given", te)
+- }
+- if flagi1 != 13 {
+- t.Errorf("int flag didn't get correct value, had %d", flagi1)
+- }
+- if flagi2 != 234 {
+- t.Errorf("default flag value changed, 234 expected, %d given", flagi2)
+- }
-
-- // Total number of bytes available on the filesystem.
-- Capacity uint64 `json:"capacity"`
+- noRRSetupTest("print -i99 one two")
+-
+- if strings.Join(tp, " ") != "one two" {
+- t.Errorf("flags didn't leave proper args remaining..%s given", tp)
+- }
+- if flagi3 != 99 {
+- t.Errorf("int flag didn't get correct value, had %d", flagi3)
+- }
+- if flagi1 != 123 {
+- t.Errorf("default flag value changed on different command with same shortname, 234 expected, %d given", flagi2)
+- }
-}
-
--type MachineInfo struct {
-- // The number of cores in this machine.
-- NumCores int `json:"num_cores"`
+-func TestChildCommandFlags(t *testing.T) {
+- noRRSetupTest("echo times -j 99 one two")
-
-- // The amount of memory (in bytes) in this machine
-- MemoryCapacity int64 `json:"memory_capacity"`
+- if strings.Join(tt, " ") != "one two" {
+- t.Errorf("flags didn't leave proper args remaining..%s given", tt)
+- }
-
-- // Filesystems on this machine.
-- Filesystems []FsInfo `json:"filesystems"`
--}
+- // Testing with flag that shouldn't be persistent
+- r := noRRSetupTest("echo times -j 99 -i77 one two")
-
--type VersionInfo struct {
-- // Kernel version.
-- KernelVersion string `json:"kernel_version"`
+- if r.Error == nil {
+- t.Errorf("invalid flag should generate error")
+- }
-
-- // OS image being used for cadvisor container, or host image if running on host directly.
-- ContainerOsVersion string `json:"container_os_version"`
+- if !strings.Contains(r.Output, "unknown shorthand") {
+- t.Errorf("Wrong error message displayed, \n %s", r.Output)
+- }
-
-- // Docker version.
-- DockerVersion string `json:"docker_version"`
+- if flagi2 != 99 {
+- t.Errorf("flag value should be 99, %d given", flagi2)
+- }
-
-- // cAdvisor version.
-- CadvisorVersion string `json:"cadvisor_version"`
--}
+- if flagi1 != 123 {
+- t.Errorf("unset flag should have default value, expecting 123, given %d", flagi1)
+- }
-
--type MachineInfoFactory interface {
-- GetMachineInfo() (*MachineInfo, error)
-- GetVersionInfo() (*VersionInfo, error)
--}
-diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/info/test/datagen.go b/Godeps/_workspace/src/github.com/google/cadvisor/info/test/datagen.go
-deleted file mode 100644
-index bb0b2ff..0000000
---- a/Godeps/_workspace/src/github.com/google/cadvisor/info/test/datagen.go
-+++ /dev/null
-@@ -1,78 +0,0 @@
--// Copyright 2014 Google Inc. All Rights Reserved.
--//
--// Licensed under the Apache License, Version 2.0 (the "License");
--// you may not use this file except in compliance with the License.
--// You may obtain a copy of the License at
--//
--// http://www.apache.org/licenses/LICENSE-2.0
--//
--// Unless required by applicable law or agreed to in writing, software
--// distributed under the License is distributed on an "AS IS" BASIS,
--// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--// See the License for the specific language governing permissions and
--// limitations under the License.
+- // Testing with flag only existing on child
+- r = noRRSetupTest("echo -j 99 -i77 one two")
-
--package test
+- if r.Error == nil {
+- t.Errorf("invalid flag should generate error")
+- }
-
--import (
-- "fmt"
-- "math/rand"
-- "time"
+- if !strings.Contains(r.Output, "intone=123") {
+- t.Errorf("Wrong error message displayed, \n %s", r.Output)
+- }
-
-- "github.com/google/cadvisor/info"
--)
+- // Testing flag with invalid input
+- r = noRRSetupTest("echo -i10E")
-
--func GenerateRandomStats(numStats, numCores int, duration time.Duration) []*info.ContainerStats {
-- ret := make([]*info.ContainerStats, numStats)
-- perCoreUsages := make([]uint64, numCores)
-- currentTime := time.Now()
-- for i := range perCoreUsages {
-- perCoreUsages[i] = uint64(rand.Int63n(1000))
+- if r.Error == nil {
+- t.Errorf("invalid input should generate error")
- }
-- for i := 0; i < numStats; i++ {
-- stats := new(info.ContainerStats)
-- stats.Cpu = new(info.CpuStats)
-- stats.Memory = new(info.MemoryStats)
-- stats.Timestamp = currentTime
-- currentTime = currentTime.Add(duration)
-
-- percore := make([]uint64, numCores)
-- for i := range perCoreUsages {
-- perCoreUsages[i] += uint64(rand.Int63n(1000))
-- percore[i] = perCoreUsages[i]
-- stats.Cpu.Usage.Total += percore[i]
-- }
-- stats.Cpu.Usage.PerCpu = percore
-- stats.Cpu.Usage.User = stats.Cpu.Usage.Total
-- stats.Cpu.Usage.System = 0
-- stats.Memory.Usage = uint64(rand.Int63n(4096))
-- ret[i] = stats
+- if !strings.Contains(r.Output, "invalid argument \"10E\" for -i10E") {
+- t.Errorf("Wrong error message displayed, \n %s", r.Output)
- }
-- return ret
-}
-
--func GenerateRandomContainerSpec(numCores int) info.ContainerSpec {
-- ret := info.ContainerSpec{
-- Cpu: info.CpuSpec{},
-- Memory: info.MemorySpec{},
+-func TestTrailingCommandFlags(t *testing.T) {
+- x := fullSetupTest("echo two -x")
+-
+- if x.Error == nil {
+- t.Errorf("invalid flag should generate error")
- }
-- ret.Cpu.Limit = uint64(1000 + rand.Int63n(2000))
-- ret.Cpu.MaxLimit = uint64(1000 + rand.Int63n(2000))
-- ret.Cpu.Mask = fmt.Sprintf("0-%d", numCores-1)
-- ret.Memory.Limit = uint64(4096 + rand.Int63n(4096))
-- return ret
-}
-
--func GenerateRandomContainerInfo(containerName string, numCores int, query *info.ContainerInfoRequest, duration time.Duration) *info.ContainerInfo {
-- stats := GenerateRandomStats(query.NumStats, numCores, duration)
-- spec := GenerateRandomContainerSpec(numCores)
+-func TestPersistentFlags(t *testing.T) {
+- fullSetupTest("echo -s something more here")
-
-- ret := &info.ContainerInfo{
-- ContainerReference: info.ContainerReference{
-- Name: containerName,
-- },
-- Spec: spec,
-- Stats: stats,
+- // persistentFlag should act like normal flag on it's own command
+- if strings.Join(te, " ") != "more here" {
+- t.Errorf("flags didn't leave proper args remaining..%s given", te)
- }
-- return ret
--}
-diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/info/version.go b/Godeps/_workspace/src/github.com/google/cadvisor/info/version.go
-deleted file mode 100644
-index 8ae9b22..0000000
---- a/Godeps/_workspace/src/github.com/google/cadvisor/info/version.go
-+++ /dev/null
-@@ -1,18 +0,0 @@
--// Copyright 2014 Google Inc. All Rights Reserved.
--//
--// Licensed under the Apache License, Version 2.0 (the "License");
--// you may not use this file except in compliance with the License.
--// You may obtain a copy of the License at
--//
--// http://www.apache.org/licenses/LICENSE-2.0
--//
--// Unless required by applicable law or agreed to in writing, software
--// distributed under the License is distributed on an "AS IS" BASIS,
--// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--// See the License for the specific language governing permissions and
--// limitations under the License.
-
--package info
+- // persistentFlag should act like normal flag on it's own command
+- if flags1 != "something" {
+- t.Errorf("string flag didn't get correct value, had %v", flags1)
+- }
-
--// Version of cAdvisor.
--const VERSION = "0.5.0"
-diff --git a/Godeps/_workspace/src/github.com/google/gofuzz/.travis.yml b/Godeps/_workspace/src/github.com/google/gofuzz/.travis.yml
-deleted file mode 100644
-index 9384a54..0000000
---- a/Godeps/_workspace/src/github.com/google/gofuzz/.travis.yml
-+++ /dev/null
-@@ -1,12 +0,0 @@
--language: go
+- fullSetupTest("echo times -s again -c test here")
-
--go:
-- - 1.3
-- - 1.2
-- - tip
+- if strings.Join(tt, " ") != "test here" {
+- t.Errorf("flags didn't leave proper args remaining..%s given", tt)
+- }
-
--install:
-- - go get code.google.com/p/go.tools/cmd/cover
+- if flags1 != "again" {
+- t.Errorf("string flag didn't get correct value, had %v", flags1)
+- }
-
--script:
-- - go test -cover
-diff --git a/Godeps/_workspace/src/github.com/google/gofuzz/CONTRIBUTING.md b/Godeps/_workspace/src/github.com/google/gofuzz/CONTRIBUTING.md
-deleted file mode 100644
-index 51cf5cd..0000000
---- a/Godeps/_workspace/src/github.com/google/gofuzz/CONTRIBUTING.md
-+++ /dev/null
-@@ -1,67 +0,0 @@
--# How to contribute #
+- if flagb2 != true {
+- t.Errorf("local flag not parsed correctly. Expected false, had %v", flagb2)
+- }
+-}
-
--We'd love to accept your patches and contributions to this project. There are
--a just a few small guidelines you need to follow.
+-func TestHelpCommand(t *testing.T) {
+- c := fullSetupTest("help echo")
+- checkResultContains(t, c, cmdEcho.Long)
-
+- r := fullSetupTest("help echo times")
+- checkResultContains(t, r, cmdTimes.Long)
+-}
-
--## Contributor License Agreement ##
+-func TestRunnableRootCommand(t *testing.T) {
+- fullSetupTest("")
-
--Contributions to any Google project must be accompanied by a Contributor
--License Agreement. This is not a copyright **assignment**, it simply gives
--Google permission to use and redistribute your contributions as part of the
--project.
+- if rootcalled != true {
+- t.Errorf("Root Function was not called")
+- }
+-}
-
-- * If you are an individual writing original source code and you're sure you
-- own the intellectual property, then you'll need to sign an [individual
-- CLA][].
+-func TestRootFlags(t *testing.T) {
+- fullSetupTest("-i 17 -b")
-
-- * If you work for a company that wants to allow you to contribute your work,
-- then you'll need to sign a [corporate CLA][].
+- if flagbr != true {
+- t.Errorf("flag value should be true, %v given", flagbr)
+- }
-
--You generally only need to submit a CLA once, so if you've already submitted
--one (even if it was for a different project), you probably don't need to do it
--again.
+- if flagir != 17 {
+- t.Errorf("flag value should be 17, %d given", flagir)
+- }
+-}
-
--[individual CLA]: https://developers.google.com/open-source/cla/individual
--[corporate CLA]: https://developers.google.com/open-source/cla/corporate
+-func TestRootHelp(t *testing.T) {
+- x := fullSetupTest("--help")
-
+- checkResultContains(t, x, "Available Commands:")
-
--## Submitting a patch ##
+- if strings.Contains(x.Output, "unknown flag: --help") {
+- t.Errorf("--help shouldn't trigger an error, Got: \n %s", x.Output)
+- }
-
-- 1. It's generally best to start by opening a new issue describing the bug or
-- feature you're intending to fix. Even if you think it's relatively minor,
-- it's helpful to know what people are working on. Mention in the initial
-- issue that you are planning to work on that bug or feature so that it can
-- be assigned to you.
+- x = fullSetupTest("echo --help")
-
-- 1. Follow the normal process of [forking][] the project, and setup a new
-- branch to work in. It's important that each group of changes be done in
-- separate branches in order to ensure that a pull request only includes the
-- commits related to that bug or feature.
+- checkResultContains(t, x, "Available Commands:")
-
-- 1. Go makes it very simple to ensure properly formatted code, so always run
-- `go fmt` on your code before committing it. You should also run
-- [golint][] over your code. As noted in the [golint readme][], it's not
-- strictly necessary that your code be completely "lint-free", but this will
-- help you find common style issues.
+- if strings.Contains(x.Output, "unknown flag: --help") {
+- t.Errorf("--help shouldn't trigger an error, Got: \n %s", x.Output)
+- }
-
-- 1. Any significant changes should almost always be accompanied by tests. The
-- project already has good test coverage, so look at some of the existing
-- tests if you're unsure how to go about it. [gocov][] and [gocov-html][]
-- are invaluable tools for seeing which parts of your code aren't being
-- exercised by your tests.
+-}
-
-- 1. Do your best to have [well-formed commit messages][] for each change.
-- This provides consistency throughout the project, and ensures that commit
-- messages are able to be formatted properly by various git tools.
+-func TestFlagsBeforeCommand(t *testing.T) {
+- // short without space
+- x := fullSetupTest("-i10 echo")
+- if x.Error != nil {
+- t.Errorf("Valid Input shouldn't have errors, got:\n %q", x.Error)
+- }
-
-- 1. Finally, push the commits to your fork and submit a [pull request][].
+- // short (int) with equals
+- // It appears that pflags doesn't support this...
+- // Commenting out until support can be added
-
--[forking]: https://help.github.com/articles/fork-a-repo
--[golint]: https://github.com/golang/lint
--[golint readme]: https://github.com/golang/lint/blob/master/README
--[gocov]: https://github.com/axw/gocov
--[gocov-html]: https://github.com/matm/gocov-html
--[well-formed commit messages]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
--[squash]: http://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits
--[pull request]: https://help.github.com/articles/creating-a-pull-request
-diff --git a/Godeps/_workspace/src/github.com/google/gofuzz/LICENSE b/Godeps/_workspace/src/github.com/google/gofuzz/LICENSE
-deleted file mode 100644
-index d645695..0000000
---- a/Godeps/_workspace/src/github.com/google/gofuzz/LICENSE
-+++ /dev/null
-@@ -1,202 +0,0 @@
+- //x = noRRSetupTest("echo -i=10")
+- //if x.Error != nil {
+- //t.Errorf("Valid Input shouldn't have errors, got:\n %s", x.Error)
+- //}
-
-- Apache License
-- Version 2.0, January 2004
-- http://www.apache.org/licenses/
+- // long with equals
+- x = noRRSetupTest("--intone=123 echo one two")
+- if x.Error != nil {
+- t.Errorf("Valid Input shouldn't have errors, got:\n %s", x.Error)
+- }
-
-- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+- // With parsing error properly reported
+- x = fullSetupTest("-i10E echo")
+- if !strings.Contains(x.Output, "invalid argument \"10E\" for -i10E") {
+- t.Errorf("Wrong error message displayed, \n %s", x.Output)
+- }
-
-- 1. Definitions.
+- //With quotes
+- x = fullSetupTest("-s=\"walking\" echo")
+- if x.Error != nil {
+- t.Errorf("Valid Input shouldn't have errors, got:\n %q", x.Error)
+- }
-
-- "License" shall mean the terms and conditions for use, reproduction,
-- and distribution as defined by Sections 1 through 9 of this document.
+- //With quotes and space
+- x = fullSetupTest("-s=\"walking fast\" echo")
+- if x.Error != nil {
+- t.Errorf("Valid Input shouldn't have errors, got:\n %q", x.Error)
+- }
-
-- "Licensor" shall mean the copyright owner or entity authorized by
-- the copyright owner that is granting the License.
+- //With inner quote
+- x = fullSetupTest("-s=\"walking \\\"Inner Quote\\\" fast\" echo")
+- if x.Error != nil {
+- t.Errorf("Valid Input shouldn't have errors, got:\n %q", x.Error)
+- }
-
-- "Legal Entity" shall mean the union of the acting entity and all
-- other entities that control, are controlled by, or are under common
-- control with that entity. For the purposes of this definition,
-- "control" means (i) the power, direct or indirect, to cause the
-- direction or management of such entity, whether by contract or
-- otherwise, or (ii) ownership of fifty percent (50%) or more of the
-- outstanding shares, or (iii) beneficial ownership of such entity.
+- //With quotes and space
+- x = fullSetupTest("-s=\"walking \\\"Inner Quote\\\" fast\" echo")
+- if x.Error != nil {
+- t.Errorf("Valid Input shouldn't have errors, got:\n %q", x.Error)
+- }
-
-- "You" (or "Your") shall mean an individual or Legal Entity
-- exercising permissions granted by this License.
+-}
+diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/command.go b/Godeps/_workspace/src/github.com/spf13/cobra/command.go
+deleted file mode 100644
+index 1337065..0000000
+--- a/Godeps/_workspace/src/github.com/spf13/cobra/command.go
++++ /dev/null
+@@ -1,764 +0,0 @@
+-// Copyright © 2013 Steve Francia <spf at spf13.com>.
+-//
+-// Licensed under the Apache License, Version 2.0 (the "License");
+-// you may not use this file except in compliance with the License.
+-// You may obtain a copy of the License at
+-// http://www.apache.org/licenses/LICENSE-2.0
+-//
+-// Unless required by applicable law or agreed to in writing, software
+-// distributed under the License is distributed on an "AS IS" BASIS,
+-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-// See the License for the specific language governing permissions and
+-// limitations under the License.
-
-- "Source" form shall mean the preferred form for making modifications,
-- including but not limited to software source code, documentation
-- source, and configuration files.
+-// Commands similar to git, go tools and other modern CLI tools
+-// inspired by go, go-Commander, gh and subcommand
-
-- "Object" form shall mean any form resulting from mechanical
-- transformation or translation of a Source form, including but
-- not limited to compiled object code, generated documentation,
-- and conversions to other media types.
+-package cobra
-
-- "Work" shall mean the work of authorship, whether in Source or
-- Object form, made available under the License, as indicated by a
-- copyright notice that is included in or attached to the work
-- (an example is provided in the Appendix below).
+-import (
+- "bytes"
+- "fmt"
+- "io"
+- "os"
+- "strings"
-
-- "Derivative Works" shall mean any work, whether in Source or Object
-- form, that is based on (or derived from) the Work and for which the
-- editorial revisions, annotations, elaborations, or other modifications
-- represent, as a whole, an original work of authorship. For the purposes
-- of this License, Derivative Works shall not include works that remain
-- separable from, or merely link (or bind by name) to the interfaces of,
-- the Work and Derivative Works thereof.
+- flag "github.com/spf13/pflag"
+-)
-
-- "Contribution" shall mean any work of authorship, including
-- the original version of the Work and any modifications or additions
-- to that Work or Derivative Works thereof, that is intentionally
-- submitted to Licensor for inclusion in the Work by the copyright owner
-- or by an individual or Legal Entity authorized to submit on behalf of
-- the copyright owner. For the purposes of this definition, "submitted"
-- means any form of electronic, verbal, or written communication sent
-- to the Licensor or its representatives, including but not limited to
-- communication on electronic mailing lists, source code control systems,
-- and issue tracking systems that are managed by, or on behalf of, the
-- Licensor for the purpose of discussing and improving the Work, but
-- excluding communication that is conspicuously marked or otherwise
-- designated in writing by the copyright owner as "Not a Contribution."
+-// Command is just that, a command for your application.
+-// eg. 'go run' ... 'run' is the command. Cobra requires
+-// you to define the usage and description as part of your command
+-// definition to ensure usability.
+-type Command struct {
+- // Name is the command name, usually the executable's name.
+- name string
+- // The one-line usage message.
+- Use string
+- // An array of aliases that can be used instead of the first word in Use.
+- Aliases []string
+- // The short description shown in the 'help' output.
+- Short string
+- // The long message shown in the 'help <this-command>' output.
+- Long string
+- // Set of flags specific to this command.
+- flags *flag.FlagSet
+- // Set of flags children commands will inherit
+- pflags *flag.FlagSet
+- // Run runs the command.
+- // The args are the arguments after the command name.
+- Run func(cmd *Command, args []string)
+- // Commands is the list of commands supported by this program.
+- commands []*Command
+- // Parent Command for this command
+- parent *Command
+- // max lengths of commands' string lengths for use in padding
+- commandsMaxUseLen int
+- commandsMaxCommandPathLen int
-
-- "Contributor" shall mean Licensor and any individual or Legal Entity
-- on behalf of whom a Contribution has been received by Licensor and
-- subsequently incorporated within the Work.
+- flagErrorBuf *bytes.Buffer
-
-- 2. Grant of Copyright License. Subject to the terms and conditions of
-- this License, each Contributor hereby grants to You a perpetual,
-- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-- copyright license to reproduce, prepare Derivative Works of,
-- publicly display, publicly perform, sublicense, and distribute the
-- Work and such Derivative Works in Source or Object form.
+- args []string
+- output *io.Writer // nil means stderr; use Out() method instead
+- usageFunc func(*Command) error // Usage can be defined by application
+- usageTemplate string // Can be defined by Application
+- helpTemplate string // Can be defined by Application
+- helpFunc func(*Command, []string) // Help can be defined by application
+- helpCommand *Command // The help command
+- helpFlagVal bool
+-}
-
-- 3. Grant of Patent License. Subject to the terms and conditions of
-- this License, each Contributor hereby grants to You a perpetual,
-- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-- (except as stated in this section) patent license to make, have made,
-- use, offer to sell, sell, import, and otherwise transfer the Work,
-- where such license applies only to those patent claims licensable
-- by such Contributor that are necessarily infringed by their
-- Contribution(s) alone or by combination of their Contribution(s)
-- with the Work to which such Contribution(s) was submitted. If You
-- institute patent litigation against any entity (including a
-- cross-claim or counterclaim in a lawsuit) alleging that the Work
-- or a Contribution incorporated within the Work constitutes direct
-- or contributory patent infringement, then any patent licenses
-- granted to You under this License for that Work shall terminate
-- as of the date such litigation is filed.
+-// os.Args[1:] by default, if desired, can be overridden
+-// particularly useful when testing.
+-func (c *Command) SetArgs(a []string) {
+- c.args = a
+-}
-
-- 4. Redistribution. You may reproduce and distribute copies of the
-- Work or Derivative Works thereof in any medium, with or without
-- modifications, and in Source or Object form, provided that You
-- meet the following conditions:
+-func (c *Command) Out() io.Writer {
+- if c.output != nil {
+- return *c.output
+- }
-
-- (a) You must give any other recipients of the Work or
-- Derivative Works a copy of this License; and
+- if c.HasParent() {
+- return c.parent.Out()
+- } else {
+- return os.Stderr
+- }
+-}
-
-- (b) You must cause any modified files to carry prominent notices
-- stating that You changed the files; and
+-// SetOutput sets the destination for usage and error messages.
+-// If output is nil, os.Stderr is used.
+-func (c *Command) SetOutput(output io.Writer) {
+- c.output = &output
+-}
-
-- (c) You must retain, in the Source form of any Derivative Works
-- that You distribute, all copyright, patent, trademark, and
-- attribution notices from the Source form of the Work,
-- excluding those notices that do not pertain to any part of
-- the Derivative Works; and
+-// Usage can be defined by application
+-func (c *Command) SetUsageFunc(f func(*Command) error) {
+- c.usageFunc = f
+-}
-
-- (d) If the Work includes a "NOTICE" text file as part of its
-- distribution, then any Derivative Works that You distribute must
-- include a readable copy of the attribution notices contained
-- within such NOTICE file, excluding those notices that do not
-- pertain to any part of the Derivative Works, in at least one
-- of the following places: within a NOTICE text file distributed
-- as part of the Derivative Works; within the Source form or
-- documentation, if provided along with the Derivative Works; or,
-- within a display generated by the Derivative Works, if and
-- wherever such third-party notices normally appear. The contents
-- of the NOTICE file are for informational purposes only and
-- do not modify the License. You may add Your own attribution
-- notices within Derivative Works that You distribute, alongside
-- or as an addendum to the NOTICE text from the Work, provided
-- that such additional attribution notices cannot be construed
-- as modifying the License.
+-// Can be defined by Application
+-func (c *Command) SetUsageTemplate(s string) {
+- c.usageTemplate = s
+-}
-
-- You may add Your own copyright statement to Your modifications and
-- may provide additional or different license terms and conditions
-- for use, reproduction, or distribution of Your modifications, or
-- for any such Derivative Works as a whole, provided Your use,
-- reproduction, and distribution of the Work otherwise complies with
-- the conditions stated in this License.
+-// Can be defined by Application
+-func (c *Command) SetHelpFunc(f func(*Command, []string)) {
+- c.helpFunc = f
+-}
-
-- 5. Submission of Contributions. Unless You explicitly state otherwise,
-- any Contribution intentionally submitted for inclusion in the Work
-- by You to the Licensor shall be under the terms and conditions of
-- this License, without any additional terms or conditions.
-- Notwithstanding the above, nothing herein shall supersede or modify
-- the terms of any separate license agreement you may have executed
-- with Licensor regarding such Contributions.
+-func (c *Command) SetHelpCommand(cmd *Command) {
+- c.helpCommand = cmd
+-}
-
-- 6. Trademarks. This License does not grant permission to use the trade
-- names, trademarks, service marks, or product names of the Licensor,
-- except as required for reasonable and customary use in describing the
-- origin of the Work and reproducing the content of the NOTICE file.
+-// Can be defined by Application
+-func (c *Command) SetHelpTemplate(s string) {
+- c.helpTemplate = s
+-}
-
-- 7. Disclaimer of Warranty. Unless required by applicable law or
-- agreed to in writing, Licensor provides the Work (and each
-- Contributor provides its Contributions) on an "AS IS" BASIS,
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-- implied, including, without limitation, any warranties or conditions
-- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-- PARTICULAR PURPOSE. You are solely responsible for determining the
-- appropriateness of using or redistributing the Work and assume any
-- risks associated with Your exercise of permissions under this License.
+-func (c *Command) UsageFunc() (f func(*Command) error) {
+- if c.usageFunc != nil {
+- return c.usageFunc
+- }
+-
+- if c.HasParent() {
+- return c.parent.UsageFunc()
+- } else {
+- return func(c *Command) error {
+- err := tmpl(c.Out(), c.UsageTemplate(), c)
+- return err
+- }
+- }
+-}
+-func (c *Command) HelpFunc() func(*Command, []string) {
+- if c.helpFunc != nil {
+- return c.helpFunc
+- }
-
-- 8. Limitation of Liability. In no event and under no legal theory,
-- whether in tort (including negligence), contract, or otherwise,
-- unless required by applicable law (such as deliberate and grossly
-- negligent acts) or agreed to in writing, shall any Contributor be
-- liable to You for damages, including any direct, indirect, special,
-- incidental, or consequential damages of any character arising as a
-- result of this License or out of the use or inability to use the
-- Work (including but not limited to damages for loss of goodwill,
-- work stoppage, computer failure or malfunction, or any and all
-- other commercial damages or losses), even if such Contributor
-- has been advised of the possibility of such damages.
+- if c.HasParent() {
+- return c.parent.HelpFunc()
+- } else {
+- return func(c *Command, args []string) {
+- if len(args) == 0 {
+- // Help called without any topic, calling on root
+- c.Root().Help()
+- return
+- }
-
-- 9. Accepting Warranty or Additional Liability. While redistributing
-- the Work or Derivative Works thereof, You may choose to offer,
-- and charge a fee for, acceptance of support, warranty, indemnity,
-- or other liability obligations and/or rights consistent with this
-- License. However, in accepting such obligations, You may act only
-- on Your own behalf and on Your sole responsibility, not on behalf
-- of any other Contributor, and only if You agree to indemnify,
-- defend, and hold each Contributor harmless for any liability
-- incurred by, or claims asserted against, such Contributor by reason
-- of your accepting any such warranty or additional liability.
+- cmd, _, e := c.Root().Find(args)
+- if cmd == nil || e != nil {
+- c.Printf("Unknown help topic %#q.", args)
-
-- END OF TERMS AND CONDITIONS
+- c.Root().Usage()
+- } else {
+- err := cmd.Help()
+- if err != nil {
+- c.Println(err)
+- }
+- }
+- }
+- }
+-}
-
-- APPENDIX: How to apply the Apache License to your work.
+-var minUsagePadding int = 25
-
-- To apply the Apache License to your work, attach the following
-- boilerplate notice, with the fields enclosed by brackets "[]"
-- replaced with your own identifying information. (Don't include
-- the brackets!) The text should be enclosed in the appropriate
-- comment syntax for the file format. We also recommend that a
-- file or class name and description of purpose be included on the
-- same "printed page" as the copyright notice for easier
-- identification within third-party archives.
+-func (c *Command) UsagePadding() int {
+- if c.parent == nil || minUsagePadding > c.parent.commandsMaxUseLen {
+- return minUsagePadding
+- } else {
+- return c.parent.commandsMaxUseLen
+- }
+-}
-
-- Copyright [yyyy] [name of copyright owner]
+-var minCommandPathPadding int = 11
-
-- Licensed under the Apache License, Version 2.0 (the "License");
-- you may not use this file except in compliance with the License.
-- You may obtain a copy of the License at
+-func (c *Command) CommandPathPadding() int {
+- if c.parent == nil || minCommandPathPadding > c.parent.commandsMaxCommandPathLen {
+- return minCommandPathPadding
+- } else {
+- return c.parent.commandsMaxCommandPathLen
+- }
+-}
-
-- http://www.apache.org/licenses/LICENSE-2.0
+-func (c *Command) UsageTemplate() string {
+- if c.usageTemplate != "" {
+- return c.usageTemplate
+- }
-
-- Unless required by applicable law or agreed to in writing, software
-- distributed under the License is distributed on an "AS IS" BASIS,
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- See the License for the specific language governing permissions and
-- limitations under the License.
-diff --git a/Godeps/_workspace/src/github.com/google/gofuzz/README.md b/Godeps/_workspace/src/github.com/google/gofuzz/README.md
-deleted file mode 100644
-index 68fcf2c..0000000
---- a/Godeps/_workspace/src/github.com/google/gofuzz/README.md
-+++ /dev/null
-@@ -1,71 +0,0 @@
--gofuzz
--======
+- if c.HasParent() {
+- return c.parent.UsageTemplate()
+- } else {
+- return `{{ $cmd := . }}
+-Usage: {{if .Runnable}}
+- {{.UseLine}}{{if .HasFlags}} [flags]{{end}}{{end}}{{if .HasSubCommands}}
+- {{ .CommandPath}} [command]{{end}}{{if gt .Aliases 0}}
-
--gofuzz is a library for populating go objects with random values.
+-Aliases:
+- {{.NameAndAliases}}{{end}}
+-{{ if .HasSubCommands}}
+-Available Commands: {{range .Commands}}{{if .Runnable}}
+- {{rpad .Use .UsagePadding }} {{.Short}}{{end}}{{end}}
+-{{end}}
+-{{ if .HasFlags}} Available Flags:
+-{{.Flags.FlagUsages}}{{end}}{{if .HasParent}}{{if and (gt .Commands 0) (gt .Parent.Commands 1) }}
+-Additional help topics: {{if gt .Commands 0 }}{{range .Commands}}{{if not .Runnable}} {{rpad .CommandPath .CommandPathPadding}} {{.Short}}{{end}}{{end}}{{end}}{{if gt .Parent.Commands 1 }}{{range .Parent.Commands}}{{if .Runnable}}{{if not (eq .Name $cmd.Name) }}{{end}}
+- {{rpad .CommandPath .CommandPathPadding}} {{.Short}}{{end}}{{end}}{{end}}{{end}}
+-{{end}}
+-Use "{{.Root.Name}} help [command]" for more information about that command.
+-`
+- }
+-}
-
--[](https://godoc.org/github.com/google/gofuzz)
--[](https://travis-ci.org/google/gofuzz)
+-func (c *Command) HelpTemplate() string {
+- if c.helpTemplate != "" {
+- return c.helpTemplate
+- }
-
--This is useful for testing:
+- if c.HasParent() {
+- return c.parent.HelpTemplate()
+- } else {
+- return `{{.Long | trim}}
+-{{if or .Runnable .HasSubCommands}}{{.UsageString}}{{end}}
+-`
+- }
+-}
-
--* Do your project's objects really serialize/unserialize correctly in all cases?
--* Is there an incorrectly formatted object that will cause your project to panic?
+-// Really only used when casting a command to a commander
+-func (c *Command) resetChildrensParents() {
+- for _, x := range c.commands {
+- x.parent = c
+- }
+-}
-
--Import with ```import "github.com/google/gofuzz"```
+-func stripFlags(args []string) []string {
+- if len(args) < 1 {
+- return args
+- }
-
--You can use it on single variables:
--```
--f := fuzz.New()
--var myInt int
--f.Fuzz(&myInt) // myInt gets a random value.
--```
+- commands := []string{}
-
--You can use it on maps:
--```
--f := fuzz.New().NilChance(0).NumElements(1, 1)
--var myMap map[ComplexKeyType]string
--f.Fuzz(&myMap) // myMap will have exactly one element.
--```
+- inQuote := false
+- for _, y := range args {
+- if !inQuote {
+- switch {
+- case strings.HasPrefix(y, "\""):
+- inQuote = true
+- case strings.Contains(y, "=\""):
+- inQuote = true
+- case !strings.HasPrefix(y, "-"):
+- commands = append(commands, y)
+- }
+- }
-
--Customize the chance of getting a nil pointer:
--```
--f := fuzz.New().NilChance(.5)
--var fancyStruct struct {
-- A, B, C, D *string
+- if strings.HasSuffix(y, "\"") && !strings.HasSuffix(y, "\\\"") {
+- inQuote = false
+- }
+- }
+-
+- return commands
-}
--f.Fuzz(&fancyStruct) // About half the pointers should be set.
--```
-
--You can even customize the randomization completely if needed:
--```
--type MyEnum string
--const (
-- A MyEnum = "A"
-- B MyEnum = "B"
--)
--type MyInfo struct {
-- Type MyEnum
-- AInfo *string
-- BInfo *string
+-func argsMinusX(args []string, x string) []string {
+- newargs := []string{}
+-
+- for _, y := range args {
+- if x != y {
+- newargs = append(newargs, y)
+- }
+- }
+- return newargs
-}
-
--f := fuzz.New().NilChance(0).Funcs(
-- func(e *MyInfo, c fuzz.Continue) {
-- switch c.Intn(2) {
-- case 0:
-- e.Type = A
-- c.Fuzz(&e.AInfo)
-- case 1:
-- e.Type = B
-- c.Fuzz(&e.BInfo)
-- }
-- },
--)
+-// find the target command given the args and command tree
+-// Meant to be run on the highest node. Only searches down.
+-func (c *Command) Find(arrs []string) (*Command, []string, error) {
+- if c == nil {
+- return nil, nil, fmt.Errorf("Called find() on a nil Command")
+- }
-
--var myObject MyInfo
--f.Fuzz(&myObject) // Type will correspond to whether A or B info is set.
--```
+- if len(arrs) == 0 {
+- return c.Root(), arrs, nil
+- }
-
--See more examples in ```example_test.go```.
+- var innerfind func(*Command, []string) (*Command, []string)
-
--Happy testing!
-diff --git a/Godeps/_workspace/src/github.com/google/gofuzz/doc.go b/Godeps/_workspace/src/github.com/google/gofuzz/doc.go
-deleted file mode 100644
-index 9f9956d..0000000
---- a/Godeps/_workspace/src/github.com/google/gofuzz/doc.go
-+++ /dev/null
-@@ -1,18 +0,0 @@
--/*
--Copyright 2014 Google Inc. All rights reserved.
+- innerfind = func(c *Command, args []string) (*Command, []string) {
+- if len(args) > 0 && c.HasSubCommands() {
+- argsWOflags := stripFlags(args)
+- if len(argsWOflags) > 0 {
+- matches := make([]*Command, 0)
+- for _, cmd := range c.commands {
+- if cmd.Name() == argsWOflags[0] || cmd.HasAlias(argsWOflags[0]) { // exact name or alias match
+- return innerfind(cmd, argsMinusX(args, argsWOflags[0]))
+- } else if EnablePrefixMatching {
+- if strings.HasPrefix(cmd.Name(), argsWOflags[0]) { // prefix match
+- matches = append(matches, cmd)
+- }
+- for _, x := range cmd.Aliases {
+- if strings.HasPrefix(x, argsWOflags[0]) {
+- matches = append(matches, cmd)
+- }
+- }
+- }
+- }
-
--Licensed under the Apache License, Version 2.0 (the "License");
--you may not use this file except in compliance with the License.
--You may obtain a copy of the License at
+- // only accept a single prefix match - multiple matches would be ambiguous
+- if len(matches) == 1 {
+- return innerfind(matches[0], argsMinusX(args, argsWOflags[0]))
+- }
+- }
+- }
-
-- http://www.apache.org/licenses/LICENSE-2.0
+- return c, args
+- }
-
--Unless required by applicable law or agreed to in writing, software
--distributed under the License is distributed on an "AS IS" BASIS,
--WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--See the License for the specific language governing permissions and
--limitations under the License.
--*/
+- commandFound, a := innerfind(c, arrs)
-
--// Package fuzz is a library for populating go objects with random values.
--package fuzz
-diff --git a/Godeps/_workspace/src/github.com/google/gofuzz/example_test.go b/Godeps/_workspace/src/github.com/google/gofuzz/example_test.go
-deleted file mode 100644
-index 792707a..0000000
---- a/Godeps/_workspace/src/github.com/google/gofuzz/example_test.go
-+++ /dev/null
-@@ -1,225 +0,0 @@
--/*
--Copyright 2014 Google Inc. All rights reserved.
+- // if commander returned and the first argument (if it exists) doesn't
+- // match the command name, return nil & error
+- if commandFound.Name() == c.Name() && len(arrs[0]) > 0 && commandFound.Name() != arrs[0] {
+- return nil, a, fmt.Errorf("unknown command %q\nRun 'help' for usage.\n", a[0])
+- }
-
--Licensed under the Apache License, Version 2.0 (the "License");
--you may not use this file except in compliance with the License.
--You may obtain a copy of the License at
+- return commandFound, a, nil
+-}
-
-- http://www.apache.org/licenses/LICENSE-2.0
+-func (c *Command) Root() *Command {
+- var findRoot func(*Command) *Command
-
--Unless required by applicable law or agreed to in writing, software
--distributed under the License is distributed on an "AS IS" BASIS,
--WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--See the License for the specific language governing permissions and
--limitations under the License.
--*/
+- findRoot = func(x *Command) *Command {
+- if x.HasParent() {
+- return findRoot(x.parent)
+- } else {
+- return x
+- }
+- }
-
--package fuzz_test
+- return findRoot(c)
+-}
-
--import (
-- "encoding/json"
-- "fmt"
-- "math/rand"
+-// execute the command determined by args and the command tree
+-func (c *Command) findAndExecute(args []string) (err error) {
-
-- "github.com/google/gofuzz"
--)
+- cmd, a, e := c.Find(args)
+- if e != nil {
+- return e
+- }
+- return cmd.execute(a)
+-}
-
--func ExampleSimple() {
-- type MyType struct {
-- A string
-- B string
-- C int
-- D struct {
-- E float64
-- }
+-func (c *Command) execute(a []string) (err error) {
+- if c == nil {
+- return fmt.Errorf("Called Execute() on a nil Command")
- }
-
-- f := fuzz.New()
-- object := MyType{}
+- err = c.ParseFlags(a)
-
-- uniqueObjects := map[MyType]int{}
+- if err != nil {
+- return err
+- } else {
+- // If help is called, regardless of other flags, we print that
+- if c.helpFlagVal {
+- c.Help()
+- return nil
+- }
-
-- for i := 0; i < 1000; i++ {
-- f.Fuzz(&object)
-- uniqueObjects[object]++
+- c.preRun()
+- argWoFlags := c.Flags().Args()
+- c.Run(c, argWoFlags)
+- return nil
- }
-- fmt.Printf("Got %v unique objects.\n", len(uniqueObjects))
-- // Output:
-- // Got 1000 unique objects.
-}
-
--func ExampleCustom() {
-- type MyType struct {
-- A int
-- B string
+-func (c *Command) preRun() {
+- for _, x := range initializers {
+- x()
- }
+-}
-
-- counter := 0
-- f := fuzz.New().Funcs(
-- func(i *int, c fuzz.Continue) {
-- *i = counter
-- counter++
-- },
-- )
-- object := MyType{}
+-func (c *Command) errorMsgFromParse() string {
+- s := c.flagErrorBuf.String()
-
-- uniqueObjects := map[MyType]int{}
+- x := strings.Split(s, "\n")
-
-- for i := 0; i < 100; i++ {
-- f.Fuzz(&object)
-- if object.A != i {
-- fmt.Printf("Unexpected value: %#v\n", object)
-- }
-- uniqueObjects[object]++
+- if len(x) > 0 {
+- return x[0]
+- } else {
+- return ""
- }
-- fmt.Printf("Got %v unique objects.\n", len(uniqueObjects))
-- // Output:
-- // Got 100 unique objects.
-}
-
--func ExampleComplex() {
-- type OtherType struct {
-- A string
-- B string
+-// Call execute to use the args (os.Args[1:] by default)
+-// and run through the command tree finding appropriate matches
+-// for commands and then corresponding flags.
+-func (c *Command) Execute() (err error) {
+-
+- // Regardless of what command execute is called on, run on Root only
+- if c.HasParent() {
+- return c.Root().Execute()
- }
-- type MyType struct {
-- Pointer *OtherType
-- Map map[string]OtherType
-- PointerMap *map[string]OtherType
-- Slice []OtherType
-- SlicePointer []*OtherType
-- PointerSlicePointer *[]*OtherType
+-
+- // initialize help as the last point possible to allow for user
+- // overriding
+- c.initHelp()
+-
+- var args []string
+-
+- if len(c.args) == 0 {
+- args = os.Args[1:]
+- } else {
+- args = c.args
- }
-
-- f := fuzz.New().RandSource(rand.NewSource(0)).NilChance(0).NumElements(1, 1).Funcs(
-- func(o *OtherType, c fuzz.Continue) {
-- o.A = "Foo"
-- o.B = "Bar"
-- },
-- func(op **OtherType, c fuzz.Continue) {
-- *op = &OtherType{"A", "B"}
-- },
-- func(m map[string]OtherType, c fuzz.Continue) {
-- m["Works Because"] = OtherType{
-- "Fuzzer",
-- "Preallocated",
-- }
-- },
-- )
-- object := MyType{}
-- f.Fuzz(&object)
-- bytes, err := json.MarshalIndent(&object, "", " ")
-- if err != nil {
-- fmt.Printf("error: %v\n", err)
+- if len(args) == 0 {
+- // Only the executable is called and the root is runnable, run it
+- if c.Runnable() {
+- err = c.execute([]string(nil))
+- } else {
+- c.Help()
+- }
+- } else {
+- err = c.findAndExecute(args)
- }
-- fmt.Printf("%s\n", string(bytes))
-- // Output:
-- // {
-- // "Pointer": {
-- // "A": "A",
-- // "B": "B"
-- // },
-- // "Map": {
-- // "Works Because": {
-- // "A": "Fuzzer",
-- // "B": "Preallocated"
-- // }
-- // },
-- // "PointerMap": {
-- // "Works Because": {
-- // "A": "Fuzzer",
-- // "B": "Preallocated"
-- // }
-- // },
-- // "Slice": [
-- // {
-- // "A": "Foo",
-- // "B": "Bar"
-- // }
-- // ],
-- // "SlicePointer": [
-- // {
-- // "A": "A",
-- // "B": "B"
-- // }
-- // ],
-- // "PointerSlicePointer": [
-- // {
-- // "A": "A",
-- // "B": "B"
-- // }
-- // ]
-- // }
--}
-
--func ExampleMap() {
-- f := fuzz.New().NilChance(0).NumElements(1, 1)
-- var myMap map[struct{ A, B, C int }]string
-- f.Fuzz(&myMap)
-- fmt.Printf("myMap has %v element(s).\n", len(myMap))
-- // Output:
-- // myMap has 1 element(s).
--}
+- // Now handle the case where the root is runnable and only flags are provided
+- if err != nil && c.Runnable() {
+- // This is pretty much a custom version of the *Command.execute method
+- // with a few differences because it's the final command (no fall back)
+- e := c.ParseFlags(args)
+- if e != nil {
+- // Flags parsing had an error.
+- // If an error happens here, we have to report it to the user
+- c.Println(c.errorMsgFromParse())
+- c.Usage()
+- return e
+- } else {
+- // If help is called, regardless of other flags, we print that
+- if c.helpFlagVal {
+- c.Help()
+- return nil
+- }
+-
+- argWoFlags := c.Flags().Args()
+- if len(argWoFlags) > 0 {
+- // If there are arguments (not flags) one of the earlier
+- // cases should have caught it.. It means invalid usage
+- // print the usage
+- c.Usage()
+- } else {
+- // Only flags left... Call root.Run
+- c.preRun()
+- c.Run(c, argWoFlags)
+- err = nil
+- }
+- }
+- }
-
--func ExampleSingle() {
-- f := fuzz.New()
-- var i int
-- f.Fuzz(&i)
+- if err != nil {
+- c.Println("Error:", err.Error())
+- c.Printf("%v: invalid command %#q\n", c.Root().Name(), os.Args[1:])
+- c.Printf("Run '%v help' for usage\n", c.Root().Name())
+- }
-
-- // Technically, we'd expect this to fail one out of 2 billion attempts...
-- fmt.Printf("(i == 0) == %v", i == 0)
-- // Output:
-- // (i == 0) == false
+- return
-}
-
--func ExampleEnum() {
-- type MyEnum string
-- const (
-- A MyEnum = "A"
-- B MyEnum = "B"
-- )
-- type MyInfo struct {
-- Type MyEnum
-- AInfo *string
-- BInfo *string
+-func (c *Command) initHelp() {
+- if c.helpCommand == nil {
+- c.helpCommand = &Command{
+- Use: "help [command]",
+- Short: "Help about any command",
+- Long: `Help provides help for any command in the application.
+- Simply type ` + c.Name() + ` help [path to command] for full details.`,
+- Run: c.HelpFunc(),
+- }
- }
+- c.AddCommand(c.helpCommand)
+-}
-
-- f := fuzz.New().NilChance(0).Funcs(
-- func(e *MyInfo, c fuzz.Continue) {
-- // Note c's embedded Rand allows for direct use.
-- // We could also use c.RandBool() here.
-- switch c.Intn(2) {
-- case 0:
-- e.Type = A
-- c.Fuzz(&e.AInfo)
-- case 1:
-- e.Type = B
-- c.Fuzz(&e.BInfo)
-- }
-- },
-- )
+-// Used for testing
+-func (c *Command) ResetCommands() {
+- c.commands = nil
+-}
-
-- for i := 0; i < 100; i++ {
-- var myObject MyInfo
-- f.Fuzz(&myObject)
-- switch myObject.Type {
-- case A:
-- if myObject.AInfo == nil {
-- fmt.Println("AInfo should have been set!")
-- }
-- if myObject.BInfo != nil {
-- fmt.Println("BInfo should NOT have been set!")
-- }
-- case B:
-- if myObject.BInfo == nil {
-- fmt.Println("BInfo should have been set!")
-- }
-- if myObject.AInfo != nil {
-- fmt.Println("AInfo should NOT have been set!")
-- }
-- default:
-- fmt.Println("Invalid enum value!")
+-func (c *Command) Commands() []*Command {
+- return c.commands
+-}
+-
+-// Add one or many commands as children of this
+-func (c *Command) AddCommand(cmds ...*Command) {
+- for i, x := range cmds {
+- if cmds[i] == c {
+- panic("Command can't be a child of itself")
+- }
+- cmds[i].parent = c
+- // update max lengths
+- usageLen := len(x.Use)
+- if usageLen > c.commandsMaxUseLen {
+- c.commandsMaxUseLen = usageLen
+- }
+- commandPathLen := len(x.CommandPath())
+- if commandPathLen > c.commandsMaxCommandPathLen {
+- c.commandsMaxCommandPathLen = commandPathLen
- }
+- c.commands = append(c.commands, x)
- }
-- // Output:
-}
-diff --git a/Godeps/_workspace/src/github.com/google/gofuzz/fuzz.go b/Godeps/_workspace/src/github.com/google/gofuzz/fuzz.go
-deleted file mode 100644
-index 31c2838..0000000
---- a/Godeps/_workspace/src/github.com/google/gofuzz/fuzz.go
-+++ /dev/null
-@@ -1,366 +0,0 @@
--/*
--Copyright 2014 Google Inc. All rights reserved.
-
--Licensed under the Apache License, Version 2.0 (the "License");
--you may not use this file except in compliance with the License.
--You may obtain a copy of the License at
+-// Convenience method to Print to the defined output
+-func (c *Command) Print(i ...interface{}) {
+- fmt.Fprint(c.Out(), i...)
+-}
-
-- http://www.apache.org/licenses/LICENSE-2.0
+-// Convenience method to Println to the defined output
+-func (c *Command) Println(i ...interface{}) {
+- str := fmt.Sprintln(i...)
+- c.Print(str)
+-}
-
--Unless required by applicable law or agreed to in writing, software
--distributed under the License is distributed on an "AS IS" BASIS,
--WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--See the License for the specific language governing permissions and
--limitations under the License.
--*/
+-// Convenience method to Printf to the defined output
+-func (c *Command) Printf(format string, i ...interface{}) {
+- str := fmt.Sprintf(format, i...)
+- c.Print(str)
+-}
-
--package fuzz
+-// Output the usage for the command
+-// Used when a user provides invalid input
+-// Can be defined by user by overriding UsageFunc
+-func (c *Command) Usage() error {
+- c.mergePersistentFlags()
+- err := c.UsageFunc()(c)
+- return err
+-}
-
--import (
-- "fmt"
-- "math/rand"
-- "reflect"
-- "time"
--)
+-// Output the help for the command
+-// Used when a user calls help [command]
+-// by the default HelpFunc in the commander
+-func (c *Command) Help() error {
+- c.mergePersistentFlags()
+- err := tmpl(c.Out(), c.HelpTemplate(), c)
+- return err
+-}
-
--// fuzzFuncMap is a map from a type to a fuzzFunc that handles that type.
--type fuzzFuncMap map[reflect.Type]reflect.Value
+-func (c *Command) UsageString() string {
+- tmpOutput := c.output
+- bb := new(bytes.Buffer)
+- c.SetOutput(bb)
+- c.Usage()
+- c.output = tmpOutput
+- return bb.String()
+-}
-
--// Fuzzer knows how to fill any object with random fields.
--type Fuzzer struct {
-- fuzzFuncs fuzzFuncMap
-- r *rand.Rand
-- nilChance float64
-- minElements int
-- maxElements int
+-// The full path to this command
+-func (c *Command) CommandPath() string {
+- str := c.Name()
+- x := c
+- for x.HasParent() {
+- str = x.parent.Name() + " " + str
+- x = x.parent
+- }
+- return str
-}
-
--// New returns a new Fuzzer. Customize your Fuzzer further by calling Funcs,
--// RandSource, NilChance, or NumElements in any order.
--func New() *Fuzzer {
-- f := &Fuzzer{
-- fuzzFuncs: fuzzFuncMap{},
-- r: rand.New(rand.NewSource(time.Now().UnixNano())),
-- nilChance: .2,
-- minElements: 1,
-- maxElements: 10,
+-//The full usage for a given command (including parents)
+-func (c *Command) UseLine() string {
+- str := ""
+- if c.HasParent() {
+- str = c.parent.CommandPath() + " "
- }
-- return f
+- return str + c.Use
-}
-
--// Funcs adds each entry in fuzzFuncs as a custom fuzzing function.
--//
--// Each entry in fuzzFuncs must be a function taking two parameters.
--// The first parameter must be a pointer or map. It is the variable that
--// function will fill with random data. The second parameter must be a
--// fuzz.Continue, which will provide a source of randomness and a way
--// to automatically continue fuzzing smaller pieces of the first parameter.
--//
--// These functions are called sensibly, e.g., if you wanted custom string
--// fuzzing, the function `func(s *string, c fuzz.Continue)` would get
--// called and passed the address of strings. Maps and pointers will always
--// be made/new'd for you, ignoring the NilChange option. For slices, it
--// doesn't make much sense to pre-create them--Fuzzer doesn't know how
--// long you want your slice--so take a pointer to a slice, and make it
--// yourself. (If you don't want your map/pointer type pre-made, take a
--// pointer to it, and make it yourself.) See the examples for a range of
--// custom functions.
--func (f *Fuzzer) Funcs(fuzzFuncs ...interface{}) *Fuzzer {
-- for i := range fuzzFuncs {
-- v := reflect.ValueOf(fuzzFuncs[i])
-- if v.Kind() != reflect.Func {
-- panic("Need only funcs!")
+-// For use in determining which flags have been assigned to which commands
+-// and which persist
+-func (c *Command) DebugFlags() {
+- c.Println("DebugFlags called on", c.Name())
+- var debugflags func(*Command)
+-
+- debugflags = func(x *Command) {
+- if x.HasFlags() || x.HasPersistentFlags() {
+- c.Println(x.Name())
- }
-- t := v.Type()
-- if t.NumIn() != 2 || t.NumOut() != 0 {
-- panic("Need 2 in and 0 out params!")
+- if x.HasFlags() {
+- x.flags.VisitAll(func(f *flag.Flag) {
+- if x.HasPersistentFlags() {
+- if x.persistentFlag(f.Name) == nil {
+- c.Println(" -"+f.Shorthand+",", "--"+f.Name, "["+f.DefValue+"]", "", f.Value, " [L]")
+- } else {
+- c.Println(" -"+f.Shorthand+",", "--"+f.Name, "["+f.DefValue+"]", "", f.Value, " [LP]")
+- }
+- } else {
+- c.Println(" -"+f.Shorthand+",", "--"+f.Name, "["+f.DefValue+"]", "", f.Value, " [L]")
+- }
+- })
- }
-- argT := t.In(0)
-- switch argT.Kind() {
-- case reflect.Ptr, reflect.Map:
-- default:
-- panic("fuzzFunc must take pointer or map type")
+- if x.HasPersistentFlags() {
+- x.pflags.VisitAll(func(f *flag.Flag) {
+- if x.HasFlags() {
+- if x.flags.Lookup(f.Name) == nil {
+- c.Println(" -"+f.Shorthand+",", "--"+f.Name, "["+f.DefValue+"]", "", f.Value, " [P]")
+- }
+- } else {
+- c.Println(" -"+f.Shorthand+",", "--"+f.Name, "["+f.DefValue+"]", "", f.Value, " [P]")
+- }
+- })
- }
-- if t.In(1) != reflect.TypeOf(Continue{}) {
-- panic("fuzzFunc's second parameter must be type fuzz.Continue")
+- c.Println(x.flagErrorBuf)
+- if x.HasSubCommands() {
+- for _, y := range x.commands {
+- debugflags(y)
+- }
- }
-- f.fuzzFuncs[argT] = v
- }
-- return f
--}
-
--// RandSource causes f to get values from the given source of randomness.
--// Use if you want deterministic fuzzing.
--func (f *Fuzzer) RandSource(s rand.Source) *Fuzzer {
-- f.r = rand.New(s)
-- return f
+- debugflags(c)
-}
-
--// NilChance sets the probability of creating a nil pointer, map, or slice to
--// 'p'. 'p' should be between 0 (no nils) and 1 (all nils), inclusive.
--func (f *Fuzzer) NilChance(p float64) *Fuzzer {
-- if p < 0 || p > 1 {
-- panic("p should be between 0 and 1, inclusive.")
+-// Name returns the command's name: the first word in the use line.
+-func (c *Command) Name() string {
+- if c.name != "" {
+- return c.name
- }
-- f.nilChance = p
-- return f
+- name := c.Use
+- i := strings.Index(name, " ")
+- if i >= 0 {
+- name = name[:i]
+- }
+- return name
-}
-
--// NumElements sets the minimum and maximum number of elements that will be
--// added to a non-nil map or slice.
--func (f *Fuzzer) NumElements(atLeast, atMost int) *Fuzzer {
-- if atLeast > atMost {
-- panic("atLeast must be <= atMost")
-- }
-- if atLeast < 0 {
-- panic("atLeast must be >= 0")
+-// Determine if a given string is an alias of the command.
+-func (c *Command) HasAlias(s string) bool {
+- for _, a := range c.Aliases {
+- if a == s {
+- return true
+- }
- }
-- f.minElements = atLeast
-- f.maxElements = atMost
-- return f
+- return false
-}
-
--func (f *Fuzzer) genElementCount() int {
-- if f.minElements == f.maxElements {
-- return f.minElements
-- }
-- return f.minElements + f.r.Intn(f.maxElements-f.minElements)
+-func (c *Command) NameAndAliases() string {
+- return strings.Join(append([]string{c.Name()}, c.Aliases...), ", ")
-}
-
--func (f *Fuzzer) genShouldFill() bool {
-- return f.r.Float64() > f.nilChance
+-// Determine if the command is itself runnable
+-func (c *Command) Runnable() bool {
+- return c.Run != nil
-}
-
--// Fuzz recursively fills all of obj's fields with something random.
--// Not safe for cyclic or tree-like structs!
--// obj must be a pointer. Only exported (public) fields can be set (thanks, golang :/ )
--// Intended for tests, so will panic on bad input or unimplemented fields.
--func (f *Fuzzer) Fuzz(obj interface{}) {
-- v := reflect.ValueOf(obj)
-- if v.Kind() != reflect.Ptr {
-- panic("needed ptr!")
-- }
-- v = v.Elem()
-- f.doFuzz(v)
+-// Determine if the command has children commands
+-func (c *Command) HasSubCommands() bool {
+- return len(c.commands) > 0
-}
-
--func (f *Fuzzer) doFuzz(v reflect.Value) {
-- if !v.CanSet() {
-- return
+-// Determine if the command is a child command
+-func (c *Command) HasParent() bool {
+- return c.parent != nil
+-}
+-
+-// Get the Commands FlagSet
+-func (c *Command) Flags() *flag.FlagSet {
+- if c.flags == nil {
+- c.flags = flag.NewFlagSet(c.Name(), flag.ContinueOnError)
+- if c.flagErrorBuf == nil {
+- c.flagErrorBuf = new(bytes.Buffer)
+- }
+- c.flags.SetOutput(c.flagErrorBuf)
+- c.PersistentFlags().BoolVarP(&c.helpFlagVal, "help", "h", false, "help for "+c.Name())
- }
-- // Check for both pointer and non-pointer custom functions.
-- if v.CanAddr() && f.tryCustom(v.Addr()) {
-- return
+- return c.flags
+-}
+-
+-// Get the Commands Persistent FlagSet
+-func (c *Command) PersistentFlags() *flag.FlagSet {
+- if c.pflags == nil {
+- c.pflags = flag.NewFlagSet(c.Name(), flag.ContinueOnError)
+- if c.flagErrorBuf == nil {
+- c.flagErrorBuf = new(bytes.Buffer)
+- }
+- c.pflags.SetOutput(c.flagErrorBuf)
- }
-- if f.tryCustom(v) {
-- return
+- return c.pflags
+-}
+-
+-// For use in testing
+-func (c *Command) ResetFlags() {
+- c.flagErrorBuf = new(bytes.Buffer)
+- c.flagErrorBuf.Reset()
+- c.flags = flag.NewFlagSet(c.Name(), flag.ContinueOnError)
+- c.flags.SetOutput(c.flagErrorBuf)
+- c.pflags = flag.NewFlagSet(c.Name(), flag.ContinueOnError)
+- c.pflags.SetOutput(c.flagErrorBuf)
+-}
+-
+-// Does the command contain flags (local not persistent)
+-func (c *Command) HasFlags() bool {
+- return c.Flags().HasFlags()
+-}
+-
+-// Does the command contain persistent flags
+-func (c *Command) HasPersistentFlags() bool {
+- return c.PersistentFlags().HasFlags()
+-}
+-
+-// Climbs up the command tree looking for matching flag
+-func (c *Command) Flag(name string) (flag *flag.Flag) {
+- flag = c.Flags().Lookup(name)
+-
+- if flag == nil {
+- flag = c.persistentFlag(name)
- }
-- if fn, ok := fillFuncMap[v.Kind()]; ok {
-- fn(v, f.r)
-- return
+-
+- return
+-}
+-
+-// recursively find matching persistent flag
+-func (c *Command) persistentFlag(name string) (flag *flag.Flag) {
+- if c.HasPersistentFlags() {
+- flag = c.PersistentFlags().Lookup(name)
- }
-- switch v.Kind() {
-- case reflect.Map:
-- if f.genShouldFill() {
-- v.Set(reflect.MakeMap(v.Type()))
-- n := f.genElementCount()
-- for i := 0; i < n; i++ {
-- key := reflect.New(v.Type().Key()).Elem()
-- f.doFuzz(key)
-- val := reflect.New(v.Type().Elem()).Elem()
-- f.doFuzz(val)
-- v.SetMapIndex(key, val)
-- }
-- return
-- }
-- v.Set(reflect.Zero(v.Type()))
-- case reflect.Ptr:
-- if f.genShouldFill() {
-- v.Set(reflect.New(v.Type().Elem()))
-- f.doFuzz(v.Elem())
-- return
-- }
-- v.Set(reflect.Zero(v.Type()))
-- case reflect.Slice:
-- if f.genShouldFill() {
-- n := f.genElementCount()
-- v.Set(reflect.MakeSlice(v.Type(), n, n))
-- for i := 0; i < n; i++ {
-- f.doFuzz(v.Index(i))
-- }
-- return
-- }
-- v.Set(reflect.Zero(v.Type()))
-- case reflect.Struct:
-- for i := 0; i < v.NumField(); i++ {
-- f.doFuzz(v.Field(i))
-- }
-- case reflect.Array:
-- fallthrough
-- case reflect.Chan:
-- fallthrough
-- case reflect.Func:
-- fallthrough
-- case reflect.Interface:
-- fallthrough
-- default:
-- panic(fmt.Sprintf("Can't handle %#v", v.Interface()))
+-
+- if flag == nil && c.HasParent() {
+- flag = c.parent.persistentFlag(name)
- }
+- return
-}
-
--// tryCustom searches for custom handlers, and returns true iff it finds a match
--// and successfully randomizes v.
--func (f *Fuzzer) tryCustom(v reflect.Value) bool {
-- doCustom, ok := f.fuzzFuncs[v.Type()]
-- if !ok {
-- return false
+-// Parses persistent flag tree & local flags
+-func (c *Command) ParseFlags(args []string) (err error) {
+- c.mergePersistentFlags()
+- err = c.Flags().Parse(args)
+-
+- // The upstream library adds spaces to the error
+- // response regardless of success.
+- // Handling it here until fixing upstream
+- if len(strings.TrimSpace(c.flagErrorBuf.String())) > 1 {
+- return fmt.Errorf("%s", c.flagErrorBuf.String())
- }
-
-- switch v.Kind() {
-- case reflect.Ptr:
-- if v.IsNil() {
-- if !v.CanSet() {
-- return false
-- }
-- v.Set(reflect.New(v.Type().Elem()))
+- //always return nil because upstream library is inconsistent & we always check the error buffer anyway
+- return nil
+-}
+-
+-func (c *Command) mergePersistentFlags() {
+- var rmerge func(x *Command)
+-
+- rmerge = func(x *Command) {
+- if x.HasPersistentFlags() {
+- x.PersistentFlags().VisitAll(func(f *flag.Flag) {
+- if c.Flags().Lookup(f.Name) == nil {
+- c.Flags().AddFlag(f)
+- }
+- })
- }
-- case reflect.Map:
-- if v.IsNil() {
-- if !v.CanSet() {
-- return false
-- }
-- v.Set(reflect.MakeMap(v.Type()))
+- if x.HasParent() {
+- rmerge(x.parent)
- }
-- default:
-- return false
- }
-
-- doCustom.Call([]reflect.Value{v, reflect.ValueOf(Continue{
-- f: f,
-- Rand: f.r,
-- })})
-- return true
+- rmerge(c)
-}
-
--// Continue can be passed to custom fuzzing functions to allow them to use
--// the correct source of randomness and to continue fuzzing their members.
--type Continue struct {
-- f *Fuzzer
--
-- // For convenience, Continue implements rand.Rand via embedding.
-- // Use this for generating any randomness if you want your fuzzing
-- // to be repeatable for a given seed.
-- *rand.Rand
+-func (c *Command) Parent() *Command {
+- return c.parent
-}
+diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/LICENSE b/Godeps/_workspace/src/github.com/spf13/pflag/LICENSE
+deleted file mode 100644
+index 63ed1cf..0000000
+--- a/Godeps/_workspace/src/github.com/spf13/pflag/LICENSE
++++ /dev/null
+@@ -1,28 +0,0 @@
+-Copyright (c) 2012 Alex Ogier. All rights reserved.
+-Copyright (c) 2012 The Go Authors. All rights reserved.
-
--// Fuzz continues fuzzing obj. obj must be a pointer.
--func (c Continue) Fuzz(obj interface{}) {
-- v := reflect.ValueOf(obj)
-- if v.Kind() != reflect.Ptr {
-- panic("needed ptr!")
-- }
-- v = v.Elem()
-- c.f.doFuzz(v)
--}
+-Redistribution and use in source and binary forms, with or without
+-modification, are permitted provided that the following conditions are
+-met:
-
--// RandString makes a random string up to 20 characters long. The returned string
--// may include a variety of (valid) UTF-8 encodings.
--func (c Continue) RandString() string {
-- return randString(c.Rand)
--}
+- * Redistributions of source code must retain the above copyright
+-notice, this list of conditions and the following disclaimer.
+- * Redistributions in binary form must reproduce the above
+-copyright notice, this list of conditions and the following disclaimer
+-in the documentation and/or other materials provided with the
+-distribution.
+- * Neither the name of Google Inc. nor the names of its
+-contributors may be used to endorse or promote products derived from
+-this software without specific prior written permission.
-
--// RandUint64 makes random 64 bit numbers.
--// Weirdly, rand doesn't have a function that gives you 64 random bits.
--func (c Continue) RandUint64() uint64 {
-- return randUint64(c.Rand)
--}
+-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/README.md b/Godeps/_workspace/src/github.com/spf13/pflag/README.md
+deleted file mode 100644
+index a12d94d..0000000
+--- a/Godeps/_workspace/src/github.com/spf13/pflag/README.md
++++ /dev/null
+@@ -1,155 +0,0 @@
+-## Description
-
--// RandBool returns true or false randomly.
--func (c Continue) RandBool() bool {
-- return randBool(c.Rand)
--}
+-pflag is a drop-in replacement for Go's flag package, implementing
+-POSIX/GNU-style --flags.
-
--func fuzzInt(v reflect.Value, r *rand.Rand) {
-- v.SetInt(int64(randUint64(r)))
--}
+-pflag is compatible with the [GNU extensions to the POSIX recommendations
+-for command-line options][1]. For a more precise description, see the
+-"Command-line flag syntax" section below.
-
--func fuzzUint(v reflect.Value, r *rand.Rand) {
-- v.SetUint(randUint64(r))
--}
+-[1]: http://www.gnu.org/software/libc/manual/html_node/Argument-Syntax.html
-
--var fillFuncMap = map[reflect.Kind]func(reflect.Value, *rand.Rand){
-- reflect.Bool: func(v reflect.Value, r *rand.Rand) {
-- v.SetBool(randBool(r))
-- },
-- reflect.Int: fuzzInt,
-- reflect.Int8: fuzzInt,
-- reflect.Int16: fuzzInt,
-- reflect.Int32: fuzzInt,
-- reflect.Int64: fuzzInt,
-- reflect.Uint: fuzzUint,
-- reflect.Uint8: fuzzUint,
-- reflect.Uint16: fuzzUint,
-- reflect.Uint32: fuzzUint,
-- reflect.Uint64: fuzzUint,
-- reflect.Uintptr: fuzzUint,
-- reflect.Float32: func(v reflect.Value, r *rand.Rand) {
-- v.SetFloat(float64(r.Float32()))
-- },
-- reflect.Float64: func(v reflect.Value, r *rand.Rand) {
-- v.SetFloat(r.Float64())
-- },
-- reflect.Complex64: func(v reflect.Value, r *rand.Rand) {
-- panic("unimplemented")
-- },
-- reflect.Complex128: func(v reflect.Value, r *rand.Rand) {
-- panic("unimplemented")
-- },
-- reflect.String: func(v reflect.Value, r *rand.Rand) {
-- v.SetString(randString(r))
-- },
-- reflect.UnsafePointer: func(v reflect.Value, r *rand.Rand) {
-- panic("unimplemented")
-- },
--}
+-pflag is available under the same style of BSD license as the Go language,
+-which can be found in the LICENSE file.
-
--// randBool returns true or false randomly.
--func randBool(r *rand.Rand) bool {
-- if r.Int()&1 == 1 {
-- return true
-- }
-- return false
--}
+-## Installation
-
--type charRange struct {
-- first, last rune
--}
+-pflag is available using the standard `go get` command.
-
--// choose returns a random unicode character from the given range, using the
--// given randomness source.
--func (r *charRange) choose(rand *rand.Rand) rune {
-- count := int64(r.last - r.first)
-- return r.first + rune(rand.Int63n(count))
--}
+-Install by running:
-
--var unicodeRanges = []charRange{
-- {' ', '~'}, // ASCII characters
-- {'\u00a0', '\u02af'}, // Multi-byte encoded characters
-- {'\u4e00', '\u9fff'}, // Common CJK (even longer encodings)
--}
+- go get github.com/ogier/pflag
-
--// randString makes a random string up to 20 characters long. The returned string
--// may include a variety of (valid) UTF-8 encodings.
--func randString(r *rand.Rand) string {
-- n := r.Intn(20)
-- runes := make([]rune, n)
-- for i := range runes {
-- runes[i] = unicodeRanges[r.Intn(len(unicodeRanges))].choose(r)
-- }
-- return string(runes)
--}
+-Run tests by running:
-
--// randUint64 makes random 64 bit numbers.
--// Weirdly, rand doesn't have a function that gives you 64 random bits.
--func randUint64(r *rand.Rand) uint64 {
-- return uint64(r.Uint32())<<32 | uint64(r.Uint32())
--}
-diff --git a/Godeps/_workspace/src/github.com/google/gofuzz/fuzz_test.go b/Godeps/_workspace/src/github.com/google/gofuzz/fuzz_test.go
-deleted file mode 100644
-index 4f0d4db..0000000
---- a/Godeps/_workspace/src/github.com/google/gofuzz/fuzz_test.go
-+++ /dev/null
-@@ -1,258 +0,0 @@
--/*
--Copyright 2014 Google Inc. All rights reserved.
+- go test github.com/ogier/pflag
-
--Licensed under the Apache License, Version 2.0 (the "License");
--you may not use this file except in compliance with the License.
--You may obtain a copy of the License at
+-## Usage
-
-- http://www.apache.org/licenses/LICENSE-2.0
+-pflag is a drop-in replacement of Go's native flag package. If you import
+-pflag under the name "flag" then all code should continue to function
+-with no changes.
-
--Unless required by applicable law or agreed to in writing, software
--distributed under the License is distributed on an "AS IS" BASIS,
--WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--See the License for the specific language governing permissions and
--limitations under the License.
--*/
+-``` go
+-import flag "github.com/ogier/pflag"
+-```
-
--package fuzz
+-There is one exception to this: if you directly instantiate the Flag struct
+-there is one more field "Shorthand" that you will need to set.
+-Most code never instantiates this struct directly, and instead uses
+-functions such as String(), BoolVar(), and Var(), and is therefore
+-unaffected.
-
--import (
-- "reflect"
-- "testing"
--)
+-Define flags using flag.String(), Bool(), Int(), etc.
-
--func TestFuzz_basic(t *testing.T) {
-- obj := &struct {
-- I int
-- I8 int8
-- I16 int16
-- I32 int32
-- I64 int64
-- U uint
-- U8 uint8
-- U16 uint16
-- U32 uint32
-- U64 uint64
-- Uptr uintptr
-- S string
-- B bool
-- }{}
+-This declares an integer flag, -flagname, stored in the pointer ip, with type *int.
-
-- failed := map[string]int{}
-- for i := 0; i < 10; i++ {
-- New().Fuzz(obj)
+-``` go
+-var ip *int = flag.Int("flagname", 1234, "help message for flagname")
+-```
-
-- if n, v := "i", obj.I; v == 0 {
-- failed[n] = failed[n] + 1
-- }
-- if n, v := "i8", obj.I8; v == 0 {
-- failed[n] = failed[n] + 1
-- }
-- if n, v := "i16", obj.I16; v == 0 {
-- failed[n] = failed[n] + 1
-- }
-- if n, v := "i32", obj.I32; v == 0 {
-- failed[n] = failed[n] + 1
-- }
-- if n, v := "i64", obj.I64; v == 0 {
-- failed[n] = failed[n] + 1
-- }
-- if n, v := "u", obj.U; v == 0 {
-- failed[n] = failed[n] + 1
-- }
-- if n, v := "u8", obj.U8; v == 0 {
-- failed[n] = failed[n] + 1
-- }
-- if n, v := "u16", obj.U16; v == 0 {
-- failed[n] = failed[n] + 1
-- }
-- if n, v := "u32", obj.U32; v == 0 {
-- failed[n] = failed[n] + 1
-- }
-- if n, v := "u64", obj.U64; v == 0 {
-- failed[n] = failed[n] + 1
-- }
-- if n, v := "uptr", obj.Uptr; v == 0 {
-- failed[n] = failed[n] + 1
-- }
-- if n, v := "s", obj.S; v == "" {
-- failed[n] = failed[n] + 1
-- }
-- if n, v := "b", obj.B; v == false {
-- failed[n] = failed[n] + 1
-- }
-- }
-- checkFailed(t, failed)
--}
+-If you like, you can bind the flag to a variable using the Var() functions.
-
--func checkFailed(t *testing.T, failed map[string]int) {
-- for k, v := range failed {
-- if v > 8 {
-- t.Errorf("%v seems to not be getting set, was zero value %v times", k, v)
-- }
-- }
+-``` go
+-var flagvar int
+-func init() {
+- flag.IntVar(&flagvar, "flagname", 1234, "help message for flagname")
-}
+-```
-
--func TestFuzz_structptr(t *testing.T) {
-- obj := &struct {
-- A *struct {
-- S string
-- }
-- }{}
+-Or you can create custom flags that satisfy the Value interface (with
+-pointer receivers) and couple them to flag parsing by
-
-- f := New().NilChance(.5)
-- failed := map[string]int{}
-- for i := 0; i < 10; i++ {
-- f.Fuzz(obj)
+-``` go
+-flag.Var(&flagVal, "name", "help message for flagname")
+-```
-
-- if n, v := "a not nil", obj.A; v == nil {
-- failed[n] = failed[n] + 1
-- }
-- if n, v := "a nil", obj.A; v != nil {
-- failed[n] = failed[n] + 1
-- }
-- if n, v := "as", obj.A; v == nil || v.S == "" {
-- failed[n] = failed[n] + 1
-- }
-- }
-- checkFailed(t, failed)
--}
+-For such flags, the default value is just the initial value of the variable.
-
--// tryFuzz tries fuzzing up to 20 times. Fail if check() never passes, report the highest
--// stage it ever got to.
--func tryFuzz(t *testing.T, f *Fuzzer, obj interface{}, check func() (stage int, passed bool)) {
-- maxStage := 0
-- for i := 0; i < 20; i++ {
-- f.Fuzz(obj)
-- stage, passed := check()
-- if stage > maxStage {
-- maxStage = stage
-- }
-- if passed {
-- return
-- }
-- }
-- t.Errorf("Only ever got to stage %v", maxStage)
--}
+-After all flags are defined, call
-
--func TestFuzz_structmap(t *testing.T) {
-- obj := &struct {
-- A map[struct {
-- S string
-- }]struct {
-- S2 string
-- }
-- B map[string]string
-- }{}
+-``` go
+-flag.Parse()
+-```
-
-- tryFuzz(t, New(), obj, func() (int, bool) {
-- if obj.A == nil {
-- return 1, false
-- }
-- if len(obj.A) == 0 {
-- return 2, false
-- }
-- for k, v := range obj.A {
-- if k.S == "" {
-- return 3, false
-- }
-- if v.S2 == "" {
-- return 4, false
-- }
-- }
+-to parse the command line into the defined flags.
-
-- if obj.B == nil {
-- return 5, false
-- }
-- if len(obj.B) == 0 {
-- return 6, false
-- }
-- for k, v := range obj.B {
-- if k == "" {
-- return 7, false
-- }
-- if v == "" {
-- return 8, false
-- }
-- }
-- return 9, true
-- })
--}
+-Flags may then be used directly. If you're using the flags themselves,
+-they are all pointers; if you bind to variables, they're values.
-
--func TestFuzz_structslice(t *testing.T) {
-- obj := &struct {
-- A []struct {
-- S string
-- }
-- B []string
-- }{}
+-``` go
+-fmt.Println("ip has value ", *ip)
+-fmt.Println("flagvar has value ", flagvar)
+-```
-
-- tryFuzz(t, New(), obj, func() (int, bool) {
-- if obj.A == nil {
-- return 1, false
-- }
-- if len(obj.A) == 0 {
-- return 2, false
-- }
-- for _, v := range obj.A {
-- if v.S == "" {
-- return 3, false
-- }
-- }
+-After parsing, the arguments after the flag are available as the
+-slice flag.Args() or individually as flag.Arg(i).
+-The arguments are indexed from 0 through flag.NArg()-1.
-
-- if obj.B == nil {
-- return 4, false
-- }
-- if len(obj.B) == 0 {
-- return 5, false
-- }
-- for _, v := range obj.B {
-- if v == "" {
-- return 6, false
-- }
-- }
-- return 7, true
-- })
+-The pflag package also defines some new functions that are not in flag,
+-that give one-letter shorthands for flags. You can use these by appending
+-'P' to the name of any function that defines a flag.
+-
+-``` go
+-var ip = flag.IntP("flagname", "f", 1234, "help message")
+-var flagvar bool
+-func init() {
+- flag.BoolVarP("boolname", "b", true, "help message")
-}
+-flag.VarP(&flagVar, "varname", "v", 1234, "help message")
+-```
-
--func TestFuzz_custom(t *testing.T) {
-- obj := &struct {
-- A string
-- B *string
-- C map[string]string
-- D *map[string]string
-- }{}
+-Shorthand letters can be used with single dashes on the command line.
+-Boolean shorthand flags can be combined with other shorthand flags.
-
-- testPhrase := "gotcalled"
-- testMap := map[string]string{"C": "D"}
-- f := New().Funcs(
-- func(s *string, c Continue) {
-- *s = testPhrase
-- },
-- func(m map[string]string, c Continue) {
-- m["C"] = "D"
-- },
-- )
+-The default set of command-line flags is controlled by
+-top-level functions. The FlagSet type allows one to define
+-independent sets of flags, such as to implement subcommands
+-in a command-line interface. The methods of FlagSet are
+-analogous to the top-level functions for the command-line
+-flag set.
-
-- tryFuzz(t, f, obj, func() (int, bool) {
-- if obj.A != testPhrase {
-- return 1, false
-- }
-- if obj.B == nil {
-- return 2, false
-- }
-- if *obj.B != testPhrase {
-- return 3, false
-- }
-- if e, a := testMap, obj.C; !reflect.DeepEqual(e, a) {
-- return 4, false
-- }
-- if obj.D == nil {
-- return 5, false
-- }
-- if e, a := testMap, *obj.D; !reflect.DeepEqual(e, a) {
-- return 6, false
-- }
-- return 7, true
-- })
--}
-diff --git a/Godeps/_workspace/src/github.com/kr/text/License b/Godeps/_workspace/src/github.com/kr/text/License
-deleted file mode 100644
-index 480a328..0000000
---- a/Godeps/_workspace/src/github.com/kr/text/License
-+++ /dev/null
-@@ -1,19 +0,0 @@
--Copyright 2012 Keith Rarick
+-## Command line flag syntax
-
--Permission is hereby granted, free of charge, to any person obtaining a copy
--of this software and associated documentation files (the "Software"), to deal
--in the Software without restriction, including without limitation the rights
--to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
--copies of the Software, and to permit persons to whom the Software is
--furnished to do so, subject to the following conditions:
+-```
+---flag // boolean flags only
+---flag=x
+-```
+-
+-Unlike the flag package, a single dash before an option means something
+-different than a double dash. Single dashes signify a series of shorthand
+-letters for flags. All but the last shorthand letter must be boolean flags.
+-
+-```
+-// boolean flags
+--f
+--abc
+-
+-// non-boolean flags
+--n 1234
+--Ifile
+-
+-// mixed
+--abcs "hello"
+--abcn1234
+-```
-
--The above copyright notice and this permission notice shall be included in
--all copies or substantial portions of the Software.
+-Flag parsing stops after the terminator "--". Unlike the flag package,
+-flags can be interspersed with arguments anywhere on the command line
+-before this terminator.
-
--THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
--IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
--AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
--LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
--OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
--THE SOFTWARE.
-diff --git a/Godeps/_workspace/src/github.com/kr/text/Readme b/Godeps/_workspace/src/github.com/kr/text/Readme
-deleted file mode 100644
-index 7e6e7c0..0000000
---- a/Godeps/_workspace/src/github.com/kr/text/Readme
-+++ /dev/null
-@@ -1,3 +0,0 @@
--This is a Go package for manipulating paragraphs of text.
+-Integer flags accept 1234, 0664, 0x1234 and may be negative.
+-Boolean flags (in their long form) accept 1, 0, t, f, true, false,
+-TRUE, FALSE, True, False.
+-Duration flags accept any input valid for time.ParseDuration.
-
--See http://go.pkgdoc.org/github.com/kr/text for full documentation.
-diff --git a/Godeps/_workspace/src/github.com/kr/text/colwriter/Readme b/Godeps/_workspace/src/github.com/kr/text/colwriter/Readme
-deleted file mode 100644
-index 1c1f4e6..0000000
---- a/Godeps/_workspace/src/github.com/kr/text/colwriter/Readme
-+++ /dev/null
-@@ -1,5 +0,0 @@
--Package colwriter provides a write filter that formats
--input lines in multiple columns.
+-## More info
-
--The package is a straightforward translation from
--/src/cmd/draw/mc.c in Plan 9 from User Space.
-diff --git a/Godeps/_workspace/src/github.com/kr/text/colwriter/column.go b/Godeps/_workspace/src/github.com/kr/text/colwriter/column.go
+-You can see the full reference documentation of the pflag package
+-[at godoc.org][3], or through go's standard documentation system by
+-running `godoc -http=:6060` and browsing to
+-[http://localhost:6060/pkg/github.com/ogier/pflag][2] after
+-installation.
+-
+-[2]: http://localhost:6060/pkg/github.com/ogier/pflag
+-[3]: http://godoc.org/github.com/ogier/pflag
+diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/bool.go b/Godeps/_workspace/src/github.com/spf13/pflag/bool.go
deleted file mode 100644
-index 7302ce9..0000000
---- a/Godeps/_workspace/src/github.com/kr/text/colwriter/column.go
+index 010576c..0000000
+--- a/Godeps/_workspace/src/github.com/spf13/pflag/bool.go
+++ /dev/null
-@@ -1,147 +0,0 @@
--// Package colwriter provides a write filter that formats
--// input lines in multiple columns.
--//
--// The package is a straightforward translation from
--// /src/cmd/draw/mc.c in Plan 9 from User Space.
--package colwriter
+@@ -1,74 +0,0 @@
+-package pflag
-
-import (
-- "bytes"
-- "io"
-- "unicode/utf8"
+- "fmt"
+- "strconv"
-)
-
--const (
-- tab = 4
--)
+-// -- bool Value
+-type boolValue bool
-
--const (
-- // Print each input line ending in a colon ':' separately.
-- BreakOnColon uint = 1 << iota
--)
+-func newBoolValue(val bool, p *bool) *boolValue {
+- *p = val
+- return (*boolValue)(p)
+-}
-
--// A Writer is a filter that arranges input lines in as many columns as will
--// fit in its width. Tab '\t' chars in the input are translated to sequences
--// of spaces ending at multiples of 4 positions.
--//
--// If BreakOnColon is set, each input line ending in a colon ':' is written
--// separately.
--//
--// The Writer assumes that all Unicode code points have the same width; this
--// may not be true in some fonts.
--type Writer struct {
-- w io.Writer
-- buf []byte
-- width int
-- flag uint
+-func (b *boolValue) Set(s string) error {
+- v, err := strconv.ParseBool(s)
+- *b = boolValue(v)
+- return err
-}
-
--// NewWriter allocates and initializes a new Writer writing to w.
--// Parameter width controls the total number of characters on each line
--// across all columns.
--func NewWriter(w io.Writer, width int, flag uint) *Writer {
-- return &Writer{
-- w: w,
-- width: width,
-- flag: flag,
-- }
+-func (b *boolValue) Type() string {
+- return "bool"
-}
-
--// Write writes p to the writer w. The only errors returned are ones
--// encountered while writing to the underlying output stream.
--func (w *Writer) Write(p []byte) (n int, err error) {
-- var linelen int
-- var lastWasColon bool
-- for i, c := range p {
-- w.buf = append(w.buf, c)
-- linelen++
-- if c == '\t' {
-- w.buf[len(w.buf)-1] = ' '
-- for linelen%tab != 0 {
-- w.buf = append(w.buf, ' ')
-- linelen++
-- }
-- }
-- if w.flag&BreakOnColon != 0 && c == ':' {
-- lastWasColon = true
-- } else if lastWasColon {
-- if c == '\n' {
-- pos := bytes.LastIndex(w.buf[:len(w.buf)-1], []byte{'\n'})
-- if pos < 0 {
-- pos = 0
-- }
-- line := w.buf[pos:]
-- w.buf = w.buf[:pos]
-- if err = w.columnate(); err != nil {
-- if len(line) < i {
-- return i - len(line), err
-- }
-- return 0, err
-- }
-- if n, err := w.w.Write(line); err != nil {
-- if r := len(line) - n; r < i {
-- return i - r, err
-- }
-- return 0, err
-- }
-- }
-- lastWasColon = false
-- }
-- if c == '\n' {
-- linelen = 0
-- }
-- }
-- return len(p), nil
+-func (b *boolValue) String() string { return fmt.Sprintf("%v", *b) }
+-
+-// BoolVar defines a bool flag with specified name, default value, and usage string.
+-// The argument p points to a bool variable in which to store the value of the flag.
+-func (f *FlagSet) BoolVar(p *bool, name string, value bool, usage string) {
+- f.VarP(newBoolValue(value, p), name, "", usage)
-}
-
--// Flush should be called after the last call to Write to ensure that any data
--// buffered in the Writer is written to output.
--func (w *Writer) Flush() error {
-- return w.columnate()
+-// Like BoolVar, but accepts a shorthand letter that can be used after a single dash.
+-func (f *FlagSet) BoolVarP(p *bool, name, shorthand string, value bool, usage string) {
+- f.VarP(newBoolValue(value, p), name, shorthand, usage)
-}
-
--func (w *Writer) columnate() error {
-- words := bytes.Split(w.buf, []byte{'\n'})
-- w.buf = nil
-- if len(words[len(words)-1]) == 0 {
-- words = words[:len(words)-1]
-- }
-- maxwidth := 0
-- for _, wd := range words {
-- if n := utf8.RuneCount(wd); n > maxwidth {
-- maxwidth = n
-- }
-- }
-- maxwidth++ // space char
-- wordsPerLine := w.width / maxwidth
-- if wordsPerLine <= 0 {
-- wordsPerLine = 1
-- }
-- nlines := (len(words) + wordsPerLine - 1) / wordsPerLine
-- for i := 0; i < nlines; i++ {
-- col := 0
-- endcol := 0
-- for j := i; j < len(words); j += nlines {
-- endcol += maxwidth
-- _, err := w.w.Write(words[j])
-- if err != nil {
-- return err
-- }
-- col += utf8.RuneCount(words[j])
-- if j+nlines < len(words) {
-- for col < endcol {
-- _, err := w.w.Write([]byte{' '})
-- if err != nil {
-- return err
-- }
-- col++
-- }
-- }
-- }
-- _, err := w.w.Write([]byte{'\n'})
-- if err != nil {
-- return err
-- }
-- }
-- return nil
+-// BoolVar defines a bool flag with specified name, default value, and usage string.
+-// The argument p points to a bool variable in which to store the value of the flag.
+-func BoolVar(p *bool, name string, value bool, usage string) {
+- CommandLine.VarP(newBoolValue(value, p), name, "", usage)
-}
-diff --git a/Godeps/_workspace/src/github.com/kr/text/colwriter/column_test.go b/Godeps/_workspace/src/github.com/kr/text/colwriter/column_test.go
+-
+-// Like BoolVar, but accepts a shorthand letter that can be used after a single dash.
+-func BoolVarP(p *bool, name, shorthand string, value bool, usage string) {
+- CommandLine.VarP(newBoolValue(value, p), name, shorthand, usage)
+-}
+-
+-// Bool defines a bool flag with specified name, default value, and usage string.
+-// The return value is the address of a bool variable that stores the value of the flag.
+-func (f *FlagSet) Bool(name string, value bool, usage string) *bool {
+- p := new(bool)
+- f.BoolVarP(p, name, "", value, usage)
+- return p
+-}
+-
+-// Like Bool, but accepts a shorthand letter that can be used after a single dash.
+-func (f *FlagSet) BoolP(name, shorthand string, value bool, usage string) *bool {
+- p := new(bool)
+- f.BoolVarP(p, name, shorthand, value, usage)
+- return p
+-}
+-
+-// Bool defines a bool flag with specified name, default value, and usage string.
+-// The return value is the address of a bool variable that stores the value of the flag.
+-func Bool(name string, value bool, usage string) *bool {
+- return CommandLine.BoolP(name, "", value, usage)
+-}
+-
+-// Like Bool, but accepts a shorthand letter that can be used after a single dash.
+-func BoolP(name, shorthand string, value bool, usage string) *bool {
+- return CommandLine.BoolP(name, shorthand, value, usage)
+-}
+diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/duration.go b/Godeps/_workspace/src/github.com/spf13/pflag/duration.go
deleted file mode 100644
-index 8d0bf8f..0000000
---- a/Godeps/_workspace/src/github.com/kr/text/colwriter/column_test.go
+index 66ed7ac..0000000
+--- a/Godeps/_workspace/src/github.com/spf13/pflag/duration.go
+++ /dev/null
-@@ -1,90 +0,0 @@
--package colwriter
+@@ -1,71 +0,0 @@
+-package pflag
-
--import (
-- "bytes"
-- "testing"
--)
+-import "time"
-
--var src = `
--.git
--.gitignore
--.godir
--Procfile:
--README.md
--api.go
--apps.go
--auth.go
--darwin.go
--data.go
--dyno.go:
--env.go
--git.go
--help.go
--hkdist
--linux.go
--ls.go
--main.go
--plugin.go
--run.go
--scale.go
--ssh.go
--tail.go
--term
--unix.go
--update.go
--version.go
--windows.go
--`[1:]
+-// -- time.Duration Value
+-type durationValue time.Duration
-
--var tests = []struct{
-- wid int
-- flag uint
-- src string
-- want string
--}{
-- {80, 0, "", ""},
-- {80, 0, src, `
--.git README.md darwin.go git.go ls.go scale.go unix.go
--.gitignore api.go data.go help.go main.go ssh.go update.go
--.godir apps.go dyno.go: hkdist plugin.go tail.go version.go
--Procfile: auth.go env.go linux.go run.go term windows.go
--`[1:]},
-- {80, BreakOnColon, src, `
--.git .gitignore .godir
+-func newDurationValue(val time.Duration, p *time.Duration) *durationValue {
+- *p = val
+- return (*durationValue)(p)
+-}
-
--Procfile:
--README.md api.go apps.go auth.go darwin.go data.go
+-func (d *durationValue) Set(s string) error {
+- v, err := time.ParseDuration(s)
+- *d = durationValue(v)
+- return err
+-}
-
--dyno.go:
--env.go hkdist main.go scale.go term version.go
--git.go linux.go plugin.go ssh.go unix.go windows.go
--help.go ls.go run.go tail.go update.go
--`[1:]},
-- {20, 0, `
--Hello
--Γειά σου
--안녕
--今日は
--`[1:], `
--Hello 안녕
--Γειά σου 今日は
--`[1:]},
+-func (d *durationValue) Type() string {
+- return "duration"
-}
-
--func TestWriter(t *testing.T) {
-- for _, test := range tests {
-- b := new(bytes.Buffer)
-- w := NewWriter(b, test.wid, test.flag)
-- if _, err := w.Write([]byte(test.src)); err != nil {
-- t.Error(err)
-- }
-- if err := w.Flush(); err != nil {
-- t.Error(err)
-- }
-- if g := b.String(); test.want != g {
-- t.Log("\n" + test.want)
-- t.Log("\n" + g)
-- t.Errorf("%q != %q", test.want, g)
-- }
-- }
+-func (d *durationValue) String() string { return (*time.Duration)(d).String() }
+-
+-// DurationVar defines a time.Duration flag with specified name, default value, and usage string.
+-// The argument p points to a time.Duration variable in which to store the value of the flag.
+-func (f *FlagSet) DurationVar(p *time.Duration, name string, value time.Duration, usage string) {
+- f.VarP(newDurationValue(value, p), name, "", usage)
-}
-diff --git a/Godeps/_workspace/src/github.com/kr/text/doc.go b/Godeps/_workspace/src/github.com/kr/text/doc.go
-deleted file mode 100644
-index cf4c198..0000000
---- a/Godeps/_workspace/src/github.com/kr/text/doc.go
-+++ /dev/null
-@@ -1,3 +0,0 @@
--// Package text provides rudimentary functions for manipulating text in
--// paragraphs.
--package text
-diff --git a/Godeps/_workspace/src/github.com/kr/text/indent.go b/Godeps/_workspace/src/github.com/kr/text/indent.go
-deleted file mode 100644
-index 4ebac45..0000000
---- a/Godeps/_workspace/src/github.com/kr/text/indent.go
-+++ /dev/null
-@@ -1,74 +0,0 @@
--package text
-
--import (
-- "io"
--)
+-// Like DurationVar, but accepts a shorthand letter that can be used after a single dash.
+-func (f *FlagSet) DurationVarP(p *time.Duration, name, shorthand string, value time.Duration, usage string) {
+- f.VarP(newDurationValue(value, p), name, shorthand, usage)
+-}
-
--// Indent inserts prefix at the beginning of each non-empty line of s. The
--// end-of-line marker is NL.
--func Indent(s, prefix string) string {
-- return string(IndentBytes([]byte(s), []byte(prefix)))
+-// DurationVar defines a time.Duration flag with specified name, default value, and usage string.
+-// The argument p points to a time.Duration variable in which to store the value of the flag.
+-func DurationVar(p *time.Duration, name string, value time.Duration, usage string) {
+- CommandLine.VarP(newDurationValue(value, p), name, "", usage)
-}
-
--// IndentBytes inserts prefix at the beginning of each non-empty line of b.
--// The end-of-line marker is NL.
--func IndentBytes(b, prefix []byte) []byte {
-- var res []byte
-- bol := true
-- for _, c := range b {
-- if bol && c != '\n' {
-- res = append(res, prefix...)
-- }
-- res = append(res, c)
-- bol = c == '\n'
-- }
-- return res
+-// Like DurationVar, but accepts a shorthand letter that can be used after a single dash.
+-func DurationVarP(p *time.Duration, name, shorthand string, value time.Duration, usage string) {
+- CommandLine.VarP(newDurationValue(value, p), name, shorthand, usage)
-}
-
--// Writer indents each line of its input.
--type indentWriter struct {
-- w io.Writer
-- bol bool
-- pre [][]byte
-- sel int
-- off int
+-// Duration defines a time.Duration flag with specified name, default value, and usage string.
+-// The return value is the address of a time.Duration variable that stores the value of the flag.
+-func (f *FlagSet) Duration(name string, value time.Duration, usage string) *time.Duration {
+- p := new(time.Duration)
+- f.DurationVarP(p, name, "", value, usage)
+- return p
-}
-
--// NewIndentWriter makes a new write filter that indents the input
--// lines. Each line is prefixed in order with the corresponding
--// element of pre. If there are more lines than elements, the last
--// element of pre is repeated for each subsequent line.
--func NewIndentWriter(w io.Writer, pre ...[]byte) io.Writer {
-- return &indentWriter{
-- w: w,
-- pre: pre,
-- bol: true,
-- }
+-// Like Duration, but accepts a shorthand letter that can be used after a single dash.
+-func (f *FlagSet) DurationP(name, shorthand string, value time.Duration, usage string) *time.Duration {
+- p := new(time.Duration)
+- f.DurationVarP(p, name, shorthand, value, usage)
+- return p
-}
-
--// The only errors returned are from the underlying indentWriter.
--func (w *indentWriter) Write(p []byte) (n int, err error) {
-- for _, c := range p {
-- if w.bol {
-- var i int
-- i, err = w.w.Write(w.pre[w.sel][w.off:])
-- w.off += i
-- if err != nil {
-- return n, err
-- }
-- }
-- _, err = w.w.Write([]byte{c})
-- if err != nil {
-- return n, err
-- }
-- n++
-- w.bol = c == '\n'
-- if w.bol {
-- w.off = 0
-- if w.sel < len(w.pre)-1 {
-- w.sel++
-- }
-- }
-- }
-- return n, nil
+-// Duration defines a time.Duration flag with specified name, default value, and usage string.
+-// The return value is the address of a time.Duration variable that stores the value of the flag.
+-func Duration(name string, value time.Duration, usage string) *time.Duration {
+- return CommandLine.DurationP(name, "", value, usage)
-}
-diff --git a/Godeps/_workspace/src/github.com/kr/text/indent_test.go b/Godeps/_workspace/src/github.com/kr/text/indent_test.go
+-
+-// Like Duration, but accepts a shorthand letter that can be used after a single dash.
+-func DurationP(name, shorthand string, value time.Duration, usage string) *time.Duration {
+- return CommandLine.DurationP(name, shorthand, value, usage)
+-}
+diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/example_test.go b/Godeps/_workspace/src/github.com/spf13/pflag/example_test.go
deleted file mode 100644
-index 5c723ee..0000000
---- a/Godeps/_workspace/src/github.com/kr/text/indent_test.go
+index 03ebeaa..0000000
+--- a/Godeps/_workspace/src/github.com/spf13/pflag/example_test.go
+++ /dev/null
-@@ -1,119 +0,0 @@
--package text
+@@ -1,73 +0,0 @@
+-// Copyright 2012 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-// These examples demonstrate more intricate uses of the flag package.
+-package pflag_test
-
-import (
-- "bytes"
-- "testing"
+- "errors"
+- "fmt"
+- "strings"
+- "time"
+-
+- flag "github.com/ogier/pflag"
-)
-
--type T struct {
-- inp, exp, pre string
--}
+-// Example 1: A single string flag called "species" with default value "gopher".
+-var species = flag.String("species", "gopher", "the species we are studying")
-
--var tests = []T{
-- {
-- "The quick brown fox\njumps over the lazy\ndog.\nBut not quickly.\n",
-- "xxxThe quick brown fox\nxxxjumps over the lazy\nxxxdog.\nxxxBut not quickly.\n",
-- "xxx",
-- },
-- {
-- "The quick brown fox\njumps over the lazy\ndog.\n\nBut not quickly.",
-- "xxxThe quick brown fox\nxxxjumps over the lazy\nxxxdog.\n\nxxxBut not quickly.",
-- "xxx",
-- },
+-// Example 2: A flag with a shorthand letter.
+-var gopherType = flag.StringP("gopher_type", "g", "pocket", "the variety of gopher")
+-
+-// Example 3: A user-defined flag type, a slice of durations.
+-type interval []time.Duration
+-
+-// String is the method to format the flag's value, part of the flag.Value interface.
+-// The String method's output will be used in diagnostics.
+-func (i *interval) String() string {
+- return fmt.Sprint(*i)
-}
-
--func TestIndent(t *testing.T) {
-- for _, test := range tests {
-- got := Indent(test.inp, test.pre)
-- if got != test.exp {
-- t.Errorf("mismatch %q != %q", got, test.exp)
+-// Set is the method to set the flag value, part of the flag.Value interface.
+-// Set's argument is a string to be parsed to set the flag.
+-// It's a comma-separated list, so we split it.
+-func (i *interval) Set(value string) error {
+- // If we wanted to allow the flag to be set multiple times,
+- // accumulating values, we would delete this if statement.
+- // That would permit usages such as
+- // -deltaT 10s -deltaT 15s
+- // and other combinations.
+- if len(*i) > 0 {
+- return errors.New("interval flag already set")
+- }
+- for _, dt := range strings.Split(value, ",") {
+- duration, err := time.ParseDuration(dt)
+- if err != nil {
+- return err
- }
+- *i = append(*i, duration)
- }
+- return nil
-}
-
--type IndentWriterTest struct {
-- inp, exp string
-- pre []string
--}
+-// Define a flag to accumulate durations. Because it has a special type,
+-// we need to use the Var function and therefore create the flag during
+-// init.
-
--var ts = []IndentWriterTest{
-- {
-- `
--The quick brown fox
--jumps over the lazy
--dog.
--But not quickly.
--`[1:],
-- `
--xxxThe quick brown fox
--xxxjumps over the lazy
--xxxdog.
--xxxBut not quickly.
--`[1:],
-- []string{"xxx"},
-- },
-- {
-- `
--The quick brown fox
--jumps over the lazy
--dog.
--But not quickly.
--`[1:],
-- `
--xxaThe quick brown fox
--xxxjumps over the lazy
--xxxdog.
--xxxBut not quickly.
--`[1:],
-- []string{"xxa", "xxx"},
-- },
-- {
-- `
--The quick brown fox
--jumps over the lazy
--dog.
--But not quickly.
--`[1:],
-- `
--xxaThe quick brown fox
--xxbjumps over the lazy
--xxcdog.
--xxxBut not quickly.
--`[1:],
-- []string{"xxa", "xxb", "xxc", "xxx"},
-- },
-- {
-- `
--The quick brown fox
--jumps over the lazy
--dog.
+-var intervalFlag interval
-
--But not quickly.`[1:],
-- `
--xxaThe quick brown fox
--xxxjumps over the lazy
--xxxdog.
--xxx
--xxxBut not quickly.`[1:],
-- []string{"xxa", "xxx"},
-- },
+-func init() {
+- // Tie the command-line flag to the intervalFlag variable and
+- // set a usage message.
+- flag.Var(&intervalFlag, "deltaT", "comma-separated list of intervals to use between events")
-}
-
--func TestIndentWriter(t *testing.T) {
-- for _, test := range ts {
-- b := new(bytes.Buffer)
-- pre := make([][]byte, len(test.pre))
-- for i := range test.pre {
-- pre[i] = []byte(test.pre[i])
-- }
-- w := NewIndentWriter(b, pre...)
-- if _, err := w.Write([]byte(test.inp)); err != nil {
-- t.Error(err)
-- }
-- if got := b.String(); got != test.exp {
-- t.Errorf("mismatch %q != %q", got, test.exp)
-- t.Log(got)
-- t.Log(test.exp)
-- }
-- }
+-func Example() {
+- // All the interesting pieces are with the variables declared above, but
+- // to enable the flag package to see the flags defined there, one must
+- // execute, typically at the start of main (not init!):
+- // flag.Parse()
+- // We don't run it here because this is not a main function and
+- // the testing suite has already parsed the flags.
-}
-diff --git a/Godeps/_workspace/src/github.com/kr/text/mc/Readme b/Godeps/_workspace/src/github.com/kr/text/mc/Readme
+diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/export_test.go b/Godeps/_workspace/src/github.com/spf13/pflag/export_test.go
deleted file mode 100644
-index 519ddc0..0000000
---- a/Godeps/_workspace/src/github.com/kr/text/mc/Readme
+index 9318fee..0000000
+--- a/Godeps/_workspace/src/github.com/spf13/pflag/export_test.go
+++ /dev/null
-@@ -1,9 +0,0 @@
--Command mc prints in multiple columns.
--
-- Usage: mc [-] [-N] [file...]
+@@ -1,29 +0,0 @@
+-// Copyright 2010 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
--Mc splits the input into as many columns as will fit in N
--print positions. If the output is a tty, the default N is
--the number of characters in a terminal line; otherwise the
--default N is 80. Under option - each input line ending in
--a colon ':' is printed separately.
-diff --git a/Godeps/_workspace/src/github.com/kr/text/mc/mc.go b/Godeps/_workspace/src/github.com/kr/text/mc/mc.go
-deleted file mode 100644
-index 00169a3..0000000
---- a/Godeps/_workspace/src/github.com/kr/text/mc/mc.go
-+++ /dev/null
-@@ -1,62 +0,0 @@
--// Command mc prints in multiple columns.
--//
--// Usage: mc [-] [-N] [file...]
--//
--// Mc splits the input into as many columns as will fit in N
--// print positions. If the output is a tty, the default N is
--// the number of characters in a terminal line; otherwise the
--// default N is 80. Under option - each input line ending in
--// a colon ':' is printed separately.
--package main
+-package pflag
-
-import (
-- "github.com/kr/pty"
-- "github.com/kr/text/colwriter"
-- "io"
-- "log"
+- "io/ioutil"
- "os"
-- "strconv"
-)
-
--func main() {
-- var width int
-- var flag uint
-- args := os.Args[1:]
-- for len(args) > 0 && len(args[0]) > 0 && args[0][0] == '-' {
-- if len(args[0]) > 1 {
-- width, _ = strconv.Atoi(args[0][1:])
-- } else {
-- flag |= colwriter.BreakOnColon
-- }
-- args = args[1:]
-- }
-- if width < 1 {
-- _, width, _ = pty.Getsize(os.Stdout)
-- }
-- if width < 1 {
-- width = 80
-- }
+-// Additional routines compiled into the package only during testing.
-
-- w := colwriter.NewWriter(os.Stdout, width, flag)
-- if len(args) > 0 {
-- for _, s := range args {
-- if f, err := os.Open(s); err == nil {
-- copyin(w, f)
-- f.Close()
-- } else {
-- log.Println(err)
-- }
-- }
-- } else {
-- copyin(w, os.Stdin)
+-// ResetForTesting clears all flag state and sets the usage function as directed.
+-// After calling ResetForTesting, parse errors in flag handling will not
+-// exit the program.
+-func ResetForTesting(usage func()) {
+- CommandLine = &FlagSet{
+- name: os.Args[0],
+- errorHandling: ContinueOnError,
+- output: ioutil.Discard,
- }
+- Usage = usage
-}
-
--func copyin(w *colwriter.Writer, r io.Reader) {
-- if _, err := io.Copy(w, r); err != nil {
-- log.Println(err)
-- }
-- if err := w.Flush(); err != nil {
-- log.Println(err)
-- }
+-// GetCommandLine returns the default FlagSet.
+-func GetCommandLine() *FlagSet {
+- return CommandLine
-}
-diff --git a/Godeps/_workspace/src/github.com/kr/text/wrap.go b/Godeps/_workspace/src/github.com/kr/text/wrap.go
+diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/flag.go b/Godeps/_workspace/src/github.com/spf13/pflag/flag.go
deleted file mode 100644
-index ca88565..0000000
---- a/Godeps/_workspace/src/github.com/kr/text/wrap.go
+index 47761a0..0000000
+--- a/Godeps/_workspace/src/github.com/spf13/pflag/flag.go
+++ /dev/null
-@@ -1,86 +0,0 @@
--package text
+@@ -1,621 +0,0 @@
+-// Copyright 2009 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-/*
+- pflag is a drop-in replacement for Go's flag package, implementing
+- POSIX/GNU-style --flags.
+-
+- pflag is compatible with the GNU extensions to the POSIX recommendations
+- for command-line options. See
+- http://www.gnu.org/software/libc/manual/html_node/Argument-Syntax.html
+-
+- Usage:
+-
+- pflag is a drop-in replacement of Go's native flag package. If you import
+- pflag under the name "flag" then all code should continue to function
+- with no changes.
+-
+- import flag "github.com/ogier/pflag"
+-
+- There is one exception to this: if you directly instantiate the Flag struct
+- there is one more field "Shorthand" that you will need to set.
+- Most code never instantiates this struct directly, and instead uses
+- functions such as String(), BoolVar(), and Var(), and is therefore
+- unaffected.
+-
+- Define flags using flag.String(), Bool(), Int(), etc.
+-
+- This declares an integer flag, -flagname, stored in the pointer ip, with type *int.
+- var ip = flag.Int("flagname", 1234, "help message for flagname")
+- If you like, you can bind the flag to a variable using the Var() functions.
+- var flagvar int
+- func init() {
+- flag.IntVar(&flagvar, "flagname", 1234, "help message for flagname")
+- }
+- Or you can create custom flags that satisfy the Value interface (with
+- pointer receivers) and couple them to flag parsing by
+- flag.Var(&flagVal, "name", "help message for flagname")
+- For such flags, the default value is just the initial value of the variable.
+-
+- After all flags are defined, call
+- flag.Parse()
+- to parse the command line into the defined flags.
+-
+- Flags may then be used directly. If you're using the flags themselves,
+- they are all pointers; if you bind to variables, they're values.
+- fmt.Println("ip has value ", *ip)
+- fmt.Println("flagvar has value ", flagvar)
+-
+- After parsing, the arguments after the flag are available as the
+- slice flag.Args() or individually as flag.Arg(i).
+- The arguments are indexed from 0 through flag.NArg()-1.
+-
+- The pflag package also defines some new functions that are not in flag,
+- that give one-letter shorthands for flags. You can use these by appending
+- 'P' to the name of any function that defines a flag.
+- var ip = flag.IntP("flagname", "f", 1234, "help message")
+- var flagvar bool
+- func init() {
+- flag.BoolVarP("boolname", "b", true, "help message")
+- }
+- flag.VarP(&flagVar, "varname", "v", 1234, "help message")
+- Shorthand letters can be used with single dashes on the command line.
+- Boolean shorthand flags can be combined with other shorthand flags.
+-
+- Command line flag syntax:
+- --flag // boolean flags only
+- --flag=x
+-
+- Unlike the flag package, a single dash before an option means something
+- different than a double dash. Single dashes signify a series of shorthand
+- letters for flags. All but the last shorthand letter must be boolean flags.
+- // boolean flags
+- -f
+- -abc
+- // non-boolean flags
+- -n 1234
+- -Ifile
+- // mixed
+- -abcs "hello"
+- -abcn1234
+-
+- Flag parsing stops after the terminator "--". Unlike the flag package,
+- flags can be interspersed with arguments anywhere on the command line
+- before this terminator.
+-
+- Integer flags accept 1234, 0664, 0x1234 and may be negative.
+- Boolean flags (in their long form) accept 1, 0, t, f, true, false,
+- TRUE, FALSE, True, False.
+- Duration flags accept any input valid for time.ParseDuration.
+-
+- The default set of command-line flags is controlled by
+- top-level functions. The FlagSet type allows one to define
+- independent sets of flags, such as to implement subcommands
+- in a command-line interface. The methods of FlagSet are
+- analogous to the top-level functions for the command-line
+- flag set.
+-*/
+-package pflag
-
-import (
- "bytes"
-- "math"
+- "errors"
+- "fmt"
+- "io"
+- "os"
+- "sort"
+- "strings"
-)
-
--var (
-- nl = []byte{'\n'}
-- sp = []byte{' '}
+-// ErrHelp is the error returned if the flag -help is invoked but no such flag is defined.
+-var ErrHelp = errors.New("pflag: help requested")
+-
+-// ErrorHandling defines how to handle flag parsing errors.
+-type ErrorHandling int
+-
+-const (
+- ContinueOnError ErrorHandling = iota
+- ExitOnError
+- PanicOnError
-)
-
--const defaultPenalty = 1e5
+-// A FlagSet represents a set of defined flags.
+-type FlagSet struct {
+- // Usage is the function called when an error occurs while parsing flags.
+- // The field is a function (not a method) that may be changed to point to
+- // a custom error handler.
+- Usage func()
-
--// Wrap wraps s into a paragraph of lines of length lim, with minimal
--// raggedness.
--func Wrap(s string, lim int) string {
-- return string(WrapBytes([]byte(s), lim))
+- name string
+- parsed bool
+- actual map[string]*Flag
+- formal map[string]*Flag
+- shorthands map[byte]*Flag
+- args []string // arguments after flags
+- exitOnError bool // does the program exit if there's an error?
+- errorHandling ErrorHandling
+- output io.Writer // nil means stderr; use out() accessor
+- interspersed bool // allow interspersed option/non-option args
-}
-
--// WrapBytes wraps b into a paragraph of lines of length lim, with minimal
--// raggedness.
--func WrapBytes(b []byte, lim int) []byte {
-- words := bytes.Split(bytes.Replace(bytes.TrimSpace(b), nl, sp, -1), sp)
-- var lines [][]byte
-- for _, line := range WrapWords(words, 1, lim, defaultPenalty) {
-- lines = append(lines, bytes.Join(line, sp))
-- }
-- return bytes.Join(lines, nl)
+-// A Flag represents the state of a flag.
+-type Flag struct {
+- Name string // name as it appears on command line
+- Shorthand string // one-letter abbreviated flag
+- Usage string // help message
+- Value Value // value as set
+- DefValue string // default value (as text); for usage message
+- Changed bool // If the user set the value (or if left to default)
-}
-
--// WrapWords is the low-level line-breaking algorithm, useful if you need more
--// control over the details of the text wrapping process. For most uses, either
--// Wrap or WrapBytes will be sufficient and more convenient.
--//
--// WrapWords splits a list of words into lines with minimal "raggedness",
--// treating each byte as one unit, accounting for spc units between adjacent
--// words on each line, and attempting to limit lines to lim units. Raggedness
--// is the total error over all lines, where error is the square of the
--// difference of the length of the line and lim. Too-long lines (which only
--// happen when a single word is longer than lim units) have pen penalty units
--// added to the error.
--func WrapWords(words [][]byte, spc, lim, pen int) [][][]byte {
-- n := len(words)
--
-- length := make([][]int, n)
-- for i := 0; i < n; i++ {
-- length[i] = make([]int, n)
-- length[i][i] = len(words[i])
-- for j := i + 1; j < n; j++ {
-- length[i][j] = length[i][j-1] + spc + len(words[j])
-- }
-- }
+-// Value is the interface to the dynamic value stored in a flag.
+-// (The default value is represented as a string.)
+-type Value interface {
+- String() string
+- Set(string) error
+- Type() string
+-}
-
-- nbrk := make([]int, n)
-- cost := make([]int, n)
-- for i := range cost {
-- cost[i] = math.MaxInt32
+-// sortFlags returns the flags as a slice in lexicographical sorted order.
+-func sortFlags(flags map[string]*Flag) []*Flag {
+- list := make(sort.StringSlice, len(flags))
+- i := 0
+- for _, f := range flags {
+- list[i] = f.Name
+- i++
- }
-- for i := n - 1; i >= 0; i-- {
-- if length[i][n-1] <= lim {
-- cost[i] = 0
-- nbrk[i] = n
-- } else {
-- for j := i + 1; j < n; j++ {
-- d := lim - length[i][j-1]
-- c := d*d + cost[j]
-- if length[i][j-1] > lim {
-- c += pen // too-long lines get a worse penalty
-- }
-- if c < cost[i] {
-- cost[i] = c
-- nbrk[i] = j
-- }
-- }
-- }
+- list.Sort()
+- result := make([]*Flag, len(list))
+- for i, name := range list {
+- result[i] = flags[name]
- }
+- return result
+-}
-
-- var lines [][][]byte
-- i := 0
-- for i < n {
-- lines = append(lines, words[i:nbrk[i]])
-- i = nbrk[i]
+-func (f *FlagSet) out() io.Writer {
+- if f.output == nil {
+- return os.Stderr
- }
-- return lines
+- return f.output
-}
-diff --git a/Godeps/_workspace/src/github.com/kr/text/wrap_test.go b/Godeps/_workspace/src/github.com/kr/text/wrap_test.go
-deleted file mode 100644
-index 90f065c..0000000
---- a/Godeps/_workspace/src/github.com/kr/text/wrap_test.go
-+++ /dev/null
-@@ -1,44 +0,0 @@
--package text
--
--import (
-- "bytes"
-- "testing"
--)
-
--var text = "The quick brown fox jumps over the lazy dog."
+-// SetOutput sets the destination for usage and error messages.
+-// If output is nil, os.Stderr is used.
+-func (f *FlagSet) SetOutput(output io.Writer) {
+- f.output = output
+-}
-
--func TestWrap(t *testing.T) {
-- exp := [][]string{
-- {"The", "quick", "brown", "fox"},
-- {"jumps", "over", "the", "lazy", "dog."},
-- }
-- words := bytes.Split([]byte(text), sp)
-- got := WrapWords(words, 1, 24, defaultPenalty)
-- if len(exp) != len(got) {
-- t.Fail()
-- }
-- for i := range exp {
-- if len(exp[i]) != len(got[i]) {
-- t.Fail()
-- }
-- for j := range exp[i] {
-- if exp[i][j] != string(got[i][j]) {
-- t.Fatal(i, exp[i][j], got[i][j])
-- }
-- }
+-// VisitAll visits the flags in lexicographical order, calling fn for each.
+-// It visits all flags, even those not set.
+-func (f *FlagSet) VisitAll(fn func(*Flag)) {
+- for _, flag := range sortFlags(f.formal) {
+- fn(flag)
- }
-}
-
--func TestWrapNarrow(t *testing.T) {
-- exp := "The\nquick\nbrown\nfox\njumps\nover\nthe\nlazy\ndog."
-- if Wrap(text, 5) != exp {
-- t.Fail()
+-func (f *FlagSet) HasFlags() bool {
+- return len(f.formal) > 0
+-}
+-
+-// VisitAll visits the command-line flags in lexicographical order, calling
+-// fn for each. It visits all flags, even those not set.
+-func VisitAll(fn func(*Flag)) {
+- CommandLine.VisitAll(fn)
+-}
+-
+-// Visit visits the flags in lexicographical order, calling fn for each.
+-// It visits only those flags that have been set.
+-func (f *FlagSet) Visit(fn func(*Flag)) {
+- for _, flag := range sortFlags(f.actual) {
+- fn(flag)
- }
-}
-
--func TestWrapOneLine(t *testing.T) {
-- exp := "The quick brown fox jumps over the lazy dog."
-- if Wrap(text, 500) != exp {
-- t.Fail()
-- }
+-// Visit visits the command-line flags in lexicographical order, calling fn
+-// for each. It visits only those flags that have been set.
+-func Visit(fn func(*Flag)) {
+- CommandLine.Visit(fn)
-}
-diff --git a/Godeps/_workspace/src/github.com/mitchellh/goamz/aws/attempt.go b/Godeps/_workspace/src/github.com/mitchellh/goamz/aws/attempt.go
-deleted file mode 100644
-index c0654f5..0000000
---- a/Godeps/_workspace/src/github.com/mitchellh/goamz/aws/attempt.go
-+++ /dev/null
-@@ -1,74 +0,0 @@
--package aws
--
--import (
-- "time"
--)
-
--// AttemptStrategy represents a strategy for waiting for an action
--// to complete successfully. This is an internal type used by the
--// implementation of other goamz packages.
--type AttemptStrategy struct {
-- Total time.Duration // total duration of attempt.
-- Delay time.Duration // interval between each try in the burst.
-- Min int // minimum number of retries; overrides Total
+-// Lookup returns the Flag structure of the named flag, returning nil if none exists.
+-func (f *FlagSet) Lookup(name string) *Flag {
+- return f.formal[name]
-}
-
--type Attempt struct {
-- strategy AttemptStrategy
-- last time.Time
-- end time.Time
-- force bool
-- count int
+-// Lookup returns the Flag structure of the named command-line flag,
+-// returning nil if none exists.
+-func Lookup(name string) *Flag {
+- return CommandLine.formal[name]
-}
-
--// Start begins a new sequence of attempts for the given strategy.
--func (s AttemptStrategy) Start() *Attempt {
-- now := time.Now()
-- return &Attempt{
-- strategy: s,
-- last: now,
-- end: now.Add(s.Total),
-- force: true,
+-// Set sets the value of the named flag.
+-func (f *FlagSet) Set(name, value string) error {
+- flag, ok := f.formal[name]
+- if !ok {
+- return fmt.Errorf("no such flag -%v", name)
- }
--}
--
--// Next waits until it is time to perform the next attempt or returns
--// false if it is time to stop trying.
--func (a *Attempt) Next() bool {
-- now := time.Now()
-- sleep := a.nextSleep(now)
-- if !a.force && !now.Add(sleep).Before(a.end) && a.strategy.Min <= a.count {
-- return false
+- err := flag.Value.Set(value)
+- if err != nil {
+- return err
- }
-- a.force = false
-- if sleep > 0 && a.count > 0 {
-- time.Sleep(sleep)
-- now = time.Now()
+- if f.actual == nil {
+- f.actual = make(map[string]*Flag)
- }
-- a.count++
-- a.last = now
-- return true
+- f.actual[name] = flag
+- f.Lookup(name).Changed = true
+- return nil
-}
-
--func (a *Attempt) nextSleep(now time.Time) time.Duration {
-- sleep := a.strategy.Delay - now.Sub(a.last)
-- if sleep < 0 {
-- return 0
-- }
-- return sleep
+-// Set sets the value of the named command-line flag.
+-func Set(name, value string) error {
+- return CommandLine.Set(name, value)
-}
-
--// HasNext returns whether another attempt will be made if the current
--// one fails. If it returns true, the following call to Next is
--// guaranteed to return true.
--func (a *Attempt) HasNext() bool {
-- if a.force || a.strategy.Min > a.count {
-- return true
-- }
-- now := time.Now()
-- if now.Add(a.nextSleep(now)).Before(a.end) {
-- a.force = true
-- return true
-- }
-- return false
+-// PrintDefaults prints, to standard error unless configured
+-// otherwise, the default values of all defined flags in the set.
+-func (f *FlagSet) PrintDefaults() {
+- f.VisitAll(func(flag *Flag) {
+- format := "--%s=%s: %s\n"
+- if _, ok := flag.Value.(*stringValue); ok {
+- // put quotes on the value
+- format = "--%s=%q: %s\n"
+- }
+- if len(flag.Shorthand) > 0 {
+- format = " -%s, " + format
+- } else {
+- format = " %s " + format
+- }
+- fmt.Fprintf(f.out(), format, flag.Shorthand, flag.Name, flag.DefValue, flag.Usage)
+- })
-}
-diff --git a/Godeps/_workspace/src/github.com/mitchellh/goamz/aws/attempt_test.go b/Godeps/_workspace/src/github.com/mitchellh/goamz/aws/attempt_test.go
-deleted file mode 100644
-index 1fda5bf..0000000
---- a/Godeps/_workspace/src/github.com/mitchellh/goamz/aws/attempt_test.go
-+++ /dev/null
-@@ -1,57 +0,0 @@
--package aws_test
-
--import (
-- "github.com/mitchellh/goamz/aws"
-- . "github.com/motain/gocheck"
-- "time"
--)
+-func (f *FlagSet) FlagUsages() string {
+- x := new(bytes.Buffer)
-
--func (S) TestAttemptTiming(c *C) {
-- testAttempt := aws.AttemptStrategy{
-- Total: 0.25e9,
-- Delay: 0.1e9,
-- }
-- want := []time.Duration{0, 0.1e9, 0.2e9, 0.2e9}
-- got := make([]time.Duration, 0, len(want)) // avoid allocation when testing timing
-- t0 := time.Now()
-- for a := testAttempt.Start(); a.Next(); {
-- got = append(got, time.Now().Sub(t0))
-- }
-- got = append(got, time.Now().Sub(t0))
-- c.Assert(got, HasLen, len(want))
-- const margin = 0.01e9
-- for i, got := range want {
-- lo := want[i] - margin
-- hi := want[i] + margin
-- if got < lo || got > hi {
-- c.Errorf("attempt %d want %g got %g", i, want[i].Seconds(), got.Seconds())
+- f.VisitAll(func(flag *Flag) {
+- format := "--%s=%s: %s\n"
+- if _, ok := flag.Value.(*stringValue); ok {
+- // put quotes on the value
+- format = "--%s=%q: %s\n"
- }
-- }
+- if len(flag.Shorthand) > 0 {
+- format = " -%s, " + format
+- } else {
+- format = " %s " + format
+- }
+- fmt.Fprintf(x, format, flag.Shorthand, flag.Name, flag.DefValue, flag.Usage)
+- })
+-
+- return x.String()
-}
-
--func (S) TestAttemptNextHasNext(c *C) {
-- a := aws.AttemptStrategy{}.Start()
-- c.Assert(a.Next(), Equals, true)
-- c.Assert(a.Next(), Equals, false)
+-// PrintDefaults prints to standard error the default values of all defined command-line flags.
+-func PrintDefaults() {
+- CommandLine.PrintDefaults()
+-}
-
-- a = aws.AttemptStrategy{}.Start()
-- c.Assert(a.Next(), Equals, true)
-- c.Assert(a.HasNext(), Equals, false)
-- c.Assert(a.Next(), Equals, false)
+-// defaultUsage is the default function to print a usage message.
+-func defaultUsage(f *FlagSet) {
+- fmt.Fprintf(f.out(), "Usage of %s:\n", f.name)
+- f.PrintDefaults()
+-}
-
-- a = aws.AttemptStrategy{Total: 2e8}.Start()
-- c.Assert(a.Next(), Equals, true)
-- c.Assert(a.HasNext(), Equals, true)
-- time.Sleep(2e8)
-- c.Assert(a.HasNext(), Equals, true)
-- c.Assert(a.Next(), Equals, true)
-- c.Assert(a.Next(), Equals, false)
+-// NOTE: Usage is not just defaultUsage(CommandLine)
+-// because it serves (via godoc flag Usage) as the example
+-// for how to write your own usage function.
-
-- a = aws.AttemptStrategy{Total: 1e8, Min: 2}.Start()
-- time.Sleep(1e8)
-- c.Assert(a.Next(), Equals, true)
-- c.Assert(a.HasNext(), Equals, true)
-- c.Assert(a.Next(), Equals, true)
-- c.Assert(a.HasNext(), Equals, false)
-- c.Assert(a.Next(), Equals, false)
+-// Usage prints to standard error a usage message documenting all defined command-line flags.
+-// The function is a variable that may be changed to point to a custom function.
+-var Usage = func() {
+- fmt.Fprintf(os.Stderr, "Usage of %s:\n", os.Args[0])
+- PrintDefaults()
-}
-diff --git a/Godeps/_workspace/src/github.com/mitchellh/goamz/aws/aws.go b/Godeps/_workspace/src/github.com/mitchellh/goamz/aws/aws.go
-deleted file mode 100644
-index c304d55..0000000
---- a/Godeps/_workspace/src/github.com/mitchellh/goamz/aws/aws.go
-+++ /dev/null
-@@ -1,423 +0,0 @@
--//
--// goamz - Go packages to interact with the Amazon Web Services.
--//
--// https://wiki.ubuntu.com/goamz
--//
--// Copyright (c) 2011 Canonical Ltd.
--//
--// Written by Gustavo Niemeyer <gustavo.niemeyer at canonical.com>
--//
--package aws
-
--import (
-- "encoding/json"
-- "errors"
-- "fmt"
-- "github.com/vaughan0/go-ini"
-- "io/ioutil"
-- "os"
--)
+-// NFlag returns the number of flags that have been set.
+-func (f *FlagSet) NFlag() int { return len(f.actual) }
-
--// Region defines the URLs where AWS services may be accessed.
--//
--// See http://goo.gl/d8BP1 for more details.
--type Region struct {
-- Name string // the canonical name of this region.
-- EC2Endpoint string
-- S3Endpoint string
-- S3BucketEndpoint string // Not needed by AWS S3. Use ${bucket} for bucket name.
-- S3LocationConstraint bool // true if this region requires a LocationConstraint declaration.
-- S3LowercaseBucket bool // true if the region requires bucket names to be lower case.
-- SDBEndpoint string
-- SNSEndpoint string
-- SQSEndpoint string
-- IAMEndpoint string
-- ELBEndpoint string
-- AutoScalingEndpoint string
-- RdsEndpoint string
-- Route53Endpoint string
--}
+-// NFlag returns the number of command-line flags that have been set.
+-func NFlag() int { return len(CommandLine.actual) }
-
--var USGovWest = Region{
-- "us-gov-west-1",
-- "https://ec2.us-gov-west-1.amazonaws.com",
-- "https://s3-fips-us-gov-west-1.amazonaws.com",
-- "",
-- true,
-- true,
-- "",
-- "https://sns.us-gov-west-1.amazonaws.com",
-- "https://sqs.us-gov-west-1.amazonaws.com",
-- "https://iam.us-gov.amazonaws.com",
-- "https://elasticloadbalancing.us-gov-west-1.amazonaws.com",
-- "https://autoscaling.us-gov-west-1.amazonaws.com",
-- "https://rds.us-gov-west-1.amazonaws.com",
-- "https://route53.amazonaws.com",
+-// Arg returns the i'th argument. Arg(0) is the first remaining argument
+-// after flags have been processed.
+-func (f *FlagSet) Arg(i int) string {
+- if i < 0 || i >= len(f.args) {
+- return ""
+- }
+- return f.args[i]
-}
-
--var USEast = Region{
-- "us-east-1",
-- "https://ec2.us-east-1.amazonaws.com",
-- "https://s3.amazonaws.com",
-- "",
-- false,
-- false,
-- "https://sdb.amazonaws.com",
-- "https://sns.us-east-1.amazonaws.com",
-- "https://sqs.us-east-1.amazonaws.com",
-- "https://iam.amazonaws.com",
-- "https://elasticloadbalancing.us-east-1.amazonaws.com",
-- "https://autoscaling.us-east-1.amazonaws.com",
-- "https://rds.us-east-1.amazonaws.com",
-- "https://route53.amazonaws.com",
+-// Arg returns the i'th command-line argument. Arg(0) is the first remaining argument
+-// after flags have been processed.
+-func Arg(i int) string {
+- return CommandLine.Arg(i)
-}
-
--var USWest = Region{
-- "us-west-1",
-- "https://ec2.us-west-1.amazonaws.com",
-- "https://s3-us-west-1.amazonaws.com",
-- "",
-- true,
-- true,
-- "https://sdb.us-west-1.amazonaws.com",
-- "https://sns.us-west-1.amazonaws.com",
-- "https://sqs.us-west-1.amazonaws.com",
-- "https://iam.amazonaws.com",
-- "https://elasticloadbalancing.us-west-1.amazonaws.com",
-- "https://autoscaling.us-west-1.amazonaws.com",
-- "https://rds.us-west-1.amazonaws.com",
-- "https://route53.amazonaws.com",
--}
+-// NArg is the number of arguments remaining after flags have been processed.
+-func (f *FlagSet) NArg() int { return len(f.args) }
-
--var USWest2 = Region{
-- "us-west-2",
-- "https://ec2.us-west-2.amazonaws.com",
-- "https://s3-us-west-2.amazonaws.com",
-- "",
-- true,
-- true,
-- "https://sdb.us-west-2.amazonaws.com",
-- "https://sns.us-west-2.amazonaws.com",
-- "https://sqs.us-west-2.amazonaws.com",
-- "https://iam.amazonaws.com",
-- "https://elasticloadbalancing.us-west-2.amazonaws.com",
-- "https://autoscaling.us-west-2.amazonaws.com",
-- "https://rds.us-west-2.amazonaws.com",
-- "https://route53.amazonaws.com",
--}
+-// NArg is the number of arguments remaining after flags have been processed.
+-func NArg() int { return len(CommandLine.args) }
-
--var EUWest = Region{
-- "eu-west-1",
-- "https://ec2.eu-west-1.amazonaws.com",
-- "https://s3-eu-west-1.amazonaws.com",
-- "",
-- true,
-- true,
-- "https://sdb.eu-west-1.amazonaws.com",
-- "https://sns.eu-west-1.amazonaws.com",
-- "https://sqs.eu-west-1.amazonaws.com",
-- "https://iam.amazonaws.com",
-- "https://elasticloadbalancing.eu-west-1.amazonaws.com",
-- "https://autoscaling.eu-west-1.amazonaws.com",
-- "https://rds.eu-west-1.amazonaws.com",
-- "https://route53.amazonaws.com",
--}
+-// Args returns the non-flag arguments.
+-func (f *FlagSet) Args() []string { return f.args }
-
--var APSoutheast = Region{
-- "ap-southeast-1",
-- "https://ec2.ap-southeast-1.amazonaws.com",
-- "https://s3-ap-southeast-1.amazonaws.com",
-- "",
-- true,
-- true,
-- "https://sdb.ap-southeast-1.amazonaws.com",
-- "https://sns.ap-southeast-1.amazonaws.com",
-- "https://sqs.ap-southeast-1.amazonaws.com",
-- "https://iam.amazonaws.com",
-- "https://elasticloadbalancing.ap-southeast-1.amazonaws.com",
-- "https://autoscaling.ap-southeast-1.amazonaws.com",
-- "https://rds.ap-southeast-1.amazonaws.com",
-- "https://route53.amazonaws.com",
--}
+-// Args returns the non-flag command-line arguments.
+-func Args() []string { return CommandLine.args }
-
--var APSoutheast2 = Region{
-- "ap-southeast-2",
-- "https://ec2.ap-southeast-2.amazonaws.com",
-- "https://s3-ap-southeast-2.amazonaws.com",
-- "",
-- true,
-- true,
-- "https://sdb.ap-southeast-2.amazonaws.com",
-- "https://sns.ap-southeast-2.amazonaws.com",
-- "https://sqs.ap-southeast-2.amazonaws.com",
-- "https://iam.amazonaws.com",
-- "https://elasticloadbalancing.ap-southeast-2.amazonaws.com",
-- "https://autoscaling.ap-southeast-2.amazonaws.com",
-- "https://rds.ap-southeast-2.amazonaws.com",
-- "https://route53.amazonaws.com",
+-// Var defines a flag with the specified name and usage string. The type and
+-// value of the flag are represented by the first argument, of type Value, which
+-// typically holds a user-defined implementation of Value. For instance, the
+-// caller could create a flag that turns a comma-separated string into a slice
+-// of strings by giving the slice the methods of Value; in particular, Set would
+-// decompose the comma-separated string into the slice.
+-func (f *FlagSet) Var(value Value, name string, usage string) {
+- f.VarP(value, name, "", usage)
-}
-
--var APNortheast = Region{
-- "ap-northeast-1",
-- "https://ec2.ap-northeast-1.amazonaws.com",
-- "https://s3-ap-northeast-1.amazonaws.com",
-- "",
-- true,
-- true,
-- "https://sdb.ap-northeast-1.amazonaws.com",
-- "https://sns.ap-northeast-1.amazonaws.com",
-- "https://sqs.ap-northeast-1.amazonaws.com",
-- "https://iam.amazonaws.com",
-- "https://elasticloadbalancing.ap-northeast-1.amazonaws.com",
-- "https://autoscaling.ap-northeast-1.amazonaws.com",
-- "https://rds.ap-northeast-1.amazonaws.com",
-- "https://route53.amazonaws.com",
+-// Like Var, but accepts a shorthand letter that can be used after a single dash.
+-func (f *FlagSet) VarP(value Value, name, shorthand, usage string) {
+- // Remember the default value as a string; it won't change.
+- flag := &Flag{name, shorthand, usage, value, value.String(), false}
+- f.AddFlag(flag)
-}
-
--var SAEast = Region{
-- "sa-east-1",
-- "https://ec2.sa-east-1.amazonaws.com",
-- "https://s3-sa-east-1.amazonaws.com",
-- "",
-- true,
-- true,
-- "https://sdb.sa-east-1.amazonaws.com",
-- "https://sns.sa-east-1.amazonaws.com",
-- "https://sqs.sa-east-1.amazonaws.com",
-- "https://iam.amazonaws.com",
-- "https://elasticloadbalancing.sa-east-1.amazonaws.com",
-- "https://autoscaling.sa-east-1.amazonaws.com",
-- "https://rds.sa-east-1.amazonaws.com",
-- "https://route53.amazonaws.com",
--}
+-func (f *FlagSet) AddFlag(flag *Flag) {
+- _, alreadythere := f.formal[flag.Name]
+- if alreadythere {
+- msg := fmt.Sprintf("%s flag redefined: %s", f.name, flag.Name)
+- fmt.Fprintln(f.out(), msg)
+- panic(msg) // Happens only if flags are declared with identical names
+- }
+- if f.formal == nil {
+- f.formal = make(map[string]*Flag)
+- }
+- f.formal[flag.Name] = flag
-
--var CNNorth = Region{
-- "cn-north-1",
-- "https://ec2.cn-north-1.amazonaws.com.cn",
-- "https://s3.cn-north-1.amazonaws.com.cn",
-- "",
-- true,
-- true,
-- "",
-- "https://sns.cn-north-1.amazonaws.com.cn",
-- "https://sqs.cn-north-1.amazonaws.com.cn",
-- "https://iam.cn-north-1.amazonaws.com.cn",
-- "https://elasticloadbalancing.cn-north-1.amazonaws.com.cn",
-- "https://autoscaling.cn-north-1.amazonaws.com.cn",
-- "https://rds.cn-north-1.amazonaws.com.cn",
-- "https://route53.amazonaws.com",
+- if len(flag.Shorthand) == 0 {
+- return
+- }
+- if len(flag.Shorthand) > 1 {
+- fmt.Fprintf(f.out(), "%s shorthand more than ASCII character: %s\n", f.name, flag.Shorthand)
+- panic("shorthand is more than one character")
+- }
+- if f.shorthands == nil {
+- f.shorthands = make(map[byte]*Flag)
+- }
+- c := flag.Shorthand[0]
+- old, alreadythere := f.shorthands[c]
+- if alreadythere {
+- fmt.Fprintf(f.out(), "%s shorthand reused: %q for %s already used for %s\n", f.name, c, flag.Name, old.Name)
+- panic("shorthand redefinition")
+- }
+- f.shorthands[c] = flag
-}
-
--var Regions = map[string]Region{
-- APNortheast.Name: APNortheast,
-- APSoutheast.Name: APSoutheast,
-- APSoutheast2.Name: APSoutheast2,
-- EUWest.Name: EUWest,
-- USEast.Name: USEast,
-- USWest.Name: USWest,
-- USWest2.Name: USWest2,
-- SAEast.Name: SAEast,
-- USGovWest.Name: USGovWest,
-- CNNorth.Name: CNNorth,
+-// Var defines a flag with the specified name and usage string. The type and
+-// value of the flag are represented by the first argument, of type Value, which
+-// typically holds a user-defined implementation of Value. For instance, the
+-// caller could create a flag that turns a comma-separated string into a slice
+-// of strings by giving the slice the methods of Value; in particular, Set would
+-// decompose the comma-separated string into the slice.
+-func Var(value Value, name string, usage string) {
+- CommandLine.VarP(value, name, "", usage)
-}
-
--type Auth struct {
-- AccessKey, SecretKey, Token string
+-// Like Var, but accepts a shorthand letter that can be used after a single dash.
+-func VarP(value Value, name, shorthand, usage string) {
+- CommandLine.VarP(value, name, shorthand, usage)
-}
-
--var unreserved = make([]bool, 128)
--var hex = "0123456789ABCDEF"
+-// failf prints to standard error a formatted error and usage message and
+-// returns the error.
+-func (f *FlagSet) failf(format string, a ...interface{}) error {
+- err := fmt.Errorf(format, a...)
+- fmt.Fprintln(f.out(), err)
+- f.usage()
+- return err
+-}
-
--func init() {
-- // RFC3986
-- u := "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz01234567890-_.~"
-- for _, c := range u {
-- unreserved[c] = true
+-// usage calls the Usage method for the flag set, or the usage function if
+-// the flag set is CommandLine.
+-func (f *FlagSet) usage() {
+- if f == CommandLine {
+- Usage()
+- } else if f.Usage == nil {
+- defaultUsage(f)
+- } else {
+- f.Usage()
- }
-}
-
--type credentials struct {
-- Code string
-- LastUpdated string
-- Type string
-- AccessKeyId string
-- SecretAccessKey string
-- Token string
-- Expiration string
+-func (f *FlagSet) setFlag(flag *Flag, value string, origArg string) error {
+- if err := flag.Value.Set(value); err != nil {
+- return f.failf("invalid argument %q for %s: %v", value, origArg, err)
+- }
+- // mark as visited for Visit()
+- if f.actual == nil {
+- f.actual = make(map[string]*Flag)
+- }
+- f.actual[flag.Name] = flag
+- flag.Changed = true
+- return nil
-}
-
--// GetMetaData retrieves instance metadata about the current machine.
--//
--// See http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/AESDG-chapter-instancedata.html for more details.
--func GetMetaData(path string) (contents []byte, err error) {
-- url := "http://169.254.169.254/latest/meta-data/" + path
--
-- resp, err := RetryingClient.Get(url)
-- if err != nil {
+-func (f *FlagSet) parseLongArg(s string, args []string) (a []string, err error) {
+- a = args
+- if len(s) == 2 { // "--" terminates the flags
+- f.args = append(f.args, args...)
- return
- }
-- defer resp.Body.Close()
--
-- if resp.StatusCode != 200 {
-- err = fmt.Errorf("Code %d returned for url %s", resp.StatusCode, url)
+- name := s[2:]
+- if len(name) == 0 || name[0] == '-' || name[0] == '=' {
+- err = f.failf("bad flag syntax: %s", s)
- return
- }
--
-- body, err := ioutil.ReadAll(resp.Body)
-- if err != nil {
+- split := strings.SplitN(name, "=", 2)
+- name = split[0]
+- m := f.formal
+- flag, alreadythere := m[name] // BUG
+- if !alreadythere {
+- if name == "help" { // special case for nice help message.
+- f.usage()
+- return args, ErrHelp
+- }
+- err = f.failf("unknown flag: --%s", name)
- return
- }
-- return []byte(body), err
+- if len(split) == 1 {
+- if _, ok := flag.Value.(*boolValue); !ok {
+- err = f.failf("flag needs an argument: %s", s)
+- return
+- }
+- f.setFlag(flag, "true", s)
+- } else {
+- if e := f.setFlag(flag, split[1], s); e != nil {
+- err = e
+- return
+- }
+- }
+- return args, nil
-}
-
--func getInstanceCredentials() (cred credentials, err error) {
-- credentialPath := "iam/security-credentials/"
--
-- // Get the instance role
-- role, err := GetMetaData(credentialPath)
-- if err != nil {
-- return
-- }
+-func (f *FlagSet) parseShortArg(s string, args []string) (a []string, err error) {
+- a = args
+- shorthands := s[1:]
-
-- // Get the instance role credentials
-- credentialJSON, err := GetMetaData(credentialPath + string(role))
-- if err != nil {
-- return
+- for i := 0; i < len(shorthands); i++ {
+- c := shorthands[i]
+- flag, alreadythere := f.shorthands[c]
+- if !alreadythere {
+- if c == 'h' { // special case for nice help message.
+- f.usage()
+- err = ErrHelp
+- return
+- }
+- //TODO continue on error
+- err = f.failf("unknown shorthand flag: %q in -%s", c, shorthands)
+- if len(args) == 0 {
+- return
+- }
+- }
+- if alreadythere {
+- if _, ok := flag.Value.(*boolValue); ok {
+- f.setFlag(flag, "true", s)
+- continue
+- }
+- if i < len(shorthands)-1 {
+- if e := f.setFlag(flag, shorthands[i+1:], s); e != nil {
+- err = e
+- return
+- }
+- break
+- }
+- if len(args) == 0 {
+- err = f.failf("flag needs an argument: %q in -%s", c, shorthands)
+- return
+- }
+- if e := f.setFlag(flag, args[0], s); e != nil {
+- err = e
+- return
+- }
+- }
+- a = args[1:]
+- break // should be unnecessary
- }
-
-- err = json.Unmarshal([]byte(credentialJSON), &cred)
- return
-}
-
--// GetAuth creates an Auth based on either passed in credentials,
--// environment information or instance based role credentials.
--func GetAuth(accessKey string, secretKey string) (auth Auth, err error) {
-- // First try passed in credentials
-- if accessKey != "" && secretKey != "" {
-- return Auth{accessKey, secretKey, ""}, nil
-- }
--
-- // Next try to get auth from the environment
-- auth, err = SharedAuth()
-- if err == nil {
-- // Found auth, return
-- return
-- }
--
-- // Next try to get auth from the environment
-- auth, err = EnvAuth()
-- if err == nil {
-- // Found auth, return
-- return
-- }
+-func (f *FlagSet) parseArgs(args []string) (err error) {
+- for len(args) > 0 {
+- s := args[0]
+- args = args[1:]
+- if len(s) == 0 || s[0] != '-' || len(s) == 1 {
+- if !f.interspersed {
+- f.args = append(f.args, s)
+- f.args = append(f.args, args...)
+- return nil
+- }
+- f.args = append(f.args, s)
+- continue
+- }
-
-- // Next try getting auth from the instance role
-- cred, err := getInstanceCredentials()
-- if err == nil {
-- // Found auth, return
-- auth.AccessKey = cred.AccessKeyId
-- auth.SecretKey = cred.SecretAccessKey
-- auth.Token = cred.Token
-- return
+- if s[1] == '-' {
+- args, err = f.parseLongArg(s, args)
+- } else {
+- args, err = f.parseShortArg(s, args)
+- }
- }
-- err = errors.New("No valid AWS authentication found")
- return
-}
-
--// SharedAuth creates an Auth based on shared credentials stored in
--// $HOME/.aws/credentials. The AWS_PROFILE environment variables is used to
--// select the profile.
--func SharedAuth() (auth Auth, err error) {
-- var profileName = os.Getenv("AWS_PROFILE")
--
-- if profileName == "" {
-- profileName = "default"
-- }
--
-- var homeDir = os.Getenv("HOME")
-- if homeDir == "" {
-- err = errors.New("Could not get HOME")
-- return
-- }
--
-- var credentialsFile = homeDir + "/.aws/credentials"
-- file, err := ini.LoadFile(credentialsFile)
+-// Parse parses flag definitions from the argument list, which should not
+-// include the command name. Must be called after all flags in the FlagSet
+-// are defined and before flags are accessed by the program.
+-// The return value will be ErrHelp if -help was set but not defined.
+-func (f *FlagSet) Parse(arguments []string) error {
+- f.parsed = true
+- f.args = make([]string, 0, len(arguments))
+- err := f.parseArgs(arguments)
- if err != nil {
-- err = errors.New("Couldn't parse AWS credentials file")
-- return
-- }
--
-- var profile = file[profileName]
-- if profile == nil {
-- err = errors.New("Couldn't find profile in AWS credentials file")
-- return
+- switch f.errorHandling {
+- case ContinueOnError:
+- return err
+- case ExitOnError:
+- os.Exit(2)
+- case PanicOnError:
+- panic(err)
+- }
- }
+- return nil
+-}
-
-- auth.AccessKey = profile["aws_access_key_id"]
-- auth.SecretKey = profile["aws_secret_access_key"]
+-// Parsed reports whether f.Parse has been called.
+-func (f *FlagSet) Parsed() bool {
+- return f.parsed
+-}
-
-- if auth.AccessKey == "" {
-- err = errors.New("AWS_ACCESS_KEY_ID not found in environment in credentials file")
-- }
-- if auth.SecretKey == "" {
-- err = errors.New("AWS_SECRET_ACCESS_KEY not found in credentials file")
-- }
-- return
+-// Parse parses the command-line flags from os.Args[1:]. Must be called
+-// after all flags are defined and before flags are accessed by the program.
+-func Parse() {
+- // Ignore errors; CommandLine is set for ExitOnError.
+- CommandLine.Parse(os.Args[1:])
-}
-
--// EnvAuth creates an Auth based on environment information.
--// The AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY environment
--// For accounts that require a security token, it is read from AWS_SECURITY_TOKEN
--// variables are used.
--func EnvAuth() (auth Auth, err error) {
-- auth.AccessKey = os.Getenv("AWS_ACCESS_KEY_ID")
-- if auth.AccessKey == "" {
-- auth.AccessKey = os.Getenv("AWS_ACCESS_KEY")
-- }
+-// Whether to support interspersed option/non-option arguments.
+-func SetInterspersed(interspersed bool) {
+- CommandLine.SetInterspersed(interspersed)
+-}
-
-- auth.SecretKey = os.Getenv("AWS_SECRET_ACCESS_KEY")
-- if auth.SecretKey == "" {
-- auth.SecretKey = os.Getenv("AWS_SECRET_KEY")
-- }
+-// Parsed returns true if the command-line flags have been parsed.
+-func Parsed() bool {
+- return CommandLine.Parsed()
+-}
-
-- auth.Token = os.Getenv("AWS_SECURITY_TOKEN")
+-// The default set of command-line flags, parsed from os.Args.
+-var CommandLine = NewFlagSet(os.Args[0], ExitOnError)
-
-- if auth.AccessKey == "" {
-- err = errors.New("AWS_ACCESS_KEY_ID or AWS_ACCESS_KEY not found in environment")
-- }
-- if auth.SecretKey == "" {
-- err = errors.New("AWS_SECRET_ACCESS_KEY or AWS_SECRET_KEY not found in environment")
+-// NewFlagSet returns a new, empty flag set with the specified name and
+-// error handling property.
+-func NewFlagSet(name string, errorHandling ErrorHandling) *FlagSet {
+- f := &FlagSet{
+- name: name,
+- errorHandling: errorHandling,
+- interspersed: true,
- }
-- return
+- return f
-}
-
--// Encode takes a string and URI-encodes it in a way suitable
--// to be used in AWS signatures.
--func Encode(s string) string {
-- encode := false
-- for i := 0; i != len(s); i++ {
-- c := s[i]
-- if c > 127 || !unreserved[c] {
-- encode = true
-- break
-- }
-- }
-- if !encode {
-- return s
-- }
-- e := make([]byte, len(s)*3)
-- ei := 0
-- for i := 0; i != len(s); i++ {
-- c := s[i]
-- if c > 127 || !unreserved[c] {
-- e[ei] = '%'
-- e[ei+1] = hex[c>>4]
-- e[ei+2] = hex[c&0xF]
-- ei += 3
-- } else {
-- e[ei] = c
-- ei += 1
-- }
-- }
-- return string(e[:ei])
+-// Whether to support interspersed option/non-option arguments.
+-func (f *FlagSet) SetInterspersed(interspersed bool) {
+- f.interspersed = interspersed
-}
-diff --git a/Godeps/_workspace/src/github.com/mitchellh/goamz/aws/aws_test.go b/Godeps/_workspace/src/github.com/mitchellh/goamz/aws/aws_test.go
+-
+-// Init sets the name and error handling property for a flag set.
+-// By default, the zero FlagSet uses an empty name and the
+-// ContinueOnError error handling policy.
+-func (f *FlagSet) Init(name string, errorHandling ErrorHandling) {
+- f.name = name
+- f.errorHandling = errorHandling
+-}
+diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/flag_test.go b/Godeps/_workspace/src/github.com/spf13/pflag/flag_test.go
deleted file mode 100644
-index 78cbbaf..0000000
---- a/Godeps/_workspace/src/github.com/mitchellh/goamz/aws/aws_test.go
+index 4d95b15..0000000
+--- a/Godeps/_workspace/src/github.com/spf13/pflag/flag_test.go
+++ /dev/null
-@@ -1,203 +0,0 @@
--package aws_test
+@@ -1,354 +0,0 @@
+-// Copyright 2009 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-package pflag_test
-
-import (
-- "github.com/mitchellh/goamz/aws"
-- . "github.com/motain/gocheck"
+- "bytes"
+- "fmt"
- "io/ioutil"
- "os"
+- "sort"
- "strings"
- "testing"
--)
--
--func Test(t *testing.T) {
-- TestingT(t)
--}
--
--var _ = Suite(&S{})
+- "time"
-
--type S struct {
-- environ []string
--}
+- . "github.com/spf13/pflag"
+-)
-
--func (s *S) SetUpSuite(c *C) {
-- s.environ = os.Environ()
--}
+-var (
+- test_bool = Bool("test_bool", false, "bool value")
+- test_int = Int("test_int", 0, "int value")
+- test_int64 = Int64("test_int64", 0, "int64 value")
+- test_uint = Uint("test_uint", 0, "uint value")
+- test_uint64 = Uint64("test_uint64", 0, "uint64 value")
+- test_string = String("test_string", "0", "string value")
+- test_float64 = Float64("test_float64", 0, "float64 value")
+- test_duration = Duration("test_duration", 0, "time.Duration value")
+-)
-
--func (s *S) TearDownTest(c *C) {
-- os.Clearenv()
-- for _, kv := range s.environ {
-- l := strings.SplitN(kv, "=", 2)
-- os.Setenv(l[0], l[1])
+-func boolString(s string) string {
+- if s == "0" {
+- return "false"
- }
+- return "true"
-}
-
--func (s *S) TestSharedAuthNoHome(c *C) {
-- os.Clearenv()
-- os.Setenv("AWS_PROFILE", "foo")
-- _, err := aws.SharedAuth()
-- c.Assert(err, ErrorMatches, "Could not get HOME")
+-func TestEverything(t *testing.T) {
+- m := make(map[string]*Flag)
+- desired := "0"
+- visitor := func(f *Flag) {
+- if len(f.Name) > 5 && f.Name[0:5] == "test_" {
+- m[f.Name] = f
+- ok := false
+- switch {
+- case f.Value.String() == desired:
+- ok = true
+- case f.Name == "test_bool" && f.Value.String() == boolString(desired):
+- ok = true
+- case f.Name == "test_duration" && f.Value.String() == desired+"s":
+- ok = true
+- }
+- if !ok {
+- t.Error("Visit: bad value", f.Value.String(), "for", f.Name)
+- }
+- }
+- }
+- VisitAll(visitor)
+- if len(m) != 8 {
+- t.Error("VisitAll misses some flags")
+- for k, v := range m {
+- t.Log(k, *v)
+- }
+- }
+- m = make(map[string]*Flag)
+- Visit(visitor)
+- if len(m) != 0 {
+- t.Errorf("Visit sees unset flags")
+- for k, v := range m {
+- t.Log(k, *v)
+- }
+- }
+- // Now set all flags
+- Set("test_bool", "true")
+- Set("test_int", "1")
+- Set("test_int64", "1")
+- Set("test_uint", "1")
+- Set("test_uint64", "1")
+- Set("test_string", "1")
+- Set("test_float64", "1")
+- Set("test_duration", "1s")
+- desired = "1"
+- Visit(visitor)
+- if len(m) != 8 {
+- t.Error("Visit fails after set")
+- for k, v := range m {
+- t.Log(k, *v)
+- }
+- }
+- // Now test they're visited in sort order.
+- var flagNames []string
+- Visit(func(f *Flag) { flagNames = append(flagNames, f.Name) })
+- if !sort.StringsAreSorted(flagNames) {
+- t.Errorf("flag names not sorted: %v", flagNames)
+- }
-}
-
--func (s *S) TestSharedAuthNoCredentialsFile(c *C) {
-- os.Clearenv()
-- os.Setenv("AWS_PROFILE", "foo")
-- os.Setenv("HOME", "/tmp")
-- _, err := aws.SharedAuth()
-- c.Assert(err, ErrorMatches, "Couldn't parse AWS credentials file")
+-func TestUsage(t *testing.T) {
+- called := false
+- ResetForTesting(func() { called = true })
+- if GetCommandLine().Parse([]string{"--x"}) == nil {
+- t.Error("parse did not fail for unknown flag")
+- }
+- if !called {
+- t.Error("did not call Usage for unknown flag")
+- }
-}
-
--func (s *S) TestSharedAuthNoProfileInFile(c *C) {
-- os.Clearenv()
-- os.Setenv("AWS_PROFILE", "foo")
--
-- d, err := ioutil.TempDir("", "")
-- if err != nil {
-- panic(err)
+-func testParse(f *FlagSet, t *testing.T) {
+- if f.Parsed() {
+- t.Error("f.Parse() = true before Parse")
- }
-- defer os.RemoveAll(d)
--
-- err = os.Mkdir(d+"/.aws", 0755)
-- if err != nil {
-- panic(err)
+- boolFlag := f.Bool("bool", false, "bool value")
+- bool2Flag := f.Bool("bool2", false, "bool2 value")
+- bool3Flag := f.Bool("bool3", false, "bool3 value")
+- intFlag := f.Int("int", 0, "int value")
+- int64Flag := f.Int64("int64", 0, "int64 value")
+- uintFlag := f.Uint("uint", 0, "uint value")
+- uint64Flag := f.Uint64("uint64", 0, "uint64 value")
+- stringFlag := f.String("string", "0", "string value")
+- float64Flag := f.Float64("float64", 0, "float64 value")
+- durationFlag := f.Duration("duration", 5*time.Second, "time.Duration value")
+- extra := "one-extra-argument"
+- args := []string{
+- "--bool",
+- "--bool2=true",
+- "--bool3=false",
+- "--int=22",
+- "--int64=0x23",
+- "--uint=24",
+- "--uint64=25",
+- "--string=hello",
+- "--float64=2718e28",
+- "--duration=2m",
+- extra,
+- }
+- if err := f.Parse(args); err != nil {
+- t.Fatal(err)
+- }
+- if !f.Parsed() {
+- t.Error("f.Parse() = false after Parse")
+- }
+- if *boolFlag != true {
+- t.Error("bool flag should be true, is ", *boolFlag)
+- }
+- if *bool2Flag != true {
+- t.Error("bool2 flag should be true, is ", *bool2Flag)
+- }
+- if *bool3Flag != false {
+- t.Error("bool3 flag should be false, is ", *bool2Flag)
+- }
+- if *intFlag != 22 {
+- t.Error("int flag should be 22, is ", *intFlag)
+- }
+- if *int64Flag != 0x23 {
+- t.Error("int64 flag should be 0x23, is ", *int64Flag)
+- }
+- if *uintFlag != 24 {
+- t.Error("uint flag should be 24, is ", *uintFlag)
+- }
+- if *uint64Flag != 25 {
+- t.Error("uint64 flag should be 25, is ", *uint64Flag)
+- }
+- if *stringFlag != "hello" {
+- t.Error("string flag should be `hello`, is ", *stringFlag)
+- }
+- if *float64Flag != 2718e28 {
+- t.Error("float64 flag should be 2718e28, is ", *float64Flag)
- }
--
-- ioutil.WriteFile(d+"/.aws/credentials", []byte("[bar]\n"), 0644)
-- os.Setenv("HOME", d)
--
-- _, err = aws.SharedAuth()
-- c.Assert(err, ErrorMatches, "Couldn't find profile in AWS credentials file")
--}
--
--func (s *S) TestSharedAuthNoKeysInProfile(c *C) {
-- os.Clearenv()
-- os.Setenv("AWS_PROFILE", "bar")
--
-- d, err := ioutil.TempDir("", "")
-- if err != nil {
-- panic(err)
+- if *durationFlag != 2*time.Minute {
+- t.Error("duration flag should be 2m, is ", *durationFlag)
- }
-- defer os.RemoveAll(d)
--
-- err = os.Mkdir(d+"/.aws", 0755)
-- if err != nil {
-- panic(err)
+- if len(f.Args()) != 1 {
+- t.Error("expected one argument, got", len(f.Args()))
+- } else if f.Args()[0] != extra {
+- t.Errorf("expected argument %q got %q", extra, f.Args()[0])
- }
--
-- ioutil.WriteFile(d+"/.aws/credentials", []byte("[bar]\nawsaccesskeyid = AK.."), 0644)
-- os.Setenv("HOME", d)
--
-- _, err = aws.SharedAuth()
-- c.Assert(err, ErrorMatches, "AWS_SECRET_ACCESS_KEY not found in credentials file")
-}
-
--func (s *S) TestSharedAuthDefaultCredentials(c *C) {
-- os.Clearenv()
--
-- d, err := ioutil.TempDir("", "")
-- if err != nil {
-- panic(err)
+-func TestShorthand(t *testing.T) {
+- f := NewFlagSet("shorthand", ContinueOnError)
+- if f.Parsed() {
+- t.Error("f.Parse() = true before Parse")
- }
-- defer os.RemoveAll(d)
--
-- err = os.Mkdir(d+"/.aws", 0755)
-- if err != nil {
-- panic(err)
+- boolaFlag := f.BoolP("boola", "a", false, "bool value")
+- boolbFlag := f.BoolP("boolb", "b", false, "bool2 value")
+- boolcFlag := f.BoolP("boolc", "c", false, "bool3 value")
+- stringFlag := f.StringP("string", "s", "0", "string value")
+- extra := "interspersed-argument"
+- notaflag := "--i-look-like-a-flag"
+- args := []string{
+- "-ab",
+- extra,
+- "-cs",
+- "hello",
+- "--",
+- notaflag,
- }
--
-- ioutil.WriteFile(d+"/.aws/credentials", []byte("[default]\naws_access_key_id = access\naws_secret_access_key = secret\n"), 0644)
-- os.Setenv("HOME", d)
--
-- auth, err := aws.SharedAuth()
-- c.Assert(err, IsNil)
-- c.Assert(auth, Equals, aws.Auth{SecretKey: "secret", AccessKey: "access"})
--}
--
--func (s *S) TestSharedAuth(c *C) {
-- os.Clearenv()
-- os.Setenv("AWS_PROFILE", "bar")
--
-- d, err := ioutil.TempDir("", "")
-- if err != nil {
-- panic(err)
+- f.SetOutput(ioutil.Discard)
+- if err := f.Parse(args); err == nil {
+- t.Error("--i-look-like-a-flag should throw an error")
- }
-- defer os.RemoveAll(d)
--
-- err = os.Mkdir(d+"/.aws", 0755)
-- if err != nil {
-- panic(err)
+- if !f.Parsed() {
+- t.Error("f.Parse() = false after Parse")
+- }
+- if *boolaFlag != true {
+- t.Error("boola flag should be true, is ", *boolaFlag)
+- }
+- if *boolbFlag != true {
+- t.Error("boolb flag should be true, is ", *boolbFlag)
+- }
+- if *boolcFlag != true {
+- t.Error("boolc flag should be true, is ", *boolcFlag)
+- }
+- if *stringFlag != "hello" {
+- t.Error("string flag should be `hello`, is ", *stringFlag)
+- }
+- if len(f.Args()) != 2 {
+- t.Error("expected one argument, got", len(f.Args()))
+- } else if f.Args()[0] != extra {
+- t.Errorf("expected argument %q got %q", extra, f.Args()[0])
+- } else if f.Args()[1] != notaflag {
+- t.Errorf("expected argument %q got %q", notaflag, f.Args()[1])
- }
--
-- ioutil.WriteFile(d+"/.aws/credentials", []byte("[bar]\naws_access_key_id = access\naws_secret_access_key = secret\n"), 0644)
-- os.Setenv("HOME", d)
--
-- auth, err := aws.SharedAuth()
-- c.Assert(err, IsNil)
-- c.Assert(auth, Equals, aws.Auth{SecretKey: "secret", AccessKey: "access"})
--}
--
--func (s *S) TestEnvAuthNoSecret(c *C) {
-- os.Clearenv()
-- _, err := aws.EnvAuth()
-- c.Assert(err, ErrorMatches, "AWS_SECRET_ACCESS_KEY or AWS_SECRET_KEY not found in environment")
--}
--
--func (s *S) TestEnvAuthNoAccess(c *C) {
-- os.Clearenv()
-- os.Setenv("AWS_SECRET_ACCESS_KEY", "foo")
-- _, err := aws.EnvAuth()
-- c.Assert(err, ErrorMatches, "AWS_ACCESS_KEY_ID or AWS_ACCESS_KEY not found in environment")
--}
--
--func (s *S) TestEnvAuth(c *C) {
-- os.Clearenv()
-- os.Setenv("AWS_SECRET_ACCESS_KEY", "secret")
-- os.Setenv("AWS_ACCESS_KEY_ID", "access")
-- auth, err := aws.EnvAuth()
-- c.Assert(err, IsNil)
-- c.Assert(auth, Equals, aws.Auth{SecretKey: "secret", AccessKey: "access"})
-}
-
--func (s *S) TestEnvAuthWithToken(c *C) {
-- os.Clearenv()
-- os.Setenv("AWS_SECRET_ACCESS_KEY", "secret")
-- os.Setenv("AWS_ACCESS_KEY_ID", "access")
-- os.Setenv("AWS_SECURITY_TOKEN", "token")
-- auth, err := aws.EnvAuth()
-- c.Assert(err, IsNil)
-- c.Assert(auth, Equals, aws.Auth{SecretKey: "secret", AccessKey: "access", Token: "token"})
+-func TestParse(t *testing.T) {
+- ResetForTesting(func() { t.Error("bad parse") })
+- testParse(GetCommandLine(), t)
-}
-
--func (s *S) TestEnvAuthAlt(c *C) {
-- os.Clearenv()
-- os.Setenv("AWS_SECRET_KEY", "secret")
-- os.Setenv("AWS_ACCESS_KEY", "access")
-- auth, err := aws.EnvAuth()
-- c.Assert(err, IsNil)
-- c.Assert(auth, Equals, aws.Auth{SecretKey: "secret", AccessKey: "access"})
+-func TestFlagSetParse(t *testing.T) {
+- testParse(NewFlagSet("test", ContinueOnError), t)
-}
-
--func (s *S) TestGetAuthStatic(c *C) {
-- auth, err := aws.GetAuth("access", "secret")
-- c.Assert(err, IsNil)
-- c.Assert(auth, Equals, aws.Auth{SecretKey: "secret", AccessKey: "access"})
--}
+-// Declare a user-defined flag type.
+-type flagVar []string
-
--func (s *S) TestGetAuthEnv(c *C) {
-- os.Clearenv()
-- os.Setenv("AWS_SECRET_ACCESS_KEY", "secret")
-- os.Setenv("AWS_ACCESS_KEY_ID", "access")
-- auth, err := aws.GetAuth("", "")
-- c.Assert(err, IsNil)
-- c.Assert(auth, Equals, aws.Auth{SecretKey: "secret", AccessKey: "access"})
+-func (f *flagVar) String() string {
+- return fmt.Sprint([]string(*f))
-}
-
--func (s *S) TestEncode(c *C) {
-- c.Assert(aws.Encode("foo"), Equals, "foo")
-- c.Assert(aws.Encode("/"), Equals, "%2F")
+-func (f *flagVar) Set(value string) error {
+- *f = append(*f, value)
+- return nil
-}
-
--func (s *S) TestRegionsAreNamed(c *C) {
-- for n, r := range aws.Regions {
-- c.Assert(n, Equals, r.Name)
+-func TestUserDefined(t *testing.T) {
+- var flags FlagSet
+- flags.Init("test", ContinueOnError)
+- var v flagVar
+- flags.VarP(&v, "v", "v", "usage")
+- if err := flags.Parse([]string{"--v=1", "-v2", "-v", "3"}); err != nil {
+- t.Error(err)
- }
--}
-diff --git a/Godeps/_workspace/src/github.com/mitchellh/goamz/aws/client.go b/Godeps/_workspace/src/github.com/mitchellh/goamz/aws/client.go
-deleted file mode 100644
-index ee53238..0000000
---- a/Godeps/_workspace/src/github.com/mitchellh/goamz/aws/client.go
-+++ /dev/null
-@@ -1,125 +0,0 @@
--package aws
--
--import (
-- "math"
-- "net"
-- "net/http"
-- "time"
--)
--
--type RetryableFunc func(*http.Request, *http.Response, error) bool
--type WaitFunc func(try int)
--type DeadlineFunc func() time.Time
--
--type ResilientTransport struct {
-- // Timeout is the maximum amount of time a dial will wait for
-- // a connect to complete.
-- //
-- // The default is no timeout.
-- //
-- // With or without a timeout, the operating system may impose
-- // its own earlier timeout. For instance, TCP timeouts are
-- // often around 3 minutes.
-- DialTimeout time.Duration
--
-- // MaxTries, if non-zero, specifies the number of times we will retry on
-- // failure. Retries are only attempted for temporary network errors or known
-- // safe failures.
-- MaxTries int
-- Deadline DeadlineFunc
-- ShouldRetry RetryableFunc
-- Wait WaitFunc
-- transport *http.Transport
--}
--
--// Convenience method for creating an http client
--func NewClient(rt *ResilientTransport) *http.Client {
-- rt.transport = &http.Transport{
-- Dial: func(netw, addr string) (net.Conn, error) {
-- c, err := net.DialTimeout(netw, addr, rt.DialTimeout)
-- if err != nil {
-- return nil, err
-- }
-- c.SetDeadline(rt.Deadline())
-- return c, nil
-- },
-- DisableKeepAlives: true,
-- Proxy: http.ProxyFromEnvironment,
+- if len(v) != 3 {
+- t.Fatal("expected 3 args; got ", len(v))
- }
-- // TODO: Would be nice is ResilientTransport allowed clients to initialize
-- // with http.Transport attributes.
-- return &http.Client{
-- Transport: rt,
+- expect := "[1 2 3]"
+- if v.String() != expect {
+- t.Errorf("expected value %q got %q", expect, v.String())
- }
-}
-
--var retryingTransport = &ResilientTransport{
-- Deadline: func() time.Time {
-- return time.Now().Add(5 * time.Second)
-- },
-- DialTimeout: 10 * time.Second,
-- MaxTries: 3,
-- ShouldRetry: awsRetry,
-- Wait: ExpBackoff,
--}
--
--// Exported default client
--var RetryingClient = NewClient(retryingTransport)
--
--func (t *ResilientTransport) RoundTrip(req *http.Request) (*http.Response, error) {
-- return t.tries(req)
+-func TestSetOutput(t *testing.T) {
+- var flags FlagSet
+- var buf bytes.Buffer
+- flags.SetOutput(&buf)
+- flags.Init("test", ContinueOnError)
+- flags.Parse([]string{"--unknown"})
+- if out := buf.String(); !strings.Contains(out, "--unknown") {
+- t.Logf("expected output mentioning unknown; got %q", out)
+- }
-}
-
--// Retry a request a maximum of t.MaxTries times.
--// We'll only retry if the proper criteria are met.
--// If a wait function is specified, wait that amount of time
--// In between requests.
--func (t *ResilientTransport) tries(req *http.Request) (res *http.Response, err error) {
-- for try := 0; try < t.MaxTries; try += 1 {
-- res, err = t.transport.RoundTrip(req)
--
-- if !t.ShouldRetry(req, res, err) {
-- break
-- }
-- if res != nil {
-- res.Body.Close()
-- }
-- if t.Wait != nil {
-- t.Wait(try)
-- }
+-// This tests that one can reset the flags. This still works but not well, and is
+-// superseded by FlagSet.
+-func TestChangingArgs(t *testing.T) {
+- ResetForTesting(func() { t.Fatal("bad parse") })
+- oldArgs := os.Args
+- defer func() { os.Args = oldArgs }()
+- os.Args = []string{"cmd", "--before", "subcmd"}
+- before := Bool("before", false, "")
+- if err := GetCommandLine().Parse(os.Args[1:]); err != nil {
+- t.Fatal(err)
- }
+- cmd := Arg(0)
+- os.Args = []string{"subcmd", "--after", "args"}
+- after := Bool("after", false, "")
+- Parse()
+- args := Args()
-
-- return
--}
--
--func ExpBackoff(try int) {
-- time.Sleep(100 * time.Millisecond *
-- time.Duration(math.Exp2(float64(try))))
+- if !*before || cmd != "subcmd" || !*after || len(args) != 1 || args[0] != "args" {
+- t.Fatalf("expected true subcmd true [args] got %v %v %v %v", *before, cmd, *after, args)
+- }
-}
-
--func LinearBackoff(try int) {
-- time.Sleep(time.Duration(try*100) * time.Millisecond)
+-// Test that -help invokes the usage message and returns ErrHelp.
+-func TestHelp(t *testing.T) {
+- var helpCalled = false
+- fs := NewFlagSet("help test", ContinueOnError)
+- fs.Usage = func() { helpCalled = true }
+- var flag bool
+- fs.BoolVar(&flag, "flag", false, "regular flag")
+- // Regular flag invocation should work
+- err := fs.Parse([]string{"--flag=true"})
+- if err != nil {
+- t.Fatal("expected no error; got ", err)
+- }
+- if !flag {
+- t.Error("flag was not set by --flag")
+- }
+- if helpCalled {
+- t.Error("help called for regular flag")
+- helpCalled = false // reset for next test
+- }
+- // Help flag should work as expected.
+- err = fs.Parse([]string{"--help"})
+- if err == nil {
+- t.Fatal("error expected")
+- }
+- if err != ErrHelp {
+- t.Fatal("expected ErrHelp; got ", err)
+- }
+- if !helpCalled {
+- t.Fatal("help was not called")
+- }
+- // If we define a help flag, that should override.
+- var help bool
+- fs.BoolVar(&help, "help", false, "help flag")
+- helpCalled = false
+- err = fs.Parse([]string{"--help"})
+- if err != nil {
+- t.Fatal("expected no error for defined --help; got ", err)
+- }
+- if helpCalled {
+- t.Fatal("help was called; should not have been for defined help flag")
+- }
-}
-
--// Decide if we should retry a request.
--// In general, the criteria for retrying a request is described here
--// http://docs.aws.amazon.com/general/latest/gr/api-retries.html
--func awsRetry(req *http.Request, res *http.Response, err error) bool {
-- retry := false
--
-- // Retry if there's a temporary network error.
-- if neterr, ok := err.(net.Error); ok {
-- if neterr.Temporary() {
-- retry = true
-- }
+-func TestNoInterspersed(t *testing.T) {
+- f := NewFlagSet("test", ContinueOnError)
+- f.SetInterspersed(false)
+- f.Bool("true", true, "always true")
+- f.Bool("false", false, "always false")
+- err := f.Parse([]string{"--true", "break", "--false"})
+- if err != nil {
+- t.Fatal("expected no error; got ", err)
- }
--
-- // Retry if we get a 5xx series error.
-- if res != nil {
-- if res.StatusCode >= 500 && res.StatusCode < 600 {
-- retry = true
-- }
+- args := f.Args()
+- if len(args) != 2 || args[0] != "break" || args[1] != "--false" {
+- t.Fatal("expected interspersed options/non-options to fail")
- }
--
-- return retry
-}
-diff --git a/Godeps/_workspace/src/github.com/mitchellh/goamz/aws/client_test.go b/Godeps/_workspace/src/github.com/mitchellh/goamz/aws/client_test.go
+diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/float32.go b/Godeps/_workspace/src/github.com/spf13/pflag/float32.go
deleted file mode 100644
-index 2f6b39c..0000000
---- a/Godeps/_workspace/src/github.com/mitchellh/goamz/aws/client_test.go
+index b7ad67d..0000000
+--- a/Godeps/_workspace/src/github.com/spf13/pflag/float32.go
+++ /dev/null
-@@ -1,121 +0,0 @@
--package aws_test
+@@ -1,74 +0,0 @@
+-package pflag
-
-import (
- "fmt"
-- "github.com/mitchellh/goamz/aws"
-- "io/ioutil"
-- "net/http"
-- "net/http/httptest"
-- "strings"
-- "testing"
-- "time"
+- "strconv"
-)
-
--// Retrieve the response from handler using aws.RetryingClient
--func serveAndGet(handler http.HandlerFunc) (body string, err error) {
-- ts := httptest.NewServer(handler)
-- defer ts.Close()
-- resp, err := aws.RetryingClient.Get(ts.URL)
-- if err != nil {
-- return
-- }
-- if resp.StatusCode != 200 {
-- return "", fmt.Errorf("Bad status code: %d", resp.StatusCode)
-- }
-- greeting, err := ioutil.ReadAll(resp.Body)
-- resp.Body.Close()
-- if err != nil {
-- return
-- }
-- return strings.TrimSpace(string(greeting)), nil
--}
+-// -- float32 Value
+-type float32Value float32
-
--func TestClient_expected(t *testing.T) {
-- body := "foo bar"
+-func newFloat32Value(val float32, p *float32) *float32Value {
+- *p = val
+- return (*float32Value)(p)
+-}
-
-- resp, err := serveAndGet(func(w http.ResponseWriter, r *http.Request) {
-- fmt.Fprintln(w, body)
-- })
-- if err != nil {
-- t.Fatal(err)
-- }
-- if resp != body {
-- t.Fatal("Body not as expected.")
-- }
+-func (f *float32Value) Set(s string) error {
+- v, err := strconv.ParseFloat(s, 32)
+- *f = float32Value(v)
+- return err
-}
-
--func TestClient_delay(t *testing.T) {
-- body := "baz"
-- wait := 4
-- resp, err := serveAndGet(func(w http.ResponseWriter, r *http.Request) {
-- if wait < 0 {
-- // If we dipped to zero delay and still failed.
-- t.Fatal("Never succeeded.")
-- }
-- wait -= 1
-- time.Sleep(time.Second * time.Duration(wait))
-- fmt.Fprintln(w, body)
-- })
-- if err != nil {
-- t.Fatal(err)
-- }
-- if resp != body {
-- t.Fatal("Body not as expected.", resp)
-- }
+-func (f *float32Value) Type() string {
+- return "float32"
-}
-
--func TestClient_no4xxRetry(t *testing.T) {
-- tries := 0
+-func (f *float32Value) String() string { return fmt.Sprintf("%v", *f) }
-
-- // Fail once before succeeding.
-- _, err := serveAndGet(func(w http.ResponseWriter, r *http.Request) {
-- tries += 1
-- http.Error(w, "error", 404)
-- })
+-// Float32Var defines a float32 flag with specified name, default value, and usage string.
+-// The argument p points to a float32 variable in which to store the value of the flag.
+-func (f *FlagSet) Float32Var(p *float32, name string, value float32, usage string) {
+- f.VarP(newFloat32Value(value, p), name, "", usage)
+-}
-
-- if err == nil {
-- t.Fatal("should have error")
-- }
+-// Like Float32Var, but accepts a shorthand letter that can be used after a single dash.
+-func (f *FlagSet) Float32VarP(p *float32, name, shorthand string, value float32, usage string) {
+- f.VarP(newFloat32Value(value, p), name, shorthand, usage)
+-}
-
-- if tries != 1 {
-- t.Fatalf("should only try once: %d", tries)
-- }
+-// Float32Var defines a float32 flag with specified name, default value, and usage string.
+-// The argument p points to a float32 variable in which to store the value of the flag.
+-func Float32Var(p *float32, name string, value float32, usage string) {
+- CommandLine.VarP(newFloat32Value(value, p), name, "", usage)
-}
-
--func TestClient_retries(t *testing.T) {
-- body := "biz"
-- failed := false
-- // Fail once before succeeding.
-- resp, err := serveAndGet(func(w http.ResponseWriter, r *http.Request) {
-- if !failed {
-- http.Error(w, "error", 500)
-- failed = true
-- } else {
-- fmt.Fprintln(w, body)
-- }
-- })
-- if failed != true {
-- t.Error("We didn't retry!")
-- }
-- if err != nil {
-- t.Fatal(err)
-- }
-- if resp != body {
-- t.Fatal("Body not as expected.")
-- }
+-// Like Float32Var, but accepts a shorthand letter that can be used after a single dash.
+-func Float32VarP(p *float32, name, shorthand string, value float32, usage string) {
+- CommandLine.VarP(newFloat32Value(value, p), name, shorthand, usage)
-}
-
--func TestClient_fails(t *testing.T) {
-- tries := 0
-- // Fail 3 times and return the last error.
-- _, err := serveAndGet(func(w http.ResponseWriter, r *http.Request) {
-- tries += 1
-- http.Error(w, "error", 500)
-- })
-- if err == nil {
-- t.Fatal(err)
-- }
-- if tries != 3 {
-- t.Fatal("Didn't retry enough")
-- }
+-// Float32 defines a float32 flag with specified name, default value, and usage string.
+-// The return value is the address of a float32 variable that stores the value of the flag.
+-func (f *FlagSet) Float32(name string, value float32, usage string) *float32 {
+- p := new(float32)
+- f.Float32VarP(p, name, "", value, usage)
+- return p
-}
-diff --git a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/ec2.go b/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/ec2.go
+-
+-// Like Float32, but accepts a shorthand letter that can be used after a single dash.
+-func (f *FlagSet) Float32P(name, shorthand string, value float32, usage string) *float32 {
+- p := new(float32)
+- f.Float32VarP(p, name, shorthand, value, usage)
+- return p
+-}
+-
+-// Float32 defines a float32 flag with specified name, default value, and usage string.
+-// The return value is the address of a float32 variable that stores the value of the flag.
+-func Float32(name string, value float32, usage string) *float32 {
+- return CommandLine.Float32P(name, "", value, usage)
+-}
+-
+-// Like Float32, but accepts a shorthand letter that can be used after a single dash.
+-func Float32P(name, shorthand string, value float32, usage string) *float32 {
+- return CommandLine.Float32P(name, shorthand, value, usage)
+-}
+diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/float64.go b/Godeps/_workspace/src/github.com/spf13/pflag/float64.go
deleted file mode 100644
-index 8f94ad5..0000000
---- a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/ec2.go
+index 0315512..0000000
+--- a/Godeps/_workspace/src/github.com/spf13/pflag/float64.go
+++ /dev/null
-@@ -1,2599 +0,0 @@
--//
--// goamz - Go packages to interact with the Amazon Web Services.
--//
--// https://wiki.ubuntu.com/goamz
--//
--// Copyright (c) 2011 Canonical Ltd.
--//
--// Written by Gustavo Niemeyer <gustavo.niemeyer at canonical.com>
--//
--
--package ec2
+@@ -1,74 +0,0 @@
+-package pflag
-
-import (
-- "crypto/rand"
-- "encoding/base64"
-- "encoding/hex"
-- "encoding/xml"
- "fmt"
-- "log"
-- "net/http"
-- "net/http/httputil"
-- "net/url"
-- "sort"
- "strconv"
-- "strings"
-- "time"
--
-- "github.com/mitchellh/goamz/aws"
-)
-
--const debug = false
+-// -- float64 Value
+-type float64Value float64
-
--// The EC2 type encapsulates operations with a specific EC2 region.
--type EC2 struct {
-- aws.Auth
-- aws.Region
-- httpClient *http.Client
-- private byte // Reserve the right of using private data.
+-func newFloat64Value(val float64, p *float64) *float64Value {
+- *p = val
+- return (*float64Value)(p)
-}
-
--// New creates a new EC2.
--func NewWithClient(auth aws.Auth, region aws.Region, client *http.Client) *EC2 {
-- return &EC2{auth, region, client, 0}
+-func (f *float64Value) Set(s string) error {
+- v, err := strconv.ParseFloat(s, 64)
+- *f = float64Value(v)
+- return err
-}
-
--func New(auth aws.Auth, region aws.Region) *EC2 {
-- return NewWithClient(auth, region, aws.RetryingClient)
+-func (f *float64Value) Type() string {
+- return "float64"
-}
-
--// ----------------------------------------------------------------------------
--// Filtering helper.
+-func (f *float64Value) String() string { return fmt.Sprintf("%v", *f) }
-
--// Filter builds filtering parameters to be used in an EC2 query which supports
--// filtering. For example:
--//
--// filter := NewFilter()
--// filter.Add("architecture", "i386")
--// filter.Add("launch-index", "0")
--// resp, err := ec2.Instances(nil, filter)
--//
--type Filter struct {
-- m map[string][]string
+-// Float64Var defines a float64 flag with specified name, default value, and usage string.
+-// The argument p points to a float64 variable in which to store the value of the flag.
+-func (f *FlagSet) Float64Var(p *float64, name string, value float64, usage string) {
+- f.VarP(newFloat64Value(value, p), name, "", usage)
-}
-
--// NewFilter creates a new Filter.
--func NewFilter() *Filter {
-- return &Filter{make(map[string][]string)}
+-// Like Float64Var, but accepts a shorthand letter that can be used after a single dash.
+-func (f *FlagSet) Float64VarP(p *float64, name, shorthand string, value float64, usage string) {
+- f.VarP(newFloat64Value(value, p), name, shorthand, usage)
-}
-
--// Add appends a filtering parameter with the given name and value(s).
--func (f *Filter) Add(name string, value ...string) {
-- f.m[name] = append(f.m[name], value...)
+-// Float64Var defines a float64 flag with specified name, default value, and usage string.
+-// The argument p points to a float64 variable in which to store the value of the flag.
+-func Float64Var(p *float64, name string, value float64, usage string) {
+- CommandLine.VarP(newFloat64Value(value, p), name, "", usage)
-}
-
--func (f *Filter) addParams(params map[string]string) {
-- if f != nil {
-- a := make([]string, len(f.m))
-- i := 0
-- for k := range f.m {
-- a[i] = k
-- i++
-- }
-- sort.StringSlice(a).Sort()
-- for i, k := range a {
-- prefix := "Filter." + strconv.Itoa(i+1)
-- params[prefix+".Name"] = k
-- for j, v := range f.m[k] {
-- params[prefix+".Value."+strconv.Itoa(j+1)] = v
-- }
-- }
-- }
+-// Like Float64Var, but accepts a shorthand letter that can be used after a single dash.
+-func Float64VarP(p *float64, name, shorthand string, value float64, usage string) {
+- CommandLine.VarP(newFloat64Value(value, p), name, shorthand, usage)
-}
-
--// ----------------------------------------------------------------------------
--// Request dispatching logic.
--
--// Error encapsulates an error returned by EC2.
--//
--// See http://goo.gl/VZGuC for more details.
--type Error struct {
-- // HTTP status code (200, 403, ...)
-- StatusCode int
-- // EC2 error code ("UnsupportedOperation", ...)
-- Code string
-- // The human-oriented error message
-- Message string
-- RequestId string `xml:"RequestID"`
+-// Float64 defines a float64 flag with specified name, default value, and usage string.
+-// The return value is the address of a float64 variable that stores the value of the flag.
+-func (f *FlagSet) Float64(name string, value float64, usage string) *float64 {
+- p := new(float64)
+- f.Float64VarP(p, name, "", value, usage)
+- return p
-}
-
--func (err *Error) Error() string {
-- if err.Code == "" {
-- return err.Message
-- }
+-// Like Float64, but accepts a shorthand letter that can be used after a single dash.
+-func (f *FlagSet) Float64P(name, shorthand string, value float64, usage string) *float64 {
+- p := new(float64)
+- f.Float64VarP(p, name, shorthand, value, usage)
+- return p
+-}
-
-- return fmt.Sprintf("%s (%s)", err.Message, err.Code)
+-// Float64 defines a float64 flag with specified name, default value, and usage string.
+-// The return value is the address of a float64 variable that stores the value of the flag.
+-func Float64(name string, value float64, usage string) *float64 {
+- return CommandLine.Float64P(name, "", value, usage)
-}
-
--// For now a single error inst is being exposed. In the future it may be useful
--// to provide access to all of them, but rather than doing it as an array/slice,
--// use a *next pointer, so that it's backward compatible and it continues to be
--// easy to handle the first error, which is what most people will want.
--type xmlErrors struct {
-- RequestId string `xml:"RequestID"`
-- Errors []Error `xml:"Errors>Error"`
+-// Like Float64, but accepts a shorthand letter that can be used after a single dash.
+-func Float64P(name, shorthand string, value float64, usage string) *float64 {
+- return CommandLine.Float64P(name, shorthand, value, usage)
-}
+diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/int.go b/Godeps/_workspace/src/github.com/spf13/pflag/int.go
+deleted file mode 100644
+index dca9da6..0000000
+--- a/Godeps/_workspace/src/github.com/spf13/pflag/int.go
++++ /dev/null
+@@ -1,74 +0,0 @@
+-package pflag
-
--var timeNow = time.Now
+-import (
+- "fmt"
+- "strconv"
+-)
-
--func (ec2 *EC2) query(params map[string]string, resp interface{}) error {
-- params["Version"] = "2014-05-01"
-- params["Timestamp"] = timeNow().In(time.UTC).Format(time.RFC3339)
-- endpoint, err := url.Parse(ec2.Region.EC2Endpoint)
-- if err != nil {
-- return err
-- }
-- if endpoint.Path == "" {
-- endpoint.Path = "/"
-- }
-- sign(ec2.Auth, "GET", endpoint.Path, params, endpoint.Host)
-- endpoint.RawQuery = multimap(params).Encode()
-- if debug {
-- log.Printf("get { %v } -> {\n", endpoint.String())
-- }
+-// -- int Value
+-type intValue int
-
-- r, err := ec2.httpClient.Get(endpoint.String())
-- if err != nil {
-- return err
-- }
-- defer r.Body.Close()
+-func newIntValue(val int, p *int) *intValue {
+- *p = val
+- return (*intValue)(p)
+-}
-
-- if debug {
-- dump, _ := httputil.DumpResponse(r, true)
-- log.Printf("response:\n")
-- log.Printf("%v\n}\n", string(dump))
-- }
-- if r.StatusCode != 200 {
-- return buildError(r)
-- }
-- err = xml.NewDecoder(r.Body).Decode(resp)
+-func (i *intValue) Set(s string) error {
+- v, err := strconv.ParseInt(s, 0, 64)
+- *i = intValue(v)
- return err
-}
-
--func multimap(p map[string]string) url.Values {
-- q := make(url.Values, len(p))
-- for k, v := range p {
-- q[k] = []string{v}
-- }
-- return q
+-func (i *intValue) Type() string {
+- return "int"
-}
-
--func buildError(r *http.Response) error {
-- errors := xmlErrors{}
-- xml.NewDecoder(r.Body).Decode(&errors)
-- var err Error
-- if len(errors.Errors) > 0 {
-- err = errors.Errors[0]
-- }
-- err.RequestId = errors.RequestId
-- err.StatusCode = r.StatusCode
-- if err.Message == "" {
-- err.Message = r.Status
-- }
-- return &err
--}
+-func (i *intValue) String() string { return fmt.Sprintf("%v", *i) }
-
--func makeParams(action string) map[string]string {
-- params := make(map[string]string)
-- params["Action"] = action
-- return params
+-// IntVar defines an int flag with specified name, default value, and usage string.
+-// The argument p points to an int variable in which to store the value of the flag.
+-func (f *FlagSet) IntVar(p *int, name string, value int, usage string) {
+- f.VarP(newIntValue(value, p), name, "", usage)
-}
-
--func addParamsList(params map[string]string, label string, ids []string) {
-- for i, id := range ids {
-- params[label+"."+strconv.Itoa(i+1)] = id
-- }
+-// Like IntVar, but accepts a shorthand letter that can be used after a single dash.
+-func (f *FlagSet) IntVarP(p *int, name, shorthand string, value int, usage string) {
+- f.VarP(newIntValue(value, p), name, shorthand, usage)
-}
-
--func addBlockDeviceParams(prename string, params map[string]string, blockdevices []BlockDeviceMapping) {
-- for i, k := range blockdevices {
-- // Fixup index since Amazon counts these from 1
-- prefix := prename + "BlockDeviceMapping." + strconv.Itoa(i+1) + "."
--
-- if k.DeviceName != "" {
-- params[prefix+"DeviceName"] = k.DeviceName
-- }
-- if k.VirtualName != "" {
-- params[prefix+"VirtualName"] = k.VirtualName
-- }
-- if k.SnapshotId != "" {
-- params[prefix+"Ebs.SnapshotId"] = k.SnapshotId
-- }
-- if k.VolumeType != "" {
-- params[prefix+"Ebs.VolumeType"] = k.VolumeType
-- }
-- if k.IOPS != 0 {
-- params[prefix+"Ebs.Iops"] = strconv.FormatInt(k.IOPS, 10)
-- }
-- if k.VolumeSize != 0 {
-- params[prefix+"Ebs.VolumeSize"] = strconv.FormatInt(k.VolumeSize, 10)
-- }
-- if k.DeleteOnTermination {
-- params[prefix+"Ebs.DeleteOnTermination"] = "true"
-- }
-- if k.Encrypted {
-- params[prefix+"Ebs.Encrypted"] = "true"
-- }
-- if k.NoDevice {
-- params[prefix+"NoDevice"] = ""
-- }
-- }
+-// IntVar defines an int flag with specified name, default value, and usage string.
+-// The argument p points to an int variable in which to store the value of the flag.
+-func IntVar(p *int, name string, value int, usage string) {
+- CommandLine.VarP(newIntValue(value, p), name, "", usage)
-}
-
--// ----------------------------------------------------------------------------
--// Instance management functions and types.
--
--// The RunInstances type encapsulates options for the respective request in EC2.
--//
--// See http://goo.gl/Mcm3b for more details.
--type RunInstances struct {
-- ImageId string
-- MinCount int
-- MaxCount int
-- KeyName string
-- InstanceType string
-- SecurityGroups []SecurityGroup
-- IamInstanceProfile string
-- KernelId string
-- RamdiskId string
-- UserData []byte
-- AvailZone string
-- PlacementGroupName string
-- Monitoring bool
-- SubnetId string
-- AssociatePublicIpAddress bool
-- DisableAPITermination bool
-- ShutdownBehavior string
-- PrivateIPAddress string
-- BlockDevices []BlockDeviceMapping
+-// Like IntVar, but accepts a shorthand letter that can be used after a single dash.
+-func IntVarP(p *int, name, shorthand string, value int, usage string) {
+- CommandLine.VarP(newIntValue(value, p), name, shorthand, usage)
-}
-
--// Response to a RunInstances request.
--//
--// See http://goo.gl/Mcm3b for more details.
--type RunInstancesResp struct {
-- RequestId string `xml:"requestId"`
-- ReservationId string `xml:"reservationId"`
-- OwnerId string `xml:"ownerId"`
-- SecurityGroups []SecurityGroup `xml:"groupSet>item"`
-- Instances []Instance `xml:"instancesSet>item"`
+-// Int defines an int flag with specified name, default value, and usage string.
+-// The return value is the address of an int variable that stores the value of the flag.
+-func (f *FlagSet) Int(name string, value int, usage string) *int {
+- p := new(int)
+- f.IntVarP(p, name, "", value, usage)
+- return p
-}
-
--// Instance encapsulates a running instance in EC2.
--//
--// See http://goo.gl/OCH8a for more details.
--type Instance struct {
-- InstanceId string `xml:"instanceId"`
-- InstanceType string `xml:"instanceType"`
-- ImageId string `xml:"imageId"`
-- PrivateDNSName string `xml:"privateDnsName"`
-- DNSName string `xml:"dnsName"`
-- KeyName string `xml:"keyName"`
-- AMILaunchIndex int `xml:"amiLaunchIndex"`
-- Hypervisor string `xml:"hypervisor"`
-- VirtType string `xml:"virtualizationType"`
-- Monitoring string `xml:"monitoring>state"`
-- AvailZone string `xml:"placement>availabilityZone"`
-- PlacementGroupName string `xml:"placement>groupName"`
-- State InstanceState `xml:"instanceState"`
-- Tags []Tag `xml:"tagSet>item"`
-- VpcId string `xml:"vpcId"`
-- SubnetId string `xml:"subnetId"`
-- IamInstanceProfile string `xml:"iamInstanceProfile"`
-- PrivateIpAddress string `xml:"privateIpAddress"`
-- PublicIpAddress string `xml:"ipAddress"`
-- Architecture string `xml:"architecture"`
-- LaunchTime time.Time `xml:"launchTime"`
-- SourceDestCheck bool `xml:"sourceDestCheck"`
-- SecurityGroups []SecurityGroup `xml:"groupSet>item"`
+-// Like Int, but accepts a shorthand letter that can be used after a single dash.
+-func (f *FlagSet) IntP(name, shorthand string, value int, usage string) *int {
+- p := new(int)
+- f.IntVarP(p, name, shorthand, value, usage)
+- return p
-}
-
--// RunInstances starts new instances in EC2.
--// If options.MinCount and options.MaxCount are both zero, a single instance
--// will be started; otherwise if options.MaxCount is zero, options.MinCount
--// will be used insteead.
--//
--// See http://goo.gl/Mcm3b for more details.
--func (ec2 *EC2) RunInstances(options *RunInstances) (resp *RunInstancesResp, err error) {
-- params := makeParams("RunInstances")
-- params["ImageId"] = options.ImageId
-- params["InstanceType"] = options.InstanceType
-- var min, max int
-- if options.MinCount == 0 && options.MaxCount == 0 {
-- min = 1
-- max = 1
-- } else if options.MaxCount == 0 {
-- min = options.MinCount
-- max = min
-- } else {
-- min = options.MinCount
-- max = options.MaxCount
-- }
-- params["MinCount"] = strconv.Itoa(min)
-- params["MaxCount"] = strconv.Itoa(max)
-- token, err := clientToken()
-- if err != nil {
-- return nil, err
-- }
-- params["ClientToken"] = token
+-// Int defines an int flag with specified name, default value, and usage string.
+-// The return value is the address of an int variable that stores the value of the flag.
+-func Int(name string, value int, usage string) *int {
+- return CommandLine.IntP(name, "", value, usage)
+-}
-
-- if options.KeyName != "" {
-- params["KeyName"] = options.KeyName
-- }
-- if options.KernelId != "" {
-- params["KernelId"] = options.KernelId
-- }
-- if options.RamdiskId != "" {
-- params["RamdiskId"] = options.RamdiskId
-- }
-- if options.UserData != nil {
-- userData := make([]byte, b64.EncodedLen(len(options.UserData)))
-- b64.Encode(userData, options.UserData)
-- params["UserData"] = string(userData)
-- }
-- if options.AvailZone != "" {
-- params["Placement.AvailabilityZone"] = options.AvailZone
-- }
-- if options.PlacementGroupName != "" {
-- params["Placement.GroupName"] = options.PlacementGroupName
-- }
-- if options.Monitoring {
-- params["Monitoring.Enabled"] = "true"
-- }
-- if options.SubnetId != "" && options.AssociatePublicIpAddress {
-- // If we have a non-default VPC / Subnet specified, we can flag
-- // AssociatePublicIpAddress to get a Public IP assigned. By default these are not provided.
-- // You cannot specify both SubnetId and the NetworkInterface.0.* parameters though, otherwise
-- // you get: Network interfaces and an instance-level subnet ID may not be specified on the same request
-- // You also need to attach Security Groups to the NetworkInterface instead of the instance,
-- // to avoid: Network interfaces and an instance-level security groups may not be specified on
-- // the same request
-- params["NetworkInterface.0.DeviceIndex"] = "0"
-- params["NetworkInterface.0.AssociatePublicIpAddress"] = "true"
-- params["NetworkInterface.0.SubnetId"] = options.SubnetId
+-// Like Int, but accepts a shorthand letter that can be used after a single dash.
+-func IntP(name, shorthand string, value int, usage string) *int {
+- return CommandLine.IntP(name, shorthand, value, usage)
+-}
+diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/int32.go b/Godeps/_workspace/src/github.com/spf13/pflag/int32.go
+deleted file mode 100644
+index 18eaacd..0000000
+--- a/Godeps/_workspace/src/github.com/spf13/pflag/int32.go
++++ /dev/null
+@@ -1,74 +0,0 @@
+-package pflag
-
-- i := 1
-- for _, g := range options.SecurityGroups {
-- // We only have SecurityGroupId's on NetworkInterface's, no SecurityGroup params.
-- if g.Id != "" {
-- params["NetworkInterface.0.SecurityGroupId."+strconv.Itoa(i)] = g.Id
-- i++
-- }
-- }
-- } else {
-- if options.SubnetId != "" {
-- params["SubnetId"] = options.SubnetId
-- }
+-import (
+- "fmt"
+- "strconv"
+-)
-
-- i, j := 1, 1
-- for _, g := range options.SecurityGroups {
-- if g.Id != "" {
-- params["SecurityGroupId."+strconv.Itoa(i)] = g.Id
-- i++
-- } else {
-- params["SecurityGroup."+strconv.Itoa(j)] = g.Name
-- j++
-- }
-- }
-- }
-- if options.IamInstanceProfile != "" {
-- params["IamInstanceProfile.Name"] = options.IamInstanceProfile
-- }
-- if options.DisableAPITermination {
-- params["DisableApiTermination"] = "true"
-- }
-- if options.ShutdownBehavior != "" {
-- params["InstanceInitiatedShutdownBehavior"] = options.ShutdownBehavior
-- }
-- if options.PrivateIPAddress != "" {
-- params["PrivateIpAddress"] = options.PrivateIPAddress
-- }
-- addBlockDeviceParams("", params, options.BlockDevices)
+-// -- int32 Value
+-type int32Value int32
-
-- resp = &RunInstancesResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
-- return
+-func newInt32Value(val int32, p *int32) *int32Value {
+- *p = val
+- return (*int32Value)(p)
-}
-
--func clientToken() (string, error) {
-- // Maximum EC2 client token size is 64 bytes.
-- // Each byte expands to two when hex encoded.
-- buf := make([]byte, 32)
-- _, err := rand.Read(buf)
-- if err != nil {
-- return "", err
-- }
-- return hex.EncodeToString(buf), nil
+-func (i *int32Value) Set(s string) error {
+- v, err := strconv.ParseInt(s, 0, 32)
+- *i = int32Value(v)
+- return err
-}
-
--// ----------------------------------------------------------------------------
--// Spot Instance management functions and types.
+-func (i *int32Value) Type() string {
+- return "int32"
+-}
-
--// The RequestSpotInstances type encapsulates options for the respective request in EC2.
--//
--// See http://goo.gl/GRZgCD for more details.
--type RequestSpotInstances struct {
-- SpotPrice string
-- InstanceCount int
-- Type string
-- ImageId string
-- KeyName string
-- InstanceType string
-- SecurityGroups []SecurityGroup
-- IamInstanceProfile string
-- KernelId string
-- RamdiskId string
-- UserData []byte
-- AvailZone string
-- PlacementGroupName string
-- Monitoring bool
-- SubnetId string
-- AssociatePublicIpAddress bool
-- PrivateIPAddress string
-- BlockDevices []BlockDeviceMapping
+-func (i *int32Value) String() string { return fmt.Sprintf("%v", *i) }
+-
+-// Int32Var defines an int32 flag with specified name, default value, and usage string.
+-// The argument p points to an int32 variable in which to store the value of the flag.
+-func (f *FlagSet) Int32Var(p *int32, name string, value int32, usage string) {
+- f.VarP(newInt32Value(value, p), name, "", usage)
-}
-
--type SpotInstanceSpec struct {
-- ImageId string
-- KeyName string
-- InstanceType string
-- SecurityGroups []SecurityGroup
-- IamInstanceProfile string
-- KernelId string
-- RamdiskId string
-- UserData []byte
-- AvailZone string
-- PlacementGroupName string
-- Monitoring bool
-- SubnetId string
-- AssociatePublicIpAddress bool
-- PrivateIPAddress string
-- BlockDevices []BlockDeviceMapping
+-// Like Int32Var, but accepts a shorthand letter that can be used after a single dash.
+-func (f *FlagSet) Int32VarP(p *int32, name, shorthand string, value int32, usage string) {
+- f.VarP(newInt32Value(value, p), name, shorthand, usage)
-}
-
--type SpotLaunchSpec struct {
-- ImageId string `xml:"imageId"`
-- KeyName string `xml:"keyName"`
-- InstanceType string `xml:"instanceType"`
-- SecurityGroups []SecurityGroup `xml:"groupSet>item"`
-- IamInstanceProfile string `xml:"iamInstanceProfile"`
-- KernelId string `xml:"kernelId"`
-- RamdiskId string `xml:"ramdiskId"`
-- PlacementGroupName string `xml:"placement>groupName"`
-- Monitoring bool `xml:"monitoring>enabled"`
-- SubnetId string `xml:"subnetId"`
-- BlockDevices []BlockDeviceMapping `xml:"blockDeviceMapping>item"`
+-// Int32Var defines an int32 flag with specified name, default value, and usage string.
+-// The argument p points to an int32 variable in which to store the value of the flag.
+-func Int32Var(p *int32, name string, value int32, usage string) {
+- CommandLine.VarP(newInt32Value(value, p), name, "", usage)
-}
-
--type SpotStatus struct {
-- Code string `xml:"code"`
-- UpdateTime string `xml:"updateTime"`
-- Message string `xml:"message"`
+-// Like Int32Var, but accepts a shorthand letter that can be used after a single dash.
+-func Int32VarP(p *int32, name, shorthand string, value int32, usage string) {
+- CommandLine.VarP(newInt32Value(value, p), name, shorthand, usage)
-}
-
--type SpotRequestResult struct {
-- SpotRequestId string `xml:"spotInstanceRequestId"`
-- SpotPrice string `xml:"spotPrice"`
-- Type string `xml:"type"`
-- AvailZone string `xml:"launchedAvailabilityZone"`
-- InstanceId string `xml:"instanceId"`
-- State string `xml:"state"`
-- Status SpotStatus `xml:"status"`
-- SpotLaunchSpec SpotLaunchSpec `xml:"launchSpecification"`
-- CreateTime string `xml:"createTime"`
-- Tags []Tag `xml:"tagSet>item"`
+-// Int32 defines an int32 flag with specified name, default value, and usage string.
+-// The return value is the address of an int32 variable that stores the value of the flag.
+-func (f *FlagSet) Int32(name string, value int32, usage string) *int32 {
+- p := new(int32)
+- f.Int32VarP(p, name, "", value, usage)
+- return p
-}
-
--// Response to a RequestSpotInstances request.
--//
--// See http://goo.gl/GRZgCD for more details.
--type RequestSpotInstancesResp struct {
-- RequestId string `xml:"requestId"`
-- SpotRequestResults []SpotRequestResult `xml:"spotInstanceRequestSet>item"`
+-// Like Int32, but accepts a shorthand letter that can be used after a single dash.
+-func (f *FlagSet) Int32P(name, shorthand string, value int32, usage string) *int32 {
+- p := new(int32)
+- f.Int32VarP(p, name, shorthand, value, usage)
+- return p
-}
-
--// RequestSpotInstances requests a new spot instances in EC2.
--func (ec2 *EC2) RequestSpotInstances(options *RequestSpotInstances) (resp *RequestSpotInstancesResp, err error) {
-- params := makeParams("RequestSpotInstances")
-- prefix := "LaunchSpecification" + "."
+-// Int32 defines an int32 flag with specified name, default value, and usage string.
+-// The return value is the address of an int32 variable that stores the value of the flag.
+-func Int32(name string, value int32, usage string) *int32 {
+- return CommandLine.Int32P(name, "", value, usage)
+-}
-
-- params["SpotPrice"] = options.SpotPrice
-- params[prefix+"ImageId"] = options.ImageId
-- params[prefix+"InstanceType"] = options.InstanceType
+-// Like Int32, but accepts a shorthand letter that can be used after a single dash.
+-func Int32P(name, shorthand string, value int32, usage string) *int32 {
+- return CommandLine.Int32P(name, shorthand, value, usage)
+-}
+diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/int64.go b/Godeps/_workspace/src/github.com/spf13/pflag/int64.go
+deleted file mode 100644
+index 0114aaa..0000000
+--- a/Godeps/_workspace/src/github.com/spf13/pflag/int64.go
++++ /dev/null
+@@ -1,74 +0,0 @@
+-package pflag
-
-- if options.InstanceCount != 0 {
-- params["InstanceCount"] = strconv.Itoa(options.InstanceCount)
-- }
-- if options.KeyName != "" {
-- params[prefix+"KeyName"] = options.KeyName
-- }
-- if options.KernelId != "" {
-- params[prefix+"KernelId"] = options.KernelId
-- }
-- if options.RamdiskId != "" {
-- params[prefix+"RamdiskId"] = options.RamdiskId
-- }
-- if options.UserData != nil {
-- userData := make([]byte, b64.EncodedLen(len(options.UserData)))
-- b64.Encode(userData, options.UserData)
-- params[prefix+"UserData"] = string(userData)
-- }
-- if options.AvailZone != "" {
-- params[prefix+"Placement.AvailabilityZone"] = options.AvailZone
-- }
-- if options.PlacementGroupName != "" {
-- params[prefix+"Placement.GroupName"] = options.PlacementGroupName
-- }
-- if options.Monitoring {
-- params[prefix+"Monitoring.Enabled"] = "true"
-- }
-- if options.SubnetId != "" && options.AssociatePublicIpAddress {
-- // If we have a non-default VPC / Subnet specified, we can flag
-- // AssociatePublicIpAddress to get a Public IP assigned. By default these are not provided.
-- // You cannot specify both SubnetId and the NetworkInterface.0.* parameters though, otherwise
-- // you get: Network interfaces and an instance-level subnet ID may not be specified on the same request
-- // You also need to attach Security Groups to the NetworkInterface instead of the instance,
-- // to avoid: Network interfaces and an instance-level security groups may not be specified on
-- // the same request
-- params[prefix+"NetworkInterface.0.DeviceIndex"] = "0"
-- params[prefix+"NetworkInterface.0.AssociatePublicIpAddress"] = "true"
-- params[prefix+"NetworkInterface.0.SubnetId"] = options.SubnetId
+-import (
+- "fmt"
+- "strconv"
+-)
-
-- i := 1
-- for _, g := range options.SecurityGroups {
-- // We only have SecurityGroupId's on NetworkInterface's, no SecurityGroup params.
-- if g.Id != "" {
-- params[prefix+"NetworkInterface.0.SecurityGroupId."+strconv.Itoa(i)] = g.Id
-- i++
-- }
-- }
-- } else {
-- if options.SubnetId != "" {
-- params[prefix+"SubnetId"] = options.SubnetId
-- }
+-// -- int64 Value
+-type int64Value int64
-
-- i, j := 1, 1
-- for _, g := range options.SecurityGroups {
-- if g.Id != "" {
-- params[prefix+"SecurityGroupId."+strconv.Itoa(i)] = g.Id
-- i++
-- } else {
-- params[prefix+"SecurityGroup."+strconv.Itoa(j)] = g.Name
-- j++
-- }
-- }
-- }
-- if options.IamInstanceProfile != "" {
-- params[prefix+"IamInstanceProfile.Name"] = options.IamInstanceProfile
-- }
-- if options.PrivateIPAddress != "" {
-- params[prefix+"PrivateIpAddress"] = options.PrivateIPAddress
-- }
-- addBlockDeviceParams(prefix, params, options.BlockDevices)
+-func newInt64Value(val int64, p *int64) *int64Value {
+- *p = val
+- return (*int64Value)(p)
+-}
-
-- resp = &RequestSpotInstancesResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
-- return
+-func (i *int64Value) Set(s string) error {
+- v, err := strconv.ParseInt(s, 0, 64)
+- *i = int64Value(v)
+- return err
-}
-
--// Response to a DescribeSpotInstanceRequests request.
--//
--// See http://goo.gl/KsKJJk for more details.
--type SpotRequestsResp struct {
-- RequestId string `xml:"requestId"`
-- SpotRequestResults []SpotRequestResult `xml:"spotInstanceRequestSet>item"`
+-func (i *int64Value) Type() string {
+- return "int64"
-}
-
--// DescribeSpotInstanceRequests returns details about spot requests in EC2. Both parameters
--// are optional, and if provided will limit the spot requests returned to those
--// matching the given spot request ids or filtering rules.
--//
--// See http://goo.gl/KsKJJk for more details.
--func (ec2 *EC2) DescribeSpotRequests(spotrequestIds []string, filter *Filter) (resp *SpotRequestsResp, err error) {
-- params := makeParams("DescribeSpotInstanceRequests")
-- addParamsList(params, "SpotInstanceRequestId", spotrequestIds)
-- filter.addParams(params)
-- resp = &SpotRequestsResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
-- return
+-func (i *int64Value) String() string { return fmt.Sprintf("%v", *i) }
+-
+-// Int64Var defines an int64 flag with specified name, default value, and usage string.
+-// The argument p points to an int64 variable in which to store the value of the flag.
+-func (f *FlagSet) Int64Var(p *int64, name string, value int64, usage string) {
+- f.VarP(newInt64Value(value, p), name, "", usage)
-}
-
--// Response to a CancelSpotInstanceRequests request.
--//
--// See http://goo.gl/3BKHj for more details.
--type CancelSpotRequestResult struct {
-- SpotRequestId string `xml:"spotInstanceRequestId"`
-- State string `xml:"state"`
+-// Like Int64Var, but accepts a shorthand letter that can be used after a single dash.
+-func (f *FlagSet) Int64VarP(p *int64, name, shorthand string, value int64, usage string) {
+- f.VarP(newInt64Value(value, p), name, shorthand, usage)
-}
--type CancelSpotRequestsResp struct {
-- RequestId string `xml:"requestId"`
-- CancelSpotRequestResults []CancelSpotRequestResult `xml:"spotInstanceRequestSet>item"`
+-
+-// Int64Var defines an int64 flag with specified name, default value, and usage string.
+-// The argument p points to an int64 variable in which to store the value of the flag.
+-func Int64Var(p *int64, name string, value int64, usage string) {
+- CommandLine.VarP(newInt64Value(value, p), name, "", usage)
-}
-
--// CancelSpotRequests requests the cancellation of spot requests when the given ids.
--//
--// See http://goo.gl/3BKHj for more details.
--func (ec2 *EC2) CancelSpotRequests(spotrequestIds []string) (resp *CancelSpotRequestsResp, err error) {
-- params := makeParams("CancelSpotInstanceRequests")
-- addParamsList(params, "SpotInstanceRequestId", spotrequestIds)
-- resp = &CancelSpotRequestsResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
-- return
+-// Like Int64Var, but accepts a shorthand letter that can be used after a single dash.
+-func Int64VarP(p *int64, name, shorthand string, value int64, usage string) {
+- CommandLine.VarP(newInt64Value(value, p), name, shorthand, usage)
-}
-
--// Response to a TerminateInstances request.
--//
--// See http://goo.gl/3BKHj for more details.
--type TerminateInstancesResp struct {
-- RequestId string `xml:"requestId"`
-- StateChanges []InstanceStateChange `xml:"instancesSet>item"`
+-// Int64 defines an int64 flag with specified name, default value, and usage string.
+-// The return value is the address of an int64 variable that stores the value of the flag.
+-func (f *FlagSet) Int64(name string, value int64, usage string) *int64 {
+- p := new(int64)
+- f.Int64VarP(p, name, "", value, usage)
+- return p
-}
-
--// InstanceState encapsulates the state of an instance in EC2.
--//
--// See http://goo.gl/y3ZBq for more details.
--type InstanceState struct {
-- Code int `xml:"code"` // Watch out, bits 15-8 have unpublished meaning.
-- Name string `xml:"name"`
+-// Like Int64, but accepts a shorthand letter that can be used after a single dash.
+-func (f *FlagSet) Int64P(name, shorthand string, value int64, usage string) *int64 {
+- p := new(int64)
+- f.Int64VarP(p, name, shorthand, value, usage)
+- return p
-}
-
--// InstanceStateChange informs of the previous and current states
--// for an instance when a state change is requested.
--type InstanceStateChange struct {
-- InstanceId string `xml:"instanceId"`
-- CurrentState InstanceState `xml:"currentState"`
-- PreviousState InstanceState `xml:"previousState"`
+-// Int64 defines an int64 flag with specified name, default value, and usage string.
+-// The return value is the address of an int64 variable that stores the value of the flag.
+-func Int64(name string, value int64, usage string) *int64 {
+- return CommandLine.Int64P(name, "", value, usage)
-}
-
--// TerminateInstances requests the termination of instances when the given ids.
--//
--// See http://goo.gl/3BKHj for more details.
--func (ec2 *EC2) TerminateInstances(instIds []string) (resp *TerminateInstancesResp, err error) {
-- params := makeParams("TerminateInstances")
-- addParamsList(params, "InstanceId", instIds)
-- resp = &TerminateInstancesResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
-- return
+-// Like Int64, but accepts a shorthand letter that can be used after a single dash.
+-func Int64P(name, shorthand string, value int64, usage string) *int64 {
+- return CommandLine.Int64P(name, shorthand, value, usage)
-}
+diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/int8.go b/Godeps/_workspace/src/github.com/spf13/pflag/int8.go
+deleted file mode 100644
+index aab1022..0000000
+--- a/Godeps/_workspace/src/github.com/spf13/pflag/int8.go
++++ /dev/null
+@@ -1,74 +0,0 @@
+-package pflag
-
--// Response to a DescribeInstances request.
--//
--// See http://goo.gl/mLbmw for more details.
--type InstancesResp struct {
-- RequestId string `xml:"requestId"`
-- Reservations []Reservation `xml:"reservationSet>item"`
+-import (
+- "fmt"
+- "strconv"
+-)
+-
+-// -- int8 Value
+-type int8Value int8
+-
+-func newInt8Value(val int8, p *int8) *int8Value {
+- *p = val
+- return (*int8Value)(p)
-}
-
--// Reservation represents details about a reservation in EC2.
--//
--// See http://goo.gl/0ItPT for more details.
--type Reservation struct {
-- ReservationId string `xml:"reservationId"`
-- OwnerId string `xml:"ownerId"`
-- RequesterId string `xml:"requesterId"`
-- SecurityGroups []SecurityGroup `xml:"groupSet>item"`
-- Instances []Instance `xml:"instancesSet>item"`
+-func (i *int8Value) Set(s string) error {
+- v, err := strconv.ParseInt(s, 0, 8)
+- *i = int8Value(v)
+- return err
-}
-
--// Instances returns details about instances in EC2. Both parameters
--// are optional, and if provided will limit the instances returned to those
--// matching the given instance ids or filtering rules.
--//
--// See http://goo.gl/4No7c for more details.
--func (ec2 *EC2) Instances(instIds []string, filter *Filter) (resp *InstancesResp, err error) {
-- params := makeParams("DescribeInstances")
-- addParamsList(params, "InstanceId", instIds)
-- filter.addParams(params)
-- resp = &InstancesResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
-- return
+-func (i *int8Value) Type() string {
+- return "int8"
-}
-
--// ----------------------------------------------------------------------------
--// Volume management
+-func (i *int8Value) String() string { return fmt.Sprintf("%v", *i) }
-
--// The CreateVolume request parameters
--//
--// See http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-CreateVolume.html
--type CreateVolume struct {
-- AvailZone string
-- Size int64
-- SnapshotId string
-- VolumeType string
-- IOPS int64
-- Encrypted bool
+-// Int8Var defines an int8 flag with specified name, default value, and usage string.
+-// The argument p points to an int8 variable in which to store the value of the flag.
+-func (f *FlagSet) Int8Var(p *int8, name string, value int8, usage string) {
+- f.VarP(newInt8Value(value, p), name, "", usage)
-}
-
--// Response to an AttachVolume request
--type AttachVolumeResp struct {
-- RequestId string `xml:"requestId"`
-- VolumeId string `xml:"volumeId"`
-- InstanceId string `xml:"instanceId"`
-- Device string `xml:"device"`
-- Status string `xml:"status"`
-- AttachTime string `xml:"attachTime"`
+-// Like Int8Var, but accepts a shorthand letter that can be used after a single dash.
+-func (f *FlagSet) Int8VarP(p *int8, name, shorthand string, value int8, usage string) {
+- f.VarP(newInt8Value(value, p), name, shorthand, usage)
-}
-
--// Response to a CreateVolume request
--type CreateVolumeResp struct {
-- RequestId string `xml:"requestId"`
-- VolumeId string `xml:"volumeId"`
-- Size int64 `xml:"size"`
-- SnapshotId string `xml:"snapshotId"`
-- AvailZone string `xml:"availabilityZone"`
-- Status string `xml:"status"`
-- CreateTime string `xml:"createTime"`
-- VolumeType string `xml:"volumeType"`
-- IOPS int64 `xml:"iops"`
-- Encrypted bool `xml:"encrypted"`
+-// Int8Var defines an int8 flag with specified name, default value, and usage string.
+-// The argument p points to an int8 variable in which to store the value of the flag.
+-func Int8Var(p *int8, name string, value int8, usage string) {
+- CommandLine.VarP(newInt8Value(value, p), name, "", usage)
-}
-
--// Volume is a single volume.
--type Volume struct {
-- VolumeId string `xml:"volumeId"`
-- Size string `xml:"size"`
-- SnapshotId string `xml:"snapshotId"`
-- AvailZone string `xml:"availabilityZone"`
-- Status string `xml:"status"`
-- Attachments []VolumeAttachment `xml:"attachmentSet>item"`
-- VolumeType string `xml:"volumeType"`
-- IOPS int64 `xml:"iops"`
-- Encrypted bool `xml:"encrypted"`
-- Tags []Tag `xml:"tagSet>item"`
+-// Like Int8Var, but accepts a shorthand letter that can be used after a single dash.
+-func Int8VarP(p *int8, name, shorthand string, value int8, usage string) {
+- CommandLine.VarP(newInt8Value(value, p), name, shorthand, usage)
+-}
+-
+-// Int8 defines an int8 flag with specified name, default value, and usage string.
+-// The return value is the address of an int8 variable that stores the value of the flag.
+-func (f *FlagSet) Int8(name string, value int8, usage string) *int8 {
+- p := new(int8)
+- f.Int8VarP(p, name, "", value, usage)
+- return p
+-}
+-
+-// Like Int8, but accepts a shorthand letter that can be used after a single dash.
+-func (f *FlagSet) Int8P(name, shorthand string, value int8, usage string) *int8 {
+- p := new(int8)
+- f.Int8VarP(p, name, shorthand, value, usage)
+- return p
+-}
+-
+-// Int8 defines an int8 flag with specified name, default value, and usage string.
+-// The return value is the address of an int8 variable that stores the value of the flag.
+-func Int8(name string, value int8, usage string) *int8 {
+- return CommandLine.Int8P(name, "", value, usage)
+-}
+-
+-// Like Int8, but accepts a shorthand letter that can be used after a single dash.
+-func Int8P(name, shorthand string, value int8, usage string) *int8 {
+- return CommandLine.Int8P(name, shorthand, value, usage)
+-}
+diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/ip.go b/Godeps/_workspace/src/github.com/spf13/pflag/ip.go
+deleted file mode 100644
+index 9d53bd3..0000000
+--- a/Godeps/_workspace/src/github.com/spf13/pflag/ip.go
++++ /dev/null
+@@ -1,79 +0,0 @@
+-package pflag
+-
+-import (
+- "fmt"
+- "net"
+-)
+-
+-// -- net.IP value
+-type ipValue net.IP
+-
+-func newIPValue(val net.IP, p *net.IP) *ipValue {
+- *p = val
+- return (*ipValue)(p)
+-}
+-
+-func (i *ipValue) String() string { return net.IP(*i).String() }
+-func (i *ipValue) Set(s string) error {
+- ip := net.ParseIP(s)
+- if ip == nil {
+- return fmt.Errorf("failed to parse IP: %q", s)
+- }
+- *i = ipValue(ip)
+- return nil
+-}
+-func (i *ipValue) Get() interface{} {
+- return net.IP(*i)
-}
-
--type VolumeAttachment struct {
-- VolumeId string `xml:"volumeId"`
-- InstanceId string `xml:"instanceId"`
-- Device string `xml:"device"`
-- Status string `xml:"status"`
+-func (i *ipValue) Type() string {
+- return "ip"
-}
-
--// Response to a DescribeVolumes request
--type VolumesResp struct {
-- RequestId string `xml:"requestId"`
-- Volumes []Volume `xml:"volumeSet>item"`
+-// IPVar defines an net.IP flag with specified name, default value, and usage string.
+-// The argument p points to an net.IP variable in which to store the value of the flag.
+-func (f *FlagSet) IPVar(p *net.IP, name string, value net.IP, usage string) {
+- f.VarP(newIPValue(value, p), name, "", usage)
-}
-
--// Attach a volume.
--func (ec2 *EC2) AttachVolume(volumeId string, instanceId string, device string) (resp *AttachVolumeResp, err error) {
-- params := makeParams("AttachVolume")
-- params["VolumeId"] = volumeId
-- params["InstanceId"] = instanceId
-- params["Device"] = device
+-// Like IPVar, but accepts a shorthand letter that can be used after a single dash.
+-func (f *FlagSet) IPVarP(p *net.IP, name, shorthand string, value net.IP, usage string) {
+- f.VarP(newIPValue(value, p), name, shorthand, usage)
+-}
-
-- resp = &AttachVolumeResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
+-// IPVar defines an net.IP flag with specified name, default value, and usage string.
+-// The argument p points to an net.IP variable in which to store the value of the flag.
+-func IPVar(p *net.IP, name string, value net.IP, usage string) {
+- CommandLine.VarP(newIPValue(value, p), name, "", usage)
+-}
-
-- return
+-// Like IPVar, but accepts a shorthand letter that can be used after a single dash.
+-func IPVarP(p *net.IP, name, shorthand string, value net.IP, usage string) {
+- CommandLine.VarP(newIPValue(value, p), name, shorthand, usage)
-}
-
--// Create a new volume.
--func (ec2 *EC2) CreateVolume(options *CreateVolume) (resp *CreateVolumeResp, err error) {
-- params := makeParams("CreateVolume")
-- params["AvailabilityZone"] = options.AvailZone
-- if options.Size > 0 {
-- params["Size"] = strconv.FormatInt(options.Size, 10)
-- }
+-// IP defines an net.IP flag with specified name, default value, and usage string.
+-// The return value is the address of an net.IP variable that stores the value of the flag.
+-func (f *FlagSet) IP(name string, value net.IP, usage string) *net.IP {
+- p := new(net.IP)
+- f.IPVarP(p, name, "", value, usage)
+- return p
+-}
-
-- if options.SnapshotId != "" {
-- params["SnapshotId"] = options.SnapshotId
-- }
+-// Like IP, but accepts a shorthand letter that can be used after a single dash.
+-func (f *FlagSet) IPP(name, shorthand string, value net.IP, usage string) *net.IP {
+- p := new(net.IP)
+- f.IPVarP(p, name, shorthand, value, usage)
+- return p
+-}
-
-- if options.VolumeType != "" {
-- params["VolumeType"] = options.VolumeType
-- }
+-// IP defines an net.IP flag with specified name, default value, and usage string.
+-// The return value is the address of an net.IP variable that stores the value of the flag.
+-func IP(name string, value net.IP, usage string) *net.IP {
+- return CommandLine.IPP(name, "", value, usage)
+-}
-
-- if options.IOPS > 0 {
-- params["Iops"] = strconv.FormatInt(options.IOPS, 10)
-- }
+-// Like IP, but accepts a shorthand letter that can be used after a single dash.
+-func IPP(name, shorthand string, value net.IP, usage string) *net.IP {
+- return CommandLine.IPP(name, shorthand, value, usage)
+-}
+diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/ipmask.go b/Godeps/_workspace/src/github.com/spf13/pflag/ipmask.go
+deleted file mode 100644
+index 6f85be9..0000000
+--- a/Godeps/_workspace/src/github.com/spf13/pflag/ipmask.go
++++ /dev/null
+@@ -1,89 +0,0 @@
+-package pflag
-
-- if options.Encrypted {
-- params["Encrypted"] = "true"
-- }
+-import (
+- "fmt"
+- "net"
+-)
-
-- resp = &CreateVolumeResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
+-// -- net.IPMask value
+-type ipMaskValue net.IPMask
-
-- return
+-func newIPMaskValue(val net.IPMask, p *net.IPMask) *ipMaskValue {
+- *p = val
+- return (*ipMaskValue)(p)
-}
-
--// Delete an EBS volume.
--func (ec2 *EC2) DeleteVolume(id string) (resp *SimpleResp, err error) {
-- params := makeParams("DeleteVolume")
-- params["VolumeId"] = id
--
-- resp = &SimpleResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
+-func (i *ipMaskValue) String() string { return net.IPMask(*i).String() }
+-func (i *ipMaskValue) Set(s string) error {
+- ip := ParseIPv4Mask(s)
+- if ip == nil {
+- return fmt.Errorf("failed to parse IP mask: %q", s)
- }
-- return
+- *i = ipMaskValue(ip)
+- return nil
+-}
+-func (i *ipMaskValue) Get() interface{} {
+- return net.IPMask(*i)
-}
-
--// Detaches an EBS volume.
--func (ec2 *EC2) DetachVolume(id string) (resp *SimpleResp, err error) {
-- params := makeParams("DetachVolume")
-- params["VolumeId"] = id
--
-- resp = &SimpleResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
-- return
+-func (i *ipMaskValue) Type() string {
+- return "ipMask"
-}
-
--// Finds or lists all volumes.
--func (ec2 *EC2) Volumes(volIds []string, filter *Filter) (resp *VolumesResp, err error) {
-- params := makeParams("DescribeVolumes")
-- addParamsList(params, "VolumeId", volIds)
-- filter.addParams(params)
-- resp = &VolumesResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
+-// Parse IPv4 netmask written in IP form (e.g. 255.255.255.0).
+-// This function should really belong to the net package.
+-func ParseIPv4Mask(s string) net.IPMask {
+- mask := net.ParseIP(s)
+- if mask == nil {
+- return nil
- }
-- return
+- return net.IPv4Mask(mask[12], mask[13], mask[14], mask[15])
-}
-
--// ----------------------------------------------------------------------------
--// ElasticIp management (for VPC)
--
--// The AllocateAddress request parameters
--//
--// see http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-AllocateAddress.html
--type AllocateAddress struct {
-- Domain string
+-// IPMaskVar defines an net.IPMask flag with specified name, default value, and usage string.
+-// The argument p points to an net.IPMask variable in which to store the value of the flag.
+-func (f *FlagSet) IPMaskVar(p *net.IPMask, name string, value net.IPMask, usage string) {
+- f.VarP(newIPMaskValue(value, p), name, "", usage)
-}
-
--// Response to an AllocateAddress request
--type AllocateAddressResp struct {
-- RequestId string `xml:"requestId"`
-- PublicIp string `xml:"publicIp"`
-- Domain string `xml:"domain"`
-- AllocationId string `xml:"allocationId"`
+-// Like IPMaskVar, but accepts a shorthand letter that can be used after a single dash.
+-func (f *FlagSet) IPMaskVarP(p *net.IPMask, name, shorthand string, value net.IPMask, usage string) {
+- f.VarP(newIPMaskValue(value, p), name, shorthand, usage)
-}
-
--// The AssociateAddress request parameters
--//
--// http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-AssociateAddress.html
--type AssociateAddress struct {
-- InstanceId string
-- PublicIp string
-- AllocationId string
-- AllowReassociation bool
+-// IPMaskVar defines an net.IPMask flag with specified name, default value, and usage string.
+-// The argument p points to an net.IPMask variable in which to store the value of the flag.
+-func IPMaskVar(p *net.IPMask, name string, value net.IPMask, usage string) {
+- CommandLine.VarP(newIPMaskValue(value, p), name, "", usage)
-}
-
--// Response to an AssociateAddress request
--type AssociateAddressResp struct {
-- RequestId string `xml:"requestId"`
-- Return bool `xml:"return"`
-- AssociationId string `xml:"associationId"`
+-// Like IPMaskVar, but accepts a shorthand letter that can be used after a single dash.
+-func IPMaskVarP(p *net.IPMask, name, shorthand string, value net.IPMask, usage string) {
+- CommandLine.VarP(newIPMaskValue(value, p), name, shorthand, usage)
-}
-
--// Address represents an Elastic IP Address
--// See http://goo.gl/uxCjp7 for more details
--type Address struct {
-- PublicIp string `xml:"publicIp"`
-- AllocationId string `xml:"allocationId"`
-- Domain string `xml:"domain"`
-- InstanceId string `xml:"instanceId"`
-- AssociationId string `xml:"associationId"`
-- NetworkInterfaceId string `xml:"networkInterfaceId"`
-- NetworkInterfaceOwnerId string `xml:"networkInterfaceOwnerId"`
-- PrivateIpAddress string `xml:"privateIpAddress"`
+-// IPMask defines an net.IPMask flag with specified name, default value, and usage string.
+-// The return value is the address of an net.IPMask variable that stores the value of the flag.
+-func (f *FlagSet) IPMask(name string, value net.IPMask, usage string) *net.IPMask {
+- p := new(net.IPMask)
+- f.IPMaskVarP(p, name, "", value, usage)
+- return p
-}
-
--type DescribeAddressesResp struct {
-- RequestId string `xml:"requestId"`
-- Addresses []Address `xml:"addressesSet>item"`
+-// Like IPMask, but accepts a shorthand letter that can be used after a single dash.
+-func (f *FlagSet) IPMaskP(name, shorthand string, value net.IPMask, usage string) *net.IPMask {
+- p := new(net.IPMask)
+- f.IPMaskVarP(p, name, shorthand, value, usage)
+- return p
-}
-
--// Allocate a new Elastic IP.
--func (ec2 *EC2) AllocateAddress(options *AllocateAddress) (resp *AllocateAddressResp, err error) {
-- params := makeParams("AllocateAddress")
-- params["Domain"] = options.Domain
--
-- resp = &AllocateAddressResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
--
-- return
+-// IPMask defines an net.IPMask flag with specified name, default value, and usage string.
+-// The return value is the address of an net.IPMask variable that stores the value of the flag.
+-func IPMask(name string, value net.IPMask, usage string) *net.IPMask {
+- return CommandLine.IPMaskP(name, "", value, usage)
-}
-
--// Release an Elastic IP (VPC).
--func (ec2 *EC2) ReleaseAddress(id string) (resp *SimpleResp, err error) {
-- params := makeParams("ReleaseAddress")
-- params["AllocationId"] = id
--
-- resp = &SimpleResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
--
-- return
+-// Like IP, but accepts a shorthand letter that can be used after a single dash.
+-func IPMaskP(name, shorthand string, value net.IPMask, usage string) *net.IPMask {
+- return CommandLine.IPMaskP(name, shorthand, value, usage)
-}
+diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/string.go b/Godeps/_workspace/src/github.com/spf13/pflag/string.go
+deleted file mode 100644
+index 362fbf8..0000000
+--- a/Godeps/_workspace/src/github.com/spf13/pflag/string.go
++++ /dev/null
+@@ -1,69 +0,0 @@
+-package pflag
-
--// Release an Elastic IP (Public)
--func (ec2 *EC2) ReleasePublicAddress(publicIp string) (resp *SimpleResp, err error) {
-- params := makeParams("ReleaseAddress")
-- params["PublicIp"] = publicIp
+-import "fmt"
-
-- resp = &SimpleResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
+-// -- string Value
+-type stringValue string
-
-- return
+-func newStringValue(val string, p *string) *stringValue {
+- *p = val
+- return (*stringValue)(p)
-}
-
--// Associate an address with a VPC instance.
--func (ec2 *EC2) AssociateAddress(options *AssociateAddress) (resp *AssociateAddressResp, err error) {
-- params := makeParams("AssociateAddress")
-- params["InstanceId"] = options.InstanceId
-- if options.PublicIp != "" {
-- params["PublicIp"] = options.PublicIp
-- }
-- if options.AllocationId != "" {
-- params["AllocationId"] = options.AllocationId
-- }
-- if options.AllowReassociation {
-- params["AllowReassociation"] = "true"
-- }
--
-- resp = &AssociateAddressResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
--
-- return
+-func (s *stringValue) Set(val string) error {
+- *s = stringValue(val)
+- return nil
+-}
+-func (s *stringValue) Type() string {
+- return "string"
-}
-
--// Disassociate an address from a VPC instance.
--func (ec2 *EC2) DisassociateAddress(id string) (resp *SimpleResp, err error) {
-- params := makeParams("DisassociateAddress")
-- params["AssociationId"] = id
--
-- resp = &SimpleResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
+-func (s *stringValue) String() string { return fmt.Sprintf("%s", *s) }
-
-- return
+-// StringVar defines a string flag with specified name, default value, and usage string.
+-// The argument p points to a string variable in which to store the value of the flag.
+-func (f *FlagSet) StringVar(p *string, name string, value string, usage string) {
+- f.VarP(newStringValue(value, p), name, "", usage)
-}
-
--// DescribeAddresses returns details about one or more
--// Elastic IP Addresses. Returned addresses can be
--// filtered by Public IP, Allocation ID or multiple filters
--//
--// See http://goo.gl/zW7J4p for more details.
--func (ec2 *EC2) Addresses(publicIps []string, allocationIds []string, filter *Filter) (resp *DescribeAddressesResp, err error) {
-- params := makeParams("DescribeAddresses")
-- addParamsList(params, "PublicIp", publicIps)
-- addParamsList(params, "AllocationId", allocationIds)
-- filter.addParams(params)
-- resp = &DescribeAddressesResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
-- return
+-// Like StringVar, but accepts a shorthand letter that can be used after a single dash.
+-func (f *FlagSet) StringVarP(p *string, name, shorthand string, value string, usage string) {
+- f.VarP(newStringValue(value, p), name, shorthand, usage)
-}
-
--// ----------------------------------------------------------------------------
--// Image and snapshot management functions and types.
--
--// The CreateImage request parameters.
--//
--// See http://goo.gl/cxU41 for more details.
--type CreateImage struct {
-- InstanceId string
-- Name string
-- Description string
-- NoReboot bool
-- BlockDevices []BlockDeviceMapping
+-// StringVar defines a string flag with specified name, default value, and usage string.
+-// The argument p points to a string variable in which to store the value of the flag.
+-func StringVar(p *string, name string, value string, usage string) {
+- CommandLine.VarP(newStringValue(value, p), name, "", usage)
-}
-
--// Response to a CreateImage request.
--//
--// See http://goo.gl/cxU41 for more details.
--type CreateImageResp struct {
-- RequestId string `xml:"requestId"`
-- ImageId string `xml:"imageId"`
+-// Like StringVar, but accepts a shorthand letter that can be used after a single dash.
+-func StringVarP(p *string, name, shorthand string, value string, usage string) {
+- CommandLine.VarP(newStringValue(value, p), name, shorthand, usage)
-}
-
--// Response to a DescribeImages request.
--//
--// See http://goo.gl/hLnyg for more details.
--type ImagesResp struct {
-- RequestId string `xml:"requestId"`
-- Images []Image `xml:"imagesSet>item"`
+-// String defines a string flag with specified name, default value, and usage string.
+-// The return value is the address of a string variable that stores the value of the flag.
+-func (f *FlagSet) String(name string, value string, usage string) *string {
+- p := new(string)
+- f.StringVarP(p, name, "", value, usage)
+- return p
-}
-
--// Response to a DescribeImageAttribute request.
--//
--// See http://goo.gl/bHO3zT for more details.
--type ImageAttributeResp struct {
-- RequestId string `xml:"requestId"`
-- ImageId string `xml:"imageId"`
-- Kernel string `xml:"kernel>value"`
-- RamDisk string `xml:"ramdisk>value"`
-- Description string `xml:"description>value"`
-- Group string `xml:"launchPermission>item>group"`
-- UserIds []string `xml:"launchPermission>item>userId"`
-- ProductCodes []string `xml:"productCodes>item>productCode"`
-- BlockDevices []BlockDeviceMapping `xml:"blockDeviceMapping>item"`
+-// Like String, but accepts a shorthand letter that can be used after a single dash.
+-func (f *FlagSet) StringP(name, shorthand string, value string, usage string) *string {
+- p := new(string)
+- f.StringVarP(p, name, shorthand, value, usage)
+- return p
-}
-
--// The RegisterImage request parameters.
--type RegisterImage struct {
-- ImageLocation string
-- Name string
-- Description string
-- Architecture string
-- KernelId string
-- RamdiskId string
-- RootDeviceName string
-- VirtType string
-- SriovNetSupport string
-- BlockDevices []BlockDeviceMapping
+-// String defines a string flag with specified name, default value, and usage string.
+-// The return value is the address of a string variable that stores the value of the flag.
+-func String(name string, value string, usage string) *string {
+- return CommandLine.StringP(name, "", value, usage)
-}
-
--// Response to a RegisterImage request.
--type RegisterImageResp struct {
-- RequestId string `xml:"requestId"`
-- ImageId string `xml:"imageId"`
+-// Like String, but accepts a shorthand letter that can be used after a single dash.
+-func StringP(name, shorthand string, value string, usage string) *string {
+- return CommandLine.StringP(name, shorthand, value, usage)
-}
+diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/uint.go b/Godeps/_workspace/src/github.com/spf13/pflag/uint.go
+deleted file mode 100644
+index c063fe7..0000000
+--- a/Godeps/_workspace/src/github.com/spf13/pflag/uint.go
++++ /dev/null
+@@ -1,74 +0,0 @@
+-package pflag
-
--// Response to a DegisterImage request.
--//
--// See http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DeregisterImage.html
--type DeregisterImageResp struct {
-- RequestId string `xml:"requestId"`
-- Return bool `xml:"return"`
--}
+-import (
+- "fmt"
+- "strconv"
+-)
-
--// BlockDeviceMapping represents the association of a block device with an image.
--//
--// See http://goo.gl/wnDBf for more details.
--type BlockDeviceMapping struct {
-- DeviceName string `xml:"deviceName"`
-- VirtualName string `xml:"virtualName"`
-- SnapshotId string `xml:"ebs>snapshotId"`
-- VolumeType string `xml:"ebs>volumeType"`
-- VolumeSize int64 `xml:"ebs>volumeSize"`
-- DeleteOnTermination bool `xml:"ebs>deleteOnTermination"`
-- Encrypted bool `xml:"ebs>encrypted"`
-- NoDevice bool `xml:"noDevice"`
+-// -- uint Value
+-type uintValue uint
-
-- // The number of I/O operations per second (IOPS) that the volume supports.
-- IOPS int64 `xml:"ebs>iops"`
+-func newUintValue(val uint, p *uint) *uintValue {
+- *p = val
+- return (*uintValue)(p)
-}
-
--// Image represents details about an image.
--//
--// See http://goo.gl/iSqJG for more details.
--type Image struct {
-- Id string `xml:"imageId"`
-- Name string `xml:"name"`
-- Description string `xml:"description"`
-- Type string `xml:"imageType"`
-- State string `xml:"imageState"`
-- Location string `xml:"imageLocation"`
-- Public bool `xml:"isPublic"`
-- Architecture string `xml:"architecture"`
-- Platform string `xml:"platform"`
-- ProductCodes []string `xml:"productCode>item>productCode"`
-- KernelId string `xml:"kernelId"`
-- RamdiskId string `xml:"ramdiskId"`
-- StateReason string `xml:"stateReason"`
-- OwnerId string `xml:"imageOwnerId"`
-- OwnerAlias string `xml:"imageOwnerAlias"`
-- RootDeviceType string `xml:"rootDeviceType"`
-- RootDeviceName string `xml:"rootDeviceName"`
-- VirtualizationType string `xml:"virtualizationType"`
-- Hypervisor string `xml:"hypervisor"`
-- BlockDevices []BlockDeviceMapping `xml:"blockDeviceMapping>item"`
-- Tags []Tag `xml:"tagSet>item"`
+-func (i *uintValue) Set(s string) error {
+- v, err := strconv.ParseUint(s, 0, 64)
+- *i = uintValue(v)
+- return err
-}
-
--// The ModifyImageAttribute request parameters.
--type ModifyImageAttribute struct {
-- AddUsers []string
-- RemoveUsers []string
-- AddGroups []string
-- RemoveGroups []string
-- ProductCodes []string
-- Description string
+-func (i *uintValue) Type() string {
+- return "uint"
-}
-
--// The CopyImage request parameters.
--//
--// See http://goo.gl/hQwPCK for more details.
--type CopyImage struct {
-- SourceRegion string
-- SourceImageId string
-- Name string
-- Description string
-- ClientToken string
+-func (i *uintValue) String() string { return fmt.Sprintf("%v", *i) }
+-
+-// UintVar defines a uint flag with specified name, default value, and usage string.
+-// The argument p points to a uint variable in which to store the value of the flag.
+-func (f *FlagSet) UintVar(p *uint, name string, value uint, usage string) {
+- f.VarP(newUintValue(value, p), name, "", usage)
+-}
+-
+-// Like UintVar, but accepts a shorthand letter that can be used after a single dash.
+-func (f *FlagSet) UintVarP(p *uint, name, shorthand string, value uint, usage string) {
+- f.VarP(newUintValue(value, p), name, shorthand, usage)
-}
-
--// Response to a CopyImage request.
--//
--// See http://goo.gl/hQwPCK for more details.
--type CopyImageResp struct {
-- RequestId string `xml:"requestId"`
-- ImageId string `xml:"imageId"`
+-// UintVar defines a uint flag with specified name, default value, and usage string.
+-// The argument p points to a uint variable in which to store the value of the flag.
+-func UintVar(p *uint, name string, value uint, usage string) {
+- CommandLine.VarP(newUintValue(value, p), name, "", usage)
-}
-
--// Creates an Amazon EBS-backed AMI from an Amazon EBS-backed instance
--// that is either running or stopped.
--//
--// See http://goo.gl/cxU41 for more details.
--func (ec2 *EC2) CreateImage(options *CreateImage) (resp *CreateImageResp, err error) {
-- params := makeParams("CreateImage")
-- params["InstanceId"] = options.InstanceId
-- params["Name"] = options.Name
-- if options.Description != "" {
-- params["Description"] = options.Description
-- }
-- if options.NoReboot {
-- params["NoReboot"] = "true"
-- }
-- addBlockDeviceParams("", params, options.BlockDevices)
+-// Like UintVar, but accepts a shorthand letter that can be used after a single dash.
+-func UintVarP(p *uint, name, shorthand string, value uint, usage string) {
+- CommandLine.VarP(newUintValue(value, p), name, shorthand, usage)
+-}
-
-- resp = &CreateImageResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
+-// Uint defines a uint flag with specified name, default value, and usage string.
+-// The return value is the address of a uint variable that stores the value of the flag.
+-func (f *FlagSet) Uint(name string, value uint, usage string) *uint {
+- p := new(uint)
+- f.UintVarP(p, name, "", value, usage)
+- return p
+-}
-
-- return
+-// Like Uint, but accepts a shorthand letter that can be used after a single dash.
+-func (f *FlagSet) UintP(name, shorthand string, value uint, usage string) *uint {
+- p := new(uint)
+- f.UintVarP(p, name, shorthand, value, usage)
+- return p
-}
-
--// Images returns details about available images.
--// The ids and filter parameters, if provided, will limit the images returned.
--// For example, to get all the private images associated with this account set
--// the boolean filter "is-public" to 0.
--// For list of filters: http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeImages.html
--//
--// Note: calling this function with nil ids and filter parameters will result in
--// a very large number of images being returned.
--//
--// See http://goo.gl/SRBhW for more details.
--func (ec2 *EC2) Images(ids []string, filter *Filter) (resp *ImagesResp, err error) {
-- params := makeParams("DescribeImages")
-- for i, id := range ids {
-- params["ImageId."+strconv.Itoa(i+1)] = id
-- }
-- filter.addParams(params)
+-// Uint defines a uint flag with specified name, default value, and usage string.
+-// The return value is the address of a uint variable that stores the value of the flag.
+-func Uint(name string, value uint, usage string) *uint {
+- return CommandLine.UintP(name, "", value, usage)
+-}
-
-- resp = &ImagesResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
-- return
+-// Like Uint, but accepts a shorthand letter that can be used after a single dash.
+-func UintP(name, shorthand string, value uint, usage string) *uint {
+- return CommandLine.UintP(name, shorthand, value, usage)
-}
+diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/uint16.go b/Godeps/_workspace/src/github.com/spf13/pflag/uint16.go
+deleted file mode 100644
+index ec14ab0..0000000
+--- a/Godeps/_workspace/src/github.com/spf13/pflag/uint16.go
++++ /dev/null
+@@ -1,76 +0,0 @@
+-package pflag
-
--// ImagesByOwners returns details about available images.
--// The ids, owners, and filter parameters, if provided, will limit the images returned.
--// For example, to get all the private images associated with this account set
--// the boolean filter "is-public" to 0.
--// For list of filters: http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeImages.html
--//
--// Note: calling this function with nil ids and filter parameters will result in
--// a very large number of images being returned.
--//
--// See http://goo.gl/SRBhW for more details.
--func (ec2 *EC2) ImagesByOwners(ids []string, owners []string, filter *Filter) (resp *ImagesResp, err error) {
-- params := makeParams("DescribeImages")
-- for i, id := range ids {
-- params["ImageId."+strconv.Itoa(i+1)] = id
-- }
-- for i, owner := range owners {
-- params[fmt.Sprintf("Owner.%d", i+1)] = owner
-- }
+-import (
+- "fmt"
+- "strconv"
+-)
-
-- filter.addParams(params)
+-// -- uint16 value
+-type uint16Value uint16
-
-- resp = &ImagesResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
-- return
+-func newUint16Value(val uint16, p *uint16) *uint16Value {
+- *p = val
+- return (*uint16Value)(p)
+-}
+-func (i *uint16Value) String() string { return fmt.Sprintf("%d", *i) }
+-func (i *uint16Value) Set(s string) error {
+- v, err := strconv.ParseUint(s, 0, 16)
+- *i = uint16Value(v)
+- return err
-}
-
--// ImageAttribute describes an attribute of an AMI.
--// You can specify only one attribute at a time.
--// Valid attributes are:
--// description | kernel | ramdisk | launchPermission | productCodes | blockDeviceMapping
--//
--// See http://goo.gl/bHO3zT for more details.
--func (ec2 *EC2) ImageAttribute(imageId, attribute string) (resp *ImageAttributeResp, err error) {
-- params := makeParams("DescribeImageAttribute")
-- params["ImageId"] = imageId
-- params["Attribute"] = attribute
+-func (i *uint16Value) Get() interface{} {
+- return uint16(*i)
+-}
-
-- resp = &ImageAttributeResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
-- return
+-func (i *uint16Value) Type() string {
+- return "uint16"
-}
-
--// ModifyImageAttribute sets attributes for an image.
--//
--// See http://goo.gl/YUjO4G for more details.
--func (ec2 *EC2) ModifyImageAttribute(imageId string, options *ModifyImageAttribute) (resp *SimpleResp, err error) {
-- params := makeParams("ModifyImageAttribute")
-- params["ImageId"] = imageId
-- if options.Description != "" {
-- params["Description.Value"] = options.Description
-- }
+-// Uint16Var defines a uint flag with specified name, default value, and usage string.
+-// The argument p points to a uint variable in which to store the value of the flag.
+-func (f *FlagSet) Uint16Var(p *uint16, name string, value uint16, usage string) {
+- f.VarP(newUint16Value(value, p), name, "", usage)
+-}
-
-- if options.AddUsers != nil {
-- for i, user := range options.AddUsers {
-- p := fmt.Sprintf("LaunchPermission.Add.%d.UserId", i+1)
-- params[p] = user
-- }
-- }
+-// Like Uint16Var, but accepts a shorthand letter that can be used after a single dash.
+-func (f *FlagSet) Uint16VarP(p *uint16, name, shorthand string, value uint16, usage string) {
+- f.VarP(newUint16Value(value, p), name, shorthand, usage)
+-}
-
-- if options.RemoveUsers != nil {
-- for i, user := range options.RemoveUsers {
-- p := fmt.Sprintf("LaunchPermission.Remove.%d.UserId", i+1)
-- params[p] = user
-- }
-- }
+-// Uint16Var defines a uint flag with specified name, default value, and usage string.
+-// The argument p points to a uint variable in which to store the value of the flag.
+-func Uint16Var(p *uint16, name string, value uint16, usage string) {
+- CommandLine.VarP(newUint16Value(value, p), name, "", usage)
+-}
-
-- if options.AddGroups != nil {
-- for i, group := range options.AddGroups {
-- p := fmt.Sprintf("LaunchPermission.Add.%d.Group", i+1)
-- params[p] = group
-- }
-- }
+-// Like Uint16Var, but accepts a shorthand letter that can be used after a single dash.
+-func Uint16VarP(p *uint16, name, shorthand string, value uint16, usage string) {
+- CommandLine.VarP(newUint16Value(value, p), name, shorthand, usage)
+-}
-
-- if options.RemoveGroups != nil {
-- for i, group := range options.RemoveGroups {
-- p := fmt.Sprintf("LaunchPermission.Remove.%d.Group", i+1)
-- params[p] = group
-- }
-- }
+-// Uint16 defines a uint flag with specified name, default value, and usage string.
+-// The return value is the address of a uint variable that stores the value of the flag.
+-func (f *FlagSet) Uint16(name string, value uint16, usage string) *uint16 {
+- p := new(uint16)
+- f.Uint16VarP(p, name, "", value, usage)
+- return p
+-}
-
-- if options.ProductCodes != nil {
-- addParamsList(params, "ProductCode", options.ProductCodes)
-- }
+-// Like Uint16, but accepts a shorthand letter that can be used after a single dash.
+-func (f *FlagSet) Uint16P(name, shorthand string, value uint16, usage string) *uint16 {
+- p := new(uint16)
+- f.Uint16VarP(p, name, shorthand, value, usage)
+- return p
+-}
-
-- resp = &SimpleResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- resp = nil
-- }
+-// Uint16 defines a uint flag with specified name, default value, and usage string.
+-// The return value is the address of a uint variable that stores the value of the flag.
+-func Uint16(name string, value uint16, usage string) *uint16 {
+- return CommandLine.Uint16P(name, "", value, usage)
+-}
-
-- return
+-// Like Uint16, but accepts a shorthand letter that can be used after a single dash.
+-func Uint16P(name, shorthand string, value uint16, usage string) *uint16 {
+- return CommandLine.Uint16P(name, shorthand, value, usage)
-}
+diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/uint32.go b/Godeps/_workspace/src/github.com/spf13/pflag/uint32.go
+deleted file mode 100644
+index 05bc3bd..0000000
+--- a/Godeps/_workspace/src/github.com/spf13/pflag/uint32.go
++++ /dev/null
+@@ -1,75 +0,0 @@
+-package pflag
-
--// Registers a new AMI with EC2.
--//
--// See: http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-RegisterImage.html
--func (ec2 *EC2) RegisterImage(options *RegisterImage) (resp *RegisterImageResp, err error) {
-- params := makeParams("RegisterImage")
-- params["Name"] = options.Name
-- if options.ImageLocation != "" {
-- params["ImageLocation"] = options.ImageLocation
-- }
+-import (
+- "fmt"
+- "strconv"
+-)
-
-- if options.Description != "" {
-- params["Description"] = options.Description
-- }
+-// -- uint16 value
+-type uint32Value uint32
-
-- if options.Architecture != "" {
-- params["Architecture"] = options.Architecture
-- }
+-func newUint32Value(val uint32, p *uint32) *uint32Value {
+- *p = val
+- return (*uint32Value)(p)
+-}
+-func (i *uint32Value) String() string { return fmt.Sprintf("%d", *i) }
+-func (i *uint32Value) Set(s string) error {
+- v, err := strconv.ParseUint(s, 0, 32)
+- *i = uint32Value(v)
+- return err
+-}
+-func (i *uint32Value) Get() interface{} {
+- return uint32(*i)
+-}
-
-- if options.KernelId != "" {
-- params["KernelId"] = options.KernelId
-- }
+-func (i *uint32Value) Type() string {
+- return "uint32"
+-}
-
-- if options.RamdiskId != "" {
-- params["RamdiskId"] = options.RamdiskId
-- }
+-// Uint32Var defines a uint32 flag with specified name, default value, and usage string.
+-// The argument p points to a uint32 variable in which to store the value of the flag.
+-func (f *FlagSet) Uint32Var(p *uint32, name string, value uint32, usage string) {
+- f.VarP(newUint32Value(value, p), name, "", usage)
+-}
-
-- if options.RootDeviceName != "" {
-- params["RootDeviceName"] = options.RootDeviceName
-- }
+-// Like Uint32Var, but accepts a shorthand letter that can be used after a single dash.
+-func (f *FlagSet) Uint32VarP(p *uint32, name, shorthand string, value uint32, usage string) {
+- f.VarP(newUint32Value(value, p), name, shorthand, usage)
+-}
-
-- if options.VirtType != "" {
-- params["VirtualizationType"] = options.VirtType
-- }
+-// Uint32Var defines a uint32 flag with specified name, default value, and usage string.
+-// The argument p points to a uint32 variable in which to store the value of the flag.
+-func Uint32Var(p *uint32, name string, value uint32, usage string) {
+- CommandLine.VarP(newUint32Value(value, p), name, "", usage)
+-}
-
-- if options.SriovNetSupport != "" {
-- params["SriovNetSupport"] = "simple"
-- }
+-// Like Uint32Var, but accepts a shorthand letter that can be used after a single dash.
+-func Uint32VarP(p *uint32, name, shorthand string, value uint32, usage string) {
+- CommandLine.VarP(newUint32Value(value, p), name, shorthand, usage)
+-}
-
-- addBlockDeviceParams("", params, options.BlockDevices)
+-// Uint32 defines a uint32 flag with specified name, default value, and usage string.
+-// The return value is the address of a uint32 variable that stores the value of the flag.
+-func (f *FlagSet) Uint32(name string, value uint32, usage string) *uint32 {
+- p := new(uint32)
+- f.Uint32VarP(p, name, "", value, usage)
+- return p
+-}
-
-- resp = &RegisterImageResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
+-// Like Uint32, but accepts a shorthand letter that can be used after a single dash.
+-func (f *FlagSet) Uint32P(name, shorthand string, value uint32, usage string) *uint32 {
+- p := new(uint32)
+- f.Uint32VarP(p, name, shorthand, value, usage)
+- return p
+-}
-
-- return
+-// Uint32 defines a uint32 flag with specified name, default value, and usage string.
+-// The return value is the address of a uint32 variable that stores the value of the flag.
+-func Uint32(name string, value uint32, usage string) *uint32 {
+- return CommandLine.Uint32P(name, "", value, usage)
-}
-
--// Degisters an image. Note that this does not delete the backing stores of the AMI.
--//
--// See http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DeregisterImage.html
--func (ec2 *EC2) DeregisterImage(imageId string) (resp *DeregisterImageResp, err error) {
-- params := makeParams("DeregisterImage")
-- params["ImageId"] = imageId
+-// Like Uint32, but accepts a shorthand letter that can be used after a single dash.
+-func Uint32P(name, shorthand string, value uint32, usage string) *uint32 {
+- return CommandLine.Uint32P(name, shorthand, value, usage)
+-}
+diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/uint64.go b/Godeps/_workspace/src/github.com/spf13/pflag/uint64.go
+deleted file mode 100644
+index 99c7e80..0000000
+--- a/Godeps/_workspace/src/github.com/spf13/pflag/uint64.go
++++ /dev/null
+@@ -1,74 +0,0 @@
+-package pflag
-
-- resp = &DeregisterImageResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
+-import (
+- "fmt"
+- "strconv"
+-)
-
-- return
+-// -- uint64 Value
+-type uint64Value uint64
+-
+-func newUint64Value(val uint64, p *uint64) *uint64Value {
+- *p = val
+- return (*uint64Value)(p)
-}
-
--// Copy and Image from one region to another.
--//
--// See http://goo.gl/hQwPCK for more details.
--func (ec2 *EC2) CopyImage(options *CopyImage) (resp *CopyImageResp, err error) {
-- params := makeParams("CopyImage")
+-func (i *uint64Value) Set(s string) error {
+- v, err := strconv.ParseUint(s, 0, 64)
+- *i = uint64Value(v)
+- return err
+-}
-
-- if options.SourceRegion != "" {
-- params["SourceRegion"] = options.SourceRegion
-- }
+-func (i *uint64Value) Type() string {
+- return "uint64"
+-}
-
-- if options.SourceImageId != "" {
-- params["SourceImageId"] = options.SourceImageId
-- }
+-func (i *uint64Value) String() string { return fmt.Sprintf("%v", *i) }
-
-- if options.Name != "" {
-- params["Name"] = options.Name
-- }
+-// Uint64Var defines a uint64 flag with specified name, default value, and usage string.
+-// The argument p points to a uint64 variable in which to store the value of the flag.
+-func (f *FlagSet) Uint64Var(p *uint64, name string, value uint64, usage string) {
+- f.VarP(newUint64Value(value, p), name, "", usage)
+-}
-
-- if options.Description != "" {
-- params["Description"] = options.Description
-- }
+-// Like Uint64Var, but accepts a shorthand letter that can be used after a single dash.
+-func (f *FlagSet) Uint64VarP(p *uint64, name, shorthand string, value uint64, usage string) {
+- f.VarP(newUint64Value(value, p), name, shorthand, usage)
+-}
-
-- if options.ClientToken != "" {
-- params["ClientToken"] = options.ClientToken
-- }
+-// Uint64Var defines a uint64 flag with specified name, default value, and usage string.
+-// The argument p points to a uint64 variable in which to store the value of the flag.
+-func Uint64Var(p *uint64, name string, value uint64, usage string) {
+- CommandLine.VarP(newUint64Value(value, p), name, "", usage)
+-}
-
-- resp = &CopyImageResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
+-// Like Uint64Var, but accepts a shorthand letter that can be used after a single dash.
+-func Uint64VarP(p *uint64, name, shorthand string, value uint64, usage string) {
+- CommandLine.VarP(newUint64Value(value, p), name, shorthand, usage)
+-}
-
-- return
+-// Uint64 defines a uint64 flag with specified name, default value, and usage string.
+-// The return value is the address of a uint64 variable that stores the value of the flag.
+-func (f *FlagSet) Uint64(name string, value uint64, usage string) *uint64 {
+- p := new(uint64)
+- f.Uint64VarP(p, name, "", value, usage)
+- return p
-}
-
--// Response to a CreateSnapshot request.
--//
--// See http://goo.gl/ttcda for more details.
--type CreateSnapshotResp struct {
-- RequestId string `xml:"requestId"`
-- Snapshot
+-// Like Uint64, but accepts a shorthand letter that can be used after a single dash.
+-func (f *FlagSet) Uint64P(name, shorthand string, value uint64, usage string) *uint64 {
+- p := new(uint64)
+- f.Uint64VarP(p, name, shorthand, value, usage)
+- return p
-}
-
--// CreateSnapshot creates a volume snapshot and stores it in S3.
--//
--// See http://goo.gl/ttcda for more details.
--func (ec2 *EC2) CreateSnapshot(volumeId, description string) (resp *CreateSnapshotResp, err error) {
-- params := makeParams("CreateSnapshot")
-- params["VolumeId"] = volumeId
-- params["Description"] = description
+-// Uint64 defines a uint64 flag with specified name, default value, and usage string.
+-// The return value is the address of a uint64 variable that stores the value of the flag.
+-func Uint64(name string, value uint64, usage string) *uint64 {
+- return CommandLine.Uint64P(name, "", value, usage)
+-}
-
-- resp = &CreateSnapshotResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
-- return
+-// Like Uint64, but accepts a shorthand letter that can be used after a single dash.
+-func Uint64P(name, shorthand string, value uint64, usage string) *uint64 {
+- return CommandLine.Uint64P(name, shorthand, value, usage)
-}
+diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/uint8.go b/Godeps/_workspace/src/github.com/spf13/pflag/uint8.go
+deleted file mode 100644
+index 6fef508..0000000
+--- a/Godeps/_workspace/src/github.com/spf13/pflag/uint8.go
++++ /dev/null
+@@ -1,74 +0,0 @@
+-package pflag
-
--// DeleteSnapshots deletes the volume snapshots with the given ids.
--//
--// Note: If you make periodic snapshots of a volume, the snapshots are
--// incremental so that only the blocks on the device that have changed
--// since your last snapshot are incrementally saved in the new snapshot.
--// Even though snapshots are saved incrementally, the snapshot deletion
--// process is designed so that you need to retain only the most recent
--// snapshot in order to restore the volume.
--//
--// See http://goo.gl/vwU1y for more details.
--func (ec2 *EC2) DeleteSnapshots(ids []string) (resp *SimpleResp, err error) {
-- params := makeParams("DeleteSnapshot")
-- for i, id := range ids {
-- params["SnapshotId."+strconv.Itoa(i+1)] = id
-- }
+-import (
+- "fmt"
+- "strconv"
+-)
-
-- resp = &SimpleResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
-- return
--}
+-// -- uint8 Value
+-type uint8Value uint8
-
--// Response to a DescribeSnapshots request.
--//
--// See http://goo.gl/nClDT for more details.
--type SnapshotsResp struct {
-- RequestId string `xml:"requestId"`
-- Snapshots []Snapshot `xml:"snapshotSet>item"`
+-func newUint8Value(val uint8, p *uint8) *uint8Value {
+- *p = val
+- return (*uint8Value)(p)
-}
-
--// Snapshot represents details about a volume snapshot.
--//
--// See http://goo.gl/nkovs for more details.
--type Snapshot struct {
-- Id string `xml:"snapshotId"`
-- VolumeId string `xml:"volumeId"`
-- VolumeSize string `xml:"volumeSize"`
-- Status string `xml:"status"`
-- StartTime string `xml:"startTime"`
-- Description string `xml:"description"`
-- Progress string `xml:"progress"`
-- OwnerId string `xml:"ownerId"`
-- OwnerAlias string `xml:"ownerAlias"`
-- Encrypted bool `xml:"encrypted"`
-- Tags []Tag `xml:"tagSet>item"`
+-func (i *uint8Value) Set(s string) error {
+- v, err := strconv.ParseUint(s, 0, 8)
+- *i = uint8Value(v)
+- return err
-}
-
--// Snapshots returns details about volume snapshots available to the user.
--// The ids and filter parameters, if provided, limit the snapshots returned.
--//
--// See http://goo.gl/ogJL4 for more details.
--func (ec2 *EC2) Snapshots(ids []string, filter *Filter) (resp *SnapshotsResp, err error) {
-- params := makeParams("DescribeSnapshots")
-- for i, id := range ids {
-- params["SnapshotId."+strconv.Itoa(i+1)] = id
-- }
-- filter.addParams(params)
--
-- resp = &SnapshotsResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
-- return
+-func (i *uint8Value) Type() string {
+- return "uint8"
-}
-
--// ----------------------------------------------------------------------------
--// KeyPair management functions and types.
+-func (i *uint8Value) String() string { return fmt.Sprintf("%v", *i) }
-
--type KeyPair struct {
-- Name string `xml:"keyName"`
-- Fingerprint string `xml:"keyFingerprint"`
+-// Uint8Var defines a uint8 flag with specified name, default value, and usage string.
+-// The argument p points to a uint8 variable in which to store the value of the flag.
+-func (f *FlagSet) Uint8Var(p *uint8, name string, value uint8, usage string) {
+- f.VarP(newUint8Value(value, p), name, "", usage)
-}
-
--type KeyPairsResp struct {
-- RequestId string `xml:"requestId"`
-- Keys []KeyPair `xml:"keySet>item"`
+-// Like Uint8Var, but accepts a shorthand letter that can be used after a single dash.
+-func (f *FlagSet) Uint8VarP(p *uint8, name, shorthand string, value uint8, usage string) {
+- f.VarP(newUint8Value(value, p), name, shorthand, usage)
-}
-
--type CreateKeyPairResp struct {
-- RequestId string `xml:"requestId"`
-- KeyName string `xml:"keyName"`
-- KeyFingerprint string `xml:"keyFingerprint"`
-- KeyMaterial string `xml:"keyMaterial"`
+-// Uint8Var defines a uint8 flag with specified name, default value, and usage string.
+-// The argument p points to a uint8 variable in which to store the value of the flag.
+-func Uint8Var(p *uint8, name string, value uint8, usage string) {
+- CommandLine.VarP(newUint8Value(value, p), name, "", usage)
-}
-
--type ImportKeyPairResponse struct {
-- RequestId string `xml:"requestId"`
-- KeyName string `xml:"keyName"`
-- KeyFingerprint string `xml:"keyFingerprint"`
+-// Like Uint8Var, but accepts a shorthand letter that can be used after a single dash.
+-func Uint8VarP(p *uint8, name, shorthand string, value uint8, usage string) {
+- CommandLine.VarP(newUint8Value(value, p), name, shorthand, usage)
-}
-
--// CreateKeyPair creates a new key pair and returns the private key contents.
--//
--// See http://goo.gl/0S6hV
--func (ec2 *EC2) CreateKeyPair(keyName string) (resp *CreateKeyPairResp, err error) {
-- params := makeParams("CreateKeyPair")
-- params["KeyName"] = keyName
+-// Uint8 defines a uint8 flag with specified name, default value, and usage string.
+-// The return value is the address of a uint8 variable that stores the value of the flag.
+-func (f *FlagSet) Uint8(name string, value uint8, usage string) *uint8 {
+- p := new(uint8)
+- f.Uint8VarP(p, name, "", value, usage)
+- return p
+-}
-
-- resp = &CreateKeyPairResp{}
-- err = ec2.query(params, resp)
-- if err == nil {
-- resp.KeyFingerprint = strings.TrimSpace(resp.KeyFingerprint)
-- }
-- return
+-// Like Uint8, but accepts a shorthand letter that can be used after a single dash.
+-func (f *FlagSet) Uint8P(name, shorthand string, value uint8, usage string) *uint8 {
+- p := new(uint8)
+- f.Uint8VarP(p, name, shorthand, value, usage)
+- return p
-}
-
--// DeleteKeyPair deletes a key pair.
--//
--// See http://goo.gl/0bqok
--func (ec2 *EC2) DeleteKeyPair(name string) (resp *SimpleResp, err error) {
-- params := makeParams("DeleteKeyPair")
-- params["KeyName"] = name
+-// Uint8 defines a uint8 flag with specified name, default value, and usage string.
+-// The return value is the address of a uint8 variable that stores the value of the flag.
+-func Uint8(name string, value uint8, usage string) *uint8 {
+- return CommandLine.Uint8P(name, "", value, usage)
+-}
-
-- resp = &SimpleResp{}
-- err = ec2.query(params, resp)
-- return
+-// Like Uint8, but accepts a shorthand letter that can be used after a single dash.
+-func Uint8P(name, shorthand string, value uint8, usage string) *uint8 {
+- return CommandLine.Uint8P(name, shorthand, value, usage)
-}
+diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/.gitignore b/Godeps/_workspace/src/github.com/stretchr/objx/.gitignore
+deleted file mode 100644
+index 0026861..0000000
+--- a/Godeps/_workspace/src/github.com/stretchr/objx/.gitignore
++++ /dev/null
+@@ -1,22 +0,0 @@
+-# Compiled Object files, Static and Dynamic libs (Shared Objects)
+-*.o
+-*.a
+-*.so
-
--// KeyPairs returns list of key pairs for this account
--//
--// See http://goo.gl/Apzsfz
--func (ec2 *EC2) KeyPairs(keynames []string, filter *Filter) (resp *KeyPairsResp, err error) {
-- params := makeParams("DescribeKeyPairs")
-- for i, name := range keynames {
-- params["KeyName."+strconv.Itoa(i)] = name
-- }
-- filter.addParams(params)
+-# Folders
+-_obj
+-_test
-
-- resp = &KeyPairsResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
+-# Architecture specific extensions/prefixes
+-*.[568vq]
+-[568vq].out
-
-- return resp, nil
--}
+-*.cgo1.go
+-*.cgo2.c
+-_cgo_defun.c
+-_cgo_gotypes.go
+-_cgo_export.*
-
--// ImportKeyPair imports a key into AWS
--//
--// See http://goo.gl/NbZUvw
--func (ec2 *EC2) ImportKeyPair(keyname string, key string) (resp *ImportKeyPairResponse, err error) {
-- params := makeParams("ImportKeyPair")
-- params["KeyName"] = keyname
+-_testmain.go
-
-- // Oddly, AWS requires the key material to be base64-encoded, even if it was
-- // already encoded. So, we force another round of encoding...
-- // c.f. https://groups.google.com/forum/?fromgroups#!topic/boto-dev/IczrStO9Q8M
-- params["PublicKeyMaterial"] = base64.StdEncoding.EncodeToString([]byte(key))
+-*.exe
+diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/README.md b/Godeps/_workspace/src/github.com/stretchr/objx/README.md
+deleted file mode 100644
+index 4aa1806..0000000
+--- a/Godeps/_workspace/src/github.com/stretchr/objx/README.md
++++ /dev/null
+@@ -1,3 +0,0 @@
+-# objx
-
-- resp = &ImportKeyPairResponse{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
-- return resp, nil
--}
+- * Jump into the [API Documentation](http://godoc.org/github.com/stretchr/objx)
+diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/accessors.go b/Godeps/_workspace/src/github.com/stretchr/objx/accessors.go
+deleted file mode 100644
+index 721bcac..0000000
+--- a/Godeps/_workspace/src/github.com/stretchr/objx/accessors.go
++++ /dev/null
+@@ -1,179 +0,0 @@
+-package objx
-
--// ----------------------------------------------------------------------------
--// Security group management functions and types.
+-import (
+- "fmt"
+- "regexp"
+- "strconv"
+- "strings"
+-)
-
--// SimpleResp represents a response to an EC2 request which on success will
--// return no other information besides a request id.
--type SimpleResp struct {
-- XMLName xml.Name
-- RequestId string `xml:"requestId"`
--}
+-// arrayAccesRegexString is the regex used to extract the array number
+-// from the access path
+-const arrayAccesRegexString = `^(.+)\[([0-9]+)\]$`
-
--// CreateSecurityGroupResp represents a response to a CreateSecurityGroup request.
--type CreateSecurityGroupResp struct {
-- SecurityGroup
-- RequestId string `xml:"requestId"`
--}
+-// arrayAccesRegex is the compiled arrayAccesRegexString
+-var arrayAccesRegex = regexp.MustCompile(arrayAccesRegexString)
-
--// CreateSecurityGroup run a CreateSecurityGroup request in EC2, with the provided
--// name and description.
+-// Get gets the value using the specified selector and
+-// returns it inside a new Obj object.
-//
--// See http://goo.gl/Eo7Yl for more details.
--func (ec2 *EC2) CreateSecurityGroup(group SecurityGroup) (resp *CreateSecurityGroupResp, err error) {
-- params := makeParams("CreateSecurityGroup")
-- params["GroupName"] = group.Name
-- params["GroupDescription"] = group.Description
-- if group.VpcId != "" {
-- params["VpcId"] = group.VpcId
-- }
--
-- resp = &CreateSecurityGroupResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
-- resp.Name = group.Name
-- return resp, nil
--}
--
--// SecurityGroupsResp represents a response to a DescribeSecurityGroups
--// request in EC2.
+-// If it cannot find the value, Get will return a nil
+-// value inside an instance of Obj.
-//
--// See http://goo.gl/k12Uy for more details.
--type SecurityGroupsResp struct {
-- RequestId string `xml:"requestId"`
-- Groups []SecurityGroupInfo `xml:"securityGroupInfo>item"`
--}
--
--// SecurityGroup encapsulates details for a security group in EC2.
+-// Get can only operate directly on map[string]interface{} and []interface.
-//
--// See http://goo.gl/CIdyP for more details.
--type SecurityGroupInfo struct {
-- SecurityGroup
-- OwnerId string `xml:"ownerId"`
-- Description string `xml:"groupDescription"`
-- IPPerms []IPPerm `xml:"ipPermissions>item"`
+-// Example
+-//
+-// To access the title of the third chapter of the second book, do:
+-//
+-// o.Get("books[1].chapters[2].title")
+-func (m Map) Get(selector string) *Value {
+- rawObj := access(m, selector, nil, false, false)
+- return &Value{data: rawObj}
-}
-
--// IPPerm represents an allowance within an EC2 security group.
+-// Set sets the value using the specified selector and
+-// returns the object on which Set was called.
-//
--// See http://goo.gl/4oTxv for more details.
--type IPPerm struct {
-- Protocol string `xml:"ipProtocol"`
-- FromPort int `xml:"fromPort"`
-- ToPort int `xml:"toPort"`
-- SourceIPs []string `xml:"ipRanges>item>cidrIp"`
-- SourceGroups []UserSecurityGroup `xml:"groups>item"`
+-// Set can only operate directly on map[string]interface{} and []interface
+-//
+-// Example
+-//
+-// To set the title of the third chapter of the second book, do:
+-//
+-// o.Set("books[1].chapters[2].title","Time to Go")
+-func (m Map) Set(selector string, value interface{}) Map {
+- access(m, selector, value, true, false)
+- return m
-}
-
--// UserSecurityGroup holds a security group and the owner
--// of that group.
--type UserSecurityGroup struct {
-- Id string `xml:"groupId"`
-- Name string `xml:"groupName"`
-- OwnerId string `xml:"userId"`
--}
+-// access accesses the object using the selector and performs the
+-// appropriate action.
+-func access(current, selector, value interface{}, isSet, panics bool) interface{} {
-
--// SecurityGroup represents an EC2 security group.
--// If SecurityGroup is used as a parameter, then one of Id or Name
--// may be empty. If both are set, then Id is used.
--type SecurityGroup struct {
-- Id string `xml:"groupId"`
-- Name string `xml:"groupName"`
-- Description string `xml:"groupDescription"`
-- VpcId string `xml:"vpcId"`
--}
+- switch selector.(type) {
+- case int, int8, int16, int32, int64, uint, uint8, uint16, uint32, uint64:
-
--// SecurityGroupNames is a convenience function that
--// returns a slice of security groups with the given names.
--func SecurityGroupNames(names ...string) []SecurityGroup {
-- g := make([]SecurityGroup, len(names))
-- for i, name := range names {
-- g[i] = SecurityGroup{Name: name}
-- }
-- return g
--}
+- if array, ok := current.([]interface{}); ok {
+- index := intFromInterface(selector)
-
--// SecurityGroupNames is a convenience function that
--// returns a slice of security groups with the given ids.
--func SecurityGroupIds(ids ...string) []SecurityGroup {
-- g := make([]SecurityGroup, len(ids))
-- for i, id := range ids {
-- g[i] = SecurityGroup{Id: id}
-- }
-- return g
--}
+- if index >= len(array) {
+- if panics {
+- panic(fmt.Sprintf("objx: Index %d is out of range. Slice only contains %d items.", index, len(array)))
+- }
+- return nil
+- }
-
--// SecurityGroups returns details about security groups in EC2. Both parameters
--// are optional, and if provided will limit the security groups returned to those
--// matching the given groups or filtering rules.
--//
--// See http://goo.gl/k12Uy for more details.
--func (ec2 *EC2) SecurityGroups(groups []SecurityGroup, filter *Filter) (resp *SecurityGroupsResp, err error) {
-- params := makeParams("DescribeSecurityGroups")
-- i, j := 1, 1
-- for _, g := range groups {
-- if g.Id != "" {
-- params["GroupId."+strconv.Itoa(i)] = g.Id
-- i++
-- } else {
-- params["GroupName."+strconv.Itoa(j)] = g.Name
-- j++
+- return array[index]
- }
-- }
-- filter.addParams(params)
-
-- resp = &SecurityGroupsResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
-- return resp, nil
--}
+- return nil
-
--// DeleteSecurityGroup removes the given security group in EC2.
--//
--// See http://goo.gl/QJJDO for more details.
--func (ec2 *EC2) DeleteSecurityGroup(group SecurityGroup) (resp *SimpleResp, err error) {
-- params := makeParams("DeleteSecurityGroup")
-- if group.Id != "" {
-- params["GroupId"] = group.Id
-- } else {
-- params["GroupName"] = group.Name
-- }
+- case string:
-
-- resp = &SimpleResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
-- return resp, nil
--}
+- selStr := selector.(string)
+- selSegs := strings.SplitN(selStr, PathSeparator, 2)
+- thisSel := selSegs[0]
+- index := -1
+- var err error
-
--// AuthorizeSecurityGroup creates an allowance for clients matching the provided
--// rules to access instances within the given security group.
--//
--// See http://goo.gl/u2sDJ for more details.
--func (ec2 *EC2) AuthorizeSecurityGroup(group SecurityGroup, perms []IPPerm) (resp *SimpleResp, err error) {
-- return ec2.authOrRevoke("AuthorizeSecurityGroupIngress", group, perms)
--}
+- // https://github.com/stretchr/objx/issues/12
+- if strings.Contains(thisSel, "[") {
-
--// AuthorizeSecurityGroupEgress creates an allowance for clients matching the provided
--// rules for egress access.
--//
--// See http://goo.gl/UHnH4L for more details.
--func (ec2 *EC2) AuthorizeSecurityGroupEgress(group SecurityGroup, perms []IPPerm) (resp *SimpleResp, err error) {
-- return ec2.authOrRevoke("AuthorizeSecurityGroupEgress", group, perms)
--}
+- arrayMatches := arrayAccesRegex.FindStringSubmatch(thisSel)
-
--// RevokeSecurityGroup revokes permissions from a group.
--//
--// See http://goo.gl/ZgdxA for more details.
--func (ec2 *EC2) RevokeSecurityGroup(group SecurityGroup, perms []IPPerm) (resp *SimpleResp, err error) {
-- return ec2.authOrRevoke("RevokeSecurityGroupIngress", group, perms)
--}
+- if len(arrayMatches) > 0 {
-
--func (ec2 *EC2) authOrRevoke(op string, group SecurityGroup, perms []IPPerm) (resp *SimpleResp, err error) {
-- params := makeParams(op)
-- if group.Id != "" {
-- params["GroupId"] = group.Id
-- } else {
-- params["GroupName"] = group.Name
-- }
+- // Get the key into the map
+- thisSel = arrayMatches[1]
+-
+- // Get the index into the array at the key
+- index, err = strconv.Atoi(arrayMatches[2])
+-
+- if err != nil {
+- // This should never happen. If it does, something has gone
+- // seriously wrong. Panic.
+- panic("objx: Array index is not an integer. Must use array[int].")
+- }
-
-- for i, perm := range perms {
-- prefix := "IpPermissions." + strconv.Itoa(i+1)
-- params[prefix+".IpProtocol"] = perm.Protocol
-- params[prefix+".FromPort"] = strconv.Itoa(perm.FromPort)
-- params[prefix+".ToPort"] = strconv.Itoa(perm.ToPort)
-- for j, ip := range perm.SourceIPs {
-- params[prefix+".IpRanges."+strconv.Itoa(j+1)+".CidrIp"] = ip
-- }
-- for j, g := range perm.SourceGroups {
-- subprefix := prefix + ".Groups." + strconv.Itoa(j+1)
-- if g.OwnerId != "" {
-- params[subprefix+".UserId"] = g.OwnerId
- }
-- if g.Id != "" {
-- params[subprefix+".GroupId"] = g.Id
+- }
+-
+- if curMap, ok := current.(Map); ok {
+- current = map[string]interface{}(curMap)
+- }
+-
+- // get the object in question
+- switch current.(type) {
+- case map[string]interface{}:
+- curMSI := current.(map[string]interface{})
+- if len(selSegs) <= 1 && isSet {
+- curMSI[thisSel] = value
+- return nil
- } else {
-- params[subprefix+".GroupName"] = g.Name
+- current = curMSI[thisSel]
+- }
+- default:
+- current = nil
+- }
+-
+- if current == nil && panics {
+- panic(fmt.Sprintf("objx: '%v' invalid on object.", selector))
+- }
+-
+- // do we need to access the item of an array?
+- if index > -1 {
+- if array, ok := current.([]interface{}); ok {
+- if index < len(array) {
+- current = array[index]
+- } else {
+- if panics {
+- panic(fmt.Sprintf("objx: Index %d is out of range. Slice only contains %d items.", index, len(array)))
+- }
+- current = nil
+- }
- }
- }
+-
+- if len(selSegs) > 1 {
+- current = access(current, selSegs[1], value, isSet, panics)
+- }
+-
- }
-
-- resp = &SimpleResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
+- return current
+-
+-}
+-
+-// intFromInterface converts an interface object to the largest
+-// representation of an unsigned integer using a type switch and
+-// assertions
+-func intFromInterface(selector interface{}) int {
+- var value int
+- switch selector.(type) {
+- case int:
+- value = selector.(int)
+- case int8:
+- value = int(selector.(int8))
+- case int16:
+- value = int(selector.(int16))
+- case int32:
+- value = int(selector.(int32))
+- case int64:
+- value = int(selector.(int64))
+- case uint:
+- value = int(selector.(uint))
+- case uint8:
+- value = int(selector.(uint8))
+- case uint16:
+- value = int(selector.(uint16))
+- case uint32:
+- value = int(selector.(uint32))
+- case uint64:
+- value = int(selector.(uint64))
+- default:
+- panic("objx: array access argument is not an integer type (this should never happen)")
- }
-- return resp, nil
+-
+- return value
+-}
+diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/accessors_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/accessors_test.go
+deleted file mode 100644
+index ce5d8e4..0000000
+--- a/Godeps/_workspace/src/github.com/stretchr/objx/accessors_test.go
++++ /dev/null
+@@ -1,145 +0,0 @@
+-package objx
+-
+-import (
+- "github.com/stretchr/testify/assert"
+- "testing"
+-)
+-
+-func TestAccessorsAccessGetSingleField(t *testing.T) {
+-
+- current := map[string]interface{}{"name": "Tyler"}
+- assert.Equal(t, "Tyler", access(current, "name", nil, false, true))
+-
+-}
+-func TestAccessorsAccessGetDeep(t *testing.T) {
+-
+- current := map[string]interface{}{"name": map[string]interface{}{"first": "Tyler", "last": "Bunnell"}}
+- assert.Equal(t, "Tyler", access(current, "name.first", nil, false, true))
+- assert.Equal(t, "Bunnell", access(current, "name.last", nil, false, true))
+-
-}
+-func TestAccessorsAccessGetDeepDeep(t *testing.T) {
+-
+- current := map[string]interface{}{"one": map[string]interface{}{"two": map[string]interface{}{"three": map[string]interface{}{"four": 4}}}}
+- assert.Equal(t, 4, access(current, "one.two.three.four", nil, false, true))
-
--// ResourceTag represents key-value metadata used to classify and organize
--// EC2 instances.
--//
--// See http://goo.gl/bncl3 for more details
--type Tag struct {
-- Key string `xml:"key"`
-- Value string `xml:"value"`
-}
+-func TestAccessorsAccessGetInsideArray(t *testing.T) {
-
--// CreateTags adds or overwrites one or more tags for the specified taggable resources.
--// For a list of tagable resources, see: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.html
--//
--// See http://goo.gl/Vmkqc for more details
--func (ec2 *EC2) CreateTags(resourceIds []string, tags []Tag) (resp *SimpleResp, err error) {
-- params := makeParams("CreateTags")
-- addParamsList(params, "ResourceId", resourceIds)
+- current := map[string]interface{}{"names": []interface{}{map[string]interface{}{"first": "Tyler", "last": "Bunnell"}, map[string]interface{}{"first": "Capitol", "last": "Bollocks"}}}
+- assert.Equal(t, "Tyler", access(current, "names[0].first", nil, false, true))
+- assert.Equal(t, "Bunnell", access(current, "names[0].last", nil, false, true))
+- assert.Equal(t, "Capitol", access(current, "names[1].first", nil, false, true))
+- assert.Equal(t, "Bollocks", access(current, "names[1].last", nil, false, true))
-
-- for j, tag := range tags {
-- params["Tag."+strconv.Itoa(j+1)+".Key"] = tag.Key
-- params["Tag."+strconv.Itoa(j+1)+".Value"] = tag.Value
-- }
+- assert.Panics(t, func() {
+- access(current, "names[2]", nil, false, true)
+- })
+- assert.Nil(t, access(current, "names[2]", nil, false, false))
-
-- resp = &SimpleResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
-- return resp, nil
-}
-
--type TagsResp struct {
-- RequestId string `xml:"requestId"`
-- Tags []ResourceTag `xml:"tagSet>item"`
+-func TestAccessorsAccessGetFromArrayWithInt(t *testing.T) {
+-
+- current := []interface{}{map[string]interface{}{"first": "Tyler", "last": "Bunnell"}, map[string]interface{}{"first": "Capitol", "last": "Bollocks"}}
+- one := access(current, 0, nil, false, false)
+- two := access(current, 1, nil, false, false)
+- three := access(current, 2, nil, false, false)
+-
+- assert.Equal(t, "Tyler", one.(map[string]interface{})["first"])
+- assert.Equal(t, "Capitol", two.(map[string]interface{})["first"])
+- assert.Nil(t, three)
+-
-}
-
--type ResourceTag struct {
-- Tag
-- ResourceId string `xml:"resourceId"`
-- ResourceType string `xml:"resourceType"`
+-func TestAccessorsGet(t *testing.T) {
+-
+- current := New(map[string]interface{}{"name": "Tyler"})
+- assert.Equal(t, "Tyler", current.Get("name").data)
+-
-}
-
--func (ec2 *EC2) Tags(filter *Filter) (*TagsResp, error) {
-- params := makeParams("DescribeTags")
-- filter.addParams(params)
+-func TestAccessorsAccessSetSingleField(t *testing.T) {
-
-- resp := &TagsResp{}
-- if err := ec2.query(params, resp); err != nil {
-- return nil, err
-- }
+- current := map[string]interface{}{"name": "Tyler"}
+- access(current, "name", "Mat", true, false)
+- assert.Equal(t, current["name"], "Mat")
+-
+- access(current, "age", 29, true, true)
+- assert.Equal(t, current["age"], 29)
-
-- return resp, nil
-}
-
--// Response to a StartInstances request.
--//
--// See http://goo.gl/awKeF for more details.
--type StartInstanceResp struct {
-- RequestId string `xml:"requestId"`
-- StateChanges []InstanceStateChange `xml:"instancesSet>item"`
+-func TestAccessorsAccessSetSingleFieldNotExisting(t *testing.T) {
+-
+- current := map[string]interface{}{}
+- access(current, "name", "Mat", true, false)
+- assert.Equal(t, current["name"], "Mat")
+-
-}
-
--// Response to a StopInstances request.
--//
--// See http://goo.gl/436dJ for more details.
--type StopInstanceResp struct {
-- RequestId string `xml:"requestId"`
-- StateChanges []InstanceStateChange `xml:"instancesSet>item"`
+-func TestAccessorsAccessSetDeep(t *testing.T) {
+-
+- current := map[string]interface{}{"name": map[string]interface{}{"first": "Tyler", "last": "Bunnell"}}
+-
+- access(current, "name.first", "Mat", true, true)
+- access(current, "name.last", "Ryer", true, true)
+-
+- assert.Equal(t, "Mat", access(current, "name.first", nil, false, true))
+- assert.Equal(t, "Ryer", access(current, "name.last", nil, false, true))
+-
-}
+-func TestAccessorsAccessSetDeepDeep(t *testing.T) {
+-
+- current := map[string]interface{}{"one": map[string]interface{}{"two": map[string]interface{}{"three": map[string]interface{}{"four": 4}}}}
+-
+- access(current, "one.two.three.four", 5, true, true)
+-
+- assert.Equal(t, 5, access(current, "one.two.three.four", nil, false, true))
-
--// StartInstances starts an Amazon EBS-backed AMI that you've previously stopped.
--//
--// See http://goo.gl/awKeF for more details.
--func (ec2 *EC2) StartInstances(ids ...string) (resp *StartInstanceResp, err error) {
-- params := makeParams("StartInstances")
-- addParamsList(params, "InstanceId", ids)
-- resp = &StartInstanceResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
-- return resp, nil
-}
+-func TestAccessorsAccessSetArray(t *testing.T) {
+-
+- current := map[string]interface{}{"names": []interface{}{"Tyler"}}
+-
+- access(current, "names[0]", "Mat", true, true)
+-
+- assert.Equal(t, "Mat", access(current, "names[0]", nil, false, true))
-
--// StopInstances requests stopping one or more Amazon EBS-backed instances.
--//
--// See http://goo.gl/436dJ for more details.
--func (ec2 *EC2) StopInstances(ids ...string) (resp *StopInstanceResp, err error) {
-- params := makeParams("StopInstances")
-- addParamsList(params, "InstanceId", ids)
-- resp = &StopInstanceResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
-- return resp, nil
-}
+-func TestAccessorsAccessSetInsideArray(t *testing.T) {
+-
+- current := map[string]interface{}{"names": []interface{}{map[string]interface{}{"first": "Tyler", "last": "Bunnell"}, map[string]interface{}{"first": "Capitol", "last": "Bollocks"}}}
+-
+- access(current, "names[0].first", "Mat", true, true)
+- access(current, "names[0].last", "Ryer", true, true)
+- access(current, "names[1].first", "Captain", true, true)
+- access(current, "names[1].last", "Underpants", true, true)
+-
+- assert.Equal(t, "Mat", access(current, "names[0].first", nil, false, true))
+- assert.Equal(t, "Ryer", access(current, "names[0].last", nil, false, true))
+- assert.Equal(t, "Captain", access(current, "names[1].first", nil, false, true))
+- assert.Equal(t, "Underpants", access(current, "names[1].last", nil, false, true))
-
--// RebootInstance requests a reboot of one or more instances. This operation is asynchronous;
--// it only queues a request to reboot the specified instance(s). The operation will succeed
--// if the instances are valid and belong to you.
--//
--// Requests to reboot terminated instances are ignored.
--//
--// See http://goo.gl/baoUf for more details.
--func (ec2 *EC2) RebootInstances(ids ...string) (resp *SimpleResp, err error) {
-- params := makeParams("RebootInstances")
-- addParamsList(params, "InstanceId", ids)
-- resp = &SimpleResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
-- return resp, nil
-}
-
--// The ModifyInstanceAttribute request parameters.
--type ModifyInstance struct {
-- InstanceType string
-- BlockDevices []BlockDeviceMapping
-- DisableAPITermination bool
-- EbsOptimized bool
-- SecurityGroups []SecurityGroup
-- ShutdownBehavior string
-- KernelId string
-- RamdiskId string
-- SourceDestCheck bool
-- SriovNetSupport bool
-- UserData []byte
+-func TestAccessorsAccessSetFromArrayWithInt(t *testing.T) {
+-
+- current := []interface{}{map[string]interface{}{"first": "Tyler", "last": "Bunnell"}, map[string]interface{}{"first": "Capitol", "last": "Bollocks"}}
+- one := access(current, 0, nil, false, false)
+- two := access(current, 1, nil, false, false)
+- three := access(current, 2, nil, false, false)
+-
+- assert.Equal(t, "Tyler", one.(map[string]interface{})["first"])
+- assert.Equal(t, "Capitol", two.(map[string]interface{})["first"])
+- assert.Nil(t, three)
-
-- SetSourceDestCheck bool
-}
-
--// Response to a ModifyInstanceAttribute request.
--//
--// http://goo.gl/icuXh5 for more details.
--type ModifyInstanceResp struct {
-- RequestId string `xml:"requestId"`
-- Return bool `xml:"return"`
+-func TestAccessorsSet(t *testing.T) {
+-
+- current := New(map[string]interface{}{"name": "Tyler"})
+- current.Set("name", "Mat")
+- assert.Equal(t, "Mat", current.Get("name").data)
+-
-}
+diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/codegen/array-access.txt b/Godeps/_workspace/src/github.com/stretchr/objx/codegen/array-access.txt
+deleted file mode 100644
+index 3060234..0000000
+--- a/Godeps/_workspace/src/github.com/stretchr/objx/codegen/array-access.txt
++++ /dev/null
+@@ -1,14 +0,0 @@
+- case []{1}:
+- a := object.([]{1})
+- if isSet {
+- a[index] = value.({1})
+- } else {
+- if index >= len(a) {
+- if panics {
+- panic(fmt.Sprintf("objx: Index %d is out of range because the []{1} only contains %d items.", index, len(a)))
+- }
+- return nil
+- } else {
+- return a[index]
+- }
+- }
+diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/codegen/index.html b/Godeps/_workspace/src/github.com/stretchr/objx/codegen/index.html
+deleted file mode 100644
+index 379ffc3..0000000
+--- a/Godeps/_workspace/src/github.com/stretchr/objx/codegen/index.html
++++ /dev/null
+@@ -1,86 +0,0 @@
+-<html>
+- <head>
+- <title>
+- Codegen
+- </title>
+- <style>
+- body {
+- width: 800px;
+- margin: auto;
+- }
+- textarea {
+- width: 100%;
+- min-height: 100px;
+- font-family: Courier;
+- }
+- </style>
+- </head>
+- <body>
-
--// ModifyImageAttribute modifies the specified attribute of the specified instance.
--// You can specify only one attribute at a time. To modify some attributes, the
--// instance must be stopped.
--//
--// See http://goo.gl/icuXh5 for more details.
--func (ec2 *EC2) ModifyInstance(instId string, options *ModifyInstance) (resp *ModifyInstanceResp, err error) {
-- params := makeParams("ModifyInstanceAttribute")
-- params["InstanceId"] = instId
-- addBlockDeviceParams("", params, options.BlockDevices)
+- <h2>
+- Template
+- </h2>
+- <p>
+- Use <code>{x}</code> as a placeholder for each argument.
+- </p>
+- <textarea id="template"></textarea>
-
-- if options.InstanceType != "" {
-- params["InstanceType.Value"] = options.InstanceType
-- }
+- <h2>
+- Arguments (comma separated)
+- </h2>
+- <p>
+- One block per line
+- </p>
+- <textarea id="args"></textarea>
-
-- if options.DisableAPITermination {
-- params["DisableApiTermination.Value"] = "true"
-- }
+- <h2>
+- Output
+- </h2>
+- <input id="go" type="button" value="Generate code" />
-
-- if options.EbsOptimized {
-- params["EbsOptimized"] = "true"
-- }
+- <textarea id="output"></textarea>
-
-- if options.ShutdownBehavior != "" {
-- params["InstanceInitiatedShutdownBehavior.Value"] = options.ShutdownBehavior
-- }
+- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
+- <script>
-
-- if options.KernelId != "" {
-- params["Kernel.Value"] = options.KernelId
-- }
+- $(function(){
-
-- if options.RamdiskId != "" {
-- params["Ramdisk.Value"] = options.RamdiskId
-- }
+- $("#go").click(function(){
-
-- if options.SourceDestCheck || options.SetSourceDestCheck {
-- if options.SourceDestCheck {
-- params["SourceDestCheck.Value"] = "true"
-- } else {
-- params["SourceDestCheck.Value"] = "false"
-- }
-- }
+- var output = ""
+- var template = $("#template").val()
+- var args = $("#args").val()
-
-- if options.SriovNetSupport {
-- params["SriovNetSupport.Value"] = "simple"
-- }
+- // collect the args
+- var argLines = args.split("\n")
+- for (var line in argLines) {
-
-- if options.UserData != nil {
-- userData := make([]byte, b64.EncodedLen(len(options.UserData)))
-- b64.Encode(userData, options.UserData)
-- params["UserData"] = string(userData)
-- }
+- var argLine = argLines[line];
+- var thisTemp = template
-
-- i := 1
-- for _, g := range options.SecurityGroups {
-- if g.Id != "" {
-- params["GroupId."+strconv.Itoa(i)] = g.Id
-- i++
-- }
-- }
+- // get individual args
+- var args = argLine.split(",")
-
-- resp = &ModifyInstanceResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- resp = nil
-- }
-- return
--}
+- for (var argI in args) {
+- var argText = args[argI];
+- var argPlaceholder = "{" + argI + "}";
-
--// ----------------------------------------------------------------------------
--// VPC management functions and types.
+- while (thisTemp.indexOf(argPlaceholder) > -1) {
+- thisTemp = thisTemp.replace(argPlaceholder, argText);
+- }
-
--// The CreateVpc request parameters
--//
--// See http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-CreateVpc.html
--type CreateVpc struct {
-- CidrBlock string
-- InstanceTenancy string
--}
+- }
-
--// Response to a CreateVpc request
--type CreateVpcResp struct {
-- RequestId string `xml:"requestId"`
-- VPC VPC `xml:"vpc"`
--}
+- output += thisTemp
-
--// The ModifyVpcAttribute request parameters.
--//
--// See http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/index.html?ApiReference-query-DescribeVpcAttribute.html for more details.
--type ModifyVpcAttribute struct {
-- EnableDnsSupport bool
-- EnableDnsHostnames bool
+- }
-
-- SetEnableDnsSupport bool
-- SetEnableDnsHostnames bool
--}
+- $("#output").val(output);
-
--// Response to a DescribeVpcAttribute request.
--//
--// See http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/index.html?ApiReference-query-DescribeVpcAttribute.html for more details.
--type VpcAttributeResp struct {
-- RequestId string `xml:"requestId"`
-- VpcId string `xml:"vpcId"`
-- EnableDnsSupport bool `xml:"enableDnsSupport>value"`
-- EnableDnsHostnames bool `xml:"enableDnsHostnames>value"`
--}
+- });
-
--// CreateInternetGateway request parameters.
--//
--// http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-CreateInternetGateway.html
--type CreateInternetGateway struct{}
+- });
-
--// CreateInternetGateway response
--type CreateInternetGatewayResp struct {
-- RequestId string `xml:"requestId"`
-- InternetGateway InternetGateway `xml:"internetGateway"`
+- </script>
+- </body>
+-</html>
+diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/codegen/template.txt b/Godeps/_workspace/src/github.com/stretchr/objx/codegen/template.txt
+deleted file mode 100644
+index b396900..0000000
+--- a/Godeps/_workspace/src/github.com/stretchr/objx/codegen/template.txt
++++ /dev/null
+@@ -1,286 +0,0 @@
+-/*
+- {4} ({1} and []{1})
+- --------------------------------------------------
+-*/
+-
+-// {4} gets the value as a {1}, returns the optionalDefault
+-// value or a system default object if the value is the wrong type.
+-func (v *Value) {4}(optionalDefault ...{1}) {1} {
+- if s, ok := v.data.({1}); ok {
+- return s
+- }
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
+- }
+- return {3}
-}
-
--// The CreateRouteTable request parameters.
+-// Must{4} gets the value as a {1}.
-//
--// http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-CreateRouteTable.html
--type CreateRouteTable struct {
-- VpcId string
+-// Panics if the object is not a {1}.
+-func (v *Value) Must{4}() {1} {
+- return v.data.({1})
-}
-
--// Response to a CreateRouteTable request.
--type CreateRouteTableResp struct {
-- RequestId string `xml:"requestId"`
-- RouteTable RouteTable `xml:"routeTable"`
+-// {4}Slice gets the value as a []{1}, returns the optionalDefault
+-// value or nil if the value is not a []{1}.
+-func (v *Value) {4}Slice(optionalDefault ...[]{1}) []{1} {
+- if s, ok := v.data.([]{1}); ok {
+- return s
+- }
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
+- }
+- return nil
-}
-
--// CreateRoute request parameters
+-// Must{4}Slice gets the value as a []{1}.
-//
--// http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-CreateRoute.html
--type CreateRoute struct {
-- RouteTableId string
-- DestinationCidrBlock string
-- GatewayId string
-- InstanceId string
-- NetworkInterfaceId string
-- VpcPeeringConnectionId string
--}
--type ReplaceRoute struct {
-- RouteTableId string
-- DestinationCidrBlock string
-- GatewayId string
-- InstanceId string
-- NetworkInterfaceId string
-- VpcPeeringConnectionId string
+-// Panics if the object is not a []{1}.
+-func (v *Value) Must{4}Slice() []{1} {
+- return v.data.([]{1})
-}
-
--type AssociateRouteTableResp struct {
-- RequestId string `xml:"requestId"`
-- AssociationId string `xml:"associationId"`
+-// Is{4} gets whether the object contained is a {1} or not.
+-func (v *Value) Is{4}() bool {
+- _, ok := v.data.({1})
+- return ok
-}
--type ReassociateRouteTableResp struct {
-- RequestId string `xml:"requestId"`
-- AssociationId string `xml:"newAssociationId"`
+-
+-// Is{4}Slice gets whether the object contained is a []{1} or not.
+-func (v *Value) Is{4}Slice() bool {
+- _, ok := v.data.([]{1})
+- return ok
-}
-
--// The CreateSubnet request parameters
+-// Each{4} calls the specified callback for each object
+-// in the []{1}.
-//
--// http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-CreateSubnet.html
--type CreateSubnet struct {
-- VpcId string
-- CidrBlock string
-- AvailabilityZone string
--}
+-// Panics if the object is the wrong type.
+-func (v *Value) Each{4}(callback func(int, {1}) bool) *Value {
+-
+- for index, val := range v.Must{4}Slice() {
+- carryon := callback(index, val)
+- if carryon == false {
+- break
+- }
+- }
+-
+- return v
-
--// Response to a CreateSubnet request
--type CreateSubnetResp struct {
-- RequestId string `xml:"requestId"`
-- Subnet Subnet `xml:"subnet"`
-}
-
--// Response to a DescribeInternetGateways request.
--type InternetGatewaysResp struct {
-- RequestId string `xml:"requestId"`
-- InternetGateways []InternetGateway `xml:"internetGatewaySet>item"`
--}
+-// Where{4} uses the specified decider function to select items
+-// from the []{1}. The object contained in the result will contain
+-// only the selected items.
+-func (v *Value) Where{4}(decider func(int, {1}) bool) *Value {
+-
+- var selected []{1}
+-
+- v.Each{4}(func(index int, val {1}) bool {
+- shouldSelect := decider(index, val)
+- if shouldSelect == false {
+- selected = append(selected, val)
+- }
+- return true
+- })
+-
+- return &Value{data:selected}
-
--// Response to a DescribeRouteTables request.
--type RouteTablesResp struct {
-- RequestId string `xml:"requestId"`
-- RouteTables []RouteTable `xml:"routeTableSet>item"`
-}
-
--// Response to a DescribeVpcs request.
--type VpcsResp struct {
-- RequestId string `xml:"requestId"`
-- VPCs []VPC `xml:"vpcSet>item"`
--}
+-// Group{4} uses the specified grouper function to group the items
+-// keyed by the return of the grouper. The object contained in the
+-// result will contain a map[string][]{1}.
+-func (v *Value) Group{4}(grouper func(int, {1}) string) *Value {
-
--// Internet Gateway
--type InternetGateway struct {
-- InternetGatewayId string `xml:"internetGatewayId"`
-- Attachments []InternetGatewayAttachment `xml:"attachmentSet>item"`
-- Tags []Tag `xml:"tagSet>item"`
--}
+- groups := make(map[string][]{1})
-
--type InternetGatewayAttachment struct {
-- VpcId string `xml:"vpcId"`
-- State string `xml:"state"`
--}
+- v.Each{4}(func(index int, val {1}) bool {
+- group := grouper(index, val)
+- if _, ok := groups[group]; !ok {
+- groups[group] = make([]{1}, 0)
+- }
+- groups[group] = append(groups[group], val)
+- return true
+- })
-
--// Routing Table
--type RouteTable struct {
-- RouteTableId string `xml:"routeTableId"`
-- VpcId string `xml:"vpcId"`
-- Associations []RouteTableAssociation `xml:"associationSet>item"`
-- Routes []Route `xml:"routeSet>item"`
-- Tags []Tag `xml:"tagSet>item"`
--}
+- return &Value{data:groups}
-
--type RouteTableAssociation struct {
-- AssociationId string `xml:"routeTableAssociationId"`
-- RouteTableId string `xml:"routeTableId"`
-- SubnetId string `xml:"subnetId"`
-- Main bool `xml:"main"`
-}
-
--type Route struct {
-- DestinationCidrBlock string `xml:"destinationCidrBlock"`
-- GatewayId string `xml:"gatewayId"`
-- InstanceId string `xml:"instanceId"`
-- InstanceOwnerId string `xml:"instanceOwnerId"`
-- NetworkInterfaceId string `xml:"networkInterfaceId"`
-- State string `xml:"state"`
-- Origin string `xml:"origin"`
-- VpcPeeringConnectionId string `xml:"vpcPeeringConnectionId"`
--}
+-// Replace{4} uses the specified function to replace each {1}s
+-// by iterating each item. The data in the returned result will be a
+-// []{1} containing the replaced items.
+-func (v *Value) Replace{4}(replacer func(int, {1}) {1}) *Value {
-
--// Subnet
--type Subnet struct {
-- SubnetId string `xml:"subnetId"`
-- State string `xml:"state"`
-- VpcId string `xml:"vpcId"`
-- CidrBlock string `xml:"cidrBlock"`
-- AvailableIpAddressCount int `xml:"availableIpAddressCount"`
-- AvailabilityZone string `xml:"availabilityZone"`
-- DefaultForAZ bool `xml:"defaultForAz"`
-- MapPublicIpOnLaunch bool `xml:"mapPublicIpOnLaunch"`
-- Tags []Tag `xml:"tagSet>item"`
--}
+- arr := v.Must{4}Slice()
+- replaced := make([]{1}, len(arr))
-
--// VPC represents a single VPC.
--type VPC struct {
-- VpcId string `xml:"vpcId"`
-- State string `xml:"state"`
-- CidrBlock string `xml:"cidrBlock"`
-- DHCPOptionsID string `xml:"dhcpOptionsId"`
-- InstanceTenancy string `xml:"instanceTenancy"`
-- IsDefault bool `xml:"isDefault"`
-- Tags []Tag `xml:"tagSet>item"`
--}
+- v.Each{4}(func(index int, val {1}) bool {
+- replaced[index] = replacer(index, val)
+- return true
+- })
+-
+- return &Value{data:replaced}
-
--// Response to a DescribeSubnets request.
--type SubnetsResp struct {
-- RequestId string `xml:"requestId"`
-- Subnets []Subnet `xml:"subnetSet>item"`
-}
-
--// Create a new VPC.
--func (ec2 *EC2) CreateVpc(options *CreateVpc) (resp *CreateVpcResp, err error) {
-- params := makeParams("CreateVpc")
-- params["CidrBlock"] = options.CidrBlock
+-// Collect{4} uses the specified collector function to collect a value
+-// for each of the {1}s in the slice. The data returned will be a
+-// []interface{}.
+-func (v *Value) Collect{4}(collector func(int, {1}) interface{}) *Value {
-
-- if options.InstanceTenancy != "" {
-- params["InstanceTenancy"] = options.InstanceTenancy
-- }
+- arr := v.Must{4}Slice()
+- collected := make([]interface{}, len(arr))
-
-- resp = &CreateVpcResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
+- v.Each{4}(func(index int, val {1}) bool {
+- collected[index] = collector(index, val)
+- return true
+- })
-
-- return
+- return &Value{data:collected}
-}
-
--// Delete a VPC.
--func (ec2 *EC2) DeleteVpc(id string) (resp *SimpleResp, err error) {
-- params := makeParams("DeleteVpc")
-- params["VpcId"] = id
+-// ************************************************************
+-// TESTS
+-// ************************************************************
-
-- resp = &SimpleResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
-- return
--}
+-func Test{4}(t *testing.T) {
-
--// DescribeVpcs
--//
--// See http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeVpcs.html
--func (ec2 *EC2) DescribeVpcs(ids []string, filter *Filter) (resp *VpcsResp, err error) {
-- params := makeParams("DescribeVpcs")
-- addParamsList(params, "VpcId", ids)
-- filter.addParams(params)
-- resp = &VpcsResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
+- val := {1}( {2} )
+- m := map[string]interface{}{"value": val, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").{4}())
+- assert.Equal(t, val, New(m).Get("value").Must{4}())
+- assert.Equal(t, {1}({3}), New(m).Get("nothing").{4}())
+- assert.Equal(t, val, New(m).Get("nothing").{4}({2}))
+-
+- assert.Panics(t, func() {
+- New(m).Get("age").Must{4}()
+- })
-
-- return
-}
-
--// VpcAttribute describes an attribute of a VPC.
--// You can specify only one attribute at a time.
--// Valid attributes are:
--// enableDnsSupport | enableDnsHostnames
--//
--// See http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/index.html?ApiReference-query-DescribeVpcAttribute.html for more details.
--func (ec2 *EC2) VpcAttribute(vpcId, attribute string) (resp *VpcAttributeResp, err error) {
-- params := makeParams("DescribeVpcAttribute")
-- params["VpcId"] = vpcId
-- params["Attribute"] = attribute
+-func Test{4}Slice(t *testing.T) {
-
-- resp = &VpcAttributeResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
-- return
--}
+- val := {1}( {2} )
+- m := map[string]interface{}{"value": []{1}{ val }, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").{4}Slice()[0])
+- assert.Equal(t, val, New(m).Get("value").Must{4}Slice()[0])
+- assert.Equal(t, []{1}(nil), New(m).Get("nothing").{4}Slice())
+- assert.Equal(t, val, New(m).Get("nothing").{4}Slice( []{1}{ {1}({2}) } )[0])
-
--// ModifyVpcAttribute modifies the specified attribute of the specified VPC.
--//
--// See http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/index.html?ApiReference-query-ModifyVpcAttribute.html for more details.
--func (ec2 *EC2) ModifyVpcAttribute(vpcId string, options *ModifyVpcAttribute) (*SimpleResp, error) {
-- params := makeParams("ModifyVpcAttribute")
+- assert.Panics(t, func() {
+- New(m).Get("nothing").Must{4}Slice()
+- })
-
-- params["VpcId"] = vpcId
+-}
-
-- if options.SetEnableDnsSupport {
-- params["EnableDnsSupport.Value"] = strconv.FormatBool(options.EnableDnsSupport)
-- }
+-func TestIs{4}(t *testing.T) {
-
-- if options.SetEnableDnsHostnames {
-- params["EnableDnsHostnames.Value"] = strconv.FormatBool(options.EnableDnsHostnames)
-- }
+- var v *Value
-
-- resp := &SimpleResp{}
-- if err := ec2.query(params, resp); err != nil {
-- return nil, err
-- }
+- v = &Value{data: {1}({2})}
+- assert.True(t, v.Is{4}())
+-
+- v = &Value{data: []{1}{ {1}({2}) }}
+- assert.True(t, v.Is{4}Slice())
-
-- return resp, nil
-}
-
--// Create a new subnet.
--func (ec2 *EC2) CreateSubnet(options *CreateSubnet) (resp *CreateSubnetResp, err error) {
-- params := makeParams("CreateSubnet")
-- params["AvailabilityZone"] = options.AvailabilityZone
-- params["CidrBlock"] = options.CidrBlock
-- params["VpcId"] = options.VpcId
+-func TestEach{4}(t *testing.T) {
-
-- resp = &CreateSubnetResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
+- v := &Value{data: []{1}{ {1}({2}), {1}({2}), {1}({2}), {1}({2}), {1}({2}) }}
+- count := 0
+- replacedVals := make([]{1}, 0)
+- assert.Equal(t, v, v.Each{4}(func(i int, val {1}) bool {
-
-- return
--}
+- count++
+- replacedVals = append(replacedVals, val)
-
--// Delete a Subnet.
--func (ec2 *EC2) DeleteSubnet(id string) (resp *SimpleResp, err error) {
-- params := makeParams("DeleteSubnet")
-- params["SubnetId"] = id
+- // abort early
+- if i == 2 {
+- return false
+- }
-
-- resp = &SimpleResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
-- return
--}
+- return true
-
--// DescribeSubnets
--//
--// http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeSubnets.html
--func (ec2 *EC2) DescribeSubnets(ids []string, filter *Filter) (resp *SubnetsResp, err error) {
-- params := makeParams("DescribeSubnets")
-- addParamsList(params, "SubnetId", ids)
-- filter.addParams(params)
+- }))
-
-- resp = &SubnetsResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
+- assert.Equal(t, count, 3)
+- assert.Equal(t, replacedVals[0], v.Must{4}Slice()[0])
+- assert.Equal(t, replacedVals[1], v.Must{4}Slice()[1])
+- assert.Equal(t, replacedVals[2], v.Must{4}Slice()[2])
-
-- return
-}
-
--// Create a new internet gateway.
--func (ec2 *EC2) CreateInternetGateway(
-- options *CreateInternetGateway) (resp *CreateInternetGatewayResp, err error) {
-- params := makeParams("CreateInternetGateway")
+-func TestWhere{4}(t *testing.T) {
-
-- resp = &CreateInternetGatewayResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
+- v := &Value{data: []{1}{ {1}({2}), {1}({2}), {1}({2}), {1}({2}), {1}({2}), {1}({2}) }}
-
-- return
--}
+- selected := v.Where{4}(func(i int, val {1}) bool {
+- return i%2==0
+- }).Must{4}Slice()
-
--// Attach an InternetGateway.
--func (ec2 *EC2) AttachInternetGateway(id, vpcId string) (resp *SimpleResp, err error) {
-- params := makeParams("AttachInternetGateway")
-- params["InternetGatewayId"] = id
-- params["VpcId"] = vpcId
+- assert.Equal(t, 3, len(selected))
-
-- resp = &SimpleResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
-- return
-}
-
--// Detach an InternetGateway.
--func (ec2 *EC2) DetachInternetGateway(id, vpcId string) (resp *SimpleResp, err error) {
-- params := makeParams("DetachInternetGateway")
-- params["InternetGatewayId"] = id
-- params["VpcId"] = vpcId
+-func TestGroup{4}(t *testing.T) {
-
-- resp = &SimpleResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
-- return
--}
+- v := &Value{data: []{1}{ {1}({2}), {1}({2}), {1}({2}), {1}({2}), {1}({2}), {1}({2}) }}
-
--// Delete an InternetGateway.
--func (ec2 *EC2) DeleteInternetGateway(id string) (resp *SimpleResp, err error) {
-- params := makeParams("DeleteInternetGateway")
-- params["InternetGatewayId"] = id
+- grouped := v.Group{4}(func(i int, val {1}) string {
+- return fmt.Sprintf("%v", i%2==0)
+- }).data.(map[string][]{1})
+-
+- assert.Equal(t, 2, len(grouped))
+- assert.Equal(t, 3, len(grouped["true"]))
+- assert.Equal(t, 3, len(grouped["false"]))
-
-- resp = &SimpleResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
-- return
-}
-
--// DescribeInternetGateways
--//
--// http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeInternetGateways.html
--func (ec2 *EC2) DescribeInternetGateways(ids []string, filter *Filter) (resp *InternetGatewaysResp, err error) {
-- params := makeParams("DescribeInternetGateways")
-- addParamsList(params, "InternetGatewayId", ids)
-- filter.addParams(params)
+-func TestReplace{4}(t *testing.T) {
-
-- resp = &InternetGatewaysResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
+- v := &Value{data: []{1}{ {1}({2}), {1}({2}), {1}({2}), {1}({2}), {1}({2}), {1}({2}) }}
-
-- return
--}
+- rawArr := v.Must{4}Slice()
-
--// Create a new routing table.
--func (ec2 *EC2) CreateRouteTable(
-- options *CreateRouteTable) (resp *CreateRouteTableResp, err error) {
-- params := makeParams("CreateRouteTable")
-- params["VpcId"] = options.VpcId
+- replaced := v.Replace{4}(func(index int, val {1}) {1} {
+- if index < len(rawArr)-1 {
+- return rawArr[index+1]
+- }
+- return rawArr[0]
+- })
-
-- resp = &CreateRouteTableResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
+- replacedArr := replaced.Must{4}Slice()
+- if assert.Equal(t, 6, len(replacedArr)) {
+- assert.Equal(t, replacedArr[0], rawArr[1])
+- assert.Equal(t, replacedArr[1], rawArr[2])
+- assert.Equal(t, replacedArr[2], rawArr[3])
+- assert.Equal(t, replacedArr[3], rawArr[4])
+- assert.Equal(t, replacedArr[4], rawArr[5])
+- assert.Equal(t, replacedArr[5], rawArr[0])
- }
-
-- return
-}
-
--// Delete a RouteTable.
--func (ec2 *EC2) DeleteRouteTable(id string) (resp *SimpleResp, err error) {
-- params := makeParams("DeleteRouteTable")
-- params["RouteTableId"] = id
+-func TestCollect{4}(t *testing.T) {
-
-- resp = &SimpleResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
-- }
-- return
--}
+- v := &Value{data: []{1}{ {1}({2}), {1}({2}), {1}({2}), {1}({2}), {1}({2}), {1}({2}) }}
-
--// DescribeRouteTables
--//
--// http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeRouteTables.html
--func (ec2 *EC2) DescribeRouteTables(ids []string, filter *Filter) (resp *RouteTablesResp, err error) {
-- params := makeParams("DescribeRouteTables")
-- addParamsList(params, "RouteTableId", ids)
-- filter.addParams(params)
+- collected := v.Collect{4}(func(index int, val {1}) interface{} {
+- return index
+- })
-
-- resp = &RouteTablesResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
+- collectedArr := collected.MustInterSlice()
+- if assert.Equal(t, 6, len(collectedArr)) {
+- assert.Equal(t, collectedArr[0], 0)
+- assert.Equal(t, collectedArr[1], 1)
+- assert.Equal(t, collectedArr[2], 2)
+- assert.Equal(t, collectedArr[3], 3)
+- assert.Equal(t, collectedArr[4], 4)
+- assert.Equal(t, collectedArr[5], 5)
- }
-
-- return
-}
+diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/codegen/types_list.txt b/Godeps/_workspace/src/github.com/stretchr/objx/codegen/types_list.txt
+deleted file mode 100644
+index 069d43d..0000000
+--- a/Godeps/_workspace/src/github.com/stretchr/objx/codegen/types_list.txt
++++ /dev/null
+@@ -1,20 +0,0 @@
+-Interface,interface{},"something",nil,Inter
+-Map,map[string]interface{},map[string]interface{}{"name":"Tyler"},nil,MSI
+-ObjxMap,(Map),New(1),New(nil),ObjxMap
+-Bool,bool,true,false,Bool
+-String,string,"hello","",Str
+-Int,int,1,0,Int
+-Int8,int8,1,0,Int8
+-Int16,int16,1,0,Int16
+-Int32,int32,1,0,Int32
+-Int64,int64,1,0,Int64
+-Uint,uint,1,0,Uint
+-Uint8,uint8,1,0,Uint8
+-Uint16,uint16,1,0,Uint16
+-Uint32,uint32,1,0,Uint32
+-Uint64,uint64,1,0,Uint64
+-Uintptr,uintptr,1,0,Uintptr
+-Float32,float32,1,0,Float32
+-Float64,float64,1,0,Float64
+-Complex64,complex64,1,0,Complex64
+-Complex128,complex128,1,0,Complex128
+diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/constants.go b/Godeps/_workspace/src/github.com/stretchr/objx/constants.go
+deleted file mode 100644
+index f9eb42a..0000000
+--- a/Godeps/_workspace/src/github.com/stretchr/objx/constants.go
++++ /dev/null
+@@ -1,13 +0,0 @@
+-package objx
-
--// Associate a routing table.
--func (ec2 *EC2) AssociateRouteTable(id, subnetId string) (*AssociateRouteTableResp, error) {
-- params := makeParams("AssociateRouteTable")
-- params["RouteTableId"] = id
-- params["SubnetId"] = subnetId
+-const (
+- // PathSeparator is the character used to separate the elements
+- // of the keypath.
+- //
+- // For example, `location.address.city`
+- PathSeparator string = "."
+-
+- // SignatureSeparator is the character that is used to
+- // separate the Base64 string from the security signature.
+- SignatureSeparator = "_"
+-)
+diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/conversions.go b/Godeps/_workspace/src/github.com/stretchr/objx/conversions.go
+deleted file mode 100644
+index 9cdfa9f..0000000
+--- a/Godeps/_workspace/src/github.com/stretchr/objx/conversions.go
++++ /dev/null
+@@ -1,117 +0,0 @@
+-package objx
+-
+-import (
+- "bytes"
+- "encoding/base64"
+- "encoding/json"
+- "errors"
+- "fmt"
+- "net/url"
+-)
+-
+-// JSON converts the contained object to a JSON string
+-// representation
+-func (m Map) JSON() (string, error) {
+-
+- result, err := json.Marshal(m)
-
-- resp := &AssociateRouteTableResp{}
-- err := ec2.query(params, resp)
- if err != nil {
-- return nil, err
+- err = errors.New("objx: JSON encode failed with: " + err.Error())
- }
-- return resp, nil
--}
-
--// Disassociate a routing table.
--func (ec2 *EC2) DisassociateRouteTable(id string) (*SimpleResp, error) {
-- params := makeParams("DisassociateRouteTable")
-- params["AssociationId"] = id
+- return string(result), err
-
-- resp := &SimpleResp{}
-- err := ec2.query(params, resp)
+-}
+-
+-// MustJSON converts the contained object to a JSON string
+-// representation and panics if there is an error
+-func (m Map) MustJSON() string {
+- result, err := m.JSON()
- if err != nil {
-- return nil, err
+- panic(err.Error())
- }
-- return resp, nil
+- return result
-}
-
--// Re-associate a routing table.
--func (ec2 *EC2) ReassociateRouteTable(id, routeTableId string) (*ReassociateRouteTableResp, error) {
-- params := makeParams("ReplaceRouteTableAssociation")
-- params["AssociationId"] = id
-- params["RouteTableId"] = routeTableId
+-// Base64 converts the contained object to a Base64 string
+-// representation of the JSON string representation
+-func (m Map) Base64() (string, error) {
-
-- resp := &ReassociateRouteTableResp{}
-- err := ec2.query(params, resp)
+- var buf bytes.Buffer
+-
+- jsonData, err := m.JSON()
- if err != nil {
-- return nil, err
+- return "", err
- }
-- return resp, nil
--}
-
--// Create a new route.
--func (ec2 *EC2) CreateRoute(options *CreateRoute) (resp *SimpleResp, err error) {
-- params := makeParams("CreateRoute")
-- params["RouteTableId"] = options.RouteTableId
-- params["DestinationCidrBlock"] = options.DestinationCidrBlock
+- encoder := base64.NewEncoder(base64.StdEncoding, &buf)
+- encoder.Write([]byte(jsonData))
+- encoder.Close()
-
-- if v := options.GatewayId; v != "" {
-- params["GatewayId"] = v
-- }
-- if v := options.InstanceId; v != "" {
-- params["InstanceId"] = v
-- }
-- if v := options.NetworkInterfaceId; v != "" {
-- params["NetworkInterfaceId"] = v
-- }
-- if v := options.VpcPeeringConnectionId; v != "" {
-- params["VpcPeeringConnectionId"] = v
-- }
+- return buf.String(), nil
-
-- resp = &SimpleResp{}
-- err = ec2.query(params, resp)
+-}
+-
+-// MustBase64 converts the contained object to a Base64 string
+-// representation of the JSON string representation and panics
+-// if there is an error
+-func (m Map) MustBase64() string {
+- result, err := m.Base64()
- if err != nil {
-- return nil, err
+- panic(err.Error())
- }
-- return
+- return result
-}
-
--// Delete a Route.
--func (ec2 *EC2) DeleteRoute(routeTableId, cidr string) (resp *SimpleResp, err error) {
-- params := makeParams("DeleteRoute")
-- params["RouteTableId"] = routeTableId
-- params["DestinationCidrBlock"] = cidr
+-// SignedBase64 converts the contained object to a Base64 string
+-// representation of the JSON string representation and signs it
+-// using the provided key.
+-func (m Map) SignedBase64(key string) (string, error) {
-
-- resp = &SimpleResp{}
-- err = ec2.query(params, resp)
+- base64, err := m.Base64()
- if err != nil {
-- return nil, err
+- return "", err
- }
-- return
--}
-
--// Replace a new route.
--func (ec2 *EC2) ReplaceRoute(options *ReplaceRoute) (resp *SimpleResp, err error) {
-- params := makeParams("ReplaceRoute")
-- params["RouteTableId"] = options.RouteTableId
-- params["DestinationCidrBlock"] = options.DestinationCidrBlock
+- sig := HashWithKey(base64, key)
-
-- if v := options.GatewayId; v != "" {
-- params["GatewayId"] = v
-- }
-- if v := options.InstanceId; v != "" {
-- params["InstanceId"] = v
-- }
-- if v := options.NetworkInterfaceId; v != "" {
-- params["NetworkInterfaceId"] = v
-- }
-- if v := options.VpcPeeringConnectionId; v != "" {
-- params["VpcPeeringConnectionId"] = v
-- }
+- return base64 + SignatureSeparator + sig, nil
-
-- resp = &SimpleResp{}
-- err = ec2.query(params, resp)
+-}
+-
+-// MustSignedBase64 converts the contained object to a Base64 string
+-// representation of the JSON string representation and signs it
+-// using the provided key and panics if there is an error
+-func (m Map) MustSignedBase64(key string) string {
+- result, err := m.SignedBase64(key)
- if err != nil {
-- return nil, err
+- panic(err.Error())
- }
-- return
+- return result
-}
-
--// The ResetImageAttribute request parameters.
--type ResetImageAttribute struct {
-- Attribute string
--}
+-/*
+- URL Query
+- ------------------------------------------------
+-*/
-
--// ResetImageAttribute resets an attribute of an AMI to its default value.
--//
--// http://goo.gl/r6ZCPm for more details.
--func (ec2 *EC2) ResetImageAttribute(imageId string, options *ResetImageAttribute) (resp *SimpleResp, err error) {
-- params := makeParams("ResetImageAttribute")
-- params["ImageId"] = imageId
+-// URLValues creates a url.Values object from an Obj. This
+-// function requires that the wrapped object be a map[string]interface{}
+-func (m Map) URLValues() url.Values {
-
-- if options.Attribute != "" {
-- params["Attribute"] = options.Attribute
-- }
+- vals := make(url.Values)
-
-- resp = &SimpleResp{}
-- err = ec2.query(params, resp)
-- if err != nil {
-- return nil, err
+- for k, v := range m {
+- //TODO: can this be done without sprintf?
+- vals.Set(k, fmt.Sprintf("%v", v))
- }
-- return
+-
+- return vals
-}
-diff --git a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/ec2_test.go b/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/ec2_test.go
+-
+-// URLQuery gets an encoded URL query representing the given
+-// Obj. This function requires that the wrapped object be a
+-// map[string]interface{}
+-func (m Map) URLQuery() (string, error) {
+- return m.URLValues().Encode(), nil
+-}
+diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/conversions_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/conversions_test.go
deleted file mode 100644
-index 849bfe2..0000000
---- a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/ec2_test.go
+index e9ccd29..0000000
+--- a/Godeps/_workspace/src/github.com/stretchr/objx/conversions_test.go
+++ /dev/null
-@@ -1,1243 +0,0 @@
--package ec2_test
+@@ -1,94 +0,0 @@
+-package objx
-
-import (
+- "github.com/stretchr/testify/assert"
- "testing"
--
-- "github.com/mitchellh/goamz/aws"
-- "github.com/mitchellh/goamz/ec2"
-- "github.com/mitchellh/goamz/testutil"
-- . "github.com/motain/gocheck"
-)
-
--func Test(t *testing.T) {
-- TestingT(t)
--}
+-func TestConversionJSON(t *testing.T) {
-
--var _ = Suite(&S{})
+- jsonString := `{"name":"Mat"}`
+- o := MustFromJSON(jsonString)
-
--type S struct {
-- ec2 *ec2.EC2
--}
+- result, err := o.JSON()
-
--var testServer = testutil.NewHTTPServer()
+- if assert.NoError(t, err) {
+- assert.Equal(t, jsonString, result)
+- }
-
--func (s *S) SetUpSuite(c *C) {
-- testServer.Start()
-- auth := aws.Auth{"abc", "123", ""}
-- s.ec2 = ec2.NewWithClient(
-- auth,
-- aws.Region{EC2Endpoint: testServer.URL},
-- testutil.DefaultClient,
-- )
--}
+- assert.Equal(t, jsonString, o.MustJSON())
-
--func (s *S) TearDownTest(c *C) {
-- testServer.Flush()
-}
-
--func (s *S) TestRunInstancesErrorDump(c *C) {
-- testServer.Response(400, nil, ErrorDump)
--
-- options := ec2.RunInstances{
-- ImageId: "ami-a6f504cf", // Ubuntu Maverick, i386, instance store
-- InstanceType: "t1.micro", // Doesn't work with micro, results in 400.
-- }
+-func TestConversionJSONWithError(t *testing.T) {
-
-- msg := `AMIs with an instance-store root device are not supported for the instance type 't1\.micro'\.`
+- o := MSI()
+- o["test"] = func() {}
-
-- resp, err := s.ec2.RunInstances(&options)
+- assert.Panics(t, func() {
+- o.MustJSON()
+- })
-
-- testServer.WaitRequest()
+- _, err := o.JSON()
-
-- c.Assert(resp, IsNil)
-- c.Assert(err, ErrorMatches, msg+` \(UnsupportedOperation\)`)
+- assert.Error(t, err)
-
-- ec2err, ok := err.(*ec2.Error)
-- c.Assert(ok, Equals, true)
-- c.Assert(ec2err.StatusCode, Equals, 400)
-- c.Assert(ec2err.Code, Equals, "UnsupportedOperation")
-- c.Assert(ec2err.Message, Matches, msg)
-- c.Assert(ec2err.RequestId, Equals, "0503f4e9-bbd6-483c-b54f-c4ae9f3b30f4")
-}
-
--func (s *S) TestRequestSpotInstancesErrorDump(c *C) {
-- testServer.Response(400, nil, ErrorDump)
--
-- options := ec2.RequestSpotInstances{
-- SpotPrice: "0.01",
-- ImageId: "ami-a6f504cf", // Ubuntu Maverick, i386, instance store
-- InstanceType: "t1.micro", // Doesn't work with micro, results in 400.
-- }
+-func TestConversionBase64(t *testing.T) {
-
-- msg := `AMIs with an instance-store root device are not supported for the instance type 't1\.micro'\.`
+- o := New(map[string]interface{}{"name": "Mat"})
-
-- resp, err := s.ec2.RequestSpotInstances(&options)
+- result, err := o.Base64()
-
-- testServer.WaitRequest()
+- if assert.NoError(t, err) {
+- assert.Equal(t, "eyJuYW1lIjoiTWF0In0=", result)
+- }
-
-- c.Assert(resp, IsNil)
-- c.Assert(err, ErrorMatches, msg+` \(UnsupportedOperation\)`)
+- assert.Equal(t, "eyJuYW1lIjoiTWF0In0=", o.MustBase64())
-
-- ec2err, ok := err.(*ec2.Error)
-- c.Assert(ok, Equals, true)
-- c.Assert(ec2err.StatusCode, Equals, 400)
-- c.Assert(ec2err.Code, Equals, "UnsupportedOperation")
-- c.Assert(ec2err.Message, Matches, msg)
-- c.Assert(ec2err.RequestId, Equals, "0503f4e9-bbd6-483c-b54f-c4ae9f3b30f4")
-}
-
--func (s *S) TestRunInstancesErrorWithoutXML(c *C) {
-- testServer.Responses(5, 500, nil, "")
-- options := ec2.RunInstances{ImageId: "image-id"}
+-func TestConversionBase64WithError(t *testing.T) {
-
-- resp, err := s.ec2.RunInstances(&options)
+- o := MSI()
+- o["test"] = func() {}
-
-- testServer.WaitRequest()
+- assert.Panics(t, func() {
+- o.MustBase64()
+- })
-
-- c.Assert(resp, IsNil)
-- c.Assert(err, ErrorMatches, "500 Internal Server Error")
+- _, err := o.Base64()
+-
+- assert.Error(t, err)
-
-- ec2err, ok := err.(*ec2.Error)
-- c.Assert(ok, Equals, true)
-- c.Assert(ec2err.StatusCode, Equals, 500)
-- c.Assert(ec2err.Code, Equals, "")
-- c.Assert(ec2err.Message, Equals, "500 Internal Server Error")
-- c.Assert(ec2err.RequestId, Equals, "")
-}
-
--func (s *S) TestRequestSpotInstancesErrorWithoutXML(c *C) {
-- testServer.Responses(5, 500, nil, "")
-- options := ec2.RequestSpotInstances{SpotPrice: "spot-price", ImageId: "image-id"}
+-func TestConversionSignedBase64(t *testing.T) {
-
-- resp, err := s.ec2.RequestSpotInstances(&options)
+- o := New(map[string]interface{}{"name": "Mat"})
-
-- testServer.WaitRequest()
+- result, err := o.SignedBase64("key")
-
-- c.Assert(resp, IsNil)
-- c.Assert(err, ErrorMatches, "500 Internal Server Error")
+- if assert.NoError(t, err) {
+- assert.Equal(t, "eyJuYW1lIjoiTWF0In0=_67ee82916f90b2c0d68c903266e8998c9ef0c3d6", result)
+- }
+-
+- assert.Equal(t, "eyJuYW1lIjoiTWF0In0=_67ee82916f90b2c0d68c903266e8998c9ef0c3d6", o.MustSignedBase64("key"))
-
-- ec2err, ok := err.(*ec2.Error)
-- c.Assert(ok, Equals, true)
-- c.Assert(ec2err.StatusCode, Equals, 500)
-- c.Assert(ec2err.Code, Equals, "")
-- c.Assert(ec2err.Message, Equals, "500 Internal Server Error")
-- c.Assert(ec2err.RequestId, Equals, "")
-}
-
--func (s *S) TestRunInstancesExample(c *C) {
-- testServer.Response(200, nil, RunInstancesExample)
+-func TestConversionSignedBase64WithError(t *testing.T) {
-
-- options := ec2.RunInstances{
-- KeyName: "my-keys",
-- ImageId: "image-id",
-- InstanceType: "inst-type",
-- SecurityGroups: []ec2.SecurityGroup{{Name: "g1"}, {Id: "g2"}, {Name: "g3"}, {Id: "g4"}},
-- UserData: []byte("1234"),
-- KernelId: "kernel-id",
-- RamdiskId: "ramdisk-id",
-- AvailZone: "zone",
-- PlacementGroupName: "group",
-- Monitoring: true,
-- SubnetId: "subnet-id",
-- DisableAPITermination: true,
-- ShutdownBehavior: "terminate",
-- PrivateIPAddress: "10.0.0.25",
-- BlockDevices: []ec2.BlockDeviceMapping{
-- {DeviceName: "/dev/sdb", VirtualName: "ephemeral0"},
-- {DeviceName: "/dev/sdc", SnapshotId: "snap-a08912c9", DeleteOnTermination: true},
-- },
-- }
-- resp, err := s.ec2.RunInstances(&options)
+- o := MSI()
+- o["test"] = func() {}
-
-- req := testServer.WaitRequest()
-- c.Assert(req.Form["Action"], DeepEquals, []string{"RunInstances"})
-- c.Assert(req.Form["ImageId"], DeepEquals, []string{"image-id"})
-- c.Assert(req.Form["MinCount"], DeepEquals, []string{"1"})
-- c.Assert(req.Form["MaxCount"], DeepEquals, []string{"1"})
-- c.Assert(req.Form["KeyName"], DeepEquals, []string{"my-keys"})
-- c.Assert(req.Form["InstanceType"], DeepEquals, []string{"inst-type"})
-- c.Assert(req.Form["SecurityGroup.1"], DeepEquals, []string{"g1"})
-- c.Assert(req.Form["SecurityGroup.2"], DeepEquals, []string{"g3"})
-- c.Assert(req.Form["SecurityGroupId.1"], DeepEquals, []string{"g2"})
-- c.Assert(req.Form["SecurityGroupId.2"], DeepEquals, []string{"g4"})
-- c.Assert(req.Form["UserData"], DeepEquals, []string{"MTIzNA=="})
-- c.Assert(req.Form["KernelId"], DeepEquals, []string{"kernel-id"})
-- c.Assert(req.Form["RamdiskId"], DeepEquals, []string{"ramdisk-id"})
-- c.Assert(req.Form["Placement.AvailabilityZone"], DeepEquals, []string{"zone"})
-- c.Assert(req.Form["Placement.GroupName"], DeepEquals, []string{"group"})
-- c.Assert(req.Form["Monitoring.Enabled"], DeepEquals, []string{"true"})
-- c.Assert(req.Form["SubnetId"], DeepEquals, []string{"subnet-id"})
-- c.Assert(req.Form["DisableApiTermination"], DeepEquals, []string{"true"})
-- c.Assert(req.Form["InstanceInitiatedShutdownBehavior"], DeepEquals, []string{"terminate"})
-- c.Assert(req.Form["PrivateIpAddress"], DeepEquals, []string{"10.0.0.25"})
-- c.Assert(req.Form["BlockDeviceMapping.1.DeviceName"], DeepEquals, []string{"/dev/sdb"})
-- c.Assert(req.Form["BlockDeviceMapping.1.VirtualName"], DeepEquals, []string{"ephemeral0"})
-- c.Assert(req.Form["BlockDeviceMapping.2.Ebs.SnapshotId"], DeepEquals, []string{"snap-a08912c9"})
-- c.Assert(req.Form["BlockDeviceMapping.2.Ebs.DeleteOnTermination"], DeepEquals, []string{"true"})
+- assert.Panics(t, func() {
+- o.MustSignedBase64("key")
+- })
-
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
-- c.Assert(resp.ReservationId, Equals, "r-47a5402e")
-- c.Assert(resp.OwnerId, Equals, "999988887777")
-- c.Assert(resp.SecurityGroups, DeepEquals, []ec2.SecurityGroup{{Name: "default", Id: "sg-67ad940e"}})
-- c.Assert(resp.Instances, HasLen, 3)
+- _, err := o.SignedBase64("key")
-
-- i0 := resp.Instances[0]
-- c.Assert(i0.InstanceId, Equals, "i-2ba64342")
-- c.Assert(i0.InstanceType, Equals, "m1.small")
-- c.Assert(i0.ImageId, Equals, "ami-60a54009")
-- c.Assert(i0.Monitoring, Equals, "enabled")
-- c.Assert(i0.KeyName, Equals, "example-key-name")
-- c.Assert(i0.AMILaunchIndex, Equals, 0)
-- c.Assert(i0.VirtType, Equals, "paravirtual")
-- c.Assert(i0.Hypervisor, Equals, "xen")
+- assert.Error(t, err)
-
-- i1 := resp.Instances[1]
-- c.Assert(i1.InstanceId, Equals, "i-2bc64242")
-- c.Assert(i1.InstanceType, Equals, "m1.small")
-- c.Assert(i1.ImageId, Equals, "ami-60a54009")
-- c.Assert(i1.Monitoring, Equals, "enabled")
-- c.Assert(i1.KeyName, Equals, "example-key-name")
-- c.Assert(i1.AMILaunchIndex, Equals, 1)
-- c.Assert(i1.VirtType, Equals, "paravirtual")
-- c.Assert(i1.Hypervisor, Equals, "xen")
+-}
+diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/doc.go b/Godeps/_workspace/src/github.com/stretchr/objx/doc.go
+deleted file mode 100644
+index 47bf85e..0000000
+--- a/Godeps/_workspace/src/github.com/stretchr/objx/doc.go
++++ /dev/null
+@@ -1,72 +0,0 @@
+-// objx - Go package for dealing with maps, slices, JSON and other data.
+-//
+-// Overview
+-//
+-// Objx provides the `objx.Map` type, which is a `map[string]interface{}` that exposes
+-// a powerful `Get` method (among others) that allows you to easily and quickly get
+-// access to data within the map, without having to worry too much about type assertions,
+-// missing data, default values etc.
+-//
+-// Pattern
+-//
+-// Objx uses a preditable pattern to make access data from within `map[string]interface{}'s
+-// easy.
+-//
+-// Call one of the `objx.` functions to create your `objx.Map` to get going:
+-//
+-// m, err := objx.FromJSON(json)
+-//
+-// NOTE: Any methods or functions with the `Must` prefix will panic if something goes wrong,
+-// the rest will be optimistic and try to figure things out without panicking.
+-//
+-// Use `Get` to access the value you're interested in. You can use dot and array
+-// notation too:
+-//
+-// m.Get("places[0].latlng")
+-//
+-// Once you have saught the `Value` you're interested in, you can use the `Is*` methods
+-// to determine its type.
+-//
+-// if m.Get("code").IsStr() { /* ... */ }
+-//
+-// Or you can just assume the type, and use one of the strong type methods to
+-// extract the real value:
+-//
+-// m.Get("code").Int()
+-//
+-// If there's no value there (or if it's the wrong type) then a default value
+-// will be returned, or you can be explicit about the default value.
+-//
+-// Get("code").Int(-1)
+-//
+-// If you're dealing with a slice of data as a value, Objx provides many useful
+-// methods for iterating, manipulating and selecting that data. You can find out more
+-// by exploring the index below.
+-//
+-// Reading data
+-//
+-// A simple example of how to use Objx:
+-//
+-// // use MustFromJSON to make an objx.Map from some JSON
+-// m := objx.MustFromJSON(`{"name": "Mat", "age": 30}`)
+-//
+-// // get the details
+-// name := m.Get("name").Str()
+-// age := m.Get("age").Int()
+-//
+-// // get their nickname (or use their name if they
+-// // don't have one)
+-// nickname := m.Get("nickname").Str(name)
+-//
+-// Ranging
+-//
+-// Since `objx.Map` is a `map[string]interface{}` you can treat it as such. For
+-// example, to `range` the data, do what you would expect:
+-//
+-// m := objx.MustFromJSON(json)
+-// for key, value := range m {
+-//
+-// /* ... do your magic ... */
+-//
+-// }
+-package objx
+diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/fixture_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/fixture_test.go
+deleted file mode 100644
+index 27f7d90..0000000
+--- a/Godeps/_workspace/src/github.com/stretchr/objx/fixture_test.go
++++ /dev/null
+@@ -1,98 +0,0 @@
+-package objx
-
-- i2 := resp.Instances[2]
-- c.Assert(i2.InstanceId, Equals, "i-2be64332")
-- c.Assert(i2.InstanceType, Equals, "m1.small")
-- c.Assert(i2.ImageId, Equals, "ami-60a54009")
-- c.Assert(i2.Monitoring, Equals, "enabled")
-- c.Assert(i2.KeyName, Equals, "example-key-name")
-- c.Assert(i2.AMILaunchIndex, Equals, 2)
-- c.Assert(i2.VirtType, Equals, "paravirtual")
-- c.Assert(i2.Hypervisor, Equals, "xen")
+-import (
+- "github.com/stretchr/testify/assert"
+- "testing"
+-)
+-
+-var fixtures = []struct {
+- // name is the name of the fixture (used for reporting
+- // failures)
+- name string
+- // data is the JSON data to be worked on
+- data string
+- // get is the argument(s) to pass to Get
+- get interface{}
+- // output is the expected output
+- output interface{}
+-}{
+- {
+- name: "Simple get",
+- data: `{"name": "Mat"}`,
+- get: "name",
+- output: "Mat",
+- },
+- {
+- name: "Get with dot notation",
+- data: `{"address": {"city": "Boulder"}}`,
+- get: "address.city",
+- output: "Boulder",
+- },
+- {
+- name: "Deep get with dot notation",
+- data: `{"one": {"two": {"three": {"four": "hello"}}}}`,
+- get: "one.two.three.four",
+- output: "hello",
+- },
+- {
+- name: "Get missing with dot notation",
+- data: `{"one": {"two": {"three": {"four": "hello"}}}}`,
+- get: "one.ten",
+- output: nil,
+- },
+- {
+- name: "Get with array notation",
+- data: `{"tags": ["one", "two", "three"]}`,
+- get: "tags[1]",
+- output: "two",
+- },
+- {
+- name: "Get with array and dot notation",
+- data: `{"types": { "tags": ["one", "two", "three"]}}`,
+- get: "types.tags[1]",
+- output: "two",
+- },
+- {
+- name: "Get with array and dot notation - field after array",
+- data: `{"tags": [{"name":"one"}, {"name":"two"}, {"name":"three"}]}`,
+- get: "tags[1].name",
+- output: "two",
+- },
+- {
+- name: "Complex get with array and dot notation",
+- data: `{"tags": [{"list": [{"one":"pizza"}]}]}`,
+- get: "tags[0].list[0].one",
+- output: "pizza",
+- },
+- {
+- name: "Get field from within string should be nil",
+- data: `{"name":"Tyler"}`,
+- get: "name.something",
+- output: nil,
+- },
+- {
+- name: "Get field from within string (using array accessor) should be nil",
+- data: `{"numbers":["one", "two", "three"]}`,
+- get: "numbers[0].nope",
+- output: nil,
+- },
-}
-
--func (s *S) TestRequestSpotInstancesExample(c *C) {
-- testServer.Response(200, nil, RequestSpotInstancesExample)
--
-- options := ec2.RequestSpotInstances{
-- SpotPrice: "0.5",
-- KeyName: "my-keys",
-- ImageId: "image-id",
-- InstanceType: "inst-type",
-- SecurityGroups: []ec2.SecurityGroup{{Name: "g1"}, {Id: "g2"}, {Name: "g3"}, {Id: "g4"}},
-- UserData: []byte("1234"),
-- KernelId: "kernel-id",
-- RamdiskId: "ramdisk-id",
-- AvailZone: "zone",
-- PlacementGroupName: "group",
-- Monitoring: true,
-- SubnetId: "subnet-id",
-- PrivateIPAddress: "10.0.0.25",
-- BlockDevices: []ec2.BlockDeviceMapping{
-- {DeviceName: "/dev/sdb", VirtualName: "ephemeral0"},
-- {DeviceName: "/dev/sdc", SnapshotId: "snap-a08912c9", DeleteOnTermination: true},
-- },
-- }
-- resp, err := s.ec2.RequestSpotInstances(&options)
+-func TestFixtures(t *testing.T) {
-
-- req := testServer.WaitRequest()
-- c.Assert(req.Form["Action"], DeepEquals, []string{"RequestSpotInstances"})
-- c.Assert(req.Form["SpotPrice"], DeepEquals, []string{"0.5"})
-- c.Assert(req.Form["LaunchSpecification.ImageId"], DeepEquals, []string{"image-id"})
-- c.Assert(req.Form["LaunchSpecification.KeyName"], DeepEquals, []string{"my-keys"})
-- c.Assert(req.Form["LaunchSpecification.InstanceType"], DeepEquals, []string{"inst-type"})
-- c.Assert(req.Form["LaunchSpecification.SecurityGroup.1"], DeepEquals, []string{"g1"})
-- c.Assert(req.Form["LaunchSpecification.SecurityGroup.2"], DeepEquals, []string{"g3"})
-- c.Assert(req.Form["LaunchSpecification.SecurityGroupId.1"], DeepEquals, []string{"g2"})
-- c.Assert(req.Form["LaunchSpecification.SecurityGroupId.2"], DeepEquals, []string{"g4"})
-- c.Assert(req.Form["LaunchSpecification.UserData"], DeepEquals, []string{"MTIzNA=="})
-- c.Assert(req.Form["LaunchSpecification.KernelId"], DeepEquals, []string{"kernel-id"})
-- c.Assert(req.Form["LaunchSpecification.RamdiskId"], DeepEquals, []string{"ramdisk-id"})
-- c.Assert(req.Form["LaunchSpecification.Placement.AvailabilityZone"], DeepEquals, []string{"zone"})
-- c.Assert(req.Form["LaunchSpecification.Placement.GroupName"], DeepEquals, []string{"group"})
-- c.Assert(req.Form["LaunchSpecification.Monitoring.Enabled"], DeepEquals, []string{"true"})
-- c.Assert(req.Form["LaunchSpecification.SubnetId"], DeepEquals, []string{"subnet-id"})
-- c.Assert(req.Form["LaunchSpecification.PrivateIpAddress"], DeepEquals, []string{"10.0.0.25"})
-- c.Assert(req.Form["LaunchSpecification.BlockDeviceMapping.1.DeviceName"], DeepEquals, []string{"/dev/sdb"})
-- c.Assert(req.Form["LaunchSpecification.BlockDeviceMapping.1.VirtualName"], DeepEquals, []string{"ephemeral0"})
-- c.Assert(req.Form["LaunchSpecification.BlockDeviceMapping.2.Ebs.SnapshotId"], DeepEquals, []string{"snap-a08912c9"})
-- c.Assert(req.Form["LaunchSpecification.BlockDeviceMapping.2.Ebs.DeleteOnTermination"], DeepEquals, []string{"true"})
+- for _, fixture := range fixtures {
-
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
-- c.Assert(resp.SpotRequestResults[0].SpotRequestId, Equals, "sir-1a2b3c4d")
-- c.Assert(resp.SpotRequestResults[0].SpotPrice, Equals, "0.5")
-- c.Assert(resp.SpotRequestResults[0].State, Equals, "open")
-- c.Assert(resp.SpotRequestResults[0].SpotLaunchSpec.ImageId, Equals, "ami-1a2b3c4d")
-- c.Assert(resp.SpotRequestResults[0].Status.Code, Equals, "pending-evaluation")
-- c.Assert(resp.SpotRequestResults[0].Status.UpdateTime, Equals, "2008-05-07T12:51:50.000Z")
-- c.Assert(resp.SpotRequestResults[0].Status.Message, Equals, "Your Spot request has been submitted for review, and is pending evaluation.")
--}
+- m := MustFromJSON(fixture.data)
-
--func (s *S) TestCancelSpotRequestsExample(c *C) {
-- testServer.Response(200, nil, CancelSpotRequestsExample)
+- // get the value
+- t.Logf("Running get fixture: \"%s\" (%v)", fixture.name, fixture)
+- value := m.Get(fixture.get.(string))
-
-- resp, err := s.ec2.CancelSpotRequests([]string{"s-1", "s-2"})
+- // make sure it matches
+- assert.Equal(t, fixture.output, value.data,
+- "Get fixture \"%s\" failed: %v", fixture.name, fixture,
+- )
-
-- req := testServer.WaitRequest()
-- c.Assert(req.Form["Action"], DeepEquals, []string{"CancelSpotInstanceRequests"})
-- c.Assert(req.Form["SpotInstanceRequestId.1"], DeepEquals, []string{"s-1"})
-- c.Assert(req.Form["SpotInstanceRequestId.2"], DeepEquals, []string{"s-2"})
+- }
-
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
-- c.Assert(resp.CancelSpotRequestResults[0].SpotRequestId, Equals, "sir-1a2b3c4d")
-- c.Assert(resp.CancelSpotRequestResults[0].State, Equals, "cancelled")
-}
+diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/map.go b/Godeps/_workspace/src/github.com/stretchr/objx/map.go
+deleted file mode 100644
+index eb6ed8e..0000000
+--- a/Godeps/_workspace/src/github.com/stretchr/objx/map.go
++++ /dev/null
+@@ -1,222 +0,0 @@
+-package objx
-
--func (s *S) TestTerminateInstancesExample(c *C) {
-- testServer.Response(200, nil, TerminateInstancesExample)
--
-- resp, err := s.ec2.TerminateInstances([]string{"i-1", "i-2"})
--
-- req := testServer.WaitRequest()
-- c.Assert(req.Form["Action"], DeepEquals, []string{"TerminateInstances"})
-- c.Assert(req.Form["InstanceId.1"], DeepEquals, []string{"i-1"})
-- c.Assert(req.Form["InstanceId.2"], DeepEquals, []string{"i-2"})
-- c.Assert(req.Form["UserData"], IsNil)
-- c.Assert(req.Form["KernelId"], IsNil)
-- c.Assert(req.Form["RamdiskId"], IsNil)
-- c.Assert(req.Form["Placement.AvailabilityZone"], IsNil)
-- c.Assert(req.Form["Placement.GroupName"], IsNil)
-- c.Assert(req.Form["Monitoring.Enabled"], IsNil)
-- c.Assert(req.Form["SubnetId"], IsNil)
-- c.Assert(req.Form["DisableApiTermination"], IsNil)
-- c.Assert(req.Form["InstanceInitiatedShutdownBehavior"], IsNil)
-- c.Assert(req.Form["PrivateIpAddress"], IsNil)
+-import (
+- "encoding/base64"
+- "encoding/json"
+- "errors"
+- "io/ioutil"
+- "net/url"
+- "strings"
+-)
-
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
-- c.Assert(resp.StateChanges, HasLen, 1)
-- c.Assert(resp.StateChanges[0].InstanceId, Equals, "i-3ea74257")
-- c.Assert(resp.StateChanges[0].CurrentState.Code, Equals, 32)
-- c.Assert(resp.StateChanges[0].CurrentState.Name, Equals, "shutting-down")
-- c.Assert(resp.StateChanges[0].PreviousState.Code, Equals, 16)
-- c.Assert(resp.StateChanges[0].PreviousState.Name, Equals, "running")
+-// MSIConvertable is an interface that defines methods for converting your
+-// custom types to a map[string]interface{} representation.
+-type MSIConvertable interface {
+- // MSI gets a map[string]interface{} (msi) representing the
+- // object.
+- MSI() map[string]interface{}
-}
-
--func (s *S) TestDescribeSpotRequestsExample(c *C) {
-- testServer.Response(200, nil, DescribeSpotRequestsExample)
--
-- filter := ec2.NewFilter()
-- filter.Add("key1", "value1")
-- filter.Add("key2", "value2", "value3")
+-// Map provides extended functionality for working with
+-// untyped data, in particular map[string]interface (msi).
+-type Map map[string]interface{}
-
-- resp, err := s.ec2.DescribeSpotRequests([]string{"s-1", "s-2"}, filter)
+-// Value returns the internal value instance
+-func (m Map) Value() *Value {
+- return &Value{data: m}
+-}
-
-- req := testServer.WaitRequest()
-- c.Assert(req.Form["Action"], DeepEquals, []string{"DescribeSpotInstanceRequests"})
-- c.Assert(req.Form["SpotInstanceRequestId.1"], DeepEquals, []string{"s-1"})
-- c.Assert(req.Form["SpotInstanceRequestId.2"], DeepEquals, []string{"s-2"})
+-// Nil represents a nil Map.
+-var Nil Map = New(nil)
-
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "b1719f2a-5334-4479-b2f1-26926EXAMPLE")
-- c.Assert(resp.SpotRequestResults[0].SpotRequestId, Equals, "sir-1a2b3c4d")
-- c.Assert(resp.SpotRequestResults[0].State, Equals, "active")
-- c.Assert(resp.SpotRequestResults[0].SpotPrice, Equals, "0.5")
-- c.Assert(resp.SpotRequestResults[0].SpotLaunchSpec.ImageId, Equals, "ami-1a2b3c4d")
-- c.Assert(resp.SpotRequestResults[0].Status.Code, Equals, "fulfilled")
-- c.Assert(resp.SpotRequestResults[0].Status.UpdateTime, Equals, "2008-05-07T12:51:50.000Z")
-- c.Assert(resp.SpotRequestResults[0].Status.Message, Equals, "Your Spot request is fulfilled.")
+-// New creates a new Map containing the map[string]interface{} in the data argument.
+-// If the data argument is not a map[string]interface, New attempts to call the
+-// MSI() method on the MSIConvertable interface to create one.
+-func New(data interface{}) Map {
+- if _, ok := data.(map[string]interface{}); !ok {
+- if converter, ok := data.(MSIConvertable); ok {
+- data = converter.MSI()
+- } else {
+- return nil
+- }
+- }
+- return Map(data.(map[string]interface{}))
-}
-
--func (s *S) TestDescribeInstancesExample1(c *C) {
-- testServer.Response(200, nil, DescribeInstancesExample1)
--
-- filter := ec2.NewFilter()
-- filter.Add("key1", "value1")
-- filter.Add("key2", "value2", "value3")
+-// MSI creates a map[string]interface{} and puts it inside a new Map.
+-//
+-// The arguments follow a key, value pattern.
+-//
+-// Panics
+-//
+-// Panics if any key arugment is non-string or if there are an odd number of arguments.
+-//
+-// Example
+-//
+-// To easily create Maps:
+-//
+-// m := objx.MSI("name", "Mat", "age", 29, "subobj", objx.MSI("active", true))
+-//
+-// // creates an Map equivalent to
+-// m := objx.New(map[string]interface{}{"name": "Mat", "age": 29, "subobj": map[string]interface{}{"active": true}})
+-func MSI(keyAndValuePairs ...interface{}) Map {
-
-- resp, err := s.ec2.Instances([]string{"i-1", "i-2"}, nil)
+- newMap := make(map[string]interface{})
+- keyAndValuePairsLen := len(keyAndValuePairs)
-
-- req := testServer.WaitRequest()
-- c.Assert(req.Form["Action"], DeepEquals, []string{"DescribeInstances"})
-- c.Assert(req.Form["InstanceId.1"], DeepEquals, []string{"i-1"})
-- c.Assert(req.Form["InstanceId.2"], DeepEquals, []string{"i-2"})
+- if keyAndValuePairsLen%2 != 0 {
+- panic("objx: MSI must have an even number of arguments following the 'key, value' pattern.")
+- }
-
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "98e3c9a4-848c-4d6d-8e8a-b1bdEXAMPLE")
-- c.Assert(resp.Reservations, HasLen, 2)
+- for i := 0; i < keyAndValuePairsLen; i = i + 2 {
-
-- r0 := resp.Reservations[0]
-- c.Assert(r0.ReservationId, Equals, "r-b27e30d9")
-- c.Assert(r0.OwnerId, Equals, "999988887777")
-- c.Assert(r0.RequesterId, Equals, "854251627541")
-- c.Assert(r0.SecurityGroups, DeepEquals, []ec2.SecurityGroup{{Name: "default", Id: "sg-67ad940e"}})
-- c.Assert(r0.Instances, HasLen, 1)
+- key := keyAndValuePairs[i]
+- value := keyAndValuePairs[i+1]
-
-- r0i := r0.Instances[0]
-- c.Assert(r0i.InstanceId, Equals, "i-c5cd56af")
-- c.Assert(r0i.PrivateDNSName, Equals, "domU-12-31-39-10-56-34.compute-1.internal")
-- c.Assert(r0i.DNSName, Equals, "ec2-174-129-165-232.compute-1.amazonaws.com")
-- c.Assert(r0i.AvailZone, Equals, "us-east-1b")
--}
+- // make sure the key is a string
+- keyString, keyStringOK := key.(string)
+- if !keyStringOK {
+- panic("objx: MSI must follow 'string, interface{}' pattern. " + keyString + " is not a valid key.")
+- }
-
--func (s *S) TestDescribeInstancesExample2(c *C) {
-- testServer.Response(200, nil, DescribeInstancesExample2)
+- newMap[keyString] = value
-
-- filter := ec2.NewFilter()
-- filter.Add("key1", "value1")
-- filter.Add("key2", "value2", "value3")
+- }
-
-- resp, err := s.ec2.Instances([]string{"i-1", "i-2"}, filter)
+- return New(newMap)
+-}
-
-- req := testServer.WaitRequest()
-- c.Assert(req.Form["Action"], DeepEquals, []string{"DescribeInstances"})
-- c.Assert(req.Form["InstanceId.1"], DeepEquals, []string{"i-1"})
-- c.Assert(req.Form["InstanceId.2"], DeepEquals, []string{"i-2"})
-- c.Assert(req.Form["Filter.1.Name"], DeepEquals, []string{"key1"})
-- c.Assert(req.Form["Filter.1.Value.1"], DeepEquals, []string{"value1"})
-- c.Assert(req.Form["Filter.1.Value.2"], IsNil)
-- c.Assert(req.Form["Filter.2.Name"], DeepEquals, []string{"key2"})
-- c.Assert(req.Form["Filter.2.Value.1"], DeepEquals, []string{"value2"})
-- c.Assert(req.Form["Filter.2.Value.2"], DeepEquals, []string{"value3"})
+-// ****** Conversion Constructors
-
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
-- c.Assert(resp.Reservations, HasLen, 1)
+-// MustFromJSON creates a new Map containing the data specified in the
+-// jsonString.
+-//
+-// Panics if the JSON is invalid.
+-func MustFromJSON(jsonString string) Map {
+- o, err := FromJSON(jsonString)
-
-- r0 := resp.Reservations[0]
-- r0i := r0.Instances[0]
-- c.Assert(r0i.State.Code, Equals, 16)
-- c.Assert(r0i.State.Name, Equals, "running")
+- if err != nil {
+- panic("objx: MustFromJSON failed with error: " + err.Error())
+- }
-
-- r0t0 := r0i.Tags[0]
-- r0t1 := r0i.Tags[1]
-- c.Assert(r0t0.Key, Equals, "webserver")
-- c.Assert(r0t0.Value, Equals, "")
-- c.Assert(r0t1.Key, Equals, "stack")
-- c.Assert(r0t1.Value, Equals, "Production")
+- return o
-}
-
--func (s *S) TestCreateImageExample(c *C) {
-- testServer.Response(200, nil, CreateImageExample)
+-// FromJSON creates a new Map containing the data specified in the
+-// jsonString.
+-//
+-// Returns an error if the JSON is invalid.
+-func FromJSON(jsonString string) (Map, error) {
-
-- options := &ec2.CreateImage{
-- InstanceId: "i-123456",
-- Name: "foo",
-- Description: "Test CreateImage",
-- NoReboot: true,
-- BlockDevices: []ec2.BlockDeviceMapping{
-- {DeviceName: "/dev/sdb", VirtualName: "ephemeral0"},
-- {DeviceName: "/dev/sdc", SnapshotId: "snap-a08912c9", DeleteOnTermination: true},
-- },
-- }
+- var data interface{}
+- err := json.Unmarshal([]byte(jsonString), &data)
-
-- resp, err := s.ec2.CreateImage(options)
+- if err != nil {
+- return Nil, err
+- }
-
-- req := testServer.WaitRequest()
-- c.Assert(req.Form["Action"], DeepEquals, []string{"CreateImage"})
-- c.Assert(req.Form["InstanceId"], DeepEquals, []string{options.InstanceId})
-- c.Assert(req.Form["Name"], DeepEquals, []string{options.Name})
-- c.Assert(req.Form["Description"], DeepEquals, []string{options.Description})
-- c.Assert(req.Form["NoReboot"], DeepEquals, []string{"true"})
-- c.Assert(req.Form["BlockDeviceMapping.1.DeviceName"], DeepEquals, []string{"/dev/sdb"})
-- c.Assert(req.Form["BlockDeviceMapping.1.VirtualName"], DeepEquals, []string{"ephemeral0"})
-- c.Assert(req.Form["BlockDeviceMapping.2.DeviceName"], DeepEquals, []string{"/dev/sdc"})
-- c.Assert(req.Form["BlockDeviceMapping.2.Ebs.SnapshotId"], DeepEquals, []string{"snap-a08912c9"})
-- c.Assert(req.Form["BlockDeviceMapping.2.Ebs.DeleteOnTermination"], DeepEquals, []string{"true"})
+- return New(data), nil
-
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
-- c.Assert(resp.ImageId, Equals, "ami-4fa54026")
-}
-
--func (s *S) TestDescribeImagesExample(c *C) {
-- testServer.Response(200, nil, DescribeImagesExample)
--
-- filter := ec2.NewFilter()
-- filter.Add("key1", "value1")
-- filter.Add("key2", "value2", "value3")
--
-- resp, err := s.ec2.Images([]string{"ami-1", "ami-2"}, filter)
--
-- req := testServer.WaitRequest()
-- c.Assert(req.Form["Action"], DeepEquals, []string{"DescribeImages"})
-- c.Assert(req.Form["ImageId.1"], DeepEquals, []string{"ami-1"})
-- c.Assert(req.Form["ImageId.2"], DeepEquals, []string{"ami-2"})
-- c.Assert(req.Form["Filter.1.Name"], DeepEquals, []string{"key1"})
-- c.Assert(req.Form["Filter.1.Value.1"], DeepEquals, []string{"value1"})
-- c.Assert(req.Form["Filter.1.Value.2"], IsNil)
-- c.Assert(req.Form["Filter.2.Name"], DeepEquals, []string{"key2"})
-- c.Assert(req.Form["Filter.2.Value.1"], DeepEquals, []string{"value2"})
-- c.Assert(req.Form["Filter.2.Value.2"], DeepEquals, []string{"value3"})
--
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "4a4a27a2-2e7c-475d-b35b-ca822EXAMPLE")
-- c.Assert(resp.Images, HasLen, 1)
+-// FromBase64 creates a new Obj containing the data specified
+-// in the Base64 string.
+-//
+-// The string is an encoded JSON string returned by Base64
+-func FromBase64(base64String string) (Map, error) {
-
-- i0 := resp.Images[0]
-- c.Assert(i0.Id, Equals, "ami-a2469acf")
-- c.Assert(i0.Type, Equals, "machine")
-- c.Assert(i0.Name, Equals, "example-marketplace-amzn-ami.1")
-- c.Assert(i0.Description, Equals, "Amazon Linux AMI i386 EBS")
-- c.Assert(i0.Location, Equals, "aws-marketplace/example-marketplace-amzn-ami.1")
-- c.Assert(i0.State, Equals, "available")
-- c.Assert(i0.Public, Equals, true)
-- c.Assert(i0.OwnerId, Equals, "123456789999")
-- c.Assert(i0.OwnerAlias, Equals, "aws-marketplace")
-- c.Assert(i0.Architecture, Equals, "i386")
-- c.Assert(i0.KernelId, Equals, "aki-805ea7e9")
-- c.Assert(i0.RootDeviceType, Equals, "ebs")
-- c.Assert(i0.RootDeviceName, Equals, "/dev/sda1")
-- c.Assert(i0.VirtualizationType, Equals, "paravirtual")
-- c.Assert(i0.Hypervisor, Equals, "xen")
+- decoder := base64.NewDecoder(base64.StdEncoding, strings.NewReader(base64String))
-
-- c.Assert(i0.BlockDevices, HasLen, 1)
-- c.Assert(i0.BlockDevices[0].DeviceName, Equals, "/dev/sda1")
-- c.Assert(i0.BlockDevices[0].SnapshotId, Equals, "snap-787e9403")
-- c.Assert(i0.BlockDevices[0].VolumeSize, Equals, int64(8))
-- c.Assert(i0.BlockDevices[0].DeleteOnTermination, Equals, true)
+- decoded, err := ioutil.ReadAll(decoder)
+- if err != nil {
+- return nil, err
+- }
-
-- testServer.Response(200, nil, DescribeImagesExample)
-- resp2, err := s.ec2.ImagesByOwners([]string{"ami-1", "ami-2"}, []string{"123456789999", "id2"}, filter)
+- return FromJSON(string(decoded))
+-}
-
-- req2 := testServer.WaitRequest()
-- c.Assert(req2.Form["Action"], DeepEquals, []string{"DescribeImages"})
-- c.Assert(req2.Form["ImageId.1"], DeepEquals, []string{"ami-1"})
-- c.Assert(req2.Form["ImageId.2"], DeepEquals, []string{"ami-2"})
-- c.Assert(req2.Form["Owner.1"], DeepEquals, []string{"123456789999"})
-- c.Assert(req2.Form["Owner.2"], DeepEquals, []string{"id2"})
-- c.Assert(req2.Form["Filter.1.Name"], DeepEquals, []string{"key1"})
-- c.Assert(req2.Form["Filter.1.Value.1"], DeepEquals, []string{"value1"})
-- c.Assert(req2.Form["Filter.1.Value.2"], IsNil)
-- c.Assert(req2.Form["Filter.2.Name"], DeepEquals, []string{"key2"})
-- c.Assert(req2.Form["Filter.2.Value.1"], DeepEquals, []string{"value2"})
-- c.Assert(req2.Form["Filter.2.Value.2"], DeepEquals, []string{"value3"})
+-// MustFromBase64 creates a new Obj containing the data specified
+-// in the Base64 string and panics if there is an error.
+-//
+-// The string is an encoded JSON string returned by Base64
+-func MustFromBase64(base64String string) Map {
-
-- c.Assert(err, IsNil)
-- c.Assert(resp2.RequestId, Equals, "4a4a27a2-2e7c-475d-b35b-ca822EXAMPLE")
-- c.Assert(resp2.Images, HasLen, 1)
+- result, err := FromBase64(base64String)
-
-- i1 := resp2.Images[0]
-- c.Assert(i1.Id, Equals, "ami-a2469acf")
-- c.Assert(i1.Type, Equals, "machine")
-- c.Assert(i1.Name, Equals, "example-marketplace-amzn-ami.1")
-- c.Assert(i1.Description, Equals, "Amazon Linux AMI i386 EBS")
-- c.Assert(i1.Location, Equals, "aws-marketplace/example-marketplace-amzn-ami.1")
-- c.Assert(i1.State, Equals, "available")
-- c.Assert(i1.Public, Equals, true)
-- c.Assert(i1.OwnerId, Equals, "123456789999")
-- c.Assert(i1.OwnerAlias, Equals, "aws-marketplace")
-- c.Assert(i1.Architecture, Equals, "i386")
-- c.Assert(i1.KernelId, Equals, "aki-805ea7e9")
-- c.Assert(i1.RootDeviceType, Equals, "ebs")
-- c.Assert(i1.RootDeviceName, Equals, "/dev/sda1")
-- c.Assert(i1.VirtualizationType, Equals, "paravirtual")
-- c.Assert(i1.Hypervisor, Equals, "xen")
+- if err != nil {
+- panic("objx: MustFromBase64 failed with error: " + err.Error())
+- }
-
-- c.Assert(i1.BlockDevices, HasLen, 1)
-- c.Assert(i1.BlockDevices[0].DeviceName, Equals, "/dev/sda1")
-- c.Assert(i1.BlockDevices[0].SnapshotId, Equals, "snap-787e9403")
-- c.Assert(i1.BlockDevices[0].VolumeSize, Equals, int64(8))
-- c.Assert(i1.BlockDevices[0].DeleteOnTermination, Equals, true)
+- return result
-}
-
--func (s *S) TestImageAttributeExample(c *C) {
-- testServer.Response(200, nil, ImageAttributeExample)
--
-- resp, err := s.ec2.ImageAttribute("ami-61a54008", "launchPermission")
+-// FromSignedBase64 creates a new Obj containing the data specified
+-// in the Base64 string.
+-//
+-// The string is an encoded JSON string returned by SignedBase64
+-func FromSignedBase64(base64String, key string) (Map, error) {
+- parts := strings.Split(base64String, SignatureSeparator)
+- if len(parts) != 2 {
+- return nil, errors.New("objx: Signed base64 string is malformed.")
+- }
-
-- req := testServer.WaitRequest()
-- c.Assert(req.Form["Action"], DeepEquals, []string{"DescribeImageAttribute"})
+- sig := HashWithKey(parts[0], key)
+- if parts[1] != sig {
+- return nil, errors.New("objx: Signature for base64 data does not match.")
+- }
-
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
-- c.Assert(resp.ImageId, Equals, "ami-61a54008")
-- c.Assert(resp.Group, Equals, "all")
-- c.Assert(resp.UserIds[0], Equals, "495219933132")
+- return FromBase64(parts[0])
-}
-
--func (s *S) TestCreateSnapshotExample(c *C) {
-- testServer.Response(200, nil, CreateSnapshotExample)
+-// MustFromSignedBase64 creates a new Obj containing the data specified
+-// in the Base64 string and panics if there is an error.
+-//
+-// The string is an encoded JSON string returned by Base64
+-func MustFromSignedBase64(base64String, key string) Map {
-
-- resp, err := s.ec2.CreateSnapshot("vol-4d826724", "Daily Backup")
+- result, err := FromSignedBase64(base64String, key)
-
-- req := testServer.WaitRequest()
-- c.Assert(req.Form["Action"], DeepEquals, []string{"CreateSnapshot"})
-- c.Assert(req.Form["VolumeId"], DeepEquals, []string{"vol-4d826724"})
-- c.Assert(req.Form["Description"], DeepEquals, []string{"Daily Backup"})
+- if err != nil {
+- panic("objx: MustFromSignedBase64 failed with error: " + err.Error())
+- }
-
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
-- c.Assert(resp.Snapshot.Id, Equals, "snap-78a54011")
-- c.Assert(resp.Snapshot.VolumeId, Equals, "vol-4d826724")
-- c.Assert(resp.Snapshot.Status, Equals, "pending")
-- c.Assert(resp.Snapshot.StartTime, Equals, "2008-05-07T12:51:50.000Z")
-- c.Assert(resp.Snapshot.Progress, Equals, "60%")
-- c.Assert(resp.Snapshot.OwnerId, Equals, "111122223333")
-- c.Assert(resp.Snapshot.VolumeSize, Equals, "10")
-- c.Assert(resp.Snapshot.Description, Equals, "Daily Backup")
+- return result
-}
-
--func (s *S) TestDeleteSnapshotsExample(c *C) {
-- testServer.Response(200, nil, DeleteSnapshotExample)
--
-- resp, err := s.ec2.DeleteSnapshots([]string{"snap-78a54011"})
+-// FromURLQuery generates a new Obj by parsing the specified
+-// query.
+-//
+-// For queries with multiple values, the first value is selected.
+-func FromURLQuery(query string) (Map, error) {
-
-- req := testServer.WaitRequest()
-- c.Assert(req.Form["Action"], DeepEquals, []string{"DeleteSnapshot"})
-- c.Assert(req.Form["SnapshotId.1"], DeepEquals, []string{"snap-78a54011"})
+- vals, err := url.ParseQuery(query)
-
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
--}
+- if err != nil {
+- return nil, err
+- }
-
--func (s *S) TestDescribeSnapshotsExample(c *C) {
-- testServer.Response(200, nil, DescribeSnapshotsExample)
+- m := make(map[string]interface{})
+- for k, vals := range vals {
+- m[k] = vals[0]
+- }
-
-- filter := ec2.NewFilter()
-- filter.Add("key1", "value1")
-- filter.Add("key2", "value2", "value3")
+- return New(m), nil
+-}
-
-- resp, err := s.ec2.Snapshots([]string{"snap-1", "snap-2"}, filter)
+-// MustFromURLQuery generates a new Obj by parsing the specified
+-// query.
+-//
+-// For queries with multiple values, the first value is selected.
+-//
+-// Panics if it encounters an error
+-func MustFromURLQuery(query string) Map {
-
-- req := testServer.WaitRequest()
-- c.Assert(req.Form["Action"], DeepEquals, []string{"DescribeSnapshots"})
-- c.Assert(req.Form["SnapshotId.1"], DeepEquals, []string{"snap-1"})
-- c.Assert(req.Form["SnapshotId.2"], DeepEquals, []string{"snap-2"})
-- c.Assert(req.Form["Filter.1.Name"], DeepEquals, []string{"key1"})
-- c.Assert(req.Form["Filter.1.Value.1"], DeepEquals, []string{"value1"})
-- c.Assert(req.Form["Filter.1.Value.2"], IsNil)
-- c.Assert(req.Form["Filter.2.Name"], DeepEquals, []string{"key2"})
-- c.Assert(req.Form["Filter.2.Value.1"], DeepEquals, []string{"value2"})
-- c.Assert(req.Form["Filter.2.Value.2"], DeepEquals, []string{"value3"})
+- o, err := FromURLQuery(query)
-
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
-- c.Assert(resp.Snapshots, HasLen, 1)
+- if err != nil {
+- panic("objx: MustFromURLQuery failed with error: " + err.Error())
+- }
-
-- s0 := resp.Snapshots[0]
-- c.Assert(s0.Id, Equals, "snap-1a2b3c4d")
-- c.Assert(s0.VolumeId, Equals, "vol-8875daef")
-- c.Assert(s0.VolumeSize, Equals, "15")
-- c.Assert(s0.Status, Equals, "pending")
-- c.Assert(s0.StartTime, Equals, "2010-07-29T04:12:01.000Z")
-- c.Assert(s0.Progress, Equals, "30%")
-- c.Assert(s0.OwnerId, Equals, "111122223333")
-- c.Assert(s0.Description, Equals, "Daily Backup")
+- return o
-
-- c.Assert(s0.Tags, HasLen, 1)
-- c.Assert(s0.Tags[0].Key, Equals, "Purpose")
-- c.Assert(s0.Tags[0].Value, Equals, "demo_db_14_backup")
-}
+diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/map_for_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/map_for_test.go
+deleted file mode 100644
+index 6beb506..0000000
+--- a/Godeps/_workspace/src/github.com/stretchr/objx/map_for_test.go
++++ /dev/null
+@@ -1,10 +0,0 @@
+-package objx
-
--func (s *S) TestModifyImageAttributeExample(c *C) {
-- testServer.Response(200, nil, ModifyImageAttributeExample)
+-var TestMap map[string]interface{} = map[string]interface{}{
+- "name": "Tyler",
+- "address": map[string]interface{}{
+- "city": "Salt Lake City",
+- "state": "UT",
+- },
+- "numbers": []interface{}{"one", "two", "three", "four", "five"},
+-}
+diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/map_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/map_test.go
+deleted file mode 100644
+index 1f8b45c..0000000
+--- a/Godeps/_workspace/src/github.com/stretchr/objx/map_test.go
++++ /dev/null
+@@ -1,147 +0,0 @@
+-package objx
-
-- options := ec2.ModifyImageAttribute{
-- Description: "Test Description",
-- }
+-import (
+- "github.com/stretchr/testify/assert"
+- "testing"
+-)
-
-- resp, err := s.ec2.ModifyImageAttribute("ami-4fa54026", &options)
+-type Convertable struct {
+- name string
+-}
-
-- req := testServer.WaitRequest()
-- c.Assert(req.Form["Action"], DeepEquals, []string{"ModifyImageAttribute"})
+-func (c *Convertable) MSI() map[string]interface{} {
+- return map[string]interface{}{"name": c.name}
+-}
-
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
+-type Unconvertable struct {
+- name string
-}
-
--func (s *S) TestModifyImageAttributeExample_complex(c *C) {
-- testServer.Response(200, nil, ModifyImageAttributeExample)
+-func TestMapCreation(t *testing.T) {
-
-- options := ec2.ModifyImageAttribute{
-- AddUsers: []string{"u1", "u2"},
-- RemoveUsers: []string{"u3"},
-- AddGroups: []string{"g1", "g3"},
-- RemoveGroups: []string{"g2"},
-- Description: "Test Description",
-- }
+- o := New(nil)
+- assert.Nil(t, o)
-
-- resp, err := s.ec2.ModifyImageAttribute("ami-4fa54026", &options)
+- o = New("Tyler")
+- assert.Nil(t, o)
-
-- req := testServer.WaitRequest()
-- c.Assert(req.Form["Action"], DeepEquals, []string{"ModifyImageAttribute"})
-- c.Assert(req.Form["LaunchPermission.Add.1.UserId"], DeepEquals, []string{"u1"})
-- c.Assert(req.Form["LaunchPermission.Add.2.UserId"], DeepEquals, []string{"u2"})
-- c.Assert(req.Form["LaunchPermission.Remove.1.UserId"], DeepEquals, []string{"u3"})
-- c.Assert(req.Form["LaunchPermission.Add.1.Group"], DeepEquals, []string{"g1"})
-- c.Assert(req.Form["LaunchPermission.Add.2.Group"], DeepEquals, []string{"g3"})
-- c.Assert(req.Form["LaunchPermission.Remove.1.Group"], DeepEquals, []string{"g2"})
+- unconvertable := &Unconvertable{name: "Tyler"}
+- o = New(unconvertable)
+- assert.Nil(t, o)
-
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
--}
+- convertable := &Convertable{name: "Tyler"}
+- o = New(convertable)
+- if assert.NotNil(t, convertable) {
+- assert.Equal(t, "Tyler", o["name"], "Tyler")
+- }
-
--func (s *S) TestCopyImageExample(c *C) {
-- testServer.Response(200, nil, CopyImageExample)
+- o = MSI()
+- if assert.NotNil(t, o) {
+- assert.NotNil(t, o)
+- }
-
-- options := ec2.CopyImage{
-- SourceRegion: "us-west-2",
-- SourceImageId: "ami-1a2b3c4d",
-- Description: "Test Description",
+- o = MSI("name", "Tyler")
+- if assert.NotNil(t, o) {
+- if assert.NotNil(t, o) {
+- assert.Equal(t, o["name"], "Tyler")
+- }
- }
-
-- resp, err := s.ec2.CopyImage(&options)
+-}
-
-- req := testServer.WaitRequest()
-- c.Assert(req.Form["Action"], DeepEquals, []string{"CopyImage"})
+-func TestMapMustFromJSONWithError(t *testing.T) {
+-
+- _, err := FromJSON(`"name":"Mat"}`)
+- assert.Error(t, err)
-
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "60bc441d-fa2c-494d-b155-5d6a3EXAMPLE")
-}
-
--func (s *S) TestCreateKeyPairExample(c *C) {
-- testServer.Response(200, nil, CreateKeyPairExample)
+-func TestMapFromJSON(t *testing.T) {
-
-- resp, err := s.ec2.CreateKeyPair("foo")
+- o := MustFromJSON(`{"name":"Mat"}`)
-
-- req := testServer.WaitRequest()
-- c.Assert(req.Form["Action"], DeepEquals, []string{"CreateKeyPair"})
-- c.Assert(req.Form["KeyName"], DeepEquals, []string{"foo"})
+- if assert.NotNil(t, o) {
+- if assert.NotNil(t, o) {
+- assert.Equal(t, "Mat", o["name"])
+- }
+- }
-
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
-- c.Assert(resp.KeyName, Equals, "foo")
-- c.Assert(resp.KeyFingerprint, Equals, "00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00")
-}
-
--func (s *S) TestDeleteKeyPairExample(c *C) {
-- testServer.Response(200, nil, DeleteKeyPairExample)
+-func TestMapFromJSONWithError(t *testing.T) {
-
-- resp, err := s.ec2.DeleteKeyPair("foo")
+- var m Map
-
-- req := testServer.WaitRequest()
-- c.Assert(req.Form["Action"], DeepEquals, []string{"DeleteKeyPair"})
-- c.Assert(req.Form["KeyName"], DeepEquals, []string{"foo"})
+- assert.Panics(t, func() {
+- m = MustFromJSON(`"name":"Mat"}`)
+- })
+-
+- assert.Nil(t, m)
-
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
-}
-
--func (s *S) TestCreateSecurityGroupExample(c *C) {
-- testServer.Response(200, nil, CreateSecurityGroupExample)
+-func TestMapFromBase64String(t *testing.T) {
-
-- resp, err := s.ec2.CreateSecurityGroup(ec2.SecurityGroup{Name: "websrv", Description: "Web Servers"})
+- base64String := "eyJuYW1lIjoiTWF0In0="
-
-- req := testServer.WaitRequest()
-- c.Assert(req.Form["Action"], DeepEquals, []string{"CreateSecurityGroup"})
-- c.Assert(req.Form["GroupName"], DeepEquals, []string{"websrv"})
-- c.Assert(req.Form["GroupDescription"], DeepEquals, []string{"Web Servers"})
+- o, err := FromBase64(base64String)
-
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
-- c.Assert(resp.Name, Equals, "websrv")
-- c.Assert(resp.Id, Equals, "sg-67ad940e")
--}
+- if assert.NoError(t, err) {
+- assert.Equal(t, o.Get("name").Str(), "Mat")
+- }
-
--func (s *S) TestDescribeSecurityGroupsExample(c *C) {
-- testServer.Response(200, nil, DescribeSecurityGroupsExample)
+- assert.Equal(t, MustFromBase64(base64String).Get("name").Str(), "Mat")
-
-- resp, err := s.ec2.SecurityGroups([]ec2.SecurityGroup{{Name: "WebServers"}, {Name: "RangedPortsBySource"}}, nil)
+-}
-
-- req := testServer.WaitRequest()
-- c.Assert(req.Form["Action"], DeepEquals, []string{"DescribeSecurityGroups"})
-- c.Assert(req.Form["GroupName.1"], DeepEquals, []string{"WebServers"})
-- c.Assert(req.Form["GroupName.2"], DeepEquals, []string{"RangedPortsBySource"})
+-func TestMapFromBase64StringWithError(t *testing.T) {
-
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
-- c.Assert(resp.Groups, HasLen, 2)
+- base64String := "eyJuYW1lIjoiTWFasd0In0="
-
-- g0 := resp.Groups[0]
-- c.Assert(g0.OwnerId, Equals, "999988887777")
-- c.Assert(g0.Name, Equals, "WebServers")
-- c.Assert(g0.Id, Equals, "sg-67ad940e")
-- c.Assert(g0.Description, Equals, "Web Servers")
-- c.Assert(g0.IPPerms, HasLen, 1)
+- _, err := FromBase64(base64String)
-
-- g0ipp := g0.IPPerms[0]
-- c.Assert(g0ipp.Protocol, Equals, "tcp")
-- c.Assert(g0ipp.FromPort, Equals, 80)
-- c.Assert(g0ipp.ToPort, Equals, 80)
-- c.Assert(g0ipp.SourceIPs, DeepEquals, []string{"0.0.0.0/0"})
+- assert.Error(t, err)
-
-- g1 := resp.Groups[1]
-- c.Assert(g1.OwnerId, Equals, "999988887777")
-- c.Assert(g1.Name, Equals, "RangedPortsBySource")
-- c.Assert(g1.Id, Equals, "sg-76abc467")
-- c.Assert(g1.Description, Equals, "Group A")
-- c.Assert(g1.IPPerms, HasLen, 1)
+- assert.Panics(t, func() {
+- MustFromBase64(base64String)
+- })
-
-- g1ipp := g1.IPPerms[0]
-- c.Assert(g1ipp.Protocol, Equals, "tcp")
-- c.Assert(g1ipp.FromPort, Equals, 6000)
-- c.Assert(g1ipp.ToPort, Equals, 7000)
-- c.Assert(g1ipp.SourceIPs, IsNil)
-}
-
--func (s *S) TestDescribeSecurityGroupsExampleWithFilter(c *C) {
-- testServer.Response(200, nil, DescribeSecurityGroupsExample)
+-func TestMapFromSignedBase64String(t *testing.T) {
-
-- filter := ec2.NewFilter()
-- filter.Add("ip-permission.protocol", "tcp")
-- filter.Add("ip-permission.from-port", "22")
-- filter.Add("ip-permission.to-port", "22")
-- filter.Add("ip-permission.group-name", "app_server_group", "database_group")
+- base64String := "eyJuYW1lIjoiTWF0In0=_67ee82916f90b2c0d68c903266e8998c9ef0c3d6"
-
-- _, err := s.ec2.SecurityGroups(nil, filter)
+- o, err := FromSignedBase64(base64String, "key")
-
-- req := testServer.WaitRequest()
-- c.Assert(req.Form["Action"], DeepEquals, []string{"DescribeSecurityGroups"})
-- c.Assert(req.Form["Filter.1.Name"], DeepEquals, []string{"ip-permission.from-port"})
-- c.Assert(req.Form["Filter.1.Value.1"], DeepEquals, []string{"22"})
-- c.Assert(req.Form["Filter.2.Name"], DeepEquals, []string{"ip-permission.group-name"})
-- c.Assert(req.Form["Filter.2.Value.1"], DeepEquals, []string{"app_server_group"})
-- c.Assert(req.Form["Filter.2.Value.2"], DeepEquals, []string{"database_group"})
-- c.Assert(req.Form["Filter.3.Name"], DeepEquals, []string{"ip-permission.protocol"})
-- c.Assert(req.Form["Filter.3.Value.1"], DeepEquals, []string{"tcp"})
-- c.Assert(req.Form["Filter.4.Name"], DeepEquals, []string{"ip-permission.to-port"})
-- c.Assert(req.Form["Filter.4.Value.1"], DeepEquals, []string{"22"})
+- if assert.NoError(t, err) {
+- assert.Equal(t, o.Get("name").Str(), "Mat")
+- }
+-
+- assert.Equal(t, MustFromSignedBase64(base64String, "key").Get("name").Str(), "Mat")
-
-- c.Assert(err, IsNil)
-}
-
--func (s *S) TestDescribeSecurityGroupsDumpWithGroup(c *C) {
-- testServer.Response(200, nil, DescribeSecurityGroupsDump)
+-func TestMapFromSignedBase64StringWithError(t *testing.T) {
-
-- resp, err := s.ec2.SecurityGroups(nil, nil)
+- base64String := "eyJuYW1lasdIjoiTWF0In0=_67ee82916f90b2c0d68c903266e8998c9ef0c3d6"
-
-- req := testServer.WaitRequest()
-- c.Assert(req.Form["Action"], DeepEquals, []string{"DescribeSecurityGroups"})
-- c.Assert(err, IsNil)
-- c.Check(resp.Groups, HasLen, 1)
-- c.Check(resp.Groups[0].IPPerms, HasLen, 2)
+- _, err := FromSignedBase64(base64String, "key")
-
-- ipp0 := resp.Groups[0].IPPerms[0]
-- c.Assert(ipp0.SourceIPs, IsNil)
-- c.Check(ipp0.Protocol, Equals, "icmp")
-- c.Assert(ipp0.SourceGroups, HasLen, 1)
-- c.Check(ipp0.SourceGroups[0].OwnerId, Equals, "12345")
-- c.Check(ipp0.SourceGroups[0].Name, Equals, "default")
-- c.Check(ipp0.SourceGroups[0].Id, Equals, "sg-67ad940e")
+- assert.Error(t, err)
+-
+- assert.Panics(t, func() {
+- MustFromSignedBase64(base64String, "key")
+- })
-
-- ipp1 := resp.Groups[0].IPPerms[1]
-- c.Check(ipp1.Protocol, Equals, "tcp")
-- c.Assert(ipp0.SourceIPs, IsNil)
-- c.Assert(ipp0.SourceGroups, HasLen, 1)
-- c.Check(ipp1.SourceGroups[0].Id, Equals, "sg-76abc467")
-- c.Check(ipp1.SourceGroups[0].OwnerId, Equals, "12345")
-- c.Check(ipp1.SourceGroups[0].Name, Equals, "other")
-}
-
--func (s *S) TestDeleteSecurityGroupExample(c *C) {
-- testServer.Response(200, nil, DeleteSecurityGroupExample)
+-func TestMapFromURLQuery(t *testing.T) {
-
-- resp, err := s.ec2.DeleteSecurityGroup(ec2.SecurityGroup{Name: "websrv"})
-- req := testServer.WaitRequest()
+- m, err := FromURLQuery("name=tyler&state=UT")
+- if assert.NoError(t, err) && assert.NotNil(t, m) {
+- assert.Equal(t, "tyler", m.Get("name").Str())
+- assert.Equal(t, "UT", m.Get("state").Str())
+- }
-
-- c.Assert(req.Form["Action"], DeepEquals, []string{"DeleteSecurityGroup"})
-- c.Assert(req.Form["GroupName"], DeepEquals, []string{"websrv"})
-- c.Assert(req.Form["GroupId"], IsNil)
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
-}
+diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/mutations.go b/Godeps/_workspace/src/github.com/stretchr/objx/mutations.go
+deleted file mode 100644
+index b35c863..0000000
+--- a/Godeps/_workspace/src/github.com/stretchr/objx/mutations.go
++++ /dev/null
+@@ -1,81 +0,0 @@
+-package objx
-
--func (s *S) TestDeleteSecurityGroupExampleWithId(c *C) {
-- testServer.Response(200, nil, DeleteSecurityGroupExample)
+-// Exclude returns a new Map with the keys in the specified []string
+-// excluded.
+-func (d Map) Exclude(exclude []string) Map {
-
-- // ignore return and error - we're only want to check the parameter handling.
-- s.ec2.DeleteSecurityGroup(ec2.SecurityGroup{Id: "sg-67ad940e", Name: "ignored"})
-- req := testServer.WaitRequest()
+- excluded := make(Map)
+- for k, v := range d {
+- var shouldInclude bool = true
+- for _, toExclude := range exclude {
+- if k == toExclude {
+- shouldInclude = false
+- break
+- }
+- }
+- if shouldInclude {
+- excluded[k] = v
+- }
+- }
-
-- c.Assert(req.Form["GroupName"], IsNil)
-- c.Assert(req.Form["GroupId"], DeepEquals, []string{"sg-67ad940e"})
+- return excluded
-}
-
--func (s *S) TestAuthorizeSecurityGroupExample1(c *C) {
-- testServer.Response(200, nil, AuthorizeSecurityGroupIngressExample)
+-// Copy creates a shallow copy of the Obj.
+-func (m Map) Copy() Map {
+- copied := make(map[string]interface{})
+- for k, v := range m {
+- copied[k] = v
+- }
+- return New(copied)
+-}
-
-- perms := []ec2.IPPerm{{
-- Protocol: "tcp",
-- FromPort: 80,
-- ToPort: 80,
-- SourceIPs: []string{"205.192.0.0/16", "205.159.0.0/16"},
-- }}
-- resp, err := s.ec2.AuthorizeSecurityGroup(ec2.SecurityGroup{Name: "websrv"}, perms)
+-// Merge blends the specified map with a copy of this map and returns the result.
+-//
+-// Keys that appear in both will be selected from the specified map.
+-// This method requires that the wrapped object be a map[string]interface{}
+-func (m Map) Merge(merge Map) Map {
+- return m.Copy().MergeHere(merge)
+-}
-
-- req := testServer.WaitRequest()
+-// Merge blends the specified map with this map and returns the current map.
+-//
+-// Keys that appear in both will be selected from the specified map. The original map
+-// will be modified. This method requires that
+-// the wrapped object be a map[string]interface{}
+-func (m Map) MergeHere(merge Map) Map {
-
-- c.Assert(req.Form["Action"], DeepEquals, []string{"AuthorizeSecurityGroupIngress"})
-- c.Assert(req.Form["GroupName"], DeepEquals, []string{"websrv"})
-- c.Assert(req.Form["IpPermissions.1.IpProtocol"], DeepEquals, []string{"tcp"})
-- c.Assert(req.Form["IpPermissions.1.FromPort"], DeepEquals, []string{"80"})
-- c.Assert(req.Form["IpPermissions.1.ToPort"], DeepEquals, []string{"80"})
-- c.Assert(req.Form["IpPermissions.1.IpRanges.1.CidrIp"], DeepEquals, []string{"205.192.0.0/16"})
-- c.Assert(req.Form["IpPermissions.1.IpRanges.2.CidrIp"], DeepEquals, []string{"205.159.0.0/16"})
+- for k, v := range merge {
+- m[k] = v
+- }
-
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
--}
+- return m
-
--func (s *S) TestAuthorizeSecurityGroupEgress(c *C) {
-- testServer.Response(200, nil, AuthorizeSecurityGroupEgressExample)
+-}
-
-- perms := []ec2.IPPerm{{
-- Protocol: "tcp",
-- FromPort: 80,
-- ToPort: 80,
-- SourceIPs: []string{"205.192.0.0/16", "205.159.0.0/16"},
-- }}
-- resp, err := s.ec2.AuthorizeSecurityGroupEgress(ec2.SecurityGroup{Name: "websrv"}, perms)
+-// Transform builds a new Obj giving the transformer a chance
+-// to change the keys and values as it goes. This method requires that
+-// the wrapped object be a map[string]interface{}
+-func (m Map) Transform(transformer func(key string, value interface{}) (string, interface{})) Map {
+- newMap := make(map[string]interface{})
+- for k, v := range m {
+- modifiedKey, modifiedVal := transformer(k, v)
+- newMap[modifiedKey] = modifiedVal
+- }
+- return New(newMap)
+-}
-
-- req := testServer.WaitRequest()
+-// TransformKeys builds a new map using the specified key mapping.
+-//
+-// Unspecified keys will be unaltered.
+-// This method requires that the wrapped object be a map[string]interface{}
+-func (m Map) TransformKeys(mapping map[string]string) Map {
+- return m.Transform(func(key string, value interface{}) (string, interface{}) {
-
-- c.Assert(req.Form["Action"], DeepEquals, []string{"AuthorizeSecurityGroupEgress"})
-- c.Assert(req.Form["GroupName"], DeepEquals, []string{"websrv"})
-- c.Assert(req.Form["IpPermissions.1.IpProtocol"], DeepEquals, []string{"tcp"})
-- c.Assert(req.Form["IpPermissions.1.FromPort"], DeepEquals, []string{"80"})
-- c.Assert(req.Form["IpPermissions.1.ToPort"], DeepEquals, []string{"80"})
-- c.Assert(req.Form["IpPermissions.1.IpRanges.1.CidrIp"], DeepEquals, []string{"205.192.0.0/16"})
-- c.Assert(req.Form["IpPermissions.1.IpRanges.2.CidrIp"], DeepEquals, []string{"205.159.0.0/16"})
+- if newKey, ok := mapping[key]; ok {
+- return newKey, value
+- }
-
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
+- return key, value
+- })
-}
+diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/mutations_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/mutations_test.go
+deleted file mode 100644
+index e20ee23..0000000
+--- a/Godeps/_workspace/src/github.com/stretchr/objx/mutations_test.go
++++ /dev/null
+@@ -1,77 +0,0 @@
+-package objx
-
--func (s *S) TestAuthorizeSecurityGroupExample1WithId(c *C) {
-- testServer.Response(200, nil, AuthorizeSecurityGroupIngressExample)
+-import (
+- "github.com/stretchr/testify/assert"
+- "testing"
+-)
-
-- perms := []ec2.IPPerm{{
-- Protocol: "tcp",
-- FromPort: 80,
-- ToPort: 80,
-- SourceIPs: []string{"205.192.0.0/16", "205.159.0.0/16"},
-- }}
-- // ignore return and error - we're only want to check the parameter handling.
-- s.ec2.AuthorizeSecurityGroup(ec2.SecurityGroup{Id: "sg-67ad940e", Name: "ignored"}, perms)
+-func TestExclude(t *testing.T) {
-
-- req := testServer.WaitRequest()
+- d := make(Map)
+- d["name"] = "Mat"
+- d["age"] = 29
+- d["secret"] = "ABC"
+-
+- excluded := d.Exclude([]string{"secret"})
+-
+- assert.Equal(t, d["name"], excluded["name"])
+- assert.Equal(t, d["age"], excluded["age"])
+- assert.False(t, excluded.Has("secret"), "secret should be excluded")
-
-- c.Assert(req.Form["GroupName"], IsNil)
-- c.Assert(req.Form["GroupId"], DeepEquals, []string{"sg-67ad940e"})
-}
-
--func (s *S) TestAuthorizeSecurityGroupExample2(c *C) {
-- testServer.Response(200, nil, AuthorizeSecurityGroupIngressExample)
+-func TestCopy(t *testing.T) {
-
-- perms := []ec2.IPPerm{{
-- Protocol: "tcp",
-- FromPort: 80,
-- ToPort: 81,
-- SourceGroups: []ec2.UserSecurityGroup{
-- {OwnerId: "999988887777", Name: "OtherAccountGroup"},
-- {Id: "sg-67ad940e"},
-- },
-- }}
-- resp, err := s.ec2.AuthorizeSecurityGroup(ec2.SecurityGroup{Name: "websrv"}, perms)
+- d1 := make(map[string]interface{})
+- d1["name"] = "Tyler"
+- d1["location"] = "UT"
-
-- req := testServer.WaitRequest()
+- d1Obj := New(d1)
+- d2Obj := d1Obj.Copy()
-
-- c.Assert(req.Form["Action"], DeepEquals, []string{"AuthorizeSecurityGroupIngress"})
-- c.Assert(req.Form["GroupName"], DeepEquals, []string{"websrv"})
-- c.Assert(req.Form["IpPermissions.1.IpProtocol"], DeepEquals, []string{"tcp"})
-- c.Assert(req.Form["IpPermissions.1.FromPort"], DeepEquals, []string{"80"})
-- c.Assert(req.Form["IpPermissions.1.ToPort"], DeepEquals, []string{"81"})
-- c.Assert(req.Form["IpPermissions.1.Groups.1.UserId"], DeepEquals, []string{"999988887777"})
-- c.Assert(req.Form["IpPermissions.1.Groups.1.GroupName"], DeepEquals, []string{"OtherAccountGroup"})
-- c.Assert(req.Form["IpPermissions.1.Groups.2.UserId"], IsNil)
-- c.Assert(req.Form["IpPermissions.1.Groups.2.GroupName"], IsNil)
-- c.Assert(req.Form["IpPermissions.1.Groups.2.GroupId"], DeepEquals, []string{"sg-67ad940e"})
+- d2Obj["name"] = "Mat"
-
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
--}
+- assert.Equal(t, d1Obj.Get("name").Str(), "Tyler")
+- assert.Equal(t, d2Obj.Get("name").Str(), "Mat")
-
--func (s *S) TestRevokeSecurityGroupExample(c *C) {
-- // RevokeSecurityGroup is implemented by the same code as AuthorizeSecurityGroup
-- // so there's no need to duplicate all the tests.
-- testServer.Response(200, nil, RevokeSecurityGroupIngressExample)
+-}
-
-- resp, err := s.ec2.RevokeSecurityGroup(ec2.SecurityGroup{Name: "websrv"}, nil)
+-func TestMerge(t *testing.T) {
-
-- req := testServer.WaitRequest()
+- d := make(map[string]interface{})
+- d["name"] = "Mat"
-
-- c.Assert(req.Form["Action"], DeepEquals, []string{"RevokeSecurityGroupIngress"})
-- c.Assert(req.Form["GroupName"], DeepEquals, []string{"websrv"})
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
--}
+- d1 := make(map[string]interface{})
+- d1["name"] = "Tyler"
+- d1["location"] = "UT"
-
--func (s *S) TestCreateTags(c *C) {
-- testServer.Response(200, nil, CreateTagsExample)
+- dObj := New(d)
+- d1Obj := New(d1)
-
-- resp, err := s.ec2.CreateTags([]string{"ami-1a2b3c4d", "i-7f4d3a2b"}, []ec2.Tag{{"webserver", ""}, {"stack", "Production"}})
+- merged := dObj.Merge(d1Obj)
-
-- req := testServer.WaitRequest()
-- c.Assert(req.Form["ResourceId.1"], DeepEquals, []string{"ami-1a2b3c4d"})
-- c.Assert(req.Form["ResourceId.2"], DeepEquals, []string{"i-7f4d3a2b"})
-- c.Assert(req.Form["Tag.1.Key"], DeepEquals, []string{"webserver"})
-- c.Assert(req.Form["Tag.1.Value"], DeepEquals, []string{""})
-- c.Assert(req.Form["Tag.2.Key"], DeepEquals, []string{"stack"})
-- c.Assert(req.Form["Tag.2.Value"], DeepEquals, []string{"Production"})
+- assert.Equal(t, merged.Get("name").Str(), d1Obj.Get("name").Str())
+- assert.Equal(t, merged.Get("location").Str(), d1Obj.Get("location").Str())
+- assert.Empty(t, dObj.Get("location").Str())
-
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
-}
-
--func (s *S) TestStartInstances(c *C) {
-- testServer.Response(200, nil, StartInstancesExample)
+-func TestMergeHere(t *testing.T) {
+-
+- d := make(map[string]interface{})
+- d["name"] = "Mat"
-
-- resp, err := s.ec2.StartInstances("i-10a64379")
-- req := testServer.WaitRequest()
+- d1 := make(map[string]interface{})
+- d1["name"] = "Tyler"
+- d1["location"] = "UT"
-
-- c.Assert(req.Form["Action"], DeepEquals, []string{"StartInstances"})
-- c.Assert(req.Form["InstanceId.1"], DeepEquals, []string{"i-10a64379"})
+- dObj := New(d)
+- d1Obj := New(d1)
-
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
+- merged := dObj.MergeHere(d1Obj)
-
-- s0 := resp.StateChanges[0]
-- c.Assert(s0.InstanceId, Equals, "i-10a64379")
-- c.Assert(s0.CurrentState.Code, Equals, 0)
-- c.Assert(s0.CurrentState.Name, Equals, "pending")
-- c.Assert(s0.PreviousState.Code, Equals, 80)
-- c.Assert(s0.PreviousState.Name, Equals, "stopped")
+- assert.Equal(t, dObj, merged, "With MergeHere, it should return the first modified map")
+- assert.Equal(t, merged.Get("name").Str(), d1Obj.Get("name").Str())
+- assert.Equal(t, merged.Get("location").Str(), d1Obj.Get("location").Str())
+- assert.Equal(t, merged.Get("location").Str(), dObj.Get("location").Str())
-}
+diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/security.go b/Godeps/_workspace/src/github.com/stretchr/objx/security.go
+deleted file mode 100644
+index fdd6be9..0000000
+--- a/Godeps/_workspace/src/github.com/stretchr/objx/security.go
++++ /dev/null
+@@ -1,14 +0,0 @@
+-package objx
-
--func (s *S) TestStopInstances(c *C) {
-- testServer.Response(200, nil, StopInstancesExample)
+-import (
+- "crypto/sha1"
+- "encoding/hex"
+-)
-
-- resp, err := s.ec2.StopInstances("i-10a64379")
-- req := testServer.WaitRequest()
+-// HashWithKey hashes the specified string using the security
+-// key.
+-func HashWithKey(data, key string) string {
+- hash := sha1.New()
+- hash.Write([]byte(data + ":" + key))
+- return hex.EncodeToString(hash.Sum(nil))
+-}
+diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/security_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/security_test.go
+deleted file mode 100644
+index 8f0898f..0000000
+--- a/Godeps/_workspace/src/github.com/stretchr/objx/security_test.go
++++ /dev/null
+@@ -1,12 +0,0 @@
+-package objx
-
-- c.Assert(req.Form["Action"], DeepEquals, []string{"StopInstances"})
-- c.Assert(req.Form["InstanceId.1"], DeepEquals, []string{"i-10a64379"})
+-import (
+- "github.com/stretchr/testify/assert"
+- "testing"
+-)
-
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
+-func TestHashWithKey(t *testing.T) {
+-
+- assert.Equal(t, "0ce84d8d01f2c7b6e0882b784429c54d280ea2d9", HashWithKey("abc", "def"))
-
-- s0 := resp.StateChanges[0]
-- c.Assert(s0.InstanceId, Equals, "i-10a64379")
-- c.Assert(s0.CurrentState.Code, Equals, 64)
-- c.Assert(s0.CurrentState.Name, Equals, "stopping")
-- c.Assert(s0.PreviousState.Code, Equals, 16)
-- c.Assert(s0.PreviousState.Name, Equals, "running")
-}
+diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/simple_example_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/simple_example_test.go
+deleted file mode 100644
+index 5408c7f..0000000
+--- a/Godeps/_workspace/src/github.com/stretchr/objx/simple_example_test.go
++++ /dev/null
+@@ -1,41 +0,0 @@
+-package objx
-
--func (s *S) TestRebootInstances(c *C) {
-- testServer.Response(200, nil, RebootInstancesExample)
+-import (
+- "github.com/stretchr/testify/assert"
+- "testing"
+-)
-
-- resp, err := s.ec2.RebootInstances("i-10a64379")
-- req := testServer.WaitRequest()
+-func TestSimpleExample(t *testing.T) {
-
-- c.Assert(req.Form["Action"], DeepEquals, []string{"RebootInstances"})
-- c.Assert(req.Form["InstanceId.1"], DeepEquals, []string{"i-10a64379"})
+- // build a map from a JSON object
+- o := MustFromJSON(`{"name":"Mat","foods":["indian","chinese"], "location":{"county":"hobbiton","city":"the shire"}}`)
-
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
--}
+- // Map can be used as a straight map[string]interface{}
+- assert.Equal(t, o["name"], "Mat")
-
--func (s *S) TestSignatureWithEndpointPath(c *C) {
-- ec2.FakeTime(true)
-- defer ec2.FakeTime(false)
+- // Get an Value object
+- v := o.Get("name")
+- assert.Equal(t, v, &Value{data: "Mat"})
-
-- testServer.Response(200, nil, RebootInstancesExample)
+- // Test the contained value
+- assert.False(t, v.IsInt())
+- assert.False(t, v.IsBool())
+- assert.True(t, v.IsStr())
-
-- // https://bugs.launchpad.net/goamz/+bug/1022749
-- ec2 := ec2.NewWithClient(s.ec2.Auth, aws.Region{EC2Endpoint: testServer.URL + "/services/Cloud"}, testutil.DefaultClient)
+- // Get the contained value
+- assert.Equal(t, v.Str(), "Mat")
-
-- _, err := ec2.RebootInstances("i-10a64379")
-- c.Assert(err, IsNil)
+- // Get a default value if the contained value is not of the expected type or does not exist
+- assert.Equal(t, 1, v.Int(1))
-
-- req := testServer.WaitRequest()
-- c.Assert(req.Form["Signature"], DeepEquals, []string{"QmvgkYGn19WirCuCz/jRp3RmRgFwWR5WRkKZ5AZnyXQ="})
--}
+- // Get a value by using array notation
+- assert.Equal(t, "indian", o.Get("foods[0]").Data())
-
--func (s *S) TestAllocateAddressExample(c *C) {
-- testServer.Response(200, nil, AllocateAddressExample)
+- // Set a value by using array notation
+- o.Set("foods[0]", "italian")
+- assert.Equal(t, "italian", o.Get("foods[0]").Str())
-
-- options := &ec2.AllocateAddress{
-- Domain: "vpc",
-- }
+- // Get a value by using dot notation
+- assert.Equal(t, "hobbiton", o.Get("location.county").Str())
-
-- resp, err := s.ec2.AllocateAddress(options)
+-}
+diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/tests.go b/Godeps/_workspace/src/github.com/stretchr/objx/tests.go
+deleted file mode 100644
+index d9e0b47..0000000
+--- a/Godeps/_workspace/src/github.com/stretchr/objx/tests.go
++++ /dev/null
+@@ -1,17 +0,0 @@
+-package objx
-
-- req := testServer.WaitRequest()
-- c.Assert(req.Form["Action"], DeepEquals, []string{"AllocateAddress"})
-- c.Assert(req.Form["Domain"], DeepEquals, []string{"vpc"})
+-// Has gets whether there is something at the specified selector
+-// or not.
+-//
+-// If m is nil, Has will always return false.
+-func (m Map) Has(selector string) bool {
+- if m == nil {
+- return false
+- }
+- return !m.Get(selector).IsNil()
+-}
-
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
-- c.Assert(resp.PublicIp, Equals, "198.51.100.1")
-- c.Assert(resp.Domain, Equals, "vpc")
-- c.Assert(resp.AllocationId, Equals, "eipalloc-5723d13e")
+-// IsNil gets whether the data is nil or not.
+-func (v *Value) IsNil() bool {
+- return v == nil || v.data == nil
-}
+diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/tests_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/tests_test.go
+deleted file mode 100644
+index bcc1eb0..0000000
+--- a/Godeps/_workspace/src/github.com/stretchr/objx/tests_test.go
++++ /dev/null
+@@ -1,24 +0,0 @@
+-package objx
-
--func (s *S) TestReleaseAddressExample(c *C) {
-- testServer.Response(200, nil, ReleaseAddressExample)
+-import (
+- "github.com/stretchr/testify/assert"
+- "testing"
+-)
-
-- resp, err := s.ec2.ReleaseAddress("eipalloc-5723d13e")
+-func TestHas(t *testing.T) {
-
-- req := testServer.WaitRequest()
-- c.Assert(req.Form["Action"], DeepEquals, []string{"ReleaseAddress"})
-- c.Assert(req.Form["AllocationId"], DeepEquals, []string{"eipalloc-5723d13e"})
+- m := New(TestMap)
-
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
--}
+- assert.True(t, m.Has("name"))
+- assert.True(t, m.Has("address.state"))
+- assert.True(t, m.Has("numbers[4]"))
-
--func (s *S) TestAssociateAddressExample(c *C) {
-- testServer.Response(200, nil, AssociateAddressExample)
+- assert.False(t, m.Has("address.state.nope"))
+- assert.False(t, m.Has("address.nope"))
+- assert.False(t, m.Has("nope"))
+- assert.False(t, m.Has("numbers[5]"))
-
-- options := &ec2.AssociateAddress{
-- InstanceId: "i-4fd2431a",
-- AllocationId: "eipalloc-5723d13e",
-- AllowReassociation: true,
-- }
+- m = nil
+- assert.False(t, m.Has("nothing"))
-
-- resp, err := s.ec2.AssociateAddress(options)
+-}
+diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/type_specific_codegen.go b/Godeps/_workspace/src/github.com/stretchr/objx/type_specific_codegen.go
+deleted file mode 100644
+index f3ecb29..0000000
+--- a/Godeps/_workspace/src/github.com/stretchr/objx/type_specific_codegen.go
++++ /dev/null
+@@ -1,2881 +0,0 @@
+-package objx
-
-- req := testServer.WaitRequest()
-- c.Assert(req.Form["Action"], DeepEquals, []string{"AssociateAddress"})
-- c.Assert(req.Form["InstanceId"], DeepEquals, []string{"i-4fd2431a"})
-- c.Assert(req.Form["AllocationId"], DeepEquals, []string{"eipalloc-5723d13e"})
-- c.Assert(req.Form["AllowReassociation"], DeepEquals, []string{"true"})
+-/*
+- Inter (interface{} and []interface{})
+- --------------------------------------------------
+-*/
-
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
-- c.Assert(resp.AssociationId, Equals, "eipassoc-fc5ca095")
+-// Inter gets the value as a interface{}, returns the optionalDefault
+-// value or a system default object if the value is the wrong type.
+-func (v *Value) Inter(optionalDefault ...interface{}) interface{} {
+- if s, ok := v.data.(interface{}); ok {
+- return s
+- }
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
+- }
+- return nil
-}
-
--func (s *S) TestDisassociateAddressExample(c *C) {
-- testServer.Response(200, nil, DisassociateAddressExample)
+-// MustInter gets the value as a interface{}.
+-//
+-// Panics if the object is not a interface{}.
+-func (v *Value) MustInter() interface{} {
+- return v.data.(interface{})
+-}
-
-- resp, err := s.ec2.DisassociateAddress("eipassoc-aa7486c3")
+-// InterSlice gets the value as a []interface{}, returns the optionalDefault
+-// value or nil if the value is not a []interface{}.
+-func (v *Value) InterSlice(optionalDefault ...[]interface{}) []interface{} {
+- if s, ok := v.data.([]interface{}); ok {
+- return s
+- }
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
+- }
+- return nil
+-}
-
-- req := testServer.WaitRequest()
-- c.Assert(req.Form["Action"], DeepEquals, []string{"DisassociateAddress"})
-- c.Assert(req.Form["AssociationId"], DeepEquals, []string{"eipassoc-aa7486c3"})
+-// MustInterSlice gets the value as a []interface{}.
+-//
+-// Panics if the object is not a []interface{}.
+-func (v *Value) MustInterSlice() []interface{} {
+- return v.data.([]interface{})
+-}
-
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
+-// IsInter gets whether the object contained is a interface{} or not.
+-func (v *Value) IsInter() bool {
+- _, ok := v.data.(interface{})
+- return ok
-}
-
--func (s *S) TestModifyInstance(c *C) {
-- testServer.Response(200, nil, ModifyInstanceExample)
+-// IsInterSlice gets whether the object contained is a []interface{} or not.
+-func (v *Value) IsInterSlice() bool {
+- _, ok := v.data.([]interface{})
+- return ok
+-}
-
-- options := ec2.ModifyInstance{
-- InstanceType: "m1.small",
-- DisableAPITermination: true,
-- EbsOptimized: true,
-- SecurityGroups: []ec2.SecurityGroup{{Id: "g1"}, {Id: "g2"}},
-- ShutdownBehavior: "terminate",
-- KernelId: "kernel-id",
-- RamdiskId: "ramdisk-id",
-- SourceDestCheck: true,
-- SriovNetSupport: true,
-- UserData: []byte("1234"),
-- BlockDevices: []ec2.BlockDeviceMapping{
-- {DeviceName: "/dev/sda1", SnapshotId: "snap-a08912c9", DeleteOnTermination: true},
-- },
-- }
+-// EachInter calls the specified callback for each object
+-// in the []interface{}.
+-//
+-// Panics if the object is the wrong type.
+-func (v *Value) EachInter(callback func(int, interface{}) bool) *Value {
-
-- resp, err := s.ec2.ModifyInstance("i-2ba64342", &options)
-- req := testServer.WaitRequest()
+- for index, val := range v.MustInterSlice() {
+- carryon := callback(index, val)
+- if carryon == false {
+- break
+- }
+- }
-
-- c.Assert(req.Form["Action"], DeepEquals, []string{"ModifyInstanceAttribute"})
-- c.Assert(req.Form["InstanceId"], DeepEquals, []string{"i-2ba64342"})
-- c.Assert(req.Form["InstanceType.Value"], DeepEquals, []string{"m1.small"})
-- c.Assert(req.Form["BlockDeviceMapping.1.DeviceName"], DeepEquals, []string{"/dev/sda1"})
-- c.Assert(req.Form["BlockDeviceMapping.1.Ebs.SnapshotId"], DeepEquals, []string{"snap-a08912c9"})
-- c.Assert(req.Form["BlockDeviceMapping.1.Ebs.DeleteOnTermination"], DeepEquals, []string{"true"})
-- c.Assert(req.Form["DisableApiTermination.Value"], DeepEquals, []string{"true"})
-- c.Assert(req.Form["EbsOptimized"], DeepEquals, []string{"true"})
-- c.Assert(req.Form["GroupId.1"], DeepEquals, []string{"g1"})
-- c.Assert(req.Form["GroupId.2"], DeepEquals, []string{"g2"})
-- c.Assert(req.Form["InstanceInitiatedShutdownBehavior.Value"], DeepEquals, []string{"terminate"})
-- c.Assert(req.Form["Kernel.Value"], DeepEquals, []string{"kernel-id"})
-- c.Assert(req.Form["Ramdisk.Value"], DeepEquals, []string{"ramdisk-id"})
-- c.Assert(req.Form["SourceDestCheck.Value"], DeepEquals, []string{"true"})
-- c.Assert(req.Form["SriovNetSupport.Value"], DeepEquals, []string{"simple"})
-- c.Assert(req.Form["UserData"], DeepEquals, []string{"MTIzNA=="})
+- return v
-
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
-}
-
--func (s *S) TestCreateVpc(c *C) {
-- testServer.Response(200, nil, CreateVpcExample)
+-// WhereInter uses the specified decider function to select items
+-// from the []interface{}. The object contained in the result will contain
+-// only the selected items.
+-func (v *Value) WhereInter(decider func(int, interface{}) bool) *Value {
-
-- options := &ec2.CreateVpc{
-- CidrBlock: "foo",
-- }
+- var selected []interface{}
-
-- resp, err := s.ec2.CreateVpc(options)
+- v.EachInter(func(index int, val interface{}) bool {
+- shouldSelect := decider(index, val)
+- if shouldSelect == false {
+- selected = append(selected, val)
+- }
+- return true
+- })
-
-- req := testServer.WaitRequest()
-- c.Assert(req.Form["CidrBlock"], DeepEquals, []string{"foo"})
+- return &Value{data: selected}
-
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "7a62c49f-347e-4fc4-9331-6e8eEXAMPLE")
-- c.Assert(resp.VPC.VpcId, Equals, "vpc-1a2b3c4d")
-- c.Assert(resp.VPC.State, Equals, "pending")
-- c.Assert(resp.VPC.CidrBlock, Equals, "10.0.0.0/16")
-- c.Assert(resp.VPC.DHCPOptionsID, Equals, "dopt-1a2b3c4d2")
-- c.Assert(resp.VPC.InstanceTenancy, Equals, "default")
-}
-
--func (s *S) TestDescribeVpcs(c *C) {
-- testServer.Response(200, nil, DescribeVpcsExample)
+-// GroupInter uses the specified grouper function to group the items
+-// keyed by the return of the grouper. The object contained in the
+-// result will contain a map[string][]interface{}.
+-func (v *Value) GroupInter(grouper func(int, interface{}) string) *Value {
-
-- filter := ec2.NewFilter()
-- filter.Add("key1", "value1")
-- filter.Add("key2", "value2", "value3")
+- groups := make(map[string][]interface{})
-
-- resp, err := s.ec2.DescribeVpcs([]string{"id1", "id2"}, filter)
+- v.EachInter(func(index int, val interface{}) bool {
+- group := grouper(index, val)
+- if _, ok := groups[group]; !ok {
+- groups[group] = make([]interface{}, 0)
+- }
+- groups[group] = append(groups[group], val)
+- return true
+- })
-
-- req := testServer.WaitRequest()
-- c.Assert(req.Form["Action"], DeepEquals, []string{"DescribeVpcs"})
-- c.Assert(req.Form["VpcId.1"], DeepEquals, []string{"id1"})
-- c.Assert(req.Form["VpcId.2"], DeepEquals, []string{"id2"})
-- c.Assert(req.Form["Filter.1.Name"], DeepEquals, []string{"key1"})
-- c.Assert(req.Form["Filter.1.Value.1"], DeepEquals, []string{"value1"})
-- c.Assert(req.Form["Filter.1.Value.2"], IsNil)
-- c.Assert(req.Form["Filter.2.Name"], DeepEquals, []string{"key2"})
-- c.Assert(req.Form["Filter.2.Value.1"], DeepEquals, []string{"value2"})
-- c.Assert(req.Form["Filter.2.Value.2"], DeepEquals, []string{"value3"})
+- return &Value{data: groups}
-
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "7a62c49f-347e-4fc4-9331-6e8eEXAMPLE")
-- c.Assert(resp.VPCs, HasLen, 1)
-}
-
--func (s *S) TestCreateSubnet(c *C) {
-- testServer.Response(200, nil, CreateSubnetExample)
+-// ReplaceInter uses the specified function to replace each interface{}s
+-// by iterating each item. The data in the returned result will be a
+-// []interface{} containing the replaced items.
+-func (v *Value) ReplaceInter(replacer func(int, interface{}) interface{}) *Value {
-
-- options := &ec2.CreateSubnet{
-- AvailabilityZone: "baz",
-- CidrBlock: "foo",
-- VpcId: "bar",
-- }
+- arr := v.MustInterSlice()
+- replaced := make([]interface{}, len(arr))
-
-- resp, err := s.ec2.CreateSubnet(options)
+- v.EachInter(func(index int, val interface{}) bool {
+- replaced[index] = replacer(index, val)
+- return true
+- })
-
-- req := testServer.WaitRequest()
-- c.Assert(req.Form["VpcId"], DeepEquals, []string{"bar"})
-- c.Assert(req.Form["CidrBlock"], DeepEquals, []string{"foo"})
-- c.Assert(req.Form["AvailabilityZone"], DeepEquals, []string{"baz"})
+- return &Value{data: replaced}
-
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "7a62c49f-347e-4fc4-9331-6e8eEXAMPLE")
-- c.Assert(resp.Subnet.SubnetId, Equals, "subnet-9d4a7b6c")
-- c.Assert(resp.Subnet.State, Equals, "pending")
-- c.Assert(resp.Subnet.VpcId, Equals, "vpc-1a2b3c4d")
-- c.Assert(resp.Subnet.CidrBlock, Equals, "10.0.1.0/24")
-- c.Assert(resp.Subnet.AvailableIpAddressCount, Equals, 251)
-}
-
--func (s *S) TestResetImageAttribute(c *C) {
-- testServer.Response(200, nil, ResetImageAttributeExample)
+-// CollectInter uses the specified collector function to collect a value
+-// for each of the interface{}s in the slice. The data returned will be a
+-// []interface{}.
+-func (v *Value) CollectInter(collector func(int, interface{}) interface{}) *Value {
-
-- options := ec2.ResetImageAttribute{Attribute: "launchPermission"}
-- resp, err := s.ec2.ResetImageAttribute("i-2ba64342", &options)
+- arr := v.MustInterSlice()
+- collected := make([]interface{}, len(arr))
-
-- req := testServer.WaitRequest()
-- c.Assert(req.Form["Action"], DeepEquals, []string{"ResetImageAttribute"})
+- v.EachInter(func(index int, val interface{}) bool {
+- collected[index] = collector(index, val)
+- return true
+- })
-
-- c.Assert(err, IsNil)
-- c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
+- return &Value{data: collected}
-}
-diff --git a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/ec2i_test.go b/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/ec2i_test.go
-deleted file mode 100644
-index 3773041..0000000
---- a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/ec2i_test.go
-+++ /dev/null
-@@ -1,203 +0,0 @@
--package ec2_test
-
--import (
-- "crypto/rand"
-- "fmt"
-- "github.com/mitchellh/goamz/aws"
-- "github.com/mitchellh/goamz/ec2"
-- "github.com/mitchellh/goamz/testutil"
-- . "github.com/motain/gocheck"
--)
+-/*
+- MSI (map[string]interface{} and []map[string]interface{})
+- --------------------------------------------------
+-*/
-
--// AmazonServer represents an Amazon EC2 server.
--type AmazonServer struct {
-- auth aws.Auth
+-// MSI gets the value as a map[string]interface{}, returns the optionalDefault
+-// value or a system default object if the value is the wrong type.
+-func (v *Value) MSI(optionalDefault ...map[string]interface{}) map[string]interface{} {
+- if s, ok := v.data.(map[string]interface{}); ok {
+- return s
+- }
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
+- }
+- return nil
-}
-
--func (s *AmazonServer) SetUp(c *C) {
-- auth, err := aws.EnvAuth()
-- if err != nil {
-- c.Fatal(err.Error())
+-// MustMSI gets the value as a map[string]interface{}.
+-//
+-// Panics if the object is not a map[string]interface{}.
+-func (v *Value) MustMSI() map[string]interface{} {
+- return v.data.(map[string]interface{})
+-}
+-
+-// MSISlice gets the value as a []map[string]interface{}, returns the optionalDefault
+-// value or nil if the value is not a []map[string]interface{}.
+-func (v *Value) MSISlice(optionalDefault ...[]map[string]interface{}) []map[string]interface{} {
+- if s, ok := v.data.([]map[string]interface{}); ok {
+- return s
- }
-- s.auth = auth
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
+- }
+- return nil
-}
-
--// Suite cost per run: 0.02 USD
--var _ = Suite(&AmazonClientSuite{})
+-// MustMSISlice gets the value as a []map[string]interface{}.
+-//
+-// Panics if the object is not a []map[string]interface{}.
+-func (v *Value) MustMSISlice() []map[string]interface{} {
+- return v.data.([]map[string]interface{})
+-}
-
--// AmazonClientSuite tests the client against a live EC2 server.
--type AmazonClientSuite struct {
-- srv AmazonServer
-- ClientTests
+-// IsMSI gets whether the object contained is a map[string]interface{} or not.
+-func (v *Value) IsMSI() bool {
+- _, ok := v.data.(map[string]interface{})
+- return ok
-}
-
--func (s *AmazonClientSuite) SetUpSuite(c *C) {
-- if !testutil.Amazon {
-- c.Skip("AmazonClientSuite tests not enabled")
+-// IsMSISlice gets whether the object contained is a []map[string]interface{} or not.
+-func (v *Value) IsMSISlice() bool {
+- _, ok := v.data.([]map[string]interface{})
+- return ok
+-}
+-
+-// EachMSI calls the specified callback for each object
+-// in the []map[string]interface{}.
+-//
+-// Panics if the object is the wrong type.
+-func (v *Value) EachMSI(callback func(int, map[string]interface{}) bool) *Value {
+-
+- for index, val := range v.MustMSISlice() {
+- carryon := callback(index, val)
+- if carryon == false {
+- break
+- }
- }
-- s.srv.SetUp(c)
-- s.ec2 = ec2.NewWithClient(s.srv.auth, aws.USEast, testutil.DefaultClient)
--}
-
--// ClientTests defines integration tests designed to test the client.
--// It is not used as a test suite in itself, but embedded within
--// another type.
--type ClientTests struct {
-- ec2 *ec2.EC2
+- return v
+-
-}
-
--var imageId = "ami-ccf405a5" // Ubuntu Maverick, i386, EBS store
+-// WhereMSI uses the specified decider function to select items
+-// from the []map[string]interface{}. The object contained in the result will contain
+-// only the selected items.
+-func (v *Value) WhereMSI(decider func(int, map[string]interface{}) bool) *Value {
-
--// Cost: 0.00 USD
--func (s *ClientTests) TestRunInstancesError(c *C) {
-- options := ec2.RunInstances{
-- ImageId: "ami-a6f504cf", // Ubuntu Maverick, i386, instance store
-- InstanceType: "t1.micro", // Doesn't work with micro, results in 400.
-- }
+- var selected []map[string]interface{}
-
-- resp, err := s.ec2.RunInstances(&options)
+- v.EachMSI(func(index int, val map[string]interface{}) bool {
+- shouldSelect := decider(index, val)
+- if shouldSelect == false {
+- selected = append(selected, val)
+- }
+- return true
+- })
-
-- c.Assert(resp, IsNil)
-- c.Assert(err, ErrorMatches, "AMI.*root device.*not supported.*")
+- return &Value{data: selected}
-
-- ec2err, ok := err.(*ec2.Error)
-- c.Assert(ok, Equals, true)
-- c.Assert(ec2err.StatusCode, Equals, 400)
-- c.Assert(ec2err.Code, Equals, "UnsupportedOperation")
-- c.Assert(ec2err.Message, Matches, "AMI.*root device.*not supported.*")
-- c.Assert(ec2err.RequestId, Matches, ".+")
-}
-
--// Cost: 0.02 USD
--func (s *ClientTests) TestRunAndTerminate(c *C) {
-- options := ec2.RunInstances{
-- ImageId: imageId,
-- InstanceType: "t1.micro",
-- }
-- resp1, err := s.ec2.RunInstances(&options)
-- c.Assert(err, IsNil)
-- c.Check(resp1.ReservationId, Matches, "r-[0-9a-f]*")
-- c.Check(resp1.OwnerId, Matches, "[0-9]+")
-- c.Check(resp1.Instances, HasLen, 1)
-- c.Check(resp1.Instances[0].InstanceType, Equals, "t1.micro")
+-// GroupMSI uses the specified grouper function to group the items
+-// keyed by the return of the grouper. The object contained in the
+-// result will contain a map[string][]map[string]interface{}.
+-func (v *Value) GroupMSI(grouper func(int, map[string]interface{}) string) *Value {
-
-- instId := resp1.Instances[0].InstanceId
+- groups := make(map[string][]map[string]interface{})
-
-- resp2, err := s.ec2.Instances([]string{instId}, nil)
-- c.Assert(err, IsNil)
-- if c.Check(resp2.Reservations, HasLen, 1) && c.Check(len(resp2.Reservations[0].Instances), Equals, 1) {
-- inst := resp2.Reservations[0].Instances[0]
-- c.Check(inst.InstanceId, Equals, instId)
-- }
+- v.EachMSI(func(index int, val map[string]interface{}) bool {
+- group := grouper(index, val)
+- if _, ok := groups[group]; !ok {
+- groups[group] = make([]map[string]interface{}, 0)
+- }
+- groups[group] = append(groups[group], val)
+- return true
+- })
+-
+- return &Value{data: groups}
-
-- resp3, err := s.ec2.TerminateInstances([]string{instId})
-- c.Assert(err, IsNil)
-- c.Check(resp3.StateChanges, HasLen, 1)
-- c.Check(resp3.StateChanges[0].InstanceId, Equals, instId)
-- c.Check(resp3.StateChanges[0].CurrentState.Name, Equals, "shutting-down")
-- c.Check(resp3.StateChanges[0].CurrentState.Code, Equals, 32)
-}
-
--// Cost: 0.00 USD
--func (s *ClientTests) TestSecurityGroups(c *C) {
-- name := "goamz-test"
-- descr := "goamz security group for tests"
+-// ReplaceMSI uses the specified function to replace each map[string]interface{}s
+-// by iterating each item. The data in the returned result will be a
+-// []map[string]interface{} containing the replaced items.
+-func (v *Value) ReplaceMSI(replacer func(int, map[string]interface{}) map[string]interface{}) *Value {
-
-- // Clean it up, if a previous test left it around and avoid leaving it around.
-- s.ec2.DeleteSecurityGroup(ec2.SecurityGroup{Name: name})
-- defer s.ec2.DeleteSecurityGroup(ec2.SecurityGroup{Name: name})
+- arr := v.MustMSISlice()
+- replaced := make([]map[string]interface{}, len(arr))
-
-- resp1, err := s.ec2.CreateSecurityGroup(ec2.SecurityGroup{Name: name, Description: descr})
-- c.Assert(err, IsNil)
-- c.Assert(resp1.RequestId, Matches, ".+")
-- c.Assert(resp1.Name, Equals, name)
-- c.Assert(resp1.Id, Matches, ".+")
+- v.EachMSI(func(index int, val map[string]interface{}) bool {
+- replaced[index] = replacer(index, val)
+- return true
+- })
-
-- resp1, err = s.ec2.CreateSecurityGroup(ec2.SecurityGroup{Name: name, Description: descr})
-- ec2err, _ := err.(*ec2.Error)
-- c.Assert(resp1, IsNil)
-- c.Assert(ec2err, NotNil)
-- c.Assert(ec2err.Code, Equals, "InvalidGroup.Duplicate")
+- return &Value{data: replaced}
-
-- perms := []ec2.IPPerm{{
-- Protocol: "tcp",
-- FromPort: 0,
-- ToPort: 1024,
-- SourceIPs: []string{"127.0.0.1/24"},
-- }}
+-}
-
-- resp2, err := s.ec2.AuthorizeSecurityGroup(ec2.SecurityGroup{Name: name}, perms)
-- c.Assert(err, IsNil)
-- c.Assert(resp2.RequestId, Matches, ".+")
+-// CollectMSI uses the specified collector function to collect a value
+-// for each of the map[string]interface{}s in the slice. The data returned will be a
+-// []interface{}.
+-func (v *Value) CollectMSI(collector func(int, map[string]interface{}) interface{}) *Value {
-
-- resp3, err := s.ec2.SecurityGroups(ec2.SecurityGroupNames(name), nil)
-- c.Assert(err, IsNil)
-- c.Assert(resp3.RequestId, Matches, ".+")
-- c.Assert(resp3.Groups, HasLen, 1)
+- arr := v.MustMSISlice()
+- collected := make([]interface{}, len(arr))
-
-- g0 := resp3.Groups[0]
-- c.Assert(g0.Name, Equals, name)
-- c.Assert(g0.Description, Equals, descr)
-- c.Assert(g0.IPPerms, HasLen, 1)
-- c.Assert(g0.IPPerms[0].Protocol, Equals, "tcp")
-- c.Assert(g0.IPPerms[0].FromPort, Equals, 0)
-- c.Assert(g0.IPPerms[0].ToPort, Equals, 1024)
-- c.Assert(g0.IPPerms[0].SourceIPs, DeepEquals, []string{"127.0.0.1/24"})
+- v.EachMSI(func(index int, val map[string]interface{}) bool {
+- collected[index] = collector(index, val)
+- return true
+- })
-
-- resp2, err = s.ec2.DeleteSecurityGroup(ec2.SecurityGroup{Name: name})
-- c.Assert(err, IsNil)
-- c.Assert(resp2.RequestId, Matches, ".+")
+- return &Value{data: collected}
-}
-
--var sessionId = func() string {
-- buf := make([]byte, 8)
-- // if we have no randomness, we'll just make do, so ignore the error.
-- rand.Read(buf)
-- return fmt.Sprintf("%x", buf)
--}()
+-/*
+- ObjxMap ((Map) and [](Map))
+- --------------------------------------------------
+-*/
-
--// sessionName reutrns a name that is probably
--// unique to this test session.
--func sessionName(prefix string) string {
-- return prefix + "-" + sessionId
+-// ObjxMap gets the value as a (Map), returns the optionalDefault
+-// value or a system default object if the value is the wrong type.
+-func (v *Value) ObjxMap(optionalDefault ...(Map)) Map {
+- if s, ok := v.data.((Map)); ok {
+- return s
+- }
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
+- }
+- return New(nil)
-}
-
--var allRegions = []aws.Region{
-- aws.USEast,
-- aws.USWest,
-- aws.EUWest,
-- aws.APSoutheast,
-- aws.APNortheast,
+-// MustObjxMap gets the value as a (Map).
+-//
+-// Panics if the object is not a (Map).
+-func (v *Value) MustObjxMap() Map {
+- return v.data.((Map))
-}
-
--// Communicate with all EC2 endpoints to see if they are alive.
--func (s *ClientTests) TestRegions(c *C) {
-- name := sessionName("goamz-region-test")
-- perms := []ec2.IPPerm{{
-- Protocol: "tcp",
-- FromPort: 80,
-- ToPort: 80,
-- SourceIPs: []string{"127.0.0.1/32"},
-- }}
-- errs := make(chan error, len(allRegions))
-- for _, region := range allRegions {
-- go func(r aws.Region) {
-- e := ec2.NewWithClient(s.ec2.Auth, r, testutil.DefaultClient)
-- _, err := e.AuthorizeSecurityGroup(ec2.SecurityGroup{Name: name}, perms)
-- errs <- err
-- }(region)
+-// ObjxMapSlice gets the value as a [](Map), returns the optionalDefault
+-// value or nil if the value is not a [](Map).
+-func (v *Value) ObjxMapSlice(optionalDefault ...[](Map)) [](Map) {
+- if s, ok := v.data.([](Map)); ok {
+- return s
- }
-- for _ = range allRegions {
-- err := <-errs
-- if err != nil {
-- ec2_err, ok := err.(*ec2.Error)
-- if ok {
-- c.Check(ec2_err.Code, Matches, "InvalidGroup.NotFound")
-- } else {
-- c.Errorf("Non-EC2 error: %s", err)
-- }
-- } else {
-- c.Errorf("Test should have errored but it seems to have succeeded")
-- }
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
- }
+- return nil
-}
-diff --git a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/ec2t_test.go b/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/ec2t_test.go
-deleted file mode 100644
-index fe50356..0000000
---- a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/ec2t_test.go
-+++ /dev/null
-@@ -1,580 +0,0 @@
--package ec2_test
--
--import (
-- "fmt"
-- "github.com/mitchellh/goamz/aws"
-- "github.com/mitchellh/goamz/ec2"
-- "github.com/mitchellh/goamz/ec2/ec2test"
-- "github.com/mitchellh/goamz/testutil"
-- . "github.com/motain/gocheck"
-- "regexp"
-- "sort"
--)
-
--// LocalServer represents a local ec2test fake server.
--type LocalServer struct {
-- auth aws.Auth
-- region aws.Region
-- srv *ec2test.Server
+-// MustObjxMapSlice gets the value as a [](Map).
+-//
+-// Panics if the object is not a [](Map).
+-func (v *Value) MustObjxMapSlice() [](Map) {
+- return v.data.([](Map))
-}
-
--func (s *LocalServer) SetUp(c *C) {
-- srv, err := ec2test.NewServer()
-- c.Assert(err, IsNil)
-- c.Assert(srv, NotNil)
--
-- s.srv = srv
-- s.region = aws.Region{EC2Endpoint: srv.URL()}
+-// IsObjxMap gets whether the object contained is a (Map) or not.
+-func (v *Value) IsObjxMap() bool {
+- _, ok := v.data.((Map))
+- return ok
-}
-
--// LocalServerSuite defines tests that will run
--// against the local ec2test server. It includes
--// selected tests from ClientTests;
--// when the ec2test functionality is sufficient, it should
--// include all of them, and ClientTests can be simply embedded.
--type LocalServerSuite struct {
-- srv LocalServer
-- ServerTests
-- clientTests ClientTests
+-// IsObjxMapSlice gets whether the object contained is a [](Map) or not.
+-func (v *Value) IsObjxMapSlice() bool {
+- _, ok := v.data.([](Map))
+- return ok
-}
-
--var _ = Suite(&LocalServerSuite{})
+-// EachObjxMap calls the specified callback for each object
+-// in the [](Map).
+-//
+-// Panics if the object is the wrong type.
+-func (v *Value) EachObjxMap(callback func(int, Map) bool) *Value {
-
--func (s *LocalServerSuite) SetUpSuite(c *C) {
-- s.srv.SetUp(c)
-- s.ServerTests.ec2 = ec2.NewWithClient(s.srv.auth, s.srv.region, testutil.DefaultClient)
-- s.clientTests.ec2 = ec2.NewWithClient(s.srv.auth, s.srv.region, testutil.DefaultClient)
--}
+- for index, val := range v.MustObjxMapSlice() {
+- carryon := callback(index, val)
+- if carryon == false {
+- break
+- }
+- }
-
--func (s *LocalServerSuite) TestRunAndTerminate(c *C) {
-- s.clientTests.TestRunAndTerminate(c)
--}
+- return v
-
--func (s *LocalServerSuite) TestSecurityGroups(c *C) {
-- s.clientTests.TestSecurityGroups(c)
-}
-
--// TestUserData is not defined on ServerTests because it
--// requires the ec2test server to function.
--func (s *LocalServerSuite) TestUserData(c *C) {
-- data := make([]byte, 256)
-- for i := range data {
-- data[i] = byte(i)
-- }
-- inst, err := s.ec2.RunInstances(&ec2.RunInstances{
-- ImageId: imageId,
-- InstanceType: "t1.micro",
-- UserData: data,
-- })
-- c.Assert(err, IsNil)
-- c.Assert(inst, NotNil)
-- c.Assert(inst.Instances[0].DNSName, Equals, inst.Instances[0].InstanceId+".example.com")
+-// WhereObjxMap uses the specified decider function to select items
+-// from the [](Map). The object contained in the result will contain
+-// only the selected items.
+-func (v *Value) WhereObjxMap(decider func(int, Map) bool) *Value {
-
-- id := inst.Instances[0].InstanceId
+- var selected [](Map)
-
-- defer s.ec2.TerminateInstances([]string{id})
+- v.EachObjxMap(func(index int, val Map) bool {
+- shouldSelect := decider(index, val)
+- if shouldSelect == false {
+- selected = append(selected, val)
+- }
+- return true
+- })
-
-- tinst := s.srv.srv.Instance(id)
-- c.Assert(tinst, NotNil)
-- c.Assert(tinst.UserData, DeepEquals, data)
--}
+- return &Value{data: selected}
-
--// AmazonServerSuite runs the ec2test server tests against a live EC2 server.
--// It will only be activated if the -all flag is specified.
--type AmazonServerSuite struct {
-- srv AmazonServer
-- ServerTests
-}
-
--var _ = Suite(&AmazonServerSuite{})
--
--func (s *AmazonServerSuite) SetUpSuite(c *C) {
-- if !testutil.Amazon {
-- c.Skip("AmazonServerSuite tests not enabled")
-- }
-- s.srv.SetUp(c)
-- s.ServerTests.ec2 = ec2.NewWithClient(s.srv.auth, aws.USEast, testutil.DefaultClient)
--}
+-// GroupObjxMap uses the specified grouper function to group the items
+-// keyed by the return of the grouper. The object contained in the
+-// result will contain a map[string][](Map).
+-func (v *Value) GroupObjxMap(grouper func(int, Map) string) *Value {
-
--// ServerTests defines a set of tests designed to test
--// the ec2test local fake ec2 server.
--// It is not used as a test suite in itself, but embedded within
--// another type.
--type ServerTests struct {
-- ec2 *ec2.EC2
--}
+- groups := make(map[string][](Map))
-
--func terminateInstances(c *C, e *ec2.EC2, insts []*ec2.Instance) {
-- var ids []string
-- for _, inst := range insts {
-- if inst != nil {
-- ids = append(ids, inst.InstanceId)
+- v.EachObjxMap(func(index int, val Map) bool {
+- group := grouper(index, val)
+- if _, ok := groups[group]; !ok {
+- groups[group] = make([](Map), 0)
- }
-- }
-- _, err := e.TerminateInstances(ids)
-- c.Check(err, IsNil, Commentf("%d INSTANCES LEFT RUNNING!!!", len(ids)))
--}
+- groups[group] = append(groups[group], val)
+- return true
+- })
-
--func (s *ServerTests) makeTestGroup(c *C, name, descr string) ec2.SecurityGroup {
-- // Clean it up if a previous test left it around.
-- _, err := s.ec2.DeleteSecurityGroup(ec2.SecurityGroup{Name: name})
-- if err != nil && err.(*ec2.Error).Code != "InvalidGroup.NotFound" {
-- c.Fatalf("delete security group: %v", err)
-- }
+- return &Value{data: groups}
-
-- resp, err := s.ec2.CreateSecurityGroup(ec2.SecurityGroup{Name: name, Description: descr})
-- c.Assert(err, IsNil)
-- c.Assert(resp.Name, Equals, name)
-- return resp.SecurityGroup
-}
-
--func (s *ServerTests) TestIPPerms(c *C) {
-- g0 := s.makeTestGroup(c, "goamz-test0", "ec2test group 0")
-- defer s.ec2.DeleteSecurityGroup(g0)
+-// ReplaceObjxMap uses the specified function to replace each (Map)s
+-// by iterating each item. The data in the returned result will be a
+-// [](Map) containing the replaced items.
+-func (v *Value) ReplaceObjxMap(replacer func(int, Map) Map) *Value {
-
-- g1 := s.makeTestGroup(c, "goamz-test1", "ec2test group 1")
-- defer s.ec2.DeleteSecurityGroup(g1)
+- arr := v.MustObjxMapSlice()
+- replaced := make([](Map), len(arr))
-
-- resp, err := s.ec2.SecurityGroups([]ec2.SecurityGroup{g0, g1}, nil)
-- c.Assert(err, IsNil)
-- c.Assert(resp.Groups, HasLen, 2)
-- c.Assert(resp.Groups[0].IPPerms, HasLen, 0)
-- c.Assert(resp.Groups[1].IPPerms, HasLen, 0)
+- v.EachObjxMap(func(index int, val Map) bool {
+- replaced[index] = replacer(index, val)
+- return true
+- })
-
-- ownerId := resp.Groups[0].OwnerId
+- return &Value{data: replaced}
-
-- // test some invalid parameters
-- // TODO more
-- _, err = s.ec2.AuthorizeSecurityGroup(g0, []ec2.IPPerm{{
-- Protocol: "tcp",
-- FromPort: 0,
-- ToPort: 1024,
-- SourceIPs: []string{"z127.0.0.1/24"},
-- }})
-- c.Assert(err, NotNil)
-- c.Check(err.(*ec2.Error).Code, Equals, "InvalidPermission.Malformed")
+-}
-
-- // Check that AuthorizeSecurityGroup adds the correct authorizations.
-- _, err = s.ec2.AuthorizeSecurityGroup(g0, []ec2.IPPerm{{
-- Protocol: "tcp",
-- FromPort: 2000,
-- ToPort: 2001,
-- SourceIPs: []string{"127.0.0.0/24"},
-- SourceGroups: []ec2.UserSecurityGroup{{
-- Name: g1.Name,
-- }, {
-- Id: g0.Id,
-- }},
-- }, {
-- Protocol: "tcp",
-- FromPort: 2000,
-- ToPort: 2001,
-- SourceIPs: []string{"200.1.1.34/32"},
-- }})
-- c.Assert(err, IsNil)
+-// CollectObjxMap uses the specified collector function to collect a value
+-// for each of the (Map)s in the slice. The data returned will be a
+-// []interface{}.
+-func (v *Value) CollectObjxMap(collector func(int, Map) interface{}) *Value {
-
-- resp, err = s.ec2.SecurityGroups([]ec2.SecurityGroup{g0}, nil)
-- c.Assert(err, IsNil)
-- c.Assert(resp.Groups, HasLen, 1)
-- c.Assert(resp.Groups[0].IPPerms, HasLen, 1)
+- arr := v.MustObjxMapSlice()
+- collected := make([]interface{}, len(arr))
-
-- perm := resp.Groups[0].IPPerms[0]
-- srcg := perm.SourceGroups
-- c.Assert(srcg, HasLen, 2)
+- v.EachObjxMap(func(index int, val Map) bool {
+- collected[index] = collector(index, val)
+- return true
+- })
-
-- // Normalize so we don't care about returned order.
-- if srcg[0].Name == g1.Name {
-- srcg[0], srcg[1] = srcg[1], srcg[0]
-- }
-- c.Check(srcg[0].Name, Equals, g0.Name)
-- c.Check(srcg[0].Id, Equals, g0.Id)
-- c.Check(srcg[0].OwnerId, Equals, ownerId)
-- c.Check(srcg[1].Name, Equals, g1.Name)
-- c.Check(srcg[1].Id, Equals, g1.Id)
-- c.Check(srcg[1].OwnerId, Equals, ownerId)
+- return &Value{data: collected}
+-}
-
-- sort.Strings(perm.SourceIPs)
-- c.Check(perm.SourceIPs, DeepEquals, []string{"127.0.0.0/24", "200.1.1.34/32"})
+-/*
+- Bool (bool and []bool)
+- --------------------------------------------------
+-*/
-
-- // Check that we can't delete g1 (because g0 is using it)
-- _, err = s.ec2.DeleteSecurityGroup(g1)
-- c.Assert(err, NotNil)
-- c.Check(err.(*ec2.Error).Code, Equals, "InvalidGroup.InUse")
+-// Bool gets the value as a bool, returns the optionalDefault
+-// value or a system default object if the value is the wrong type.
+-func (v *Value) Bool(optionalDefault ...bool) bool {
+- if s, ok := v.data.(bool); ok {
+- return s
+- }
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
+- }
+- return false
+-}
-
-- _, err = s.ec2.RevokeSecurityGroup(g0, []ec2.IPPerm{{
-- Protocol: "tcp",
-- FromPort: 2000,
-- ToPort: 2001,
-- SourceGroups: []ec2.UserSecurityGroup{{Id: g1.Id}},
-- }, {
-- Protocol: "tcp",
-- FromPort: 2000,
-- ToPort: 2001,
-- SourceIPs: []string{"200.1.1.34/32"},
-- }})
-- c.Assert(err, IsNil)
+-// MustBool gets the value as a bool.
+-//
+-// Panics if the object is not a bool.
+-func (v *Value) MustBool() bool {
+- return v.data.(bool)
+-}
-
-- resp, err = s.ec2.SecurityGroups([]ec2.SecurityGroup{g0}, nil)
-- c.Assert(err, IsNil)
-- c.Assert(resp.Groups, HasLen, 1)
-- c.Assert(resp.Groups[0].IPPerms, HasLen, 1)
+-// BoolSlice gets the value as a []bool, returns the optionalDefault
+-// value or nil if the value is not a []bool.
+-func (v *Value) BoolSlice(optionalDefault ...[]bool) []bool {
+- if s, ok := v.data.([]bool); ok {
+- return s
+- }
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
+- }
+- return nil
+-}
-
-- perm = resp.Groups[0].IPPerms[0]
-- srcg = perm.SourceGroups
-- c.Assert(srcg, HasLen, 1)
-- c.Check(srcg[0].Name, Equals, g0.Name)
-- c.Check(srcg[0].Id, Equals, g0.Id)
-- c.Check(srcg[0].OwnerId, Equals, ownerId)
+-// MustBoolSlice gets the value as a []bool.
+-//
+-// Panics if the object is not a []bool.
+-func (v *Value) MustBoolSlice() []bool {
+- return v.data.([]bool)
+-}
-
-- c.Check(perm.SourceIPs, DeepEquals, []string{"127.0.0.0/24"})
+-// IsBool gets whether the object contained is a bool or not.
+-func (v *Value) IsBool() bool {
+- _, ok := v.data.(bool)
+- return ok
+-}
-
-- // We should be able to delete g1 now because we've removed its only use.
-- _, err = s.ec2.DeleteSecurityGroup(g1)
-- c.Assert(err, IsNil)
+-// IsBoolSlice gets whether the object contained is a []bool or not.
+-func (v *Value) IsBoolSlice() bool {
+- _, ok := v.data.([]bool)
+- return ok
+-}
-
-- _, err = s.ec2.DeleteSecurityGroup(g0)
-- c.Assert(err, IsNil)
+-// EachBool calls the specified callback for each object
+-// in the []bool.
+-//
+-// Panics if the object is the wrong type.
+-func (v *Value) EachBool(callback func(int, bool) bool) *Value {
-
-- f := ec2.NewFilter()
-- f.Add("group-id", g0.Id, g1.Id)
-- resp, err = s.ec2.SecurityGroups(nil, f)
-- c.Assert(err, IsNil)
-- c.Assert(resp.Groups, HasLen, 0)
--}
+- for index, val := range v.MustBoolSlice() {
+- carryon := callback(index, val)
+- if carryon == false {
+- break
+- }
+- }
-
--func (s *ServerTests) TestDuplicateIPPerm(c *C) {
-- name := "goamz-test"
-- descr := "goamz security group for tests"
+- return v
-
-- // Clean it up, if a previous test left it around and avoid leaving it around.
-- s.ec2.DeleteSecurityGroup(ec2.SecurityGroup{Name: name})
-- defer s.ec2.DeleteSecurityGroup(ec2.SecurityGroup{Name: name})
+-}
-
-- resp1, err := s.ec2.CreateSecurityGroup(ec2.SecurityGroup{Name: name, Description: descr})
-- c.Assert(err, IsNil)
-- c.Assert(resp1.Name, Equals, name)
+-// WhereBool uses the specified decider function to select items
+-// from the []bool. The object contained in the result will contain
+-// only the selected items.
+-func (v *Value) WhereBool(decider func(int, bool) bool) *Value {
-
-- perms := []ec2.IPPerm{{
-- Protocol: "tcp",
-- FromPort: 200,
-- ToPort: 1024,
-- SourceIPs: []string{"127.0.0.1/24"},
-- }, {
-- Protocol: "tcp",
-- FromPort: 0,
-- ToPort: 100,
-- SourceIPs: []string{"127.0.0.1/24"},
-- }}
+- var selected []bool
-
-- _, err = s.ec2.AuthorizeSecurityGroup(ec2.SecurityGroup{Name: name}, perms[0:1])
-- c.Assert(err, IsNil)
+- v.EachBool(func(index int, val bool) bool {
+- shouldSelect := decider(index, val)
+- if shouldSelect == false {
+- selected = append(selected, val)
+- }
+- return true
+- })
-
-- _, err = s.ec2.AuthorizeSecurityGroup(ec2.SecurityGroup{Name: name}, perms[0:2])
-- c.Assert(err, ErrorMatches, `.*\(InvalidPermission.Duplicate\)`)
--}
+- return &Value{data: selected}
-
--type filterSpec struct {
-- name string
-- values []string
-}
-
--func (s *ServerTests) TestInstanceFiltering(c *C) {
-- groupResp, err := s.ec2.CreateSecurityGroup(ec2.SecurityGroup{Name: sessionName("testgroup1"), Description: "testgroup one description"})
-- c.Assert(err, IsNil)
-- group1 := groupResp.SecurityGroup
-- defer s.ec2.DeleteSecurityGroup(group1)
+-// GroupBool uses the specified grouper function to group the items
+-// keyed by the return of the grouper. The object contained in the
+-// result will contain a map[string][]bool.
+-func (v *Value) GroupBool(grouper func(int, bool) string) *Value {
-
-- groupResp, err = s.ec2.CreateSecurityGroup(ec2.SecurityGroup{Name: sessionName("testgroup2"), Description: "testgroup two description"})
-- c.Assert(err, IsNil)
-- group2 := groupResp.SecurityGroup
-- defer s.ec2.DeleteSecurityGroup(group2)
+- groups := make(map[string][]bool)
-
-- insts := make([]*ec2.Instance, 3)
-- inst, err := s.ec2.RunInstances(&ec2.RunInstances{
-- MinCount: 2,
-- ImageId: imageId,
-- InstanceType: "t1.micro",
-- SecurityGroups: []ec2.SecurityGroup{group1},
+- v.EachBool(func(index int, val bool) bool {
+- group := grouper(index, val)
+- if _, ok := groups[group]; !ok {
+- groups[group] = make([]bool, 0)
+- }
+- groups[group] = append(groups[group], val)
+- return true
- })
-- c.Assert(err, IsNil)
-- insts[0] = &inst.Instances[0]
-- insts[1] = &inst.Instances[1]
-- defer terminateInstances(c, s.ec2, insts)
-
-- imageId2 := "ami-e358958a" // Natty server, i386, EBS store
-- inst, err = s.ec2.RunInstances(&ec2.RunInstances{
-- ImageId: imageId2,
-- InstanceType: "t1.micro",
-- SecurityGroups: []ec2.SecurityGroup{group2},
+- return &Value{data: groups}
+-
+-}
+-
+-// ReplaceBool uses the specified function to replace each bools
+-// by iterating each item. The data in the returned result will be a
+-// []bool containing the replaced items.
+-func (v *Value) ReplaceBool(replacer func(int, bool) bool) *Value {
+-
+- arr := v.MustBoolSlice()
+- replaced := make([]bool, len(arr))
+-
+- v.EachBool(func(index int, val bool) bool {
+- replaced[index] = replacer(index, val)
+- return true
- })
-- c.Assert(err, IsNil)
-- insts[2] = &inst.Instances[0]
-
-- ids := func(indices ...int) (instIds []string) {
-- for _, index := range indices {
-- instIds = append(instIds, insts[index].InstanceId)
-- }
-- return
-- }
+- return &Value{data: replaced}
-
-- tests := []struct {
-- about string
-- instanceIds []string // instanceIds argument to Instances method.
-- filters []filterSpec // filters argument to Instances method.
-- resultIds []string // set of instance ids of expected results.
-- allowExtra bool // resultIds may be incomplete.
-- err string // expected error.
-- }{
-- {
-- about: "check that Instances returns all instances",
-- resultIds: ids(0, 1, 2),
-- allowExtra: true,
-- }, {
-- about: "check that specifying two instance ids returns them",
-- instanceIds: ids(0, 2),
-- resultIds: ids(0, 2),
-- }, {
-- about: "check that specifying a non-existent instance id gives an error",
-- instanceIds: append(ids(0), "i-deadbeef"),
-- err: `.*\(InvalidInstanceID\.NotFound\)`,
-- }, {
-- about: "check that a filter allowed both instances returns both of them",
-- filters: []filterSpec{
-- {"instance-id", ids(0, 2)},
-- },
-- resultIds: ids(0, 2),
-- }, {
-- about: "check that a filter allowing only one instance returns it",
-- filters: []filterSpec{
-- {"instance-id", ids(1)},
-- },
-- resultIds: ids(1),
-- }, {
-- about: "check that a filter allowing no instances returns none",
-- filters: []filterSpec{
-- {"instance-id", []string{"i-deadbeef12345"}},
-- },
-- }, {
-- about: "check that filtering on group id works",
-- filters: []filterSpec{
-- {"group-id", []string{group1.Id}},
-- },
-- resultIds: ids(0, 1),
-- }, {
-- about: "check that filtering on group name works",
-- filters: []filterSpec{
-- {"group-name", []string{group1.Name}},
-- },
-- resultIds: ids(0, 1),
-- }, {
-- about: "check that filtering on image id works",
-- filters: []filterSpec{
-- {"image-id", []string{imageId}},
-- },
-- resultIds: ids(0, 1),
-- allowExtra: true,
-- }, {
-- about: "combination filters 1",
-- filters: []filterSpec{
-- {"image-id", []string{imageId, imageId2}},
-- {"group-name", []string{group1.Name}},
-- },
-- resultIds: ids(0, 1),
-- }, {
-- about: "combination filters 2",
-- filters: []filterSpec{
-- {"image-id", []string{imageId2}},
-- {"group-name", []string{group1.Name}},
-- },
-- },
-- }
-- for i, t := range tests {
-- c.Logf("%d. %s", i, t.about)
-- var f *ec2.Filter
-- if t.filters != nil {
-- f = ec2.NewFilter()
-- for _, spec := range t.filters {
-- f.Add(spec.name, spec.values...)
-- }
-- }
-- resp, err := s.ec2.Instances(t.instanceIds, f)
-- if t.err != "" {
-- c.Check(err, ErrorMatches, t.err)
-- continue
-- }
-- c.Assert(err, IsNil)
-- insts := make(map[string]*ec2.Instance)
-- for _, r := range resp.Reservations {
-- for j := range r.Instances {
-- inst := &r.Instances[j]
-- c.Check(insts[inst.InstanceId], IsNil, Commentf("duplicate instance id: %q", inst.InstanceId))
-- insts[inst.InstanceId] = inst
-- }
-- }
-- if !t.allowExtra {
-- c.Check(insts, HasLen, len(t.resultIds), Commentf("expected %d instances got %#v", len(t.resultIds), insts))
-- }
-- for j, id := range t.resultIds {
-- c.Check(insts[id], NotNil, Commentf("instance id %d (%q) not found; got %#v", j, id, insts))
-- }
-- }
-}
-
--func idsOnly(gs []ec2.SecurityGroup) []ec2.SecurityGroup {
-- for i := range gs {
-- gs[i].Name = ""
-- }
-- return gs
--}
+-// CollectBool uses the specified collector function to collect a value
+-// for each of the bools in the slice. The data returned will be a
+-// []interface{}.
+-func (v *Value) CollectBool(collector func(int, bool) interface{}) *Value {
-
--func namesOnly(gs []ec2.SecurityGroup) []ec2.SecurityGroup {
-- for i := range gs {
-- gs[i].Id = ""
-- }
-- return gs
+- arr := v.MustBoolSlice()
+- collected := make([]interface{}, len(arr))
+-
+- v.EachBool(func(index int, val bool) bool {
+- collected[index] = collector(index, val)
+- return true
+- })
+-
+- return &Value{data: collected}
-}
-
--func (s *ServerTests) TestGroupFiltering(c *C) {
-- g := make([]ec2.SecurityGroup, 4)
-- for i := range g {
-- resp, err := s.ec2.CreateSecurityGroup(ec2.SecurityGroup{Name: sessionName(fmt.Sprintf("testgroup%d", i)), Description: fmt.Sprintf("testdescription%d", i)})
-- c.Assert(err, IsNil)
-- g[i] = resp.SecurityGroup
-- c.Logf("group %d: %v", i, g[i])
-- defer s.ec2.DeleteSecurityGroup(g[i])
-- }
+-/*
+- Str (string and []string)
+- --------------------------------------------------
+-*/
-
-- perms := [][]ec2.IPPerm{
-- {{
-- Protocol: "tcp",
-- FromPort: 100,
-- ToPort: 200,
-- SourceIPs: []string{"1.2.3.4/32"},
-- }},
-- {{
-- Protocol: "tcp",
-- FromPort: 200,
-- ToPort: 300,
-- SourceGroups: []ec2.UserSecurityGroup{{Id: g[1].Id}},
-- }},
-- {{
-- Protocol: "udp",
-- FromPort: 200,
-- ToPort: 400,
-- SourceGroups: []ec2.UserSecurityGroup{{Id: g[1].Id}},
-- }},
+-// Str gets the value as a string, returns the optionalDefault
+-// value or a system default object if the value is the wrong type.
+-func (v *Value) Str(optionalDefault ...string) string {
+- if s, ok := v.data.(string); ok {
+- return s
- }
-- for i, ps := range perms {
-- _, err := s.ec2.AuthorizeSecurityGroup(g[i], ps)
-- c.Assert(err, IsNil)
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
- }
+- return ""
+-}
-
-- groups := func(indices ...int) (gs []ec2.SecurityGroup) {
-- for _, index := range indices {
-- gs = append(gs, g[index])
-- }
-- return
-- }
+-// MustStr gets the value as a string.
+-//
+-// Panics if the object is not a string.
+-func (v *Value) MustStr() string {
+- return v.data.(string)
+-}
-
-- type groupTest struct {
-- about string
-- groups []ec2.SecurityGroup // groupIds argument to SecurityGroups method.
-- filters []filterSpec // filters argument to SecurityGroups method.
-- results []ec2.SecurityGroup // set of expected result groups.
-- allowExtra bool // specified results may be incomplete.
-- err string // expected error.
-- }
-- filterCheck := func(name, val string, gs []ec2.SecurityGroup) groupTest {
-- return groupTest{
-- about: "filter check " + name,
-- filters: []filterSpec{{name, []string{val}}},
-- results: gs,
-- allowExtra: true,
-- }
+-// StrSlice gets the value as a []string, returns the optionalDefault
+-// value or nil if the value is not a []string.
+-func (v *Value) StrSlice(optionalDefault ...[]string) []string {
+- if s, ok := v.data.([]string); ok {
+- return s
- }
-- tests := []groupTest{
-- {
-- about: "check that SecurityGroups returns all groups",
-- results: groups(0, 1, 2, 3),
-- allowExtra: true,
-- }, {
-- about: "check that specifying two group ids returns them",
-- groups: idsOnly(groups(0, 2)),
-- results: groups(0, 2),
-- }, {
-- about: "check that specifying names only works",
-- groups: namesOnly(groups(0, 2)),
-- results: groups(0, 2),
-- }, {
-- about: "check that specifying a non-existent group id gives an error",
-- groups: append(groups(0), ec2.SecurityGroup{Id: "sg-eeeeeeeee"}),
-- err: `.*\(InvalidGroup\.NotFound\)`,
-- }, {
-- about: "check that a filter allowed two groups returns both of them",
-- filters: []filterSpec{
-- {"group-id", []string{g[0].Id, g[2].Id}},
-- },
-- results: groups(0, 2),
-- },
-- {
-- about: "check that the previous filter works when specifying a list of ids",
-- groups: groups(1, 2),
-- filters: []filterSpec{
-- {"group-id", []string{g[0].Id, g[2].Id}},
-- },
-- results: groups(2),
-- }, {
-- about: "check that a filter allowing no groups returns none",
-- filters: []filterSpec{
-- {"group-id", []string{"sg-eeeeeeeee"}},
-- },
-- },
-- filterCheck("description", "testdescription1", groups(1)),
-- filterCheck("group-name", g[2].Name, groups(2)),
-- filterCheck("ip-permission.cidr", "1.2.3.4/32", groups(0)),
-- filterCheck("ip-permission.group-name", g[1].Name, groups(1, 2)),
-- filterCheck("ip-permission.protocol", "udp", groups(2)),
-- filterCheck("ip-permission.from-port", "200", groups(1, 2)),
-- filterCheck("ip-permission.to-port", "200", groups(0)),
-- // TODO owner-id
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
- }
-- for i, t := range tests {
-- c.Logf("%d. %s", i, t.about)
-- var f *ec2.Filter
-- if t.filters != nil {
-- f = ec2.NewFilter()
-- for _, spec := range t.filters {
-- f.Add(spec.name, spec.values...)
-- }
-- }
-- resp, err := s.ec2.SecurityGroups(t.groups, f)
-- if t.err != "" {
-- c.Check(err, ErrorMatches, t.err)
-- continue
-- }
-- c.Assert(err, IsNil)
-- groups := make(map[string]*ec2.SecurityGroup)
-- for j := range resp.Groups {
-- group := &resp.Groups[j].SecurityGroup
-- c.Check(groups[group.Id], IsNil, Commentf("duplicate group id: %q", group.Id))
+- return nil
+-}
-
-- groups[group.Id] = group
-- }
-- // If extra groups may be returned, eliminate all groups that
-- // we did not create in this session apart from the default group.
-- if t.allowExtra {
-- namePat := regexp.MustCompile(sessionName("testgroup[0-9]"))
-- for id, g := range groups {
-- if !namePat.MatchString(g.Name) {
-- delete(groups, id)
-- }
-- }
-- }
-- c.Check(groups, HasLen, len(t.results))
-- for j, g := range t.results {
-- rg := groups[g.Id]
-- c.Assert(rg, NotNil, Commentf("group %d (%v) not found; got %#v", j, g, groups))
-- c.Check(rg.Name, Equals, g.Name, Commentf("group %d (%v)", j, g))
-- }
-- }
+-// MustStrSlice gets the value as a []string.
+-//
+-// Panics if the object is not a []string.
+-func (v *Value) MustStrSlice() []string {
+- return v.data.([]string)
-}
-diff --git a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/ec2test/filter.go b/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/ec2test/filter.go
-deleted file mode 100644
-index 1a0c046..0000000
---- a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/ec2test/filter.go
-+++ /dev/null
-@@ -1,84 +0,0 @@
--package ec2test
-
--import (
-- "fmt"
-- "net/url"
-- "strings"
--)
+-// IsStr gets whether the object contained is a string or not.
+-func (v *Value) IsStr() bool {
+- _, ok := v.data.(string)
+- return ok
+-}
-
--// filter holds an ec2 filter. A filter maps an attribute to a set of
--// possible values for that attribute. For an item to pass through the
--// filter, every attribute of the item mentioned in the filter must match
--// at least one of its given values.
--type filter map[string][]string
+-// IsStrSlice gets whether the object contained is a []string or not.
+-func (v *Value) IsStrSlice() bool {
+- _, ok := v.data.([]string)
+- return ok
+-}
-
--// newFilter creates a new filter from the Filter fields in the url form.
--//
--// The filtering is specified through a map of name=>values, where the
--// name is a well-defined key identifying the data to be matched,
--// and the list of values holds the possible values the filtered
--// item can take for the key to be included in the
--// result set. For example:
--//
--// Filter.1.Name=instance-type
--// Filter.1.Value.1=m1.small
--// Filter.1.Value.2=m1.large
+-// EachStr calls the specified callback for each object
+-// in the []string.
-//
--func newFilter(form url.Values) filter {
-- // TODO return an error if the fields are not well formed?
-- names := make(map[int]string)
-- values := make(map[int][]string)
-- maxId := 0
-- for name, fvalues := range form {
-- var rest string
-- var id int
-- if x, _ := fmt.Sscanf(name, "Filter.%d.%s", &id, &rest); x != 2 {
-- continue
-- }
-- if id > maxId {
-- maxId = id
-- }
-- if rest == "Name" {
-- names[id] = fvalues[0]
-- continue
-- }
-- if !strings.HasPrefix(rest, "Value.") {
-- continue
+-// Panics if the object is the wrong type.
+-func (v *Value) EachStr(callback func(int, string) bool) *Value {
+-
+- for index, val := range v.MustStrSlice() {
+- carryon := callback(index, val)
+- if carryon == false {
+- break
- }
-- values[id] = append(values[id], fvalues[0])
- }
-
-- f := make(filter)
-- for id, name := range names {
-- f[name] = values[id]
-- }
-- return f
--}
+- return v
-
--func notDigit(r rune) bool {
-- return r < '0' || r > '9'
-}
-
--// filterable represents an object that can be passed through a filter.
--type filterable interface {
-- // matchAttr returns true if given attribute of the
-- // object matches value. It returns an error if the
-- // attribute is not recognised or the value is malformed.
-- matchAttr(attr, value string) (bool, error)
--}
+-// WhereStr uses the specified decider function to select items
+-// from the []string. The object contained in the result will contain
+-// only the selected items.
+-func (v *Value) WhereStr(decider func(int, string) bool) *Value {
-
--// ok returns true if x passes through the filter.
--func (f filter) ok(x filterable) (bool, error) {
--next:
-- for a, vs := range f {
-- for _, v := range vs {
-- if ok, err := x.matchAttr(a, v); ok {
-- continue next
-- } else if err != nil {
-- return false, fmt.Errorf("bad attribute or value %q=%q for type %T: %v", a, v, x, err)
-- }
+- var selected []string
+-
+- v.EachStr(func(index int, val string) bool {
+- shouldSelect := decider(index, val)
+- if shouldSelect == false {
+- selected = append(selected, val)
- }
-- return false, nil
-- }
-- return true, nil
+- return true
+- })
+-
+- return &Value{data: selected}
+-
-}
-diff --git a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/ec2test/server.go b/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/ec2test/server.go
-deleted file mode 100644
-index 2f24cb2..0000000
---- a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/ec2test/server.go
-+++ /dev/null
-@@ -1,993 +0,0 @@
--// The ec2test package implements a fake EC2 provider with
--// the capability of inducing errors on any given operation,
--// and retrospectively determining what operations have been
--// carried out.
--package ec2test
-
--import (
-- "encoding/base64"
-- "encoding/xml"
-- "fmt"
-- "github.com/mitchellh/goamz/ec2"
-- "io"
-- "net"
-- "net/http"
-- "net/url"
-- "regexp"
-- "strconv"
-- "strings"
-- "sync"
--)
+-// GroupStr uses the specified grouper function to group the items
+-// keyed by the return of the grouper. The object contained in the
+-// result will contain a map[string][]string.
+-func (v *Value) GroupStr(grouper func(int, string) string) *Value {
-
--var b64 = base64.StdEncoding
+- groups := make(map[string][]string)
-
--// Action represents a request that changes the ec2 state.
--type Action struct {
-- RequestId string
+- v.EachStr(func(index int, val string) bool {
+- group := grouper(index, val)
+- if _, ok := groups[group]; !ok {
+- groups[group] = make([]string, 0)
+- }
+- groups[group] = append(groups[group], val)
+- return true
+- })
-
-- // Request holds the requested action as a url.Values instance
-- Request url.Values
+- return &Value{data: groups}
-
-- // If the action succeeded, Response holds the value that
-- // was marshalled to build the XML response for the request.
-- Response interface{}
+-}
+-
+-// ReplaceStr uses the specified function to replace each strings
+-// by iterating each item. The data in the returned result will be a
+-// []string containing the replaced items.
+-func (v *Value) ReplaceStr(replacer func(int, string) string) *Value {
+-
+- arr := v.MustStrSlice()
+- replaced := make([]string, len(arr))
+-
+- v.EachStr(func(index int, val string) bool {
+- replaced[index] = replacer(index, val)
+- return true
+- })
+-
+- return &Value{data: replaced}
-
-- // If the action failed, Err holds an error giving details of the failure.
-- Err *ec2.Error
-}
-
--// TODO possible other things:
--// - some virtual time stamp interface, so a client
--// can ask for all actions after a certain virtual time.
+-// CollectStr uses the specified collector function to collect a value
+-// for each of the strings in the slice. The data returned will be a
+-// []interface{}.
+-func (v *Value) CollectStr(collector func(int, string) interface{}) *Value {
-
--// Server implements an EC2 simulator for use in testing.
--type Server struct {
-- url string
-- listener net.Listener
-- mu sync.Mutex
-- reqs []*Action
+- arr := v.MustStrSlice()
+- collected := make([]interface{}, len(arr))
-
-- instances map[string]*Instance // id -> instance
-- reservations map[string]*reservation // id -> reservation
-- groups map[string]*securityGroup // id -> group
-- maxId counter
-- reqId counter
-- reservationId counter
-- groupId counter
-- initialInstanceState ec2.InstanceState
+- v.EachStr(func(index int, val string) bool {
+- collected[index] = collector(index, val)
+- return true
+- })
+-
+- return &Value{data: collected}
-}
-
--// reservation holds a simulated ec2 reservation.
--type reservation struct {
-- id string
-- instances map[string]*Instance
-- groups []*securityGroup
+-/*
+- Int (int and []int)
+- --------------------------------------------------
+-*/
+-
+-// Int gets the value as a int, returns the optionalDefault
+-// value or a system default object if the value is the wrong type.
+-func (v *Value) Int(optionalDefault ...int) int {
+- if s, ok := v.data.(int); ok {
+- return s
+- }
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
+- }
+- return 0
-}
-
--// instance holds a simulated ec2 instance
--type Instance struct {
-- // UserData holds the data that was passed to the RunInstances request
-- // when the instance was started.
-- UserData []byte
-- id string
-- imageId string
-- reservation *reservation
-- instType string
-- state ec2.InstanceState
+-// MustInt gets the value as a int.
+-//
+-// Panics if the object is not a int.
+-func (v *Value) MustInt() int {
+- return v.data.(int)
-}
-
--// permKey represents permission for a given security
--// group or IP address (but not both) to access a given range of
--// ports. Equality of permKeys is used in the implementation of
--// permission sets, relying on the uniqueness of securityGroup
--// instances.
--type permKey struct {
-- protocol string
-- fromPort int
-- toPort int
-- group *securityGroup
-- ipAddr string
+-// IntSlice gets the value as a []int, returns the optionalDefault
+-// value or nil if the value is not a []int.
+-func (v *Value) IntSlice(optionalDefault ...[]int) []int {
+- if s, ok := v.data.([]int); ok {
+- return s
+- }
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
+- }
+- return nil
-}
-
--// securityGroup holds a simulated ec2 security group.
--// Instances of securityGroup should only be created through
--// Server.createSecurityGroup to ensure that groups can be
--// compared by pointer value.
--type securityGroup struct {
-- id string
-- name string
-- description string
+-// MustIntSlice gets the value as a []int.
+-//
+-// Panics if the object is not a []int.
+-func (v *Value) MustIntSlice() []int {
+- return v.data.([]int)
+-}
-
-- perms map[permKey]bool
+-// IsInt gets whether the object contained is a int or not.
+-func (v *Value) IsInt() bool {
+- _, ok := v.data.(int)
+- return ok
-}
-
--func (g *securityGroup) ec2SecurityGroup() ec2.SecurityGroup {
-- return ec2.SecurityGroup{
-- Name: g.name,
-- Id: g.id,
-- }
+-// IsIntSlice gets whether the object contained is a []int or not.
+-func (v *Value) IsIntSlice() bool {
+- _, ok := v.data.([]int)
+- return ok
-}
-
--func (g *securityGroup) matchAttr(attr, value string) (ok bool, err error) {
-- switch attr {
-- case "description":
-- return g.description == value, nil
-- case "group-id":
-- return g.id == value, nil
-- case "group-name":
-- return g.name == value, nil
-- case "ip-permission.cidr":
-- return g.hasPerm(func(k permKey) bool { return k.ipAddr == value }), nil
-- case "ip-permission.group-name":
-- return g.hasPerm(func(k permKey) bool {
-- return k.group != nil && k.group.name == value
-- }), nil
-- case "ip-permission.from-port":
-- port, err := strconv.Atoi(value)
-- if err != nil {
-- return false, err
-- }
-- return g.hasPerm(func(k permKey) bool { return k.fromPort == port }), nil
-- case "ip-permission.to-port":
-- port, err := strconv.Atoi(value)
-- if err != nil {
-- return false, err
+-// EachInt calls the specified callback for each object
+-// in the []int.
+-//
+-// Panics if the object is the wrong type.
+-func (v *Value) EachInt(callback func(int, int) bool) *Value {
+-
+- for index, val := range v.MustIntSlice() {
+- carryon := callback(index, val)
+- if carryon == false {
+- break
- }
-- return g.hasPerm(func(k permKey) bool { return k.toPort == port }), nil
-- case "ip-permission.protocol":
-- return g.hasPerm(func(k permKey) bool { return k.protocol == value }), nil
-- case "owner-id":
-- return value == ownerId, nil
- }
-- return false, fmt.Errorf("unknown attribute %q", attr)
+-
+- return v
+-
-}
-
--func (g *securityGroup) hasPerm(test func(k permKey) bool) bool {
-- for k := range g.perms {
-- if test(k) {
-- return true
+-// WhereInt uses the specified decider function to select items
+-// from the []int. The object contained in the result will contain
+-// only the selected items.
+-func (v *Value) WhereInt(decider func(int, int) bool) *Value {
+-
+- var selected []int
+-
+- v.EachInt(func(index int, val int) bool {
+- shouldSelect := decider(index, val)
+- if shouldSelect == false {
+- selected = append(selected, val)
- }
-- }
-- return false
+- return true
+- })
+-
+- return &Value{data: selected}
+-
-}
-
--// ec2Perms returns the list of EC2 permissions granted
--// to g. It groups permissions by port range and protocol.
--func (g *securityGroup) ec2Perms() (perms []ec2.IPPerm) {
-- // The grouping is held in result. We use permKey for convenience,
-- // (ensuring that the group and ipAddr of each key is zero). For
-- // each protocol/port range combination, we build up the permission
-- // set in the associated value.
-- result := make(map[permKey]*ec2.IPPerm)
-- for k := range g.perms {
-- groupKey := k
-- groupKey.group = nil
-- groupKey.ipAddr = ""
+-// GroupInt uses the specified grouper function to group the items
+-// keyed by the return of the grouper. The object contained in the
+-// result will contain a map[string][]int.
+-func (v *Value) GroupInt(grouper func(int, int) string) *Value {
-
-- ec2p := result[groupKey]
-- if ec2p == nil {
-- ec2p = &ec2.IPPerm{
-- Protocol: k.protocol,
-- FromPort: k.fromPort,
-- ToPort: k.toPort,
-- }
-- result[groupKey] = ec2p
-- }
-- if k.group != nil {
-- ec2p.SourceGroups = append(ec2p.SourceGroups,
-- ec2.UserSecurityGroup{
-- Id: k.group.id,
-- Name: k.group.name,
-- OwnerId: ownerId,
-- })
-- } else {
-- ec2p.SourceIPs = append(ec2p.SourceIPs, k.ipAddr)
+- groups := make(map[string][]int)
+-
+- v.EachInt(func(index int, val int) bool {
+- group := grouper(index, val)
+- if _, ok := groups[group]; !ok {
+- groups[group] = make([]int, 0)
- }
-- }
-- for _, ec2p := range result {
-- perms = append(perms, *ec2p)
-- }
-- return
+- groups[group] = append(groups[group], val)
+- return true
+- })
+-
+- return &Value{data: groups}
+-
-}
-
--var actions = map[string]func(*Server, http.ResponseWriter, *http.Request, string) interface{}{
-- "RunInstances": (*Server).runInstances,
-- "TerminateInstances": (*Server).terminateInstances,
-- "DescribeInstances": (*Server).describeInstances,
-- "CreateSecurityGroup": (*Server).createSecurityGroup,
-- "DescribeSecurityGroups": (*Server).describeSecurityGroups,
-- "DeleteSecurityGroup": (*Server).deleteSecurityGroup,
-- "AuthorizeSecurityGroupIngress": (*Server).authorizeSecurityGroupIngress,
-- "RevokeSecurityGroupIngress": (*Server).revokeSecurityGroupIngress,
+-// ReplaceInt uses the specified function to replace each ints
+-// by iterating each item. The data in the returned result will be a
+-// []int containing the replaced items.
+-func (v *Value) ReplaceInt(replacer func(int, int) int) *Value {
+-
+- arr := v.MustIntSlice()
+- replaced := make([]int, len(arr))
+-
+- v.EachInt(func(index int, val int) bool {
+- replaced[index] = replacer(index, val)
+- return true
+- })
+-
+- return &Value{data: replaced}
+-
-}
-
--const ownerId = "9876"
+-// CollectInt uses the specified collector function to collect a value
+-// for each of the ints in the slice. The data returned will be a
+-// []interface{}.
+-func (v *Value) CollectInt(collector func(int, int) interface{}) *Value {
-
--// newAction allocates a new action and adds it to the
--// recorded list of server actions.
--func (srv *Server) newAction() *Action {
-- srv.mu.Lock()
-- defer srv.mu.Unlock()
+- arr := v.MustIntSlice()
+- collected := make([]interface{}, len(arr))
-
-- a := new(Action)
-- srv.reqs = append(srv.reqs, a)
-- return a
+- v.EachInt(func(index int, val int) bool {
+- collected[index] = collector(index, val)
+- return true
+- })
+-
+- return &Value{data: collected}
-}
-
--// NewServer returns a new server.
--func NewServer() (*Server, error) {
-- srv := &Server{
-- instances: make(map[string]*Instance),
-- groups: make(map[string]*securityGroup),
-- reservations: make(map[string]*reservation),
-- initialInstanceState: Pending,
+-/*
+- Int8 (int8 and []int8)
+- --------------------------------------------------
+-*/
+-
+-// Int8 gets the value as a int8, returns the optionalDefault
+-// value or a system default object if the value is the wrong type.
+-func (v *Value) Int8(optionalDefault ...int8) int8 {
+- if s, ok := v.data.(int8); ok {
+- return s
+- }
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
- }
+- return 0
+-}
-
-- // Add default security group.
-- g := &securityGroup{
-- name: "default",
-- description: "default group",
-- id: fmt.Sprintf("sg-%d", srv.groupId.next()),
+-// MustInt8 gets the value as a int8.
+-//
+-// Panics if the object is not a int8.
+-func (v *Value) MustInt8() int8 {
+- return v.data.(int8)
+-}
+-
+-// Int8Slice gets the value as a []int8, returns the optionalDefault
+-// value or nil if the value is not a []int8.
+-func (v *Value) Int8Slice(optionalDefault ...[]int8) []int8 {
+- if s, ok := v.data.([]int8); ok {
+- return s
- }
-- g.perms = map[permKey]bool{
-- permKey{
-- protocol: "icmp",
-- fromPort: -1,
-- toPort: -1,
-- group: g,
-- }: true,
-- permKey{
-- protocol: "tcp",
-- fromPort: 0,
-- toPort: 65535,
-- group: g,
-- }: true,
-- permKey{
-- protocol: "udp",
-- fromPort: 0,
-- toPort: 65535,
-- group: g,
-- }: true,
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
- }
-- srv.groups[g.id] = g
+- return nil
+-}
-
-- l, err := net.Listen("tcp", "localhost:0")
-- if err != nil {
-- return nil, fmt.Errorf("cannot listen on localhost: %v", err)
+-// MustInt8Slice gets the value as a []int8.
+-//
+-// Panics if the object is not a []int8.
+-func (v *Value) MustInt8Slice() []int8 {
+- return v.data.([]int8)
+-}
+-
+-// IsInt8 gets whether the object contained is a int8 or not.
+-func (v *Value) IsInt8() bool {
+- _, ok := v.data.(int8)
+- return ok
+-}
+-
+-// IsInt8Slice gets whether the object contained is a []int8 or not.
+-func (v *Value) IsInt8Slice() bool {
+- _, ok := v.data.([]int8)
+- return ok
+-}
+-
+-// EachInt8 calls the specified callback for each object
+-// in the []int8.
+-//
+-// Panics if the object is the wrong type.
+-func (v *Value) EachInt8(callback func(int, int8) bool) *Value {
+-
+- for index, val := range v.MustInt8Slice() {
+- carryon := callback(index, val)
+- if carryon == false {
+- break
+- }
- }
-- srv.listener = l
-
-- srv.url = "http://" + l.Addr().String()
+- return v
+-
+-}
+-
+-// WhereInt8 uses the specified decider function to select items
+-// from the []int8. The object contained in the result will contain
+-// only the selected items.
+-func (v *Value) WhereInt8(decider func(int, int8) bool) *Value {
+-
+- var selected []int8
+-
+- v.EachInt8(func(index int, val int8) bool {
+- shouldSelect := decider(index, val)
+- if shouldSelect == false {
+- selected = append(selected, val)
+- }
+- return true
+- })
+-
+- return &Value{data: selected}
+-
+-}
+-
+-// GroupInt8 uses the specified grouper function to group the items
+-// keyed by the return of the grouper. The object contained in the
+-// result will contain a map[string][]int8.
+-func (v *Value) GroupInt8(grouper func(int, int8) string) *Value {
+-
+- groups := make(map[string][]int8)
+-
+- v.EachInt8(func(index int, val int8) bool {
+- group := grouper(index, val)
+- if _, ok := groups[group]; !ok {
+- groups[group] = make([]int8, 0)
+- }
+- groups[group] = append(groups[group], val)
+- return true
+- })
-
-- // we use HandlerFunc rather than *Server directly so that we
-- // can avoid exporting HandlerFunc from *Server.
-- go http.Serve(l, http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-- srv.serveHTTP(w, req)
-- }))
-- return srv, nil
--}
+- return &Value{data: groups}
-
--// Quit closes down the server.
--func (srv *Server) Quit() {
-- srv.listener.Close()
-}
-
--// SetInitialInstanceState sets the state that any new instances will be started in.
--func (srv *Server) SetInitialInstanceState(state ec2.InstanceState) {
-- srv.mu.Lock()
-- srv.initialInstanceState = state
-- srv.mu.Unlock()
--}
+-// ReplaceInt8 uses the specified function to replace each int8s
+-// by iterating each item. The data in the returned result will be a
+-// []int8 containing the replaced items.
+-func (v *Value) ReplaceInt8(replacer func(int, int8) int8) *Value {
+-
+- arr := v.MustInt8Slice()
+- replaced := make([]int8, len(arr))
+-
+- v.EachInt8(func(index int, val int8) bool {
+- replaced[index] = replacer(index, val)
+- return true
+- })
+-
+- return &Value{data: replaced}
-
--// URL returns the URL of the server.
--func (srv *Server) URL() string {
-- return srv.url
-}
-
--// serveHTTP serves the EC2 protocol.
--func (srv *Server) serveHTTP(w http.ResponseWriter, req *http.Request) {
-- req.ParseForm()
+-// CollectInt8 uses the specified collector function to collect a value
+-// for each of the int8s in the slice. The data returned will be a
+-// []interface{}.
+-func (v *Value) CollectInt8(collector func(int, int8) interface{}) *Value {
-
-- a := srv.newAction()
-- a.RequestId = fmt.Sprintf("req%d", srv.reqId.next())
-- a.Request = req.Form
+- arr := v.MustInt8Slice()
+- collected := make([]interface{}, len(arr))
-
-- // Methods on Server that deal with parsing user data
-- // may fail. To save on error handling code, we allow these
-- // methods to call fatalf, which will panic with an *ec2.Error
-- // which will be caught here and returned
-- // to the client as a properly formed EC2 error.
-- defer func() {
-- switch err := recover().(type) {
-- case *ec2.Error:
-- a.Err = err
-- err.RequestId = a.RequestId
-- writeError(w, err)
-- case nil:
-- default:
-- panic(err)
-- }
-- }()
+- v.EachInt8(func(index int, val int8) bool {
+- collected[index] = collector(index, val)
+- return true
+- })
-
-- f := actions[req.Form.Get("Action")]
-- if f == nil {
-- fatalf(400, "InvalidParameterValue", "Unrecognized Action")
-- }
+- return &Value{data: collected}
+-}
-
-- response := f(srv, w, req, a.RequestId)
-- a.Response = response
+-/*
+- Int16 (int16 and []int16)
+- --------------------------------------------------
+-*/
-
-- w.Header().Set("Content-Type", `xml version="1.0" encoding="UTF-8"`)
-- xmlMarshal(w, response)
+-// Int16 gets the value as a int16, returns the optionalDefault
+-// value or a system default object if the value is the wrong type.
+-func (v *Value) Int16(optionalDefault ...int16) int16 {
+- if s, ok := v.data.(int16); ok {
+- return s
+- }
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
+- }
+- return 0
-}
-
--// Instance returns the instance for the given instance id.
--// It returns nil if there is no such instance.
--func (srv *Server) Instance(id string) *Instance {
-- srv.mu.Lock()
-- defer srv.mu.Unlock()
-- return srv.instances[id]
+-// MustInt16 gets the value as a int16.
+-//
+-// Panics if the object is not a int16.
+-func (v *Value) MustInt16() int16 {
+- return v.data.(int16)
-}
-
--// writeError writes an appropriate error response.
--// TODO how should we deal with errors when the
--// error itself is potentially generated by backend-agnostic
--// code?
--func writeError(w http.ResponseWriter, err *ec2.Error) {
-- // Error encapsulates an error returned by EC2.
-- // TODO merge with ec2.Error when xml supports ignoring a field.
-- type ec2error struct {
-- Code string // EC2 error code ("UnsupportedOperation", ...)
-- Message string // The human-oriented error message
-- RequestId string
+-// Int16Slice gets the value as a []int16, returns the optionalDefault
+-// value or nil if the value is not a []int16.
+-func (v *Value) Int16Slice(optionalDefault ...[]int16) []int16 {
+- if s, ok := v.data.([]int16); ok {
+- return s
- }
--
-- type Response struct {
-- RequestId string
-- Errors []ec2error `xml:"Errors>Error"`
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
- }
+- return nil
+-}
-
-- w.Header().Set("Content-Type", `xml version="1.0" encoding="UTF-8"`)
-- w.WriteHeader(err.StatusCode)
-- xmlMarshal(w, Response{
-- RequestId: err.RequestId,
-- Errors: []ec2error{{
-- Code: err.Code,
-- Message: err.Message,
-- }},
-- })
+-// MustInt16Slice gets the value as a []int16.
+-//
+-// Panics if the object is not a []int16.
+-func (v *Value) MustInt16Slice() []int16 {
+- return v.data.([]int16)
-}
-
--// xmlMarshal is the same as xml.Marshal except that
--// it panics on error. The marshalling should not fail,
--// but we want to know if it does.
--func xmlMarshal(w io.Writer, x interface{}) {
-- if err := xml.NewEncoder(w).Encode(x); err != nil {
-- panic(fmt.Errorf("error marshalling %#v: %v", x, err))
-- }
+-// IsInt16 gets whether the object contained is a int16 or not.
+-func (v *Value) IsInt16() bool {
+- _, ok := v.data.(int16)
+- return ok
-}
-
--// formToGroups parses a set of SecurityGroup form values
--// as found in a RunInstances request, and returns the resulting
--// slice of security groups.
--// It calls fatalf if a group is not found.
--func (srv *Server) formToGroups(form url.Values) []*securityGroup {
-- var groups []*securityGroup
-- for name, values := range form {
-- switch {
-- case strings.HasPrefix(name, "SecurityGroupId."):
-- if g := srv.groups[values[0]]; g != nil {
-- groups = append(groups, g)
-- } else {
-- fatalf(400, "InvalidGroup.NotFound", "unknown group id %q", values[0])
-- }
-- case strings.HasPrefix(name, "SecurityGroup."):
-- var found *securityGroup
-- for _, g := range srv.groups {
-- if g.name == values[0] {
-- found = g
-- }
-- }
-- if found == nil {
-- fatalf(400, "InvalidGroup.NotFound", "unknown group name %q", values[0])
-- }
-- groups = append(groups, found)
-- }
-- }
-- return groups
+-// IsInt16Slice gets whether the object contained is a []int16 or not.
+-func (v *Value) IsInt16Slice() bool {
+- _, ok := v.data.([]int16)
+- return ok
-}
-
--// runInstances implements the EC2 RunInstances entry point.
--func (srv *Server) runInstances(w http.ResponseWriter, req *http.Request, reqId string) interface{} {
-- min := atoi(req.Form.Get("MinCount"))
-- max := atoi(req.Form.Get("MaxCount"))
-- if min < 0 || max < 1 {
-- fatalf(400, "InvalidParameterValue", "bad values for MinCount or MaxCount")
-- }
-- if min > max {
-- fatalf(400, "InvalidParameterCombination", "MinCount is greater than MaxCount")
-- }
-- var userData []byte
-- if data := req.Form.Get("UserData"); data != "" {
-- var err error
-- userData, err = b64.DecodeString(data)
-- if err != nil {
-- fatalf(400, "InvalidParameterValue", "bad UserData value: %v", err)
+-// EachInt16 calls the specified callback for each object
+-// in the []int16.
+-//
+-// Panics if the object is the wrong type.
+-func (v *Value) EachInt16(callback func(int, int16) bool) *Value {
+-
+- for index, val := range v.MustInt16Slice() {
+- carryon := callback(index, val)
+- if carryon == false {
+- break
- }
- }
-
-- // TODO attributes still to consider:
-- // ImageId: accept anything, we can verify later
-- // KeyName ?
-- // InstanceType ?
-- // KernelId ?
-- // RamdiskId ?
-- // AvailZone ?
-- // GroupName tag
-- // Monitoring ignore?
-- // SubnetId ?
-- // DisableAPITermination bool
-- // ShutdownBehavior string
-- // PrivateIPAddress string
+- return v
-
-- srv.mu.Lock()
-- defer srv.mu.Unlock()
+-}
-
-- // make sure that form fields are correct before creating the reservation.
-- instType := req.Form.Get("InstanceType")
-- imageId := req.Form.Get("ImageId")
+-// WhereInt16 uses the specified decider function to select items
+-// from the []int16. The object contained in the result will contain
+-// only the selected items.
+-func (v *Value) WhereInt16(decider func(int, int16) bool) *Value {
-
-- r := srv.newReservation(srv.formToGroups(req.Form))
+- var selected []int16
-
-- var resp ec2.RunInstancesResp
-- resp.RequestId = reqId
-- resp.ReservationId = r.id
-- resp.OwnerId = ownerId
+- v.EachInt16(func(index int, val int16) bool {
+- shouldSelect := decider(index, val)
+- if shouldSelect == false {
+- selected = append(selected, val)
+- }
+- return true
+- })
-
-- for i := 0; i < max; i++ {
-- inst := srv.newInstance(r, instType, imageId, srv.initialInstanceState)
-- inst.UserData = userData
-- resp.Instances = append(resp.Instances, inst.ec2instance())
-- }
-- return &resp
--}
+- return &Value{data: selected}
-
--func (srv *Server) group(group ec2.SecurityGroup) *securityGroup {
-- if group.Id != "" {
-- return srv.groups[group.Id]
-- }
-- for _, g := range srv.groups {
-- if g.name == group.Name {
-- return g
-- }
-- }
-- return nil
-}
-
--// NewInstances creates n new instances in srv with the given instance type,
--// image ID, initial state and security groups. If any group does not already
--// exist, it will be created. NewInstances returns the ids of the new instances.
--func (srv *Server) NewInstances(n int, instType string, imageId string, state ec2.InstanceState, groups []ec2.SecurityGroup) []string {
-- srv.mu.Lock()
-- defer srv.mu.Unlock()
+-// GroupInt16 uses the specified grouper function to group the items
+-// keyed by the return of the grouper. The object contained in the
+-// result will contain a map[string][]int16.
+-func (v *Value) GroupInt16(grouper func(int, int16) string) *Value {
-
-- rgroups := make([]*securityGroup, len(groups))
-- for i, group := range groups {
-- g := srv.group(group)
-- if g == nil {
-- fatalf(400, "InvalidGroup.NotFound", "no such group %v", g)
+- groups := make(map[string][]int16)
+-
+- v.EachInt16(func(index int, val int16) bool {
+- group := grouper(index, val)
+- if _, ok := groups[group]; !ok {
+- groups[group] = make([]int16, 0)
- }
-- rgroups[i] = g
-- }
-- r := srv.newReservation(rgroups)
+- groups[group] = append(groups[group], val)
+- return true
+- })
-
-- ids := make([]string, n)
-- for i := 0; i < n; i++ {
-- inst := srv.newInstance(r, instType, imageId, state)
-- ids[i] = inst.id
-- }
-- return ids
--}
+- return &Value{data: groups}
-
--func (srv *Server) newInstance(r *reservation, instType string, imageId string, state ec2.InstanceState) *Instance {
-- inst := &Instance{
-- id: fmt.Sprintf("i-%d", srv.maxId.next()),
-- instType: instType,
-- imageId: imageId,
-- state: state,
-- reservation: r,
-- }
-- srv.instances[inst.id] = inst
-- r.instances[inst.id] = inst
-- return inst
-}
-
--func (srv *Server) newReservation(groups []*securityGroup) *reservation {
-- r := &reservation{
-- id: fmt.Sprintf("r-%d", srv.reservationId.next()),
-- instances: make(map[string]*Instance),
-- groups: groups,
-- }
+-// ReplaceInt16 uses the specified function to replace each int16s
+-// by iterating each item. The data in the returned result will be a
+-// []int16 containing the replaced items.
+-func (v *Value) ReplaceInt16(replacer func(int, int16) int16) *Value {
-
-- srv.reservations[r.id] = r
-- return r
--}
+- arr := v.MustInt16Slice()
+- replaced := make([]int16, len(arr))
-
--func (srv *Server) terminateInstances(w http.ResponseWriter, req *http.Request, reqId string) interface{} {
-- srv.mu.Lock()
-- defer srv.mu.Unlock()
-- var resp ec2.TerminateInstancesResp
-- resp.RequestId = reqId
-- var insts []*Instance
-- for attr, vals := range req.Form {
-- if strings.HasPrefix(attr, "InstanceId.") {
-- id := vals[0]
-- inst := srv.instances[id]
-- if inst == nil {
-- fatalf(400, "InvalidInstanceID.NotFound", "no such instance id %q", id)
-- }
-- insts = append(insts, inst)
-- }
-- }
-- for _, inst := range insts {
-- resp.StateChanges = append(resp.StateChanges, inst.terminate())
-- }
-- return &resp
--}
+- v.EachInt16(func(index int, val int16) bool {
+- replaced[index] = replacer(index, val)
+- return true
+- })
-
--func (inst *Instance) terminate() (d ec2.InstanceStateChange) {
-- d.PreviousState = inst.state
-- inst.state = ShuttingDown
-- d.CurrentState = inst.state
-- d.InstanceId = inst.id
-- return d
--}
+- return &Value{data: replaced}
-
--func (inst *Instance) ec2instance() ec2.Instance {
-- return ec2.Instance{
-- InstanceId: inst.id,
-- InstanceType: inst.instType,
-- ImageId: inst.imageId,
-- DNSName: fmt.Sprintf("%s.example.com", inst.id),
-- // TODO the rest
-- }
-}
-
--func (inst *Instance) matchAttr(attr, value string) (ok bool, err error) {
-- switch attr {
-- case "architecture":
-- return value == "i386", nil
-- case "instance-id":
-- return inst.id == value, nil
-- case "group-id":
-- for _, g := range inst.reservation.groups {
-- if g.id == value {
-- return true, nil
-- }
-- }
-- return false, nil
-- case "group-name":
-- for _, g := range inst.reservation.groups {
-- if g.name == value {
-- return true, nil
-- }
-- }
-- return false, nil
-- case "image-id":
-- return value == inst.imageId, nil
-- case "instance-state-code":
-- code, err := strconv.Atoi(value)
-- if err != nil {
-- return false, err
-- }
-- return code&0xff == inst.state.Code, nil
-- case "instance-state-name":
-- return value == inst.state.Name, nil
-- }
-- return false, fmt.Errorf("unknown attribute %q", attr)
--}
+-// CollectInt16 uses the specified collector function to collect a value
+-// for each of the int16s in the slice. The data returned will be a
+-// []interface{}.
+-func (v *Value) CollectInt16(collector func(int, int16) interface{}) *Value {
-
--var (
-- Pending = ec2.InstanceState{0, "pending"}
-- Running = ec2.InstanceState{16, "running"}
-- ShuttingDown = ec2.InstanceState{32, "shutting-down"}
-- Terminated = ec2.InstanceState{16, "terminated"}
-- Stopped = ec2.InstanceState{16, "stopped"}
--)
+- arr := v.MustInt16Slice()
+- collected := make([]interface{}, len(arr))
-
--func (srv *Server) createSecurityGroup(w http.ResponseWriter, req *http.Request, reqId string) interface{} {
-- name := req.Form.Get("GroupName")
-- if name == "" {
-- fatalf(400, "InvalidParameterValue", "empty security group name")
-- }
-- srv.mu.Lock()
-- defer srv.mu.Unlock()
-- if srv.group(ec2.SecurityGroup{Name: name}) != nil {
-- fatalf(400, "InvalidGroup.Duplicate", "group %q already exists", name)
-- }
-- g := &securityGroup{
-- name: name,
-- description: req.Form.Get("GroupDescription"),
-- id: fmt.Sprintf("sg-%d", srv.groupId.next()),
-- perms: make(map[permKey]bool),
-- }
-- srv.groups[g.id] = g
-- // we define a local type for this because ec2.CreateSecurityGroupResp
-- // contains SecurityGroup, but the response to this request
-- // should not contain the security group name.
-- type CreateSecurityGroupResponse struct {
-- RequestId string `xml:"requestId"`
-- Return bool `xml:"return"`
-- GroupId string `xml:"groupId"`
-- }
-- r := &CreateSecurityGroupResponse{
-- RequestId: reqId,
-- Return: true,
-- GroupId: g.id,
-- }
-- return r
--}
+- v.EachInt16(func(index int, val int16) bool {
+- collected[index] = collector(index, val)
+- return true
+- })
-
--func (srv *Server) notImplemented(w http.ResponseWriter, req *http.Request, reqId string) interface{} {
-- fatalf(500, "InternalError", "not implemented")
-- panic("not reached")
+- return &Value{data: collected}
-}
-
--func (srv *Server) describeInstances(w http.ResponseWriter, req *http.Request, reqId string) interface{} {
-- srv.mu.Lock()
-- defer srv.mu.Unlock()
-- insts := make(map[*Instance]bool)
-- for name, vals := range req.Form {
-- if !strings.HasPrefix(name, "InstanceId.") {
-- continue
-- }
-- inst := srv.instances[vals[0]]
-- if inst == nil {
-- fatalf(400, "InvalidInstanceID.NotFound", "instance %q not found", vals[0])
-- }
-- insts[inst] = true
-- }
--
-- f := newFilter(req.Form)
+-/*
+- Int32 (int32 and []int32)
+- --------------------------------------------------
+-*/
-
-- var resp ec2.InstancesResp
-- resp.RequestId = reqId
-- for _, r := range srv.reservations {
-- var instances []ec2.Instance
-- for _, inst := range r.instances {
-- if len(insts) > 0 && !insts[inst] {
-- continue
-- }
-- ok, err := f.ok(inst)
-- if ok {
-- instances = append(instances, inst.ec2instance())
-- } else if err != nil {
-- fatalf(400, "InvalidParameterValue", "describe instances: %v", err)
-- }
-- }
-- if len(instances) > 0 {
-- var groups []ec2.SecurityGroup
-- for _, g := range r.groups {
-- groups = append(groups, g.ec2SecurityGroup())
-- }
-- resp.Reservations = append(resp.Reservations, ec2.Reservation{
-- ReservationId: r.id,
-- OwnerId: ownerId,
-- Instances: instances,
-- SecurityGroups: groups,
-- })
-- }
+-// Int32 gets the value as a int32, returns the optionalDefault
+-// value or a system default object if the value is the wrong type.
+-func (v *Value) Int32(optionalDefault ...int32) int32 {
+- if s, ok := v.data.(int32); ok {
+- return s
- }
-- return &resp
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
+- }
+- return 0
-}
-
--func (srv *Server) describeSecurityGroups(w http.ResponseWriter, req *http.Request, reqId string) interface{} {
-- // BUG similar bug to describeInstances, but for GroupName and GroupId
-- srv.mu.Lock()
-- defer srv.mu.Unlock()
+-// MustInt32 gets the value as a int32.
+-//
+-// Panics if the object is not a int32.
+-func (v *Value) MustInt32() int32 {
+- return v.data.(int32)
+-}
-
-- var groups []*securityGroup
-- for name, vals := range req.Form {
-- var g ec2.SecurityGroup
-- switch {
-- case strings.HasPrefix(name, "GroupName."):
-- g.Name = vals[0]
-- case strings.HasPrefix(name, "GroupId."):
-- g.Id = vals[0]
-- default:
-- continue
-- }
-- sg := srv.group(g)
-- if sg == nil {
-- fatalf(400, "InvalidGroup.NotFound", "no such group %v", g)
-- }
-- groups = append(groups, sg)
+-// Int32Slice gets the value as a []int32, returns the optionalDefault
+-// value or nil if the value is not a []int32.
+-func (v *Value) Int32Slice(optionalDefault ...[]int32) []int32 {
+- if s, ok := v.data.([]int32); ok {
+- return s
- }
-- if len(groups) == 0 {
-- for _, g := range srv.groups {
-- groups = append(groups, g)
-- }
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
- }
+- return nil
+-}
-
-- f := newFilter(req.Form)
-- var resp ec2.SecurityGroupsResp
-- resp.RequestId = reqId
-- for _, group := range groups {
-- ok, err := f.ok(group)
-- if ok {
-- resp.Groups = append(resp.Groups, ec2.SecurityGroupInfo{
-- OwnerId: ownerId,
-- SecurityGroup: group.ec2SecurityGroup(),
-- Description: group.description,
-- IPPerms: group.ec2Perms(),
-- })
-- } else if err != nil {
-- fatalf(400, "InvalidParameterValue", "describe security groups: %v", err)
+-// MustInt32Slice gets the value as a []int32.
+-//
+-// Panics if the object is not a []int32.
+-func (v *Value) MustInt32Slice() []int32 {
+- return v.data.([]int32)
+-}
+-
+-// IsInt32 gets whether the object contained is a int32 or not.
+-func (v *Value) IsInt32() bool {
+- _, ok := v.data.(int32)
+- return ok
+-}
+-
+-// IsInt32Slice gets whether the object contained is a []int32 or not.
+-func (v *Value) IsInt32Slice() bool {
+- _, ok := v.data.([]int32)
+- return ok
+-}
+-
+-// EachInt32 calls the specified callback for each object
+-// in the []int32.
+-//
+-// Panics if the object is the wrong type.
+-func (v *Value) EachInt32(callback func(int, int32) bool) *Value {
+-
+- for index, val := range v.MustInt32Slice() {
+- carryon := callback(index, val)
+- if carryon == false {
+- break
- }
- }
-- return &resp
+-
+- return v
+-
-}
-
--func (srv *Server) authorizeSecurityGroupIngress(w http.ResponseWriter, req *http.Request, reqId string) interface{} {
-- srv.mu.Lock()
-- defer srv.mu.Unlock()
-- g := srv.group(ec2.SecurityGroup{
-- Name: req.Form.Get("GroupName"),
-- Id: req.Form.Get("GroupId"),
-- })
-- if g == nil {
-- fatalf(400, "InvalidGroup.NotFound", "group not found")
-- }
-- perms := srv.parsePerms(req)
+-// WhereInt32 uses the specified decider function to select items
+-// from the []int32. The object contained in the result will contain
+-// only the selected items.
+-func (v *Value) WhereInt32(decider func(int, int32) bool) *Value {
-
-- for _, p := range perms {
-- if g.perms[p] {
-- fatalf(400, "InvalidPermission.Duplicate", "Permission has already been authorized on the specified group")
+- var selected []int32
+-
+- v.EachInt32(func(index int, val int32) bool {
+- shouldSelect := decider(index, val)
+- if shouldSelect == false {
+- selected = append(selected, val)
- }
-- }
-- for _, p := range perms {
-- g.perms[p] = true
-- }
-- return &ec2.SimpleResp{
-- XMLName: xml.Name{"", "AuthorizeSecurityGroupIngressResponse"},
-- RequestId: reqId,
-- }
+- return true
+- })
+-
+- return &Value{data: selected}
+-
-}
-
--func (srv *Server) revokeSecurityGroupIngress(w http.ResponseWriter, req *http.Request, reqId string) interface{} {
-- srv.mu.Lock()
-- defer srv.mu.Unlock()
-- g := srv.group(ec2.SecurityGroup{
-- Name: req.Form.Get("GroupName"),
-- Id: req.Form.Get("GroupId"),
+-// GroupInt32 uses the specified grouper function to group the items
+-// keyed by the return of the grouper. The object contained in the
+-// result will contain a map[string][]int32.
+-func (v *Value) GroupInt32(grouper func(int, int32) string) *Value {
+-
+- groups := make(map[string][]int32)
+-
+- v.EachInt32(func(index int, val int32) bool {
+- group := grouper(index, val)
+- if _, ok := groups[group]; !ok {
+- groups[group] = make([]int32, 0)
+- }
+- groups[group] = append(groups[group], val)
+- return true
- })
-- if g == nil {
-- fatalf(400, "InvalidGroup.NotFound", "group not found")
-- }
-- perms := srv.parsePerms(req)
-
-- // Note EC2 does not give an error if asked to revoke an authorization
-- // that does not exist.
-- for _, p := range perms {
-- delete(g.perms, p)
-- }
-- return &ec2.SimpleResp{
-- XMLName: xml.Name{"", "RevokeSecurityGroupIngressResponse"},
-- RequestId: reqId,
-- }
+- return &Value{data: groups}
+-
-}
-
--var secGroupPat = regexp.MustCompile(`^sg-[a-z0-9]+$`)
--var ipPat = regexp.MustCompile(`^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/[0-9]+$`)
--var ownerIdPat = regexp.MustCompile(`^[0-9]+$`)
+-// ReplaceInt32 uses the specified function to replace each int32s
+-// by iterating each item. The data in the returned result will be a
+-// []int32 containing the replaced items.
+-func (v *Value) ReplaceInt32(replacer func(int, int32) int32) *Value {
-
--// parsePerms returns a slice of permKey values extracted
--// from the permission fields in req.
--func (srv *Server) parsePerms(req *http.Request) []permKey {
-- // perms maps an index found in the form to its associated
-- // IPPerm. For instance, the form value with key
-- // "IpPermissions.3.FromPort" will be stored in perms[3].FromPort
-- perms := make(map[int]ec2.IPPerm)
+- arr := v.MustInt32Slice()
+- replaced := make([]int32, len(arr))
-
-- type subgroupKey struct {
-- id1, id2 int
-- }
-- // Each IPPerm can have many source security groups. The form key
-- // for a source security group contains two indices: the index
-- // of the IPPerm and the sub-index of the security group. The
-- // sourceGroups map maps from a subgroupKey containing these
-- // two indices to the associated security group. For instance,
-- // the form value with key "IPPermissions.3.Groups.2.GroupName"
-- // will be stored in sourceGroups[subgroupKey{3, 2}].Name.
-- sourceGroups := make(map[subgroupKey]ec2.UserSecurityGroup)
+- v.EachInt32(func(index int, val int32) bool {
+- replaced[index] = replacer(index, val)
+- return true
+- })
-
-- // For each value in the form we store its associated information in the
-- // above maps. The maps are necessary because the form keys may
-- // arrive in any order, and the indices are not
-- // necessarily sequential or even small.
-- for name, vals := range req.Form {
-- val := vals[0]
-- var id1 int
-- var rest string
-- if x, _ := fmt.Sscanf(name, "IpPermissions.%d.%s", &id1, &rest); x != 2 {
-- continue
-- }
-- ec2p := perms[id1]
-- switch {
-- case rest == "FromPort":
-- ec2p.FromPort = atoi(val)
-- case rest == "ToPort":
-- ec2p.ToPort = atoi(val)
-- case rest == "IpProtocol":
-- switch val {
-- case "tcp", "udp", "icmp":
-- ec2p.Protocol = val
-- default:
-- // check it's a well formed number
-- atoi(val)
-- ec2p.Protocol = val
-- }
-- case strings.HasPrefix(rest, "Groups."):
-- k := subgroupKey{id1: id1}
-- if x, _ := fmt.Sscanf(rest[len("Groups."):], "%d.%s", &k.id2, &rest); x != 2 {
-- continue
-- }
-- g := sourceGroups[k]
-- switch rest {
-- case "UserId":
-- // BUG if the user id is blank, this does not conform to the
-- // way that EC2 handles it - a specified but blank owner id
-- // can cause RevokeSecurityGroupIngress to fail with
-- // "group not found" even if the security group id has been
-- // correctly specified.
-- // By failing here, we ensure that we fail early in this case.
-- if !ownerIdPat.MatchString(val) {
-- fatalf(400, "InvalidUserID.Malformed", "Invalid user ID: %q", val)
-- }
-- g.OwnerId = val
-- case "GroupName":
-- g.Name = val
-- case "GroupId":
-- if !secGroupPat.MatchString(val) {
-- fatalf(400, "InvalidGroupId.Malformed", "Invalid group ID: %q", val)
-- }
-- g.Id = val
-- default:
-- fatalf(400, "UnknownParameter", "unknown parameter %q", name)
-- }
-- sourceGroups[k] = g
-- case strings.HasPrefix(rest, "IpRanges."):
-- var id2 int
-- if x, _ := fmt.Sscanf(rest[len("IpRanges."):], "%d.%s", &id2, &rest); x != 2 {
-- continue
-- }
-- switch rest {
-- case "CidrIp":
-- if !ipPat.MatchString(val) {
-- fatalf(400, "InvalidPermission.Malformed", "Invalid IP range: %q", val)
-- }
-- ec2p.SourceIPs = append(ec2p.SourceIPs, val)
-- default:
-- fatalf(400, "UnknownParameter", "unknown parameter %q", name)
-- }
-- default:
-- fatalf(400, "UnknownParameter", "unknown parameter %q", name)
-- }
-- perms[id1] = ec2p
-- }
-- // Associate each set of source groups with its IPPerm.
-- for k, g := range sourceGroups {
-- p := perms[k.id1]
-- p.SourceGroups = append(p.SourceGroups, g)
-- perms[k.id1] = p
-- }
+- return &Value{data: replaced}
-
-- // Now that we have built up the IPPerms we need, we check for
-- // parameter errors and build up a permKey for each permission,
-- // looking up security groups from srv as we do so.
-- var result []permKey
-- for _, p := range perms {
-- if p.FromPort > p.ToPort {
-- fatalf(400, "InvalidParameterValue", "invalid port range")
-- }
-- k := permKey{
-- protocol: p.Protocol,
-- fromPort: p.FromPort,
-- toPort: p.ToPort,
-- }
-- for _, g := range p.SourceGroups {
-- if g.OwnerId != "" && g.OwnerId != ownerId {
-- fatalf(400, "InvalidGroup.NotFound", "group %q not found", g.Name)
-- }
-- var ec2g ec2.SecurityGroup
-- switch {
-- case g.Id != "":
-- ec2g.Id = g.Id
-- case g.Name != "":
-- ec2g.Name = g.Name
-- }
-- k.group = srv.group(ec2g)
-- if k.group == nil {
-- fatalf(400, "InvalidGroup.NotFound", "group %v not found", g)
-- }
-- result = append(result, k)
-- }
-- k.group = nil
-- for _, ip := range p.SourceIPs {
-- k.ipAddr = ip
-- result = append(result, k)
-- }
-- }
-- return result
-}
-
--func (srv *Server) deleteSecurityGroup(w http.ResponseWriter, req *http.Request, reqId string) interface{} {
-- srv.mu.Lock()
-- defer srv.mu.Unlock()
-- g := srv.group(ec2.SecurityGroup{
-- Name: req.Form.Get("GroupName"),
-- Id: req.Form.Get("GroupId"),
+-// CollectInt32 uses the specified collector function to collect a value
+-// for each of the int32s in the slice. The data returned will be a
+-// []interface{}.
+-func (v *Value) CollectInt32(collector func(int, int32) interface{}) *Value {
+-
+- arr := v.MustInt32Slice()
+- collected := make([]interface{}, len(arr))
+-
+- v.EachInt32(func(index int, val int32) bool {
+- collected[index] = collector(index, val)
+- return true
- })
-- if g == nil {
-- fatalf(400, "InvalidGroup.NotFound", "group not found")
-- }
-- for _, r := range srv.reservations {
-- for _, h := range r.groups {
-- if h == g && r.hasRunningMachine() {
-- fatalf(500, "InvalidGroup.InUse", "group is currently in use by a running instance")
-- }
-- }
+-
+- return &Value{data: collected}
+-}
+-
+-/*
+- Int64 (int64 and []int64)
+- --------------------------------------------------
+-*/
+-
+-// Int64 gets the value as a int64, returns the optionalDefault
+-// value or a system default object if the value is the wrong type.
+-func (v *Value) Int64(optionalDefault ...int64) int64 {
+- if s, ok := v.data.(int64); ok {
+- return s
- }
-- for _, sg := range srv.groups {
-- // If a group refers to itself, it's ok to delete it.
-- if sg == g {
-- continue
-- }
-- for k := range sg.perms {
-- if k.group == g {
-- fatalf(500, "InvalidGroup.InUse", "group is currently in use by group %q", sg.id)
-- }
-- }
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
- }
+- return 0
+-}
-
-- delete(srv.groups, g.id)
-- return &ec2.SimpleResp{
-- XMLName: xml.Name{"", "DeleteSecurityGroupResponse"},
-- RequestId: reqId,
-- }
+-// MustInt64 gets the value as a int64.
+-//
+-// Panics if the object is not a int64.
+-func (v *Value) MustInt64() int64 {
+- return v.data.(int64)
-}
-
--func (r *reservation) hasRunningMachine() bool {
-- for _, inst := range r.instances {
-- if inst.state.Code != ShuttingDown.Code && inst.state.Code != Terminated.Code {
-- return true
-- }
+-// Int64Slice gets the value as a []int64, returns the optionalDefault
+-// value or nil if the value is not a []int64.
+-func (v *Value) Int64Slice(optionalDefault ...[]int64) []int64 {
+- if s, ok := v.data.([]int64); ok {
+- return s
- }
-- return false
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
+- }
+- return nil
-}
-
--type counter int
+-// MustInt64Slice gets the value as a []int64.
+-//
+-// Panics if the object is not a []int64.
+-func (v *Value) MustInt64Slice() []int64 {
+- return v.data.([]int64)
+-}
-
--func (c *counter) next() (i int) {
-- i = int(*c)
-- (*c)++
-- return
+-// IsInt64 gets whether the object contained is a int64 or not.
+-func (v *Value) IsInt64() bool {
+- _, ok := v.data.(int64)
+- return ok
-}
-
--// atoi is like strconv.Atoi but is fatal if the
--// string is not well formed.
--func atoi(s string) int {
-- i, err := strconv.Atoi(s)
-- if err != nil {
-- fatalf(400, "InvalidParameterValue", "bad number: %v", err)
+-// IsInt64Slice gets whether the object contained is a []int64 or not.
+-func (v *Value) IsInt64Slice() bool {
+- _, ok := v.data.([]int64)
+- return ok
+-}
+-
+-// EachInt64 calls the specified callback for each object
+-// in the []int64.
+-//
+-// Panics if the object is the wrong type.
+-func (v *Value) EachInt64(callback func(int, int64) bool) *Value {
+-
+- for index, val := range v.MustInt64Slice() {
+- carryon := callback(index, val)
+- if carryon == false {
+- break
+- }
- }
-- return i
+-
+- return v
+-
-}
-
--func fatalf(statusCode int, code string, f string, a ...interface{}) {
-- panic(&ec2.Error{
-- StatusCode: statusCode,
-- Code: code,
-- Message: fmt.Sprintf(f, a...),
+-// WhereInt64 uses the specified decider function to select items
+-// from the []int64. The object contained in the result will contain
+-// only the selected items.
+-func (v *Value) WhereInt64(decider func(int, int64) bool) *Value {
+-
+- var selected []int64
+-
+- v.EachInt64(func(index int, val int64) bool {
+- shouldSelect := decider(index, val)
+- if shouldSelect == false {
+- selected = append(selected, val)
+- }
+- return true
- })
--}
-diff --git a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/export_test.go b/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/export_test.go
-deleted file mode 100644
-index 1c24422..0000000
---- a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/export_test.go
-+++ /dev/null
-@@ -1,22 +0,0 @@
--package ec2
-
--import (
-- "github.com/mitchellh/goamz/aws"
-- "time"
--)
+- return &Value{data: selected}
-
--func Sign(auth aws.Auth, method, path string, params map[string]string, host string) {
-- sign(auth, method, path, params, host)
-}
-
--func fixedTime() time.Time {
-- return time.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC)
--}
+-// GroupInt64 uses the specified grouper function to group the items
+-// keyed by the return of the grouper. The object contained in the
+-// result will contain a map[string][]int64.
+-func (v *Value) GroupInt64(grouper func(int, int64) string) *Value {
+-
+- groups := make(map[string][]int64)
+-
+- v.EachInt64(func(index int, val int64) bool {
+- group := grouper(index, val)
+- if _, ok := groups[group]; !ok {
+- groups[group] = make([]int64, 0)
+- }
+- groups[group] = append(groups[group], val)
+- return true
+- })
+-
+- return &Value{data: groups}
-
--func FakeTime(fakeIt bool) {
-- if fakeIt {
-- timeNow = fixedTime
-- } else {
-- timeNow = time.Now
-- }
-}
-diff --git a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/responses_test.go b/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/responses_test.go
-deleted file mode 100644
-index 0a4dbb3..0000000
---- a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/responses_test.go
-+++ /dev/null
-@@ -1,854 +0,0 @@
--package ec2_test
-
--var ErrorDump = `
--<?xml version="1.0" encoding="UTF-8"?>
--<Response><Errors><Error><Code>UnsupportedOperation</Code>
--<Message>AMIs with an instance-store root device are not supported for the instance type 't1.micro'.</Message>
--</Error></Errors><RequestID>0503f4e9-bbd6-483c-b54f-c4ae9f3b30f4</RequestID></Response>
--`
+-// ReplaceInt64 uses the specified function to replace each int64s
+-// by iterating each item. The data in the returned result will be a
+-// []int64 containing the replaced items.
+-func (v *Value) ReplaceInt64(replacer func(int, int64) int64) *Value {
+-
+- arr := v.MustInt64Slice()
+- replaced := make([]int64, len(arr))
+-
+- v.EachInt64(func(index int, val int64) bool {
+- replaced[index] = replacer(index, val)
+- return true
+- })
+-
+- return &Value{data: replaced}
-
--// http://goo.gl/Mcm3b
--var RunInstancesExample = `
--<RunInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2011-12-15/">
-- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
-- <reservationId>r-47a5402e</reservationId>
-- <ownerId>999988887777</ownerId>
-- <groupSet>
-- <item>
-- <groupId>sg-67ad940e</groupId>
-- <groupName>default</groupName>
-- </item>
-- </groupSet>
-- <instancesSet>
-- <item>
-- <instanceId>i-2ba64342</instanceId>
-- <imageId>ami-60a54009</imageId>
-- <instanceState>
-- <code>0</code>
-- <name>pending</name>
-- </instanceState>
-- <privateDnsName></privateDnsName>
-- <dnsName></dnsName>
-- <keyName>example-key-name</keyName>
-- <amiLaunchIndex>0</amiLaunchIndex>
-- <instanceType>m1.small</instanceType>
-- <launchTime>2007-08-07T11:51:50.000Z</launchTime>
-- <placement>
-- <availabilityZone>us-east-1b</availabilityZone>
-- </placement>
-- <monitoring>
-- <state>enabled</state>
-- </monitoring>
-- <virtualizationType>paravirtual</virtualizationType>
-- <clientToken/>
-- <tagSet/>
-- <hypervisor>xen</hypervisor>
-- </item>
-- <item>
-- <instanceId>i-2bc64242</instanceId>
-- <imageId>ami-60a54009</imageId>
-- <instanceState>
-- <code>0</code>
-- <name>pending</name>
-- </instanceState>
-- <privateDnsName></privateDnsName>
-- <dnsName></dnsName>
-- <keyName>example-key-name</keyName>
-- <amiLaunchIndex>1</amiLaunchIndex>
-- <instanceType>m1.small</instanceType>
-- <launchTime>2007-08-07T11:51:50.000Z</launchTime>
-- <placement>
-- <availabilityZone>us-east-1b</availabilityZone>
-- </placement>
-- <monitoring>
-- <state>enabled</state>
-- </monitoring>
-- <virtualizationType>paravirtual</virtualizationType>
-- <clientToken/>
-- <tagSet/>
-- <hypervisor>xen</hypervisor>
-- </item>
-- <item>
-- <instanceId>i-2be64332</instanceId>
-- <imageId>ami-60a54009</imageId>
-- <instanceState>
-- <code>0</code>
-- <name>pending</name>
-- </instanceState>
-- <privateDnsName></privateDnsName>
-- <dnsName></dnsName>
-- <keyName>example-key-name</keyName>
-- <amiLaunchIndex>2</amiLaunchIndex>
-- <instanceType>m1.small</instanceType>
-- <launchTime>2007-08-07T11:51:50.000Z</launchTime>
-- <placement>
-- <availabilityZone>us-east-1b</availabilityZone>
-- </placement>
-- <monitoring>
-- <state>enabled</state>
-- </monitoring>
-- <virtualizationType>paravirtual</virtualizationType>
-- <clientToken/>
-- <tagSet/>
-- <hypervisor>xen</hypervisor>
-- </item>
-- </instancesSet>
--</RunInstancesResponse>
--`
+-}
-
--// http://goo.gl/GRZgCD
--var RequestSpotInstancesExample = `
--<RequestSpotInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2014-02-01/">
-- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
-- <spotInstanceRequestSet>
-- <item>
-- <spotInstanceRequestId>sir-1a2b3c4d</spotInstanceRequestId>
-- <spotPrice>0.5</spotPrice>
-- <type>one-time</type>
-- <state>open</state>
-- <status>
-- <code>pending-evaluation</code>
-- <updateTime>2008-05-07T12:51:50.000Z</updateTime>
-- <message>Your Spot request has been submitted for review, and is pending evaluation.</message>
-- </status>
-- <availabilityZoneGroup>MyAzGroup</availabilityZoneGroup>
-- <launchSpecification>
-- <imageId>ami-1a2b3c4d</imageId>
-- <keyName>gsg-keypair</keyName>
-- <groupSet>
-- <item>
-- <groupId>sg-1a2b3c4d</groupId>
-- <groupName>websrv</groupName>
-- </item>
-- </groupSet>
-- <instanceType>m1.small</instanceType>
-- <blockDeviceMapping/>
-- <monitoring>
-- <enabled>false</enabled>
-- </monitoring>
-- <ebsOptimized>false</ebsOptimized>
-- </launchSpecification>
-- <createTime>YYYY-MM-DDTHH:MM:SS.000Z</createTime>
-- <productDescription>Linux/UNIX</productDescription>
-- </item>
-- </spotInstanceRequestSet>
--</RequestSpotInstancesResponse>
--`
+-// CollectInt64 uses the specified collector function to collect a value
+-// for each of the int64s in the slice. The data returned will be a
+-// []interface{}.
+-func (v *Value) CollectInt64(collector func(int, int64) interface{}) *Value {
-
--// http://goo.gl/KsKJJk
--var DescribeSpotRequestsExample = `
--<DescribeSpotInstanceRequestsResponse xmlns="http://ec2.amazonaws.com/doc/2014-02-01/">
-- <requestId>b1719f2a-5334-4479-b2f1-26926EXAMPLE</requestId>
-- <spotInstanceRequestSet>
-- <item>
-- <spotInstanceRequestId>sir-1a2b3c4d</spotInstanceRequestId>
-- <spotPrice>0.5</spotPrice>
-- <type>one-time</type>
-- <state>active</state>
-- <status>
-- <code>fulfilled</code>
-- <updateTime>2008-05-07T12:51:50.000Z</updateTime>
-- <message>Your Spot request is fulfilled.</message>
-- </status>
-- <launchSpecification>
-- <imageId>ami-1a2b3c4d</imageId>
-- <keyName>gsg-keypair</keyName>
-- <groupSet>
-- <item>
-- <groupId>sg-1a2b3c4d</groupId>
-- <groupName>websrv</groupName>
-- </item>
-- </groupSet>
-- <instanceType>m1.small</instanceType>
-- <monitoring>
-- <enabled>false</enabled>
-- </monitoring>
-- <ebsOptimized>false</ebsOptimized>
-- </launchSpecification>
-- <instanceId>i-1a2b3c4d</instanceId>
-- <createTime>YYYY-MM-DDTHH:MM:SS.000Z</createTime>
-- <productDescription>Linux/UNIX</productDescription>
-- <launchedAvailabilityZone>us-east-1a</launchedAvailabilityZone>
-- </item>
-- </spotInstanceRequestSet>
--</DescribeSpotInstanceRequestsResponse>
--`
+- arr := v.MustInt64Slice()
+- collected := make([]interface{}, len(arr))
-
--// http://goo.gl/DcfFgJ
--var CancelSpotRequestsExample = `
--<CancelSpotInstanceRequestsResponse xmlns="http://ec2.amazonaws.com/doc/2014-02-01/">
-- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
-- <spotInstanceRequestSet>
-- <item>
-- <spotInstanceRequestId>sir-1a2b3c4d</spotInstanceRequestId>
-- <state>cancelled</state>
-- </item>
-- </spotInstanceRequestSet>
--</CancelSpotInstanceRequestsResponse>
--`
+- v.EachInt64(func(index int, val int64) bool {
+- collected[index] = collector(index, val)
+- return true
+- })
-
--// http://goo.gl/3BKHj
--var TerminateInstancesExample = `
--<TerminateInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2011-12-15/">
-- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
-- <instancesSet>
-- <item>
-- <instanceId>i-3ea74257</instanceId>
-- <currentState>
-- <code>32</code>
-- <name>shutting-down</name>
-- </currentState>
-- <previousState>
-- <code>16</code>
-- <name>running</name>
-- </previousState>
-- </item>
-- </instancesSet>
--</TerminateInstancesResponse>
--`
+- return &Value{data: collected}
+-}
-
--// http://goo.gl/mLbmw
--var DescribeInstancesExample1 = `
--<DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2011-12-15/">
-- <requestId>98e3c9a4-848c-4d6d-8e8a-b1bdEXAMPLE</requestId>
-- <reservationSet>
-- <item>
-- <reservationId>r-b27e30d9</reservationId>
-- <ownerId>999988887777</ownerId>
-- <groupSet>
-- <item>
-- <groupId>sg-67ad940e</groupId>
-- <groupName>default</groupName>
-- </item>
-- </groupSet>
-- <instancesSet>
-- <item>
-- <instanceId>i-c5cd56af</instanceId>
-- <imageId>ami-1a2b3c4d</imageId>
-- <instanceState>
-- <code>16</code>
-- <name>running</name>
-- </instanceState>
-- <privateDnsName>domU-12-31-39-10-56-34.compute-1.internal</privateDnsName>
-- <dnsName>ec2-174-129-165-232.compute-1.amazonaws.com</dnsName>
-- <reason/>
-- <keyName>GSG_Keypair</keyName>
-- <amiLaunchIndex>0</amiLaunchIndex>
-- <productCodes/>
-- <instanceType>m1.small</instanceType>
-- <launchTime>2010-08-17T01:15:18.000Z</launchTime>
-- <placement>
-- <availabilityZone>us-east-1b</availabilityZone>
-- <groupName/>
-- </placement>
-- <kernelId>aki-94c527fd</kernelId>
-- <ramdiskId>ari-96c527ff</ramdiskId>
-- <monitoring>
-- <state>disabled</state>
-- </monitoring>
-- <privateIpAddress>10.198.85.190</privateIpAddress>
-- <ipAddress>174.129.165.232</ipAddress>
-- <architecture>i386</architecture>
-- <rootDeviceType>ebs</rootDeviceType>
-- <rootDeviceName>/dev/sda1</rootDeviceName>
-- <blockDeviceMapping>
-- <item>
-- <deviceName>/dev/sda1</deviceName>
-- <ebs>
-- <volumeId>vol-a082c1c9</volumeId>
-- <status>attached</status>
-- <attachTime>2010-08-17T01:15:21.000Z</attachTime>
-- <deleteOnTermination>false</deleteOnTermination>
-- </ebs>
-- </item>
-- </blockDeviceMapping>
-- <instanceLifecycle>spot</instanceLifecycle>
-- <spotInstanceRequestId>sir-7a688402</spotInstanceRequestId>
-- <virtualizationType>paravirtual</virtualizationType>
-- <clientToken/>
-- <tagSet/>
-- <hypervisor>xen</hypervisor>
-- </item>
-- </instancesSet>
-- <requesterId>854251627541</requesterId>
-- </item>
-- <item>
-- <reservationId>r-b67e30dd</reservationId>
-- <ownerId>999988887777</ownerId>
-- <groupSet>
-- <item>
-- <groupId>sg-67ad940e</groupId>
-- <groupName>default</groupName>
-- </item>
-- </groupSet>
-- <instancesSet>
-- <item>
-- <instanceId>i-d9cd56b3</instanceId>
-- <imageId>ami-1a2b3c4d</imageId>
-- <instanceState>
-- <code>16</code>
-- <name>running</name>
-- </instanceState>
-- <privateDnsName>domU-12-31-39-10-54-E5.compute-1.internal</privateDnsName>
-- <dnsName>ec2-184-73-58-78.compute-1.amazonaws.com</dnsName>
-- <reason/>
-- <keyName>GSG_Keypair</keyName>
-- <amiLaunchIndex>0</amiLaunchIndex>
-- <productCodes/>
-- <instanceType>m1.large</instanceType>
-- <launchTime>2010-08-17T01:15:19.000Z</launchTime>
-- <placement>
-- <availabilityZone>us-east-1b</availabilityZone>
-- <groupName/>
-- </placement>
-- <kernelId>aki-94c527fd</kernelId>
-- <ramdiskId>ari-96c527ff</ramdiskId>
-- <monitoring>
-- <state>disabled</state>
-- </monitoring>
-- <privateIpAddress>10.198.87.19</privateIpAddress>
-- <ipAddress>184.73.58.78</ipAddress>
-- <architecture>i386</architecture>
-- <rootDeviceType>ebs</rootDeviceType>
-- <rootDeviceName>/dev/sda1</rootDeviceName>
-- <blockDeviceMapping>
-- <item>
-- <deviceName>/dev/sda1</deviceName>
-- <ebs>
-- <volumeId>vol-a282c1cb</volumeId>
-- <status>attached</status>
-- <attachTime>2010-08-17T01:15:23.000Z</attachTime>
-- <deleteOnTermination>false</deleteOnTermination>
-- </ebs>
-- </item>
-- </blockDeviceMapping>
-- <instanceLifecycle>spot</instanceLifecycle>
-- <spotInstanceRequestId>sir-55a3aa02</spotInstanceRequestId>
-- <virtualizationType>paravirtual</virtualizationType>
-- <clientToken/>
-- <tagSet/>
-- <hypervisor>xen</hypervisor>
-- </item>
-- </instancesSet>
-- <requesterId>854251627541</requesterId>
-- </item>
-- </reservationSet>
--</DescribeInstancesResponse>
--`
+-/*
+- Uint (uint and []uint)
+- --------------------------------------------------
+-*/
-
--// http://goo.gl/mLbmw
--var DescribeInstancesExample2 = `
--<DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2011-12-15/">
-- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
-- <reservationSet>
-- <item>
-- <reservationId>r-bc7e30d7</reservationId>
-- <ownerId>999988887777</ownerId>
-- <groupSet>
-- <item>
-- <groupId>sg-67ad940e</groupId>
-- <groupName>default</groupName>
-- </item>
-- </groupSet>
-- <instancesSet>
-- <item>
-- <instanceId>i-c7cd56ad</instanceId>
-- <imageId>ami-b232d0db</imageId>
-- <instanceState>
-- <code>16</code>
-- <name>running</name>
-- </instanceState>
-- <privateDnsName>domU-12-31-39-01-76-06.compute-1.internal</privateDnsName>
-- <dnsName>ec2-72-44-52-124.compute-1.amazonaws.com</dnsName>
-- <keyName>GSG_Keypair</keyName>
-- <amiLaunchIndex>0</amiLaunchIndex>
-- <productCodes/>
-- <instanceType>m1.small</instanceType>
-- <launchTime>2010-08-17T01:15:16.000Z</launchTime>
-- <placement>
-- <availabilityZone>us-east-1b</availabilityZone>
-- </placement>
-- <kernelId>aki-94c527fd</kernelId>
-- <ramdiskId>ari-96c527ff</ramdiskId>
-- <monitoring>
-- <state>disabled</state>
-- </monitoring>
-- <privateIpAddress>10.255.121.240</privateIpAddress>
-- <ipAddress>72.44.52.124</ipAddress>
-- <architecture>i386</architecture>
-- <rootDeviceType>ebs</rootDeviceType>
-- <rootDeviceName>/dev/sda1</rootDeviceName>
-- <blockDeviceMapping>
-- <item>
-- <deviceName>/dev/sda1</deviceName>
-- <ebs>
-- <volumeId>vol-a482c1cd</volumeId>
-- <status>attached</status>
-- <attachTime>2010-08-17T01:15:26.000Z</attachTime>
-- <deleteOnTermination>true</deleteOnTermination>
-- </ebs>
-- </item>
-- </blockDeviceMapping>
-- <virtualizationType>paravirtual</virtualizationType>
-- <clientToken/>
-- <tagSet>
-- <item>
-- <key>webserver</key>
-- <value></value>
-- </item>
-- <item>
-- <key>stack</key>
-- <value>Production</value>
-- </item>
-- </tagSet>
-- <hypervisor>xen</hypervisor>
-- </item>
-- </instancesSet>
-- </item>
-- </reservationSet>
--</DescribeInstancesResponse>
--`
+-// Uint gets the value as a uint, returns the optionalDefault
+-// value or a system default object if the value is the wrong type.
+-func (v *Value) Uint(optionalDefault ...uint) uint {
+- if s, ok := v.data.(uint); ok {
+- return s
+- }
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
+- }
+- return 0
+-}
-
--// http://goo.gl/cxU41
--var CreateImageExample = `
--<CreateImageResponse xmlns="http://ec2.amazonaws.com/doc/2013-02-01/">
-- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
-- <imageId>ami-4fa54026</imageId>
--</CreateImageResponse>
--`
+-// MustUint gets the value as a uint.
+-//
+-// Panics if the object is not a uint.
+-func (v *Value) MustUint() uint {
+- return v.data.(uint)
+-}
-
--// http://goo.gl/V0U25
--var DescribeImagesExample = `
--<DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2012-08-15/">
-- <requestId>4a4a27a2-2e7c-475d-b35b-ca822EXAMPLE</requestId>
-- <imagesSet>
-- <item>
-- <imageId>ami-a2469acf</imageId>
-- <imageLocation>aws-marketplace/example-marketplace-amzn-ami.1</imageLocation>
-- <imageState>available</imageState>
-- <imageOwnerId>123456789999</imageOwnerId>
-- <isPublic>true</isPublic>
-- <productCodes>
-- <item>
-- <productCode>a1b2c3d4e5f6g7h8i9j10k11</productCode>
-- <type>marketplace</type>
-- </item>
-- </productCodes>
-- <architecture>i386</architecture>
-- <imageType>machine</imageType>
-- <kernelId>aki-805ea7e9</kernelId>
-- <imageOwnerAlias>aws-marketplace</imageOwnerAlias>
-- <name>example-marketplace-amzn-ami.1</name>
-- <description>Amazon Linux AMI i386 EBS</description>
-- <rootDeviceType>ebs</rootDeviceType>
-- <rootDeviceName>/dev/sda1</rootDeviceName>
-- <blockDeviceMapping>
-- <item>
-- <deviceName>/dev/sda1</deviceName>
-- <ebs>
-- <snapshotId>snap-787e9403</snapshotId>
-- <volumeSize>8</volumeSize>
-- <deleteOnTermination>true</deleteOnTermination>
-- </ebs>
-- </item>
-- </blockDeviceMapping>
-- <virtualizationType>paravirtual</virtualizationType>
-- <hypervisor>xen</hypervisor>
-- </item>
-- </imagesSet>
--</DescribeImagesResponse>
--`
+-// UintSlice gets the value as a []uint, returns the optionalDefault
+-// value or nil if the value is not a []uint.
+-func (v *Value) UintSlice(optionalDefault ...[]uint) []uint {
+- if s, ok := v.data.([]uint); ok {
+- return s
+- }
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
+- }
+- return nil
+-}
+-
+-// MustUintSlice gets the value as a []uint.
+-//
+-// Panics if the object is not a []uint.
+-func (v *Value) MustUintSlice() []uint {
+- return v.data.([]uint)
+-}
+-
+-// IsUint gets whether the object contained is a uint or not.
+-func (v *Value) IsUint() bool {
+- _, ok := v.data.(uint)
+- return ok
+-}
+-
+-// IsUintSlice gets whether the object contained is a []uint or not.
+-func (v *Value) IsUintSlice() bool {
+- _, ok := v.data.([]uint)
+- return ok
+-}
-
--// http://goo.gl/bHO3z
--var ImageAttributeExample = `
--<DescribeImageAttributeResponse xmlns="http://ec2.amazonaws.com/doc/2013-07-15/">
-- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
-- <imageId>ami-61a54008</imageId>
-- <launchPermission>
-- <item>
-- <group>all</group>
-- </item>
-- <item>
-- <userId>495219933132</userId>
-- </item>
-- </launchPermission>
--</DescribeImageAttributeResponse>
--`
+-// EachUint calls the specified callback for each object
+-// in the []uint.
+-//
+-// Panics if the object is the wrong type.
+-func (v *Value) EachUint(callback func(int, uint) bool) *Value {
-
--// http://goo.gl/ttcda
--var CreateSnapshotExample = `
--<CreateSnapshotResponse xmlns="http://ec2.amazonaws.com/doc/2012-10-01/">
-- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
-- <snapshotId>snap-78a54011</snapshotId>
-- <volumeId>vol-4d826724</volumeId>
-- <status>pending</status>
-- <startTime>2008-05-07T12:51:50.000Z</startTime>
-- <progress>60%</progress>
-- <ownerId>111122223333</ownerId>
-- <volumeSize>10</volumeSize>
-- <description>Daily Backup</description>
--</CreateSnapshotResponse>
--`
+- for index, val := range v.MustUintSlice() {
+- carryon := callback(index, val)
+- if carryon == false {
+- break
+- }
+- }
-
--// http://goo.gl/vwU1y
--var DeleteSnapshotExample = `
--<DeleteSnapshotResponse xmlns="http://ec2.amazonaws.com/doc/2012-10-01/">
-- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
-- <return>true</return>
--</DeleteSnapshotResponse>
--`
+- return v
-
--// http://goo.gl/nkovs
--var DescribeSnapshotsExample = `
--<DescribeSnapshotsResponse xmlns="http://ec2.amazonaws.com/doc/2012-10-01/">
-- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
-- <snapshotSet>
-- <item>
-- <snapshotId>snap-1a2b3c4d</snapshotId>
-- <volumeId>vol-8875daef</volumeId>
-- <status>pending</status>
-- <startTime>2010-07-29T04:12:01.000Z</startTime>
-- <progress>30%</progress>
-- <ownerId>111122223333</ownerId>
-- <volumeSize>15</volumeSize>
-- <description>Daily Backup</description>
-- <tagSet>
-- <item>
-- <key>Purpose</key>
-- <value>demo_db_14_backup</value>
-- </item>
-- </tagSet>
-- </item>
-- </snapshotSet>
--</DescribeSnapshotsResponse>
--`
+-}
-
--// http://goo.gl/YUjO4G
--var ModifyImageAttributeExample = `
--<ModifyImageAttributeResponse xmlns="http://ec2.amazonaws.com/doc/2013-06-15/">
-- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
-- <return>true</return>
--</ModifyImageAttributeResponse>
--`
+-// WhereUint uses the specified decider function to select items
+-// from the []uint. The object contained in the result will contain
+-// only the selected items.
+-func (v *Value) WhereUint(decider func(int, uint) bool) *Value {
-
--// http://goo.gl/hQwPCK
--var CopyImageExample = `
--<CopyImageResponse xmlns="http://ec2.amazonaws.com/doc/2013-06-15/">
-- <requestId>60bc441d-fa2c-494d-b155-5d6a3EXAMPLE</requestId>
-- <imageId>ami-4d3c2b1a</imageId>
--</CopyImageResponse>
--`
+- var selected []uint
-
--var CreateKeyPairExample = `
--<CreateKeyPairResponse xmlns="http://ec2.amazonaws.com/doc/2013-02-01/">
-- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
-- <keyName>foo</keyName>
-- <keyFingerprint>
-- 00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-- </keyFingerprint>
-- <keyMaterial>---- BEGIN RSA PRIVATE KEY ----
--MIICiTCCAfICCQD6m7oRw0uXOjANBgkqhkiG9w0BAQUFADCBiDELMAkGA1UEBhMC
--VVMxCzAJBgNVBAgTAldBMRAwDgYDVQQHEwdTZWF0dGxlMQ8wDQYDVQQKEwZBbWF6
--b24xFDASBgNVBAsTC0lBTSBDb25zb2xlMRIwEAYDVQQDEwlUZXN0Q2lsYWMxHzAd
--BgkqhkiG9w0BCQEWEG5vb25lQGFtYXpvbi5jb20wHhcNMTEwNDI1MjA0NTIxWhcN
--MTIwNDI0MjA0NTIxWjCBiDELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAldBMRAwDgYD
--VQQHEwdTZWF0dGxlMQ8wDQYDVQQKEwZBbWF6b24xFDASBgNVBAsTC0lBTSBDb25z
--b2xlMRIwEAYDVQQDEwlUZXN0Q2lsYWMxHzAdBgkqhkiG9w0BCQEWEG5vb25lQGFt
--YXpvbi5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMaK0dn+a4GmWIWJ
--21uUSfwfEvySWtC2XADZ4nB+BLYgVIk60CpiwsZ3G93vUEIO3IyNoH/f0wYK8m9T
--rDHudUZg3qX4waLG5M43q7Wgc/MbQITxOUSQv7c7ugFFDzQGBzZswY6786m86gpE
--Ibb3OhjZnzcvQAaRHhdlQWIMm2nrAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAtCu4
--nUhVVxYUntneD9+h8Mg9q6q+auNKyExzyLwaxlAoo7TJHidbtS4J5iNmZgXL0Fkb
--FFBjvSfpJIlJ00zbhNYS5f6GuoEDmFJl0ZxBHjJnyp378OD8uTs7fLvjx79LjSTb
--NYiytVbZPQUQ5Yaxu2jXnimvw3rrszlaEXAMPLE=
-------END RSA PRIVATE KEY-----
--</keyMaterial>
--</CreateKeyPairResponse>
--`
+- v.EachUint(func(index int, val uint) bool {
+- shouldSelect := decider(index, val)
+- if shouldSelect == false {
+- selected = append(selected, val)
+- }
+- return true
+- })
-
--var DeleteKeyPairExample = `
--<DeleteKeyPairResponse xmlns="http://ec2.amazonaws.com/doc/2013-02-01/">
-- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
-- <return>true</return>
--</DeleteKeyPairResponse>
--`
+- return &Value{data: selected}
-
--// http://goo.gl/Eo7Yl
--var CreateSecurityGroupExample = `
--<CreateSecurityGroupResponse xmlns="http://ec2.amazonaws.com/doc/2011-12-15/">
-- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
-- <return>true</return>
-- <groupId>sg-67ad940e</groupId>
--</CreateSecurityGroupResponse>
--`
+-}
-
--// http://goo.gl/k12Uy
--var DescribeSecurityGroupsExample = `
--<DescribeSecurityGroupsResponse xmlns="http://ec2.amazonaws.com/doc/2011-12-15/">
-- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
-- <securityGroupInfo>
-- <item>
-- <ownerId>999988887777</ownerId>
-- <groupName>WebServers</groupName>
-- <groupId>sg-67ad940e</groupId>
-- <groupDescription>Web Servers</groupDescription>
-- <ipPermissions>
-- <item>
-- <ipProtocol>tcp</ipProtocol>
-- <fromPort>80</fromPort>
-- <toPort>80</toPort>
-- <groups/>
-- <ipRanges>
-- <item>
-- <cidrIp>0.0.0.0/0</cidrIp>
-- </item>
-- </ipRanges>
-- </item>
-- </ipPermissions>
-- </item>
-- <item>
-- <ownerId>999988887777</ownerId>
-- <groupName>RangedPortsBySource</groupName>
-- <groupId>sg-76abc467</groupId>
-- <groupDescription>Group A</groupDescription>
-- <ipPermissions>
-- <item>
-- <ipProtocol>tcp</ipProtocol>
-- <fromPort>6000</fromPort>
-- <toPort>7000</toPort>
-- <groups/>
-- <ipRanges/>
-- </item>
-- </ipPermissions>
-- </item>
-- </securityGroupInfo>
--</DescribeSecurityGroupsResponse>
--`
+-// GroupUint uses the specified grouper function to group the items
+-// keyed by the return of the grouper. The object contained in the
+-// result will contain a map[string][]uint.
+-func (v *Value) GroupUint(grouper func(int, uint) string) *Value {
-
--// A dump which includes groups within ip permissions.
--var DescribeSecurityGroupsDump = `
--<?xml version="1.0" encoding="UTF-8"?>
--<DescribeSecurityGroupsResponse xmlns="http://ec2.amazonaws.com/doc/2011-12-15/">
-- <requestId>87b92b57-cc6e-48b2-943f-f6f0e5c9f46c</requestId>
-- <securityGroupInfo>
-- <item>
-- <ownerId>12345</ownerId>
-- <groupName>default</groupName>
-- <groupDescription>default group</groupDescription>
-- <ipPermissions>
-- <item>
-- <ipProtocol>icmp</ipProtocol>
-- <fromPort>-1</fromPort>
-- <toPort>-1</toPort>
-- <groups>
-- <item>
-- <userId>12345</userId>
-- <groupName>default</groupName>
-- <groupId>sg-67ad940e</groupId>
-- </item>
-- </groups>
-- <ipRanges/>
-- </item>
-- <item>
-- <ipProtocol>tcp</ipProtocol>
-- <fromPort>0</fromPort>
-- <toPort>65535</toPort>
-- <groups>
-- <item>
-- <userId>12345</userId>
-- <groupName>other</groupName>
-- <groupId>sg-76abc467</groupId>
-- </item>
-- </groups>
-- <ipRanges/>
-- </item>
-- </ipPermissions>
-- </item>
-- </securityGroupInfo>
--</DescribeSecurityGroupsResponse>
--`
+- groups := make(map[string][]uint)
-
--// http://goo.gl/QJJDO
--var DeleteSecurityGroupExample = `
--<DeleteSecurityGroupResponse xmlns="http://ec2.amazonaws.com/doc/2011-12-15/">
-- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
-- <return>true</return>
--</DeleteSecurityGroupResponse>
--`
+- v.EachUint(func(index int, val uint) bool {
+- group := grouper(index, val)
+- if _, ok := groups[group]; !ok {
+- groups[group] = make([]uint, 0)
+- }
+- groups[group] = append(groups[group], val)
+- return true
+- })
-
--// http://goo.gl/u2sDJ
--var AuthorizeSecurityGroupIngressExample = `
--<AuthorizeSecurityGroupIngressResponse xmlns="http://ec2.amazonaws.com/doc/2011-12-15/">
-- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
-- <return>true</return>
--</AuthorizeSecurityGroupIngressResponse>
--`
+- return &Value{data: groups}
-
--// http://goo.gl/u2sDJ
--var AuthorizeSecurityGroupEgressExample = `
--<AuthorizeSecurityGroupEgressResponse xmlns="http://ec2.amazonaws.com/doc/2014-06-15/">
-- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
-- <return>true</return>
--</AuthorizeSecurityGroupEgressResponse>
--`
+-}
-
--// http://goo.gl/Mz7xr
--var RevokeSecurityGroupIngressExample = `
--<RevokeSecurityGroupIngressResponse xmlns="http://ec2.amazonaws.com/doc/2011-12-15/">
-- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
-- <return>true</return>
--</RevokeSecurityGroupIngressResponse>
--`
+-// ReplaceUint uses the specified function to replace each uints
+-// by iterating each item. The data in the returned result will be a
+-// []uint containing the replaced items.
+-func (v *Value) ReplaceUint(replacer func(int, uint) uint) *Value {
-
--// http://goo.gl/Vmkqc
--var CreateTagsExample = `
--<CreateTagsResponse xmlns="http://ec2.amazonaws.com/doc/2011-12-15/">
-- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
-- <return>true</return>
--</CreateTagsResponse>
--`
+- arr := v.MustUintSlice()
+- replaced := make([]uint, len(arr))
-
--// http://goo.gl/awKeF
--var StartInstancesExample = `
--<StartInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2011-12-15/">
-- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
-- <instancesSet>
-- <item>
-- <instanceId>i-10a64379</instanceId>
-- <currentState>
-- <code>0</code>
-- <name>pending</name>
-- </currentState>
-- <previousState>
-- <code>80</code>
-- <name>stopped</name>
-- </previousState>
-- </item>
-- </instancesSet>
--</StartInstancesResponse>
--`
+- v.EachUint(func(index int, val uint) bool {
+- replaced[index] = replacer(index, val)
+- return true
+- })
-
--// http://goo.gl/436dJ
--var StopInstancesExample = `
--<StopInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2011-12-15/">
-- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
-- <instancesSet>
-- <item>
-- <instanceId>i-10a64379</instanceId>
-- <currentState>
-- <code>64</code>
-- <name>stopping</name>
-- </currentState>
-- <previousState>
-- <code>16</code>
-- <name>running</name>
-- </previousState>
-- </item>
-- </instancesSet>
--</StopInstancesResponse>
--`
+- return &Value{data: replaced}
-
--// http://goo.gl/baoUf
--var RebootInstancesExample = `
--<RebootInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2011-12-15/">
-- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
-- <return>true</return>
--</RebootInstancesResponse>
--`
+-}
-
--// http://goo.gl/9rprDN
--var AllocateAddressExample = `
--<AllocateAddressResponse xmlns="http://ec2.amazonaws.com/doc/2013-10-15/">
-- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
-- <publicIp>198.51.100.1</publicIp>
-- <domain>vpc</domain>
-- <allocationId>eipalloc-5723d13e</allocationId>
--</AllocateAddressResponse>
--`
+-// CollectUint uses the specified collector function to collect a value
+-// for each of the uints in the slice. The data returned will be a
+-// []interface{}.
+-func (v *Value) CollectUint(collector func(int, uint) interface{}) *Value {
-
--// http://goo.gl/3Q0oCc
--var ReleaseAddressExample = `
--<ReleaseAddressResponse xmlns="http://ec2.amazonaws.com/doc/2013-10-15/">
-- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
-- <return>true</return>
--</ReleaseAddressResponse>
--`
+- arr := v.MustUintSlice()
+- collected := make([]interface{}, len(arr))
-
--// http://goo.gl/uOSQE
--var AssociateAddressExample = `
--<AssociateAddressResponse xmlns="http://ec2.amazonaws.com/doc/2013-10-15/">
-- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
-- <return>true</return>
-- <associationId>eipassoc-fc5ca095</associationId>
--</AssociateAddressResponse>
--`
+- v.EachUint(func(index int, val uint) bool {
+- collected[index] = collector(index, val)
+- return true
+- })
-
--// http://goo.gl/LrOa0
--var DisassociateAddressExample = `
--<DisassociateAddressResponse xmlns="http://ec2.amazonaws.com/doc/2013-10-15/">
-- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
-- <return>true</return>
--</DisassociateAddressResponse>
--`
+- return &Value{data: collected}
+-}
-
--// http://goo.gl/icuXh5
--var ModifyInstanceExample = `
--<ModifyImageAttributeResponse xmlns="http://ec2.amazonaws.com/doc/2013-06-15/">
-- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
-- <return>true</return>
--</ModifyImageAttributeResponse>
--`
+-/*
+- Uint8 (uint8 and []uint8)
+- --------------------------------------------------
+-*/
-
--var CreateVpcExample = `
--<CreateVpcResponse xmlns="http://ec2.amazonaws.com/doc/2014-06-15/">
-- <requestId>7a62c49f-347e-4fc4-9331-6e8eEXAMPLE</requestId>
-- <vpc>
-- <vpcId>vpc-1a2b3c4d</vpcId>
-- <state>pending</state>
-- <cidrBlock>10.0.0.0/16</cidrBlock>
-- <dhcpOptionsId>dopt-1a2b3c4d2</dhcpOptionsId>
-- <instanceTenancy>default</instanceTenancy>
-- <tagSet/>
-- </vpc>
--</CreateVpcResponse>
--`
+-// Uint8 gets the value as a uint8, returns the optionalDefault
+-// value or a system default object if the value is the wrong type.
+-func (v *Value) Uint8(optionalDefault ...uint8) uint8 {
+- if s, ok := v.data.(uint8); ok {
+- return s
+- }
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
+- }
+- return 0
+-}
-
--var DescribeVpcsExample = `
--<DescribeVpcsResponse xmlns="http://ec2.amazonaws.com/doc/2014-06-15/">
-- <requestId>7a62c49f-347e-4fc4-9331-6e8eEXAMPLE</requestId>
-- <vpcSet>
-- <item>
-- <vpcId>vpc-1a2b3c4d</vpcId>
-- <state>available</state>
-- <cidrBlock>10.0.0.0/23</cidrBlock>
-- <dhcpOptionsId>dopt-7a8b9c2d</dhcpOptionsId>
-- <instanceTenancy>default</instanceTenancy>
-- <isDefault>false</isDefault>
-- <tagSet/>
-- </item>
-- </vpcSet>
--</DescribeVpcsResponse>
--`
+-// MustUint8 gets the value as a uint8.
+-//
+-// Panics if the object is not a uint8.
+-func (v *Value) MustUint8() uint8 {
+- return v.data.(uint8)
+-}
-
--var CreateSubnetExample = `
--<CreateSubnetResponse xmlns="http://ec2.amazonaws.com/doc/2014-06-15/">
-- <requestId>7a62c49f-347e-4fc4-9331-6e8eEXAMPLE</requestId>
-- <subnet>
-- <subnetId>subnet-9d4a7b6c</subnetId>
-- <state>pending</state>
-- <vpcId>vpc-1a2b3c4d</vpcId>
-- <cidrBlock>10.0.1.0/24</cidrBlock>
-- <availableIpAddressCount>251</availableIpAddressCount>
-- <availabilityZone>us-east-1a</availabilityZone>
-- <tagSet/>
-- </subnet>
--</CreateSubnetResponse>
--`
+-// Uint8Slice gets the value as a []uint8, returns the optionalDefault
+-// value or nil if the value is not a []uint8.
+-func (v *Value) Uint8Slice(optionalDefault ...[]uint8) []uint8 {
+- if s, ok := v.data.([]uint8); ok {
+- return s
+- }
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
+- }
+- return nil
+-}
-
--// http://goo.gl/r6ZCPm
--var ResetImageAttributeExample = `
--<ResetImageAttributeResponse xmlns="http://ec2.amazonaws.com/doc/2014-06-15/">
-- <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
-- <return>true</return>
--</ResetImageAttributeResponse>
--`
-diff --git a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/sign.go b/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/sign.go
-deleted file mode 100644
-index bffc3c7..0000000
---- a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/sign.go
-+++ /dev/null
-@@ -1,45 +0,0 @@
--package ec2
+-// MustUint8Slice gets the value as a []uint8.
+-//
+-// Panics if the object is not a []uint8.
+-func (v *Value) MustUint8Slice() []uint8 {
+- return v.data.([]uint8)
+-}
-
--import (
-- "crypto/hmac"
-- "crypto/sha256"
-- "encoding/base64"
-- "github.com/mitchellh/goamz/aws"
-- "sort"
-- "strings"
--)
+-// IsUint8 gets whether the object contained is a uint8 or not.
+-func (v *Value) IsUint8() bool {
+- _, ok := v.data.(uint8)
+- return ok
+-}
-
--// ----------------------------------------------------------------------------
--// EC2 signing (http://goo.gl/fQmAN)
+-// IsUint8Slice gets whether the object contained is a []uint8 or not.
+-func (v *Value) IsUint8Slice() bool {
+- _, ok := v.data.([]uint8)
+- return ok
+-}
-
--var b64 = base64.StdEncoding
+-// EachUint8 calls the specified callback for each object
+-// in the []uint8.
+-//
+-// Panics if the object is the wrong type.
+-func (v *Value) EachUint8(callback func(int, uint8) bool) *Value {
-
--func sign(auth aws.Auth, method, path string, params map[string]string, host string) {
-- params["AWSAccessKeyId"] = auth.AccessKey
-- params["SignatureVersion"] = "2"
-- params["SignatureMethod"] = "HmacSHA256"
-- if auth.Token != "" {
-- params["SecurityToken"] = auth.Token
+- for index, val := range v.MustUint8Slice() {
+- carryon := callback(index, val)
+- if carryon == false {
+- break
+- }
- }
-
-- // AWS specifies that the parameters in a signed request must
-- // be provided in the natural order of the keys. This is distinct
-- // from the natural order of the encoded value of key=value.
-- // Percent and equals affect the sorting order.
-- var keys, sarray []string
-- for k, _ := range params {
-- keys = append(keys, k)
-- }
-- sort.Strings(keys)
-- for _, k := range keys {
-- sarray = append(sarray, aws.Encode(k)+"="+aws.Encode(params[k]))
-- }
-- joined := strings.Join(sarray, "&")
-- payload := method + "\n" + host + "\n" + path + "\n" + joined
-- hash := hmac.New(sha256.New, []byte(auth.SecretKey))
-- hash.Write([]byte(payload))
-- signature := make([]byte, b64.EncodedLen(hash.Size()))
-- b64.Encode(signature, hash.Sum(nil))
+- return v
-
-- params["Signature"] = string(signature)
-}
-diff --git a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/sign_test.go b/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/sign_test.go
-deleted file mode 100644
-index 86d203e..0000000
---- a/Godeps/_workspace/src/github.com/mitchellh/goamz/ec2/sign_test.go
-+++ /dev/null
-@@ -1,68 +0,0 @@
--package ec2_test
-
--import (
-- "github.com/mitchellh/goamz/aws"
-- "github.com/mitchellh/goamz/ec2"
-- . "github.com/motain/gocheck"
--)
+-// WhereUint8 uses the specified decider function to select items
+-// from the []uint8. The object contained in the result will contain
+-// only the selected items.
+-func (v *Value) WhereUint8(decider func(int, uint8) bool) *Value {
-
--// EC2 ReST authentication docs: http://goo.gl/fQmAN
+- var selected []uint8
-
--var testAuth = aws.Auth{"user", "secret", ""}
+- v.EachUint8(func(index int, val uint8) bool {
+- shouldSelect := decider(index, val)
+- if shouldSelect == false {
+- selected = append(selected, val)
+- }
+- return true
+- })
-
--func (s *S) TestBasicSignature(c *C) {
-- params := map[string]string{}
-- ec2.Sign(testAuth, "GET", "/path", params, "localhost")
-- c.Assert(params["SignatureVersion"], Equals, "2")
-- c.Assert(params["SignatureMethod"], Equals, "HmacSHA256")
-- expected := "6lSe5QyXum0jMVc7cOUz32/52ZnL7N5RyKRk/09yiK4="
-- c.Assert(params["Signature"], Equals, expected)
--}
+- return &Value{data: selected}
-
--func (s *S) TestParamSignature(c *C) {
-- params := map[string]string{
-- "param1": "value1",
-- "param2": "value2",
-- "param3": "value3",
-- }
-- ec2.Sign(testAuth, "GET", "/path", params, "localhost")
-- expected := "XWOR4+0lmK8bD8CGDGZ4kfuSPbb2JibLJiCl/OPu1oU="
-- c.Assert(params["Signature"], Equals, expected)
-}
-
--func (s *S) TestManyParams(c *C) {
-- params := map[string]string{
-- "param1": "value10",
-- "param2": "value2",
-- "param3": "value3",
-- "param4": "value4",
-- "param5": "value5",
-- "param6": "value6",
-- "param7": "value7",
-- "param8": "value8",
-- "param9": "value9",
-- "param10": "value1",
-- }
-- ec2.Sign(testAuth, "GET", "/path", params, "localhost")
-- expected := "di0sjxIvezUgQ1SIL6i+C/H8lL+U0CQ9frLIak8jkVg="
-- c.Assert(params["Signature"], Equals, expected)
--}
+-// GroupUint8 uses the specified grouper function to group the items
+-// keyed by the return of the grouper. The object contained in the
+-// result will contain a map[string][]uint8.
+-func (v *Value) GroupUint8(grouper func(int, uint8) string) *Value {
-
--func (s *S) TestEscaping(c *C) {
-- params := map[string]string{"Nonce": "+ +"}
-- ec2.Sign(testAuth, "GET", "/path", params, "localhost")
-- c.Assert(params["Nonce"], Equals, "+ +")
-- expected := "bqffDELReIqwjg/W0DnsnVUmfLK4wXVLO4/LuG+1VFA="
-- c.Assert(params["Signature"], Equals, expected)
--}
+- groups := make(map[string][]uint8)
-
--func (s *S) TestSignatureExample1(c *C) {
-- params := map[string]string{
-- "Timestamp": "2009-02-01T12:53:20+00:00",
-- "Version": "2007-11-07",
-- "Action": "ListDomains",
-- }
-- ec2.Sign(aws.Auth{"access", "secret", ""}, "GET", "/", params, "sdb.amazonaws.com")
-- expected := "okj96/5ucWBSc1uR2zXVfm6mDHtgfNv657rRtt/aunQ="
-- c.Assert(params["Signature"], Equals, expected)
--}
-diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/LICENSE b/Godeps/_workspace/src/github.com/mitchellh/mapstructure/LICENSE
-deleted file mode 100644
-index f9c841a..0000000
---- a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/LICENSE
-+++ /dev/null
-@@ -1,21 +0,0 @@
--The MIT License (MIT)
+- v.EachUint8(func(index int, val uint8) bool {
+- group := grouper(index, val)
+- if _, ok := groups[group]; !ok {
+- groups[group] = make([]uint8, 0)
+- }
+- groups[group] = append(groups[group], val)
+- return true
+- })
-
--Copyright (c) 2013 Mitchell Hashimoto
+- return &Value{data: groups}
-
--Permission is hereby granted, free of charge, to any person obtaining a copy
--of this software and associated documentation files (the "Software"), to deal
--in the Software without restriction, including without limitation the rights
--to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
--copies of the Software, and to permit persons to whom the Software is
--furnished to do so, subject to the following conditions:
+-}
-
--The above copyright notice and this permission notice shall be included in
--all copies or substantial portions of the Software.
+-// ReplaceUint8 uses the specified function to replace each uint8s
+-// by iterating each item. The data in the returned result will be a
+-// []uint8 containing the replaced items.
+-func (v *Value) ReplaceUint8(replacer func(int, uint8) uint8) *Value {
-
--THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
--IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
--AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
--LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
--OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
--THE SOFTWARE.
-diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/README.md b/Godeps/_workspace/src/github.com/mitchellh/mapstructure/README.md
-deleted file mode 100644
-index 659d688..0000000
---- a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/README.md
-+++ /dev/null
-@@ -1,46 +0,0 @@
--# mapstructure
+- arr := v.MustUint8Slice()
+- replaced := make([]uint8, len(arr))
-
--mapstructure is a Go library for decoding generic map values to structures
--and vice versa, while providing helpful error handling.
+- v.EachUint8(func(index int, val uint8) bool {
+- replaced[index] = replacer(index, val)
+- return true
+- })
-
--This library is most useful when decoding values from some data stream (JSON,
--Gob, etc.) where you don't _quite_ know the structure of the underlying data
--until you read a part of it. You can therefore read a `map[string]interface{}`
--and use this library to decode it into the proper underlying native Go
--structure.
+- return &Value{data: replaced}
-
--## Installation
+-}
-
--Standard `go get`:
+-// CollectUint8 uses the specified collector function to collect a value
+-// for each of the uint8s in the slice. The data returned will be a
+-// []interface{}.
+-func (v *Value) CollectUint8(collector func(int, uint8) interface{}) *Value {
-
--```
--$ go get github.com/mitchellh/mapstructure
--```
+- arr := v.MustUint8Slice()
+- collected := make([]interface{}, len(arr))
-
--## Usage & Example
+- v.EachUint8(func(index int, val uint8) bool {
+- collected[index] = collector(index, val)
+- return true
+- })
-
--For usage and examples see the [Godoc](http://godoc.org/github.com/mitchellh/mapstructure).
+- return &Value{data: collected}
+-}
-
--The `Decode` function has examples associated with it there.
+-/*
+- Uint16 (uint16 and []uint16)
+- --------------------------------------------------
+-*/
-
--## But Why?!
+-// Uint16 gets the value as a uint16, returns the optionalDefault
+-// value or a system default object if the value is the wrong type.
+-func (v *Value) Uint16(optionalDefault ...uint16) uint16 {
+- if s, ok := v.data.(uint16); ok {
+- return s
+- }
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
+- }
+- return 0
+-}
-
--Go offers fantastic standard libraries for decoding formats such as JSON.
--The standard method is to have a struct pre-created, and populate that struct
--from the bytes of the encoded format. This is great, but the problem is if
--you have configuration or an encoding that changes slightly depending on
--specific fields. For example, consider this JSON:
+-// MustUint16 gets the value as a uint16.
+-//
+-// Panics if the object is not a uint16.
+-func (v *Value) MustUint16() uint16 {
+- return v.data.(uint16)
+-}
-
--```json
--{
-- "type": "person",
-- "name": "Mitchell"
+-// Uint16Slice gets the value as a []uint16, returns the optionalDefault
+-// value or nil if the value is not a []uint16.
+-func (v *Value) Uint16Slice(optionalDefault ...[]uint16) []uint16 {
+- if s, ok := v.data.([]uint16); ok {
+- return s
+- }
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
+- }
+- return nil
-}
--```
-
--Perhaps we can't populate a specific structure without first reading
--the "type" field from the JSON. We could always do two passes over the
--decoding of the JSON (reading the "type" first, and the rest later).
--However, it is much simpler to just decode this into a `map[string]interface{}`
--structure, read the "type" key, then use something like this library
--to decode it into the proper structure.
-diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/decode_hooks.go b/Godeps/_workspace/src/github.com/mitchellh/mapstructure/decode_hooks.go
-deleted file mode 100644
-index 087a392..0000000
---- a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/decode_hooks.go
-+++ /dev/null
-@@ -1,84 +0,0 @@
--package mapstructure
+-// MustUint16Slice gets the value as a []uint16.
+-//
+-// Panics if the object is not a []uint16.
+-func (v *Value) MustUint16Slice() []uint16 {
+- return v.data.([]uint16)
+-}
-
--import (
-- "reflect"
-- "strconv"
-- "strings"
--)
+-// IsUint16 gets whether the object contained is a uint16 or not.
+-func (v *Value) IsUint16() bool {
+- _, ok := v.data.(uint16)
+- return ok
+-}
-
--// ComposeDecodeHookFunc creates a single DecodeHookFunc that
--// automatically composes multiple DecodeHookFuncs.
+-// IsUint16Slice gets whether the object contained is a []uint16 or not.
+-func (v *Value) IsUint16Slice() bool {
+- _, ok := v.data.([]uint16)
+- return ok
+-}
+-
+-// EachUint16 calls the specified callback for each object
+-// in the []uint16.
-//
--// The composed funcs are called in order, with the result of the
--// previous transformation.
--func ComposeDecodeHookFunc(fs ...DecodeHookFunc) DecodeHookFunc {
-- return func(
-- f reflect.Kind,
-- t reflect.Kind,
-- data interface{}) (interface{}, error) {
-- var err error
-- for _, f1 := range fs {
-- data, err = f1(f, t, data)
-- if err != nil {
-- return nil, err
-- }
+-// Panics if the object is the wrong type.
+-func (v *Value) EachUint16(callback func(int, uint16) bool) *Value {
-
-- // Modify the from kind to be correct with the new data
-- f = getKind(reflect.ValueOf(data))
+- for index, val := range v.MustUint16Slice() {
+- carryon := callback(index, val)
+- if carryon == false {
+- break
- }
--
-- return data, nil
- }
+-
+- return v
+-
-}
-
--// StringToSliceHookFunc returns a DecodeHookFunc that converts
--// string to []string by splitting on the given sep.
--func StringToSliceHookFunc(sep string) DecodeHookFunc {
-- return func(
-- f reflect.Kind,
-- t reflect.Kind,
-- data interface{}) (interface{}, error) {
-- if f != reflect.String || t != reflect.Slice {
-- return data, nil
-- }
+-// WhereUint16 uses the specified decider function to select items
+-// from the []uint16. The object contained in the result will contain
+-// only the selected items.
+-func (v *Value) WhereUint16(decider func(int, uint16) bool) *Value {
-
-- raw := data.(string)
-- if raw == "" {
-- return []string{}, nil
+- var selected []uint16
+-
+- v.EachUint16(func(index int, val uint16) bool {
+- shouldSelect := decider(index, val)
+- if shouldSelect == false {
+- selected = append(selected, val)
- }
+- return true
+- })
+-
+- return &Value{data: selected}
-
-- return strings.Split(raw, sep), nil
-- }
-}
-
--func WeaklyTypedHook(
-- f reflect.Kind,
-- t reflect.Kind,
-- data interface{}) (interface{}, error) {
-- dataVal := reflect.ValueOf(data)
-- switch t {
-- case reflect.String:
-- switch f {
-- case reflect.Bool:
-- if dataVal.Bool() {
-- return "1", nil
-- } else {
-- return "0", nil
-- }
-- case reflect.Float32:
-- return strconv.FormatFloat(dataVal.Float(), 'f', -1, 64), nil
-- case reflect.Int:
-- return strconv.FormatInt(dataVal.Int(), 10), nil
-- case reflect.Slice:
-- dataType := dataVal.Type()
-- elemKind := dataType.Elem().Kind()
-- if elemKind == reflect.Uint8 {
-- return string(dataVal.Interface().([]uint8)), nil
-- }
-- case reflect.Uint:
-- return strconv.FormatUint(dataVal.Uint(), 10), nil
+-// GroupUint16 uses the specified grouper function to group the items
+-// keyed by the return of the grouper. The object contained in the
+-// result will contain a map[string][]uint16.
+-func (v *Value) GroupUint16(grouper func(int, uint16) string) *Value {
+-
+- groups := make(map[string][]uint16)
+-
+- v.EachUint16(func(index int, val uint16) bool {
+- group := grouper(index, val)
+- if _, ok := groups[group]; !ok {
+- groups[group] = make([]uint16, 0)
- }
-- }
+- groups[group] = append(groups[group], val)
+- return true
+- })
+-
+- return &Value{data: groups}
-
-- return data, nil
-}
-diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/decode_hooks_test.go b/Godeps/_workspace/src/github.com/mitchellh/mapstructure/decode_hooks_test.go
-deleted file mode 100644
-index b417dee..0000000
---- a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/decode_hooks_test.go
-+++ /dev/null
-@@ -1,191 +0,0 @@
--package mapstructure
-
--import (
-- "errors"
-- "reflect"
-- "testing"
--)
+-// ReplaceUint16 uses the specified function to replace each uint16s
+-// by iterating each item. The data in the returned result will be a
+-// []uint16 containing the replaced items.
+-func (v *Value) ReplaceUint16(replacer func(int, uint16) uint16) *Value {
-
--func TestComposeDecodeHookFunc(t *testing.T) {
-- f1 := func(
-- f reflect.Kind,
-- t reflect.Kind,
-- data interface{}) (interface{}, error) {
-- return data.(string) + "foo", nil
-- }
+- arr := v.MustUint16Slice()
+- replaced := make([]uint16, len(arr))
-
-- f2 := func(
-- f reflect.Kind,
-- t reflect.Kind,
-- data interface{}) (interface{}, error) {
-- return data.(string) + "bar", nil
-- }
+- v.EachUint16(func(index int, val uint16) bool {
+- replaced[index] = replacer(index, val)
+- return true
+- })
-
-- f := ComposeDecodeHookFunc(f1, f2)
+- return &Value{data: replaced}
-
-- result, err := f(reflect.String, reflect.Slice, "")
-- if err != nil {
-- t.Fatalf("bad: %s", err)
-- }
-- if result.(string) != "foobar" {
-- t.Fatalf("bad: %#v", result)
-- }
-}
-
--func TestComposeDecodeHookFunc_err(t *testing.T) {
-- f1 := func(reflect.Kind, reflect.Kind, interface{}) (interface{}, error) {
-- return nil, errors.New("foo")
-- }
+-// CollectUint16 uses the specified collector function to collect a value
+-// for each of the uint16s in the slice. The data returned will be a
+-// []interface{}.
+-func (v *Value) CollectUint16(collector func(int, uint16) interface{}) *Value {
-
-- f2 := func(reflect.Kind, reflect.Kind, interface{}) (interface{}, error) {
-- panic("NOPE")
-- }
+- arr := v.MustUint16Slice()
+- collected := make([]interface{}, len(arr))
-
-- f := ComposeDecodeHookFunc(f1, f2)
+- v.EachUint16(func(index int, val uint16) bool {
+- collected[index] = collector(index, val)
+- return true
+- })
-
-- _, err := f(reflect.String, reflect.Slice, 42)
-- if err.Error() != "foo" {
-- t.Fatalf("bad: %s", err)
-- }
+- return &Value{data: collected}
-}
-
--func TestComposeDecodeHookFunc_kinds(t *testing.T) {
-- var f2From reflect.Kind
+-/*
+- Uint32 (uint32 and []uint32)
+- --------------------------------------------------
+-*/
-
-- f1 := func(
-- f reflect.Kind,
-- t reflect.Kind,
-- data interface{}) (interface{}, error) {
-- return int(42), nil
+-// Uint32 gets the value as a uint32, returns the optionalDefault
+-// value or a system default object if the value is the wrong type.
+-func (v *Value) Uint32(optionalDefault ...uint32) uint32 {
+- if s, ok := v.data.(uint32); ok {
+- return s
- }
--
-- f2 := func(
-- f reflect.Kind,
-- t reflect.Kind,
-- data interface{}) (interface{}, error) {
-- f2From = f
-- return data, nil
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
- }
+- return 0
+-}
-
-- f := ComposeDecodeHookFunc(f1, f2)
+-// MustUint32 gets the value as a uint32.
+-//
+-// Panics if the object is not a uint32.
+-func (v *Value) MustUint32() uint32 {
+- return v.data.(uint32)
+-}
-
-- _, err := f(reflect.String, reflect.Slice, "")
-- if err != nil {
-- t.Fatalf("bad: %s", err)
+-// Uint32Slice gets the value as a []uint32, returns the optionalDefault
+-// value or nil if the value is not a []uint32.
+-func (v *Value) Uint32Slice(optionalDefault ...[]uint32) []uint32 {
+- if s, ok := v.data.([]uint32); ok {
+- return s
- }
-- if f2From != reflect.Int {
-- t.Fatalf("bad: %#v", f2From)
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
- }
+- return nil
-}
-
--func TestStringToSliceHookFunc(t *testing.T) {
-- f := StringToSliceHookFunc(",")
--
-- cases := []struct {
-- f, t reflect.Kind
-- data interface{}
-- result interface{}
-- err bool
-- }{
-- {reflect.Slice, reflect.Slice, 42, 42, false},
-- {reflect.String, reflect.String, 42, 42, false},
-- {
-- reflect.String,
-- reflect.Slice,
-- "foo,bar,baz",
-- []string{"foo", "bar", "baz"},
-- false,
-- },
-- {
-- reflect.String,
-- reflect.Slice,
-- "",
-- []string{},
-- false,
-- },
-- }
+-// MustUint32Slice gets the value as a []uint32.
+-//
+-// Panics if the object is not a []uint32.
+-func (v *Value) MustUint32Slice() []uint32 {
+- return v.data.([]uint32)
+-}
-
-- for i, tc := range cases {
-- actual, err := f(tc.f, tc.t, tc.data)
-- if tc.err != (err != nil) {
-- t.Fatalf("case %d: expected err %#v", i, tc.err)
-- }
-- if !reflect.DeepEqual(actual, tc.result) {
-- t.Fatalf(
-- "case %d: expected %#v, got %#v",
-- i, tc.result, actual)
+-// IsUint32 gets whether the object contained is a uint32 or not.
+-func (v *Value) IsUint32() bool {
+- _, ok := v.data.(uint32)
+- return ok
+-}
+-
+-// IsUint32Slice gets whether the object contained is a []uint32 or not.
+-func (v *Value) IsUint32Slice() bool {
+- _, ok := v.data.([]uint32)
+- return ok
+-}
+-
+-// EachUint32 calls the specified callback for each object
+-// in the []uint32.
+-//
+-// Panics if the object is the wrong type.
+-func (v *Value) EachUint32(callback func(int, uint32) bool) *Value {
+-
+- for index, val := range v.MustUint32Slice() {
+- carryon := callback(index, val)
+- if carryon == false {
+- break
- }
- }
+-
+- return v
+-
-}
-
--func TestWeaklyTypedHook(t *testing.T) {
-- var f DecodeHookFunc = WeaklyTypedHook
+-// WhereUint32 uses the specified decider function to select items
+-// from the []uint32. The object contained in the result will contain
+-// only the selected items.
+-func (v *Value) WhereUint32(decider func(int, uint32) bool) *Value {
-
-- cases := []struct {
-- f, t reflect.Kind
-- data interface{}
-- result interface{}
-- err bool
-- }{
-- // TO STRING
-- {
-- reflect.Bool,
-- reflect.String,
-- false,
-- "0",
-- false,
-- },
+- var selected []uint32
-
-- {
-- reflect.Bool,
-- reflect.String,
-- true,
-- "1",
-- false,
-- },
+- v.EachUint32(func(index int, val uint32) bool {
+- shouldSelect := decider(index, val)
+- if shouldSelect == false {
+- selected = append(selected, val)
+- }
+- return true
+- })
-
-- {
-- reflect.Float32,
-- reflect.String,
-- float32(7),
-- "7",
-- false,
-- },
+- return &Value{data: selected}
-
-- {
-- reflect.Int,
-- reflect.String,
-- int(7),
-- "7",
-- false,
-- },
+-}
-
-- {
-- reflect.Slice,
-- reflect.String,
-- []uint8("foo"),
-- "foo",
-- false,
-- },
+-// GroupUint32 uses the specified grouper function to group the items
+-// keyed by the return of the grouper. The object contained in the
+-// result will contain a map[string][]uint32.
+-func (v *Value) GroupUint32(grouper func(int, uint32) string) *Value {
-
-- {
-- reflect.Uint,
-- reflect.String,
-- uint(7),
-- "7",
-- false,
-- },
-- }
+- groups := make(map[string][]uint32)
-
-- for i, tc := range cases {
-- actual, err := f(tc.f, tc.t, tc.data)
-- if tc.err != (err != nil) {
-- t.Fatalf("case %d: expected err %#v", i, tc.err)
-- }
-- if !reflect.DeepEqual(actual, tc.result) {
-- t.Fatalf(
-- "case %d: expected %#v, got %#v",
-- i, tc.result, actual)
+- v.EachUint32(func(index int, val uint32) bool {
+- group := grouper(index, val)
+- if _, ok := groups[group]; !ok {
+- groups[group] = make([]uint32, 0)
- }
-- }
--}
-diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/error.go b/Godeps/_workspace/src/github.com/mitchellh/mapstructure/error.go
-deleted file mode 100644
-index 3460799..0000000
---- a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/error.go
-+++ /dev/null
-@@ -1,32 +0,0 @@
--package mapstructure
+- groups[group] = append(groups[group], val)
+- return true
+- })
-
--import (
-- "fmt"
-- "strings"
--)
+- return &Value{data: groups}
-
--// Error implements the error interface and can represents multiple
--// errors that occur in the course of a single decode.
--type Error struct {
-- Errors []string
-}
-
--func (e *Error) Error() string {
-- points := make([]string, len(e.Errors))
-- for i, err := range e.Errors {
-- points[i] = fmt.Sprintf("* %s", err)
-- }
+-// ReplaceUint32 uses the specified function to replace each uint32s
+-// by iterating each item. The data in the returned result will be a
+-// []uint32 containing the replaced items.
+-func (v *Value) ReplaceUint32(replacer func(int, uint32) uint32) *Value {
-
-- return fmt.Sprintf(
-- "%d error(s) decoding:\n\n%s",
-- len(e.Errors), strings.Join(points, "\n"))
--}
+- arr := v.MustUint32Slice()
+- replaced := make([]uint32, len(arr))
+-
+- v.EachUint32(func(index int, val uint32) bool {
+- replaced[index] = replacer(index, val)
+- return true
+- })
+-
+- return &Value{data: replaced}
-
--func appendErrors(errors []string, err error) []string {
-- switch e := err.(type) {
-- case *Error:
-- return append(errors, e.Errors...)
-- default:
-- return append(errors, e.Error())
-- }
-}
-diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure.go b/Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure.go
-deleted file mode 100644
-index 381ba5d..0000000
---- a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure.go
-+++ /dev/null
-@@ -1,704 +0,0 @@
--// The mapstructure package exposes functionality to convert an
--// abitrary map[string]interface{} into a native Go structure.
--//
--// The Go structure can be arbitrarily complex, containing slices,
--// other structs, etc. and the decoder will properly decode nested
--// maps and so on into the proper structures in the native Go struct.
--// See the examples to see what the decoder is capable of.
--package mapstructure
-
--import (
-- "errors"
-- "fmt"
-- "reflect"
-- "sort"
-- "strconv"
-- "strings"
--)
+-// CollectUint32 uses the specified collector function to collect a value
+-// for each of the uint32s in the slice. The data returned will be a
+-// []interface{}.
+-func (v *Value) CollectUint32(collector func(int, uint32) interface{}) *Value {
-
--// DecodeHookFunc is the callback function that can be used for
--// data transformations. See "DecodeHook" in the DecoderConfig
--// struct.
--type DecodeHookFunc func(
-- from reflect.Kind,
-- to reflect.Kind,
-- data interface{}) (interface{}, error)
+- arr := v.MustUint32Slice()
+- collected := make([]interface{}, len(arr))
-
--// DecoderConfig is the configuration that is used to create a new decoder
--// and allows customization of various aspects of decoding.
--type DecoderConfig struct {
-- // DecodeHook, if set, will be called before any decoding and any
-- // type conversion (if WeaklyTypedInput is on). This lets you modify
-- // the values before they're set down onto the resulting struct.
-- //
-- // If an error is returned, the entire decode will fail with that
-- // error.
-- DecodeHook DecodeHookFunc
+- v.EachUint32(func(index int, val uint32) bool {
+- collected[index] = collector(index, val)
+- return true
+- })
-
-- // If ErrorUnused is true, then it is an error for there to exist
-- // keys in the original map that were unused in the decoding process
-- // (extra keys).
-- ErrorUnused bool
+- return &Value{data: collected}
+-}
-
-- // If WeaklyTypedInput is true, the decoder will make the following
-- // "weak" conversions:
-- //
-- // - bools to string (true = "1", false = "0")
-- // - numbers to string (base 10)
-- // - bools to int/uint (true = 1, false = 0)
-- // - strings to int/uint (base implied by prefix)
-- // - int to bool (true if value != 0)
-- // - string to bool (accepts: 1, t, T, TRUE, true, True, 0, f, F,
-- // FALSE, false, False. Anything else is an error)
-- // - empty array = empty map and vice versa
-- //
-- WeaklyTypedInput bool
+-/*
+- Uint64 (uint64 and []uint64)
+- --------------------------------------------------
+-*/
-
-- // Metadata is the struct that will contain extra metadata about
-- // the decoding. If this is nil, then no metadata will be tracked.
-- Metadata *Metadata
+-// Uint64 gets the value as a uint64, returns the optionalDefault
+-// value or a system default object if the value is the wrong type.
+-func (v *Value) Uint64(optionalDefault ...uint64) uint64 {
+- if s, ok := v.data.(uint64); ok {
+- return s
+- }
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
+- }
+- return 0
+-}
-
-- // Result is a pointer to the struct that will contain the decoded
-- // value.
-- Result interface{}
+-// MustUint64 gets the value as a uint64.
+-//
+-// Panics if the object is not a uint64.
+-func (v *Value) MustUint64() uint64 {
+- return v.data.(uint64)
+-}
-
-- // The tag name that mapstructure reads for field names. This
-- // defaults to "mapstructure"
-- TagName string
+-// Uint64Slice gets the value as a []uint64, returns the optionalDefault
+-// value or nil if the value is not a []uint64.
+-func (v *Value) Uint64Slice(optionalDefault ...[]uint64) []uint64 {
+- if s, ok := v.data.([]uint64); ok {
+- return s
+- }
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
+- }
+- return nil
-}
-
--// A Decoder takes a raw interface value and turns it into structured
--// data, keeping track of rich error information along the way in case
--// anything goes wrong. Unlike the basic top-level Decode method, you can
--// more finely control how the Decoder behaves using the DecoderConfig
--// structure. The top-level Decode method is just a convenience that sets
--// up the most basic Decoder.
--type Decoder struct {
-- config *DecoderConfig
+-// MustUint64Slice gets the value as a []uint64.
+-//
+-// Panics if the object is not a []uint64.
+-func (v *Value) MustUint64Slice() []uint64 {
+- return v.data.([]uint64)
-}
-
--// Metadata contains information about decoding a structure that
--// is tedious or difficult to get otherwise.
--type Metadata struct {
-- // Keys are the keys of the structure which were successfully decoded
-- Keys []string
+-// IsUint64 gets whether the object contained is a uint64 or not.
+-func (v *Value) IsUint64() bool {
+- _, ok := v.data.(uint64)
+- return ok
+-}
-
-- // Unused is a slice of keys that were found in the raw value but
-- // weren't decoded since there was no matching field in the result interface
-- Unused []string
+-// IsUint64Slice gets whether the object contained is a []uint64 or not.
+-func (v *Value) IsUint64Slice() bool {
+- _, ok := v.data.([]uint64)
+- return ok
-}
-
--// Decode takes a map and uses reflection to convert it into the
--// given Go native structure. val must be a pointer to a struct.
--func Decode(m interface{}, rawVal interface{}) error {
-- config := &DecoderConfig{
-- Metadata: nil,
-- Result: rawVal,
-- }
+-// EachUint64 calls the specified callback for each object
+-// in the []uint64.
+-//
+-// Panics if the object is the wrong type.
+-func (v *Value) EachUint64(callback func(int, uint64) bool) *Value {
-
-- decoder, err := NewDecoder(config)
-- if err != nil {
-- return err
+- for index, val := range v.MustUint64Slice() {
+- carryon := callback(index, val)
+- if carryon == false {
+- break
+- }
- }
-
-- return decoder.Decode(m)
+- return v
+-
-}
-
--// WeakDecode is the same as Decode but is shorthand to enable
--// WeaklyTypedInput. See DecoderConfig for more info.
--func WeakDecode(input, output interface{}) error {
-- config := &DecoderConfig{
-- Metadata: nil,
-- Result: output,
-- WeaklyTypedInput: true,
-- }
+-// WhereUint64 uses the specified decider function to select items
+-// from the []uint64. The object contained in the result will contain
+-// only the selected items.
+-func (v *Value) WhereUint64(decider func(int, uint64) bool) *Value {
-
-- decoder, err := NewDecoder(config)
-- if err != nil {
-- return err
-- }
+- var selected []uint64
+-
+- v.EachUint64(func(index int, val uint64) bool {
+- shouldSelect := decider(index, val)
+- if shouldSelect == false {
+- selected = append(selected, val)
+- }
+- return true
+- })
+-
+- return &Value{data: selected}
-
-- return decoder.Decode(input)
-}
-
--// NewDecoder returns a new decoder for the given configuration. Once
--// a decoder has been returned, the same configuration must not be used
--// again.
--func NewDecoder(config *DecoderConfig) (*Decoder, error) {
-- val := reflect.ValueOf(config.Result)
-- if val.Kind() != reflect.Ptr {
-- return nil, errors.New("result must be a pointer")
-- }
+-// GroupUint64 uses the specified grouper function to group the items
+-// keyed by the return of the grouper. The object contained in the
+-// result will contain a map[string][]uint64.
+-func (v *Value) GroupUint64(grouper func(int, uint64) string) *Value {
-
-- val = val.Elem()
-- if !val.CanAddr() {
-- return nil, errors.New("result must be addressable (a pointer)")
-- }
+- groups := make(map[string][]uint64)
-
-- if config.Metadata != nil {
-- if config.Metadata.Keys == nil {
-- config.Metadata.Keys = make([]string, 0)
+- v.EachUint64(func(index int, val uint64) bool {
+- group := grouper(index, val)
+- if _, ok := groups[group]; !ok {
+- groups[group] = make([]uint64, 0)
- }
+- groups[group] = append(groups[group], val)
+- return true
+- })
-
-- if config.Metadata.Unused == nil {
-- config.Metadata.Unused = make([]string, 0)
-- }
-- }
+- return &Value{data: groups}
-
-- if config.TagName == "" {
-- config.TagName = "mapstructure"
-- }
+-}
-
-- result := &Decoder{
-- config: config,
-- }
+-// ReplaceUint64 uses the specified function to replace each uint64s
+-// by iterating each item. The data in the returned result will be a
+-// []uint64 containing the replaced items.
+-func (v *Value) ReplaceUint64(replacer func(int, uint64) uint64) *Value {
-
-- return result, nil
--}
+- arr := v.MustUint64Slice()
+- replaced := make([]uint64, len(arr))
+-
+- v.EachUint64(func(index int, val uint64) bool {
+- replaced[index] = replacer(index, val)
+- return true
+- })
+-
+- return &Value{data: replaced}
-
--// Decode decodes the given raw interface to the target pointer specified
--// by the configuration.
--func (d *Decoder) Decode(raw interface{}) error {
-- return d.decode("", raw, reflect.ValueOf(d.config.Result).Elem())
-}
-
--// Decodes an unknown data type into a specific reflection value.
--func (d *Decoder) decode(name string, data interface{}, val reflect.Value) error {
-- if data == nil {
-- // If the data is nil, then we don't set anything.
-- return nil
-- }
+-// CollectUint64 uses the specified collector function to collect a value
+-// for each of the uint64s in the slice. The data returned will be a
+-// []interface{}.
+-func (v *Value) CollectUint64(collector func(int, uint64) interface{}) *Value {
-
-- dataVal := reflect.ValueOf(data)
-- if !dataVal.IsValid() {
-- // If the data value is invalid, then we just set the value
-- // to be the zero value.
-- val.Set(reflect.Zero(val.Type()))
-- return nil
-- }
+- arr := v.MustUint64Slice()
+- collected := make([]interface{}, len(arr))
-
-- if d.config.DecodeHook != nil {
-- // We have a DecodeHook, so let's pre-process the data.
-- var err error
-- data, err = d.config.DecodeHook(getKind(dataVal), getKind(val), data)
-- if err != nil {
-- return err
-- }
-- }
+- v.EachUint64(func(index int, val uint64) bool {
+- collected[index] = collector(index, val)
+- return true
+- })
-
-- var err error
-- dataKind := getKind(val)
-- switch dataKind {
-- case reflect.Bool:
-- err = d.decodeBool(name, data, val)
-- case reflect.Interface:
-- err = d.decodeBasic(name, data, val)
-- case reflect.String:
-- err = d.decodeString(name, data, val)
-- case reflect.Int:
-- err = d.decodeInt(name, data, val)
-- case reflect.Uint:
-- err = d.decodeUint(name, data, val)
-- case reflect.Float32:
-- err = d.decodeFloat(name, data, val)
-- case reflect.Struct:
-- err = d.decodeStruct(name, data, val)
-- case reflect.Map:
-- err = d.decodeMap(name, data, val)
-- case reflect.Ptr:
-- err = d.decodePtr(name, data, val)
-- case reflect.Slice:
-- err = d.decodeSlice(name, data, val)
-- default:
-- // If we reached this point then we weren't able to decode it
-- return fmt.Errorf("%s: unsupported type: %s", name, dataKind)
-- }
+- return &Value{data: collected}
+-}
-
-- // If we reached here, then we successfully decoded SOMETHING, so
-- // mark the key as used if we're tracking metadata.
-- if d.config.Metadata != nil && name != "" {
-- d.config.Metadata.Keys = append(d.config.Metadata.Keys, name)
+-/*
+- Uintptr (uintptr and []uintptr)
+- --------------------------------------------------
+-*/
+-
+-// Uintptr gets the value as a uintptr, returns the optionalDefault
+-// value or a system default object if the value is the wrong type.
+-func (v *Value) Uintptr(optionalDefault ...uintptr) uintptr {
+- if s, ok := v.data.(uintptr); ok {
+- return s
+- }
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
- }
+- return 0
+-}
-
-- return err
+-// MustUintptr gets the value as a uintptr.
+-//
+-// Panics if the object is not a uintptr.
+-func (v *Value) MustUintptr() uintptr {
+- return v.data.(uintptr)
-}
-
--// This decodes a basic type (bool, int, string, etc.) and sets the
--// value to "data" of that type.
--func (d *Decoder) decodeBasic(name string, data interface{}, val reflect.Value) error {
-- dataVal := reflect.ValueOf(data)
-- dataValType := dataVal.Type()
-- if !dataValType.AssignableTo(val.Type()) {
-- return fmt.Errorf(
-- "'%s' expected type '%s', got '%s'",
-- name, val.Type(), dataValType)
+-// UintptrSlice gets the value as a []uintptr, returns the optionalDefault
+-// value or nil if the value is not a []uintptr.
+-func (v *Value) UintptrSlice(optionalDefault ...[]uintptr) []uintptr {
+- if s, ok := v.data.([]uintptr); ok {
+- return s
+- }
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
- }
--
-- val.Set(dataVal)
- return nil
-}
-
--func (d *Decoder) decodeString(name string, data interface{}, val reflect.Value) error {
-- dataVal := reflect.ValueOf(data)
-- dataKind := getKind(dataVal)
--
-- converted := true
-- switch {
-- case dataKind == reflect.String:
-- val.SetString(dataVal.String())
-- case dataKind == reflect.Bool && d.config.WeaklyTypedInput:
-- if dataVal.Bool() {
-- val.SetString("1")
-- } else {
-- val.SetString("0")
-- }
-- case dataKind == reflect.Int && d.config.WeaklyTypedInput:
-- val.SetString(strconv.FormatInt(dataVal.Int(), 10))
-- case dataKind == reflect.Uint && d.config.WeaklyTypedInput:
-- val.SetString(strconv.FormatUint(dataVal.Uint(), 10))
-- case dataKind == reflect.Float32 && d.config.WeaklyTypedInput:
-- val.SetString(strconv.FormatFloat(dataVal.Float(), 'f', -1, 64))
-- case dataKind == reflect.Slice && d.config.WeaklyTypedInput:
-- dataType := dataVal.Type()
-- elemKind := dataType.Elem().Kind()
-- switch {
-- case elemKind == reflect.Uint8:
-- val.SetString(string(dataVal.Interface().([]uint8)))
-- default:
-- converted = false
-- }
-- default:
-- converted = false
-- }
+-// MustUintptrSlice gets the value as a []uintptr.
+-//
+-// Panics if the object is not a []uintptr.
+-func (v *Value) MustUintptrSlice() []uintptr {
+- return v.data.([]uintptr)
+-}
-
-- if !converted {
-- return fmt.Errorf(
-- "'%s' expected type '%s', got unconvertible type '%s'",
-- name, val.Type(), dataVal.Type())
-- }
+-// IsUintptr gets whether the object contained is a uintptr or not.
+-func (v *Value) IsUintptr() bool {
+- _, ok := v.data.(uintptr)
+- return ok
+-}
-
-- return nil
+-// IsUintptrSlice gets whether the object contained is a []uintptr or not.
+-func (v *Value) IsUintptrSlice() bool {
+- _, ok := v.data.([]uintptr)
+- return ok
-}
-
--func (d *Decoder) decodeInt(name string, data interface{}, val reflect.Value) error {
-- dataVal := reflect.ValueOf(data)
-- dataKind := getKind(dataVal)
+-// EachUintptr calls the specified callback for each object
+-// in the []uintptr.
+-//
+-// Panics if the object is the wrong type.
+-func (v *Value) EachUintptr(callback func(int, uintptr) bool) *Value {
-
-- switch {
-- case dataKind == reflect.Int:
-- val.SetInt(dataVal.Int())
-- case dataKind == reflect.Uint:
-- val.SetInt(int64(dataVal.Uint()))
-- case dataKind == reflect.Float32:
-- val.SetInt(int64(dataVal.Float()))
-- case dataKind == reflect.Bool && d.config.WeaklyTypedInput:
-- if dataVal.Bool() {
-- val.SetInt(1)
-- } else {
-- val.SetInt(0)
-- }
-- case dataKind == reflect.String && d.config.WeaklyTypedInput:
-- i, err := strconv.ParseInt(dataVal.String(), 0, val.Type().Bits())
-- if err == nil {
-- val.SetInt(i)
-- } else {
-- return fmt.Errorf("cannot parse '%s' as int: %s", name, err)
+- for index, val := range v.MustUintptrSlice() {
+- carryon := callback(index, val)
+- if carryon == false {
+- break
- }
-- default:
-- return fmt.Errorf(
-- "'%s' expected type '%s', got unconvertible type '%s'",
-- name, val.Type(), dataVal.Type())
- }
-
-- return nil
+- return v
+-
-}
-
--func (d *Decoder) decodeUint(name string, data interface{}, val reflect.Value) error {
-- dataVal := reflect.ValueOf(data)
-- dataKind := getKind(dataVal)
+-// WhereUintptr uses the specified decider function to select items
+-// from the []uintptr. The object contained in the result will contain
+-// only the selected items.
+-func (v *Value) WhereUintptr(decider func(int, uintptr) bool) *Value {
-
-- switch {
-- case dataKind == reflect.Int:
-- val.SetUint(uint64(dataVal.Int()))
-- case dataKind == reflect.Uint:
-- val.SetUint(dataVal.Uint())
-- case dataKind == reflect.Float32:
-- val.SetUint(uint64(dataVal.Float()))
-- case dataKind == reflect.Bool && d.config.WeaklyTypedInput:
-- if dataVal.Bool() {
-- val.SetUint(1)
-- } else {
-- val.SetUint(0)
-- }
-- case dataKind == reflect.String && d.config.WeaklyTypedInput:
-- i, err := strconv.ParseUint(dataVal.String(), 0, val.Type().Bits())
-- if err == nil {
-- val.SetUint(i)
-- } else {
-- return fmt.Errorf("cannot parse '%s' as uint: %s", name, err)
+- var selected []uintptr
+-
+- v.EachUintptr(func(index int, val uintptr) bool {
+- shouldSelect := decider(index, val)
+- if shouldSelect == false {
+- selected = append(selected, val)
- }
-- default:
-- return fmt.Errorf(
-- "'%s' expected type '%s', got unconvertible type '%s'",
-- name, val.Type(), dataVal.Type())
-- }
+- return true
+- })
+-
+- return &Value{data: selected}
-
-- return nil
-}
-
--func (d *Decoder) decodeBool(name string, data interface{}, val reflect.Value) error {
-- dataVal := reflect.ValueOf(data)
-- dataKind := getKind(dataVal)
+-// GroupUintptr uses the specified grouper function to group the items
+-// keyed by the return of the grouper. The object contained in the
+-// result will contain a map[string][]uintptr.
+-func (v *Value) GroupUintptr(grouper func(int, uintptr) string) *Value {
-
-- switch {
-- case dataKind == reflect.Bool:
-- val.SetBool(dataVal.Bool())
-- case dataKind == reflect.Int && d.config.WeaklyTypedInput:
-- val.SetBool(dataVal.Int() != 0)
-- case dataKind == reflect.Uint && d.config.WeaklyTypedInput:
-- val.SetBool(dataVal.Uint() != 0)
-- case dataKind == reflect.Float32 && d.config.WeaklyTypedInput:
-- val.SetBool(dataVal.Float() != 0)
-- case dataKind == reflect.String && d.config.WeaklyTypedInput:
-- b, err := strconv.ParseBool(dataVal.String())
-- if err == nil {
-- val.SetBool(b)
-- } else if dataVal.String() == "" {
-- val.SetBool(false)
-- } else {
-- return fmt.Errorf("cannot parse '%s' as bool: %s", name, err)
+- groups := make(map[string][]uintptr)
+-
+- v.EachUintptr(func(index int, val uintptr) bool {
+- group := grouper(index, val)
+- if _, ok := groups[group]; !ok {
+- groups[group] = make([]uintptr, 0)
- }
-- default:
-- return fmt.Errorf(
-- "'%s' expected type '%s', got unconvertible type '%s'",
-- name, val.Type(), dataVal.Type())
-- }
+- groups[group] = append(groups[group], val)
+- return true
+- })
+-
+- return &Value{data: groups}
-
-- return nil
-}
-
--func (d *Decoder) decodeFloat(name string, data interface{}, val reflect.Value) error {
-- dataVal := reflect.ValueOf(data)
-- dataKind := getKind(dataVal)
+-// ReplaceUintptr uses the specified function to replace each uintptrs
+-// by iterating each item. The data in the returned result will be a
+-// []uintptr containing the replaced items.
+-func (v *Value) ReplaceUintptr(replacer func(int, uintptr) uintptr) *Value {
-
-- switch {
-- case dataKind == reflect.Int:
-- val.SetFloat(float64(dataVal.Int()))
-- case dataKind == reflect.Uint:
-- val.SetFloat(float64(dataVal.Uint()))
-- case dataKind == reflect.Float32:
-- val.SetFloat(float64(dataVal.Float()))
-- case dataKind == reflect.Bool && d.config.WeaklyTypedInput:
-- if dataVal.Bool() {
-- val.SetFloat(1)
-- } else {
-- val.SetFloat(0)
-- }
-- case dataKind == reflect.String && d.config.WeaklyTypedInput:
-- f, err := strconv.ParseFloat(dataVal.String(), val.Type().Bits())
-- if err == nil {
-- val.SetFloat(f)
-- } else {
-- return fmt.Errorf("cannot parse '%s' as float: %s", name, err)
-- }
-- default:
-- return fmt.Errorf(
-- "'%s' expected type '%s', got unconvertible type '%s'",
-- name, val.Type(), dataVal.Type())
-- }
+- arr := v.MustUintptrSlice()
+- replaced := make([]uintptr, len(arr))
-
-- return nil
--}
+- v.EachUintptr(func(index int, val uintptr) bool {
+- replaced[index] = replacer(index, val)
+- return true
+- })
-
--func (d *Decoder) decodeMap(name string, data interface{}, val reflect.Value) error {
-- valType := val.Type()
-- valKeyType := valType.Key()
-- valElemType := valType.Elem()
+- return &Value{data: replaced}
-
-- // Make a new map to hold our result
-- mapType := reflect.MapOf(valKeyType, valElemType)
-- valMap := reflect.MakeMap(mapType)
+-}
-
-- // Check input type
-- dataVal := reflect.Indirect(reflect.ValueOf(data))
-- if dataVal.Kind() != reflect.Map {
-- // Accept empty array/slice instead of an empty map in weakly typed mode
-- if d.config.WeaklyTypedInput &&
-- (dataVal.Kind() == reflect.Slice || dataVal.Kind() == reflect.Array) &&
-- dataVal.Len() == 0 {
-- val.Set(valMap)
-- return nil
-- } else {
-- return fmt.Errorf("'%s' expected a map, got '%s'", name, dataVal.Kind())
-- }
-- }
+-// CollectUintptr uses the specified collector function to collect a value
+-// for each of the uintptrs in the slice. The data returned will be a
+-// []interface{}.
+-func (v *Value) CollectUintptr(collector func(int, uintptr) interface{}) *Value {
-
-- // Accumulate errors
-- errors := make([]string, 0)
+- arr := v.MustUintptrSlice()
+- collected := make([]interface{}, len(arr))
-
-- for _, k := range dataVal.MapKeys() {
-- fieldName := fmt.Sprintf("%s[%s]", name, k)
+- v.EachUintptr(func(index int, val uintptr) bool {
+- collected[index] = collector(index, val)
+- return true
+- })
-
-- // First decode the key into the proper type
-- currentKey := reflect.Indirect(reflect.New(valKeyType))
-- if err := d.decode(fieldName, k.Interface(), currentKey); err != nil {
-- errors = appendErrors(errors, err)
-- continue
-- }
+- return &Value{data: collected}
+-}
-
-- // Next decode the data into the proper type
-- v := dataVal.MapIndex(k).Interface()
-- currentVal := reflect.Indirect(reflect.New(valElemType))
-- if err := d.decode(fieldName, v, currentVal); err != nil {
-- errors = appendErrors(errors, err)
-- continue
-- }
+-/*
+- Float32 (float32 and []float32)
+- --------------------------------------------------
+-*/
-
-- valMap.SetMapIndex(currentKey, currentVal)
+-// Float32 gets the value as a float32, returns the optionalDefault
+-// value or a system default object if the value is the wrong type.
+-func (v *Value) Float32(optionalDefault ...float32) float32 {
+- if s, ok := v.data.(float32); ok {
+- return s
+- }
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
- }
+- return 0
+-}
-
-- // Set the built up map to the value
-- val.Set(valMap)
+-// MustFloat32 gets the value as a float32.
+-//
+-// Panics if the object is not a float32.
+-func (v *Value) MustFloat32() float32 {
+- return v.data.(float32)
+-}
-
-- // If we had errors, return those
-- if len(errors) > 0 {
-- return &Error{errors}
+-// Float32Slice gets the value as a []float32, returns the optionalDefault
+-// value or nil if the value is not a []float32.
+-func (v *Value) Float32Slice(optionalDefault ...[]float32) []float32 {
+- if s, ok := v.data.([]float32); ok {
+- return s
+- }
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
- }
--
- return nil
-}
-
--func (d *Decoder) decodePtr(name string, data interface{}, val reflect.Value) error {
-- // Create an element of the concrete (non pointer) type and decode
-- // into that. Then set the value of the pointer to this type.
-- valType := val.Type()
-- valElemType := valType.Elem()
-- realVal := reflect.New(valElemType)
-- if err := d.decode(name, data, reflect.Indirect(realVal)); err != nil {
-- return err
-- }
+-// MustFloat32Slice gets the value as a []float32.
+-//
+-// Panics if the object is not a []float32.
+-func (v *Value) MustFloat32Slice() []float32 {
+- return v.data.([]float32)
+-}
-
-- val.Set(realVal)
-- return nil
+-// IsFloat32 gets whether the object contained is a float32 or not.
+-func (v *Value) IsFloat32() bool {
+- _, ok := v.data.(float32)
+- return ok
-}
-
--func (d *Decoder) decodeSlice(name string, data interface{}, val reflect.Value) error {
-- dataVal := reflect.Indirect(reflect.ValueOf(data))
-- dataValKind := dataVal.Kind()
-- valType := val.Type()
-- valElemType := valType.Elem()
-- sliceType := reflect.SliceOf(valElemType)
+-// IsFloat32Slice gets whether the object contained is a []float32 or not.
+-func (v *Value) IsFloat32Slice() bool {
+- _, ok := v.data.([]float32)
+- return ok
+-}
-
-- // Check input type
-- if dataValKind != reflect.Array && dataValKind != reflect.Slice {
-- // Accept empty map instead of array/slice in weakly typed mode
-- if d.config.WeaklyTypedInput && dataVal.Kind() == reflect.Map && dataVal.Len() == 0 {
-- val.Set(reflect.MakeSlice(sliceType, 0, 0))
-- return nil
-- } else {
-- return fmt.Errorf(
-- "'%s': source data must be an array or slice, got %s", name, dataValKind)
+-// EachFloat32 calls the specified callback for each object
+-// in the []float32.
+-//
+-// Panics if the object is the wrong type.
+-func (v *Value) EachFloat32(callback func(int, float32) bool) *Value {
+-
+- for index, val := range v.MustFloat32Slice() {
+- carryon := callback(index, val)
+- if carryon == false {
+- break
- }
- }
-
-- // Make a new slice to hold our result, same size as the original data.
-- valSlice := reflect.MakeSlice(sliceType, dataVal.Len(), dataVal.Len())
+- return v
-
-- // Accumulate any errors
-- errors := make([]string, 0)
+-}
-
-- for i := 0; i < dataVal.Len(); i++ {
-- currentData := dataVal.Index(i).Interface()
-- currentField := valSlice.Index(i)
+-// WhereFloat32 uses the specified decider function to select items
+-// from the []float32. The object contained in the result will contain
+-// only the selected items.
+-func (v *Value) WhereFloat32(decider func(int, float32) bool) *Value {
-
-- fieldName := fmt.Sprintf("%s[%d]", name, i)
-- if err := d.decode(fieldName, currentData, currentField); err != nil {
-- errors = appendErrors(errors, err)
+- var selected []float32
+-
+- v.EachFloat32(func(index int, val float32) bool {
+- shouldSelect := decider(index, val)
+- if shouldSelect == false {
+- selected = append(selected, val)
- }
-- }
+- return true
+- })
-
-- // Finally, set the value to the slice we built up
-- val.Set(valSlice)
+- return &Value{data: selected}
-
-- // If there were errors, we return those
-- if len(errors) > 0 {
-- return &Error{errors}
-- }
+-}
+-
+-// GroupFloat32 uses the specified grouper function to group the items
+-// keyed by the return of the grouper. The object contained in the
+-// result will contain a map[string][]float32.
+-func (v *Value) GroupFloat32(grouper func(int, float32) string) *Value {
+-
+- groups := make(map[string][]float32)
+-
+- v.EachFloat32(func(index int, val float32) bool {
+- group := grouper(index, val)
+- if _, ok := groups[group]; !ok {
+- groups[group] = make([]float32, 0)
+- }
+- groups[group] = append(groups[group], val)
+- return true
+- })
+-
+- return &Value{data: groups}
-
-- return nil
-}
-
--func (d *Decoder) decodeStruct(name string, data interface{}, val reflect.Value) error {
-- dataVal := reflect.Indirect(reflect.ValueOf(data))
-- dataValKind := dataVal.Kind()
-- if dataValKind != reflect.Map {
-- return fmt.Errorf("'%s' expected a map, got '%s'", name, dataValKind)
-- }
+-// ReplaceFloat32 uses the specified function to replace each float32s
+-// by iterating each item. The data in the returned result will be a
+-// []float32 containing the replaced items.
+-func (v *Value) ReplaceFloat32(replacer func(int, float32) float32) *Value {
-
-- dataValType := dataVal.Type()
-- if kind := dataValType.Key().Kind(); kind != reflect.String && kind != reflect.Interface {
-- return fmt.Errorf(
-- "'%s' needs a map with string keys, has '%s' keys",
-- name, dataValType.Key().Kind())
-- }
+- arr := v.MustFloat32Slice()
+- replaced := make([]float32, len(arr))
-
-- dataValKeys := make(map[reflect.Value]struct{})
-- dataValKeysUnused := make(map[interface{}]struct{})
-- for _, dataValKey := range dataVal.MapKeys() {
-- dataValKeys[dataValKey] = struct{}{}
-- dataValKeysUnused[dataValKey.Interface()] = struct{}{}
-- }
+- v.EachFloat32(func(index int, val float32) bool {
+- replaced[index] = replacer(index, val)
+- return true
+- })
-
-- errors := make([]string, 0)
+- return &Value{data: replaced}
-
-- // This slice will keep track of all the structs we'll be decoding.
-- // There can be more than one struct if there are embedded structs
-- // that are squashed.
-- structs := make([]reflect.Value, 1, 5)
-- structs[0] = val
+-}
-
-- // Compile the list of all the fields that we're going to be decoding
-- // from all the structs.
-- fields := make(map[*reflect.StructField]reflect.Value)
-- for len(structs) > 0 {
-- structVal := structs[0]
-- structs = structs[1:]
+-// CollectFloat32 uses the specified collector function to collect a value
+-// for each of the float32s in the slice. The data returned will be a
+-// []interface{}.
+-func (v *Value) CollectFloat32(collector func(int, float32) interface{}) *Value {
-
-- structType := structVal.Type()
-- for i := 0; i < structType.NumField(); i++ {
-- fieldType := structType.Field(i)
+- arr := v.MustFloat32Slice()
+- collected := make([]interface{}, len(arr))
-
-- if fieldType.Anonymous {
-- fieldKind := fieldType.Type.Kind()
-- if fieldKind != reflect.Struct {
-- errors = appendErrors(errors,
-- fmt.Errorf("%s: unsupported type: %s", fieldType.Name, fieldKind))
-- continue
-- }
+- v.EachFloat32(func(index int, val float32) bool {
+- collected[index] = collector(index, val)
+- return true
+- })
-
-- // We have an embedded field. We "squash" the fields down
-- // if specified in the tag.
-- squash := false
-- tagParts := strings.Split(fieldType.Tag.Get(d.config.TagName), ",")
-- for _, tag := range tagParts[1:] {
-- if tag == "squash" {
-- squash = true
-- break
-- }
-- }
+- return &Value{data: collected}
+-}
-
-- if squash {
-- structs = append(structs, val.FieldByName(fieldType.Name))
-- continue
-- }
-- }
+-/*
+- Float64 (float64 and []float64)
+- --------------------------------------------------
+-*/
+-
+-// Float64 gets the value as a float64, returns the optionalDefault
+-// value or a system default object if the value is the wrong type.
+-func (v *Value) Float64(optionalDefault ...float64) float64 {
+- if s, ok := v.data.(float64); ok {
+- return s
+- }
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
+- }
+- return 0
+-}
+-
+-// MustFloat64 gets the value as a float64.
+-//
+-// Panics if the object is not a float64.
+-func (v *Value) MustFloat64() float64 {
+- return v.data.(float64)
+-}
-
-- // Normal struct field, store it away
-- fields[&fieldType] = structVal.Field(i)
-- }
+-// Float64Slice gets the value as a []float64, returns the optionalDefault
+-// value or nil if the value is not a []float64.
+-func (v *Value) Float64Slice(optionalDefault ...[]float64) []float64 {
+- if s, ok := v.data.([]float64); ok {
+- return s
- }
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
+- }
+- return nil
+-}
-
-- for fieldType, field := range fields {
-- fieldName := fieldType.Name
+-// MustFloat64Slice gets the value as a []float64.
+-//
+-// Panics if the object is not a []float64.
+-func (v *Value) MustFloat64Slice() []float64 {
+- return v.data.([]float64)
+-}
-
-- tagValue := fieldType.Tag.Get(d.config.TagName)
-- tagValue = strings.SplitN(tagValue, ",", 2)[0]
-- if tagValue != "" {
-- fieldName = tagValue
-- }
+-// IsFloat64 gets whether the object contained is a float64 or not.
+-func (v *Value) IsFloat64() bool {
+- _, ok := v.data.(float64)
+- return ok
+-}
-
-- rawMapKey := reflect.ValueOf(fieldName)
-- rawMapVal := dataVal.MapIndex(rawMapKey)
-- if !rawMapVal.IsValid() {
-- // Do a slower search by iterating over each key and
-- // doing case-insensitive search.
-- for dataValKey, _ := range dataValKeys {
-- mK, ok := dataValKey.Interface().(string)
-- if !ok {
-- // Not a string key
-- continue
-- }
+-// IsFloat64Slice gets whether the object contained is a []float64 or not.
+-func (v *Value) IsFloat64Slice() bool {
+- _, ok := v.data.([]float64)
+- return ok
+-}
-
-- if strings.EqualFold(mK, fieldName) {
-- rawMapKey = dataValKey
-- rawMapVal = dataVal.MapIndex(dataValKey)
-- break
-- }
-- }
+-// EachFloat64 calls the specified callback for each object
+-// in the []float64.
+-//
+-// Panics if the object is the wrong type.
+-func (v *Value) EachFloat64(callback func(int, float64) bool) *Value {
-
-- if !rawMapVal.IsValid() {
-- // There was no matching key in the map for the value in
-- // the struct. Just ignore.
-- continue
-- }
+- for index, val := range v.MustFloat64Slice() {
+- carryon := callback(index, val)
+- if carryon == false {
+- break
- }
+- }
-
-- // Delete the key we're using from the unused map so we stop tracking
-- delete(dataValKeysUnused, rawMapKey.Interface())
+- return v
-
-- if !field.IsValid() {
-- // This should never happen
-- panic("field is not valid")
-- }
+-}
-
-- // If we can't set the field, then it is unexported or something,
-- // and we just continue onwards.
-- if !field.CanSet() {
-- continue
-- }
+-// WhereFloat64 uses the specified decider function to select items
+-// from the []float64. The object contained in the result will contain
+-// only the selected items.
+-func (v *Value) WhereFloat64(decider func(int, float64) bool) *Value {
-
-- // If the name is empty string, then we're at the root, and we
-- // don't dot-join the fields.
-- if name != "" {
-- fieldName = fmt.Sprintf("%s.%s", name, fieldName)
-- }
+- var selected []float64
-
-- if err := d.decode(fieldName, rawMapVal.Interface(), field); err != nil {
-- errors = appendErrors(errors, err)
+- v.EachFloat64(func(index int, val float64) bool {
+- shouldSelect := decider(index, val)
+- if shouldSelect == false {
+- selected = append(selected, val)
- }
-- }
+- return true
+- })
-
-- if d.config.ErrorUnused && len(dataValKeysUnused) > 0 {
-- keys := make([]string, 0, len(dataValKeysUnused))
-- for rawKey, _ := range dataValKeysUnused {
-- keys = append(keys, rawKey.(string))
-- }
-- sort.Strings(keys)
+- return &Value{data: selected}
-
-- err := fmt.Errorf("'%s' has invalid keys: %s", name, strings.Join(keys, ", "))
-- errors = appendErrors(errors, err)
-- }
+-}
-
-- if len(errors) > 0 {
-- return &Error{errors}
-- }
+-// GroupFloat64 uses the specified grouper function to group the items
+-// keyed by the return of the grouper. The object contained in the
+-// result will contain a map[string][]float64.
+-func (v *Value) GroupFloat64(grouper func(int, float64) string) *Value {
-
-- // Add the unused keys to the list of unused keys if we're tracking metadata
-- if d.config.Metadata != nil {
-- for rawKey, _ := range dataValKeysUnused {
-- key := rawKey.(string)
-- if name != "" {
-- key = fmt.Sprintf("%s.%s", name, key)
-- }
+- groups := make(map[string][]float64)
-
-- d.config.Metadata.Unused = append(d.config.Metadata.Unused, key)
+- v.EachFloat64(func(index int, val float64) bool {
+- group := grouper(index, val)
+- if _, ok := groups[group]; !ok {
+- groups[group] = make([]float64, 0)
- }
-- }
+- groups[group] = append(groups[group], val)
+- return true
+- })
+-
+- return &Value{data: groups}
-
-- return nil
-}
-
--func getKind(val reflect.Value) reflect.Kind {
-- kind := val.Kind()
+-// ReplaceFloat64 uses the specified function to replace each float64s
+-// by iterating each item. The data in the returned result will be a
+-// []float64 containing the replaced items.
+-func (v *Value) ReplaceFloat64(replacer func(int, float64) float64) *Value {
+-
+- arr := v.MustFloat64Slice()
+- replaced := make([]float64, len(arr))
+-
+- v.EachFloat64(func(index int, val float64) bool {
+- replaced[index] = replacer(index, val)
+- return true
+- })
+-
+- return &Value{data: replaced}
-
-- switch {
-- case kind >= reflect.Int && kind <= reflect.Int64:
-- return reflect.Int
-- case kind >= reflect.Uint && kind <= reflect.Uint64:
-- return reflect.Uint
-- case kind >= reflect.Float32 && kind <= reflect.Float64:
-- return reflect.Float32
-- default:
-- return kind
-- }
-}
-diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure_benchmark_test.go b/Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure_benchmark_test.go
-deleted file mode 100644
-index b50ac36..0000000
---- a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure_benchmark_test.go
-+++ /dev/null
-@@ -1,243 +0,0 @@
--package mapstructure
-
--import (
-- "testing"
--)
+-// CollectFloat64 uses the specified collector function to collect a value
+-// for each of the float64s in the slice. The data returned will be a
+-// []interface{}.
+-func (v *Value) CollectFloat64(collector func(int, float64) interface{}) *Value {
-
--func Benchmark_Decode(b *testing.B) {
-- type Person struct {
-- Name string
-- Age int
-- Emails []string
-- Extra map[string]string
-- }
+- arr := v.MustFloat64Slice()
+- collected := make([]interface{}, len(arr))
-
-- input := map[string]interface{}{
-- "name": "Mitchell",
-- "age": 91,
-- "emails": []string{"one", "two", "three"},
-- "extra": map[string]string{
-- "twitter": "mitchellh",
-- },
-- }
+- v.EachFloat64(func(index int, val float64) bool {
+- collected[index] = collector(index, val)
+- return true
+- })
-
-- var result Person
-- for i := 0; i < b.N; i++ {
-- Decode(input, &result)
-- }
+- return &Value{data: collected}
-}
-
--func Benchmark_DecodeBasic(b *testing.B) {
-- input := map[string]interface{}{
-- "vstring": "foo",
-- "vint": 42,
-- "Vuint": 42,
-- "vbool": true,
-- "Vfloat": 42.42,
-- "vsilent": true,
-- "vdata": 42,
-- }
+-/*
+- Complex64 (complex64 and []complex64)
+- --------------------------------------------------
+-*/
-
-- var result Basic
-- for i := 0; i < b.N; i++ {
-- Decode(input, &result)
+-// Complex64 gets the value as a complex64, returns the optionalDefault
+-// value or a system default object if the value is the wrong type.
+-func (v *Value) Complex64(optionalDefault ...complex64) complex64 {
+- if s, ok := v.data.(complex64); ok {
+- return s
- }
--}
--
--func Benchmark_DecodeEmbedded(b *testing.B) {
-- input := map[string]interface{}{
-- "vstring": "foo",
-- "Basic": map[string]interface{}{
-- "vstring": "innerfoo",
-- },
-- "vunique": "bar",
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
- }
+- return 0
+-}
-
-- var result Embedded
-- for i := 0; i < b.N; i++ {
-- Decode(input, &result)
-- }
+-// MustComplex64 gets the value as a complex64.
+-//
+-// Panics if the object is not a complex64.
+-func (v *Value) MustComplex64() complex64 {
+- return v.data.(complex64)
-}
-
--func Benchmark_DecodeTypeConversion(b *testing.B) {
-- input := map[string]interface{}{
-- "IntToFloat": 42,
-- "IntToUint": 42,
-- "IntToBool": 1,
-- "IntToString": 42,
-- "UintToInt": 42,
-- "UintToFloat": 42,
-- "UintToBool": 42,
-- "UintToString": 42,
-- "BoolToInt": true,
-- "BoolToUint": true,
-- "BoolToFloat": true,
-- "BoolToString": true,
-- "FloatToInt": 42.42,
-- "FloatToUint": 42.42,
-- "FloatToBool": 42.42,
-- "FloatToString": 42.42,
-- "StringToInt": "42",
-- "StringToUint": "42",
-- "StringToBool": "1",
-- "StringToFloat": "42.42",
-- "SliceToMap": []interface{}{},
-- "MapToSlice": map[string]interface{}{},
+-// Complex64Slice gets the value as a []complex64, returns the optionalDefault
+-// value or nil if the value is not a []complex64.
+-func (v *Value) Complex64Slice(optionalDefault ...[]complex64) []complex64 {
+- if s, ok := v.data.([]complex64); ok {
+- return s
- }
--
-- var resultStrict TypeConversionResult
-- for i := 0; i < b.N; i++ {
-- Decode(input, &resultStrict)
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
- }
+- return nil
-}
-
--func Benchmark_DecodeMap(b *testing.B) {
-- input := map[string]interface{}{
-- "vfoo": "foo",
-- "vother": map[interface{}]interface{}{
-- "foo": "foo",
-- "bar": "bar",
-- },
-- }
--
-- var result Map
-- for i := 0; i < b.N; i++ {
-- Decode(input, &result)
-- }
+-// MustComplex64Slice gets the value as a []complex64.
+-//
+-// Panics if the object is not a []complex64.
+-func (v *Value) MustComplex64Slice() []complex64 {
+- return v.data.([]complex64)
-}
-
--func Benchmark_DecodeMapOfStruct(b *testing.B) {
-- input := map[string]interface{}{
-- "value": map[string]interface{}{
-- "foo": map[string]string{"vstring": "one"},
-- "bar": map[string]string{"vstring": "two"},
-- },
-- }
+-// IsComplex64 gets whether the object contained is a complex64 or not.
+-func (v *Value) IsComplex64() bool {
+- _, ok := v.data.(complex64)
+- return ok
+-}
-
-- var result MapOfStruct
-- for i := 0; i < b.N; i++ {
-- Decode(input, &result)
-- }
+-// IsComplex64Slice gets whether the object contained is a []complex64 or not.
+-func (v *Value) IsComplex64Slice() bool {
+- _, ok := v.data.([]complex64)
+- return ok
-}
-
--func Benchmark_DecodeSlice(b *testing.B) {
-- input := map[string]interface{}{
-- "vfoo": "foo",
-- "vbar": []string{"foo", "bar", "baz"},
-- }
+-// EachComplex64 calls the specified callback for each object
+-// in the []complex64.
+-//
+-// Panics if the object is the wrong type.
+-func (v *Value) EachComplex64(callback func(int, complex64) bool) *Value {
-
-- var result Slice
-- for i := 0; i < b.N; i++ {
-- Decode(input, &result)
+- for index, val := range v.MustComplex64Slice() {
+- carryon := callback(index, val)
+- if carryon == false {
+- break
+- }
- }
--}
-
--func Benchmark_DecodeSliceOfStruct(b *testing.B) {
-- input := map[string]interface{}{
-- "value": []map[string]interface{}{
-- {"vstring": "one"},
-- {"vstring": "two"},
-- },
-- }
+- return v
-
-- var result SliceOfStruct
-- for i := 0; i < b.N; i++ {
-- Decode(input, &result)
-- }
-}
-
--func Benchmark_DecodeWeaklyTypedInput(b *testing.B) {
-- type Person struct {
-- Name string
-- Age int
-- Emails []string
-- }
+-// WhereComplex64 uses the specified decider function to select items
+-// from the []complex64. The object contained in the result will contain
+-// only the selected items.
+-func (v *Value) WhereComplex64(decider func(int, complex64) bool) *Value {
-
-- // This input can come from anywhere, but typically comes from
-- // something like decoding JSON, generated by a weakly typed language
-- // such as PHP.
-- input := map[string]interface{}{
-- "name": 123, // number => string
-- "age": "42", // string => number
-- "emails": map[string]interface{}{}, // empty map => empty array
-- }
+- var selected []complex64
-
-- var result Person
-- config := &DecoderConfig{
-- WeaklyTypedInput: true,
-- Result: &result,
-- }
+- v.EachComplex64(func(index int, val complex64) bool {
+- shouldSelect := decider(index, val)
+- if shouldSelect == false {
+- selected = append(selected, val)
+- }
+- return true
+- })
-
-- decoder, err := NewDecoder(config)
-- if err != nil {
-- panic(err)
-- }
+- return &Value{data: selected}
-
-- for i := 0; i < b.N; i++ {
-- decoder.Decode(input)
-- }
-}
-
--func Benchmark_DecodeMetadata(b *testing.B) {
-- type Person struct {
-- Name string
-- Age int
-- }
+-// GroupComplex64 uses the specified grouper function to group the items
+-// keyed by the return of the grouper. The object contained in the
+-// result will contain a map[string][]complex64.
+-func (v *Value) GroupComplex64(grouper func(int, complex64) string) *Value {
-
-- input := map[string]interface{}{
-- "name": "Mitchell",
-- "age": 91,
-- "email": "foo at bar.com",
-- }
+- groups := make(map[string][]complex64)
-
-- var md Metadata
-- var result Person
-- config := &DecoderConfig{
-- Metadata: &md,
-- Result: &result,
-- }
+- v.EachComplex64(func(index int, val complex64) bool {
+- group := grouper(index, val)
+- if _, ok := groups[group]; !ok {
+- groups[group] = make([]complex64, 0)
+- }
+- groups[group] = append(groups[group], val)
+- return true
+- })
-
-- decoder, err := NewDecoder(config)
-- if err != nil {
-- panic(err)
-- }
+- return &Value{data: groups}
-
-- for i := 0; i < b.N; i++ {
-- decoder.Decode(input)
-- }
-}
-
--func Benchmark_DecodeMetadataEmbedded(b *testing.B) {
-- input := map[string]interface{}{
-- "vstring": "foo",
-- "vunique": "bar",
-- }
+-// ReplaceComplex64 uses the specified function to replace each complex64s
+-// by iterating each item. The data in the returned result will be a
+-// []complex64 containing the replaced items.
+-func (v *Value) ReplaceComplex64(replacer func(int, complex64) complex64) *Value {
-
-- var md Metadata
-- var result EmbeddedSquash
-- config := &DecoderConfig{
-- Metadata: &md,
-- Result: &result,
-- }
+- arr := v.MustComplex64Slice()
+- replaced := make([]complex64, len(arr))
-
-- decoder, err := NewDecoder(config)
-- if err != nil {
-- b.Fatalf("err: %s", err)
-- }
+- v.EachComplex64(func(index int, val complex64) bool {
+- replaced[index] = replacer(index, val)
+- return true
+- })
+-
+- return &Value{data: replaced}
-
-- for i := 0; i < b.N; i++ {
-- decoder.Decode(input)
-- }
-}
-
--func Benchmark_DecodeTagged(b *testing.B) {
-- input := map[string]interface{}{
-- "foo": "bar",
-- "bar": "value",
-- }
+-// CollectComplex64 uses the specified collector function to collect a value
+-// for each of the complex64s in the slice. The data returned will be a
+-// []interface{}.
+-func (v *Value) CollectComplex64(collector func(int, complex64) interface{}) *Value {
-
-- var result Tagged
-- for i := 0; i < b.N; i++ {
-- Decode(input, &result)
-- }
--}
-diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure_bugs_test.go b/Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure_bugs_test.go
-deleted file mode 100644
-index 7054f1a..0000000
---- a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure_bugs_test.go
-+++ /dev/null
-@@ -1,47 +0,0 @@
--package mapstructure
+- arr := v.MustComplex64Slice()
+- collected := make([]interface{}, len(arr))
-
--import "testing"
+- v.EachComplex64(func(index int, val complex64) bool {
+- collected[index] = collector(index, val)
+- return true
+- })
-
--// GH-1
--func TestDecode_NilValue(t *testing.T) {
-- input := map[string]interface{}{
-- "vfoo": nil,
-- "vother": nil,
-- }
+- return &Value{data: collected}
+-}
-
-- var result Map
-- err := Decode(input, &result)
-- if err != nil {
-- t.Fatalf("should not error: %s", err)
-- }
+-/*
+- Complex128 (complex128 and []complex128)
+- --------------------------------------------------
+-*/
-
-- if result.Vfoo != "" {
-- t.Fatalf("value should be default: %s", result.Vfoo)
+-// Complex128 gets the value as a complex128, returns the optionalDefault
+-// value or a system default object if the value is the wrong type.
+-func (v *Value) Complex128(optionalDefault ...complex128) complex128 {
+- if s, ok := v.data.(complex128); ok {
+- return s
+- }
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
- }
+- return 0
+-}
-
-- if result.Vother != nil {
-- t.Fatalf("Vother should be nil: %s", result.Vother)
-- }
+-// MustComplex128 gets the value as a complex128.
+-//
+-// Panics if the object is not a complex128.
+-func (v *Value) MustComplex128() complex128 {
+- return v.data.(complex128)
-}
-
--// GH-10
--func TestDecode_mapInterfaceInterface(t *testing.T) {
-- input := map[interface{}]interface{}{
-- "vfoo": nil,
-- "vother": nil,
+-// Complex128Slice gets the value as a []complex128, returns the optionalDefault
+-// value or nil if the value is not a []complex128.
+-func (v *Value) Complex128Slice(optionalDefault ...[]complex128) []complex128 {
+- if s, ok := v.data.([]complex128); ok {
+- return s
- }
--
-- var result Map
-- err := Decode(input, &result)
-- if err != nil {
-- t.Fatalf("should not error: %s", err)
+- if len(optionalDefault) == 1 {
+- return optionalDefault[0]
- }
+- return nil
+-}
-
-- if result.Vfoo != "" {
-- t.Fatalf("value should be default: %s", result.Vfoo)
-- }
+-// MustComplex128Slice gets the value as a []complex128.
+-//
+-// Panics if the object is not a []complex128.
+-func (v *Value) MustComplex128Slice() []complex128 {
+- return v.data.([]complex128)
+-}
-
-- if result.Vother != nil {
-- t.Fatalf("Vother should be nil: %s", result.Vother)
-- }
+-// IsComplex128 gets whether the object contained is a complex128 or not.
+-func (v *Value) IsComplex128() bool {
+- _, ok := v.data.(complex128)
+- return ok
-}
-diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure_examples_test.go b/Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure_examples_test.go
-deleted file mode 100644
-index aa393cc..0000000
---- a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure_examples_test.go
-+++ /dev/null
-@@ -1,169 +0,0 @@
--package mapstructure
-
--import (
-- "fmt"
--)
+-// IsComplex128Slice gets whether the object contained is a []complex128 or not.
+-func (v *Value) IsComplex128Slice() bool {
+- _, ok := v.data.([]complex128)
+- return ok
+-}
-
--func ExampleDecode() {
-- type Person struct {
-- Name string
-- Age int
-- Emails []string
-- Extra map[string]string
-- }
+-// EachComplex128 calls the specified callback for each object
+-// in the []complex128.
+-//
+-// Panics if the object is the wrong type.
+-func (v *Value) EachComplex128(callback func(int, complex128) bool) *Value {
-
-- // This input can come from anywhere, but typically comes from
-- // something like decoding JSON where we're not quite sure of the
-- // struct initially.
-- input := map[string]interface{}{
-- "name": "Mitchell",
-- "age": 91,
-- "emails": []string{"one", "two", "three"},
-- "extra": map[string]string{
-- "twitter": "mitchellh",
-- },
+- for index, val := range v.MustComplex128Slice() {
+- carryon := callback(index, val)
+- if carryon == false {
+- break
+- }
- }
-
-- var result Person
-- err := Decode(input, &result)
-- if err != nil {
-- panic(err)
-- }
+- return v
-
-- fmt.Printf("%#v", result)
-- // Output:
-- // mapstructure.Person{Name:"Mitchell", Age:91, Emails:[]string{"one", "two", "three"}, Extra:map[string]string{"twitter":"mitchellh"}}
-}
-
--func ExampleDecode_errors() {
-- type Person struct {
-- Name string
-- Age int
-- Emails []string
-- Extra map[string]string
-- }
+-// WhereComplex128 uses the specified decider function to select items
+-// from the []complex128. The object contained in the result will contain
+-// only the selected items.
+-func (v *Value) WhereComplex128(decider func(int, complex128) bool) *Value {
-
-- // This input can come from anywhere, but typically comes from
-- // something like decoding JSON where we're not quite sure of the
-- // struct initially.
-- input := map[string]interface{}{
-- "name": 123,
-- "age": "bad value",
-- "emails": []int{1, 2, 3},
-- }
+- var selected []complex128
-
-- var result Person
-- err := Decode(input, &result)
-- if err == nil {
-- panic("should have an error")
-- }
+- v.EachComplex128(func(index int, val complex128) bool {
+- shouldSelect := decider(index, val)
+- if shouldSelect == false {
+- selected = append(selected, val)
+- }
+- return true
+- })
-
-- fmt.Println(err.Error())
-- // Output:
-- // 5 error(s) decoding:
-- //
-- // * 'Name' expected type 'string', got unconvertible type 'int'
-- // * 'Age' expected type 'int', got unconvertible type 'string'
-- // * 'Emails[0]' expected type 'string', got unconvertible type 'int'
-- // * 'Emails[1]' expected type 'string', got unconvertible type 'int'
-- // * 'Emails[2]' expected type 'string', got unconvertible type 'int'
--}
+- return &Value{data: selected}
-
--func ExampleDecode_metadata() {
-- type Person struct {
-- Name string
-- Age int
-- }
+-}
-
-- // This input can come from anywhere, but typically comes from
-- // something like decoding JSON where we're not quite sure of the
-- // struct initially.
-- input := map[string]interface{}{
-- "name": "Mitchell",
-- "age": 91,
-- "email": "foo at bar.com",
-- }
+-// GroupComplex128 uses the specified grouper function to group the items
+-// keyed by the return of the grouper. The object contained in the
+-// result will contain a map[string][]complex128.
+-func (v *Value) GroupComplex128(grouper func(int, complex128) string) *Value {
-
-- // For metadata, we make a more advanced DecoderConfig so we can
-- // more finely configure the decoder that is used. In this case, we
-- // just tell the decoder we want to track metadata.
-- var md Metadata
-- var result Person
-- config := &DecoderConfig{
-- Metadata: &md,
-- Result: &result,
-- }
+- groups := make(map[string][]complex128)
-
-- decoder, err := NewDecoder(config)
-- if err != nil {
-- panic(err)
-- }
+- v.EachComplex128(func(index int, val complex128) bool {
+- group := grouper(index, val)
+- if _, ok := groups[group]; !ok {
+- groups[group] = make([]complex128, 0)
+- }
+- groups[group] = append(groups[group], val)
+- return true
+- })
-
-- if err := decoder.Decode(input); err != nil {
-- panic(err)
-- }
+- return &Value{data: groups}
-
-- fmt.Printf("Unused keys: %#v", md.Unused)
-- // Output:
-- // Unused keys: []string{"email"}
-}
-
--func ExampleDecode_weaklyTypedInput() {
-- type Person struct {
-- Name string
-- Age int
-- Emails []string
-- }
--
-- // This input can come from anywhere, but typically comes from
-- // something like decoding JSON, generated by a weakly typed language
-- // such as PHP.
-- input := map[string]interface{}{
-- "name": 123, // number => string
-- "age": "42", // string => number
-- "emails": map[string]interface{}{}, // empty map => empty array
-- }
+-// ReplaceComplex128 uses the specified function to replace each complex128s
+-// by iterating each item. The data in the returned result will be a
+-// []complex128 containing the replaced items.
+-func (v *Value) ReplaceComplex128(replacer func(int, complex128) complex128) *Value {
-
-- var result Person
-- config := &DecoderConfig{
-- WeaklyTypedInput: true,
-- Result: &result,
-- }
+- arr := v.MustComplex128Slice()
+- replaced := make([]complex128, len(arr))
-
-- decoder, err := NewDecoder(config)
-- if err != nil {
-- panic(err)
-- }
+- v.EachComplex128(func(index int, val complex128) bool {
+- replaced[index] = replacer(index, val)
+- return true
+- })
-
-- err = decoder.Decode(input)
-- if err != nil {
-- panic(err)
-- }
+- return &Value{data: replaced}
-
-- fmt.Printf("%#v", result)
-- // Output: mapstructure.Person{Name:"123", Age:42, Emails:[]string{}}
-}
-
--func ExampleDecode_tags() {
-- // Note that the mapstructure tags defined in the struct type
-- // can indicate which fields the values are mapped to.
-- type Person struct {
-- Name string `mapstructure:"person_name"`
-- Age int `mapstructure:"person_age"`
-- }
+-// CollectComplex128 uses the specified collector function to collect a value
+-// for each of the complex128s in the slice. The data returned will be a
+-// []interface{}.
+-func (v *Value) CollectComplex128(collector func(int, complex128) interface{}) *Value {
-
-- input := map[string]interface{}{
-- "person_name": "Mitchell",
-- "person_age": 91,
-- }
+- arr := v.MustComplex128Slice()
+- collected := make([]interface{}, len(arr))
-
-- var result Person
-- err := Decode(input, &result)
-- if err != nil {
-- panic(err)
-- }
+- v.EachComplex128(func(index int, val complex128) bool {
+- collected[index] = collector(index, val)
+- return true
+- })
-
-- fmt.Printf("%#v", result)
-- // Output:
-- // mapstructure.Person{Name:"Mitchell", Age:91}
+- return &Value{data: collected}
-}
-diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure_test.go b/Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure_test.go
+diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/type_specific_codegen_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/type_specific_codegen_test.go
deleted file mode 100644
-index 23029c7..0000000
---- a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure_test.go
+index f7a4fce..0000000
+--- a/Godeps/_workspace/src/github.com/stretchr/objx/type_specific_codegen_test.go
+++ /dev/null
-@@ -1,828 +0,0 @@
--package mapstructure
+@@ -1,2867 +0,0 @@
+-package objx
-
-import (
-- "reflect"
-- "sort"
+- "fmt"
+- "github.com/stretchr/testify/assert"
- "testing"
-)
-
--type Basic struct {
-- Vstring string
-- Vint int
-- Vuint uint
-- Vbool bool
-- Vfloat float64
-- Vextra string
-- vsilent bool
-- Vdata interface{}
--}
--
--type Embedded struct {
-- Basic
-- Vunique string
--}
+-// ************************************************************
+-// TESTS
+-// ************************************************************
-
--type EmbeddedPointer struct {
-- *Basic
-- Vunique string
--}
+-func TestInter(t *testing.T) {
-
--type EmbeddedSquash struct {
-- Basic `mapstructure:",squash"`
-- Vunique string
--}
+- val := interface{}("something")
+- m := map[string]interface{}{"value": val, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").Inter())
+- assert.Equal(t, val, New(m).Get("value").MustInter())
+- assert.Equal(t, interface{}(nil), New(m).Get("nothing").Inter())
+- assert.Equal(t, val, New(m).Get("nothing").Inter("something"))
-
--type Map struct {
-- Vfoo string
-- Vother map[string]string
--}
+- assert.Panics(t, func() {
+- New(m).Get("age").MustInter()
+- })
-
--type MapOfStruct struct {
-- Value map[string]Basic
-}
-
--type Nested struct {
-- Vfoo string
-- Vbar Basic
--}
+-func TestInterSlice(t *testing.T) {
-
--type NestedPointer struct {
-- Vfoo string
-- Vbar *Basic
--}
+- val := interface{}("something")
+- m := map[string]interface{}{"value": []interface{}{val}, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").InterSlice()[0])
+- assert.Equal(t, val, New(m).Get("value").MustInterSlice()[0])
+- assert.Equal(t, []interface{}(nil), New(m).Get("nothing").InterSlice())
+- assert.Equal(t, val, New(m).Get("nothing").InterSlice([]interface{}{interface{}("something")})[0])
-
--type Slice struct {
-- Vfoo string
-- Vbar []string
--}
+- assert.Panics(t, func() {
+- New(m).Get("nothing").MustInterSlice()
+- })
-
--type SliceOfStruct struct {
-- Value []Basic
-}
-
--type Tagged struct {
-- Extra string `mapstructure:"bar,what,what"`
-- Value string `mapstructure:"foo"`
--}
+-func TestIsInter(t *testing.T) {
-
--type TypeConversionResult struct {
-- IntToFloat float32
-- IntToUint uint
-- IntToBool bool
-- IntToString string
-- UintToInt int
-- UintToFloat float32
-- UintToBool bool
-- UintToString string
-- BoolToInt int
-- BoolToUint uint
-- BoolToFloat float32
-- BoolToString string
-- FloatToInt int
-- FloatToUint uint
-- FloatToBool bool
-- FloatToString string
-- SliceUint8ToString string
-- StringToInt int
-- StringToUint uint
-- StringToBool bool
-- StringToFloat float32
-- SliceToMap map[string]interface{}
-- MapToSlice []interface{}
--}
+- var v *Value
-
--func TestBasicTypes(t *testing.T) {
-- t.Parallel()
+- v = &Value{data: interface{}("something")}
+- assert.True(t, v.IsInter())
-
-- input := map[string]interface{}{
-- "vstring": "foo",
-- "vint": 42,
-- "Vuint": 42,
-- "vbool": true,
-- "Vfloat": 42.42,
-- "vsilent": true,
-- "vdata": 42,
-- }
+- v = &Value{data: []interface{}{interface{}("something")}}
+- assert.True(t, v.IsInterSlice())
-
-- var result Basic
-- err := Decode(input, &result)
-- if err != nil {
-- t.Errorf("got an err: %s", err.Error())
-- t.FailNow()
-- }
+-}
-
-- if result.Vstring != "foo" {
-- t.Errorf("vstring value should be 'foo': %#v", result.Vstring)
-- }
+-func TestEachInter(t *testing.T) {
-
-- if result.Vint != 42 {
-- t.Errorf("vint value should be 42: %#v", result.Vint)
-- }
+- v := &Value{data: []interface{}{interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something")}}
+- count := 0
+- replacedVals := make([]interface{}, 0)
+- assert.Equal(t, v, v.EachInter(func(i int, val interface{}) bool {
-
-- if result.Vuint != 42 {
-- t.Errorf("vuint value should be 42: %#v", result.Vuint)
-- }
+- count++
+- replacedVals = append(replacedVals, val)
-
-- if result.Vbool != true {
-- t.Errorf("vbool value should be true: %#v", result.Vbool)
-- }
+- // abort early
+- if i == 2 {
+- return false
+- }
-
-- if result.Vfloat != 42.42 {
-- t.Errorf("vfloat value should be 42.42: %#v", result.Vfloat)
-- }
+- return true
-
-- if result.Vextra != "" {
-- t.Errorf("vextra value should be empty: %#v", result.Vextra)
-- }
+- }))
-
-- if result.vsilent != false {
-- t.Error("vsilent should not be set, it is unexported")
-- }
+- assert.Equal(t, count, 3)
+- assert.Equal(t, replacedVals[0], v.MustInterSlice()[0])
+- assert.Equal(t, replacedVals[1], v.MustInterSlice()[1])
+- assert.Equal(t, replacedVals[2], v.MustInterSlice()[2])
-
-- if result.Vdata != 42 {
-- t.Error("vdata should be valid")
-- }
-}
-
--func TestBasic_IntWithFloat(t *testing.T) {
-- t.Parallel()
+-func TestWhereInter(t *testing.T) {
-
-- input := map[string]interface{}{
-- "vint": float64(42),
-- }
+- v := &Value{data: []interface{}{interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something")}}
+-
+- selected := v.WhereInter(func(i int, val interface{}) bool {
+- return i%2 == 0
+- }).MustInterSlice()
+-
+- assert.Equal(t, 3, len(selected))
-
-- var result Basic
-- err := Decode(input, &result)
-- if err != nil {
-- t.Fatalf("got an err: %s", err)
-- }
-}
-
--func TestDecode_Embedded(t *testing.T) {
-- t.Parallel()
+-func TestGroupInter(t *testing.T) {
-
-- input := map[string]interface{}{
-- "vstring": "foo",
-- "Basic": map[string]interface{}{
-- "vstring": "innerfoo",
-- },
-- "vunique": "bar",
-- }
+- v := &Value{data: []interface{}{interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something")}}
-
-- var result Embedded
-- err := Decode(input, &result)
-- if err != nil {
-- t.Fatalf("got an err: %s", err.Error())
-- }
+- grouped := v.GroupInter(func(i int, val interface{}) string {
+- return fmt.Sprintf("%v", i%2 == 0)
+- }).data.(map[string][]interface{})
-
-- if result.Vstring != "innerfoo" {
-- t.Errorf("vstring value should be 'innerfoo': %#v", result.Vstring)
-- }
+- assert.Equal(t, 2, len(grouped))
+- assert.Equal(t, 3, len(grouped["true"]))
+- assert.Equal(t, 3, len(grouped["false"]))
-
-- if result.Vunique != "bar" {
-- t.Errorf("vunique value should be 'bar': %#v", result.Vunique)
-- }
-}
-
--func TestDecode_EmbeddedPointer(t *testing.T) {
-- t.Parallel()
+-func TestReplaceInter(t *testing.T) {
-
-- input := map[string]interface{}{
-- "vstring": "foo",
-- "Basic": map[string]interface{}{
-- "vstring": "innerfoo",
-- },
-- "vunique": "bar",
-- }
+- v := &Value{data: []interface{}{interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something")}}
-
-- var result EmbeddedPointer
-- err := Decode(input, &result)
-- if err == nil {
-- t.Fatal("should get error")
+- rawArr := v.MustInterSlice()
+-
+- replaced := v.ReplaceInter(func(index int, val interface{}) interface{} {
+- if index < len(rawArr)-1 {
+- return rawArr[index+1]
+- }
+- return rawArr[0]
+- })
+-
+- replacedArr := replaced.MustInterSlice()
+- if assert.Equal(t, 6, len(replacedArr)) {
+- assert.Equal(t, replacedArr[0], rawArr[1])
+- assert.Equal(t, replacedArr[1], rawArr[2])
+- assert.Equal(t, replacedArr[2], rawArr[3])
+- assert.Equal(t, replacedArr[3], rawArr[4])
+- assert.Equal(t, replacedArr[4], rawArr[5])
+- assert.Equal(t, replacedArr[5], rawArr[0])
- }
+-
-}
-
--func TestDecode_EmbeddedSquash(t *testing.T) {
-- t.Parallel()
+-func TestCollectInter(t *testing.T) {
-
-- input := map[string]interface{}{
-- "vstring": "foo",
-- "vunique": "bar",
-- }
+- v := &Value{data: []interface{}{interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something")}}
-
-- var result EmbeddedSquash
-- err := Decode(input, &result)
-- if err != nil {
-- t.Fatalf("got an err: %s", err.Error())
-- }
+- collected := v.CollectInter(func(index int, val interface{}) interface{} {
+- return index
+- })
-
-- if result.Vstring != "foo" {
-- t.Errorf("vstring value should be 'foo': %#v", result.Vstring)
+- collectedArr := collected.MustInterSlice()
+- if assert.Equal(t, 6, len(collectedArr)) {
+- assert.Equal(t, collectedArr[0], 0)
+- assert.Equal(t, collectedArr[1], 1)
+- assert.Equal(t, collectedArr[2], 2)
+- assert.Equal(t, collectedArr[3], 3)
+- assert.Equal(t, collectedArr[4], 4)
+- assert.Equal(t, collectedArr[5], 5)
- }
-
-- if result.Vunique != "bar" {
-- t.Errorf("vunique value should be 'bar': %#v", result.Vunique)
-- }
-}
-
--func TestDecode_DecodeHook(t *testing.T) {
-- t.Parallel()
+-// ************************************************************
+-// TESTS
+-// ************************************************************
-
-- input := map[string]interface{}{
-- "vint": "WHAT",
-- }
+-func TestMSI(t *testing.T) {
-
-- decodeHook := func(from reflect.Kind, to reflect.Kind, v interface{}) (interface{}, error) {
-- if from == reflect.String && to != reflect.String {
-- return 5, nil
-- }
+- val := map[string]interface{}(map[string]interface{}{"name": "Tyler"})
+- m := map[string]interface{}{"value": val, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").MSI())
+- assert.Equal(t, val, New(m).Get("value").MustMSI())
+- assert.Equal(t, map[string]interface{}(nil), New(m).Get("nothing").MSI())
+- assert.Equal(t, val, New(m).Get("nothing").MSI(map[string]interface{}{"name": "Tyler"}))
-
-- return v, nil
-- }
+- assert.Panics(t, func() {
+- New(m).Get("age").MustMSI()
+- })
-
-- var result Basic
-- config := &DecoderConfig{
-- DecodeHook: decodeHook,
-- Result: &result,
-- }
+-}
-
-- decoder, err := NewDecoder(config)
-- if err != nil {
-- t.Fatalf("err: %s", err)
-- }
+-func TestMSISlice(t *testing.T) {
-
-- err = decoder.Decode(input)
-- if err != nil {
-- t.Fatalf("got an err: %s", err)
-- }
+- val := map[string]interface{}(map[string]interface{}{"name": "Tyler"})
+- m := map[string]interface{}{"value": []map[string]interface{}{val}, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").MSISlice()[0])
+- assert.Equal(t, val, New(m).Get("value").MustMSISlice()[0])
+- assert.Equal(t, []map[string]interface{}(nil), New(m).Get("nothing").MSISlice())
+- assert.Equal(t, val, New(m).Get("nothing").MSISlice([]map[string]interface{}{map[string]interface{}(map[string]interface{}{"name": "Tyler"})})[0])
+-
+- assert.Panics(t, func() {
+- New(m).Get("nothing").MustMSISlice()
+- })
-
-- if result.Vint != 5 {
-- t.Errorf("vint should be 5: %#v", result.Vint)
-- }
-}
-
--func TestDecode_Nil(t *testing.T) {
-- t.Parallel()
+-func TestIsMSI(t *testing.T) {
-
-- var input interface{} = nil
-- result := Basic{
-- Vstring: "foo",
-- }
+- var v *Value
-
-- err := Decode(input, &result)
-- if err != nil {
-- t.Fatalf("err: %s", err)
-- }
+- v = &Value{data: map[string]interface{}(map[string]interface{}{"name": "Tyler"})}
+- assert.True(t, v.IsMSI())
+-
+- v = &Value{data: []map[string]interface{}{map[string]interface{}(map[string]interface{}{"name": "Tyler"})}}
+- assert.True(t, v.IsMSISlice())
-
-- if result.Vstring != "foo" {
-- t.Fatalf("bad: %#v", result.Vstring)
-- }
-}
-
--func TestDecode_NonStruct(t *testing.T) {
-- t.Parallel()
+-func TestEachMSI(t *testing.T) {
-
-- input := map[string]interface{}{
-- "foo": "bar",
-- "bar": "baz",
-- }
+- v := &Value{data: []map[string]interface{}{map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"})}}
+- count := 0
+- replacedVals := make([]map[string]interface{}, 0)
+- assert.Equal(t, v, v.EachMSI(func(i int, val map[string]interface{}) bool {
-
-- var result map[string]string
-- err := Decode(input, &result)
-- if err != nil {
-- t.Fatalf("err: %s", err)
-- }
+- count++
+- replacedVals = append(replacedVals, val)
-
-- if result["foo"] != "bar" {
-- t.Fatal("foo is not bar")
-- }
--}
+- // abort early
+- if i == 2 {
+- return false
+- }
-
--func TestDecode_TypeConversion(t *testing.T) {
-- input := map[string]interface{}{
-- "IntToFloat": 42,
-- "IntToUint": 42,
-- "IntToBool": 1,
-- "IntToString": 42,
-- "UintToInt": 42,
-- "UintToFloat": 42,
-- "UintToBool": 42,
-- "UintToString": 42,
-- "BoolToInt": true,
-- "BoolToUint": true,
-- "BoolToFloat": true,
-- "BoolToString": true,
-- "FloatToInt": 42.42,
-- "FloatToUint": 42.42,
-- "FloatToBool": 42.42,
-- "FloatToString": 42.42,
-- "SliceUint8ToString": []uint8("foo"),
-- "StringToInt": "42",
-- "StringToUint": "42",
-- "StringToBool": "1",
-- "StringToFloat": "42.42",
-- "SliceToMap": []interface{}{},
-- "MapToSlice": map[string]interface{}{},
-- }
+- return true
-
-- expectedResultStrict := TypeConversionResult{
-- IntToFloat: 42.0,
-- IntToUint: 42,
-- UintToInt: 42,
-- UintToFloat: 42,
-- BoolToInt: 0,
-- BoolToUint: 0,
-- BoolToFloat: 0,
-- FloatToInt: 42,
-- FloatToUint: 42,
-- }
+- }))
-
-- expectedResultWeak := TypeConversionResult{
-- IntToFloat: 42.0,
-- IntToUint: 42,
-- IntToBool: true,
-- IntToString: "42",
-- UintToInt: 42,
-- UintToFloat: 42,
-- UintToBool: true,
-- UintToString: "42",
-- BoolToInt: 1,
-- BoolToUint: 1,
-- BoolToFloat: 1,
-- BoolToString: "1",
-- FloatToInt: 42,
-- FloatToUint: 42,
-- FloatToBool: true,
-- FloatToString: "42.42",
-- SliceUint8ToString: "foo",
-- StringToInt: 42,
-- StringToUint: 42,
-- StringToBool: true,
-- StringToFloat: 42.42,
-- SliceToMap: map[string]interface{}{},
-- MapToSlice: []interface{}{},
-- }
+- assert.Equal(t, count, 3)
+- assert.Equal(t, replacedVals[0], v.MustMSISlice()[0])
+- assert.Equal(t, replacedVals[1], v.MustMSISlice()[1])
+- assert.Equal(t, replacedVals[2], v.MustMSISlice()[2])
-
-- // Test strict type conversion
-- var resultStrict TypeConversionResult
-- err := Decode(input, &resultStrict)
-- if err == nil {
-- t.Errorf("should return an error")
-- }
-- if !reflect.DeepEqual(resultStrict, expectedResultStrict) {
-- t.Errorf("expected %v, got: %v", expectedResultStrict, resultStrict)
-- }
+-}
-
-- // Test weak type conversion
-- var decoder *Decoder
-- var resultWeak TypeConversionResult
+-func TestWhereMSI(t *testing.T) {
-
-- config := &DecoderConfig{
-- WeaklyTypedInput: true,
-- Result: &resultWeak,
-- }
+- v := &Value{data: []map[string]interface{}{map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"})}}
-
-- decoder, err = NewDecoder(config)
-- if err != nil {
-- t.Fatalf("err: %s", err)
-- }
+- selected := v.WhereMSI(func(i int, val map[string]interface{}) bool {
+- return i%2 == 0
+- }).MustMSISlice()
-
-- err = decoder.Decode(input)
-- if err != nil {
-- t.Fatalf("got an err: %s", err)
-- }
+- assert.Equal(t, 3, len(selected))
-
-- if !reflect.DeepEqual(resultWeak, expectedResultWeak) {
-- t.Errorf("expected \n%#v, got: \n%#v", expectedResultWeak, resultWeak)
-- }
-}
-
--func TestDecoder_ErrorUnused(t *testing.T) {
-- t.Parallel()
+-func TestGroupMSI(t *testing.T) {
-
-- input := map[string]interface{}{
-- "vstring": "hello",
-- "foo": "bar",
-- }
+- v := &Value{data: []map[string]interface{}{map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"})}}
-
-- var result Basic
-- config := &DecoderConfig{
-- ErrorUnused: true,
-- Result: &result,
-- }
+- grouped := v.GroupMSI(func(i int, val map[string]interface{}) string {
+- return fmt.Sprintf("%v", i%2 == 0)
+- }).data.(map[string][]map[string]interface{})
-
-- decoder, err := NewDecoder(config)
-- if err != nil {
-- t.Fatalf("err: %s", err)
-- }
+- assert.Equal(t, 2, len(grouped))
+- assert.Equal(t, 3, len(grouped["true"]))
+- assert.Equal(t, 3, len(grouped["false"]))
-
-- err = decoder.Decode(input)
-- if err == nil {
-- t.Fatal("expected error")
-- }
-}
-
--func TestMap(t *testing.T) {
-- t.Parallel()
+-func TestReplaceMSI(t *testing.T) {
-
-- input := map[string]interface{}{
-- "vfoo": "foo",
-- "vother": map[interface{}]interface{}{
-- "foo": "foo",
-- "bar": "bar",
-- },
-- }
+- v := &Value{data: []map[string]interface{}{map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"})}}
-
-- var result Map
-- err := Decode(input, &result)
-- if err != nil {
-- t.Fatalf("got an error: %s", err)
-- }
+- rawArr := v.MustMSISlice()
-
-- if result.Vfoo != "foo" {
-- t.Errorf("vfoo value should be 'foo': %#v", result.Vfoo)
-- }
+- replaced := v.ReplaceMSI(func(index int, val map[string]interface{}) map[string]interface{} {
+- if index < len(rawArr)-1 {
+- return rawArr[index+1]
+- }
+- return rawArr[0]
+- })
-
-- if result.Vother == nil {
-- t.Fatal("vother should not be nil")
+- replacedArr := replaced.MustMSISlice()
+- if assert.Equal(t, 6, len(replacedArr)) {
+- assert.Equal(t, replacedArr[0], rawArr[1])
+- assert.Equal(t, replacedArr[1], rawArr[2])
+- assert.Equal(t, replacedArr[2], rawArr[3])
+- assert.Equal(t, replacedArr[3], rawArr[4])
+- assert.Equal(t, replacedArr[4], rawArr[5])
+- assert.Equal(t, replacedArr[5], rawArr[0])
- }
-
-- if len(result.Vother) != 2 {
-- t.Error("vother should have two items")
-- }
+-}
-
-- if result.Vother["foo"] != "foo" {
-- t.Errorf("'foo' key should be foo, got: %#v", result.Vother["foo"])
-- }
+-func TestCollectMSI(t *testing.T) {
-
-- if result.Vother["bar"] != "bar" {
-- t.Errorf("'bar' key should be bar, got: %#v", result.Vother["bar"])
-- }
--}
+- v := &Value{data: []map[string]interface{}{map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"})}}
-
--func TestMapOfStruct(t *testing.T) {
-- t.Parallel()
+- collected := v.CollectMSI(func(index int, val map[string]interface{}) interface{} {
+- return index
+- })
-
-- input := map[string]interface{}{
-- "value": map[string]interface{}{
-- "foo": map[string]string{"vstring": "one"},
-- "bar": map[string]string{"vstring": "two"},
-- },
+- collectedArr := collected.MustInterSlice()
+- if assert.Equal(t, 6, len(collectedArr)) {
+- assert.Equal(t, collectedArr[0], 0)
+- assert.Equal(t, collectedArr[1], 1)
+- assert.Equal(t, collectedArr[2], 2)
+- assert.Equal(t, collectedArr[3], 3)
+- assert.Equal(t, collectedArr[4], 4)
+- assert.Equal(t, collectedArr[5], 5)
- }
-
-- var result MapOfStruct
-- err := Decode(input, &result)
-- if err != nil {
-- t.Fatalf("got an err: %s", err)
-- }
+-}
-
-- if result.Value == nil {
-- t.Fatal("value should not be nil")
-- }
+-// ************************************************************
+-// TESTS
+-// ************************************************************
-
-- if len(result.Value) != 2 {
-- t.Error("value should have two items")
-- }
+-func TestObjxMap(t *testing.T) {
-
-- if result.Value["foo"].Vstring != "one" {
-- t.Errorf("foo value should be 'one', got: %s", result.Value["foo"].Vstring)
-- }
+- val := (Map)(New(1))
+- m := map[string]interface{}{"value": val, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").ObjxMap())
+- assert.Equal(t, val, New(m).Get("value").MustObjxMap())
+- assert.Equal(t, (Map)(New(nil)), New(m).Get("nothing").ObjxMap())
+- assert.Equal(t, val, New(m).Get("nothing").ObjxMap(New(1)))
+-
+- assert.Panics(t, func() {
+- New(m).Get("age").MustObjxMap()
+- })
-
-- if result.Value["bar"].Vstring != "two" {
-- t.Errorf("bar value should be 'two', got: %s", result.Value["bar"].Vstring)
-- }
-}
-
--func TestNestedType(t *testing.T) {
-- t.Parallel()
+-func TestObjxMapSlice(t *testing.T) {
-
-- input := map[string]interface{}{
-- "vfoo": "foo",
-- "vbar": map[string]interface{}{
-- "vstring": "foo",
-- "vint": 42,
-- "vbool": true,
-- },
-- }
+- val := (Map)(New(1))
+- m := map[string]interface{}{"value": [](Map){val}, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").ObjxMapSlice()[0])
+- assert.Equal(t, val, New(m).Get("value").MustObjxMapSlice()[0])
+- assert.Equal(t, [](Map)(nil), New(m).Get("nothing").ObjxMapSlice())
+- assert.Equal(t, val, New(m).Get("nothing").ObjxMapSlice([](Map){(Map)(New(1))})[0])
-
-- var result Nested
-- err := Decode(input, &result)
-- if err != nil {
-- t.Fatalf("got an err: %s", err.Error())
-- }
+- assert.Panics(t, func() {
+- New(m).Get("nothing").MustObjxMapSlice()
+- })
-
-- if result.Vfoo != "foo" {
-- t.Errorf("vfoo value should be 'foo': %#v", result.Vfoo)
-- }
+-}
-
-- if result.Vbar.Vstring != "foo" {
-- t.Errorf("vstring value should be 'foo': %#v", result.Vbar.Vstring)
-- }
+-func TestIsObjxMap(t *testing.T) {
-
-- if result.Vbar.Vint != 42 {
-- t.Errorf("vint value should be 42: %#v", result.Vbar.Vint)
-- }
+- var v *Value
-
-- if result.Vbar.Vbool != true {
-- t.Errorf("vbool value should be true: %#v", result.Vbar.Vbool)
-- }
+- v = &Value{data: (Map)(New(1))}
+- assert.True(t, v.IsObjxMap())
+-
+- v = &Value{data: [](Map){(Map)(New(1))}}
+- assert.True(t, v.IsObjxMapSlice())
-
-- if result.Vbar.Vextra != "" {
-- t.Errorf("vextra value should be empty: %#v", result.Vbar.Vextra)
-- }
-}
-
--func TestNestedTypePointer(t *testing.T) {
-- t.Parallel()
+-func TestEachObjxMap(t *testing.T) {
-
-- input := map[string]interface{}{
-- "vfoo": "foo",
-- "vbar": &map[string]interface{}{
-- "vstring": "foo",
-- "vint": 42,
-- "vbool": true,
-- },
-- }
+- v := &Value{data: [](Map){(Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1))}}
+- count := 0
+- replacedVals := make([](Map), 0)
+- assert.Equal(t, v, v.EachObjxMap(func(i int, val Map) bool {
-
-- var result NestedPointer
-- err := Decode(input, &result)
-- if err != nil {
-- t.Fatalf("got an err: %s", err.Error())
-- }
+- count++
+- replacedVals = append(replacedVals, val)
-
-- if result.Vfoo != "foo" {
-- t.Errorf("vfoo value should be 'foo': %#v", result.Vfoo)
-- }
+- // abort early
+- if i == 2 {
+- return false
+- }
-
-- if result.Vbar.Vstring != "foo" {
-- t.Errorf("vstring value should be 'foo': %#v", result.Vbar.Vstring)
-- }
+- return true
-
-- if result.Vbar.Vint != 42 {
-- t.Errorf("vint value should be 42: %#v", result.Vbar.Vint)
-- }
+- }))
-
-- if result.Vbar.Vbool != true {
-- t.Errorf("vbool value should be true: %#v", result.Vbar.Vbool)
-- }
+- assert.Equal(t, count, 3)
+- assert.Equal(t, replacedVals[0], v.MustObjxMapSlice()[0])
+- assert.Equal(t, replacedVals[1], v.MustObjxMapSlice()[1])
+- assert.Equal(t, replacedVals[2], v.MustObjxMapSlice()[2])
-
-- if result.Vbar.Vextra != "" {
-- t.Errorf("vextra value should be empty: %#v", result.Vbar.Vextra)
-- }
-}
-
--func TestSlice(t *testing.T) {
-- t.Parallel()
+-func TestWhereObjxMap(t *testing.T) {
-
-- inputStringSlice := map[string]interface{}{
-- "vfoo": "foo",
-- "vbar": []string{"foo", "bar", "baz"},
-- }
+- v := &Value{data: [](Map){(Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1))}}
-
-- inputStringSlicePointer := map[string]interface{}{
-- "vfoo": "foo",
-- "vbar": &[]string{"foo", "bar", "baz"},
-- }
+- selected := v.WhereObjxMap(func(i int, val Map) bool {
+- return i%2 == 0
+- }).MustObjxMapSlice()
-
-- outputStringSlice := &Slice{
-- "foo",
-- []string{"foo", "bar", "baz"},
-- }
+- assert.Equal(t, 3, len(selected))
-
-- testSliceInput(t, inputStringSlice, outputStringSlice)
-- testSliceInput(t, inputStringSlicePointer, outputStringSlice)
-}
-
--func TestInvalidSlice(t *testing.T) {
-- t.Parallel()
+-func TestGroupObjxMap(t *testing.T) {
-
-- input := map[string]interface{}{
-- "vfoo": "foo",
-- "vbar": 42,
-- }
+- v := &Value{data: [](Map){(Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1))}}
-
-- result := Slice{}
-- err := Decode(input, &result)
-- if err == nil {
-- t.Errorf("expected failure")
+- grouped := v.GroupObjxMap(func(i int, val Map) string {
+- return fmt.Sprintf("%v", i%2 == 0)
+- }).data.(map[string][](Map))
+-
+- assert.Equal(t, 2, len(grouped))
+- assert.Equal(t, 3, len(grouped["true"]))
+- assert.Equal(t, 3, len(grouped["false"]))
+-
+-}
+-
+-func TestReplaceObjxMap(t *testing.T) {
+-
+- v := &Value{data: [](Map){(Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1))}}
+-
+- rawArr := v.MustObjxMapSlice()
+-
+- replaced := v.ReplaceObjxMap(func(index int, val Map) Map {
+- if index < len(rawArr)-1 {
+- return rawArr[index+1]
+- }
+- return rawArr[0]
+- })
+-
+- replacedArr := replaced.MustObjxMapSlice()
+- if assert.Equal(t, 6, len(replacedArr)) {
+- assert.Equal(t, replacedArr[0], rawArr[1])
+- assert.Equal(t, replacedArr[1], rawArr[2])
+- assert.Equal(t, replacedArr[2], rawArr[3])
+- assert.Equal(t, replacedArr[3], rawArr[4])
+- assert.Equal(t, replacedArr[4], rawArr[5])
+- assert.Equal(t, replacedArr[5], rawArr[0])
- }
--}
-
--func TestSliceOfStruct(t *testing.T) {
-- t.Parallel()
+-}
-
-- input := map[string]interface{}{
-- "value": []map[string]interface{}{
-- {"vstring": "one"},
-- {"vstring": "two"},
-- },
-- }
+-func TestCollectObjxMap(t *testing.T) {
-
-- var result SliceOfStruct
-- err := Decode(input, &result)
-- if err != nil {
-- t.Fatalf("got unexpected error: %s", err)
-- }
+- v := &Value{data: [](Map){(Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1))}}
-
-- if len(result.Value) != 2 {
-- t.Fatalf("expected two values, got %d", len(result.Value))
-- }
+- collected := v.CollectObjxMap(func(index int, val Map) interface{} {
+- return index
+- })
-
-- if result.Value[0].Vstring != "one" {
-- t.Errorf("first value should be 'one', got: %s", result.Value[0].Vstring)
+- collectedArr := collected.MustInterSlice()
+- if assert.Equal(t, 6, len(collectedArr)) {
+- assert.Equal(t, collectedArr[0], 0)
+- assert.Equal(t, collectedArr[1], 1)
+- assert.Equal(t, collectedArr[2], 2)
+- assert.Equal(t, collectedArr[3], 3)
+- assert.Equal(t, collectedArr[4], 4)
+- assert.Equal(t, collectedArr[5], 5)
- }
-
-- if result.Value[1].Vstring != "two" {
-- t.Errorf("second value should be 'two', got: %s", result.Value[1].Vstring)
-- }
-}
-
--func TestInvalidType(t *testing.T) {
-- t.Parallel()
+-// ************************************************************
+-// TESTS
+-// ************************************************************
-
-- input := map[string]interface{}{
-- "vstring": 42,
-- }
+-func TestBool(t *testing.T) {
-
-- var result Basic
-- err := Decode(input, &result)
-- if err == nil {
-- t.Fatal("error should exist")
-- }
+- val := bool(true)
+- m := map[string]interface{}{"value": val, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").Bool())
+- assert.Equal(t, val, New(m).Get("value").MustBool())
+- assert.Equal(t, bool(false), New(m).Get("nothing").Bool())
+- assert.Equal(t, val, New(m).Get("nothing").Bool(true))
-
-- derr, ok := err.(*Error)
-- if !ok {
-- t.Fatalf("error should be kind of Error, instead: %#v", err)
-- }
+- assert.Panics(t, func() {
+- New(m).Get("age").MustBool()
+- })
-
-- if derr.Errors[0] != "'Vstring' expected type 'string', got unconvertible type 'int'" {
-- t.Errorf("got unexpected error: %s", err)
-- }
-}
-
--func TestMetadata(t *testing.T) {
-- t.Parallel()
--
-- input := map[string]interface{}{
-- "vfoo": "foo",
-- "vbar": map[string]interface{}{
-- "vstring": "foo",
-- "Vuint": 42,
-- "foo": "bar",
-- },
-- "bar": "nil",
-- }
+-func TestBoolSlice(t *testing.T) {
-
-- var md Metadata
-- var result Nested
-- config := &DecoderConfig{
-- Metadata: &md,
-- Result: &result,
-- }
+- val := bool(true)
+- m := map[string]interface{}{"value": []bool{val}, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").BoolSlice()[0])
+- assert.Equal(t, val, New(m).Get("value").MustBoolSlice()[0])
+- assert.Equal(t, []bool(nil), New(m).Get("nothing").BoolSlice())
+- assert.Equal(t, val, New(m).Get("nothing").BoolSlice([]bool{bool(true)})[0])
-
-- decoder, err := NewDecoder(config)
-- if err != nil {
-- t.Fatalf("err: %s", err)
-- }
+- assert.Panics(t, func() {
+- New(m).Get("nothing").MustBoolSlice()
+- })
-
-- err = decoder.Decode(input)
-- if err != nil {
-- t.Fatalf("err: %s", err.Error())
-- }
+-}
-
-- expectedKeys := []string{"Vfoo", "Vbar.Vstring", "Vbar.Vuint", "Vbar"}
-- if !reflect.DeepEqual(md.Keys, expectedKeys) {
-- t.Fatalf("bad keys: %#v", md.Keys)
-- }
+-func TestIsBool(t *testing.T) {
-
-- expectedUnused := []string{"Vbar.foo", "bar"}
-- if !reflect.DeepEqual(md.Unused, expectedUnused) {
-- t.Fatalf("bad unused: %#v", md.Unused)
-- }
--}
+- var v *Value
-
--func TestMetadata_Embedded(t *testing.T) {
-- t.Parallel()
+- v = &Value{data: bool(true)}
+- assert.True(t, v.IsBool())
-
-- input := map[string]interface{}{
-- "vstring": "foo",
-- "vunique": "bar",
-- }
+- v = &Value{data: []bool{bool(true)}}
+- assert.True(t, v.IsBoolSlice())
-
-- var md Metadata
-- var result EmbeddedSquash
-- config := &DecoderConfig{
-- Metadata: &md,
-- Result: &result,
-- }
+-}
-
-- decoder, err := NewDecoder(config)
-- if err != nil {
-- t.Fatalf("err: %s", err)
-- }
+-func TestEachBool(t *testing.T) {
-
-- err = decoder.Decode(input)
-- if err != nil {
-- t.Fatalf("err: %s", err.Error())
-- }
+- v := &Value{data: []bool{bool(true), bool(true), bool(true), bool(true), bool(true)}}
+- count := 0
+- replacedVals := make([]bool, 0)
+- assert.Equal(t, v, v.EachBool(func(i int, val bool) bool {
-
-- expectedKeys := []string{"Vstring", "Vunique"}
+- count++
+- replacedVals = append(replacedVals, val)
-
-- sort.Strings(md.Keys)
-- if !reflect.DeepEqual(md.Keys, expectedKeys) {
-- t.Fatalf("bad keys: %#v", md.Keys)
-- }
+- // abort early
+- if i == 2 {
+- return false
+- }
-
-- expectedUnused := []string{}
-- if !reflect.DeepEqual(md.Unused, expectedUnused) {
-- t.Fatalf("bad unused: %#v", md.Unused)
-- }
--}
+- return true
-
--func TestNonPtrValue(t *testing.T) {
-- t.Parallel()
+- }))
-
-- err := Decode(map[string]interface{}{}, Basic{})
-- if err == nil {
-- t.Fatal("error should exist")
-- }
+- assert.Equal(t, count, 3)
+- assert.Equal(t, replacedVals[0], v.MustBoolSlice()[0])
+- assert.Equal(t, replacedVals[1], v.MustBoolSlice()[1])
+- assert.Equal(t, replacedVals[2], v.MustBoolSlice()[2])
-
-- if err.Error() != "result must be a pointer" {
-- t.Errorf("got unexpected error: %s", err)
-- }
-}
-
--func TestTagged(t *testing.T) {
-- t.Parallel()
+-func TestWhereBool(t *testing.T) {
-
-- input := map[string]interface{}{
-- "foo": "bar",
-- "bar": "value",
-- }
+- v := &Value{data: []bool{bool(true), bool(true), bool(true), bool(true), bool(true), bool(true)}}
-
-- var result Tagged
-- err := Decode(input, &result)
-- if err != nil {
-- t.Fatalf("unexpected error: %s", err)
-- }
+- selected := v.WhereBool(func(i int, val bool) bool {
+- return i%2 == 0
+- }).MustBoolSlice()
-
-- if result.Value != "bar" {
-- t.Errorf("value should be 'bar', got: %#v", result.Value)
-- }
+- assert.Equal(t, 3, len(selected))
-
-- if result.Extra != "value" {
-- t.Errorf("extra should be 'value', got: %#v", result.Extra)
-- }
-}
-
--func TestWeakDecode(t *testing.T) {
-- t.Parallel()
+-func TestGroupBool(t *testing.T) {
-
-- input := map[string]interface{}{
-- "foo": "4",
-- "bar": "value",
-- }
+- v := &Value{data: []bool{bool(true), bool(true), bool(true), bool(true), bool(true), bool(true)}}
-
-- var result struct {
-- Foo int
-- Bar string
-- }
+- grouped := v.GroupBool(func(i int, val bool) string {
+- return fmt.Sprintf("%v", i%2 == 0)
+- }).data.(map[string][]bool)
-
-- if err := WeakDecode(input, &result); err != nil {
-- t.Fatalf("err: %s", err)
-- }
-- if result.Foo != 4 {
-- t.Fatalf("bad: %#v", result)
-- }
-- if result.Bar != "value" {
-- t.Fatalf("bad: %#v", result)
-- }
--}
+- assert.Equal(t, 2, len(grouped))
+- assert.Equal(t, 3, len(grouped["true"]))
+- assert.Equal(t, 3, len(grouped["false"]))
-
--func testSliceInput(t *testing.T, input map[string]interface{}, expected *Slice) {
-- var result Slice
-- err := Decode(input, &result)
-- if err != nil {
-- t.Fatalf("got error: %s", err)
-- }
+-}
-
-- if result.Vfoo != expected.Vfoo {
-- t.Errorf("Vfoo expected '%s', got '%s'", expected.Vfoo, result.Vfoo)
-- }
+-func TestReplaceBool(t *testing.T) {
-
-- if result.Vbar == nil {
-- t.Fatalf("Vbar a slice, got '%#v'", result.Vbar)
-- }
+- v := &Value{data: []bool{bool(true), bool(true), bool(true), bool(true), bool(true), bool(true)}}
-
-- if len(result.Vbar) != len(expected.Vbar) {
-- t.Errorf("Vbar length should be %d, got %d", len(expected.Vbar), len(result.Vbar))
-- }
+- rawArr := v.MustBoolSlice()
-
-- for i, v := range result.Vbar {
-- if v != expected.Vbar[i] {
-- t.Errorf(
-- "Vbar[%d] should be '%#v', got '%#v'",
-- i, expected.Vbar[i], v)
+- replaced := v.ReplaceBool(func(index int, val bool) bool {
+- if index < len(rawArr)-1 {
+- return rawArr[index+1]
- }
+- return rawArr[0]
+- })
+-
+- replacedArr := replaced.MustBoolSlice()
+- if assert.Equal(t, 6, len(replacedArr)) {
+- assert.Equal(t, replacedArr[0], rawArr[1])
+- assert.Equal(t, replacedArr[1], rawArr[2])
+- assert.Equal(t, replacedArr[2], rawArr[3])
+- assert.Equal(t, replacedArr[3], rawArr[4])
+- assert.Equal(t, replacedArr[4], rawArr[5])
+- assert.Equal(t, replacedArr[5], rawArr[0])
- }
+-
-}
-diff --git a/Godeps/_workspace/src/github.com/racker/perigee/.gitignore b/Godeps/_workspace/src/github.com/racker/perigee/.gitignore
-deleted file mode 100644
-index 49ca32a..0000000
---- a/Godeps/_workspace/src/github.com/racker/perigee/.gitignore
-+++ /dev/null
-@@ -1,2 +0,0 @@
--bin/*
--pkg/*
-diff --git a/Godeps/_workspace/src/github.com/racker/perigee/LICENSE b/Godeps/_workspace/src/github.com/racker/perigee/LICENSE
-deleted file mode 100644
-index d645695..0000000
---- a/Godeps/_workspace/src/github.com/racker/perigee/LICENSE
-+++ /dev/null
-@@ -1,202 +0,0 @@
-
-- Apache License
-- Version 2.0, January 2004
-- http://www.apache.org/licenses/
+-func TestCollectBool(t *testing.T) {
-
-- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+- v := &Value{data: []bool{bool(true), bool(true), bool(true), bool(true), bool(true), bool(true)}}
-
-- 1. Definitions.
+- collected := v.CollectBool(func(index int, val bool) interface{} {
+- return index
+- })
-
-- "License" shall mean the terms and conditions for use, reproduction,
-- and distribution as defined by Sections 1 through 9 of this document.
+- collectedArr := collected.MustInterSlice()
+- if assert.Equal(t, 6, len(collectedArr)) {
+- assert.Equal(t, collectedArr[0], 0)
+- assert.Equal(t, collectedArr[1], 1)
+- assert.Equal(t, collectedArr[2], 2)
+- assert.Equal(t, collectedArr[3], 3)
+- assert.Equal(t, collectedArr[4], 4)
+- assert.Equal(t, collectedArr[5], 5)
+- }
-
-- "Licensor" shall mean the copyright owner or entity authorized by
-- the copyright owner that is granting the License.
+-}
-
-- "Legal Entity" shall mean the union of the acting entity and all
-- other entities that control, are controlled by, or are under common
-- control with that entity. For the purposes of this definition,
-- "control" means (i) the power, direct or indirect, to cause the
-- direction or management of such entity, whether by contract or
-- otherwise, or (ii) ownership of fifty percent (50%) or more of the
-- outstanding shares, or (iii) beneficial ownership of such entity.
+-// ************************************************************
+-// TESTS
+-// ************************************************************
-
-- "You" (or "Your") shall mean an individual or Legal Entity
-- exercising permissions granted by this License.
+-func TestStr(t *testing.T) {
-
-- "Source" form shall mean the preferred form for making modifications,
-- including but not limited to software source code, documentation
-- source, and configuration files.
+- val := string("hello")
+- m := map[string]interface{}{"value": val, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").Str())
+- assert.Equal(t, val, New(m).Get("value").MustStr())
+- assert.Equal(t, string(""), New(m).Get("nothing").Str())
+- assert.Equal(t, val, New(m).Get("nothing").Str("hello"))
-
-- "Object" form shall mean any form resulting from mechanical
-- transformation or translation of a Source form, including but
-- not limited to compiled object code, generated documentation,
-- and conversions to other media types.
+- assert.Panics(t, func() {
+- New(m).Get("age").MustStr()
+- })
-
-- "Work" shall mean the work of authorship, whether in Source or
-- Object form, made available under the License, as indicated by a
-- copyright notice that is included in or attached to the work
-- (an example is provided in the Appendix below).
+-}
-
-- "Derivative Works" shall mean any work, whether in Source or Object
-- form, that is based on (or derived from) the Work and for which the
-- editorial revisions, annotations, elaborations, or other modifications
-- represent, as a whole, an original work of authorship. For the purposes
-- of this License, Derivative Works shall not include works that remain
-- separable from, or merely link (or bind by name) to the interfaces of,
-- the Work and Derivative Works thereof.
+-func TestStrSlice(t *testing.T) {
-
-- "Contribution" shall mean any work of authorship, including
-- the original version of the Work and any modifications or additions
-- to that Work or Derivative Works thereof, that is intentionally
-- submitted to Licensor for inclusion in the Work by the copyright owner
-- or by an individual or Legal Entity authorized to submit on behalf of
-- the copyright owner. For the purposes of this definition, "submitted"
-- means any form of electronic, verbal, or written communication sent
-- to the Licensor or its representatives, including but not limited to
-- communication on electronic mailing lists, source code control systems,
-- and issue tracking systems that are managed by, or on behalf of, the
-- Licensor for the purpose of discussing and improving the Work, but
-- excluding communication that is conspicuously marked or otherwise
-- designated in writing by the copyright owner as "Not a Contribution."
+- val := string("hello")
+- m := map[string]interface{}{"value": []string{val}, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").StrSlice()[0])
+- assert.Equal(t, val, New(m).Get("value").MustStrSlice()[0])
+- assert.Equal(t, []string(nil), New(m).Get("nothing").StrSlice())
+- assert.Equal(t, val, New(m).Get("nothing").StrSlice([]string{string("hello")})[0])
-
-- "Contributor" shall mean Licensor and any individual or Legal Entity
-- on behalf of whom a Contribution has been received by Licensor and
-- subsequently incorporated within the Work.
+- assert.Panics(t, func() {
+- New(m).Get("nothing").MustStrSlice()
+- })
-
-- 2. Grant of Copyright License. Subject to the terms and conditions of
-- this License, each Contributor hereby grants to You a perpetual,
-- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-- copyright license to reproduce, prepare Derivative Works of,
-- publicly display, publicly perform, sublicense, and distribute the
-- Work and such Derivative Works in Source or Object form.
+-}
-
-- 3. Grant of Patent License. Subject to the terms and conditions of
-- this License, each Contributor hereby grants to You a perpetual,
-- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-- (except as stated in this section) patent license to make, have made,
-- use, offer to sell, sell, import, and otherwise transfer the Work,
-- where such license applies only to those patent claims licensable
-- by such Contributor that are necessarily infringed by their
-- Contribution(s) alone or by combination of their Contribution(s)
-- with the Work to which such Contribution(s) was submitted. If You
-- institute patent litigation against any entity (including a
-- cross-claim or counterclaim in a lawsuit) alleging that the Work
-- or a Contribution incorporated within the Work constitutes direct
-- or contributory patent infringement, then any patent licenses
-- granted to You under this License for that Work shall terminate
-- as of the date such litigation is filed.
+-func TestIsStr(t *testing.T) {
-
-- 4. Redistribution. You may reproduce and distribute copies of the
-- Work or Derivative Works thereof in any medium, with or without
-- modifications, and in Source or Object form, provided that You
-- meet the following conditions:
+- var v *Value
-
-- (a) You must give any other recipients of the Work or
-- Derivative Works a copy of this License; and
+- v = &Value{data: string("hello")}
+- assert.True(t, v.IsStr())
-
-- (b) You must cause any modified files to carry prominent notices
-- stating that You changed the files; and
+- v = &Value{data: []string{string("hello")}}
+- assert.True(t, v.IsStrSlice())
-
-- (c) You must retain, in the Source form of any Derivative Works
-- that You distribute, all copyright, patent, trademark, and
-- attribution notices from the Source form of the Work,
-- excluding those notices that do not pertain to any part of
-- the Derivative Works; and
+-}
-
-- (d) If the Work includes a "NOTICE" text file as part of its
-- distribution, then any Derivative Works that You distribute must
-- include a readable copy of the attribution notices contained
-- within such NOTICE file, excluding those notices that do not
-- pertain to any part of the Derivative Works, in at least one
-- of the following places: within a NOTICE text file distributed
-- as part of the Derivative Works; within the Source form or
-- documentation, if provided along with the Derivative Works; or,
-- within a display generated by the Derivative Works, if and
-- wherever such third-party notices normally appear. The contents
-- of the NOTICE file are for informational purposes only and
-- do not modify the License. You may add Your own attribution
-- notices within Derivative Works that You distribute, alongside
-- or as an addendum to the NOTICE text from the Work, provided
-- that such additional attribution notices cannot be construed
-- as modifying the License.
+-func TestEachStr(t *testing.T) {
-
-- You may add Your own copyright statement to Your modifications and
-- may provide additional or different license terms and conditions
-- for use, reproduction, or distribution of Your modifications, or
-- for any such Derivative Works as a whole, provided Your use,
-- reproduction, and distribution of the Work otherwise complies with
-- the conditions stated in this License.
+- v := &Value{data: []string{string("hello"), string("hello"), string("hello"), string("hello"), string("hello")}}
+- count := 0
+- replacedVals := make([]string, 0)
+- assert.Equal(t, v, v.EachStr(func(i int, val string) bool {
-
-- 5. Submission of Contributions. Unless You explicitly state otherwise,
-- any Contribution intentionally submitted for inclusion in the Work
-- by You to the Licensor shall be under the terms and conditions of
-- this License, without any additional terms or conditions.
-- Notwithstanding the above, nothing herein shall supersede or modify
-- the terms of any separate license agreement you may have executed
-- with Licensor regarding such Contributions.
+- count++
+- replacedVals = append(replacedVals, val)
-
-- 6. Trademarks. This License does not grant permission to use the trade
-- names, trademarks, service marks, or product names of the Licensor,
-- except as required for reasonable and customary use in describing the
-- origin of the Work and reproducing the content of the NOTICE file.
+- // abort early
+- if i == 2 {
+- return false
+- }
-
-- 7. Disclaimer of Warranty. Unless required by applicable law or
-- agreed to in writing, Licensor provides the Work (and each
-- Contributor provides its Contributions) on an "AS IS" BASIS,
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-- implied, including, without limitation, any warranties or conditions
-- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-- PARTICULAR PURPOSE. You are solely responsible for determining the
-- appropriateness of using or redistributing the Work and assume any
-- risks associated with Your exercise of permissions under this License.
+- return true
-
-- 8. Limitation of Liability. In no event and under no legal theory,
-- whether in tort (including negligence), contract, or otherwise,
-- unless required by applicable law (such as deliberate and grossly
-- negligent acts) or agreed to in writing, shall any Contributor be
-- liable to You for damages, including any direct, indirect, special,
-- incidental, or consequential damages of any character arising as a
-- result of this License or out of the use or inability to use the
-- Work (including but not limited to damages for loss of goodwill,
-- work stoppage, computer failure or malfunction, or any and all
-- other commercial damages or losses), even if such Contributor
-- has been advised of the possibility of such damages.
+- }))
-
-- 9. Accepting Warranty or Additional Liability. While redistributing
-- the Work or Derivative Works thereof, You may choose to offer,
-- and charge a fee for, acceptance of support, warranty, indemnity,
-- or other liability obligations and/or rights consistent with this
-- License. However, in accepting such obligations, You may act only
-- on Your own behalf and on Your sole responsibility, not on behalf
-- of any other Contributor, and only if You agree to indemnify,
-- defend, and hold each Contributor harmless for any liability
-- incurred by, or claims asserted against, such Contributor by reason
-- of your accepting any such warranty or additional liability.
+- assert.Equal(t, count, 3)
+- assert.Equal(t, replacedVals[0], v.MustStrSlice()[0])
+- assert.Equal(t, replacedVals[1], v.MustStrSlice()[1])
+- assert.Equal(t, replacedVals[2], v.MustStrSlice()[2])
-
-- END OF TERMS AND CONDITIONS
+-}
-
-- APPENDIX: How to apply the Apache License to your work.
+-func TestWhereStr(t *testing.T) {
-
-- To apply the Apache License to your work, attach the following
-- boilerplate notice, with the fields enclosed by brackets "[]"
-- replaced with your own identifying information. (Don't include
-- the brackets!) The text should be enclosed in the appropriate
-- comment syntax for the file format. We also recommend that a
-- file or class name and description of purpose be included on the
-- same "printed page" as the copyright notice for easier
-- identification within third-party archives.
+- v := &Value{data: []string{string("hello"), string("hello"), string("hello"), string("hello"), string("hello"), string("hello")}}
+-
+- selected := v.WhereStr(func(i int, val string) bool {
+- return i%2 == 0
+- }).MustStrSlice()
-
-- Copyright [yyyy] [name of copyright owner]
+- assert.Equal(t, 3, len(selected))
-
-- Licensed under the Apache License, Version 2.0 (the "License");
-- you may not use this file except in compliance with the License.
-- You may obtain a copy of the License at
+-}
-
-- http://www.apache.org/licenses/LICENSE-2.0
+-func TestGroupStr(t *testing.T) {
-
-- Unless required by applicable law or agreed to in writing, software
-- distributed under the License is distributed on an "AS IS" BASIS,
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- See the License for the specific language governing permissions and
-- limitations under the License.
-diff --git a/Godeps/_workspace/src/github.com/racker/perigee/README.md b/Godeps/_workspace/src/github.com/racker/perigee/README.md
-deleted file mode 100644
-index 81cbf4a..0000000
---- a/Godeps/_workspace/src/github.com/racker/perigee/README.md
-+++ /dev/null
-@@ -1,120 +0,0 @@
--# perigee
+- v := &Value{data: []string{string("hello"), string("hello"), string("hello"), string("hello"), string("hello"), string("hello")}}
-
--Perigee provides a REST client that, while it should be generic enough to use with most any RESTful API, is nonetheless optimized to the needs of the OpenStack APIs.
--Perigee grew out of the need to refactor out common API access code from the [gorax](http://github.com/racker/gorax) project.
+- grouped := v.GroupStr(func(i int, val string) string {
+- return fmt.Sprintf("%v", i%2 == 0)
+- }).data.(map[string][]string)
-
--Several things influenced the name of the project.
--Numerous elements of the OpenStack ecosystem are named after astronomical artifacts.
--Additionally, perigee occurs when two orbiting bodies are closest to each other.
--Perigee seemed appropriate for something aiming to bring OpenStack and other RESTful services closer to the end-user.
+- assert.Equal(t, 2, len(grouped))
+- assert.Equal(t, 3, len(grouped["true"]))
+- assert.Equal(t, 3, len(grouped["false"]))
-
--**This library is still in the very early stages of development. Unless you want to contribute, it probably isn't what you want**
+-}
-
--## Installation and Testing
+-func TestReplaceStr(t *testing.T) {
-
--To install:
+- v := &Value{data: []string{string("hello"), string("hello"), string("hello"), string("hello"), string("hello"), string("hello")}}
-
--```bash
--go get github.com/racker/perigee
--```
+- rawArr := v.MustStrSlice()
-
--To run unit tests:
+- replaced := v.ReplaceStr(func(index int, val string) string {
+- if index < len(rawArr)-1 {
+- return rawArr[index+1]
+- }
+- return rawArr[0]
+- })
-
--```bash
--go test github.com/racker/perigee
--```
+- replacedArr := replaced.MustStrSlice()
+- if assert.Equal(t, 6, len(replacedArr)) {
+- assert.Equal(t, replacedArr[0], rawArr[1])
+- assert.Equal(t, replacedArr[1], rawArr[2])
+- assert.Equal(t, replacedArr[2], rawArr[3])
+- assert.Equal(t, replacedArr[3], rawArr[4])
+- assert.Equal(t, replacedArr[4], rawArr[5])
+- assert.Equal(t, replacedArr[5], rawArr[0])
+- }
-
--## Contributing
+-}
-
--The following guidelines are preliminary, as this project is just starting out.
--However, this should serve as a working first-draft.
+-func TestCollectStr(t *testing.T) {
-
--### Branching
+- v := &Value{data: []string{string("hello"), string("hello"), string("hello"), string("hello"), string("hello"), string("hello")}}
-
--The master branch must always be a valid build.
--The `go get` command will not work otherwise.
--Therefore, development must occur on a different branch.
+- collected := v.CollectStr(func(index int, val string) interface{} {
+- return index
+- })
-
--When creating a feature branch, do so off the master branch:
+- collectedArr := collected.MustInterSlice()
+- if assert.Equal(t, 6, len(collectedArr)) {
+- assert.Equal(t, collectedArr[0], 0)
+- assert.Equal(t, collectedArr[1], 1)
+- assert.Equal(t, collectedArr[2], 2)
+- assert.Equal(t, collectedArr[3], 3)
+- assert.Equal(t, collectedArr[4], 4)
+- assert.Equal(t, collectedArr[5], 5)
+- }
-
--```bash
--git checkout master
--git pull
--git checkout -b featureBranch
--git checkout -b featureBranch-wip # optional
--```
+-}
-
--Perform all your editing and testing in the WIP-branch.
--Feel free to make as many commits as you see fit.
--You may even open "WIP" pull requests from your feature branch to seek feedback.
--WIP pull requests will **never** be merged, however.
+-// ************************************************************
+-// TESTS
+-// ************************************************************
-
--To get code merged, you'll need to "squash" your changes into one or more clean commits in the feature branch.
--These steps should be followed:
+-func TestInt(t *testing.T) {
-
--```bash
--git checkout featureBranch
--git merge --squash featureBranch-wip
--git commit -a
--git push origin featureBranch
--```
+- val := int(1)
+- m := map[string]interface{}{"value": val, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").Int())
+- assert.Equal(t, val, New(m).Get("value").MustInt())
+- assert.Equal(t, int(0), New(m).Get("nothing").Int())
+- assert.Equal(t, val, New(m).Get("nothing").Int(1))
-
--You may now open a nice, clean, self-contained pull request from featureBranch to master.
+- assert.Panics(t, func() {
+- New(m).Get("age").MustInt()
+- })
-
--The `git commit -a` command above will open a text editor so that
--you may provide a comprehensive description of the changes.
+-}
-
--In general, when submitting a pull request against master,
--be sure to answer the following questions:
+-func TestIntSlice(t *testing.T) {
-
--- What is the problem?
--- Why is it a problem?
--- What is your solution?
--- How does your solution work? (Recommended for non-trivial changes.)
--- Why should we use your solution over someone elses? (Recommended especially if multiple solutions being discussed.)
+- val := int(1)
+- m := map[string]interface{}{"value": []int{val}, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").IntSlice()[0])
+- assert.Equal(t, val, New(m).Get("value").MustIntSlice()[0])
+- assert.Equal(t, []int(nil), New(m).Get("nothing").IntSlice())
+- assert.Equal(t, val, New(m).Get("nothing").IntSlice([]int{int(1)})[0])
-
--Remember that monster-sized pull requests are a bear to code-review,
--so having helpful commit logs are an absolute must to review changes as quickly as possible.
+- assert.Panics(t, func() {
+- New(m).Get("nothing").MustIntSlice()
+- })
-
--Finally, (s)he who breaks master is ultimately responsible for fixing master.
+-}
-
--### Source Representation
+-func TestIsInt(t *testing.T) {
-
--The Go community firmly believes in a consistent representation for all Go source code.
--We do too.
--Make sure all source code is passed through "go fmt" *before* you create your pull request.
+- var v *Value
-
--Please note, however, that we fully acknowledge and recognize that we no longer rely upon punch-cards for representing source files.
--Therefore, no 80-column limit exists.
--However, if a line exceeds 132 columns, you may want to consider splitting the line.
+- v = &Value{data: int(1)}
+- assert.True(t, v.IsInt())
-
--### Unit and Integration Tests
+- v = &Value{data: []int{int(1)}}
+- assert.True(t, v.IsIntSlice())
-
--Pull requests that include non-trivial code changes without accompanying unit tests will be flatly rejected.
--While we have no way of enforcing this practice,
--you can ensure your code is thoroughly tested by always [writing tests first by intention.](http://en.wikipedia.org/wiki/Test-driven_development)
+-}
-
--When creating a pull request, if even one test fails, the PR will be rejected.
--Make sure all unit tests pass.
--Make sure all integration tests pass.
+-func TestEachInt(t *testing.T) {
-
--### Documentation
+- v := &Value{data: []int{int(1), int(1), int(1), int(1), int(1)}}
+- count := 0
+- replacedVals := make([]int, 0)
+- assert.Equal(t, v, v.EachInt(func(i int, val int) bool {
-
--Private functions and methods which are obvious to anyone unfamiliar with gorax needn't be accompanied by documentation.
--However, this is a code-smell; if submitting a PR, expect to justify your decision.
+- count++
+- replacedVals = append(replacedVals, val)
-
--Public functions, regardless of how obvious, **must** have accompanying godoc-style documentation.
--This is not to suggest you should provide a tome for each function, however.
--Sometimes a link to more information is more appropriate, provided the link is stable, reliable, and pertinent.
+- // abort early
+- if i == 2 {
+- return false
+- }
-
--Changing documentation often results in bizarre diffs in pull requests, due to text often spanning multiple lines.
--To work around this, put [one logical thought or sentence on a single line.](http://rhodesmill.org/brandon/2012/one-sentence-per-line/)
--While this looks weird in a plain-text editor,
--remember that both godoc and HTML viewers will reflow text.
--The source code and its comments should be easy to edit with minimal diff pollution.
--Let software dedicated to presenting the documentation to human readers deal with its presentation.
+- return true
-
--## Examples
+- }))
-
--t.b.d.
+- assert.Equal(t, count, 3)
+- assert.Equal(t, replacedVals[0], v.MustIntSlice()[0])
+- assert.Equal(t, replacedVals[1], v.MustIntSlice()[1])
+- assert.Equal(t, replacedVals[2], v.MustIntSlice()[2])
-
-diff --git a/Godeps/_workspace/src/github.com/racker/perigee/api.go b/Godeps/_workspace/src/github.com/racker/perigee/api.go
-deleted file mode 100644
-index 0fcbadb..0000000
---- a/Godeps/_workspace/src/github.com/racker/perigee/api.go
-+++ /dev/null
-@@ -1,269 +0,0 @@
--// vim: ts=8 sw=8 noet ai
+-}
-
--package perigee
+-func TestWhereInt(t *testing.T) {
-
--import (
-- "encoding/json"
-- "fmt"
-- "io"
-- "io/ioutil"
-- "log"
-- "net/http"
-- "strings"
--)
+- v := &Value{data: []int{int(1), int(1), int(1), int(1), int(1), int(1)}}
-
--// The UnexpectedResponseCodeError structure represents a mismatch in understanding between server and client in terms of response codes.
--// Most often, this is due to an actual error condition (e.g., getting a 404 for a resource when you expect a 200).
--// However, it needn't always be the case (e.g., getting a 204 (No Content) response back when a 200 is expected).
--type UnexpectedResponseCodeError struct {
-- Url string
-- Expected []int
-- Actual int
-- Body []byte
--}
+- selected := v.WhereInt(func(i int, val int) bool {
+- return i%2 == 0
+- }).MustIntSlice()
+-
+- assert.Equal(t, 3, len(selected))
-
--func (err *UnexpectedResponseCodeError) Error() string {
-- return fmt.Sprintf("Expected HTTP response code %d when accessing URL(%s); got %d instead with the following body:\n%s", err.Expected, err.Url, err.Actual, string(err.Body))
-}
-
--// Request issues an HTTP request, marshaling parameters, and unmarshaling results, as configured in the provided Options parameter.
--// The Response structure returned, if any, will include accumulated results recovered from the HTTP server.
--// See the Response structure for more details.
--func Request(method string, url string, opts Options) (*Response, error) {
-- var body io.Reader
-- var response Response
+-func TestGroupInt(t *testing.T) {
-
-- client := opts.CustomClient
-- if client == nil {
-- client = new(http.Client)
-- }
+- v := &Value{data: []int{int(1), int(1), int(1), int(1), int(1), int(1)}}
-
-- contentType := opts.ContentType
+- grouped := v.GroupInt(func(i int, val int) string {
+- return fmt.Sprintf("%v", i%2 == 0)
+- }).data.(map[string][]int)
-
-- body = nil
-- if opts.ReqBody != nil {
-- if contentType == "" {
-- contentType = "application/json"
-- }
+- assert.Equal(t, 2, len(grouped))
+- assert.Equal(t, 3, len(grouped["true"]))
+- assert.Equal(t, 3, len(grouped["false"]))
-
-- if contentType == "application/json" {
-- bodyText, err := json.Marshal(opts.ReqBody)
-- if err != nil {
-- return nil, err
-- }
-- body = strings.NewReader(string(bodyText))
-- if opts.DumpReqJson {
-- log.Printf("Making request:\n%#v\n", string(bodyText))
-- }
-- } else {
-- // assume opts.ReqBody implements the correct interface
-- body = opts.ReqBody.(io.Reader)
-- }
-- }
+-}
-
-- req, err := http.NewRequest(method, url, body)
-- if err != nil {
-- return nil, err
-- }
+-func TestReplaceInt(t *testing.T) {
-
-- if contentType != "" {
-- req.Header.Add("Content-Type", contentType)
-- }
+- v := &Value{data: []int{int(1), int(1), int(1), int(1), int(1), int(1)}}
-
-- if opts.ContentLength > 0 {
-- req.ContentLength = opts.ContentLength
-- req.Header.Add("Content-Length", string(opts.ContentLength))
-- }
+- rawArr := v.MustIntSlice()
-
-- if opts.MoreHeaders != nil {
-- for k, v := range opts.MoreHeaders {
-- req.Header.Add(k, v)
+- replaced := v.ReplaceInt(func(index int, val int) int {
+- if index < len(rawArr)-1 {
+- return rawArr[index+1]
- }
-- }
+- return rawArr[0]
+- })
-
-- if accept := req.Header.Get("Accept"); accept == "" {
-- accept = opts.Accept
-- if accept == "" {
-- accept = "application/json"
-- }
-- req.Header.Add("Accept", accept)
+- replacedArr := replaced.MustIntSlice()
+- if assert.Equal(t, 6, len(replacedArr)) {
+- assert.Equal(t, replacedArr[0], rawArr[1])
+- assert.Equal(t, replacedArr[1], rawArr[2])
+- assert.Equal(t, replacedArr[2], rawArr[3])
+- assert.Equal(t, replacedArr[3], rawArr[4])
+- assert.Equal(t, replacedArr[4], rawArr[5])
+- assert.Equal(t, replacedArr[5], rawArr[0])
- }
-
-- if opts.SetHeaders != nil {
-- err = opts.SetHeaders(req)
-- if err != nil {
-- return &response, err
-- }
-- }
+-}
-
-- httpResponse, err := client.Do(req)
-- if httpResponse != nil {
-- response.HttpResponse = *httpResponse
-- response.StatusCode = httpResponse.StatusCode
-- }
+-func TestCollectInt(t *testing.T) {
-
-- if err != nil {
-- return &response, err
-- }
-- // This if-statement is legacy code, preserved for backward compatibility.
-- if opts.StatusCode != nil {
-- *opts.StatusCode = httpResponse.StatusCode
-- }
+- v := &Value{data: []int{int(1), int(1), int(1), int(1), int(1), int(1)}}
-
-- acceptableResponseCodes := opts.OkCodes
-- if len(acceptableResponseCodes) != 0 {
-- if not_in(httpResponse.StatusCode, acceptableResponseCodes) {
-- b, _ := ioutil.ReadAll(httpResponse.Body)
-- httpResponse.Body.Close()
-- return &response, &UnexpectedResponseCodeError{
-- Url: url,
-- Expected: acceptableResponseCodes,
-- Actual: httpResponse.StatusCode,
-- Body: b,
-- }
-- }
-- }
-- if opts.Results != nil {
-- defer httpResponse.Body.Close()
-- jsonResult, err := ioutil.ReadAll(httpResponse.Body)
-- response.JsonResult = jsonResult
-- if err != nil {
-- return &response, err
-- }
+- collected := v.CollectInt(func(index int, val int) interface{} {
+- return index
+- })
-
-- err = json.Unmarshal(jsonResult, opts.Results)
-- // This if-statement is legacy code, preserved for backward compatibility.
-- if opts.ResponseJson != nil {
-- *opts.ResponseJson = jsonResult
-- }
+- collectedArr := collected.MustInterSlice()
+- if assert.Equal(t, 6, len(collectedArr)) {
+- assert.Equal(t, collectedArr[0], 0)
+- assert.Equal(t, collectedArr[1], 1)
+- assert.Equal(t, collectedArr[2], 2)
+- assert.Equal(t, collectedArr[3], 3)
+- assert.Equal(t, collectedArr[4], 4)
+- assert.Equal(t, collectedArr[5], 5)
- }
-- return &response, err
--}
-
--// not_in returns false if, and only if, the provided needle is _not_
--// in the given set of integers.
--func not_in(needle int, haystack []int) bool {
-- for _, straw := range haystack {
-- if needle == straw {
-- return false
-- }
-- }
-- return true
-}
-
--// Post makes a POST request against a server using the provided HTTP client.
--// The url must be a fully-formed URL string.
--// DEPRECATED. Use Request() instead.
--func Post(url string, opts Options) error {
-- r, err := Request("POST", url, opts)
-- if opts.Response != nil {
-- *opts.Response = r
-- }
-- return err
--}
+-// ************************************************************
+-// TESTS
+-// ************************************************************
-
--// Get makes a GET request against a server using the provided HTTP client.
--// The url must be a fully-formed URL string.
--// DEPRECATED. Use Request() instead.
--func Get(url string, opts Options) error {
-- r, err := Request("GET", url, opts)
-- if opts.Response != nil {
-- *opts.Response = r
-- }
-- return err
--}
+-func TestInt8(t *testing.T) {
+-
+- val := int8(1)
+- m := map[string]interface{}{"value": val, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").Int8())
+- assert.Equal(t, val, New(m).Get("value").MustInt8())
+- assert.Equal(t, int8(0), New(m).Get("nothing").Int8())
+- assert.Equal(t, val, New(m).Get("nothing").Int8(1))
+-
+- assert.Panics(t, func() {
+- New(m).Get("age").MustInt8()
+- })
-
--// Delete makes a DELETE request against a server using the provided HTTP client.
--// The url must be a fully-formed URL string.
--// DEPRECATED. Use Request() instead.
--func Delete(url string, opts Options) error {
-- r, err := Request("DELETE", url, opts)
-- if opts.Response != nil {
-- *opts.Response = r
-- }
-- return err
-}
-
--// Put makes a PUT request against a server using the provided HTTP client.
--// The url must be a fully-formed URL string.
--// DEPRECATED. Use Request() instead.
--func Put(url string, opts Options) error {
-- r, err := Request("PUT", url, opts)
-- if opts.Response != nil {
-- *opts.Response = r
-- }
-- return err
+-func TestInt8Slice(t *testing.T) {
+-
+- val := int8(1)
+- m := map[string]interface{}{"value": []int8{val}, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").Int8Slice()[0])
+- assert.Equal(t, val, New(m).Get("value").MustInt8Slice()[0])
+- assert.Equal(t, []int8(nil), New(m).Get("nothing").Int8Slice())
+- assert.Equal(t, val, New(m).Get("nothing").Int8Slice([]int8{int8(1)})[0])
+-
+- assert.Panics(t, func() {
+- New(m).Get("nothing").MustInt8Slice()
+- })
+-
-}
-
--// Options describes a set of optional parameters to the various request calls.
--//
--// The custom client can be used for a variety of purposes beyond selecting encrypted versus unencrypted channels.
--// Transports can be defined to provide augmented logging, header manipulation, et. al.
--//
--// If the ReqBody field is provided, it will be embedded as a JSON object.
--// Otherwise, provide nil.
--//
--// If JSON output is to be expected from the response,
--// provide either a pointer to the container structure in Results,
--// or a pointer to a nil-initialized pointer variable.
--// The latter method will cause the unmarshaller to allocate the container type for you.
--// If no response is expected, provide a nil Results value.
--//
--// The MoreHeaders map, if non-nil or empty, provides a set of headers to add to those
--// already present in the request. At present, only Accepted and Content-Type are set
--// by default.
--//
--// OkCodes provides a set of acceptable, positive responses.
--//
--// If provided, StatusCode specifies a pointer to an integer, which will receive the
--// returned HTTP status code, successful or not. DEPRECATED; use the Response.StatusCode field instead for new software.
--//
--// ResponseJson, if specified, provides a means for returning the raw JSON. This is
--// most useful for diagnostics. DEPRECATED; use the Response.JsonResult field instead for new software.
--//
--// DumpReqJson, if set to true, will cause the request to appear to stdout for debugging purposes.
--// This attribute may be removed at any time in the future; DO NOT use this attribute in production software.
--//
--// Response, if set, provides a way to communicate the complete set of HTTP response, raw JSON, status code, and
--// other useful attributes back to the caller. Note that the Request() method returns a Response structure as part
--// of its public interface; you don't need to set the Response field here to use this structure. The Response field
--// exists primarily for legacy or deprecated functions.
--//
--// SetHeaders allows the caller to provide code to set any custom headers programmatically. Typically, this
--// facility can invoke, e.g., SetBasicAuth() on the request to easily set up authentication.
--// Any error generated will terminate the request and will propegate back to the caller.
--type Options struct {
-- CustomClient *http.Client
-- ReqBody interface{}
-- Results interface{}
-- MoreHeaders map[string]string
-- OkCodes []int
-- StatusCode *int `DEPRECATED`
-- DumpReqJson bool `UNSUPPORTED`
-- ResponseJson *[]byte `DEPRECATED`
-- Response **Response
-- ContentType string `json:"Content-Type,omitempty"`
-- ContentLength int64 `json:"Content-Length,omitempty"`
-- Accept string `json:"Accept,omitempty"`
-- SetHeaders func(r *http.Request) error
+-func TestIsInt8(t *testing.T) {
+-
+- var v *Value
+-
+- v = &Value{data: int8(1)}
+- assert.True(t, v.IsInt8())
+-
+- v = &Value{data: []int8{int8(1)}}
+- assert.True(t, v.IsInt8Slice())
+-
-}
-
--// Response contains return values from the various request calls.
--//
--// HttpResponse will return the http response from the request call.
--// Note: HttpResponse.Body is always closed and will not be available from this return value.
--//
--// StatusCode specifies the returned HTTP status code, successful or not.
--//
--// If Results is specified in the Options:
--// - JsonResult will contain the raw return from the request call
--// This is most useful for diagnostics.
--// - Result will contain the unmarshalled json either in the Result passed in
--// or the unmarshaller will allocate the container type for you.
+-func TestEachInt8(t *testing.T) {
+-
+- v := &Value{data: []int8{int8(1), int8(1), int8(1), int8(1), int8(1)}}
+- count := 0
+- replacedVals := make([]int8, 0)
+- assert.Equal(t, v, v.EachInt8(func(i int, val int8) bool {
+-
+- count++
+- replacedVals = append(replacedVals, val)
+-
+- // abort early
+- if i == 2 {
+- return false
+- }
+-
+- return true
+-
+- }))
+-
+- assert.Equal(t, count, 3)
+- assert.Equal(t, replacedVals[0], v.MustInt8Slice()[0])
+- assert.Equal(t, replacedVals[1], v.MustInt8Slice()[1])
+- assert.Equal(t, replacedVals[2], v.MustInt8Slice()[2])
-
--type Response struct {
-- HttpResponse http.Response
-- JsonResult []byte
-- Results interface{}
-- StatusCode int
-}
-diff --git a/Godeps/_workspace/src/github.com/racker/perigee/api_test.go b/Godeps/_workspace/src/github.com/racker/perigee/api_test.go
-deleted file mode 100644
-index da943b2..0000000
---- a/Godeps/_workspace/src/github.com/racker/perigee/api_test.go
-+++ /dev/null
-@@ -1,226 +0,0 @@
--package perigee
-
--import (
-- "bytes"
-- "fmt"
-- "net/http"
-- "net/http/httptest"
-- "strings"
-- "testing"
--)
+-func TestWhereInt8(t *testing.T) {
-
--func TestNormal(t *testing.T) {
-- handler := http.HandlerFunc(
-- func(w http.ResponseWriter, r *http.Request) {
-- w.Write([]byte("testing"))
-- })
-- ts := httptest.NewServer(handler)
-- defer ts.Close()
+- v := &Value{data: []int8{int8(1), int8(1), int8(1), int8(1), int8(1), int8(1)}}
+-
+- selected := v.WhereInt8(func(i int, val int8) bool {
+- return i%2 == 0
+- }).MustInt8Slice()
+-
+- assert.Equal(t, 3, len(selected))
-
-- response, err := Request("GET", ts.URL, Options{})
-- if err != nil {
-- t.Fatalf("should not have error: %s", err)
-- }
-- if response.StatusCode != 200 {
-- t.Fatalf("response code %d is not 200", response.StatusCode)
-- }
-}
-
--func TestOKCodes(t *testing.T) {
-- expectCode := 201
-- handler := http.HandlerFunc(
-- func(w http.ResponseWriter, r *http.Request) {
-- w.WriteHeader(expectCode)
-- w.Write([]byte("testing"))
-- })
-- ts := httptest.NewServer(handler)
-- defer ts.Close()
+-func TestGroupInt8(t *testing.T) {
+-
+- v := &Value{data: []int8{int8(1), int8(1), int8(1), int8(1), int8(1), int8(1)}}
+-
+- grouped := v.GroupInt8(func(i int, val int8) string {
+- return fmt.Sprintf("%v", i%2 == 0)
+- }).data.(map[string][]int8)
+-
+- assert.Equal(t, 2, len(grouped))
+- assert.Equal(t, 3, len(grouped["true"]))
+- assert.Equal(t, 3, len(grouped["false"]))
-
-- options := Options{
-- OkCodes: []int{expectCode},
-- }
-- results, err := Request("GET", ts.URL, options)
-- if err != nil {
-- t.Fatalf("should not have error: %s", err)
-- }
-- if results.StatusCode != expectCode {
-- t.Fatalf("response code %d is not %d", results.StatusCode, expectCode)
-- }
-}
-
--func TestLocation(t *testing.T) {
-- newLocation := "http://www.example.com"
-- handler := http.HandlerFunc(
-- func(w http.ResponseWriter, r *http.Request) {
-- w.Header().Set("Location", newLocation)
-- w.Write([]byte("testing"))
-- })
-- ts := httptest.NewServer(handler)
-- defer ts.Close()
+-func TestReplaceInt8(t *testing.T) {
-
-- response, err := Request("GET", ts.URL, Options{})
-- if err != nil {
-- t.Fatalf("should not have error: %s", err)
-- }
+- v := &Value{data: []int8{int8(1), int8(1), int8(1), int8(1), int8(1), int8(1)}}
-
-- location, err := response.HttpResponse.Location()
-- if err != nil {
-- t.Fatalf("should not have error: %s", err)
-- }
+- rawArr := v.MustInt8Slice()
-
-- if location.String() != newLocation {
-- t.Fatalf("location returned \"%s\" is not \"%s\"", location.String(), newLocation)
+- replaced := v.ReplaceInt8(func(index int, val int8) int8 {
+- if index < len(rawArr)-1 {
+- return rawArr[index+1]
+- }
+- return rawArr[0]
+- })
+-
+- replacedArr := replaced.MustInt8Slice()
+- if assert.Equal(t, 6, len(replacedArr)) {
+- assert.Equal(t, replacedArr[0], rawArr[1])
+- assert.Equal(t, replacedArr[1], rawArr[2])
+- assert.Equal(t, replacedArr[2], rawArr[3])
+- assert.Equal(t, replacedArr[3], rawArr[4])
+- assert.Equal(t, replacedArr[4], rawArr[5])
+- assert.Equal(t, replacedArr[5], rawArr[0])
- }
+-
-}
-
--func TestHeaders(t *testing.T) {
-- newLocation := "http://www.example.com"
-- handler := http.HandlerFunc(
-- func(w http.ResponseWriter, r *http.Request) {
-- w.Header().Set("Location", newLocation)
-- w.Write([]byte("testing"))
-- })
-- ts := httptest.NewServer(handler)
-- defer ts.Close()
+-func TestCollectInt8(t *testing.T) {
-
-- response, err := Request("GET", ts.URL, Options{})
-- if err != nil {
-- t.Fatalf("should not have error: %s", err)
-- }
+- v := &Value{data: []int8{int8(1), int8(1), int8(1), int8(1), int8(1), int8(1)}}
-
-- location := response.HttpResponse.Header.Get("Location")
-- if location == "" {
-- t.Fatalf("Location should not empty")
-- }
+- collected := v.CollectInt8(func(index int, val int8) interface{} {
+- return index
+- })
-
-- if location != newLocation {
-- t.Fatalf("location returned \"%s\" is not \"%s\"", location, newLocation)
+- collectedArr := collected.MustInterSlice()
+- if assert.Equal(t, 6, len(collectedArr)) {
+- assert.Equal(t, collectedArr[0], 0)
+- assert.Equal(t, collectedArr[1], 1)
+- assert.Equal(t, collectedArr[2], 2)
+- assert.Equal(t, collectedArr[3], 3)
+- assert.Equal(t, collectedArr[4], 4)
+- assert.Equal(t, collectedArr[5], 5)
- }
+-
-}
-
--func TestCustomHeaders(t *testing.T) {
-- var contentType, accept, contentLength string
+-// ************************************************************
+-// TESTS
+-// ************************************************************
-
-- handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-- m := map[string][]string(r.Header)
-- contentType = m["Content-Type"][0]
-- accept = m["Accept"][0]
-- contentLength = m["Content-Length"][0]
+-func TestInt16(t *testing.T) {
+-
+- val := int16(1)
+- m := map[string]interface{}{"value": val, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").Int16())
+- assert.Equal(t, val, New(m).Get("value").MustInt16())
+- assert.Equal(t, int16(0), New(m).Get("nothing").Int16())
+- assert.Equal(t, val, New(m).Get("nothing").Int16(1))
+-
+- assert.Panics(t, func() {
+- New(m).Get("age").MustInt16()
- })
-- ts := httptest.NewServer(handler)
-- defer ts.Close()
-
-- _, err := Request("GET", ts.URL, Options{
-- ContentLength: 5,
-- ContentType: "x-application/vb",
-- Accept: "x-application/c",
-- ReqBody: strings.NewReader("Hello"),
+-}
+-
+-func TestInt16Slice(t *testing.T) {
+-
+- val := int16(1)
+- m := map[string]interface{}{"value": []int16{val}, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").Int16Slice()[0])
+- assert.Equal(t, val, New(m).Get("value").MustInt16Slice()[0])
+- assert.Equal(t, []int16(nil), New(m).Get("nothing").Int16Slice())
+- assert.Equal(t, val, New(m).Get("nothing").Int16Slice([]int16{int16(1)})[0])
+-
+- assert.Panics(t, func() {
+- New(m).Get("nothing").MustInt16Slice()
- })
-- if err != nil {
-- t.Fatalf(err.Error())
-- }
-
-- if contentType != "x-application/vb" {
-- t.Fatalf("I expected x-application/vb; got ", contentType)
-- }
+-}
-
-- if contentLength != "5" {
-- t.Fatalf("I expected 5 byte content length; got ", contentLength)
-- }
+-func TestIsInt16(t *testing.T) {
+-
+- var v *Value
+-
+- v = &Value{data: int16(1)}
+- assert.True(t, v.IsInt16())
+-
+- v = &Value{data: []int16{int16(1)}}
+- assert.True(t, v.IsInt16Slice())
-
-- if accept != "x-application/c" {
-- t.Fatalf("I expected x-application/c; got ", accept)
-- }
-}
-
--func TestJson(t *testing.T) {
-- newLocation := "http://www.example.com"
-- jsonBytes := []byte(`{"foo": {"bar": "baz"}}`)
-- handler := http.HandlerFunc(
-- func(w http.ResponseWriter, r *http.Request) {
-- w.Header().Set("Location", newLocation)
-- w.Write(jsonBytes)
-- })
-- ts := httptest.NewServer(handler)
-- defer ts.Close()
+-func TestEachInt16(t *testing.T) {
-
-- type Data struct {
-- Foo struct {
-- Bar string `json:"bar"`
-- } `json:"foo"`
-- }
-- var data Data
+- v := &Value{data: []int16{int16(1), int16(1), int16(1), int16(1), int16(1)}}
+- count := 0
+- replacedVals := make([]int16, 0)
+- assert.Equal(t, v, v.EachInt16(func(i int, val int16) bool {
-
-- response, err := Request("GET", ts.URL, Options{Results: &data})
-- if err != nil {
-- t.Fatalf("should not have error: %s", err)
-- }
+- count++
+- replacedVals = append(replacedVals, val)
-
-- if bytes.Compare(jsonBytes, response.JsonResult) != 0 {
-- t.Fatalf("json returned \"%s\" is not \"%s\"", response.JsonResult, jsonBytes)
-- }
+- // abort early
+- if i == 2 {
+- return false
+- }
+-
+- return true
+-
+- }))
+-
+- assert.Equal(t, count, 3)
+- assert.Equal(t, replacedVals[0], v.MustInt16Slice()[0])
+- assert.Equal(t, replacedVals[1], v.MustInt16Slice()[1])
+- assert.Equal(t, replacedVals[2], v.MustInt16Slice()[2])
-
-- if data.Foo.Bar != "baz" {
-- t.Fatalf("Results returned %v", data)
-- }
-}
-
--func TestSetHeaders(t *testing.T) {
-- var wasCalled bool
-- handler := http.HandlerFunc(
-- func(w http.ResponseWriter, r *http.Request) {
-- w.Write([]byte("Hi"))
-- })
-- ts := httptest.NewServer(handler)
-- defer ts.Close()
+-func TestWhereInt16(t *testing.T) {
-
-- _, err := Request("GET", ts.URL, Options{
-- SetHeaders: func(r *http.Request) error {
-- wasCalled = true
-- return nil
-- },
-- })
+- v := &Value{data: []int16{int16(1), int16(1), int16(1), int16(1), int16(1), int16(1)}}
-
-- if err != nil {
-- t.Fatal(err)
-- }
+- selected := v.WhereInt16(func(i int, val int16) bool {
+- return i%2 == 0
+- }).MustInt16Slice()
-
-- if !wasCalled {
-- t.Fatal("I expected header setter callback to be called, but it wasn't")
-- }
+- assert.Equal(t, 3, len(selected))
-
-- myError := fmt.Errorf("boo")
+-}
-
-- _, err = Request("GET", ts.URL, Options{
-- SetHeaders: func(r *http.Request) error {
-- return myError
-- },
+-func TestGroupInt16(t *testing.T) {
+-
+- v := &Value{data: []int16{int16(1), int16(1), int16(1), int16(1), int16(1), int16(1)}}
+-
+- grouped := v.GroupInt16(func(i int, val int16) string {
+- return fmt.Sprintf("%v", i%2 == 0)
+- }).data.(map[string][]int16)
+-
+- assert.Equal(t, 2, len(grouped))
+- assert.Equal(t, 3, len(grouped["true"]))
+- assert.Equal(t, 3, len(grouped["false"]))
+-
+-}
+-
+-func TestReplaceInt16(t *testing.T) {
+-
+- v := &Value{data: []int16{int16(1), int16(1), int16(1), int16(1), int16(1), int16(1)}}
+-
+- rawArr := v.MustInt16Slice()
+-
+- replaced := v.ReplaceInt16(func(index int, val int16) int16 {
+- if index < len(rawArr)-1 {
+- return rawArr[index+1]
+- }
+- return rawArr[0]
- })
-
-- if err != myError {
-- t.Fatal("I expected errors to propegate back to the caller.")
+- replacedArr := replaced.MustInt16Slice()
+- if assert.Equal(t, 6, len(replacedArr)) {
+- assert.Equal(t, replacedArr[0], rawArr[1])
+- assert.Equal(t, replacedArr[1], rawArr[2])
+- assert.Equal(t, replacedArr[2], rawArr[3])
+- assert.Equal(t, replacedArr[3], rawArr[4])
+- assert.Equal(t, replacedArr[4], rawArr[5])
+- assert.Equal(t, replacedArr[5], rawArr[0])
- }
+-
-}
-
--func TestBodilessMethodsAreSentWithoutContentHeaders(t *testing.T) {
-- var h map[string][]string
+-func TestCollectInt16(t *testing.T) {
-
-- handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-- h = r.Header
+- v := &Value{data: []int16{int16(1), int16(1), int16(1), int16(1), int16(1), int16(1)}}
+-
+- collected := v.CollectInt16(func(index int, val int16) interface{} {
+- return index
- })
-- ts := httptest.NewServer(handler)
-- defer ts.Close()
-
-- _, err := Request("GET", ts.URL, Options{})
-- if err != nil {
-- t.Fatalf(err.Error())
+- collectedArr := collected.MustInterSlice()
+- if assert.Equal(t, 6, len(collectedArr)) {
+- assert.Equal(t, collectedArr[0], 0)
+- assert.Equal(t, collectedArr[1], 1)
+- assert.Equal(t, collectedArr[2], 2)
+- assert.Equal(t, collectedArr[3], 3)
+- assert.Equal(t, collectedArr[4], 4)
+- assert.Equal(t, collectedArr[5], 5)
- }
-
-- if len(h["Content-Type"]) != 0 {
-- t.Fatalf("I expected nothing for Content-Type but got ", h["Content-Type"])
-- }
+-}
+-
+-// ************************************************************
+-// TESTS
+-// ************************************************************
+-
+-func TestInt32(t *testing.T) {
+-
+- val := int32(1)
+- m := map[string]interface{}{"value": val, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").Int32())
+- assert.Equal(t, val, New(m).Get("value").MustInt32())
+- assert.Equal(t, int32(0), New(m).Get("nothing").Int32())
+- assert.Equal(t, val, New(m).Get("nothing").Int32(1))
+-
+- assert.Panics(t, func() {
+- New(m).Get("age").MustInt32()
+- })
-
-- if len(h["Content-Length"]) != 0 {
-- t.Fatalf("I expected nothing for Content-Length but got ", h["Content-Length"])
-- }
-}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/.editorconfig b/Godeps/_workspace/src/github.com/rackspace/gophercloud/.editorconfig
-deleted file mode 100644
-index 2655ebc..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/.editorconfig
-+++ /dev/null
-@@ -1,16 +0,0 @@
--# EditorConfig is awesome: http://EditorConfig.org
-
--# top-most EditorConfig file
--root = true
+-func TestInt32Slice(t *testing.T) {
-
--# All files
--[*]
--end_of_line = lf
--insert_final_newline = true
--charset = utf-8
--trim_trailing_whitespace = true
+- val := int32(1)
+- m := map[string]interface{}{"value": []int32{val}, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").Int32Slice()[0])
+- assert.Equal(t, val, New(m).Get("value").MustInt32Slice()[0])
+- assert.Equal(t, []int32(nil), New(m).Get("nothing").Int32Slice())
+- assert.Equal(t, val, New(m).Get("nothing").Int32Slice([]int32{int32(1)})[0])
-
--# Golang
--[*.go]
--indent_style = tab
--indent_size = 2
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/.travis.yml b/Godeps/_workspace/src/github.com/rackspace/gophercloud/.travis.yml
-deleted file mode 100644
-index 6e1dbd0..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/.travis.yml
-+++ /dev/null
-@@ -1,14 +0,0 @@
--language: go
--install:
-- - go get -v .
--go:
-- - 1.1
-- - 1.2
-- - tip
--after_success:
-- - go get code.google.com/p/go.tools/cmd/cover
-- - go get github.com/axw/gocov/gocov
-- - go get github.com/mattn/goveralls
-- - export PATH=$PATH:$HOME/gopath/bin/
-- - goveralls 2k7PTU3xa474Hymwgdj6XjqenNfGTNkO8
+- assert.Panics(t, func() {
+- New(m).Get("nothing").MustInt32Slice()
+- })
-
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/CONTRIBUTORS.md b/Godeps/_workspace/src/github.com/rackspace/gophercloud/CONTRIBUTORS.md
-deleted file mode 100644
-index 9076695..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/CONTRIBUTORS.md
-+++ /dev/null
-@@ -1,6 +0,0 @@
--Contributors
--============
+-}
-
--Samuel A. Falvo II <sam.falvo at rackspace.com>
--Glen Campbell <glen.campbell at rackspace.com>
--Jesse Noller <jesse.noller at rackspace.com>
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/LICENSE b/Godeps/_workspace/src/github.com/rackspace/gophercloud/LICENSE
-deleted file mode 100644
-index fbbbc9e..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/LICENSE
-+++ /dev/null
-@@ -1,191 +0,0 @@
--Copyright 2012-2013 Rackspace, Inc.
+-func TestIsInt32(t *testing.T) {
-
--Licensed under the Apache License, Version 2.0 (the "License"); you may not use
--this file except in compliance with the License. You may obtain a copy of the
--License at
+- var v *Value
-
-- http://www.apache.org/licenses/LICENSE-2.0
+- v = &Value{data: int32(1)}
+- assert.True(t, v.IsInt32())
-
--Unless required by applicable law or agreed to in writing, software distributed
--under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
--CONDITIONS OF ANY KIND, either express or implied. See the License for the
--specific language governing permissions and limitations under the License.
+- v = &Value{data: []int32{int32(1)}}
+- assert.True(t, v.IsInt32Slice())
-
--------
--
-- Apache License
-- Version 2.0, January 2004
-- http://www.apache.org/licenses/
+-}
-
-- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+-func TestEachInt32(t *testing.T) {
-
-- 1. Definitions.
+- v := &Value{data: []int32{int32(1), int32(1), int32(1), int32(1), int32(1)}}
+- count := 0
+- replacedVals := make([]int32, 0)
+- assert.Equal(t, v, v.EachInt32(func(i int, val int32) bool {
-
-- "License" shall mean the terms and conditions for use, reproduction,
-- and distribution as defined by Sections 1 through 9 of this document.
+- count++
+- replacedVals = append(replacedVals, val)
-
-- "Licensor" shall mean the copyright owner or entity authorized by
-- the copyright owner that is granting the License.
+- // abort early
+- if i == 2 {
+- return false
+- }
-
-- "Legal Entity" shall mean the union of the acting entity and all
-- other entities that control, are controlled by, or are under common
-- control with that entity. For the purposes of this definition,
-- "control" means (i) the power, direct or indirect, to cause the
-- direction or management of such entity, whether by contract or
-- otherwise, or (ii) ownership of fifty percent (50%) or more of the
-- outstanding shares, or (iii) beneficial ownership of such entity.
+- return true
-
-- "You" (or "Your") shall mean an individual or Legal Entity
-- exercising permissions granted by this License.
+- }))
+-
+- assert.Equal(t, count, 3)
+- assert.Equal(t, replacedVals[0], v.MustInt32Slice()[0])
+- assert.Equal(t, replacedVals[1], v.MustInt32Slice()[1])
+- assert.Equal(t, replacedVals[2], v.MustInt32Slice()[2])
+-
+-}
-
-- "Source" form shall mean the preferred form for making modifications,
-- including but not limited to software source code, documentation
-- source, and configuration files.
+-func TestWhereInt32(t *testing.T) {
-
-- "Object" form shall mean any form resulting from mechanical
-- transformation or translation of a Source form, including but
-- not limited to compiled object code, generated documentation,
-- and conversions to other media types.
+- v := &Value{data: []int32{int32(1), int32(1), int32(1), int32(1), int32(1), int32(1)}}
-
-- "Work" shall mean the work of authorship, whether in Source or
-- Object form, made available under the License, as indicated by a
-- copyright notice that is included in or attached to the work
-- (an example is provided in the Appendix below).
+- selected := v.WhereInt32(func(i int, val int32) bool {
+- return i%2 == 0
+- }).MustInt32Slice()
-
-- "Derivative Works" shall mean any work, whether in Source or Object
-- form, that is based on (or derived from) the Work and for which the
-- editorial revisions, annotations, elaborations, or other modifications
-- represent, as a whole, an original work of authorship. For the purposes
-- of this License, Derivative Works shall not include works that remain
-- separable from, or merely link (or bind by name) to the interfaces of,
-- the Work and Derivative Works thereof.
+- assert.Equal(t, 3, len(selected))
-
-- "Contribution" shall mean any work of authorship, including
-- the original version of the Work and any modifications or additions
-- to that Work or Derivative Works thereof, that is intentionally
-- submitted to Licensor for inclusion in the Work by the copyright owner
-- or by an individual or Legal Entity authorized to submit on behalf of
-- the copyright owner. For the purposes of this definition, "submitted"
-- means any form of electronic, verbal, or written communication sent
-- to the Licensor or its representatives, including but not limited to
-- communication on electronic mailing lists, source code control systems,
-- and issue tracking systems that are managed by, or on behalf of, the
-- Licensor for the purpose of discussing and improving the Work, but
-- excluding communication that is conspicuously marked or otherwise
-- designated in writing by the copyright owner as "Not a Contribution."
+-}
-
-- "Contributor" shall mean Licensor and any individual or Legal Entity
-- on behalf of whom a Contribution has been received by Licensor and
-- subsequently incorporated within the Work.
+-func TestGroupInt32(t *testing.T) {
-
-- 2. Grant of Copyright License. Subject to the terms and conditions of
-- this License, each Contributor hereby grants to You a perpetual,
-- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-- copyright license to reproduce, prepare Derivative Works of,
-- publicly display, publicly perform, sublicense, and distribute the
-- Work and such Derivative Works in Source or Object form.
+- v := &Value{data: []int32{int32(1), int32(1), int32(1), int32(1), int32(1), int32(1)}}
-
-- 3. Grant of Patent License. Subject to the terms and conditions of
-- this License, each Contributor hereby grants to You a perpetual,
-- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-- (except as stated in this section) patent license to make, have made,
-- use, offer to sell, sell, import, and otherwise transfer the Work,
-- where such license applies only to those patent claims licensable
-- by such Contributor that are necessarily infringed by their
-- Contribution(s) alone or by combination of their Contribution(s)
-- with the Work to which such Contribution(s) was submitted. If You
-- institute patent litigation against any entity (including a
-- cross-claim or counterclaim in a lawsuit) alleging that the Work
-- or a Contribution incorporated within the Work constitutes direct
-- or contributory patent infringement, then any patent licenses
-- granted to You under this License for that Work shall terminate
-- as of the date such litigation is filed.
+- grouped := v.GroupInt32(func(i int, val int32) string {
+- return fmt.Sprintf("%v", i%2 == 0)
+- }).data.(map[string][]int32)
-
-- 4. Redistribution. You may reproduce and distribute copies of the
-- Work or Derivative Works thereof in any medium, with or without
-- modifications, and in Source or Object form, provided that You
-- meet the following conditions:
+- assert.Equal(t, 2, len(grouped))
+- assert.Equal(t, 3, len(grouped["true"]))
+- assert.Equal(t, 3, len(grouped["false"]))
-
-- (a) You must give any other recipients of the Work or
-- Derivative Works a copy of this License; and
+-}
-
-- (b) You must cause any modified files to carry prominent notices
-- stating that You changed the files; and
+-func TestReplaceInt32(t *testing.T) {
-
-- (c) You must retain, in the Source form of any Derivative Works
-- that You distribute, all copyright, patent, trademark, and
-- attribution notices from the Source form of the Work,
-- excluding those notices that do not pertain to any part of
-- the Derivative Works; and
+- v := &Value{data: []int32{int32(1), int32(1), int32(1), int32(1), int32(1), int32(1)}}
-
-- (d) If the Work includes a "NOTICE" text file as part of its
-- distribution, then any Derivative Works that You distribute must
-- include a readable copy of the attribution notices contained
-- within such NOTICE file, excluding those notices that do not
-- pertain to any part of the Derivative Works, in at least one
-- of the following places: within a NOTICE text file distributed
-- as part of the Derivative Works; within the Source form or
-- documentation, if provided along with the Derivative Works; or,
-- within a display generated by the Derivative Works, if and
-- wherever such third-party notices normally appear. The contents
-- of the NOTICE file are for informational purposes only and
-- do not modify the License. You may add Your own attribution
-- notices within Derivative Works that You distribute, alongside
-- or as an addendum to the NOTICE text from the Work, provided
-- that such additional attribution notices cannot be construed
-- as modifying the License.
+- rawArr := v.MustInt32Slice()
-
-- You may add Your own copyright statement to Your modifications and
-- may provide additional or different license terms and conditions
-- for use, reproduction, or distribution of Your modifications, or
-- for any such Derivative Works as a whole, provided Your use,
-- reproduction, and distribution of the Work otherwise complies with
-- the conditions stated in this License.
+- replaced := v.ReplaceInt32(func(index int, val int32) int32 {
+- if index < len(rawArr)-1 {
+- return rawArr[index+1]
+- }
+- return rawArr[0]
+- })
-
-- 5. Submission of Contributions. Unless You explicitly state otherwise,
-- any Contribution intentionally submitted for inclusion in the Work
-- by You to the Licensor shall be under the terms and conditions of
-- this License, without any additional terms or conditions.
-- Notwithstanding the above, nothing herein shall supersede or modify
-- the terms of any separate license agreement you may have executed
-- with Licensor regarding such Contributions.
+- replacedArr := replaced.MustInt32Slice()
+- if assert.Equal(t, 6, len(replacedArr)) {
+- assert.Equal(t, replacedArr[0], rawArr[1])
+- assert.Equal(t, replacedArr[1], rawArr[2])
+- assert.Equal(t, replacedArr[2], rawArr[3])
+- assert.Equal(t, replacedArr[3], rawArr[4])
+- assert.Equal(t, replacedArr[4], rawArr[5])
+- assert.Equal(t, replacedArr[5], rawArr[0])
+- }
-
-- 6. Trademarks. This License does not grant permission to use the trade
-- names, trademarks, service marks, or product names of the Licensor,
-- except as required for reasonable and customary use in describing the
-- origin of the Work and reproducing the content of the NOTICE file.
+-}
-
-- 7. Disclaimer of Warranty. Unless required by applicable law or
-- agreed to in writing, Licensor provides the Work (and each
-- Contributor provides its Contributions) on an "AS IS" BASIS,
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-- implied, including, without limitation, any warranties or conditions
-- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-- PARTICULAR PURPOSE. You are solely responsible for determining the
-- appropriateness of using or redistributing the Work and assume any
-- risks associated with Your exercise of permissions under this License.
+-func TestCollectInt32(t *testing.T) {
-
-- 8. Limitation of Liability. In no event and under no legal theory,
-- whether in tort (including negligence), contract, or otherwise,
-- unless required by applicable law (such as deliberate and grossly
-- negligent acts) or agreed to in writing, shall any Contributor be
-- liable to You for damages, including any direct, indirect, special,
-- incidental, or consequential damages of any character arising as a
-- result of this License or out of the use or inability to use the
-- Work (including but not limited to damages for loss of goodwill,
-- work stoppage, computer failure or malfunction, or any and all
-- other commercial damages or losses), even if such Contributor
-- has been advised of the possibility of such damages.
+- v := &Value{data: []int32{int32(1), int32(1), int32(1), int32(1), int32(1), int32(1)}}
-
-- 9. Accepting Warranty or Additional Liability. While redistributing
-- the Work or Derivative Works thereof, You may choose to offer,
-- and charge a fee for, acceptance of support, warranty, indemnity,
-- or other liability obligations and/or rights consistent with this
-- License. However, in accepting such obligations, You may act only
-- on Your own behalf and on Your sole responsibility, not on behalf
-- of any other Contributor, and only if You agree to indemnify,
-- defend, and hold each Contributor harmless for any liability
-- incurred by, or claims asserted against, such Contributor by reason
-- of your accepting any such warranty or additional liability.
+- collected := v.CollectInt32(func(index int, val int32) interface{} {
+- return index
+- })
-
-- END OF TERMS AND CONDITIONS
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/README.asciidoc b/Godeps/_workspace/src/github.com/rackspace/gophercloud/README.asciidoc
-deleted file mode 100644
-index b7a7c01..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/README.asciidoc
-+++ /dev/null
-@@ -1,44 +0,0 @@
--== Gophercloud -- V0.1.0 image:https://secure.travis-ci.org/rackspace/gophercloud.png?branch=master["build status",link="https://travis-ci.org/rackspace/gophercloud"]
+- collectedArr := collected.MustInterSlice()
+- if assert.Equal(t, 6, len(collectedArr)) {
+- assert.Equal(t, collectedArr[0], 0)
+- assert.Equal(t, collectedArr[1], 1)
+- assert.Equal(t, collectedArr[2], 2)
+- assert.Equal(t, collectedArr[3], 3)
+- assert.Equal(t, collectedArr[4], 4)
+- assert.Equal(t, collectedArr[5], 5)
+- }
-
--Gophercloud currently lets you authenticate with OpenStack providers to create and manage servers.
--We are working on extending the API to further include cloud files, block storage, DNS, databases, security groups, and other features.
+-}
-
--WARNING: This library is still in the very early stages of development. Unless you want to contribute, it probably isn't what you want. Yet.
+-// ************************************************************
+-// TESTS
+-// ************************************************************
-
--=== Outstanding Features
+-func TestInt64(t *testing.T) {
-
--1. Apache 2.0 License, making Gophercloud friendly to commercial and open-source enterprises alike.
--2. Gophercloud is one of the most actively maintained Go SDKs for OpenStack.
--3. Gophercloud supports Identity V2 and Nova V2 APIs. More coming soon!
--4. The up-coming Gophercloud 0.2.0 release supports API extensions, and makes writing support for new extensions easy.
--5. Gophercloud supports automatic reauthentication upon auth token timeout, if enabled by your software.
--6. Gophercloud is the only SDK implementation with actual acceptance-level integration tests.
+- val := int64(1)
+- m := map[string]interface{}{"value": val, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").Int64())
+- assert.Equal(t, val, New(m).Get("value").MustInt64())
+- assert.Equal(t, int64(0), New(m).Get("nothing").Int64())
+- assert.Equal(t, val, New(m).Get("nothing").Int64(1))
-
--=== What Does it Look Like?
+- assert.Panics(t, func() {
+- New(m).Get("age").MustInt64()
+- })
-
--The Gophercloud 0.1.0 and earlier APIs are now deprecated and obsolete.
--No new feature development will occur for 0.1.0 or 0.0.0.
--However, we will accept and provide bug fixes for these APIs.
--Please refer to the acceptance tests in the master brach for code examples using the v0.1.0 API.
--The most up to date documentation for version 0.1.x can be found at link:http://godoc.org/github.com/rackspace/gophercloud[our Godoc.org documentation].
+-}
-
--We are working on a new API that provides much better support for extensions, pagination, and other features that proved difficult to implement before.
--This new API will be substantially more Go-idiomatic as well; one of the complaints received about 0.1.x and earlier is that it didn't "feel" right.
--To see what this new API is going to look like, you can look at the code examples up on the link:http://gophercloud.io/docs.html[Gophercloud website].
--If you're interested in tracking progress, note that features for version 0.2.0 will appear in the `v0.2.0` branch until merged to master.
+-func TestInt64Slice(t *testing.T) {
-
--=== How can I Contribute?
+- val := int64(1)
+- m := map[string]interface{}{"value": []int64{val}, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").Int64Slice()[0])
+- assert.Equal(t, val, New(m).Get("value").MustInt64Slice()[0])
+- assert.Equal(t, []int64(nil), New(m).Get("nothing").Int64Slice())
+- assert.Equal(t, val, New(m).Get("nothing").Int64Slice([]int64{int64(1)})[0])
-
--After using Gophercloud for a while, you might find that it lacks some useful feature, or that existing behavior seems buggy. We welcome contributions
--from our users for both missing functionality as well as for bug fixes. We encourage contributors to collaborate with the
--link:http://gophercloud.io/community.html[Gophercloud community.]
+- assert.Panics(t, func() {
+- New(m).Get("nothing").MustInt64Slice()
+- })
-
--Finally, Gophercloud maintains its own link:http://gophercloud.io[announcements and updates blog.]
--Feel free to check back now and again to see what's new.
+-}
-
--== License
+-func TestIsInt64(t *testing.T) {
-
--Copyright (C) 2013, 2014 Rackspace, Inc.
+- var v *Value
-
--Licensed under the Apache License, Version 2.0
+- v = &Value{data: int64(1)}
+- assert.True(t, v.IsInt64())
-
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/00-authentication.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/00-authentication.go
-deleted file mode 100644
-index 6467203..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/00-authentication.go
-+++ /dev/null
-@@ -1,30 +0,0 @@
--// +build acceptance,old
+- v = &Value{data: []int64{int64(1)}}
+- assert.True(t, v.IsInt64Slice())
-
--package main
+-}
-
--import (
-- "fmt"
-- "github.com/rackspace/gophercloud"
-- "os"
-- "strings"
--)
+-func TestEachInt64(t *testing.T) {
-
--func main() {
-- provider, username, _, apiKey := getCredentials()
+- v := &Value{data: []int64{int64(1), int64(1), int64(1), int64(1), int64(1)}}
+- count := 0
+- replacedVals := make([]int64, 0)
+- assert.Equal(t, v, v.EachInt64(func(i int, val int64) bool {
-
-- if !strings.Contains(provider, "rackspace") {
-- fmt.Fprintf(os.Stdout, "Skipping test because provider doesn't support API_KEYs\n")
-- return
-- }
+- count++
+- replacedVals = append(replacedVals, val)
-
-- _, err := gophercloud.Authenticate(
-- provider,
-- gophercloud.AuthOptions{
-- Username: username,
-- ApiKey: apiKey,
-- },
-- )
-- if err != nil {
-- panic(err)
-- }
--}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/01-authentication.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/01-authentication.go
-deleted file mode 100644
-index 5cc9d38..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/01-authentication.go
-+++ /dev/null
-@@ -1,22 +0,0 @@
--// +build acceptance,old
+- // abort early
+- if i == 2 {
+- return false
+- }
-
--package main
+- return true
-
--import (
-- "github.com/rackspace/gophercloud"
--)
+- }))
-
--func main() {
-- provider, username, password, _ := getCredentials()
+- assert.Equal(t, count, 3)
+- assert.Equal(t, replacedVals[0], v.MustInt64Slice()[0])
+- assert.Equal(t, replacedVals[1], v.MustInt64Slice()[1])
+- assert.Equal(t, replacedVals[2], v.MustInt64Slice()[2])
-
-- _, err := gophercloud.Authenticate(
-- provider,
-- gophercloud.AuthOptions{
-- Username: username,
-- Password: password,
-- },
-- )
-- if err != nil {
-- panic(err)
-- }
-}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/02-list-servers.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/02-list-servers.go
-deleted file mode 100644
-index 772852e..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/02-list-servers.go
-+++ /dev/null
-@@ -1,62 +0,0 @@
--// +build acceptance,old
-
--package main
+-func TestWhereInt64(t *testing.T) {
-
--import (
-- "flag"
-- "fmt"
-- "github.com/rackspace/gophercloud"
--)
+- v := &Value{data: []int64{int64(1), int64(1), int64(1), int64(1), int64(1), int64(1)}}
-
--var quiet = flag.Bool("quiet", false, "Quiet mode, for acceptance testing. $? still indicates errors though.")
+- selected := v.WhereInt64(func(i int, val int64) bool {
+- return i%2 == 0
+- }).MustInt64Slice()
-
--func main() {
-- flag.Parse()
+- assert.Equal(t, 3, len(selected))
-
-- withIdentity(false, func(acc gophercloud.AccessProvider) {
-- withServerApi(acc, func(api gophercloud.CloudServersProvider) {
-- tryFullDetails(api)
-- tryLinksOnly(api)
-- })
-- })
-}
-
--func tryLinksOnly(api gophercloud.CloudServersProvider) {
-- servers, err := api.ListServersLinksOnly()
-- if err != nil {
-- panic(err)
-- }
+-func TestGroupInt64(t *testing.T) {
-
-- if !*quiet {
-- fmt.Println("Id,Name")
-- for _, s := range servers {
-- if s.AccessIPv4 != "" {
-- panic("IPv4 not expected")
-- }
+- v := &Value{data: []int64{int64(1), int64(1), int64(1), int64(1), int64(1), int64(1)}}
-
-- if s.Status != "" {
-- panic("Status not expected")
-- }
+- grouped := v.GroupInt64(func(i int, val int64) string {
+- return fmt.Sprintf("%v", i%2 == 0)
+- }).data.(map[string][]int64)
-
-- if s.Progress != 0 {
-- panic("Progress not expected")
-- }
+- assert.Equal(t, 2, len(grouped))
+- assert.Equal(t, 3, len(grouped["true"]))
+- assert.Equal(t, 3, len(grouped["false"]))
-
-- fmt.Printf("%s,\"%s\"\n", s.Id, s.Name)
-- }
-- }
-}
-
--func tryFullDetails(api gophercloud.CloudServersProvider) {
-- servers, err := api.ListServers()
-- if err != nil {
-- panic(err)
-- }
+-func TestReplaceInt64(t *testing.T) {
-
-- if !*quiet {
-- fmt.Println("Id,Name,AccessIPv4,Status,Progress")
-- for _, s := range servers {
-- fmt.Printf("%s,\"%s\",%s,%s,%d\n", s.Id, s.Name, s.AccessIPv4, s.Status, s.Progress)
+- v := &Value{data: []int64{int64(1), int64(1), int64(1), int64(1), int64(1), int64(1)}}
+-
+- rawArr := v.MustInt64Slice()
+-
+- replaced := v.ReplaceInt64(func(index int, val int64) int64 {
+- if index < len(rawArr)-1 {
+- return rawArr[index+1]
- }
-- }
--}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/03-get-server-details.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/03-get-server-details.go
-deleted file mode 100644
-index 01140a9..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/03-get-server-details.go
-+++ /dev/null
-@@ -1,134 +0,0 @@
--// +build acceptance,old
+- return rawArr[0]
+- })
-
--package main
+- replacedArr := replaced.MustInt64Slice()
+- if assert.Equal(t, 6, len(replacedArr)) {
+- assert.Equal(t, replacedArr[0], rawArr[1])
+- assert.Equal(t, replacedArr[1], rawArr[2])
+- assert.Equal(t, replacedArr[2], rawArr[3])
+- assert.Equal(t, replacedArr[3], rawArr[4])
+- assert.Equal(t, replacedArr[4], rawArr[5])
+- assert.Equal(t, replacedArr[5], rawArr[0])
+- }
-
--import (
-- "flag"
-- "fmt"
-- "github.com/rackspace/gophercloud"
-- "os"
-- "github.com/racker/perigee"
--)
+-}
-
--var id = flag.String("i", "", "Server ID to get info on. Defaults to first server in your account if unspecified.")
--var rgn = flag.String("r", "", "Datacenter region. Leave blank for default region.")
--var quiet = flag.Bool("quiet", false, "Run quietly, for acceptance testing. $? non-zero if issue.")
+-func TestCollectInt64(t *testing.T) {
-
--func main() {
-- flag.Parse()
+- v := &Value{data: []int64{int64(1), int64(1), int64(1), int64(1), int64(1), int64(1)}}
-
-- resultCode := 0
-- withIdentity(false, func(auth gophercloud.AccessProvider) {
-- withServerApi(auth, func(servers gophercloud.CloudServersProvider) {
-- var (
-- err error
-- serverId string
-- deleteAfterwards bool
-- )
+- collected := v.CollectInt64(func(index int, val int64) interface{} {
+- return index
+- })
-
-- // Figure out which server to provide server details for.
-- if *id == "" {
-- deleteAfterwards, serverId, err = locateAServer(servers)
-- if err != nil {
-- panic(err)
-- }
-- if deleteAfterwards {
-- defer servers.DeleteServerById(serverId)
-- }
-- } else {
-- serverId = *id
-- }
+- collectedArr := collected.MustInterSlice()
+- if assert.Equal(t, 6, len(collectedArr)) {
+- assert.Equal(t, collectedArr[0], 0)
+- assert.Equal(t, collectedArr[1], 1)
+- assert.Equal(t, collectedArr[2], 2)
+- assert.Equal(t, collectedArr[3], 3)
+- assert.Equal(t, collectedArr[4], 4)
+- assert.Equal(t, collectedArr[5], 5)
+- }
-
-- // Grab server details by ID, and provide a report.
-- s, err := servers.ServerById(serverId)
-- if err != nil {
-- panic(err)
-- }
+-}
-
-- configs := []string{
-- "Access IPv4: %s\n",
-- "Access IPv6: %s\n",
-- " Created: %s\n",
-- " Flavor: %s\n",
-- " Host ID: %s\n",
-- " ID: %s\n",
-- " Image: %s\n",
-- " Name: %s\n",
-- " Progress: %s\n",
-- " Status: %s\n",
-- " Tenant ID: %s\n",
-- " Updated: %s\n",
-- " User ID: %s\n",
-- }
+-// ************************************************************
+-// TESTS
+-// ************************************************************
-
-- values := []string{
-- s.AccessIPv4,
-- s.AccessIPv6,
-- s.Created,
-- s.Flavor.Id,
-- s.HostId,
-- s.Id,
-- s.Image.Id,
-- s.Name,
-- fmt.Sprintf("%d", s.Progress),
-- s.Status,
-- s.TenantId,
-- s.Updated,
-- s.UserId,
-- }
+-func TestUint(t *testing.T) {
-
-- if !*quiet {
-- fmt.Println("Server info:")
-- for i, _ := range configs {
-- fmt.Printf(configs[i], values[i])
-- }
-- }
-- })
+- val := uint(1)
+- m := map[string]interface{}{"value": val, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").Uint())
+- assert.Equal(t, val, New(m).Get("value").MustUint())
+- assert.Equal(t, uint(0), New(m).Get("nothing").Uint())
+- assert.Equal(t, val, New(m).Get("nothing").Uint(1))
-
-- // Negative test -- We should absolutely never panic for a server that doesn't exist.
-- withServerApi(auth, func(servers gophercloud.CloudServersProvider) {
-- _, err := servers.ServerById(randomString("garbage", 32))
-- if err == nil {
-- fmt.Printf("Expected a 404 response when looking for a server known not to exist\n")
-- resultCode = 1
-- }
-- perigeeError, ok := err.(*perigee.UnexpectedResponseCodeError)
-- if !ok {
-- fmt.Printf("Unexpected error type\n")
-- resultCode = 1
-- } else {
-- if perigeeError.Actual != 404 {
-- fmt.Printf("Expected a 404 error code\n")
-- }
-- }
-- })
+- assert.Panics(t, func() {
+- New(m).Get("age").MustUint()
- })
-- os.Exit(resultCode)
+-
-}
-
--// locateAServer queries the set of servers owned by the user. If at least one
--// exists, the first found is picked, and its ID is returned. Otherwise, a new
--// server will be created, and its ID returned.
--//
--// deleteAfter will be true if the caller should schedule a call to DeleteServerById()
--// to clean up.
--func locateAServer(servers gophercloud.CloudServersProvider) (deleteAfter bool, id string, err error) {
-- ss, err := servers.ListServers()
-- if err != nil {
-- return false, "", err
-- }
+-func TestUintSlice(t *testing.T) {
-
-- if len(ss) > 0 {
-- // We could just cheat and dump the server details from ss[0].
-- // But, that tests ListServers(), and not ServerById(). So, we
-- // elect not to cheat.
-- return false, ss[0].Id, nil
-- }
+- val := uint(1)
+- m := map[string]interface{}{"value": []uint{val}, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").UintSlice()[0])
+- assert.Equal(t, val, New(m).Get("value").MustUintSlice()[0])
+- assert.Equal(t, []uint(nil), New(m).Get("nothing").UintSlice())
+- assert.Equal(t, val, New(m).Get("nothing").UintSlice([]uint{uint(1)})[0])
+-
+- assert.Panics(t, func() {
+- New(m).Get("nothing").MustUintSlice()
+- })
-
-- serverId, err := createServer(servers, "", "", "", "")
-- if err != nil {
-- return false, "", err
-- }
-- err = waitForServerState(servers, serverId, "ACTIVE")
-- return true, serverId, err
-}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/04-create-server.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/04-create-server.go
-deleted file mode 100644
-index 03fd606..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/04-create-server.go
-+++ /dev/null
-@@ -1,47 +0,0 @@
--// +build acceptance,old
-
--package main
+-func TestIsUint(t *testing.T) {
-
--import (
-- "flag"
-- "fmt"
-- "github.com/rackspace/gophercloud"
--)
+- var v *Value
-
--var region, serverName, imageRef, flavorRef *string
--var adminPass = flag.String("a", "", "Administrator password (auto-assigned if none)")
--var quiet = flag.Bool("quiet", false, "Quiet mode for acceptance tests. $? non-zero if error.")
+- v = &Value{data: uint(1)}
+- assert.True(t, v.IsUint())
-
--func configure() {
-- region = flag.String("r", "", "Region in which to create the server. Leave blank for provider-default region.")
-- serverName = flag.String("n", randomString("ACPTTEST--", 16), "Server name (what you see in the control panel)")
-- imageRef = flag.String("i", "", "ID of image to deploy onto the server")
-- flavorRef = flag.String("f", "", "Flavor of server to deploy image upon")
+- v = &Value{data: []uint{uint(1)}}
+- assert.True(t, v.IsUintSlice())
-
-- flag.Parse()
-}
-
--func main() {
-- configure()
+-func TestEachUint(t *testing.T) {
-
-- withIdentity(false, func(auth gophercloud.AccessProvider) {
-- withServerApi(auth, func(servers gophercloud.CloudServersProvider) {
-- _, err := createServer(servers, *imageRef, *flavorRef, *serverName, *adminPass)
-- if err != nil {
-- panic(err)
-- }
+- v := &Value{data: []uint{uint(1), uint(1), uint(1), uint(1), uint(1)}}
+- count := 0
+- replacedVals := make([]uint, 0)
+- assert.Equal(t, v, v.EachUint(func(i int, val uint) bool {
-
-- allServers, err := servers.ListServers()
-- if err != nil {
-- panic(err)
-- }
+- count++
+- replacedVals = append(replacedVals, val)
+-
+- // abort early
+- if i == 2 {
+- return false
+- }
+-
+- return true
+-
+- }))
+-
+- assert.Equal(t, count, 3)
+- assert.Equal(t, replacedVals[0], v.MustUintSlice()[0])
+- assert.Equal(t, replacedVals[1], v.MustUintSlice()[1])
+- assert.Equal(t, replacedVals[2], v.MustUintSlice()[2])
-
-- if !*quiet {
-- fmt.Printf("ID,Name,Status,Progress\n")
-- for _, i := range allServers {
-- fmt.Printf("%s,\"%s\",%s,%d\n", i.Id, i.Name, i.Status, i.Progress)
-- }
-- }
-- })
-- })
-}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/05-list-images.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/05-list-images.go
-deleted file mode 100644
-index 5ead18b..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/05-list-images.go
-+++ /dev/null
-@@ -1,32 +0,0 @@
--// +build acceptance,old
-
--package main
+-func TestWhereUint(t *testing.T) {
-
--import (
-- "flag"
-- "fmt"
-- "github.com/rackspace/gophercloud"
--)
+- v := &Value{data: []uint{uint(1), uint(1), uint(1), uint(1), uint(1), uint(1)}}
-
--var quiet = flag.Bool("quiet", false, "Quiet mode for acceptance testing. $? non-zero on error though.")
--var rgn = flag.String("r", "", "Datacenter region to interrogate. Leave blank for provider-default region.")
+- selected := v.WhereUint(func(i int, val uint) bool {
+- return i%2 == 0
+- }).MustUintSlice()
-
--func main() {
-- flag.Parse()
+- assert.Equal(t, 3, len(selected))
-
-- withIdentity(false, func(auth gophercloud.AccessProvider) {
-- withServerApi(auth, func(servers gophercloud.CloudServersProvider) {
-- images, err := servers.ListImages()
-- if err != nil {
-- panic(err)
-- }
+-}
+-
+-func TestGroupUint(t *testing.T) {
+-
+- v := &Value{data: []uint{uint(1), uint(1), uint(1), uint(1), uint(1), uint(1)}}
+-
+- grouped := v.GroupUint(func(i int, val uint) string {
+- return fmt.Sprintf("%v", i%2 == 0)
+- }).data.(map[string][]uint)
+-
+- assert.Equal(t, 2, len(grouped))
+- assert.Equal(t, 3, len(grouped["true"]))
+- assert.Equal(t, 3, len(grouped["false"]))
-
-- if !*quiet {
-- fmt.Println("ID,Name,MinRam,MinDisk")
-- for _, image := range images {
-- fmt.Printf("%s,\"%s\",%d,%d\n", image.Id, image.Name, image.MinRam, image.MinDisk)
-- }
-- }
-- })
-- })
-}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/06-list-flavors.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/06-list-flavors.go
-deleted file mode 100644
-index 65db7da..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/06-list-flavors.go
-+++ /dev/null
-@@ -1,32 +0,0 @@
--// +build acceptance,old
-
--package main
+-func TestReplaceUint(t *testing.T) {
-
--import (
-- "flag"
-- "fmt"
-- "github.com/rackspace/gophercloud"
--)
+- v := &Value{data: []uint{uint(1), uint(1), uint(1), uint(1), uint(1), uint(1)}}
-
--var quiet = flag.Bool("quiet", false, "Quiet mode for acceptance testing. $? non-zero on error though.")
--var rgn = flag.String("r", "", "Datacenter region to interrogate. Leave blank for provider-default region.")
+- rawArr := v.MustUintSlice()
-
--func main() {
-- flag.Parse()
+- replaced := v.ReplaceUint(func(index int, val uint) uint {
+- if index < len(rawArr)-1 {
+- return rawArr[index+1]
+- }
+- return rawArr[0]
+- })
-
-- withIdentity(false, func(auth gophercloud.AccessProvider) {
-- withServerApi(auth, func(servers gophercloud.CloudServersProvider) {
-- flavors, err := servers.ListFlavors()
-- if err != nil {
-- panic(err)
-- }
+- replacedArr := replaced.MustUintSlice()
+- if assert.Equal(t, 6, len(replacedArr)) {
+- assert.Equal(t, replacedArr[0], rawArr[1])
+- assert.Equal(t, replacedArr[1], rawArr[2])
+- assert.Equal(t, replacedArr[2], rawArr[3])
+- assert.Equal(t, replacedArr[3], rawArr[4])
+- assert.Equal(t, replacedArr[4], rawArr[5])
+- assert.Equal(t, replacedArr[5], rawArr[0])
+- }
-
-- if !*quiet {
-- fmt.Println("ID,Name,MinRam,MinDisk")
-- for _, f := range flavors {
-- fmt.Printf("%s,\"%s\",%d,%d\n", f.Id, f.Name, f.Ram, f.Disk)
-- }
-- }
-- })
+-}
+-
+-func TestCollectUint(t *testing.T) {
+-
+- v := &Value{data: []uint{uint(1), uint(1), uint(1), uint(1), uint(1), uint(1)}}
+-
+- collected := v.CollectUint(func(index int, val uint) interface{} {
+- return index
- })
+-
+- collectedArr := collected.MustInterSlice()
+- if assert.Equal(t, 6, len(collectedArr)) {
+- assert.Equal(t, collectedArr[0], 0)
+- assert.Equal(t, collectedArr[1], 1)
+- assert.Equal(t, collectedArr[2], 2)
+- assert.Equal(t, collectedArr[3], 3)
+- assert.Equal(t, collectedArr[4], 4)
+- assert.Equal(t, collectedArr[5], 5)
+- }
+-
-}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/07-change-admin-password.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/07-change-admin-password.go
-deleted file mode 100644
-index 880fbe8..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/07-change-admin-password.go
-+++ /dev/null
-@@ -1,49 +0,0 @@
--// +build acceptance,old
-
--package main
+-// ************************************************************
+-// TESTS
+-// ************************************************************
-
--import (
-- "flag"
-- "fmt"
-- "github.com/rackspace/gophercloud"
--)
+-func TestUint8(t *testing.T) {
-
--var quiet = flag.Bool("quiet", false, "Quiet mode, for acceptance testing. $? still indicates errors though.")
--var serverId = flag.String("i", "", "ID of server whose admin password is to be changed.")
--var newPass = flag.String("p", "", "New password for the server.")
+- val := uint8(1)
+- m := map[string]interface{}{"value": val, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").Uint8())
+- assert.Equal(t, val, New(m).Get("value").MustUint8())
+- assert.Equal(t, uint8(0), New(m).Get("nothing").Uint8())
+- assert.Equal(t, val, New(m).Get("nothing").Uint8(1))
-
--func main() {
-- flag.Parse()
+- assert.Panics(t, func() {
+- New(m).Get("age").MustUint8()
+- })
-
-- withIdentity(false, func(acc gophercloud.AccessProvider) {
-- withServerApi(acc, func(api gophercloud.CloudServersProvider) {
-- // If user doesn't explicitly provide a server ID, create one dynamically.
-- if *serverId == "" {
-- var err error
-- *serverId, err = createServer(api, "", "", "", "")
-- if err != nil {
-- panic(err)
-- }
-- waitForServerState(api, *serverId, "ACTIVE")
-- }
+-}
-
-- // If no password is provided, create one dynamically.
-- if *newPass == "" {
-- *newPass = randomString("", 16)
-- }
+-func TestUint8Slice(t *testing.T) {
-
-- // Submit the request for changing the admin password.
-- // Note that we don't verify this actually completes;
-- // doing so is beyond the scope of the SDK, and should be
-- // the responsibility of your specific OpenStack provider.
-- err := api.SetAdminPassword(*serverId, *newPass)
-- if err != nil {
-- panic(err)
-- }
+- val := uint8(1)
+- m := map[string]interface{}{"value": []uint8{val}, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").Uint8Slice()[0])
+- assert.Equal(t, val, New(m).Get("value").MustUint8Slice()[0])
+- assert.Equal(t, []uint8(nil), New(m).Get("nothing").Uint8Slice())
+- assert.Equal(t, val, New(m).Get("nothing").Uint8Slice([]uint8{uint8(1)})[0])
-
-- if !*quiet {
-- fmt.Println("Password change request submitted.")
-- }
-- })
+- assert.Panics(t, func() {
+- New(m).Get("nothing").MustUint8Slice()
- })
+-
-}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/08-reauthentication.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/08-reauthentication.go
-deleted file mode 100644
-index c46f5bb..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/08-reauthentication.go
-+++ /dev/null
-@@ -1,50 +0,0 @@
--// +build acceptance,old
-
--package main
+-func TestIsUint8(t *testing.T) {
-
--import (
-- "flag"
-- "fmt"
-- "github.com/rackspace/gophercloud"
--)
+- var v *Value
-
--var quiet = flag.Bool("quiet", false, "Quiet mode for acceptance testing. $? non-zero on error though.")
--var rgn = flag.String("r", "", "Datacenter region to interrogate. Leave blank for provider-default region.")
+- v = &Value{data: uint8(1)}
+- assert.True(t, v.IsUint8())
-
--func main() {
-- flag.Parse()
+- v = &Value{data: []uint8{uint8(1)}}
+- assert.True(t, v.IsUint8Slice())
-
-- // Invoke withIdentity such that re-auth is enabled.
-- withIdentity(true, func(auth gophercloud.AccessProvider) {
-- token1 := auth.AuthToken()
+-}
-
-- withServerApi(auth, func(servers gophercloud.CloudServersProvider) {
-- // Just to confirm everything works, we should be able to list images without error.
-- _, err := servers.ListImages()
-- if err != nil {
-- panic(err)
-- }
+-func TestEachUint8(t *testing.T) {
-
-- // Revoke our current authentication token.
-- auth.Revoke(auth.AuthToken())
+- v := &Value{data: []uint8{uint8(1), uint8(1), uint8(1), uint8(1), uint8(1)}}
+- count := 0
+- replacedVals := make([]uint8, 0)
+- assert.Equal(t, v, v.EachUint8(func(i int, val uint8) bool {
-
-- // Attempt to list images again. This should _succeed_, because we enabled re-authentication.
-- _, err = servers.ListImages()
-- if err != nil {
-- panic(err)
-- }
+- count++
+- replacedVals = append(replacedVals, val)
-
-- // However, our new authentication token should differ.
-- token2 := auth.AuthToken()
+- // abort early
+- if i == 2 {
+- return false
+- }
-
-- if !*quiet {
-- fmt.Println("Old authentication token: ", token1)
-- fmt.Println("New authentication token: ", token2)
-- }
+- return true
-
-- if token1 == token2 {
-- panic("Tokens should differ")
-- }
-- })
-- })
--}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/09-resize-server.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/09-resize-server.go
-deleted file mode 100644
-index a2ef3c8..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/09-resize-server.go
-+++ /dev/null
-@@ -1,102 +0,0 @@
--// +build acceptance,old
+- }))
-
--package main
+- assert.Equal(t, count, 3)
+- assert.Equal(t, replacedVals[0], v.MustUint8Slice()[0])
+- assert.Equal(t, replacedVals[1], v.MustUint8Slice()[1])
+- assert.Equal(t, replacedVals[2], v.MustUint8Slice()[2])
-
--import (
-- "flag"
-- "fmt"
-- "github.com/rackspace/gophercloud"
-- "time"
--)
+-}
-
--var quiet = flag.Bool("quiet", false, "Quiet mode, for acceptance testing. $? still indicates errors though.")
+-func TestWhereUint8(t *testing.T) {
-
--func main() {
-- flag.Parse()
+- v := &Value{data: []uint8{uint8(1), uint8(1), uint8(1), uint8(1), uint8(1), uint8(1)}}
-
-- withIdentity(false, func(acc gophercloud.AccessProvider) {
-- withServerApi(acc, func(api gophercloud.CloudServersProvider) {
-- // These tests are going to take some time to complete.
-- // So, we'll do two tests at the same time to help amortize test time.
-- done := make(chan bool)
-- go resizeRejectTest(api, done)
-- go resizeAcceptTest(api, done)
-- _ = <-done
-- _ = <-done
+- selected := v.WhereUint8(func(i int, val uint8) bool {
+- return i%2 == 0
+- }).MustUint8Slice()
+-
+- assert.Equal(t, 3, len(selected))
-
-- if !*quiet {
-- fmt.Println("Done.")
-- }
-- })
-- })
-}
-
--// Perform the resize test, but reject the resize request.
--func resizeRejectTest(api gophercloud.CloudServersProvider, done chan bool) {
-- withServer(api, func(id string) {
-- newFlavorId := findAlternativeFlavor()
-- err := api.ResizeServer(id, randomString("ACPTTEST", 24), newFlavorId, "")
-- if err != nil {
-- panic(err)
-- }
+-func TestGroupUint8(t *testing.T) {
-
-- waitForServerState(api, id, "VERIFY_RESIZE")
+- v := &Value{data: []uint8{uint8(1), uint8(1), uint8(1), uint8(1), uint8(1), uint8(1)}}
+-
+- grouped := v.GroupUint8(func(i int, val uint8) string {
+- return fmt.Sprintf("%v", i%2 == 0)
+- }).data.(map[string][]uint8)
+-
+- assert.Equal(t, 2, len(grouped))
+- assert.Equal(t, 3, len(grouped["true"]))
+- assert.Equal(t, 3, len(grouped["false"]))
-
-- err = api.RevertResize(id)
-- if err != nil {
-- panic(err)
-- }
-- })
-- done <- true
-}
-
--// Perform the resize test, but accept the resize request.
--func resizeAcceptTest(api gophercloud.CloudServersProvider, done chan bool) {
-- withServer(api, func(id string) {
-- newFlavorId := findAlternativeFlavor()
-- err := api.ResizeServer(id, randomString("ACPTTEST", 24), newFlavorId, "")
-- if err != nil {
-- panic(err)
-- }
+-func TestReplaceUint8(t *testing.T) {
-
-- waitForServerState(api, id, "VERIFY_RESIZE")
+- v := &Value{data: []uint8{uint8(1), uint8(1), uint8(1), uint8(1), uint8(1), uint8(1)}}
-
-- err = api.ConfirmResize(id)
-- if err != nil {
-- panic(err)
+- rawArr := v.MustUint8Slice()
+-
+- replaced := v.ReplaceUint8(func(index int, val uint8) uint8 {
+- if index < len(rawArr)-1 {
+- return rawArr[index+1]
- }
+- return rawArr[0]
- })
-- done <- true
--}
-
--func withServer(api gophercloud.CloudServersProvider, f func(string)) {
-- id, err := createServer(api, "", "", "", "")
-- if err != nil {
-- panic(err)
+- replacedArr := replaced.MustUint8Slice()
+- if assert.Equal(t, 6, len(replacedArr)) {
+- assert.Equal(t, replacedArr[0], rawArr[1])
+- assert.Equal(t, replacedArr[1], rawArr[2])
+- assert.Equal(t, replacedArr[2], rawArr[3])
+- assert.Equal(t, replacedArr[3], rawArr[4])
+- assert.Equal(t, replacedArr[4], rawArr[5])
+- assert.Equal(t, replacedArr[5], rawArr[0])
- }
-
-- for {
-- s, err := api.ServerById(id)
-- if err != nil {
-- panic(err)
-- }
-- if s.Status == "ACTIVE" {
-- break
-- }
-- time.Sleep(10 * time.Second)
-- }
+-}
-
-- f(id)
+-func TestCollectUint8(t *testing.T) {
-
-- // I've learned that resizing an instance can fail if a delete request
-- // comes in prior to its completion. This ends up leaving the server
-- // in an error state, and neither the resize NOR the delete complete.
-- // This is a bug in OpenStack, as far as I'm concerned, but thankfully,
-- // there's an easy work-around -- just wait for your server to return to
-- // active state first!
-- waitForServerState(api, id, "ACTIVE")
-- err = api.DeleteServerById(id)
-- if err != nil {
-- panic(err)
+- v := &Value{data: []uint8{uint8(1), uint8(1), uint8(1), uint8(1), uint8(1), uint8(1)}}
+-
+- collected := v.CollectUint8(func(index int, val uint8) interface{} {
+- return index
+- })
+-
+- collectedArr := collected.MustInterSlice()
+- if assert.Equal(t, 6, len(collectedArr)) {
+- assert.Equal(t, collectedArr[0], 0)
+- assert.Equal(t, collectedArr[1], 1)
+- assert.Equal(t, collectedArr[2], 2)
+- assert.Equal(t, collectedArr[3], 3)
+- assert.Equal(t, collectedArr[4], 4)
+- assert.Equal(t, collectedArr[5], 5)
- }
+-
-}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/10-reboot-server.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/10-reboot-server.go
-deleted file mode 100644
-index ba6215a..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/10-reboot-server.go
-+++ /dev/null
-@@ -1,45 +0,0 @@
--// +build acceptance,old
-
--package main
+-// ************************************************************
+-// TESTS
+-// ************************************************************
-
--import (
-- "flag"
-- "fmt"
-- "github.com/rackspace/gophercloud"
--)
+-func TestUint16(t *testing.T) {
-
--var quiet = flag.Bool("quiet", false, "Quiet mode, for acceptance testing. $? still indicates errors though.")
+- val := uint16(1)
+- m := map[string]interface{}{"value": val, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").Uint16())
+- assert.Equal(t, val, New(m).Get("value").MustUint16())
+- assert.Equal(t, uint16(0), New(m).Get("nothing").Uint16())
+- assert.Equal(t, val, New(m).Get("nothing").Uint16(1))
-
--func main() {
-- flag.Parse()
+- assert.Panics(t, func() {
+- New(m).Get("age").MustUint16()
+- })
-
-- withIdentity(false, func(acc gophercloud.AccessProvider) {
-- withServerApi(acc, func(servers gophercloud.CloudServersProvider) {
-- log("Creating server")
-- serverId, err := createServer(servers, "", "", "", "")
-- if err != nil {
-- panic(err)
-- }
-- waitForServerState(servers, serverId, "ACTIVE")
+-}
-
-- log("Soft-rebooting server")
-- servers.RebootServer(serverId, false)
-- waitForServerState(servers, serverId, "REBOOT")
-- waitForServerState(servers, serverId, "ACTIVE")
+-func TestUint16Slice(t *testing.T) {
-
-- log("Hard-rebooting server")
-- servers.RebootServer(serverId, true)
-- waitForServerState(servers, serverId, "HARD_REBOOT")
-- waitForServerState(servers, serverId, "ACTIVE")
+- val := uint16(1)
+- m := map[string]interface{}{"value": []uint16{val}, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").Uint16Slice()[0])
+- assert.Equal(t, val, New(m).Get("value").MustUint16Slice()[0])
+- assert.Equal(t, []uint16(nil), New(m).Get("nothing").Uint16Slice())
+- assert.Equal(t, val, New(m).Get("nothing").Uint16Slice([]uint16{uint16(1)})[0])
-
-- log("Done")
-- servers.DeleteServerById(serverId)
-- })
+- assert.Panics(t, func() {
+- New(m).Get("nothing").MustUint16Slice()
- })
--}
-
--func log(s string) {
-- if !*quiet {
-- fmt.Println(s)
-- }
-}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/11-rescue-unrescue-server.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/11-rescue-unrescue-server.go
-deleted file mode 100644
-index 008ad9d..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/11-rescue-unrescue-server.go
-+++ /dev/null
-@@ -1,52 +0,0 @@
--// +build acceptance,old
--
--package main
--
--import (
-- "flag"
-- "fmt"
-- "github.com/rackspace/gophercloud"
--)
-
--var quiet = flag.Bool("quiet", false, "Quiet mode, for acceptance testing. $? still indicates errors though.")
+-func TestIsUint16(t *testing.T) {
-
--func main() {
-- flag.Parse()
-- withIdentity(false, func(acc gophercloud.AccessProvider) {
-- withServerApi(acc, func(servers gophercloud.CloudServersProvider) {
-- log("Creating server")
-- id, err := createServer(servers, "", "", "", "")
-- if err != nil {
-- panic(err)
-- }
-- waitForServerState(servers, id, "ACTIVE")
-- defer servers.DeleteServerById(id)
+- var v *Value
-
-- log("Rescuing server")
-- adminPass, err := servers.RescueServer(id)
-- if err != nil {
-- panic(err)
-- }
-- log(" Admin password = " + adminPass)
-- if len(adminPass) < 1 {
-- panic("Empty admin password")
-- }
-- waitForServerState(servers, id, "RESCUE")
+- v = &Value{data: uint16(1)}
+- assert.True(t, v.IsUint16())
-
-- log("Unrescuing server")
-- err = servers.UnrescueServer(id)
-- if err != nil {
-- panic(err)
-- }
-- waitForServerState(servers, id, "ACTIVE")
+- v = &Value{data: []uint16{uint16(1)}}
+- assert.True(t, v.IsUint16Slice())
-
-- log("Done")
-- })
-- })
-}
-
--func log(s string) {
-- if !*quiet {
-- fmt.Println(s)
-- }
--}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/12-update-server.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/12-update-server.go
-deleted file mode 100644
-index c0191f1..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/12-update-server.go
-+++ /dev/null
-@@ -1,46 +0,0 @@
--// +build acceptance,old
+-func TestEachUint16(t *testing.T) {
-
--package main
+- v := &Value{data: []uint16{uint16(1), uint16(1), uint16(1), uint16(1), uint16(1)}}
+- count := 0
+- replacedVals := make([]uint16, 0)
+- assert.Equal(t, v, v.EachUint16(func(i int, val uint16) bool {
-
--import (
-- "flag"
-- "fmt"
-- "github.com/rackspace/gophercloud"
--)
+- count++
+- replacedVals = append(replacedVals, val)
-
--var quiet = flag.Bool("quiet", false, "Quiet mode, for acceptance testing. $? still indicates errors though.")
+- // abort early
+- if i == 2 {
+- return false
+- }
-
--func main() {
-- flag.Parse()
-- withIdentity(false, func(acc gophercloud.AccessProvider) {
-- withServerApi(acc, func(servers gophercloud.CloudServersProvider) {
-- log("Creating server")
-- id, err := createServer(servers, "", "", "", "")
-- if err != nil {
-- panic(err)
-- }
-- waitForServerState(servers, id, "ACTIVE")
-- defer servers.DeleteServerById(id)
+- return true
-
-- log("Updating name of server")
-- newName := randomString("ACPTTEST", 32)
-- newDetails, err := servers.UpdateServer(id, gophercloud.NewServerSettings{
-- Name: newName,
-- })
-- if err != nil {
-- panic(err)
-- }
-- if newDetails.Name != newName {
-- panic("Name change didn't appear to take")
-- }
+- }))
-
-- log("Done")
-- })
-- })
--}
+- assert.Equal(t, count, 3)
+- assert.Equal(t, replacedVals[0], v.MustUint16Slice()[0])
+- assert.Equal(t, replacedVals[1], v.MustUint16Slice()[1])
+- assert.Equal(t, replacedVals[2], v.MustUint16Slice()[2])
-
--func log(s string) {
-- if !*quiet {
-- fmt.Println(s)
-- }
-}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/13-rebuild-server.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/13-rebuild-server.go
-deleted file mode 100644
-index ae7e19f..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/13-rebuild-server.go
-+++ /dev/null
-@@ -1,46 +0,0 @@
--// +build acceptance,old
--
--package main
-
--import (
-- "flag"
-- "fmt"
-- "github.com/rackspace/gophercloud"
--)
+-func TestWhereUint16(t *testing.T) {
-
--var quiet = flag.Bool("quiet", false, "Quiet mode, for acceptance testing. $? still indicates errors though.")
+- v := &Value{data: []uint16{uint16(1), uint16(1), uint16(1), uint16(1), uint16(1), uint16(1)}}
-
--func main() {
-- flag.Parse()
-- withIdentity(false, func(acc gophercloud.AccessProvider) {
-- withServerApi(acc, func(servers gophercloud.CloudServersProvider) {
-- log("Creating server")
-- id, err := createServer(servers, "", "", "", "")
-- if err != nil {
-- panic(err)
-- }
-- waitForServerState(servers, id, "ACTIVE")
-- defer servers.DeleteServerById(id)
+- selected := v.WhereUint16(func(i int, val uint16) bool {
+- return i%2 == 0
+- }).MustUint16Slice()
-
-- log("Rebuilding server")
-- newDetails, err := servers.RebuildServer(id, gophercloud.NewServer{
-- Name: randomString("ACPTTEST", 32),
-- ImageRef: findAlternativeImage(),
-- FlavorRef: findAlternativeFlavor(),
-- AdminPass: randomString("", 16),
-- })
-- if err != nil {
-- panic(err)
-- }
-- waitForServerState(servers, newDetails.Id, "ACTIVE")
+- assert.Equal(t, 3, len(selected))
-
-- log("Done")
-- })
-- })
-}
-
--func log(s string) {
-- if !*quiet {
-- fmt.Println(s)
-- }
--}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/14-list-addresses.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/14-list-addresses.go
-deleted file mode 100644
-index 1d7d26b..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/14-list-addresses.go
-+++ /dev/null
-@@ -1,66 +0,0 @@
--// +build acceptance,old
+-func TestGroupUint16(t *testing.T) {
-
--package main
+- v := &Value{data: []uint16{uint16(1), uint16(1), uint16(1), uint16(1), uint16(1), uint16(1)}}
-
--import (
-- "flag"
-- "fmt"
-- "github.com/rackspace/gophercloud"
--)
+- grouped := v.GroupUint16(func(i int, val uint16) string {
+- return fmt.Sprintf("%v", i%2 == 0)
+- }).data.(map[string][]uint16)
-
--var quiet = flag.Bool("quiet", false, "Quiet mode, for acceptance testing. $? still indicates errors though.")
+- assert.Equal(t, 2, len(grouped))
+- assert.Equal(t, 3, len(grouped["true"]))
+- assert.Equal(t, 3, len(grouped["false"]))
-
--func main() {
-- flag.Parse()
-- withIdentity(false, func(acc gophercloud.AccessProvider) {
-- withServerApi(acc, func(api gophercloud.CloudServersProvider) {
-- log("Creating server")
-- id, err := createServer(api, "", "", "", "")
-- if err != nil {
-- panic(err)
-- }
-- waitForServerState(api, id, "ACTIVE")
-- defer api.DeleteServerById(id)
+-}
-
-- tryAllAddresses(id, api)
-- tryAddressesByNetwork("private", id, api)
+-func TestReplaceUint16(t *testing.T) {
-
-- log("Done")
-- })
+- v := &Value{data: []uint16{uint16(1), uint16(1), uint16(1), uint16(1), uint16(1), uint16(1)}}
+-
+- rawArr := v.MustUint16Slice()
+-
+- replaced := v.ReplaceUint16(func(index int, val uint16) uint16 {
+- if index < len(rawArr)-1 {
+- return rawArr[index+1]
+- }
+- return rawArr[0]
- })
--}
-
--func tryAllAddresses(id string, api gophercloud.CloudServersProvider) {
-- log("Getting list of all addresses...")
-- addresses, err := api.ListAddresses(id)
-- if (err != nil) && (err != gophercloud.WarnUnauthoritative) {
-- panic(err)
-- }
-- if err == gophercloud.WarnUnauthoritative {
-- log("Uh oh -- got a response back, but it's not authoritative for some reason.")
-- }
-- if !*quiet {
-- fmt.Println("Addresses:")
-- fmt.Printf("%+v\n", addresses)
+- replacedArr := replaced.MustUint16Slice()
+- if assert.Equal(t, 6, len(replacedArr)) {
+- assert.Equal(t, replacedArr[0], rawArr[1])
+- assert.Equal(t, replacedArr[1], rawArr[2])
+- assert.Equal(t, replacedArr[2], rawArr[3])
+- assert.Equal(t, replacedArr[3], rawArr[4])
+- assert.Equal(t, replacedArr[4], rawArr[5])
+- assert.Equal(t, replacedArr[5], rawArr[0])
- }
--}
-
--func tryAddressesByNetwork(networkLabel string, id string, api gophercloud.CloudServersProvider) {
-- log("Getting list of addresses on", networkLabel, "network...")
-- network, err := api.ListAddressesByNetwork(id, networkLabel)
-- if (err != nil) && (err != gophercloud.WarnUnauthoritative) {
-- panic(err)
-- }
-- if err == gophercloud.WarnUnauthoritative {
-- log("Uh oh -- got a response back, but it's not authoritative for some reason.")
-- }
-- for _, addr := range network[networkLabel] {
-- log("Address:", addr.Addr, " IPv", addr.Version)
-- }
-}
-
--func log(s ...interface{}) {
-- if !*quiet {
-- fmt.Println(s...)
+-func TestCollectUint16(t *testing.T) {
+-
+- v := &Value{data: []uint16{uint16(1), uint16(1), uint16(1), uint16(1), uint16(1), uint16(1)}}
+-
+- collected := v.CollectUint16(func(index int, val uint16) interface{} {
+- return index
+- })
+-
+- collectedArr := collected.MustInterSlice()
+- if assert.Equal(t, 6, len(collectedArr)) {
+- assert.Equal(t, collectedArr[0], 0)
+- assert.Equal(t, collectedArr[1], 1)
+- assert.Equal(t, collectedArr[2], 2)
+- assert.Equal(t, collectedArr[3], 3)
+- assert.Equal(t, collectedArr[4], 4)
+- assert.Equal(t, collectedArr[5], 5)
- }
+-
-}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/15-list-keypairs.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/15-list-keypairs.go
-deleted file mode 100644
-index 1a617ed..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/15-list-keypairs.go
-+++ /dev/null
-@@ -1,32 +0,0 @@
--// +build acceptance,old
-
--package main
+-// ************************************************************
+-// TESTS
+-// ************************************************************
-
--import (
-- "flag"
-- "fmt"
-- "github.com/rackspace/gophercloud"
--)
+-func TestUint32(t *testing.T) {
-
--var quiet = flag.Bool("quiet", false, "Quiet mode for acceptance testing. $? non-zero on error though.")
--var rgn = flag.String("r", "", "Datacenter region to interrogate. Leave blank for provider-default region.")
+- val := uint32(1)
+- m := map[string]interface{}{"value": val, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").Uint32())
+- assert.Equal(t, val, New(m).Get("value").MustUint32())
+- assert.Equal(t, uint32(0), New(m).Get("nothing").Uint32())
+- assert.Equal(t, val, New(m).Get("nothing").Uint32(1))
-
--func main() {
-- flag.Parse()
+- assert.Panics(t, func() {
+- New(m).Get("age").MustUint32()
+- })
-
-- withIdentity(false, func(auth gophercloud.AccessProvider) {
-- withServerApi(auth, func(servers gophercloud.CloudServersProvider) {
-- keypairs, err := servers.ListKeyPairs()
-- if err != nil {
-- panic(err)
-- }
+-}
-
-- if !*quiet {
-- fmt.Println("name,fingerprint,publickey")
-- for _, key := range keypairs {
-- fmt.Printf("%s,%s,%s\n", key.Name, key.FingerPrint, key.PublicKey)
-- }
-- }
-- })
+-func TestUint32Slice(t *testing.T) {
+-
+- val := uint32(1)
+- m := map[string]interface{}{"value": []uint32{val}, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").Uint32Slice()[0])
+- assert.Equal(t, val, New(m).Get("value").MustUint32Slice()[0])
+- assert.Equal(t, []uint32(nil), New(m).Get("nothing").Uint32Slice())
+- assert.Equal(t, val, New(m).Get("nothing").Uint32Slice([]uint32{uint32(1)})[0])
+-
+- assert.Panics(t, func() {
+- New(m).Get("nothing").MustUint32Slice()
- })
+-
-}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/16-create-delete-keypair.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/16-create-delete-keypair.go
-deleted file mode 100644
-index f59e51c..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/16-create-delete-keypair.go
-+++ /dev/null
-@@ -1,45 +0,0 @@
--// +build acceptance,old
-
--package main
+-func TestIsUint32(t *testing.T) {
-
--import (
-- "flag"
-- "fmt"
-- "github.com/rackspace/gophercloud"
--)
+- var v *Value
-
--var quiet = flag.Bool("quiet", false, "Quiet mode for acceptance testing. $? non-zero on error though.")
--var rgn = flag.String("r", "", "Datacenter region to interrogate. Leave blank for provider-default region.")
+- v = &Value{data: uint32(1)}
+- assert.True(t, v.IsUint32())
-
--func main() {
-- flag.Parse()
+- v = &Value{data: []uint32{uint32(1)}}
+- assert.True(t, v.IsUint32Slice())
-
-- withIdentity(false, func(auth gophercloud.AccessProvider) {
-- withServerApi(auth, func(servers gophercloud.CloudServersProvider) {
-- name := randomString("ACPTTEST", 16)
-- kp := gophercloud.NewKeyPair{
-- Name: name,
-- }
-- keypair, err := servers.CreateKeyPair(kp)
-- if err != nil {
-- panic(err)
-- }
-- if !*quiet {
-- fmt.Printf("%s,%s,%s\n", keypair.Name, keypair.FingerPrint, keypair.PublicKey)
-- }
+-}
-
-- keypair, err = servers.ShowKeyPair(name)
-- if err != nil {
-- panic(err)
-- }
-- if !*quiet {
-- fmt.Printf("%s,%s,%s\n", keypair.Name, keypair.FingerPrint, keypair.PublicKey)
-- }
+-func TestEachUint32(t *testing.T) {
-
-- err = servers.DeleteKeyPair(name)
-- if err != nil {
-- panic(err)
-- }
-- })
-- })
--}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/17-create-delete-image.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/17-create-delete-image.go
-deleted file mode 100644
-index b3d80a3..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/17-create-delete-image.go
-+++ /dev/null
-@@ -1,52 +0,0 @@
--// +build acceptance,old
+- v := &Value{data: []uint32{uint32(1), uint32(1), uint32(1), uint32(1), uint32(1)}}
+- count := 0
+- replacedVals := make([]uint32, 0)
+- assert.Equal(t, v, v.EachUint32(func(i int, val uint32) bool {
-
--package main
+- count++
+- replacedVals = append(replacedVals, val)
-
--import (
-- "flag"
-- "fmt"
-- "github.com/rackspace/gophercloud"
--)
+- // abort early
+- if i == 2 {
+- return false
+- }
-
--var quiet = flag.Bool("quiet", false, "Quiet mode for acceptance testing. $? non-zero on error though.")
--var rgn = flag.String("r", "", "Datacenter region to interrogate. Leave blank for provider-default region.")
+- return true
-
--func main() {
-- flag.Parse()
+- }))
-
-- withIdentity(false, func(auth gophercloud.AccessProvider) {
-- withServerApi(auth, func(servers gophercloud.CloudServersProvider) {
-- log("Creating server")
-- serverId, err := createServer(servers, "", "", "", "")
-- if err != nil {
-- panic(err)
-- }
-- waitForServerState(servers, serverId, "ACTIVE")
+- assert.Equal(t, count, 3)
+- assert.Equal(t, replacedVals[0], v.MustUint32Slice()[0])
+- assert.Equal(t, replacedVals[1], v.MustUint32Slice()[1])
+- assert.Equal(t, replacedVals[2], v.MustUint32Slice()[2])
-
-- log("Creating image")
-- name := randomString("ACPTTEST", 16)
-- createImage := gophercloud.CreateImage{
-- Name: name,
-- }
-- imageId, err := servers.CreateImage(serverId, createImage)
-- if err != nil {
-- panic(err)
-- }
-- waitForImageState(servers, imageId, "ACTIVE")
+-}
-
-- log("Deleting server")
-- servers.DeleteServerById(serverId)
+-func TestWhereUint32(t *testing.T) {
-
-- log("Deleting image")
-- servers.DeleteImageById(imageId)
+- v := &Value{data: []uint32{uint32(1), uint32(1), uint32(1), uint32(1), uint32(1), uint32(1)}}
+-
+- selected := v.WhereUint32(func(i int, val uint32) bool {
+- return i%2 == 0
+- }).MustUint32Slice()
+-
+- assert.Equal(t, 3, len(selected))
-
-- log("Done")
-- })
-- })
-}
-
--func log(s string) {
-- if !*quiet {
-- fmt.Println(s)
-- }
--}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/18-osutil-authentication.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/18-osutil-authentication.go
-deleted file mode 100644
-index 01ff4e9..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/18-osutil-authentication.go
-+++ /dev/null
-@@ -1,19 +0,0 @@
--// +build acceptance,old
+-func TestGroupUint32(t *testing.T) {
-
--package main
+- v := &Value{data: []uint32{uint32(1), uint32(1), uint32(1), uint32(1), uint32(1), uint32(1)}}
-
--import (
-- "github.com/rackspace/gophercloud"
-- "github.com/rackspace/gophercloud/osutil"
--)
+- grouped := v.GroupUint32(func(i int, val uint32) string {
+- return fmt.Sprintf("%v", i%2 == 0)
+- }).data.(map[string][]uint32)
+-
+- assert.Equal(t, 2, len(grouped))
+- assert.Equal(t, 3, len(grouped["true"]))
+- assert.Equal(t, 3, len(grouped["false"]))
-
--func main() {
-- provider, authOptions, err := osutil.AuthOptions()
-- if err != nil {
-- panic(err)
-- }
-- _, err = gophercloud.Authenticate(provider, authOptions)
-- if err != nil {
-- panic(err)
-- }
-}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/19-list-addresses-0.1.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/19-list-addresses-0.1.go
-deleted file mode 100644
-index d60557b..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/19-list-addresses-0.1.go
-+++ /dev/null
-@@ -1,58 +0,0 @@
--// +build acceptance,old
-
--package main
+-func TestReplaceUint32(t *testing.T) {
-
--import (
-- "flag"
-- "fmt"
-- "github.com/rackspace/gophercloud"
--)
+- v := &Value{data: []uint32{uint32(1), uint32(1), uint32(1), uint32(1), uint32(1), uint32(1)}}
-
--var quiet = flag.Bool("quiet", false, "Quiet mode, for acceptance testing. $? still indicates errors though.")
+- rawArr := v.MustUint32Slice()
-
--func main() {
-- flag.Parse()
-- withIdentity(false, func(acc gophercloud.AccessProvider) {
-- withServerApi(acc, func(api gophercloud.CloudServersProvider) {
-- log("Creating server")
-- id, err := createServer(api, "", "", "", "")
-- if err != nil {
-- panic(err)
-- }
-- waitForServerState(api, id, "ACTIVE")
-- defer api.DeleteServerById(id)
+- replaced := v.ReplaceUint32(func(index int, val uint32) uint32 {
+- if index < len(rawArr)-1 {
+- return rawArr[index+1]
+- }
+- return rawArr[0]
+- })
-
-- tryAllAddresses(id, api)
+- replacedArr := replaced.MustUint32Slice()
+- if assert.Equal(t, 6, len(replacedArr)) {
+- assert.Equal(t, replacedArr[0], rawArr[1])
+- assert.Equal(t, replacedArr[1], rawArr[2])
+- assert.Equal(t, replacedArr[2], rawArr[3])
+- assert.Equal(t, replacedArr[3], rawArr[4])
+- assert.Equal(t, replacedArr[4], rawArr[5])
+- assert.Equal(t, replacedArr[5], rawArr[0])
+- }
-
-- log("Done")
-- })
-- })
-}
-
--func tryAllAddresses(id string, api gophercloud.CloudServersProvider) {
-- log("Getting the server instance")
-- s, err := api.ServerById(id)
-- if err != nil {
-- panic(err)
-- }
+-func TestCollectUint32(t *testing.T) {
-
-- log("Getting the complete set of pools")
-- ps, err := s.AllAddressPools()
-- if err != nil {
-- panic(err)
-- }
+- v := &Value{data: []uint32{uint32(1), uint32(1), uint32(1), uint32(1), uint32(1), uint32(1)}}
-
-- log("Listing IPs for each pool")
-- for k, v := range ps {
-- log(fmt.Sprintf(" Pool %s", k))
-- for _, a := range v {
-- log(fmt.Sprintf(" IP: %s, Version: %d", a.Addr, a.Version))
-- }
-- }
--}
+- collected := v.CollectUint32(func(index int, val uint32) interface{} {
+- return index
+- })
-
--func log(s ...interface{}) {
-- if !*quiet {
-- fmt.Println(s...)
+- collectedArr := collected.MustInterSlice()
+- if assert.Equal(t, 6, len(collectedArr)) {
+- assert.Equal(t, collectedArr[0], 0)
+- assert.Equal(t, collectedArr[1], 1)
+- assert.Equal(t, collectedArr[2], 2)
+- assert.Equal(t, collectedArr[3], 3)
+- assert.Equal(t, collectedArr[4], 4)
+- assert.Equal(t, collectedArr[5], 5)
- }
+-
-}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/99-delete-server.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/99-delete-server.go
-deleted file mode 100644
-index 3e38ba4..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/99-delete-server.go
-+++ /dev/null
-@@ -1,48 +0,0 @@
--// +build acceptance,old
-
--package main
+-// ************************************************************
+-// TESTS
+-// ************************************************************
-
--import (
-- "flag"
-- "fmt"
-- "github.com/rackspace/gophercloud"
--)
+-func TestUint64(t *testing.T) {
-
--var quiet = flag.Bool("quiet", false, "Quiet operation for acceptance tests. $? non-zero if problem.")
--var region = flag.String("r", "", "Datacenter region. Leave blank for provider-default region.")
+- val := uint64(1)
+- m := map[string]interface{}{"value": val, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").Uint64())
+- assert.Equal(t, val, New(m).Get("value").MustUint64())
+- assert.Equal(t, uint64(0), New(m).Get("nothing").Uint64())
+- assert.Equal(t, val, New(m).Get("nothing").Uint64(1))
-
--func main() {
-- flag.Parse()
+- assert.Panics(t, func() {
+- New(m).Get("age").MustUint64()
+- })
-
-- withIdentity(false, func(auth gophercloud.AccessProvider) {
-- withServerApi(auth, func(servers gophercloud.CloudServersProvider) {
-- // Grab a listing of all servers.
-- ss, err := servers.ListServers()
-- if err != nil {
-- panic(err)
-- }
+-}
-
-- // And for each one that starts with the ACPTTEST prefix, delete it.
-- // These are likely left-overs from previously running acceptance tests.
-- // Note that 04-create-servers.go is intended to leak servers by intention,
-- // so as to test this code. :)
-- n := 0
-- for _, s := range ss {
-- if len(s.Name) < 8 {
-- continue
-- }
-- if s.Name[0:8] == "ACPTTEST" {
-- err := servers.DeleteServerById(s.Id)
-- if err != nil {
-- panic(err)
-- }
-- n++
-- }
-- }
+-func TestUint64Slice(t *testing.T) {
-
-- if !*quiet {
-- fmt.Printf("%d servers removed.\n", n)
-- }
-- })
+- val := uint64(1)
+- m := map[string]interface{}{"value": []uint64{val}, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").Uint64Slice()[0])
+- assert.Equal(t, val, New(m).Get("value").MustUint64Slice()[0])
+- assert.Equal(t, []uint64(nil), New(m).Get("nothing").Uint64Slice())
+- assert.Equal(t, val, New(m).Get("nothing").Uint64Slice([]uint64{uint64(1)})[0])
+-
+- assert.Panics(t, func() {
+- New(m).Get("nothing").MustUint64Slice()
- })
--}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/libargs.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/libargs.go
-deleted file mode 100644
-index cf234e7..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/libargs.go
-+++ /dev/null
-@@ -1,239 +0,0 @@
--// +build acceptance,old
-
--package main
+-}
-
--import (
-- "crypto/rand"
-- "fmt"
-- "github.com/rackspace/gophercloud"
-- "os"
-- "strings"
-- "time"
--)
+-func TestIsUint64(t *testing.T) {
-
--// getCredentials will verify existence of needed credential information
--// provided through environment variables. This function will not return
--// if at least one piece of required information is missing.
--func getCredentials() (provider, username, password, apiKey string) {
-- provider = os.Getenv("SDK_PROVIDER")
-- username = os.Getenv("SDK_USERNAME")
-- password = os.Getenv("SDK_PASSWORD")
-- apiKey = os.Getenv("SDK_API_KEY")
-- var authURL = os.Getenv("OS_AUTH_URL")
+- var v *Value
-
-- if (provider == "") || (username == "") || (password == "") {
-- fmt.Fprintf(os.Stderr, "One or more of the following environment variables aren't set:\n")
-- fmt.Fprintf(os.Stderr, " SDK_PROVIDER=\"%s\"\n", provider)
-- fmt.Fprintf(os.Stderr, " SDK_USERNAME=\"%s\"\n", username)
-- fmt.Fprintf(os.Stderr, " SDK_PASSWORD=\"%s\"\n", password)
-- os.Exit(1)
-- }
+- v = &Value{data: uint64(1)}
+- assert.True(t, v.IsUint64())
-
-- if strings.Contains(provider, "rackspace") && (authURL != "") {
-- provider = authURL + "/v2.0/tokens"
-- }
+- v = &Value{data: []uint64{uint64(1)}}
+- assert.True(t, v.IsUint64Slice())
-
-- return
-}
-
--// randomString generates a string of given length, but random content.
--// All content will be within the ASCII graphic character set.
--// (Implementation from Even Shaw's contribution on
--// http://stackoverflow.com/questions/12771930/what-is-the-fastest-way-to-generate-a-long-random-string-in-go).
--func randomString(prefix string, n int) string {
-- const alphanum = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
-- var bytes = make([]byte, n)
-- rand.Read(bytes)
-- for i, b := range bytes {
-- bytes[i] = alphanum[b%byte(len(alphanum))]
-- }
-- return prefix + string(bytes)
--}
+-func TestEachUint64(t *testing.T) {
-
--// aSuitableImage finds a minimal image for use in dynamically creating servers.
--// If none can be found, this function will panic.
--func aSuitableImage(api gophercloud.CloudServersProvider) string {
-- images, err := api.ListImages()
-- if err != nil {
-- panic(err)
-- }
+- v := &Value{data: []uint64{uint64(1), uint64(1), uint64(1), uint64(1), uint64(1)}}
+- count := 0
+- replacedVals := make([]uint64, 0)
+- assert.Equal(t, v, v.EachUint64(func(i int, val uint64) bool {
-
-- // TODO(sfalvo):
-- // Works for Rackspace, might not work for your provider!
-- // Need to figure out why ListImages() provides 0 values for
-- // Ram and Disk fields.
-- //
-- // Until then, just return Ubuntu 12.04 LTS.
-- for i := 0; i < len(images); i++ {
-- if strings.Contains(images[i].Name, "Ubuntu 12.04 LTS") {
-- return images[i].Id
+- count++
+- replacedVals = append(replacedVals, val)
+-
+- // abort early
+- if i == 2 {
+- return false
- }
-- }
-- panic("Image for Ubuntu 12.04 LTS not found.")
--}
-
--// aSuitableFlavor finds the minimum flavor capable of running the test image
--// chosen by aSuitableImage. If none can be found, this function will panic.
--func aSuitableFlavor(api gophercloud.CloudServersProvider) string {
-- flavors, err := api.ListFlavors()
-- if err != nil {
-- panic(err)
-- }
+- return true
-
-- // TODO(sfalvo):
-- // Works for Rackspace, might not work for your provider!
-- // Need to figure out why ListFlavors() provides 0 values for
-- // Ram and Disk fields.
-- //
-- // Until then, just return Ubuntu 12.04 LTS.
-- for i := 0; i < len(flavors); i++ {
-- if flavors[i].Id == "2" {
-- return flavors[i].Id
-- }
-- }
-- panic("Flavor 2 (512MB 1-core 20GB machine) not found.")
--}
+- }))
-
--// createServer creates a new server in a manner compatible with acceptance testing.
--// In particular, it ensures that the name of the server always starts with "ACPTTEST--",
--// which the delete servers acceptance test relies on to identify servers to delete.
--// Passing in empty image and flavor references will force the use of reasonable defaults.
--// An empty name string will result in a dynamically created name prefixed with "ACPTTEST--".
--// A blank admin password will cause a password to be automatically generated; however,
--// at present no means of recovering this password exists, as no acceptance tests yet require
--// this data.
--func createServer(servers gophercloud.CloudServersProvider, imageRef, flavorRef, name, adminPass string) (string, error) {
-- if imageRef == "" {
-- imageRef = aSuitableImage(servers)
-- }
+- assert.Equal(t, count, 3)
+- assert.Equal(t, replacedVals[0], v.MustUint64Slice()[0])
+- assert.Equal(t, replacedVals[1], v.MustUint64Slice()[1])
+- assert.Equal(t, replacedVals[2], v.MustUint64Slice()[2])
-
-- if flavorRef == "" {
-- flavorRef = aSuitableFlavor(servers)
-- }
+-}
-
-- if len(name) < 1 {
-- name = randomString("ACPTTEST", 16)
-- }
+-func TestWhereUint64(t *testing.T) {
-
-- if (len(name) < 8) || (name[0:8] != "ACPTTEST") {
-- name = fmt.Sprintf("ACPTTEST--%s", name)
-- }
+- v := &Value{data: []uint64{uint64(1), uint64(1), uint64(1), uint64(1), uint64(1), uint64(1)}}
-
-- newServer, err := servers.CreateServer(gophercloud.NewServer{
-- Name: name,
-- ImageRef: imageRef,
-- FlavorRef: flavorRef,
-- AdminPass: adminPass,
-- })
+- selected := v.WhereUint64(func(i int, val uint64) bool {
+- return i%2 == 0
+- }).MustUint64Slice()
-
-- if err != nil {
-- return "", err
-- }
+- assert.Equal(t, 3, len(selected))
-
-- return newServer.Id, nil
-}
-
--// findAlternativeFlavor locates a flavor to resize a server to. It is guaranteed to be different
--// than what aSuitableFlavor() returns. If none could be found, this function will panic.
--func findAlternativeFlavor() string {
-- return "3" // 1GB image, up from 512MB image
--}
+-func TestGroupUint64(t *testing.T) {
-
--// findAlternativeImage locates an image to resize or rebuild a server with. It is guaranteed to be
--// different than what aSuitableImage() returns. If none could be found, this function will panic.
--func findAlternativeImage() string {
-- return "c6f9c411-e708-4952-91e5-62ded5ea4d3e"
--}
+- v := &Value{data: []uint64{uint64(1), uint64(1), uint64(1), uint64(1), uint64(1), uint64(1)}}
-
--// withIdentity authenticates the user against the provider's identity service, and provides an
--// accessor for additional services.
--func withIdentity(ar bool, f func(gophercloud.AccessProvider)) {
-- _, _, _, apiKey := getCredentials()
-- if len(apiKey) == 0 {
-- withPasswordIdentity(ar, f)
-- } else {
-- withAPIKeyIdentity(ar, f)
-- }
--}
+- grouped := v.GroupUint64(func(i int, val uint64) string {
+- return fmt.Sprintf("%v", i%2 == 0)
+- }).data.(map[string][]uint64)
-
--func withPasswordIdentity(ar bool, f func(gophercloud.AccessProvider)) {
-- provider, username, password, _ := getCredentials()
-- acc, err := gophercloud.Authenticate(
-- provider,
-- gophercloud.AuthOptions{
-- Username: username,
-- Password: password,
-- AllowReauth: ar,
-- },
-- )
-- if err != nil {
-- panic(err)
-- }
+- assert.Equal(t, 2, len(grouped))
+- assert.Equal(t, 3, len(grouped["true"]))
+- assert.Equal(t, 3, len(grouped["false"]))
-
-- f(acc)
-}
-
--func withAPIKeyIdentity(ar bool, f func(gophercloud.AccessProvider)) {
-- provider, username, _, apiKey := getCredentials()
-- acc, err := gophercloud.Authenticate(
-- provider,
-- gophercloud.AuthOptions{
-- Username: username,
-- ApiKey: apiKey,
-- AllowReauth: ar,
-- },
-- )
-- if err != nil {
-- panic(err)
-- }
+-func TestReplaceUint64(t *testing.T) {
-
-- f(acc)
--}
+- v := &Value{data: []uint64{uint64(1), uint64(1), uint64(1), uint64(1), uint64(1), uint64(1)}}
-
--// withServerApi acquires the cloud servers API.
--func withServerApi(acc gophercloud.AccessProvider, f func(gophercloud.CloudServersProvider)) {
-- api, err := gophercloud.ServersApi(acc, gophercloud.ApiCriteria{
-- Name: "cloudServersOpenStack",
-- VersionId: "2",
-- UrlChoice: gophercloud.PublicURL,
+- rawArr := v.MustUint64Slice()
+-
+- replaced := v.ReplaceUint64(func(index int, val uint64) uint64 {
+- if index < len(rawArr)-1 {
+- return rawArr[index+1]
+- }
+- return rawArr[0]
- })
-- if err != nil {
-- panic(err)
+-
+- replacedArr := replaced.MustUint64Slice()
+- if assert.Equal(t, 6, len(replacedArr)) {
+- assert.Equal(t, replacedArr[0], rawArr[1])
+- assert.Equal(t, replacedArr[1], rawArr[2])
+- assert.Equal(t, replacedArr[2], rawArr[3])
+- assert.Equal(t, replacedArr[3], rawArr[4])
+- assert.Equal(t, replacedArr[4], rawArr[5])
+- assert.Equal(t, replacedArr[5], rawArr[0])
- }
-
-- f(api)
-}
-
--// waitForServerState polls, every 10 seconds, for a given server to appear in the indicated state.
--// This call will block forever if it never appears in the desired state, so if a timeout is required,
--// make sure to call this function in a goroutine.
--func waitForServerState(api gophercloud.CloudServersProvider, id, state string) error {
-- for {
-- s, err := api.ServerById(id)
-- if err != nil {
-- return err
-- }
-- if s.Status == state {
-- return nil
-- }
-- time.Sleep(10 * time.Second)
-- }
-- panic("Impossible")
--}
+-func TestCollectUint64(t *testing.T) {
-
--// waitForImageState polls, every 10 seconds, for a given image to appear in the indicated state.
--// This call will block forever if it never appears in the desired state, so if a timeout is required,
--// make sure to call this function in a goroutine.
--func waitForImageState(api gophercloud.CloudServersProvider, id, state string) error {
-- for {
-- s, err := api.ImageById(id)
-- if err != nil {
-- return err
-- }
-- if s.Status == state {
-- return nil
-- }
-- time.Sleep(10 * time.Second)
+- v := &Value{data: []uint64{uint64(1), uint64(1), uint64(1), uint64(1), uint64(1), uint64(1)}}
+-
+- collected := v.CollectUint64(func(index int, val uint64) interface{} {
+- return index
+- })
+-
+- collectedArr := collected.MustInterSlice()
+- if assert.Equal(t, 6, len(collectedArr)) {
+- assert.Equal(t, collectedArr[0], 0)
+- assert.Equal(t, collectedArr[1], 1)
+- assert.Equal(t, collectedArr[2], 2)
+- assert.Equal(t, collectedArr[3], 3)
+- assert.Equal(t, collectedArr[4], 4)
+- assert.Equal(t, collectedArr[5], 5)
- }
-- panic("Impossible")
+-
-}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/api_fetch.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/api_fetch.go
-deleted file mode 100644
-index 196047e..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/api_fetch.go
-+++ /dev/null
-@@ -1,49 +0,0 @@
--package gophercloud
-
--import(
-- "fmt"
-- "github.com/mitchellh/mapstructure"
--)
+-// ************************************************************
+-// TESTS
+-// ************************************************************
-
--//The default generic openstack api
--var OpenstackApi = map[string]interface{}{
-- "Type": "compute",
-- "UrlChoice": PublicURL,
--}
+-func TestUintptr(t *testing.T) {
+-
+- val := uintptr(1)
+- m := map[string]interface{}{"value": val, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").Uintptr())
+- assert.Equal(t, val, New(m).Get("value").MustUintptr())
+- assert.Equal(t, uintptr(0), New(m).Get("nothing").Uintptr())
+- assert.Equal(t, val, New(m).Get("nothing").Uintptr(1))
+-
+- assert.Panics(t, func() {
+- New(m).Get("age").MustUintptr()
+- })
-
--// Api for use with rackspace
--var RackspaceApi = map[string]interface{}{
-- "Name": "cloudServersOpenStack",
-- "VersionId": "2",
-- "UrlChoice": PublicURL,
-}
-
+-func TestUintptrSlice(t *testing.T) {
+-
+- val := uintptr(1)
+- m := map[string]interface{}{"value": []uintptr{val}, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").UintptrSlice()[0])
+- assert.Equal(t, val, New(m).Get("value").MustUintptrSlice()[0])
+- assert.Equal(t, []uintptr(nil), New(m).Get("nothing").UintptrSlice())
+- assert.Equal(t, val, New(m).Get("nothing").UintptrSlice([]uintptr{uintptr(1)})[0])
+-
+- assert.Panics(t, func() {
+- New(m).Get("nothing").MustUintptrSlice()
+- })
-
--//Populates an ApiCriteria struct with the api values
--//from one of the api maps
--func PopulateApi(variant string) (ApiCriteria, error){
-- var Api ApiCriteria
-- var variantMap map[string]interface{}
+-}
-
-- switch variant {
-- case "":
-- variantMap = OpenstackApi
+-func TestIsUintptr(t *testing.T) {
-
-- case "openstack":
-- variantMap = OpenstackApi
+- var v *Value
-
-- case "rackspace":
-- variantMap = RackspaceApi
+- v = &Value{data: uintptr(1)}
+- assert.True(t, v.IsUintptr())
-
-- default:
-- var err = fmt.Errorf(
-- "PopulateApi: Unknown variant %# v; legal values: \"openstack\", \"rackspace\"", variant)
-- return Api, err
-- }
+- v = &Value{data: []uintptr{uintptr(1)}}
+- assert.True(t, v.IsUintptrSlice())
-
-- err := mapstructure.Decode(variantMap,&Api)
-- if err != nil{
-- return Api,err
-- }
-- return Api, err
-}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/authenticate.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/authenticate.go
-deleted file mode 100644
-index ff609aa..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/authenticate.go
-+++ /dev/null
-@@ -1,257 +0,0 @@
--package gophercloud
-
--import (
-- "fmt"
-- "github.com/racker/perigee"
--)
+-func TestEachUintptr(t *testing.T) {
-
--// AuthOptions lets anyone calling Authenticate() supply the required access credentials.
--// At present, only Identity V2 API support exists; therefore, only Username, Password,
--// and optionally, TenantId are provided. If future Identity API versions become available,
--// alternative fields unique to those versions may appear here.
--type AuthOptions struct {
-- // Username and Password are required if using Identity V2 API.
-- // Consult with your provider's control panel to discover your
-- // account's username and password.
-- Username, Password string
+- v := &Value{data: []uintptr{uintptr(1), uintptr(1), uintptr(1), uintptr(1), uintptr(1)}}
+- count := 0
+- replacedVals := make([]uintptr, 0)
+- assert.Equal(t, v, v.EachUintptr(func(i int, val uintptr) bool {
-
-- // ApiKey used for providers that support Api Key authentication
-- ApiKey string
+- count++
+- replacedVals = append(replacedVals, val)
-
-- // The TenantId field is optional for the Identity V2 API.
-- TenantId string
+- // abort early
+- if i == 2 {
+- return false
+- }
-
-- // The TenantName can be specified instead of the TenantId
-- TenantName string
+- return true
-
-- // AllowReauth should be set to true if you grant permission for Gophercloud to cache
-- // your credentials in memory, and to allow Gophercloud to attempt to re-authenticate
-- // automatically if/when your token expires. If you set it to false, it will not cache
-- // these settings, but re-authentication will not be possible. This setting defaults
-- // to false.
-- AllowReauth bool
--}
+- }))
-
--// AuthContainer provides a JSON encoding wrapper for passing credentials to the Identity
--// service. You will not work with this structure directly.
--type AuthContainer struct {
-- Auth Auth `json:"auth"`
--}
+- assert.Equal(t, count, 3)
+- assert.Equal(t, replacedVals[0], v.MustUintptrSlice()[0])
+- assert.Equal(t, replacedVals[1], v.MustUintptrSlice()[1])
+- assert.Equal(t, replacedVals[2], v.MustUintptrSlice()[2])
-
--// Auth provides a JSON encoding wrapper for passing credentials to the Identity
--// service. You will not work with this structure directly.
--type Auth struct {
-- PasswordCredentials *PasswordCredentials `json:"passwordCredentials,omitempty"`
-- ApiKeyCredentials *ApiKeyCredentials `json:"RAX-KSKEY:apiKeyCredentials,omitempty"`
-- TenantId string `json:"tenantId,omitempty"`
-- TenantName string `json:"tenantName,omitempty"`
-}
-
--// PasswordCredentials provides a JSON encoding wrapper for passing credentials to the Identity
--// service. You will not work with this structure directly.
--type PasswordCredentials struct {
-- Username string `json:"username"`
-- Password string `json:"password"`
--}
+-func TestWhereUintptr(t *testing.T) {
-
--type ApiKeyCredentials struct {
-- Username string `json:"username"`
-- ApiKey string `json:"apiKey"`
--}
+- v := &Value{data: []uintptr{uintptr(1), uintptr(1), uintptr(1), uintptr(1), uintptr(1), uintptr(1)}}
-
--// Access encapsulates the API token and its relevant fields, as well as the
--// services catalog that Identity API returns once authenticated.
--type Access struct {
-- Token Token
-- ServiceCatalog []CatalogEntry
-- User User
-- provider Provider `json:"-"`
-- options AuthOptions `json:"-"`
-- context *Context `json:"-"`
--}
+- selected := v.WhereUintptr(func(i int, val uintptr) bool {
+- return i%2 == 0
+- }).MustUintptrSlice()
-
--// Token encapsulates an authentication token and when it expires. It also includes
--// tenant information if available.
--type Token struct {
-- Id, Expires string
-- Tenant Tenant
--}
+- assert.Equal(t, 3, len(selected))
-
--// Tenant encapsulates tenant authentication information. If, after authentication,
--// no tenant information is supplied, both Id and Name will be "".
--type Tenant struct {
-- Id, Name string
-}
-
--// User encapsulates the user credentials, and provides visibility in what
--// the user can do through its role assignments.
--type User struct {
-- Id, Name string
-- XRaxDefaultRegion string `json:"RAX-AUTH:defaultRegion"`
-- Roles []Role
--}
+-func TestGroupUintptr(t *testing.T) {
-
--// Role encapsulates a permission that a user can rely on.
--type Role struct {
-- Description, Id, Name string
--}
+- v := &Value{data: []uintptr{uintptr(1), uintptr(1), uintptr(1), uintptr(1), uintptr(1), uintptr(1)}}
-
--// CatalogEntry encapsulates a service catalog record.
--type CatalogEntry struct {
-- Name, Type string
-- Endpoints []EntryEndpoint
--}
+- grouped := v.GroupUintptr(func(i int, val uintptr) string {
+- return fmt.Sprintf("%v", i%2 == 0)
+- }).data.(map[string][]uintptr)
-
--// EntryEndpoint encapsulates how to get to the API of some service.
--type EntryEndpoint struct {
-- Region, TenantId string
-- PublicURL, InternalURL string
-- VersionId, VersionInfo, VersionList string
--}
+- assert.Equal(t, 2, len(grouped))
+- assert.Equal(t, 3, len(grouped["true"]))
+- assert.Equal(t, 3, len(grouped["false"]))
-
--type AuthError struct {
-- StatusCode int
-}
-
--func (ae *AuthError) Error() string {
-- switch ae.StatusCode {
-- case 401:
-- return "Auth failed. Bad credentials."
+-func TestReplaceUintptr(t *testing.T) {
-
-- default:
-- return fmt.Sprintf("Auth failed. Status code is: %s.", ae.StatusCode)
-- }
--}
+- v := &Value{data: []uintptr{uintptr(1), uintptr(1), uintptr(1), uintptr(1), uintptr(1), uintptr(1)}}
-
--//
--func getAuthCredentials(options AuthOptions) Auth {
-- if options.ApiKey == "" {
-- return Auth{
-- PasswordCredentials: &PasswordCredentials{
-- Username: options.Username,
-- Password: options.Password,
-- },
-- TenantId: options.TenantId,
-- TenantName: options.TenantName,
-- }
-- } else {
-- return Auth{
-- ApiKeyCredentials: &ApiKeyCredentials{
-- Username: options.Username,
-- ApiKey: options.ApiKey,
-- },
-- TenantId: options.TenantId,
-- TenantName: options.TenantName,
+- rawArr := v.MustUintptrSlice()
+-
+- replaced := v.ReplaceUintptr(func(index int, val uintptr) uintptr {
+- if index < len(rawArr)-1 {
+- return rawArr[index+1]
- }
+- return rawArr[0]
+- })
+-
+- replacedArr := replaced.MustUintptrSlice()
+- if assert.Equal(t, 6, len(replacedArr)) {
+- assert.Equal(t, replacedArr[0], rawArr[1])
+- assert.Equal(t, replacedArr[1], rawArr[2])
+- assert.Equal(t, replacedArr[2], rawArr[3])
+- assert.Equal(t, replacedArr[3], rawArr[4])
+- assert.Equal(t, replacedArr[4], rawArr[5])
+- assert.Equal(t, replacedArr[5], rawArr[0])
- }
+-
-}
-
--// papersPlease contains the common logic between authentication and re-authentication.
--// The name, obviously a joke on the process of authentication, was chosen because
--// of how many other entities exist in the program containing the word Auth or Authorization.
--// I didn't need another one.
--func (c *Context) papersPlease(p Provider, options AuthOptions) (*Access, error) {
-- var access *Access
-- access = new(Access)
+-func TestCollectUintptr(t *testing.T) {
-
-- if (options.Username == "") || (options.Password == "" && options.ApiKey == "") {
-- return nil, ErrCredentials
-- }
+- v := &Value{data: []uintptr{uintptr(1), uintptr(1), uintptr(1), uintptr(1), uintptr(1), uintptr(1)}}
-
-- resp, err := perigee.Request("POST", p.AuthEndpoint, perigee.Options{
-- CustomClient: c.httpClient,
-- ReqBody: &AuthContainer{
-- Auth: getAuthCredentials(options),
-- },
-- Results: &struct {
-- Access **Access `json:"access"`
-- }{
-- &access,
-- },
+- collected := v.CollectUintptr(func(index int, val uintptr) interface{} {
+- return index
- })
-
-- if err == nil {
-- switch resp.StatusCode {
-- case 200:
-- access.options = options
-- access.provider = p
-- access.context = c
--
-- default:
-- err = &AuthError {
-- StatusCode: resp.StatusCode,
-- }
-- }
+- collectedArr := collected.MustInterSlice()
+- if assert.Equal(t, 6, len(collectedArr)) {
+- assert.Equal(t, collectedArr[0], 0)
+- assert.Equal(t, collectedArr[1], 1)
+- assert.Equal(t, collectedArr[2], 2)
+- assert.Equal(t, collectedArr[3], 3)
+- assert.Equal(t, collectedArr[4], 4)
+- assert.Equal(t, collectedArr[5], 5)
- }
-
-- return access, err
-}
-
--// Authenticate() grants access to the OpenStack-compatible provider API.
--//
--// Providers are identified through a unique key string.
--// See the RegisterProvider() method for more details.
--//
--// The supplied AuthOptions instance allows the client to specify only those credentials
--// relevant for the authentication request. At present, support exists for OpenStack
--// Identity V2 API only; support for V3 will become available as soon as documentation for it
--// becomes readily available.
--//
--// For Identity V2 API requirements, you must provide at least the Username and Password
--// options. The TenantId field is optional, and defaults to "".
--func (c *Context) Authenticate(provider string, options AuthOptions) (*Access, error) {
-- p, err := c.ProviderByName(provider)
-- if err != nil {
-- return nil, err
-- }
-- return c.papersPlease(p, options)
--}
+-// ************************************************************
+-// TESTS
+-// ************************************************************
-
--// Reauthenticate attempts to reauthenticate using the configured access credentials, if
--// allowed. This method takes no action unless your AuthOptions has the AllowReauth flag
--// set to true.
--func (a *Access) Reauthenticate() error {
-- var other *Access
-- var err error
+-func TestFloat32(t *testing.T) {
-
-- if a.options.AllowReauth {
-- other, err = a.context.papersPlease(a.provider, a.options)
-- if err == nil {
-- *a = *other
-- }
-- }
-- return err
--}
+- val := float32(1)
+- m := map[string]interface{}{"value": val, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").Float32())
+- assert.Equal(t, val, New(m).Get("value").MustFloat32())
+- assert.Equal(t, float32(0), New(m).Get("nothing").Float32())
+- assert.Equal(t, val, New(m).Get("nothing").Float32(1))
-
--// See AccessProvider interface definition for details.
--func (a *Access) FirstEndpointUrlByCriteria(ac ApiCriteria) string {
-- ep := FindFirstEndpointByCriteria(a.ServiceCatalog, ac)
-- urls := []string{ep.PublicURL, ep.InternalURL}
-- return urls[ac.UrlChoice]
--}
+- assert.Panics(t, func() {
+- New(m).Get("age").MustFloat32()
+- })
-
--// See AccessProvider interface definition for details.
--func (a *Access) AuthToken() string {
-- return a.Token.Id
-}
-
--// See AccessProvider interface definition for details.
--func (a *Access) Revoke(tok string) error {
-- url := a.provider.AuthEndpoint + "/" + tok
-- err := perigee.Delete(url, perigee.Options{
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": a.AuthToken(),
-- },
-- OkCodes: []int{204},
+-func TestFloat32Slice(t *testing.T) {
+-
+- val := float32(1)
+- m := map[string]interface{}{"value": []float32{val}, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").Float32Slice()[0])
+- assert.Equal(t, val, New(m).Get("value").MustFloat32Slice()[0])
+- assert.Equal(t, []float32(nil), New(m).Get("nothing").Float32Slice())
+- assert.Equal(t, val, New(m).Get("nothing").Float32Slice([]float32{float32(1)})[0])
+-
+- assert.Panics(t, func() {
+- New(m).Get("nothing").MustFloat32Slice()
- })
-- return err
+-
-}
-
--// See ServiceCatalogerForIdentityV2 interface definition for details.
--// Note that the raw slice is returend; be careful not to alter the fields of any members,
--// for other components of Gophercloud may depend upon them.
--// If this becomes a problem in the future,
--// a future revision may return a deep-copy of the service catalog instead.
--func (a *Access) V2ServiceCatalog() []CatalogEntry {
-- return a.ServiceCatalog
+-func TestIsFloat32(t *testing.T) {
+-
+- var v *Value
+-
+- v = &Value{data: float32(1)}
+- assert.True(t, v.IsFloat32())
+-
+- v = &Value{data: []float32{float32(1)}}
+- assert.True(t, v.IsFloat32Slice())
+-
-}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/authenticate_test.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/authenticate_test.go
-deleted file mode 100644
-index b05c780..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/authenticate_test.go
-+++ /dev/null
-@@ -1,264 +0,0 @@
--package gophercloud
-
--import (
-- "net/http"
-- "testing"
--)
+-func TestEachFloat32(t *testing.T) {
-
--const SUCCESSFUL_RESPONSE = `{
-- "access": {
-- "serviceCatalog": [{
-- "endpoints": [{
-- "publicURL": "https://ord.servers.api.rackspacecloud.com/v2/12345",
-- "region": "ORD",
-- "tenantId": "12345",
-- "versionId": "2",
-- "versionInfo": "https://ord.servers.api.rackspacecloud.com/v2",
-- "versionList": "https://ord.servers.api.rackspacecloud.com/"
-- },{
-- "publicURL": "https://dfw.servers.api.rackspacecloud.com/v2/12345",
-- "region": "DFW",
-- "tenantId": "12345",
-- "versionId": "2",
-- "versionInfo": "https://dfw.servers.api.rackspacecloud.com/v2",
-- "versionList": "https://dfw.servers.api.rackspacecloud.com/"
-- }],
-- "name": "cloudServersOpenStack",
-- "type": "compute"
-- },{
-- "endpoints": [{
-- "publicURL": "https://ord.databases.api.rackspacecloud.com/v1.0/12345",
-- "region": "ORD",
-- "tenantId": "12345"
-- }],
-- "name": "cloudDatabases",
-- "type": "rax:database"
-- }],
-- "token": {
-- "expires": "2012-04-13T13:15:00.000-05:00",
-- "id": "aaaaa-bbbbb-ccccc-dddd"
-- },
-- "user": {
-- "RAX-AUTH:defaultRegion": "DFW",
-- "id": "161418",
-- "name": "demoauthor",
-- "roles": [{
-- "description": "User Admin Role.",
-- "id": "3",
-- "name": "identity:user-admin"
-- }]
+- v := &Value{data: []float32{float32(1), float32(1), float32(1), float32(1), float32(1)}}
+- count := 0
+- replacedVals := make([]float32, 0)
+- assert.Equal(t, v, v.EachFloat32(func(i int, val float32) bool {
+-
+- count++
+- replacedVals = append(replacedVals, val)
+-
+- // abort early
+- if i == 2 {
+- return false
- }
-- }
+-
+- return true
+-
+- }))
+-
+- assert.Equal(t, count, 3)
+- assert.Equal(t, replacedVals[0], v.MustFloat32Slice()[0])
+- assert.Equal(t, replacedVals[1], v.MustFloat32Slice()[1])
+- assert.Equal(t, replacedVals[2], v.MustFloat32Slice()[2])
+-
-}
--`
-
--func TestAuthProvider(t *testing.T) {
-- tt := newTransport().WithResponse(SUCCESSFUL_RESPONSE)
-- c := TestContext().UseCustomClient(&http.Client{
-- Transport: tt,
-- })
+-func TestWhereFloat32(t *testing.T) {
-
-- _, err := c.Authenticate("", AuthOptions{})
-- if err == nil {
-- t.Error("Expected error for empty provider string")
-- return
-- }
-- _, err = c.Authenticate("unknown-provider", AuthOptions{Username: "u", Password: "p"})
-- if err == nil {
-- t.Error("Expected error for unknown service provider")
-- return
-- }
+- v := &Value{data: []float32{float32(1), float32(1), float32(1), float32(1), float32(1), float32(1)}}
+-
+- selected := v.WhereFloat32(func(i int, val float32) bool {
+- return i%2 == 0
+- }).MustFloat32Slice()
+-
+- assert.Equal(t, 3, len(selected))
-
-- err = c.RegisterProvider("provider", Provider{AuthEndpoint: "/"})
-- if err != nil {
-- t.Error(err)
-- return
-- }
-- _, err = c.Authenticate("provider", AuthOptions{Username: "u", Password: "p"})
-- if err != nil {
-- t.Error(err)
-- return
-- }
-- if tt.called != 1 {
-- t.Error("Expected transport to be called once.")
-- return
-- }
-}
-
--func TestTenantIdEncoding(t *testing.T) {
-- tt := newTransport().WithResponse(SUCCESSFUL_RESPONSE)
-- c := TestContext().
-- UseCustomClient(&http.Client{
-- Transport: tt,
-- }).
-- WithProvider("provider", Provider{AuthEndpoint: "/"})
+-func TestGroupFloat32(t *testing.T) {
-
-- tt.IgnoreTenantId()
-- _, err := c.Authenticate("provider", AuthOptions{
-- Username: "u",
-- Password: "p",
+- v := &Value{data: []float32{float32(1), float32(1), float32(1), float32(1), float32(1), float32(1)}}
+-
+- grouped := v.GroupFloat32(func(i int, val float32) string {
+- return fmt.Sprintf("%v", i%2 == 0)
+- }).data.(map[string][]float32)
+-
+- assert.Equal(t, 2, len(grouped))
+- assert.Equal(t, 3, len(grouped["true"]))
+- assert.Equal(t, 3, len(grouped["false"]))
+-
+-}
+-
+-func TestReplaceFloat32(t *testing.T) {
+-
+- v := &Value{data: []float32{float32(1), float32(1), float32(1), float32(1), float32(1), float32(1)}}
+-
+- rawArr := v.MustFloat32Slice()
+-
+- replaced := v.ReplaceFloat32(func(index int, val float32) float32 {
+- if index < len(rawArr)-1 {
+- return rawArr[index+1]
+- }
+- return rawArr[0]
- })
-- if err != nil {
-- t.Error(err)
-- return
-- }
-- if tt.tenantIdFound {
-- t.Error("Tenant ID should not have been encoded")
-- return
+-
+- replacedArr := replaced.MustFloat32Slice()
+- if assert.Equal(t, 6, len(replacedArr)) {
+- assert.Equal(t, replacedArr[0], rawArr[1])
+- assert.Equal(t, replacedArr[1], rawArr[2])
+- assert.Equal(t, replacedArr[2], rawArr[3])
+- assert.Equal(t, replacedArr[3], rawArr[4])
+- assert.Equal(t, replacedArr[4], rawArr[5])
+- assert.Equal(t, replacedArr[5], rawArr[0])
- }
-
-- tt.ExpectTenantId()
-- _, err = c.Authenticate("provider", AuthOptions{
-- Username: "u",
-- Password: "p",
-- TenantId: "t",
+-}
+-
+-func TestCollectFloat32(t *testing.T) {
+-
+- v := &Value{data: []float32{float32(1), float32(1), float32(1), float32(1), float32(1), float32(1)}}
+-
+- collected := v.CollectFloat32(func(index int, val float32) interface{} {
+- return index
- })
-- if err != nil {
-- t.Error(err)
-- return
-- }
-- if !tt.tenantIdFound {
-- t.Error("Tenant ID should have been encoded")
-- return
+-
+- collectedArr := collected.MustInterSlice()
+- if assert.Equal(t, 6, len(collectedArr)) {
+- assert.Equal(t, collectedArr[0], 0)
+- assert.Equal(t, collectedArr[1], 1)
+- assert.Equal(t, collectedArr[2], 2)
+- assert.Equal(t, collectedArr[3], 3)
+- assert.Equal(t, collectedArr[4], 4)
+- assert.Equal(t, collectedArr[5], 5)
- }
+-
-}
-
--func TestUserNameAndPassword(t *testing.T) {
-- c := TestContext().
-- WithProvider("provider", Provider{AuthEndpoint: "http://localhost/"}).
-- UseCustomClient(&http.Client{Transport: newTransport().WithResponse(SUCCESSFUL_RESPONSE)})
+-// ************************************************************
+-// TESTS
+-// ************************************************************
-
-- credentials := []AuthOptions{
-- {},
-- {Username: "u"},
-- {Password: "p"},
-- }
-- for i, auth := range credentials {
-- _, err := c.Authenticate("provider", auth)
-- if err == nil {
-- t.Error("Expected error from missing credentials (%d)", i)
-- return
-- }
-- }
+-func TestFloat64(t *testing.T) {
+-
+- val := float64(1)
+- m := map[string]interface{}{"value": val, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").Float64())
+- assert.Equal(t, val, New(m).Get("value").MustFloat64())
+- assert.Equal(t, float64(0), New(m).Get("nothing").Float64())
+- assert.Equal(t, val, New(m).Get("nothing").Float64(1))
+-
+- assert.Panics(t, func() {
+- New(m).Get("age").MustFloat64()
+- })
-
-- _, err := c.Authenticate("provider", AuthOptions{Username: "u", Password: "p"})
-- if err != nil {
-- t.Error(err)
-- return
-- }
-}
-
--func TestUserNameAndApiKey(t *testing.T) {
-- c := TestContext().
-- WithProvider("provider", Provider{AuthEndpoint: "http://localhost/"}).
-- UseCustomClient(&http.Client{Transport: newTransport().WithResponse(SUCCESSFUL_RESPONSE)})
+-func TestFloat64Slice(t *testing.T) {
-
-- credentials := []AuthOptions{
-- {},
-- {Username: "u"},
-- {ApiKey: "a"},
-- }
-- for i, auth := range credentials {
-- _, err := c.Authenticate("provider", auth)
-- if err == nil {
-- t.Error("Expected error from missing credentials (%d)", i)
-- return
-- }
-- }
+- val := float64(1)
+- m := map[string]interface{}{"value": []float64{val}, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").Float64Slice()[0])
+- assert.Equal(t, val, New(m).Get("value").MustFloat64Slice()[0])
+- assert.Equal(t, []float64(nil), New(m).Get("nothing").Float64Slice())
+- assert.Equal(t, val, New(m).Get("nothing").Float64Slice([]float64{float64(1)})[0])
+-
+- assert.Panics(t, func() {
+- New(m).Get("nothing").MustFloat64Slice()
+- })
-
-- _, err := c.Authenticate("provider", AuthOptions{Username: "u", ApiKey: "a"})
-- if err != nil {
-- t.Error(err)
-- return
-- }
-}
-
--func TestTokenAcquisition(t *testing.T) {
-- c := TestContext().
-- UseCustomClient(&http.Client{Transport: newTransport().WithResponse(SUCCESSFUL_RESPONSE)}).
-- WithProvider("provider", Provider{AuthEndpoint: "http://localhost/"})
+-func TestIsFloat64(t *testing.T) {
-
-- acc, err := c.Authenticate("provider", AuthOptions{Username: "u", Password: "p"})
-- if err != nil {
-- t.Error(err)
-- return
-- }
+- var v *Value
+-
+- v = &Value{data: float64(1)}
+- assert.True(t, v.IsFloat64())
+-
+- v = &Value{data: []float64{float64(1)}}
+- assert.True(t, v.IsFloat64Slice())
-
-- tok := acc.Token
-- if (tok.Id == "") || (tok.Expires == "") {
-- t.Error("Expected a valid token for successful login; got %s, %s", tok.Id, tok.Expires)
-- return
-- }
-}
-
--func TestServiceCatalogAcquisition(t *testing.T) {
-- c := TestContext().
-- UseCustomClient(&http.Client{Transport: newTransport().WithResponse(SUCCESSFUL_RESPONSE)}).
-- WithProvider("provider", Provider{AuthEndpoint: "http://localhost/"})
+-func TestEachFloat64(t *testing.T) {
-
-- acc, err := c.Authenticate("provider", AuthOptions{Username: "u", Password: "p"})
-- if err != nil {
-- t.Error(err)
-- return
-- }
+- v := &Value{data: []float64{float64(1), float64(1), float64(1), float64(1), float64(1)}}
+- count := 0
+- replacedVals := make([]float64, 0)
+- assert.Equal(t, v, v.EachFloat64(func(i int, val float64) bool {
-
-- svcs := acc.ServiceCatalog
-- if len(svcs) < 2 {
-- t.Error("Expected 2 service catalog entries; got %d", len(svcs))
-- return
-- }
+- count++
+- replacedVals = append(replacedVals, val)
-
-- types := map[string]bool{
-- "compute": true,
-- "rax:database": true,
-- }
-- for _, entry := range svcs {
-- if !types[entry.Type] {
-- t.Error("Expected to find type %s.", entry.Type)
-- return
+- // abort early
+- if i == 2 {
+- return false
- }
-- }
--}
-
--func TestUserAcquisition(t *testing.T) {
-- c := TestContext().
-- UseCustomClient(&http.Client{Transport: newTransport().WithResponse(SUCCESSFUL_RESPONSE)}).
-- WithProvider("provider", Provider{AuthEndpoint: "http://localhost/"})
+- return true
-
-- acc, err := c.Authenticate("provider", AuthOptions{Username: "u", Password: "p"})
-- if err != nil {
-- t.Error(err)
-- return
-- }
+- }))
+-
+- assert.Equal(t, count, 3)
+- assert.Equal(t, replacedVals[0], v.MustFloat64Slice()[0])
+- assert.Equal(t, replacedVals[1], v.MustFloat64Slice()[1])
+- assert.Equal(t, replacedVals[2], v.MustFloat64Slice()[2])
-
-- u := acc.User
-- if u.Id != "161418" {
-- t.Error("Expected user ID of 16148; got", u.Id)
-- return
-- }
-}
-
--func TestAuthenticationNeverReauths(t *testing.T) {
-- tt := newTransport().WithError(401)
-- c := TestContext().
-- UseCustomClient(&http.Client{Transport: tt}).
-- WithProvider("provider", Provider{AuthEndpoint: "http://localhost"})
+-func TestWhereFloat64(t *testing.T) {
-
-- _, err := c.Authenticate("provider", AuthOptions{Username: "u", Password: "p"})
-- if err == nil {
-- t.Error("Expected an error from a 401 Unauthorized response")
-- return
-- }
+- v := &Value{data: []float64{float64(1), float64(1), float64(1), float64(1), float64(1), float64(1)}}
-
-- rc, _ := ActualResponseCode(err)
-- if rc != 401 {
-- t.Error("Expected a 401 error code")
-- return
-- }
+- selected := v.WhereFloat64(func(i int, val float64) bool {
+- return i%2 == 0
+- }).MustFloat64Slice()
-
-- err = tt.VerifyCalls(t, 1)
-- if err != nil {
-- // Test object already flagged.
-- return
-- }
--}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/common_types.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/common_types.go
-deleted file mode 100644
-index 044b308..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/common_types.go
-+++ /dev/null
-@@ -1,24 +0,0 @@
--package gophercloud
+- assert.Equal(t, 3, len(selected))
-
--// Link is used for JSON (un)marshalling.
--// It provides RESTful links to a resource.
--type Link struct {
-- Href string `json:"href"`
-- Rel string `json:"rel"`
-- Type string `json:"type"`
-}
-
--// FileConfig structures represent a blob of data which must appear at a
--// a specific location in a server's filesystem. The file contents are
--// base-64 encoded.
--type FileConfig struct {
-- Path string `json:"path"`
-- Contents string `json:"contents"`
--}
+-func TestGroupFloat64(t *testing.T) {
-
--// NetworkConfig structures represent an affinity between a server and a
--// specific, uniquely identified network. Networks are identified through
--// universally unique IDs.
--type NetworkConfig struct {
-- Uuid string `json:"uuid"`
--}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/context.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/context.go
-deleted file mode 100644
-index e753c8b..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/context.go
-+++ /dev/null
-@@ -1,150 +0,0 @@
--package gophercloud
+- v := &Value{data: []float64{float64(1), float64(1), float64(1), float64(1), float64(1), float64(1)}}
-
--import (
-- "net/http"
-- "strings"
-- "fmt"
-- "github.com/tonnerre/golang-pretty"
--)
+- grouped := v.GroupFloat64(func(i int, val float64) string {
+- return fmt.Sprintf("%v", i%2 == 0)
+- }).data.(map[string][]float64)
+-
+- assert.Equal(t, 2, len(grouped))
+- assert.Equal(t, 3, len(grouped["true"]))
+- assert.Equal(t, 3, len(grouped["false"]))
-
--// Provider structures exist for each tangible provider of OpenStack service.
--// For example, Rackspace, Hewlett-Packard, and NASA might have their own instance of this structure.
--//
--// At a minimum, a provider must expose an authentication endpoint.
--type Provider struct {
-- AuthEndpoint string
-}
-
--// ReauthHandlerFunc functions are responsible for somehow performing the task of
--// reauthentication.
--type ReauthHandlerFunc func(AccessProvider) error
+-func TestReplaceFloat64(t *testing.T) {
-
--// Context structures encapsulate Gophercloud-global state in a manner which
--// facilitates easier unit testing. As a user of this SDK, you'll never
--// have to use this structure, except when contributing new code to the SDK.
--type Context struct {
-- // providerMap serves as a directory of supported providers.
-- providerMap map[string]Provider
+- v := &Value{data: []float64{float64(1), float64(1), float64(1), float64(1), float64(1), float64(1)}}
-
-- // httpClient refers to the current HTTP client interface to use.
-- httpClient *http.Client
+- rawArr := v.MustFloat64Slice()
-
-- // reauthHandler provides the functionality needed to re-authenticate
-- // if that feature is enabled. Note: in order to allow for automatic
-- // re-authentication, the Context object will need to remember your
-- // username, password, and tenant ID as provided in the initial call
-- // to Authenticate(). If you do not desire this, you'll need to handle
-- // reauthentication yourself through other means. Two methods exist:
-- // the first approach is to just handle errors yourself at the application
-- // layer, and the other is through a custom reauthentication handler
-- // set through the WithReauthHandler() method.
-- reauthHandler ReauthHandlerFunc
--}
+- replaced := v.ReplaceFloat64(func(index int, val float64) float64 {
+- if index < len(rawArr)-1 {
+- return rawArr[index+1]
+- }
+- return rawArr[0]
+- })
-
--// TestContext yields a new Context instance, pre-initialized with a barren
--// state suitable for per-unit-test customization. This configuration consists
--// of:
--//
--// * An empty provider map.
--//
--// * An HTTP client built by the net/http package (see http://godoc.org/net/http#Client).
--func TestContext() *Context {
-- return &Context{
-- providerMap: make(map[string]Provider),
-- httpClient: &http.Client{},
-- reauthHandler: func(acc AccessProvider) error {
-- return acc.Reauthenticate()
-- },
+- replacedArr := replaced.MustFloat64Slice()
+- if assert.Equal(t, 6, len(replacedArr)) {
+- assert.Equal(t, replacedArr[0], rawArr[1])
+- assert.Equal(t, replacedArr[1], rawArr[2])
+- assert.Equal(t, replacedArr[2], rawArr[3])
+- assert.Equal(t, replacedArr[3], rawArr[4])
+- assert.Equal(t, replacedArr[4], rawArr[5])
+- assert.Equal(t, replacedArr[5], rawArr[0])
- }
--}
-
--// UseCustomClient configures the context to use a customized HTTP client
--// instance. By default, TestContext() will return a Context which uses
--// the net/http package's default client instance.
--func (c *Context) UseCustomClient(hc *http.Client) *Context {
-- c.httpClient = hc
-- return c
-}
-
--// RegisterProvider allows a unit test to register a mythical provider convenient for testing.
--// If the provider structure lacks adequate configuration, or the configuration given has some
--// detectable error, an ErrConfiguration error will result.
--func (c *Context) RegisterProvider(name string, p Provider) error {
-- if p.AuthEndpoint == "" {
-- return ErrConfiguration
-- }
+-func TestCollectFloat64(t *testing.T) {
-
-- c.providerMap[name] = p
-- return nil
--}
+- v := &Value{data: []float64{float64(1), float64(1), float64(1), float64(1), float64(1), float64(1)}}
-
--// WithProvider offers convenience for unit tests.
--func (c *Context) WithProvider(name string, p Provider) *Context {
-- err := c.RegisterProvider(name, p)
-- if err != nil {
-- panic(err)
-- }
-- return c
--}
+- collected := v.CollectFloat64(func(index int, val float64) interface{} {
+- return index
+- })
-
--// ProviderByName will locate a provider amongst those previously registered, if it exists.
--// If the named provider has not been registered, an ErrProvider error will result.
--//
--// You may also specify a custom Identity API URL.
--// Any provider name that contains the characters "://", in that order, will be treated as a custom Identity API URL.
--// Custom URLs, important for private cloud deployments, overrides all provider configurations.
--func (c *Context) ProviderByName(name string) (p Provider, err error) {
-- for provider, descriptor := range c.providerMap {
-- if name == provider {
-- return descriptor, nil
-- }
-- }
-- if strings.Contains(name, "://") {
-- p = Provider{
-- AuthEndpoint: name,
-- }
-- return p, nil
+- collectedArr := collected.MustInterSlice()
+- if assert.Equal(t, 6, len(collectedArr)) {
+- assert.Equal(t, collectedArr[0], 0)
+- assert.Equal(t, collectedArr[1], 1)
+- assert.Equal(t, collectedArr[2], 2)
+- assert.Equal(t, collectedArr[3], 3)
+- assert.Equal(t, collectedArr[4], 4)
+- assert.Equal(t, collectedArr[5], 5)
- }
-- return Provider{}, ErrProvider
--}
-
--func getServiceCatalogFromAccessProvider(provider AccessProvider) ([]CatalogEntry) {
-- access, found := provider.(*Access)
-- if found {
-- return access.ServiceCatalog
-- } else {
-- return nil
-- }
-}
-
--// Instantiates a Cloud Servers API for the provider given.
--func (c *Context) ServersApi(provider AccessProvider, criteria ApiCriteria) (CloudServersProvider, error) {
-- url := provider.FirstEndpointUrlByCriteria(criteria)
-- if url == "" {
-- var err = fmt.Errorf(
-- "Missing endpoint, or insufficient privileges to access endpoint; criteria = %# v; serviceCatalog = %# v",
-- pretty.Formatter(criteria),
-- pretty.Formatter(getServiceCatalogFromAccessProvider(provider)))
-- return nil, err
-- }
+-// ************************************************************
+-// TESTS
+-// ************************************************************
-
-- gcp := &genericServersProvider{
-- endpoint: url,
-- context: c,
-- access: provider,
-- }
+-func TestComplex64(t *testing.T) {
+-
+- val := complex64(1)
+- m := map[string]interface{}{"value": val, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").Complex64())
+- assert.Equal(t, val, New(m).Get("value").MustComplex64())
+- assert.Equal(t, complex64(0), New(m).Get("nothing").Complex64())
+- assert.Equal(t, val, New(m).Get("nothing").Complex64(1))
+-
+- assert.Panics(t, func() {
+- New(m).Get("age").MustComplex64()
+- })
-
-- return gcp, nil
-}
-
--// WithReauthHandler configures the context to handle reauthentication attempts using the supplied
--// funtion. By default, reauthentication happens by invoking Authenticate(), which is unlikely to be
--// useful in a unit test.
--//
--// Do not confuse this function with WithReauth()! Although they work together to support reauthentication,
--// WithReauth() actually contains the decision-making logic to determine when to perform a reauth,
--// while WithReauthHandler() is used to configure what a reauth actually entails.
--func (c *Context) WithReauthHandler(f ReauthHandlerFunc) *Context {
-- c.reauthHandler = f
-- return c
+-func TestComplex64Slice(t *testing.T) {
+-
+- val := complex64(1)
+- m := map[string]interface{}{"value": []complex64{val}, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").Complex64Slice()[0])
+- assert.Equal(t, val, New(m).Get("value").MustComplex64Slice()[0])
+- assert.Equal(t, []complex64(nil), New(m).Get("nothing").Complex64Slice())
+- assert.Equal(t, val, New(m).Get("nothing").Complex64Slice([]complex64{complex64(1)})[0])
+-
+- assert.Panics(t, func() {
+- New(m).Get("nothing").MustComplex64Slice()
+- })
+-
-}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/context_test.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/context_test.go
-deleted file mode 100644
-index 2936526..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/context_test.go
-+++ /dev/null
-@@ -1,28 +0,0 @@
--package gophercloud
-
--import (
-- "testing"
--)
+-func TestIsComplex64(t *testing.T) {
-
--func TestProviderRegistry(t *testing.T) {
-- c := TestContext()
+- var v *Value
-
-- _, err := c.ProviderByName("aProvider")
-- if err == nil {
-- t.Error("Expected error when looking for a provider by non-existant name")
-- return
-- }
+- v = &Value{data: complex64(1)}
+- assert.True(t, v.IsComplex64())
-
-- err = c.RegisterProvider("aProvider", Provider{})
-- if err != ErrConfiguration {
-- t.Error("Unexpected error/nil when registering a provider w/out an auth endpoint\n %s", err)
-- return
-- }
+- v = &Value{data: []complex64{complex64(1)}}
+- assert.True(t, v.IsComplex64Slice())
-
-- _ = c.RegisterProvider("aProvider", Provider{AuthEndpoint: "http://localhost/auth"})
-- _, err = c.ProviderByName("aProvider")
-- if err != nil {
-- t.Error(err)
-- return
-- }
-}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/errors.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/errors.go
-deleted file mode 100644
-index 726ba7e..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/errors.go
-+++ /dev/null
-@@ -1,39 +0,0 @@
--package gophercloud
-
--import (
-- "fmt"
--)
+-func TestEachComplex64(t *testing.T) {
-
--// ErrNotImplemented should be used only while developing new SDK features.
--// No established function or method will ever produce this error.
--var ErrNotImplemented = fmt.Errorf("Not implemented")
+- v := &Value{data: []complex64{complex64(1), complex64(1), complex64(1), complex64(1), complex64(1)}}
+- count := 0
+- replacedVals := make([]complex64, 0)
+- assert.Equal(t, v, v.EachComplex64(func(i int, val complex64) bool {
-
--// ErrProvider errors occur when attempting to reference an unsupported
--// provider. More often than not, this error happens due to a typo in
--// the name.
--var ErrProvider = fmt.Errorf("Missing or incorrect provider")
+- count++
+- replacedVals = append(replacedVals, val)
-
--// ErrCredentials errors happen when attempting to authenticate using a
--// set of credentials not recognized by the Authenticate() method.
--// For example, not providing a username or password when attempting to
--// authenticate against an Identity V2 API.
--var ErrCredentials = fmt.Errorf("Missing or incomplete credentials")
+- // abort early
+- if i == 2 {
+- return false
+- }
-
--// ErrConfiguration errors happen when attempting to add a new provider, and
--// the provider added lacks a correct or consistent configuration.
--// For example, all providers must expose at least an Identity V2 API
--// for authentication; if this endpoint isn't specified, you may receive
--// this error when attempting to register it against a context.
--var ErrConfiguration = fmt.Errorf("Missing or incomplete configuration")
+- return true
+-
+- }))
+-
+- assert.Equal(t, count, 3)
+- assert.Equal(t, replacedVals[0], v.MustComplex64Slice()[0])
+- assert.Equal(t, replacedVals[1], v.MustComplex64Slice()[1])
+- assert.Equal(t, replacedVals[2], v.MustComplex64Slice()[2])
+-
+-}
-
--// ErrError errors happen when you attempt to discover the response code
--// responsible for a previous request bombing with an error, but pass in an
--// error interface which doesn't belong to the web client.
--var ErrError = fmt.Errorf("Attempt to solicit actual HTTP response code from error entity which doesn't know")
+-func TestWhereComplex64(t *testing.T) {
-
--// WarnUnauthoritative warnings happen when a service believes its response
--// to be correct, but is not in a position of knowing for sure at the moment.
--// For example, the service could be responding with cached data that has
--// exceeded its time-to-live setting, but which has not yet received an official
--// update from an authoritative source.
--var WarnUnauthoritative = fmt.Errorf("Unauthoritative data")
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/flavors.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/flavors.go
-deleted file mode 100644
-index eb864d5..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/flavors.go
-+++ /dev/null
-@@ -1,55 +0,0 @@
--package gophercloud
+- v := &Value{data: []complex64{complex64(1), complex64(1), complex64(1), complex64(1), complex64(1), complex64(1)}}
-
--import (
-- "github.com/racker/perigee"
--)
+- selected := v.WhereComplex64(func(i int, val complex64) bool {
+- return i%2 == 0
+- }).MustComplex64Slice()
-
--// See CloudServersProvider interface for details.
--func (gsp *genericServersProvider) ListFlavors() ([]Flavor, error) {
-- var fs []Flavor
+- assert.Equal(t, 3, len(selected))
-
-- err := gsp.context.WithReauth(gsp.access, func() error {
-- url := gsp.endpoint + "/flavors/detail"
-- return perigee.Get(url, perigee.Options{
-- CustomClient: gsp.context.httpClient,
-- Results: &struct{ Flavors *[]Flavor }{&fs},
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gsp.access.AuthToken(),
-- },
-- })
-- })
-- return fs, err
-}
-
--// FlavorLink provides a reference to a flavor by either ID or by direct URL.
--// Some services use just the ID, others use just the URL.
--// This structure provides a common means of expressing both in a single field.
--type FlavorLink struct {
-- Id string `json:"id"`
-- Links []Link `json:"links"`
--}
+-func TestGroupComplex64(t *testing.T) {
+-
+- v := &Value{data: []complex64{complex64(1), complex64(1), complex64(1), complex64(1), complex64(1), complex64(1)}}
+-
+- grouped := v.GroupComplex64(func(i int, val complex64) string {
+- return fmt.Sprintf("%v", i%2 == 0)
+- }).data.(map[string][]complex64)
+-
+- assert.Equal(t, 2, len(grouped))
+- assert.Equal(t, 3, len(grouped["true"]))
+- assert.Equal(t, 3, len(grouped["false"]))
-
--// Flavor records represent (virtual) hardware configurations for server resources in a region.
--//
--// The Id field contains the flavor's unique identifier.
--// For example, this identifier will be useful when specifying which hardware configuration to use for a new server instance.
--//
--// The Disk and Ram fields provide a measure of storage space offered by the flavor, in GB and MB, respectively.
--//
--// The Name field provides a human-readable moniker for the flavor.
--//
--// Swap indicates how much space is reserved for swap.
--// If not provided, this field will be set to 0.
--//
--// VCpus indicates how many (virtual) CPUs are available for this flavor.
--type Flavor struct {
-- OsFlvDisabled bool `json:"OS-FLV-DISABLED:disabled"`
-- Disk int `json:"disk"`
-- Id string `json:"id"`
-- Links []Link `json:"links"`
-- Name string `json:"name"`
-- Ram int `json:"ram"`
-- RxTxFactor float64 `json:"rxtx_factor"`
-- Swap int `json:"swap"`
-- VCpus int `json:"vcpus"`
-}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/floating_ips.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/floating_ips.go
-deleted file mode 100644
-index 1163667..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/floating_ips.go
-+++ /dev/null
-@@ -1,88 +0,0 @@
--package gophercloud
-
--import (
-- "errors"
-- "fmt"
-- "github.com/racker/perigee"
--)
+-func TestReplaceComplex64(t *testing.T) {
-
--func (gsp *genericServersProvider) ListFloatingIps() ([]FloatingIp, error) {
-- var fips []FloatingIp
+- v := &Value{data: []complex64{complex64(1), complex64(1), complex64(1), complex64(1), complex64(1), complex64(1)}}
-
-- err := gsp.context.WithReauth(gsp.access, func() error {
-- url := gsp.endpoint + "/os-floating-ips"
-- return perigee.Get(url, perigee.Options{
-- CustomClient: gsp.context.httpClient,
-- Results: &struct {
-- FloatingIps *[]FloatingIp `json:"floating_ips"`
-- }{&fips},
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gsp.access.AuthToken(),
-- },
-- })
+- rawArr := v.MustComplex64Slice()
+-
+- replaced := v.ReplaceComplex64(func(index int, val complex64) complex64 {
+- if index < len(rawArr)-1 {
+- return rawArr[index+1]
+- }
+- return rawArr[0]
- })
-- return fips, err
+-
+- replacedArr := replaced.MustComplex64Slice()
+- if assert.Equal(t, 6, len(replacedArr)) {
+- assert.Equal(t, replacedArr[0], rawArr[1])
+- assert.Equal(t, replacedArr[1], rawArr[2])
+- assert.Equal(t, replacedArr[2], rawArr[3])
+- assert.Equal(t, replacedArr[3], rawArr[4])
+- assert.Equal(t, replacedArr[4], rawArr[5])
+- assert.Equal(t, replacedArr[5], rawArr[0])
+- }
+-
-}
-
--func (gsp *genericServersProvider) CreateFloatingIp(pool string) (FloatingIp, error) {
-- fip := new(FloatingIp)
+-func TestCollectComplex64(t *testing.T) {
-
-- err := gsp.context.WithReauth(gsp.access, func() error {
-- url := gsp.endpoint + "/os-floating-ips"
-- return perigee.Post(url, perigee.Options{
-- CustomClient: gsp.context.httpClient,
-- ReqBody: map[string]string{
-- "pool": pool,
-- },
-- Results: &struct {
-- FloatingIp **FloatingIp `json:"floating_ip"`
-- }{&fip},
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gsp.access.AuthToken(),
-- },
-- })
+- v := &Value{data: []complex64{complex64(1), complex64(1), complex64(1), complex64(1), complex64(1), complex64(1)}}
+-
+- collected := v.CollectComplex64(func(index int, val complex64) interface{} {
+- return index
- })
-
-- if fip.Ip == "" {
-- return *fip, errors.New("Error creating floating IP")
+- collectedArr := collected.MustInterSlice()
+- if assert.Equal(t, 6, len(collectedArr)) {
+- assert.Equal(t, collectedArr[0], 0)
+- assert.Equal(t, collectedArr[1], 1)
+- assert.Equal(t, collectedArr[2], 2)
+- assert.Equal(t, collectedArr[3], 3)
+- assert.Equal(t, collectedArr[4], 4)
+- assert.Equal(t, collectedArr[5], 5)
- }
-
-- return *fip, err
-}
-
--func (gsp *genericServersProvider) AssociateFloatingIp(serverId string, ip FloatingIp) error {
-- return gsp.context.WithReauth(gsp.access, func() error {
-- ep := fmt.Sprintf("%s/servers/%s/action", gsp.endpoint, serverId)
-- return perigee.Post(ep, perigee.Options{
-- CustomClient: gsp.context.httpClient,
-- ReqBody: map[string](map[string]string){
-- "addFloatingIp": map[string]string{"address": ip.Ip},
-- },
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gsp.access.AuthToken(),
-- },
-- OkCodes: []int{202},
-- })
+-// ************************************************************
+-// TESTS
+-// ************************************************************
+-
+-func TestComplex128(t *testing.T) {
+-
+- val := complex128(1)
+- m := map[string]interface{}{"value": val, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").Complex128())
+- assert.Equal(t, val, New(m).Get("value").MustComplex128())
+- assert.Equal(t, complex128(0), New(m).Get("nothing").Complex128())
+- assert.Equal(t, val, New(m).Get("nothing").Complex128(1))
+-
+- assert.Panics(t, func() {
+- New(m).Get("age").MustComplex128()
- })
+-
-}
-
--func (gsp *genericServersProvider) DeleteFloatingIp(ip FloatingIp) error {
-- return gsp.context.WithReauth(gsp.access, func() error {
-- ep := fmt.Sprintf("%s/os-floating-ips/%d", gsp.endpoint, ip.Id)
-- return perigee.Delete(ep, perigee.Options{
-- CustomClient: gsp.context.httpClient,
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gsp.access.AuthToken(),
-- },
-- OkCodes: []int{202},
-- })
+-func TestComplex128Slice(t *testing.T) {
+-
+- val := complex128(1)
+- m := map[string]interface{}{"value": []complex128{val}, "nothing": nil}
+- assert.Equal(t, val, New(m).Get("value").Complex128Slice()[0])
+- assert.Equal(t, val, New(m).Get("value").MustComplex128Slice()[0])
+- assert.Equal(t, []complex128(nil), New(m).Get("nothing").Complex128Slice())
+- assert.Equal(t, val, New(m).Get("nothing").Complex128Slice([]complex128{complex128(1)})[0])
+-
+- assert.Panics(t, func() {
+- New(m).Get("nothing").MustComplex128Slice()
- })
--}
-
--type FloatingIp struct {
-- Id int `json:"id"`
-- Pool string `json:"pool"`
-- Ip string `json:"ip"`
-- FixedIp string `json:"fixed_ip"`
-- InstanceId string `json:"instance_id"`
-}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/global_context.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/global_context.go
-deleted file mode 100644
-index 89d283b..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/global_context.go
-+++ /dev/null
-@@ -1,67 +0,0 @@
--package gophercloud
-
--import (
-- "github.com/racker/perigee"
--)
+-func TestIsComplex128(t *testing.T) {
-
--// globalContext is the, well, "global context."
--// Most of this SDK is written in a manner to facilitate easier testing,
--// which doesn't require all the configuration a real-world application would require.
--// However, for real-world deployments, applications should be able to rely on a consistent configuration of providers, etc.
--var globalContext *Context
+- var v *Value
-
--// providers is the set of supported providers.
--var providers = map[string]Provider{
-- "rackspace-us": {
-- AuthEndpoint: "https://identity.api.rackspacecloud.com/v2.0/tokens",
-- },
-- "rackspace-uk": {
-- AuthEndpoint: "https://lon.identity.api.rackspacecloud.com/v2.0/tokens",
-- },
--}
+- v = &Value{data: complex128(1)}
+- assert.True(t, v.IsComplex128())
-
--// Initialize the global context to sane configuration.
--// The Go runtime ensures this function is called before main(),
--// thus guaranteeing proper configuration before your application ever runs.
--func init() {
-- globalContext = TestContext()
-- for name, descriptor := range providers {
-- globalContext.RegisterProvider(name, descriptor)
-- }
--}
+- v = &Value{data: []complex128{complex128(1)}}
+- assert.True(t, v.IsComplex128Slice())
-
--// Authenticate() grants access to the OpenStack-compatible provider API.
--//
--// Providers are identified through a unique key string.
--// Specifying an unsupported provider will result in an ErrProvider error.
--// However, you may also specify a custom Identity API URL.
--// Any provider name that contains the characters "://", in that order, will be treated as a custom Identity API URL.
--// Custom URLs, important for private cloud deployments, overrides all provider configurations.
--//
--// The supplied AuthOptions instance allows the client to specify only those credentials
--// relevant for the authentication request. At present, support exists for OpenStack
--// Identity V2 API only; support for V3 will become available as soon as documentation for it
--// becomes readily available.
--//
--// For Identity V2 API requirements, you must provide at least the Username and Password
--// options. The TenantId field is optional, and defaults to "".
--func Authenticate(provider string, options AuthOptions) (*Access, error) {
-- return globalContext.Authenticate(provider, options)
-}
-
--// Instantiates a Cloud Servers object for the provider given.
--func ServersApi(acc AccessProvider, criteria ApiCriteria) (CloudServersProvider, error) {
-- return globalContext.ServersApi(acc, criteria)
+-func TestEachComplex128(t *testing.T) {
+-
+- v := &Value{data: []complex128{complex128(1), complex128(1), complex128(1), complex128(1), complex128(1)}}
+- count := 0
+- replacedVals := make([]complex128, 0)
+- assert.Equal(t, v, v.EachComplex128(func(i int, val complex128) bool {
+-
+- count++
+- replacedVals = append(replacedVals, val)
+-
+- // abort early
+- if i == 2 {
+- return false
+- }
+-
+- return true
+-
+- }))
+-
+- assert.Equal(t, count, 3)
+- assert.Equal(t, replacedVals[0], v.MustComplex128Slice()[0])
+- assert.Equal(t, replacedVals[1], v.MustComplex128Slice()[1])
+- assert.Equal(t, replacedVals[2], v.MustComplex128Slice()[2])
+-
-}
-
--// ActualResponseCode inspects a returned error, and discovers the actual response actual
--// response code that caused the error to be raised.
--func ActualResponseCode(e error) (int, error) {
-- if err, typeOk := e.(*perigee.UnexpectedResponseCodeError); typeOk {
-- return err.Actual, nil
-- } else if err, typeOk := e.(*AuthError); typeOk{
-- return err.StatusCode, nil
-- }
+-func TestWhereComplex128(t *testing.T) {
+-
+- v := &Value{data: []complex128{complex128(1), complex128(1), complex128(1), complex128(1), complex128(1), complex128(1)}}
+-
+- selected := v.WhereComplex128(func(i int, val complex128) bool {
+- return i%2 == 0
+- }).MustComplex128Slice()
+-
+- assert.Equal(t, 3, len(selected))
-
-- return 0, ErrError
-}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/images.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/images.go
-deleted file mode 100644
-index a23e0bb..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/images.go
-+++ /dev/null
-@@ -1,106 +0,0 @@
--package gophercloud
-
--import (
-- "github.com/racker/perigee"
--)
+-func TestGroupComplex128(t *testing.T) {
-
--// See the CloudImagesProvider interface for details.
--func (gsp *genericServersProvider) ListImages() ([]Image, error) {
-- var is []Image
+- v := &Value{data: []complex128{complex128(1), complex128(1), complex128(1), complex128(1), complex128(1), complex128(1)}}
+-
+- grouped := v.GroupComplex128(func(i int, val complex128) string {
+- return fmt.Sprintf("%v", i%2 == 0)
+- }).data.(map[string][]complex128)
+-
+- assert.Equal(t, 2, len(grouped))
+- assert.Equal(t, 3, len(grouped["true"]))
+- assert.Equal(t, 3, len(grouped["false"]))
-
-- err := gsp.context.WithReauth(gsp.access, func() error {
-- url := gsp.endpoint + "/images/detail"
-- return perigee.Get(url, perigee.Options{
-- CustomClient: gsp.context.httpClient,
-- Results: &struct{ Images *[]Image }{&is},
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gsp.access.AuthToken(),
-- },
-- })
-- })
-- return is, err
-}
-
--func (gsp *genericServersProvider) ImageById(id string) (*Image, error) {
-- var is *Image
+-func TestReplaceComplex128(t *testing.T) {
-
-- err := gsp.context.WithReauth(gsp.access, func() error {
-- url := gsp.endpoint + "/images/" + id
-- return perigee.Get(url, perigee.Options{
-- CustomClient: gsp.context.httpClient,
-- Results: &struct{ Image **Image }{&is},
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gsp.access.AuthToken(),
-- },
-- })
+- v := &Value{data: []complex128{complex128(1), complex128(1), complex128(1), complex128(1), complex128(1), complex128(1)}}
+-
+- rawArr := v.MustComplex128Slice()
+-
+- replaced := v.ReplaceComplex128(func(index int, val complex128) complex128 {
+- if index < len(rawArr)-1 {
+- return rawArr[index+1]
+- }
+- return rawArr[0]
- })
-- return is, err
+-
+- replacedArr := replaced.MustComplex128Slice()
+- if assert.Equal(t, 6, len(replacedArr)) {
+- assert.Equal(t, replacedArr[0], rawArr[1])
+- assert.Equal(t, replacedArr[1], rawArr[2])
+- assert.Equal(t, replacedArr[2], rawArr[3])
+- assert.Equal(t, replacedArr[3], rawArr[4])
+- assert.Equal(t, replacedArr[4], rawArr[5])
+- assert.Equal(t, replacedArr[5], rawArr[0])
+- }
+-
-}
-
--func (gsp *genericServersProvider) DeleteImageById(id string) error {
-- err := gsp.context.WithReauth(gsp.access, func() error {
-- url := gsp.endpoint + "/images/" + id
-- _, err := perigee.Request("DELETE", url, perigee.Options{
-- CustomClient: gsp.context.httpClient,
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gsp.access.AuthToken(),
-- },
-- })
-- return err
+-func TestCollectComplex128(t *testing.T) {
+-
+- v := &Value{data: []complex128{complex128(1), complex128(1), complex128(1), complex128(1), complex128(1), complex128(1)}}
+-
+- collected := v.CollectComplex128(func(index int, val complex128) interface{} {
+- return index
- })
-- return err
+-
+- collectedArr := collected.MustInterSlice()
+- if assert.Equal(t, 6, len(collectedArr)) {
+- assert.Equal(t, collectedArr[0], 0)
+- assert.Equal(t, collectedArr[1], 1)
+- assert.Equal(t, collectedArr[2], 2)
+- assert.Equal(t, collectedArr[3], 3)
+- assert.Equal(t, collectedArr[4], 4)
+- assert.Equal(t, collectedArr[5], 5)
+- }
+-
-}
+diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/value.go b/Godeps/_workspace/src/github.com/stretchr/objx/value.go
+deleted file mode 100644
+index 7aaef06..0000000
+--- a/Godeps/_workspace/src/github.com/stretchr/objx/value.go
++++ /dev/null
+@@ -1,13 +0,0 @@
+-package objx
-
--// ImageLink provides a reference to a image by either ID or by direct URL.
--// Some services use just the ID, others use just the URL.
--// This structure provides a common means of expressing both in a single field.
--type ImageLink struct {
-- Id string `json:"id"`
-- Links []Link `json:"links"`
+-// Value provides methods for extracting interface{} data in various
+-// types.
+-type Value struct {
+- // data contains the raw data being managed by this Value
+- data interface{}
-}
-
--// Image is used for JSON (un)marshalling.
--// It provides a description of an OS image.
--//
--// The Id field contains the image's unique identifier.
--// For example, this identifier will be useful for specifying which operating system to install on a new server instance.
--//
--// The MinDisk and MinRam fields specify the minimum resources a server must provide to be able to install the image.
--//
--// The Name field provides a human-readable moniker for the OS image.
--//
--// The Progress and Status fields indicate image-creation status.
--// Any usable image will have 100% progress.
--//
--// The Updated field indicates the last time this image was changed.
--//
--// OsDcfDiskConfig indicates the server's boot volume configuration.
--// Valid values are:
--// AUTO
--// ----
--// The server is built with a single partition the size of the target flavor disk.
--// The file system is automatically adjusted to fit the entire partition.
--// This keeps things simple and automated.
--// AUTO is valid only for images and servers with a single partition that use the EXT3 file system.
--// This is the default setting for applicable Rackspace base images.
--//
--// MANUAL
--// ------
--// The server is built using whatever partition scheme and file system is in the source image.
--// If the target flavor disk is larger,
--// the remaining disk space is left unpartitioned.
--// This enables images to have non-EXT3 file systems, multiple partitions, and so on,
--// and enables you to manage the disk configuration.
--//
--type Image struct {
-- Created string `json:"created"`
-- Id string `json:"id"`
-- Links []Link `json:"links"`
-- MinDisk int `json:"minDisk"`
-- MinRam int `json:"minRam"`
-- Name string `json:"name"`
-- Progress int `json:"progress"`
-- Status string `json:"status"`
-- Updated string `json:"updated"`
-- OsDcfDiskConfig string `json:"OS-DCF:diskConfig"`
+-// Data returns the raw data contained by this Value
+-func (v *Value) Data() interface{} {
+- return v.data
-}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/interfaces.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/interfaces.go
+diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/value_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/value_test.go
deleted file mode 100644
-index 4c7dbee..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/interfaces.go
+index 0bc65d9..0000000
+--- a/Godeps/_workspace/src/github.com/stretchr/objx/value_test.go
+++ /dev/null
-@@ -1,247 +0,0 @@
--package gophercloud
+@@ -1 +0,0 @@
+-package objx
+diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/assert/assertions.go b/Godeps/_workspace/src/github.com/stretchr/testify/assert/assertions.go
+deleted file mode 100644
+index c784e1b..0000000
+--- a/Godeps/_workspace/src/github.com/stretchr/testify/assert/assertions.go
++++ /dev/null
+@@ -1,490 +0,0 @@
+-package assert
+-
+-import (
+- "fmt"
+- "reflect"
+- "runtime"
+- "strings"
+- "time"
+-)
+-
+-// TestingT is an interface wrapper around *testing.T
+-type TestingT interface {
+- Errorf(format string, args ...interface{})
+-}
+-
+-// Comparison a custom function that returns true on success and false on failure
+-type Comparison func() (success bool)
+-
+-/*
+- Helper functions
+-*/
-
--import "net/url"
+-// ObjectsAreEqual determines if two objects are considered equal.
+-//
+-// This function does no assertion of any kind.
+-func ObjectsAreEqual(expected, actual interface{}) bool {
-
--// AccessProvider instances encapsulate a Keystone authentication interface.
--type AccessProvider interface {
-- // FirstEndpointUrlByCriteria searches through the service catalog for the first
-- // matching entry endpoint fulfilling the provided criteria. If nothing found,
-- // return "". Otherwise, return either the public or internal URL for the
-- // endpoint, depending on both its existence and the setting of the ApiCriteria.UrlChoice
-- // field.
-- FirstEndpointUrlByCriteria(ApiCriteria) string
+- if reflect.DeepEqual(expected, actual) {
+- return true
+- }
-
-- // AuthToken provides a copy of the current authentication token for the user's credentials.
-- // Note that AuthToken() will not automatically refresh an expired token.
-- AuthToken() string
+- if reflect.ValueOf(expected) == reflect.ValueOf(actual) {
+- return true
+- }
-
-- // Revoke allows you to terminate any program's access to the OpenStack API by token ID.
-- Revoke(string) error
+- // Last ditch effort
+- if fmt.Sprintf("%#v", expected) == fmt.Sprintf("%#v", actual) {
+- return true
+- }
+-
+- return false
-
-- // Reauthenticate attempts to acquire a new authentication token, if the feature is enabled by
-- // AuthOptions.AllowReauth.
-- Reauthenticate() error
-}
-
--// ServiceCatalogerIdentityV2 interface provides direct access to the service catalog as offered by the Identity V2 API.
--// We regret we need to fracture the namespace of what should otherwise be a simple concept; however,
--// the OpenStack community saw fit to render V3's service catalog completely incompatible with V2.
--type ServiceCatalogerForIdentityV2 interface {
-- V2ServiceCatalog() []CatalogEntry
+-/* CallerInfo is necessary because the assert functions use the testing object
+-internally, causing it to print the file:line of the assert method, rather than where
+-the problem actually occured in calling code.*/
+-
+-// CallerInfo returns a string containing the file and line number of the assert call
+-// that failed.
+-func CallerInfo() string {
+-
+- file := ""
+- line := 0
+- ok := false
+-
+- for i := 0; ; i++ {
+- _, file, line, ok = runtime.Caller(i)
+- if !ok {
+- return ""
+- }
+- parts := strings.Split(file, "/")
+- dir := parts[len(parts)-2]
+- file = parts[len(parts)-1]
+- if (dir != "assert" && dir != "mock") || file == "mock_test.go" {
+- break
+- }
+- }
+-
+- return fmt.Sprintf("%s:%d", file, line)
-}
-
--// CloudServersProvider instances encapsulate a Cloud Servers API, should one exist in the service catalog
--// for your provider.
--type CloudServersProvider interface {
-- // Servers
+-// getWhitespaceString returns a string that is long enough to overwrite the default
+-// output from the go testing framework.
+-func getWhitespaceString() string {
-
-- // ListServers provides a complete list of servers hosted by the user
-- // in a given region. This function differs from ListServersLinksOnly()
-- // in that it returns all available details for each server returned.
-- ListServers() ([]Server, error)
+- _, file, line, ok := runtime.Caller(1)
+- if !ok {
+- return ""
+- }
+- parts := strings.Split(file, "/")
+- file = parts[len(parts)-1]
-
-- // ListServersByFilters provides a list of servers hosted by the user in a
-- // given region. This function let you requests servers by certain URI
-- // paramaters defined by the API endpoint. This is sometimes more suitable
-- // if you have many servers and you only want to pick servers on certain
-- // criterias. An example usage could be :
-- //
-- // filter := url.Values{}
-- // filter.Set("name", "MyServer")
-- // filter.Set("status", "ACTIVE")
-- //
-- // filteredServers, err := c.ListServersByFilters(filter)
-- //
-- // Here, filteredServers only contains servers whose name started with
-- // "MyServer" and are in "ACTIVE" status.
-- ListServersByFilter(filter url.Values) ([]Server, error)
+- return strings.Repeat(" ", len(fmt.Sprintf("%s:%d: ", file, line)))
-
-- // ListServers provides a complete list of servers hosted by the user
-- // in a given region. This function differs from ListServers() in that
-- // it returns only IDs and links to each server returned.
-- //
-- // This function should be used only under certain circumstances.
-- // It's most useful for checking to see if a server with a given ID exists,
-- // or that you have permission to work with that server. It's also useful
-- // when the cost of retrieving the server link list plus the overhead of manually
-- // invoking ServerById() for each of the servers you're interested in is less than
-- // just calling ListServers() to begin with. This may be a consideration, for
-- // example, with mobile applications.
-- //
-- // In other cases, you probably should just call ListServers() and cache the
-- // results to conserve overall bandwidth and reduce your access rate on the API.
-- ListServersLinksOnly() ([]Server, error)
+-}
-
-- // ServerById will retrieve a detailed server description given the unique ID
-- // of a server. The ID can be returned by either ListServers() or by ListServersLinksOnly().
-- ServerById(id string) (*Server, error)
+-func messageFromMsgAndArgs(msgAndArgs ...interface{}) string {
+- if len(msgAndArgs) == 0 || msgAndArgs == nil {
+- return ""
+- }
+- if len(msgAndArgs) == 1 {
+- return msgAndArgs[0].(string)
+- }
+- if len(msgAndArgs) > 1 {
+- return fmt.Sprintf(msgAndArgs[0].(string), msgAndArgs[1:]...)
+- }
+- return ""
+-}
-
-- // CreateServer requests a new server to be created by the cloud server provider.
-- // The user must pass in a pointer to an initialized NewServerContainer structure.
-- // Please refer to the NewServerContainer documentation for more details.
-- //
-- // If the NewServer structure's AdminPass is empty (""), a password will be
-- // automatically generated by your OpenStack provider, and returned through the
-- // AdminPass field of the result. Take care, however; this will be the only time
-- // this happens. No other means exists in the public API to acquire a password
-- // for a pre-existing server. If you lose it, you'll need to call SetAdminPassword()
-- // to set a new one.
-- CreateServer(ns NewServer) (*NewServer, error)
+-// Fail reports a failure through
+-func Fail(t TestingT, failureMessage string, msgAndArgs ...interface{}) bool {
-
-- // DeleteServerById requests that the server with the assigned ID be removed
-- // from your account. The delete happens asynchronously.
-- DeleteServerById(id string) error
+- message := messageFromMsgAndArgs(msgAndArgs...)
-
-- // SetAdminPassword requests that the server with the specified ID have its
-- // administrative password changed. For Linux, BSD, or other POSIX-like
-- // system, this password corresponds to the root user. For Windows machines,
-- // the Administrator password will be affected instead.
-- SetAdminPassword(id string, pw string) error
+- if len(message) > 0 {
+- t.Errorf("\r%s\r\tLocation:\t%s\n\r\tError:\t\t%s\n\r\tMessages:\t%s\n\r", getWhitespaceString(), CallerInfo(), failureMessage, message)
+- } else {
+- t.Errorf("\r%s\r\tLocation:\t%s\n\r\tError:\t\t%s\n\r", getWhitespaceString(), CallerInfo(), failureMessage)
+- }
-
-- // ResizeServer can be a short-hand for RebuildServer where only the size of the server
-- // changes. Note that after the resize operation is requested, you will need to confirm
-- // the resize has completed for changes to take effect permanently. Changes will assume
-- // to be confirmed even without an explicit confirmation after 24 hours from the initial
-- // request.
-- ResizeServer(id, newName, newFlavor, newDiskConfig string) error
+- return false
+-}
-
-- // RevertResize will reject a server's resized configuration, thus
-- // rolling back to the original server.
-- RevertResize(id string) error
+-// Implements asserts that an object is implemented by the specified interface.
+-//
+-// assert.Implements(t, (*MyInterface)(nil), new(MyObject), "MyObject")
+-func Implements(t TestingT, interfaceObject interface{}, object interface{}, msgAndArgs ...interface{}) bool {
-
-- // ConfirmResizeServer will acknowledge a server's resized configuration.
-- ConfirmResize(id string) error
+- interfaceType := reflect.TypeOf(interfaceObject).Elem()
-
-- // RebootServer requests that the server with the specified ID be rebooted.
-- // Two reboot mechanisms exist.
-- //
-- // - Hard. This will physically power-cycle the unit.
-- // - Soft. This will attempt to use the server's software-based mechanisms to restart
-- // the machine. E.g., "shutdown -r now" on Linux.
-- RebootServer(id string, hard bool) error
+- if !reflect.TypeOf(object).Implements(interfaceType) {
+- return Fail(t, fmt.Sprintf("Object must implement %v", interfaceType), msgAndArgs...)
+- }
-
-- // RescueServer requests that the server with the specified ID be placed into
-- // a state of maintenance. The server instance is replaced with a new instance,
-- // of the same flavor and image. This new image will have the boot volume of the
-- // original machine mounted as a secondary device, so that repair and administration
-- // may occur. Use UnrescueServer() to restore the server to its previous state.
-- // Note also that many providers will impose a time limit for how long a server may
-- // exist in rescue mode! Consult the API documentation for your provider for
-- // details.
-- RescueServer(id string) (string, error)
+- return true
-
-- // UnrescueServer requests that a server in rescue state be placed into its nominal
-- // operating state.
-- UnrescueServer(id string) error
+-}
-
-- // UpdateServer alters one or more fields of the identified server's Server record.
-- // However, not all fields may be altered. Presently, only Name, AccessIPv4, and
-- // AccessIPv6 fields may be altered. If unspecified, or set to an empty or zero
-- // value, the corresponding field remains unaltered.
-- //
-- // This function returns the new set of server details if successful.
-- UpdateServer(id string, newValues NewServerSettings) (*Server, error)
+-// IsType asserts that the specified objects are of the same type.
+-func IsType(t TestingT, expectedType interface{}, object interface{}, msgAndArgs ...interface{}) bool {
-
-- // RebuildServer reprovisions a server to the specifications given by the
-- // NewServer structure. The following fields are guaranteed to be recognized:
-- //
-- // Name (required) AccessIPv4
-- // imageRef (required) AccessIPv6
-- // AdminPass (required) Metadata
-- // Personality
-- //
-- // Other providers may reserve the right to act on additional fields.
-- RebuildServer(id string, ns NewServer) (*Server, error)
+- if !ObjectsAreEqual(reflect.TypeOf(object), reflect.TypeOf(expectedType)) {
+- return Fail(t, fmt.Sprintf("Object expected to be of type %v, but was %v", reflect.TypeOf(expectedType), reflect.TypeOf(object)), msgAndArgs...)
+- }
-
-- // CreateImage will create a new image from the specified server id returning the id of the new image.
-- CreateImage(id string, ci CreateImage) (string, error)
+- return true
+-}
-
-- // Addresses
+-// Equal asserts that two objects are equal.
+-//
+-// assert.Equal(t, 123, 123, "123 and 123 should be equal")
+-//
+-// Returns whether the assertion was successful (true) or not (false).
+-func Equal(t TestingT, expected, actual interface{}, msgAndArgs ...interface{}) bool {
-
-- // ListAddresses yields the list of available addresses for the server.
-- // This information is also returned by ServerById() in the Server.Addresses
-- // field. However, if you have a lot of servers and all you need are addresses,
-- // this function might be more efficient.
-- ListAddresses(id string) (AddressSet, error)
+- if !ObjectsAreEqual(expected, actual) {
+- return Fail(t, fmt.Sprintf("Not equal: %#v != %#v", expected, actual), msgAndArgs...)
+- }
-
-- // ListAddressesByNetwork yields the list of available addresses for a given server id and networkLabel.
-- // Example: ListAddressesByNetwork("234-4353-4jfrj-43j2s", "private")
-- ListAddressesByNetwork(id, networkLabel string) (NetworkAddress, error)
+- return true
-
-- // ListFloatingIps yields the list of all floating IP addresses allocated to the current project.
-- ListFloatingIps() ([]FloatingIp, error)
+-}
-
-- // CreateFloatingIp allocates a new IP from the named pool to the current project.
-- CreateFloatingIp(pool string) (FloatingIp, error)
+-// Exactly asserts that two objects are equal is value and type.
+-//
+-// assert.Exactly(t, int32(123), int64(123), "123 and 123 should NOT be equal")
+-//
+-// Returns whether the assertion was successful (true) or not (false).
+-func Exactly(t TestingT, expected, actual interface{}, msgAndArgs ...interface{}) bool {
-
-- // DeleteFloatingIp returns the specified IP from the current project to the pool.
-- DeleteFloatingIp(ip FloatingIp) error
+- aType := reflect.TypeOf(expected)
+- bType := reflect.TypeOf(actual)
-
-- // AssociateFloatingIp associates the given floating IP to the given server id.
-- AssociateFloatingIp(serverId string, ip FloatingIp) error
+- if aType != bType {
+- return Fail(t, "Types expected to match exactly", "%v != %v", aType, bType)
+- }
-
-- // Images
+- return Equal(t, expected, actual, msgAndArgs...)
-
-- // ListImages yields the list of available operating system images. This function
-- // returns full details for each image, if available.
-- ListImages() ([]Image, error)
+-}
-
-- // ImageById yields details about a specific image.
-- ImageById(id string) (*Image, error)
+-// NotNil asserts that the specified object is not nil.
+-//
+-// assert.NotNil(t, err, "err should be something")
+-//
+-// Returns whether the assertion was successful (true) or not (false).
+-func NotNil(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
-
-- // DeleteImageById will delete the specific image.
-- DeleteImageById(id string) error
+- var success bool = true
-
-- // Flavors
+- if object == nil {
+- success = false
+- } else {
+- value := reflect.ValueOf(object)
+- kind := value.Kind()
+- if kind >= reflect.Chan && kind <= reflect.Slice && value.IsNil() {
+- success = false
+- }
+- }
-
-- // ListFlavors yields the list of available system flavors. This function
-- // returns full details for each flavor, if available.
-- ListFlavors() ([]Flavor, error)
+- if !success {
+- Fail(t, "Expected not to be nil.", msgAndArgs...)
+- }
-
-- // KeyPairs
+- return success
+-}
-
-- // ListKeyPairs yields the list of available keypairs.
-- ListKeyPairs() ([]KeyPair, error)
+-// Nil asserts that the specified object is nil.
+-//
+-// assert.Nil(t, err, "err should be nothing")
+-//
+-// Returns whether the assertion was successful (true) or not (false).
+-func Nil(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
-
-- // CreateKeyPairs will create or generate a new keypair.
-- CreateKeyPair(nkp NewKeyPair) (KeyPair, error)
+- if object == nil {
+- return true
+- } else {
+- value := reflect.ValueOf(object)
+- kind := value.Kind()
+- if kind >= reflect.Chan && kind <= reflect.Slice && value.IsNil() {
+- return true
+- }
+- }
-
-- // DeleteKeyPair wil delete a keypair.
-- DeleteKeyPair(name string) error
+- return Fail(t, fmt.Sprintf("Expected nil, but got: %#v", object), msgAndArgs...)
+-}
-
-- // ShowKeyPair will yield the named keypair.
-- ShowKeyPair(name string) (KeyPair, error)
+-// isEmpty gets whether the specified object is considered empty or not.
+-func isEmpty(object interface{}) bool {
-
-- // ListSecurityGroups provides a listing of security groups for the tenant.
-- // This method works only if the provider supports the os-security-groups extension.
-- ListSecurityGroups() ([]SecurityGroup, error)
+- if object == nil {
+- return true
+- } else if object == "" {
+- return true
+- } else if object == 0 {
+- return true
+- } else if object == false {
+- return true
+- }
-
-- // CreateSecurityGroup lets a tenant create a new security group.
-- // Only the SecurityGroup fields which are specified will be marshalled to the API.
-- // This method works only if the provider supports the os-security-groups extension.
-- CreateSecurityGroup(desired SecurityGroup) (*SecurityGroup, error)
+- objValue := reflect.ValueOf(object)
+- switch objValue.Kind() {
+- case reflect.Map:
+- fallthrough
+- case reflect.Slice:
+- {
+- return (objValue.Len() == 0)
+- }
+- }
-
-- // ListSecurityGroupsByServerId provides a list of security groups which apply to the indicated server.
-- // This method works only if the provider supports the os-security-groups extension.
-- ListSecurityGroupsByServerId(id string) ([]SecurityGroup, error)
+- return false
-
-- // SecurityGroupById returns a security group corresponding to the provided ID number.
-- // This method works only if the provider supports the os-security-groups extension.
-- SecurityGroupById(id int) (*SecurityGroup, error)
+-}
-
-- // DeleteSecurityGroupById disposes of a security group corresponding to the provided ID number.
-- // This method works only if the provider supports the os-security-groups extension.
-- DeleteSecurityGroupById(id int) error
+-// Empty asserts that the specified object is empty. I.e. nil, "", false, 0 or a
+-// slice with len == 0.
+-//
+-// assert.Empty(t, obj)
+-//
+-// Returns whether the assertion was successful (true) or not (false).
+-func Empty(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
-
-- // ListDefaultSGRules lists default security group rules.
-- // This method only works if the provider supports the os-security-groups-default-rules extension.
-- ListDefaultSGRules() ([]SGRule, error)
+- pass := isEmpty(object)
+- if !pass {
+- Fail(t, fmt.Sprintf("Should be empty, but was %v", object), msgAndArgs...)
+- }
-
-- // CreateDefaultSGRule creates a default security group rule.
-- // This method only works if the provider supports the os-security-groups-default-rules extension.
-- CreateDefaultSGRule(SGRule) (*SGRule, error)
+- return pass
-
-- // GetSGRule obtains information for a specified security group rule.
-- // This method only works if the provider supports the os-security-groups-default-rules extension.
-- GetSGRule(string) (*SGRule, error)
-}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/keypairs.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/keypairs.go
-deleted file mode 100644
-index 8ae8cd3..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/keypairs.go
-+++ /dev/null
-@@ -1,98 +0,0 @@
--package gophercloud
-
--import (
-- "github.com/racker/perigee"
--)
+-// Empty asserts that the specified object is NOT empty. I.e. not nil, "", false, 0 or a
+-// slice with len == 0.
+-//
+-// if assert.NotEmpty(t, obj) {
+-// assert.Equal(t, "two", obj[1])
+-// }
+-//
+-// Returns whether the assertion was successful (true) or not (false).
+-func NotEmpty(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
-
--// See the CloudImagesProvider interface for details.
--func (gsp *genericServersProvider) ListKeyPairs() ([]KeyPair, error) {
-- type KeyPairs struct {
-- KeyPairs []struct {
-- KeyPair KeyPair `json:"keypair"`
-- } `json:"keypairs"`
+- pass := !isEmpty(object)
+- if !pass {
+- Fail(t, fmt.Sprintf("Should NOT be empty, but was %v", object), msgAndArgs...)
- }
-
-- var kp KeyPairs
+- return pass
-
-- err := gsp.context.WithReauth(gsp.access, func() error {
-- url := gsp.endpoint + "/os-keypairs"
-- return perigee.Get(url, perigee.Options{
-- CustomClient: gsp.context.httpClient,
-- Results: &kp,
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gsp.access.AuthToken(),
-- },
-- })
-- })
+-}
-
-- // Flatten out the list of keypairs
-- var keypairs []KeyPair
-- for _, k := range kp.KeyPairs {
-- keypairs = append(keypairs, k.KeyPair)
+-// True asserts that the specified value is true.
+-//
+-// assert.True(t, myBool, "myBool should be true")
+-//
+-// Returns whether the assertion was successful (true) or not (false).
+-func True(t TestingT, value bool, msgAndArgs ...interface{}) bool {
+-
+- if value != true {
+- return Fail(t, "Should be true", msgAndArgs...)
- }
-- return keypairs, err
+-
+- return true
+-
-}
-
--func (gsp *genericServersProvider) CreateKeyPair(nkp NewKeyPair) (KeyPair, error) {
-- var kp KeyPair
+-// False asserts that the specified value is true.
+-//
+-// assert.False(t, myBool, "myBool should be false")
+-//
+-// Returns whether the assertion was successful (true) or not (false).
+-func False(t TestingT, value bool, msgAndArgs ...interface{}) bool {
+-
+- if value != false {
+- return Fail(t, "Should be false", msgAndArgs...)
+- }
+-
+- return true
-
-- err := gsp.context.WithReauth(gsp.access, func() error {
-- url := gsp.endpoint + "/os-keypairs"
-- return perigee.Post(url, perigee.Options{
-- ReqBody: &struct {
-- KeyPair *NewKeyPair `json:"keypair"`
-- }{&nkp},
-- CustomClient: gsp.context.httpClient,
-- Results: &struct{ KeyPair *KeyPair }{&kp},
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gsp.access.AuthToken(),
-- },
-- OkCodes: []int{200},
-- })
-- })
-- return kp, err
-}
-
--// See the CloudImagesProvider interface for details.
--func (gsp *genericServersProvider) DeleteKeyPair(name string) error {
-- err := gsp.context.WithReauth(gsp.access, func() error {
-- url := gsp.endpoint + "/os-keypairs/" + name
-- return perigee.Delete(url, perigee.Options{
-- CustomClient: gsp.context.httpClient,
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gsp.access.AuthToken(),
-- },
-- OkCodes: []int{202},
-- })
-- })
-- return err
+-// NotEqual asserts that the specified values are NOT equal.
+-//
+-// assert.NotEqual(t, obj1, obj2, "two objects shouldn't be equal")
+-//
+-// Returns whether the assertion was successful (true) or not (false).
+-func NotEqual(t TestingT, expected, actual interface{}, msgAndArgs ...interface{}) bool {
+-
+- if ObjectsAreEqual(expected, actual) {
+- return Fail(t, "Should not be equal", msgAndArgs...)
+- }
+-
+- return true
+-
-}
-
--func (gsp *genericServersProvider) ShowKeyPair(name string) (KeyPair, error) {
-- var kp KeyPair
+-// Contains asserts that the specified string contains the specified substring.
+-//
+-// assert.Contains(t, "Hello World", "World", "But 'Hello World' does contain 'World'")
+-//
+-// Returns whether the assertion was successful (true) or not (false).
+-func Contains(t TestingT, s, contains string, msgAndArgs ...interface{}) bool {
+-
+- if !strings.Contains(s, contains) {
+- return Fail(t, fmt.Sprintf("\"%s\" does not contain \"%s\"", s, contains), msgAndArgs...)
+- }
+-
+- return true
-
-- err := gsp.context.WithReauth(gsp.access, func() error {
-- url := gsp.endpoint + "/os-keypairs/" + name
-- return perigee.Get(url, perigee.Options{
-- CustomClient: gsp.context.httpClient,
-- Results: &struct{ KeyPair *KeyPair }{&kp},
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gsp.access.AuthToken(),
-- },
-- })
-- })
-- return kp, err
-}
-
--type KeyPair struct {
-- FingerPrint string `json:"fingerprint"`
-- Name string `json:"name"`
-- PrivateKey string `json:"private_key,omitempty"`
-- PublicKey string `json:"public_key"`
-- UserID string `json:"user_id,omitempty"`
+-// NotContains asserts that the specified string does NOT contain the specified substring.
+-//
+-// assert.NotContains(t, "Hello World", "Earth", "But 'Hello World' does NOT contain 'Earth'")
+-//
+-// Returns whether the assertion was successful (true) or not (false).
+-func NotContains(t TestingT, s, contains string, msgAndArgs ...interface{}) bool {
+-
+- if strings.Contains(s, contains) {
+- return Fail(t, fmt.Sprintf("\"%s\" should not contain \"%s\"", s, contains), msgAndArgs...)
+- }
+-
+- return true
+-
-}
-
--type NewKeyPair struct {
-- Name string `json:"name"`
-- PublicKey string `json:"public_key,omitempty"`
+-// Uses a Comparison to assert a complex condition.
+-func Condition(t TestingT, comp Comparison, msgAndArgs ...interface{}) bool {
+- result := comp()
+- if !result {
+- Fail(t, "Condition failed!", msgAndArgs...)
+- }
+- return result
-}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/osutil/auth.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/osutil/auth.go
-deleted file mode 100644
-index a411b63..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/osutil/auth.go
-+++ /dev/null
-@@ -1,64 +0,0 @@
--package osutil
-
--import (
-- "fmt"
-- "github.com/rackspace/gophercloud"
-- "os"
-- "strings"
--)
+-// PanicTestFunc defines a func that should be passed to the assert.Panics and assert.NotPanics
+-// methods, and represents a simple func that takes no arguments, and returns nothing.
+-type PanicTestFunc func()
-
--var (
-- nilOptions = gophercloud.AuthOptions{}
+-// didPanic returns true if the function passed to it panics. Otherwise, it returns false.
+-func didPanic(f PanicTestFunc) (bool, interface{}) {
-
-- // ErrNoAuthUrl errors occur when the value of the OS_AUTH_URL environment variable cannot be determined.
-- ErrNoAuthUrl = fmt.Errorf("Environment variable OS_AUTH_URL needs to be set.")
+- var didPanic bool = false
+- var message interface{}
+- func() {
-
-- // ErrNoUsername errors occur when the value of the OS_USERNAME environment variable cannot be determined.
-- ErrNoUsername = fmt.Errorf("Environment variable OS_USERNAME needs to be set.")
+- defer func() {
+- if message = recover(); message != nil {
+- didPanic = true
+- }
+- }()
-
-- // ErrNoPassword errors occur when the value of the OS_PASSWORD environment variable cannot be determined.
-- ErrNoPassword = fmt.Errorf("Environment variable OS_PASSWORD or OS_API_KEY needs to be set.")
--)
+- // call the target function
+- f()
-
--// AuthOptions fills out a gophercloud.AuthOptions structure with the settings found on the various OpenStack
--// OS_* environment variables. The following variables provide sources of truth: OS_AUTH_URL, OS_USERNAME,
--// OS_PASSWORD, OS_TENANT_ID, and OS_TENANT_NAME. Of these, OS_USERNAME, OS_PASSWORD, and OS_AUTH_URL must
--// have settings, or an error will result. OS_TENANT_ID and OS_TENANT_NAME are optional.
+- }()
+-
+- return didPanic, message
+-
+-}
+-
+-// Panics asserts that the code inside the specified PanicTestFunc panics.
-//
--// The value of OS_AUTH_URL will be returned directly to the caller, for subsequent use in
--// gophercloud.Authenticate()'s Provider parameter. This function will not interpret the value of OS_AUTH_URL,
--// so as a convenient extention, you may set OS_AUTH_URL to, e.g., "rackspace-uk", or any other Gophercloud-recognized
--// provider shortcuts. For broad compatibility, especially with local installations, you should probably
--// avoid the temptation to do this.
--func AuthOptions() (string, gophercloud.AuthOptions, error) {
-- provider := os.Getenv("OS_AUTH_URL")
-- username := os.Getenv("OS_USERNAME")
-- password := os.Getenv("OS_PASSWORD")
-- tenantId := os.Getenv("OS_TENANT_ID")
-- tenantName := os.Getenv("OS_TENANT_NAME")
+-// assert.Panics(t, func(){
+-// GoCrazy()
+-// }, "Calling GoCrazy() should panic")
+-//
+-// Returns whether the assertion was successful (true) or not (false).
+-func Panics(t TestingT, f PanicTestFunc, msgAndArgs ...interface{}) bool {
-
-- if provider == "" {
-- return "", nilOptions, ErrNoAuthUrl
+- if funcDidPanic, panicValue := didPanic(f); !funcDidPanic {
+- return Fail(t, fmt.Sprintf("func %#v should panic\n\r\tPanic value:\t%v", f, panicValue), msgAndArgs...)
- }
-
-- if username == "" {
-- return "", nilOptions, ErrNoUsername
-- }
+- return true
+-}
-
-- if password == "" {
-- return "", nilOptions, ErrNoPassword
-- }
+-// NotPanics asserts that the code inside the specified PanicTestFunc does NOT panic.
+-//
+-// assert.NotPanics(t, func(){
+-// RemainCalm()
+-// }, "Calling RemainCalm() should NOT panic")
+-//
+-// Returns whether the assertion was successful (true) or not (false).
+-func NotPanics(t TestingT, f PanicTestFunc, msgAndArgs ...interface{}) bool {
-
-- ao := gophercloud.AuthOptions{
-- Username: username,
-- Password: password,
-- TenantId: tenantId,
-- TenantName: tenantName,
+- if funcDidPanic, panicValue := didPanic(f); funcDidPanic {
+- return Fail(t, fmt.Sprintf("func %#v should not panic\n\r\tPanic value:\t%v", f, panicValue), msgAndArgs...)
- }
-
-- if !strings.HasSuffix(provider, "/tokens") {
-- provider += "/tokens"
+- return true
+-}
+-
+-// WithinDuration asserts that the two times are within duration delta of each other.
+-//
+-// assert.WithinDuration(t, time.Now(), time.Now(), 10*time.Second, "The difference should not be more than 10s")
+-//
+-// Returns whether the assertion was successful (true) or not (false).
+-func WithinDuration(t TestingT, expected, actual time.Time, delta time.Duration, msgAndArgs ...interface{}) bool {
+-
+- dt := expected.Sub(actual)
+- if dt < -delta || dt > delta {
+- return Fail(t, fmt.Sprintf("Max difference between %v and %v allowed is %v, but difference was %v", expected, actual, dt, delta), msgAndArgs...)
- }
-
-- return provider, ao, nil
+- return true
-}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/osutil/region.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/osutil/region.go
-deleted file mode 100644
-index f7df507..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/osutil/region.go
-+++ /dev/null
-@@ -1,9 +0,0 @@
--package osutil
-
--import "os"
+-/*
+- Errors
+-*/
-
--// Region provides a means of querying the OS_REGION_NAME environment variable.
--// At present, you may also use os.Getenv("OS_REGION_NAME") as well.
--func Region() string {
-- return os.Getenv("OS_REGION_NAME")
--}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/package.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/package.go
-deleted file mode 100644
-index 396e523..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/package.go
-+++ /dev/null
-@@ -1,7 +0,0 @@
--// Gophercloud provides a multi-vendor interface to OpenStack-compatible clouds which attempts to follow
--// established Go community coding standards and social norms.
+-// NoError asserts that a function returned no error (i.e. `nil`).
-//
--// Unless you intend on contributing code to the SDK, you will almost certainly never have to use any
--// Context structures or any of its methods. Contextual methods exist for easier unit testing only.
--// Stick with the global functions unless you know exactly what you're doing, and why.
--package gophercloud
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/reauth.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/reauth.go
-deleted file mode 100644
-index 342aca4..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/reauth.go
-+++ /dev/null
-@@ -1,36 +0,0 @@
--package gophercloud
+-// actualObj, err := SomeFunction()
+-// if assert.NoError(t, err) {
+-// assert.Equal(t, actualObj, expectedObj)
+-// }
+-//
+-// Returns whether the assertion was successful (true) or not (false).
+-func NoError(t TestingT, err error, msgAndArgs ...interface{}) bool {
-
--import (
-- "github.com/racker/perigee"
--)
+- message := messageFromMsgAndArgs(msgAndArgs...)
+- return Nil(t, err, "No error is expected but got %v %s", err, message)
-
--// WithReauth wraps a Perigee request fragment with logic to perform re-authentication
--// if it's deemed necessary.
+-}
+-
+-// Error asserts that a function returned an error (i.e. not `nil`).
-//
--// Do not confuse this function with WithReauth()! Although they work together to support reauthentication,
--// WithReauth() actually contains the decision-making logic to determine when to perform a reauth,
--// while WithReauthHandler() is used to configure what a reauth actually entails.
--func (c *Context) WithReauth(ap AccessProvider, f func() error) error {
-- err := f()
-- cause, ok := err.(*perigee.UnexpectedResponseCodeError)
-- if ok && cause.Actual == 401 {
-- err = c.reauthHandler(ap)
-- if err == nil {
-- err = f()
-- }
-- }
-- return err
+-// actualObj, err := SomeFunction()
+-// if assert.Error(t, err, "An error was expected") {
+-// assert.Equal(t, err, expectedError)
+-// }
+-//
+-// Returns whether the assertion was successful (true) or not (false).
+-func Error(t TestingT, err error, msgAndArgs ...interface{}) bool {
+-
+- message := messageFromMsgAndArgs(msgAndArgs...)
+- return NotNil(t, err, "An error is expected but got nil. %s", message)
+-
-}
-
--// This is like WithReauth above but returns a perigee Response object
--func (c *Context) ResponseWithReauth(ap AccessProvider, f func() (*perigee.Response, error)) (*perigee.Response, error) {
-- response, err := f()
-- cause, ok := err.(*perigee.UnexpectedResponseCodeError)
-- if ok && cause.Actual == 401 {
-- err = c.reauthHandler(ap)
-- if err == nil {
-- response, err = f()
-- }
+-// Error asserts that a function returned an error (i.e. not `nil`).
+-//
+-// actualObj, err := SomeFunction()
+-// if assert.Error(t, err, "An error was expected") {
+-// assert.Equal(t, err, expectedError)
+-// }
+-//
+-// Returns whether the assertion was successful (true) or not (false).
+-func EqualError(t TestingT, theError error, errString string, msgAndArgs ...interface{}) bool {
+-
+- message := messageFromMsgAndArgs(msgAndArgs...)
+- if !NotNil(t, theError, "An error is expected but got nil. %s", message) {
+- return false
- }
-- return response, err
+- s := "An error with value \"%s\" is expected but got \"%s\". %s"
+- return Equal(t, theError.Error(), errString,
+- s, errString, theError.Error(), message)
-}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/reauth_test.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/reauth_test.go
+diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/assert/assertions_test.go b/Godeps/_workspace/src/github.com/stretchr/testify/assert/assertions_test.go
deleted file mode 100644
-index e3501b8..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/reauth_test.go
+index bf1d727..0000000
+--- a/Godeps/_workspace/src/github.com/stretchr/testify/assert/assertions_test.go
+++ /dev/null
-@@ -1,133 +0,0 @@
--package gophercloud
+@@ -1,401 +0,0 @@
+-package assert
-
-import (
-- "github.com/racker/perigee"
+- "errors"
- "testing"
+- "time"
-)
-
--// This reauth-handler does nothing, and returns no error.
--func doNothing(_ AccessProvider) error {
-- return nil
+-// AssertionTesterInterface defines an interface to be used for testing assertion methods
+-type AssertionTesterInterface interface {
+- TestMethod()
-}
-
--func TestOtherErrorsPropegate(t *testing.T) {
-- calls := 0
-- c := TestContext().WithReauthHandler(doNothing)
--
-- err := c.WithReauth(nil, func() error {
-- calls++
-- return &perigee.UnexpectedResponseCodeError{
-- Expected: []int{204},
-- Actual: 404,
-- }
-- })
+-// AssertionTesterConformingObject is an object that conforms to the AssertionTesterInterface interface
+-type AssertionTesterConformingObject struct {
+-}
-
-- if err == nil {
-- t.Error("Expected MyError to be returned; got nil instead.")
-- return
-- }
-- if _, ok := err.(*perigee.UnexpectedResponseCodeError); !ok {
-- t.Error("Expected UnexpectedResponseCodeError; got %#v", err)
-- return
-- }
-- if calls != 1 {
-- t.Errorf("Expected the body to be invoked once; found %d calls instead", calls)
-- return
-- }
+-func (a *AssertionTesterConformingObject) TestMethod() {
-}
-
--func Test401ErrorCausesBodyInvokation2ndTime(t *testing.T) {
-- calls := 0
-- c := TestContext().WithReauthHandler(doNothing)
+-// AssertionTesterNonConformingObject is an object that does not conform to the AssertionTesterInterface interface
+-type AssertionTesterNonConformingObject struct {
+-}
-
-- err := c.WithReauth(nil, func() error {
-- calls++
-- return &perigee.UnexpectedResponseCodeError{
-- Expected: []int{204},
-- Actual: 401,
-- }
-- })
+-func TestObjectsAreEqual(t *testing.T) {
-
-- if err == nil {
-- t.Error("Expected MyError to be returned; got nil instead.")
-- return
+- if !ObjectsAreEqual("Hello World", "Hello World") {
+- t.Error("objectsAreEqual should return true")
- }
-- if calls != 2 {
-- t.Errorf("Expected the body to be invoked once; found %d calls instead", calls)
-- return
+- if !ObjectsAreEqual(123, 123) {
+- t.Error("objectsAreEqual should return true")
- }
--}
--
--func TestReauthAttemptShouldHappen(t *testing.T) {
-- calls := 0
-- c := TestContext().WithReauthHandler(func(_ AccessProvider) error {
-- calls++
-- return nil
-- })
-- c.WithReauth(nil, func() error {
-- return &perigee.UnexpectedResponseCodeError{
-- Expected: []int{204},
-- Actual: 401,
-- }
-- })
--
-- if calls != 1 {
-- t.Errorf("Expected Reauthenticator to be called once; found %d instead", calls)
-- return
+- if !ObjectsAreEqual(123.5, 123.5) {
+- t.Error("objectsAreEqual should return true")
+- }
+- if !ObjectsAreEqual([]byte("Hello World"), []byte("Hello World")) {
+- t.Error("objectsAreEqual should return true")
+- }
+- if !ObjectsAreEqual(nil, nil) {
+- t.Error("objectsAreEqual should return true")
- }
--}
--
--type MyError struct{}
-
--func (*MyError) Error() string {
-- return "MyError instance"
-}
-
--func TestReauthErrorShouldPropegate(t *testing.T) {
-- c := TestContext().WithReauthHandler(func(_ AccessProvider) error {
-- return &MyError{}
-- })
+-func TestImplements(t *testing.T) {
-
-- err := c.WithReauth(nil, func() error {
-- return &perigee.UnexpectedResponseCodeError{
-- Expected: []int{204},
-- Actual: 401,
-- }
-- })
+- mockT := new(testing.T)
-
-- if _, ok := err.(*MyError); !ok {
-- t.Errorf("Expected a MyError; got %#v", err)
-- return
+- if !Implements(mockT, (*AssertionTesterInterface)(nil), new(AssertionTesterConformingObject)) {
+- t.Error("Implements method should return true: AssertionTesterConformingObject implements AssertionTesterInterface")
+- }
+- if Implements(mockT, (*AssertionTesterInterface)(nil), new(AssertionTesterNonConformingObject)) {
+- t.Error("Implements method should return false: AssertionTesterNonConformingObject does not implements AssertionTesterInterface")
- }
--}
--
--type MyAccess struct{}
-
--func (my *MyAccess) FirstEndpointUrlByCriteria(ApiCriteria) string {
-- return ""
--}
--func (my *MyAccess) AuthToken() string {
-- return ""
--}
--func (my *MyAccess) Revoke(string) error {
-- return nil
--}
--func (my *MyAccess) Reauthenticate() error {
-- return nil
-}
-
--func TestReauthHandlerUsesSameAccessProvider(t *testing.T) {
-- fakeAccess := &MyAccess{}
-- c := TestContext().WithReauthHandler(func(acc AccessProvider) error {
-- if acc != fakeAccess {
-- t.Errorf("Expected acc = fakeAccess")
-- }
-- return nil
-- })
-- c.WithReauth(fakeAccess, func() error {
-- return &perigee.UnexpectedResponseCodeError{
-- Expected: []int{204},
-- Actual: 401,
-- }
-- })
--}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/scripts/create-environment.sh b/Godeps/_workspace/src/github.com/rackspace/gophercloud/scripts/create-environment.sh
-deleted file mode 100644
-index 6bae6e8..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/scripts/create-environment.sh
-+++ /dev/null
-@@ -1,26 +0,0 @@
--#!/bin/bash
--#
--# This script helps new contributors set up their local workstation for
--# gophercloud development and contributions.
+-func TestIsType(t *testing.T) {
-
--# Create the environment
--export GOPATH=$HOME/go/gophercloud
--mkdir -p $GOPATH
+- mockT := new(testing.T)
-
--# Download gophercloud into that environment
--go get github.com/rackspace/gophercloud
--cd $GOPATH/src/github.com/rackspace/gophercloud
--git checkout master
+- if !IsType(mockT, new(AssertionTesterConformingObject), new(AssertionTesterConformingObject)) {
+- t.Error("IsType should return true: AssertionTesterConformingObject is the same type as AssertionTesterConformingObject")
+- }
+- if IsType(mockT, new(AssertionTesterConformingObject), new(AssertionTesterNonConformingObject)) {
+- t.Error("IsType should return false: AssertionTesterConformingObject is not the same type as AssertionTesterNonConformingObject")
+- }
-
--# Write out the env.sh convenience file.
--cd $GOPATH
--cat <<EOF >env.sh
--#!/bin/bash
--export GOPATH=$(pwd)
--export GOPHERCLOUD=$GOPATH/src/github.com/rackspace/gophercloud
--EOF
--chmod a+x env.sh
+-}
-
--# Make changes immediately available as a convenience.
--. ./env.sh
+-func TestEqual(t *testing.T) {
-
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/scripts/test-all.sh b/Godeps/_workspace/src/github.com/rackspace/gophercloud/scripts/test-all.sh
-deleted file mode 100644
-index 096736f..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/scripts/test-all.sh
-+++ /dev/null
-@@ -1,37 +0,0 @@
--#!/bin/bash
--#
--# This script is responsible for executing all the acceptance tests found in
--# the acceptance/ directory.
+- mockT := new(testing.T)
-
--# Find where _this_ script is running from.
--SCRIPTS=$(dirname $0)
--SCRIPTS=$(cd $SCRIPTS; pwd)
+- if !Equal(mockT, "Hello World", "Hello World") {
+- t.Error("Equal should return true")
+- }
+- if !Equal(mockT, 123, 123) {
+- t.Error("Equal should return true")
+- }
+- if !Equal(mockT, 123.5, 123.5) {
+- t.Error("Equal should return true")
+- }
+- if !Equal(mockT, []byte("Hello World"), []byte("Hello World")) {
+- t.Error("Equal should return true")
+- }
+- if !Equal(mockT, nil, nil) {
+- t.Error("Equal should return true")
+- }
-
--# Locate the acceptance test / examples directory.
--ACCEPTANCE=$(cd $SCRIPTS/../acceptance; pwd)
+-}
-
--# Go workspace path
--WS=$(cd $SCRIPTS/..; pwd)
+-func TestNotNil(t *testing.T) {
-
--# In order to run Go code interactively, we need the GOPATH environment
--# to be set.
--if [ "x$GOPATH" == "x" ]; then
-- export GOPATH=$WS
-- echo "WARNING: You didn't have your GOPATH environment variable set."
-- echo " I'm assuming $GOPATH as its value."
--fi
+- mockT := new(testing.T)
-
--# Run all acceptance tests sequentially.
--# If any test fails, we fail fast.
--LIBS=$(ls $ACCEPTANCE/lib*.go)
--for T in $(ls -1 $ACCEPTANCE/[0-9][0-9]*.go); do
-- if ! [ -x $T ]; then
-- CMD="go run $T $LIBS -quiet"
-- echo "$CMD ..."
-- if ! $CMD ; then
-- echo "- FAILED. Try re-running w/out the -quiet option to see output."
-- exit 1
-- fi
-- fi
--done
+- if !NotNil(mockT, new(AssertionTesterConformingObject)) {
+- t.Error("NotNil should return true: object is not nil")
+- }
+- if NotNil(mockT, nil) {
+- t.Error("NotNil should return false: object is nil")
+- }
-
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/servers.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/servers.go
-deleted file mode 100644
-index 1f6a7a4..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/servers.go
-+++ /dev/null
-@@ -1,807 +0,0 @@
--// TODO(sfalvo): Remove Rackspace-specific Server structure fields and refactor them into a provider-specific access method.
--// Be sure to update godocs accordingly.
+-}
+-
+-func TestNil(t *testing.T) {
-
--package gophercloud
+- mockT := new(testing.T)
-
--import (
-- "fmt"
-- "net/url"
-- "strings"
+- if !Nil(mockT, nil) {
+- t.Error("Nil should return true: object is nil")
+- }
+- if Nil(mockT, new(AssertionTesterConformingObject)) {
+- t.Error("Nil should return false: object is not nil")
+- }
-
-- "github.com/mitchellh/mapstructure"
-- "github.com/racker/perigee"
--)
+-}
-
--// genericServersProvider structures provide the implementation for generic OpenStack-compatible
--// CloudServersProvider interfaces.
--type genericServersProvider struct {
-- // endpoint refers to the provider's API endpoint base URL. This will be used to construct
-- // and issue queries.
-- endpoint string
+-func TestTrue(t *testing.T) {
-
-- // Test context (if any) in which to issue requests.
-- context *Context
+- mockT := new(testing.T)
+-
+- if !True(mockT, true) {
+- t.Error("True should return true")
+- }
+- if True(mockT, false) {
+- t.Error("True should return false")
+- }
-
-- // access associates this API provider with a set of credentials,
-- // which may be automatically renewed if they near expiration.
-- access AccessProvider
-}
-
--// See the CloudServersProvider interface for details.
--func (gcp *genericServersProvider) ListServersByFilter(filter url.Values) ([]Server, error) {
-- var ss []Server
+-func TestFalse(t *testing.T) {
-
-- err := gcp.context.WithReauth(gcp.access, func() error {
-- url := gcp.endpoint + "/servers/detail?" + filter.Encode()
-- return perigee.Get(url, perigee.Options{
-- CustomClient: gcp.context.httpClient,
-- Results: &struct{ Servers *[]Server }{&ss},
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gcp.access.AuthToken(),
-- },
-- })
-- })
-- return ss, err
--}
+- mockT := new(testing.T)
-
--// See the CloudServersProvider interface for details.
--func (gcp *genericServersProvider) ListServersLinksOnly() ([]Server, error) {
-- var ss []Server
+- if !False(mockT, false) {
+- t.Error("False should return true")
+- }
+- if False(mockT, true) {
+- t.Error("False should return false")
+- }
-
-- err := gcp.context.WithReauth(gcp.access, func() error {
-- url := gcp.endpoint + "/servers"
-- return perigee.Get(url, perigee.Options{
-- CustomClient: gcp.context.httpClient,
-- Results: &struct{ Servers *[]Server }{&ss},
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gcp.access.AuthToken(),
-- },
-- })
-- })
-- return ss, err
-}
-
--// See the CloudServersProvider interface for details.
--func (gcp *genericServersProvider) ListServers() ([]Server, error) {
-- var ss []Server
+-func TestExactly(t *testing.T) {
-
-- err := gcp.context.WithReauth(gcp.access, func() error {
-- url := gcp.endpoint + "/servers/detail"
-- return perigee.Get(url, perigee.Options{
-- CustomClient: gcp.context.httpClient,
-- Results: &struct{ Servers *[]Server }{&ss},
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gcp.access.AuthToken(),
-- },
-- })
-- })
+- mockT := new(testing.T)
-
-- // Compatibility with v0.0.x -- we "map" our public and private
-- // addresses into a legacy structure field for the benefit of
-- // earlier software.
+- a := float32(1)
+- b := float64(1)
+- c := float32(1)
+- d := float32(2)
-
-- if err != nil {
-- return ss, err
+- if Exactly(mockT, a, b) {
+- t.Error("Exactly should return false")
+- }
+- if Exactly(mockT, a, d) {
+- t.Error("Exactly should return false")
+- }
+- if !Exactly(mockT, a, c) {
+- t.Error("Exactly should return true")
- }
-
-- for _, s := range ss {
-- err = mapstructure.Decode(s.RawAddresses, &s.Addresses)
-- if err != nil {
-- return ss, err
-- }
+- if Exactly(mockT, nil, a) {
+- t.Error("Exactly should return false")
+- }
+- if Exactly(mockT, a, nil) {
+- t.Error("Exactly should return false")
- }
-
-- return ss, err
-}
-
--// See the CloudServersProvider interface for details.
--func (gsp *genericServersProvider) ServerById(id string) (*Server, error) {
-- var s *Server
--
-- err := gsp.context.WithReauth(gsp.access, func() error {
-- url := gsp.endpoint + "/servers/" + id
-- return perigee.Get(url, perigee.Options{
-- Results: &struct{ Server **Server }{&s},
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gsp.access.AuthToken(),
-- },
-- OkCodes: []int{200},
-- })
-- })
+-func TestNotEqual(t *testing.T) {
-
-- // Compatibility with v0.0.x -- we "map" our public and private
-- // addresses into a legacy structure field for the benefit of
-- // earlier software.
+- mockT := new(testing.T)
-
-- if err != nil {
-- return s, err
+- if !NotEqual(mockT, "Hello World", "Hello World!") {
+- t.Error("NotEqual should return true")
+- }
+- if !NotEqual(mockT, 123, 1234) {
+- t.Error("NotEqual should return true")
+- }
+- if !NotEqual(mockT, 123.5, 123.55) {
+- t.Error("NotEqual should return true")
+- }
+- if !NotEqual(mockT, []byte("Hello World"), []byte("Hello World!")) {
+- t.Error("NotEqual should return true")
- }
+- if !NotEqual(mockT, nil, new(AssertionTesterConformingObject)) {
+- t.Error("NotEqual should return true")
+- }
+-}
-
-- err = mapstructure.Decode(s.RawAddresses, &s.Addresses)
+-func TestContains(t *testing.T) {
+-
+- mockT := new(testing.T)
+-
+- if !Contains(mockT, "Hello World", "Hello") {
+- t.Error("Contains should return true: \"Hello World\" contains \"Hello\"")
+- }
+- if Contains(mockT, "Hello World", "Salut") {
+- t.Error("Contains should return false: \"Hello World\" does not contain \"Salut\"")
+- }
-
-- return s, err
-}
-
--// See the CloudServersProvider interface for details.
--func (gsp *genericServersProvider) CreateServer(ns NewServer) (*NewServer, error) {
-- var s *NewServer
+-func TestNotContains(t *testing.T) {
-
-- err := gsp.context.WithReauth(gsp.access, func() error {
-- ep := gsp.endpoint + "/servers"
-- return perigee.Post(ep, perigee.Options{
-- ReqBody: &struct {
-- Server *NewServer `json:"server"`
-- }{&ns},
-- Results: &struct{ Server **NewServer }{&s},
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gsp.access.AuthToken(),
-- },
-- OkCodes: []int{202},
-- })
-- })
+- mockT := new(testing.T)
-
-- return s, err
--}
+- if !NotContains(mockT, "Hello World", "Hello!") {
+- t.Error("NotContains should return true: \"Hello World\" does not contain \"Hello!\"")
+- }
+- if NotContains(mockT, "Hello World", "Hello") {
+- t.Error("NotContains should return false: \"Hello World\" contains \"Hello\"")
+- }
-
--// See the CloudServersProvider interface for details.
--func (gsp *genericServersProvider) DeleteServerById(id string) error {
-- err := gsp.context.WithReauth(gsp.access, func() error {
-- url := gsp.endpoint + "/servers/" + id
-- return perigee.Delete(url, perigee.Options{
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gsp.access.AuthToken(),
-- },
-- OkCodes: []int{204},
-- })
-- })
-- return err
-}
-
--// See the CloudServersProvider interface for details.
--func (gsp *genericServersProvider) SetAdminPassword(id, pw string) error {
-- err := gsp.context.WithReauth(gsp.access, func() error {
-- url := fmt.Sprintf("%s/servers/%s/action", gsp.endpoint, id)
-- return perigee.Post(url, perigee.Options{
-- ReqBody: &struct {
-- ChangePassword struct {
-- AdminPass string `json:"adminPass"`
-- } `json:"changePassword"`
-- }{
-- struct {
-- AdminPass string `json:"adminPass"`
-- }{pw},
-- },
-- OkCodes: []int{202},
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gsp.access.AuthToken(),
-- },
-- })
-- })
-- return err
--}
+-func TestDidPanic(t *testing.T) {
-
--// See the CloudServersProvider interface for details.
--func (gsp *genericServersProvider) ResizeServer(id, newName, newFlavor, newDiskConfig string) error {
-- err := gsp.context.WithReauth(gsp.access, func() error {
-- url := fmt.Sprintf("%s/servers/%s/action", gsp.endpoint, id)
-- rr := ResizeRequest{
-- Name: newName,
-- FlavorRef: newFlavor,
-- DiskConfig: newDiskConfig,
-- }
-- return perigee.Post(url, perigee.Options{
-- ReqBody: &struct {
-- Resize ResizeRequest `json:"resize"`
-- }{rr},
-- OkCodes: []int{202},
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gsp.access.AuthToken(),
-- },
-- })
-- })
-- return err
--}
+- if funcDidPanic, _ := didPanic(func() {
+- panic("Panic!")
+- }); !funcDidPanic {
+- t.Error("didPanic should return true")
+- }
-
--// See the CloudServersProvider interface for details.
--func (gsp *genericServersProvider) RevertResize(id string) error {
-- err := gsp.context.WithReauth(gsp.access, func() error {
-- url := fmt.Sprintf("%s/servers/%s/action", gsp.endpoint, id)
-- return perigee.Post(url, perigee.Options{
-- ReqBody: &struct {
-- RevertResize *int `json:"revertResize"`
-- }{nil},
-- OkCodes: []int{202},
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gsp.access.AuthToken(),
-- },
-- })
-- })
-- return err
--}
+- if funcDidPanic, _ := didPanic(func() {
+- }); funcDidPanic {
+- t.Error("didPanic should return false")
+- }
-
--// See the CloudServersProvider interface for details.
--func (gsp *genericServersProvider) ConfirmResize(id string) error {
-- err := gsp.context.WithReauth(gsp.access, func() error {
-- url := fmt.Sprintf("%s/servers/%s/action", gsp.endpoint, id)
-- return perigee.Post(url, perigee.Options{
-- ReqBody: &struct {
-- ConfirmResize *int `json:"confirmResize"`
-- }{nil},
-- OkCodes: []int{204},
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gsp.access.AuthToken(),
-- },
-- })
-- })
-- return err
-}
-
--// See the CloudServersProvider interface for details
--func (gsp *genericServersProvider) RebootServer(id string, hard bool) error {
-- return gsp.context.WithReauth(gsp.access, func() error {
-- url := fmt.Sprintf("%s/servers/%s/action", gsp.endpoint, id)
-- types := map[bool]string{false: "SOFT", true: "HARD"}
-- return perigee.Post(url, perigee.Options{
-- ReqBody: &struct {
-- Reboot struct {
-- Type string `json:"type"`
-- } `json:"reboot"`
-- }{
-- struct {
-- Type string `json:"type"`
-- }{types[hard]},
-- },
-- OkCodes: []int{202},
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gsp.access.AuthToken(),
-- },
-- })
-- })
--}
+-func TestPanics(t *testing.T) {
-
--// See the CloudServersProvider interface for details
--func (gsp *genericServersProvider) RescueServer(id string) (string, error) {
-- var pw *string
+- mockT := new(testing.T)
-
-- err := gsp.context.WithReauth(gsp.access, func() error {
-- url := fmt.Sprintf("%s/servers/%s/action", gsp.endpoint, id)
-- return perigee.Post(url, perigee.Options{
-- ReqBody: &struct {
-- Rescue string `json:"rescue"`
-- }{"none"},
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gsp.access.AuthToken(),
-- },
-- Results: &struct {
-- AdminPass **string `json:"adminPass"`
-- }{&pw},
-- })
-- })
-- return *pw, err
--}
+- if !Panics(mockT, func() {
+- panic("Panic!")
+- }) {
+- t.Error("Panics should return true")
+- }
+-
+- if Panics(mockT, func() {
+- }) {
+- t.Error("Panics should return false")
+- }
-
--// See the CloudServersProvider interface for details
--func (gsp *genericServersProvider) UnrescueServer(id string) error {
-- return gsp.context.WithReauth(gsp.access, func() error {
-- url := fmt.Sprintf("%s/servers/%s/action", gsp.endpoint, id)
-- return perigee.Post(url, perigee.Options{
-- ReqBody: &struct {
-- Unrescue *int `json:"unrescue"`
-- }{nil},
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gsp.access.AuthToken(),
-- },
-- OkCodes: []int{202},
-- })
-- })
-}
-
--// See the CloudServersProvider interface for details
--func (gsp *genericServersProvider) UpdateServer(id string, changes NewServerSettings) (*Server, error) {
-- var svr *Server
-- err := gsp.context.WithReauth(gsp.access, func() error {
-- url := fmt.Sprintf("%s/servers/%s", gsp.endpoint, id)
-- return perigee.Put(url, perigee.Options{
-- ReqBody: &struct {
-- Server NewServerSettings `json:"server"`
-- }{changes},
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gsp.access.AuthToken(),
-- },
-- Results: &struct {
-- Server **Server `json:"server"`
-- }{&svr},
-- })
-- })
-- return svr, err
+-func TestNotPanics(t *testing.T) {
+-
+- mockT := new(testing.T)
+-
+- if !NotPanics(mockT, func() {
+- }) {
+- t.Error("NotPanics should return true")
+- }
+-
+- if NotPanics(mockT, func() {
+- panic("Panic!")
+- }) {
+- t.Error("NotPanics should return false")
+- }
+-
-}
-
--// See the CloudServersProvider interface for details.
--func (gsp *genericServersProvider) RebuildServer(id string, ns NewServer) (*Server, error) {
-- var s *Server
+-func TestEqual_Funcs(t *testing.T) {
-
-- err := gsp.context.WithReauth(gsp.access, func() error {
-- ep := fmt.Sprintf("%s/servers/%s/action", gsp.endpoint, id)
-- return perigee.Post(ep, perigee.Options{
-- ReqBody: &struct {
-- Rebuild *NewServer `json:"rebuild"`
-- }{&ns},
-- Results: &struct{ Server **Server }{&s},
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gsp.access.AuthToken(),
-- },
-- OkCodes: []int{202},
-- })
-- })
+- type f func() int
+- var f1 f = func() int { return 1 }
+- var f2 f = func() int { return 2 }
+-
+- var f1_copy f = f1
+-
+- Equal(t, f1_copy, f1, "Funcs are the same and should be considered equal")
+- NotEqual(t, f1, f2, "f1 and f2 are different")
-
-- return s, err
-}
-
--// See the CloudServersProvider interface for details.
--func (gsp *genericServersProvider) ListAddresses(id string) (AddressSet, error) {
-- var pas *AddressSet
-- var statusCode int
+-func TestNoError(t *testing.T) {
-
-- err := gsp.context.WithReauth(gsp.access, func() error {
-- ep := fmt.Sprintf("%s/servers/%s/ips", gsp.endpoint, id)
-- return perigee.Get(ep, perigee.Options{
-- Results: &struct{ Addresses **AddressSet }{&pas},
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gsp.access.AuthToken(),
-- },
-- OkCodes: []int{200, 203},
-- StatusCode: &statusCode,
-- })
-- })
+- mockT := new(testing.T)
-
-- if err != nil {
-- if statusCode == 203 {
-- err = WarnUnauthoritative
-- }
-- }
+- // start with a nil error
+- var err error = nil
+-
+- True(t, NoError(mockT, err), "NoError should return True for nil arg")
+-
+- // now set an error
+- err = errors.New("Some error")
+-
+- False(t, NoError(mockT, err), "NoError with error should return False")
-
-- return *pas, err
-}
-
--// See the CloudServersProvider interface for details.
--func (gsp *genericServersProvider) ListAddressesByNetwork(id, networkLabel string) (NetworkAddress, error) {
-- pas := make(NetworkAddress)
-- var statusCode int
+-func TestError(t *testing.T) {
-
-- err := gsp.context.WithReauth(gsp.access, func() error {
-- ep := fmt.Sprintf("%s/servers/%s/ips/%s", gsp.endpoint, id, networkLabel)
-- return perigee.Get(ep, perigee.Options{
-- Results: &pas,
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gsp.access.AuthToken(),
-- },
-- OkCodes: []int{200, 203},
-- StatusCode: &statusCode,
-- })
-- })
+- mockT := new(testing.T)
-
-- if err != nil {
-- if statusCode == 203 {
-- err = WarnUnauthoritative
-- }
-- }
+- // start with a nil error
+- var err error = nil
+-
+- False(t, Error(mockT, err), "Error should return False for nil arg")
+-
+- // now set an error
+- err = errors.New("Some error")
+-
+- True(t, Error(mockT, err), "Error with error should return True")
-
-- return pas, err
-}
-
--// See the CloudServersProvider interface for details.
--func (gsp *genericServersProvider) CreateImage(id string, ci CreateImage) (string, error) {
-- response, err := gsp.context.ResponseWithReauth(gsp.access, func() (*perigee.Response, error) {
-- ep := fmt.Sprintf("%s/servers/%s/action", gsp.endpoint, id)
-- return perigee.Request("POST", ep, perigee.Options{
-- ReqBody: &struct {
-- CreateImage *CreateImage `json:"createImage"`
-- }{&ci},
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gsp.access.AuthToken(),
-- },
-- OkCodes: []int{200, 202},
-- })
-- })
+-func TestEqualError(t *testing.T) {
+- mockT := new(testing.T)
-
-- if err != nil {
-- return "", err
-- }
-- location, err := response.HttpResponse.Location()
-- if err != nil {
-- return "", err
-- }
+- // start with a nil error
+- var err error = nil
+- False(t, EqualError(mockT, err, ""),
+- "EqualError should return false for nil arg")
-
-- // Return the last element of the location which is the image id
-- locationArr := strings.Split(location.Path, "/")
-- return locationArr[len(locationArr)-1], err
+- // now set an error
+- err = errors.New("Some error")
+- False(t, EqualError(mockT, err, "Not some error"),
+- "EqualError should return false for different error string")
+- True(t, EqualError(mockT, err, "Some error"),
+- "EqualError should return true")
-}
-
--// See the CloudServersProvider interface for details.
--func (gsp *genericServersProvider) ListSecurityGroups() ([]SecurityGroup, error) {
-- var sgs []SecurityGroup
+-func Test_isEmpty(t *testing.T) {
-
-- err := gsp.context.WithReauth(gsp.access, func() error {
-- ep := fmt.Sprintf("%s/os-security-groups", gsp.endpoint)
-- return perigee.Get(ep, perigee.Options{
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gsp.access.AuthToken(),
-- },
-- Results: &struct {
-- SecurityGroups *[]SecurityGroup `json:"security_groups"`
-- }{&sgs},
-- })
-- })
-- return sgs, err
--}
+- True(t, isEmpty(""))
+- True(t, isEmpty(nil))
+- True(t, isEmpty([]string{}))
+- True(t, isEmpty(0))
+- True(t, isEmpty(false))
+- True(t, isEmpty(map[string]string{}))
-
--// See the CloudServersProvider interface for details.
--func (gsp *genericServersProvider) CreateSecurityGroup(desired SecurityGroup) (*SecurityGroup, error) {
-- var actual *SecurityGroup
+- False(t, isEmpty("something"))
+- False(t, isEmpty(errors.New("something")))
+- False(t, isEmpty([]string{"something"}))
+- False(t, isEmpty(1))
+- False(t, isEmpty(true))
+- False(t, isEmpty(map[string]string{"Hello": "World"}))
-
-- err := gsp.context.WithReauth(gsp.access, func() error {
-- ep := fmt.Sprintf("%s/os-security-groups", gsp.endpoint)
-- return perigee.Post(ep, perigee.Options{
-- ReqBody: struct {
-- AddSecurityGroup SecurityGroup `json:"security_group"`
-- }{desired},
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gsp.access.AuthToken(),
-- },
-- Results: &struct {
-- SecurityGroup **SecurityGroup `json:"security_group"`
-- }{&actual},
-- })
-- })
-- return actual, err
-}
-
--// See the CloudServersProvider interface for details.
--func (gsp *genericServersProvider) ListSecurityGroupsByServerId(id string) ([]SecurityGroup, error) {
-- var sgs []SecurityGroup
+-func TestEmpty(t *testing.T) {
-
-- err := gsp.context.WithReauth(gsp.access, func() error {
-- ep := fmt.Sprintf("%s/servers/%s/os-security-groups", gsp.endpoint, id)
-- return perigee.Get(ep, perigee.Options{
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gsp.access.AuthToken(),
-- },
-- Results: &struct {
-- SecurityGroups *[]SecurityGroup `json:"security_groups"`
-- }{&sgs},
-- })
-- })
-- return sgs, err
--}
+- mockT := new(testing.T)
-
--// See the CloudServersProvider interface for details.
--func (gsp *genericServersProvider) SecurityGroupById(id int) (*SecurityGroup, error) {
-- var actual *SecurityGroup
+- True(t, Empty(mockT, ""), "Empty string is empty")
+- True(t, Empty(mockT, nil), "Nil is empty")
+- True(t, Empty(mockT, []string{}), "Empty string array is empty")
+- True(t, Empty(mockT, 0), "Zero int value is empty")
+- True(t, Empty(mockT, false), "False value is empty")
-
-- err := gsp.context.WithReauth(gsp.access, func() error {
-- ep := fmt.Sprintf("%s/os-security-groups/%d", gsp.endpoint, id)
-- return perigee.Get(ep, perigee.Options{
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gsp.access.AuthToken(),
-- },
-- Results: &struct {
-- SecurityGroup **SecurityGroup `json:"security_group"`
-- }{&actual},
-- })
-- })
-- return actual, err
--}
+- False(t, Empty(mockT, "something"), "Non Empty string is not empty")
+- False(t, Empty(mockT, errors.New("something")), "Non nil object is not empty")
+- False(t, Empty(mockT, []string{"something"}), "Non empty string array is not empty")
+- False(t, Empty(mockT, 1), "Non-zero int value is not empty")
+- False(t, Empty(mockT, true), "True value is not empty")
-
--// See the CloudServersProvider interface for details.
--func (gsp *genericServersProvider) DeleteSecurityGroupById(id int) error {
-- err := gsp.context.WithReauth(gsp.access, func() error {
-- ep := fmt.Sprintf("%s/os-security-groups/%d", gsp.endpoint, id)
-- return perigee.Delete(ep, perigee.Options{
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gsp.access.AuthToken(),
-- },
-- OkCodes: []int{202},
-- })
-- })
-- return err
-}
-
--// See the CloudServersProvider interface for details.
--func (gsp *genericServersProvider) ListDefaultSGRules() ([]SGRule, error) {
-- var sgrs []SGRule
-- err := gsp.context.WithReauth(gsp.access, func() error {
-- ep := fmt.Sprintf("%s/os-security-group-default-rules", gsp.endpoint)
-- return perigee.Get(ep, perigee.Options{
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gsp.access.AuthToken(),
-- },
-- Results: &struct{ Security_group_default_rules *[]SGRule }{&sgrs},
-- })
-- })
-- return sgrs, err
--}
+-func TestNotEmpty(t *testing.T) {
-
--// See the CloudServersProvider interface for details.
--func (gsp *genericServersProvider) CreateDefaultSGRule(r SGRule) (*SGRule, error) {
-- var sgr *SGRule
-- err := gsp.context.WithReauth(gsp.access, func() error {
-- ep := fmt.Sprintf("%s/os-security-group-default-rules", gsp.endpoint)
-- return perigee.Post(ep, perigee.Options{
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gsp.access.AuthToken(),
-- },
-- Results: &struct{ Security_group_default_rule **SGRule }{&sgr},
-- ReqBody: struct {
-- Security_group_default_rule SGRule `json:"security_group_default_rule"`
-- }{r},
-- })
-- })
-- return sgr, err
--}
+- mockT := new(testing.T)
-
--// See the CloudServersProvider interface for details.
--func (gsp *genericServersProvider) GetSGRule(id string) (*SGRule, error) {
-- var sgr *SGRule
-- err := gsp.context.WithReauth(gsp.access, func() error {
-- ep := fmt.Sprintf("%s/os-security-group-default-rules/%s", gsp.endpoint, id)
-- return perigee.Get(ep, perigee.Options{
-- MoreHeaders: map[string]string{
-- "X-Auth-Token": gsp.access.AuthToken(),
-- },
-- Results: &struct{ Security_group_default_rule **SGRule }{&sgr},
-- })
-- })
-- return sgr, err
--}
+- False(t, NotEmpty(mockT, ""), "Empty string is empty")
+- False(t, NotEmpty(mockT, nil), "Nil is empty")
+- False(t, NotEmpty(mockT, []string{}), "Empty string array is empty")
+- False(t, NotEmpty(mockT, 0), "Zero int value is empty")
+- False(t, NotEmpty(mockT, false), "False value is empty")
-
--// SecurityGroup provides a description of a security group, including all its rules.
--type SecurityGroup struct {
-- Description string `json:"description,omitempty"`
-- Id int `json:"id,omitempty"`
-- Name string `json:"name,omitempty"`
-- Rules []SGRule `json:"rules,omitempty"`
-- TenantId string `json:"tenant_id,omitempty"`
--}
+- True(t, NotEmpty(mockT, "something"), "Non Empty string is not empty")
+- True(t, NotEmpty(mockT, errors.New("something")), "Non nil object is not empty")
+- True(t, NotEmpty(mockT, []string{"something"}), "Non empty string array is not empty")
+- True(t, NotEmpty(mockT, 1), "Non-zero int value is not empty")
+- True(t, NotEmpty(mockT, true), "True value is not empty")
-
--// SGRule encapsulates a single rule which applies to a security group.
--// This definition is just a guess, based on the documentation found in another extension here: http://docs.openstack.org/api/openstack-compute/2/content/GET_os-security-group-default-rules-v2_listSecGroupDefaultRules_v2__tenant_id__os-security-group-rules_ext-os-security-group-default-rules.html
--type SGRule struct {
-- FromPort int `json:"from_port,omitempty"`
-- Id int `json:"id,omitempty"`
-- IpProtocol string `json:"ip_protocol,omitempty"`
-- IpRange map[string]interface{} `json:"ip_range,omitempty"`
-- ToPort int `json:"to_port,omitempty"`
-}
-
--// RaxBandwidth provides measurement of server bandwidth consumed over a given audit interval.
--type RaxBandwidth struct {
-- AuditPeriodEnd string `json:"audit_period_end"`
-- AuditPeriodStart string `json:"audit_period_start"`
-- BandwidthInbound int64 `json:"bandwidth_inbound"`
-- BandwidthOutbound int64 `json:"bandwidth_outbound"`
-- Interface string `json:"interface"`
--}
+-func TestWithinDuration(t *testing.T) {
-
--// A VersionedAddress denotes either an IPv4 or IPv6 (depending on version indicated)
--// address.
--type VersionedAddress struct {
-- Addr string `json:"addr"`
-- Version int `json:"version"`
--}
+- mockT := new(testing.T)
+- a := time.Now()
+- b := a.Add(10 * time.Second)
-
--// An AddressSet provides a set of public and private IP addresses for a resource.
--// Each address has a version to identify if IPv4 or IPv6.
--type AddressSet struct {
-- Public []VersionedAddress `json:"public"`
-- Private []VersionedAddress `json:"private"`
--}
+- True(t, WithinDuration(mockT, a, b, 10*time.Second), "A 10s difference is within a 10s time difference")
+- True(t, WithinDuration(mockT, b, a, 10*time.Second), "A 10s difference is within a 10s time difference")
-
--type NetworkAddress map[string][]VersionedAddress
+- False(t, WithinDuration(mockT, a, b, 9*time.Second), "A 10s difference is not within a 9s time difference")
+- False(t, WithinDuration(mockT, b, a, 9*time.Second), "A 10s difference is not within a 9s time difference")
-
--// Server records represent (virtual) hardware instances (not configurations) accessible by the user.
+- False(t, WithinDuration(mockT, a, b, -9*time.Second), "A 10s difference is not within a 9s time difference")
+- False(t, WithinDuration(mockT, b, a, -9*time.Second), "A 10s difference is not within a 9s time difference")
+-
+- False(t, WithinDuration(mockT, a, b, -11*time.Second), "A 10s difference is not within a 9s time difference")
+- False(t, WithinDuration(mockT, b, a, -11*time.Second), "A 10s difference is not within a 9s time difference")
+-}
+diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/assert/doc.go b/Godeps/_workspace/src/github.com/stretchr/testify/assert/doc.go
+deleted file mode 100644
+index 25f699b..0000000
+--- a/Godeps/_workspace/src/github.com/stretchr/testify/assert/doc.go
++++ /dev/null
+@@ -1,74 +0,0 @@
+-// A set of comprehensive testing tools for use with the normal Go testing system.
-//
--// The AccessIPv4 / AccessIPv6 fields provides IP addresses for the server in the IPv4 or IPv6 format, respectively.
+-// Example Usage
-//
--// Addresses provides addresses for any attached isolated networks.
--// The version field indicates whether the IP address is version 4 or 6.
--// Note: only public and private pools appear here.
--// To get the complete set, use the AllAddressPools() method instead.
+-// The following is a complete example using assert in a standard test function:
+-// import (
+-// "testing"
+-// "github.com/stretchr/testify/assert"
+-// )
-//
--// Created tells when the server entity was created.
+-// func TestSomething(t *testing.T) {
-//
--// The Flavor field includes the flavor ID and flavor links.
+-// var a string = "Hello"
+-// var b string = "Hello"
-//
--// The compute provisioning algorithm has an anti-affinity property that
--// attempts to spread customer VMs across hosts.
--// Under certain situations,
--// VMs from the same customer might be placed on the same host.
--// The HostId field represents the host your server runs on and
--// can be used to determine this scenario if it is relevant to your application.
--// Note that HostId is unique only per account; it is not globally unique.
+-// assert.Equal(t, a, b, "The two words should be the same.")
-//
--// Id provides the server's unique identifier.
--// This field must be treated opaquely.
+-// }
-//
--// Image indicates which image is installed on the server.
+-// Assertions
-//
--// Links provides one or more means of accessing the server.
+-// Assertions allow you to easily write test code, and are global funcs in the `assert` package.
+-// All assertion functions take, as the first argument, the `*testing.T` object provided by the
+-// testing framework. This allows the assertion funcs to write the failings and other details to
+-// the correct place.
-//
--// Metadata provides a small key-value store for application-specific information.
+-// Every assertion function also takes an optional string message as the final argument,
+-// allowing custom error messages to be appended to the message the assertion method outputs.
-//
--// Name provides a human-readable name for the server.
+-// Here is an overview of the assert functions:
-//
--// Progress indicates how far along it is towards being provisioned.
--// 100 represents complete, while 0 represents just beginning.
+-// assert.Equal(t, expected, actual [, message [, format-args])
-//
--// Status provides an indication of what the server's doing at the moment.
--// A server will be in ACTIVE state if it's ready for use.
+-// assert.NotEqual(t, notExpected, actual [, message [, format-args]])
-//
--// OsDcfDiskConfig indicates the server's boot volume configuration.
--// Valid values are:
--// AUTO
--// ----
--// The server is built with a single partition the size of the target flavor disk.
--// The file system is automatically adjusted to fit the entire partition.
--// This keeps things simple and automated.
--// AUTO is valid only for images and servers with a single partition that use the EXT3 file system.
--// This is the default setting for applicable Rackspace base images.
+-// assert.True(t, actualBool [, message [, format-args]])
-//
--// MANUAL
--// ------
--// The server is built using whatever partition scheme and file system is in the source image.
--// If the target flavor disk is larger,
--// the remaining disk space is left unpartitioned.
--// This enables images to have non-EXT3 file systems, multiple partitions, and so on,
--// and enables you to manage the disk configuration.
+-// assert.False(t, actualBool [, message [, format-args]])
-//
--// RaxBandwidth provides measures of the server's inbound and outbound bandwidth per interface.
+-// assert.Nil(t, actualObject [, message [, format-args]])
-//
--// OsExtStsPowerState provides an indication of the server's power.
--// This field appears to be a set of flag bits:
+-// assert.NotNil(t, actualObject [, message [, format-args]])
-//
--// ... 4 3 2 1 0
--// +--//--+---+---+---+---+
--// | .... | 0 | S | 0 | I |
--// +--//--+---+---+---+---+
--// | |
--// | +--- 0=Instance is down.
--// | 1=Instance is up.
--// |
--// +----------- 0=Server is switched ON.
--// 1=Server is switched OFF.
--// (note reverse logic.)
+-// assert.Empty(t, actualObject [, message [, format-args]])
-//
--// Unused bits should be ignored when read, and written as 0 for future compatibility.
+-// assert.NotEmpty(t, actualObject [, message [, format-args]])
-//
--// OsExtStsTaskState and OsExtStsVmState work together
--// to provide visibility in the provisioning process for the instance.
--// Consult Rackspace documentation at
--// http://docs.rackspace.com/servers/api/v2/cs-devguide/content/ch_extensions.html#ext_status
--// for more details. It's too lengthy to include here.
--type Server struct {
-- AccessIPv4 string `json:"accessIPv4"`
-- AccessIPv6 string `json:"accessIPv6"`
-- Addresses AddressSet
-- Created string `json:"created"`
-- Flavor FlavorLink `json:"flavor"`
-- HostId string `json:"hostId"`
-- Id string `json:"id"`
-- Image ImageLink `json:"image"`
-- Links []Link `json:"links"`
-- Metadata map[string]string `json:"metadata"`
-- Name string `json:"name"`
-- Progress int `json:"progress"`
-- Status string `json:"status"`
-- TenantId string `json:"tenant_id"`
-- Updated string `json:"updated"`
-- UserId string `json:"user_id"`
-- OsDcfDiskConfig string `json:"OS-DCF:diskConfig"`
-- RaxBandwidth []RaxBandwidth `json:"rax-bandwidth:bandwidth"`
-- OsExtStsPowerState int `json:"OS-EXT-STS:power_state"`
-- OsExtStsTaskState string `json:"OS-EXT-STS:task_state"`
-- OsExtStsVmState string `json:"OS-EXT-STS:vm_state"`
--
-- RawAddresses map[string]interface{} `json:"addresses"`
--}
+-// assert.Error(t, errorObject [, message [, format-args]])
+-//
+-// assert.NoError(t, errorObject [, message [, format-args]])
+-//
+-// assert.Implements(t, (*MyInterface)(nil), new(MyObject) [,message [, format-args]])
+-//
+-// assert.IsType(t, expectedObject, actualObject [, message [, format-args]])
+-//
+-// assert.Contains(t, string, substring [, message [, format-args]])
+-//
+-// assert.NotContains(t, string, substring [, message [, format-args]])
+-//
+-// assert.Panics(t, func(){
+-//
+-// // call code that should panic
+-//
+-// } [, message [, format-args]])
+-//
+-// assert.NotPanics(t, func(){
+-//
+-// // call code that should not panic
+-//
+-// } [, message [, format-args]])
+-//
+-// assert.WithinDuration(t, timeA, timeB, deltaTime, [, message [, format-args]])
-
--// AllAddressPools returns a complete set of address pools available on the server.
--// The name of each pool supported keys the map.
--// The value of the map contains the addresses provided in the corresponding pool.
--func (s *Server) AllAddressPools() (map[string][]VersionedAddress, error) {
-- pools := make(map[string][]VersionedAddress, 0)
-- for pool, subtree := range s.RawAddresses {
-- addresses := make([]VersionedAddress, 0)
-- err := mapstructure.Decode(subtree, &addresses)
-- if err != nil {
-- return nil, err
-- }
-- pools[pool] = addresses
-- }
-- return pools, nil
--}
+-package assert
+diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/assert/errors.go b/Godeps/_workspace/src/github.com/stretchr/testify/assert/errors.go
+deleted file mode 100644
+index da004d1..0000000
+--- a/Godeps/_workspace/src/github.com/stretchr/testify/assert/errors.go
++++ /dev/null
+@@ -1,10 +0,0 @@
+-package assert
-
--// NewServerSettings structures record those fields of the Server structure to change
--// when updating a server (see UpdateServer method).
--type NewServerSettings struct {
-- Name string `json:"name,omitempty"`
-- AccessIPv4 string `json:"accessIPv4,omitempty"`
-- AccessIPv6 string `json:"accessIPv6,omitempty"`
--}
+-import (
+- "errors"
+-)
-
--// NewServer structures are used for both requests and responses.
--// The fields discussed below are relevent for server-creation purposes.
+-// AnError is an error instance useful for testing. If the code does not care
+-// about error specifics, and only needs to return the error for example, this
+-// error should be used to make the test code more readable.
+-var AnError error = errors.New("assert.AnError general error for testing.")
+diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/mock/doc.go b/Godeps/_workspace/src/github.com/stretchr/testify/mock/doc.go
+deleted file mode 100644
+index 7d4e7b8..0000000
+--- a/Godeps/_workspace/src/github.com/stretchr/testify/mock/doc.go
++++ /dev/null
+@@ -1,43 +0,0 @@
+-// Provides a system by which it is possible to mock your objects and verify calls are happening as expected.
-//
--// The Name field contains the desired name of the server.
--// Note that (at present) Rackspace permits more than one server with the same name;
--// however, software should not depend on this.
--// Not only will Rackspace support thank you, so will your own devops engineers.
--// A name is required.
+-// Example Usage
-//
--// The ImageRef field contains the ID of the desired software image to place on the server.
--// This ID must be found in the image slice returned by the Images() function.
--// This field is required.
+-// The mock package provides an object, Mock, that tracks activity on another object. It is usually
+-// embedded into a test object as shown below:
-//
--// The FlavorRef field contains the ID of the server configuration desired for deployment.
--// This ID must be found in the flavor slice returned by the Flavors() function.
--// This field is required.
+-// type MyTestObject struct {
+-// // add a Mock object instance
+-// mock.Mock
-//
--// For OsDcfDiskConfig, refer to the Image or Server structure documentation.
--// This field defaults to "AUTO" if not explicitly provided.
+-// // other fields go here as normal
+-// }
-//
--// Metadata contains a small key/value association of arbitrary data.
--// Neither Rackspace nor OpenStack places significance on this field in any way.
--// This field defaults to an empty map if not provided.
+-// When implementing the methods of an interface, you wire your functions up
+-// to call the Mock.Called(args...) method, and return the appropriate values.
-//
--// Personality specifies the contents of certain files in the server's filesystem.
--// The files and their contents are mapped through a slice of FileConfig structures.
--// If not provided, all filesystem entities retain their image-specific configuration.
+-// For example, to mock a method that saves the name and age of a person and returns
+-// the year of their birth or an error, you might write this:
-//
--// Networks specifies an affinity for the server's various networks and interfaces.
--// Networks are identified through UUIDs; see NetworkConfig structure documentation for more details.
--// If not provided, network affinity is determined automatically.
+-// func (o *MyTestObject) SavePersonDetails(firstname, lastname string, age int) (int, error) {
+-// args := o.Mock.Called(firstname, lastname, age)
+-// return args.Int(0), args.Error(1)
+-// }
-//
--// The AdminPass field may be used to provide a root- or administrator-password
--// during the server provisioning process.
--// If not provided, a random password will be automatically generated and returned in this field.
+-// The Int, Error and Bool methods are examples of strongly typed getters that take the argument
+-// index position. Given this argument list:
-//
--// The following fields are intended to be used to communicate certain results about the server being provisioned.
--// When attempting to create a new server, these fields MUST not be provided.
--// They'll be filled in by the response received from the Rackspace APIs.
+-// (12, true, "Something")
-//
--// The Id field contains the server's unique identifier.
--// The identifier's scope is best assumed to be bound by the user's account, unless other arrangements have been made with Rackspace.
+-// You could read them out strongly typed like this:
-//
--// The SecurityGroup field allows the user to specify a security group at launch.
+-// args.Int(0)
+-// args.Bool(1)
+-// args.String(2)
-//
--// Any Links provided are used to refer to the server specifically by URL.
--// These links are useful for making additional REST calls not explicitly supported by Gorax.
--type NewServer struct {
-- Name string `json:"name,omitempty"`
-- ImageRef string `json:"imageRef,omitempty"`
-- FlavorRef string `json:"flavorRef,omitempty"`
-- Metadata map[string]string `json:"metadata,omitempty"`
-- Personality []FileConfig `json:"personality,omitempty"`
-- Networks []NetworkConfig `json:"networks,omitempty"`
-- AdminPass string `json:"adminPass,omitempty"`
-- KeyPairName string `json:"key_name,omitempty"`
-- Id string `json:"id,omitempty"`
-- Links []Link `json:"links,omitempty"`
-- OsDcfDiskConfig string `json:"OS-DCF:diskConfig,omitempty"`
-- SecurityGroup []map[string]interface{} `json:"security_groups,omitempty"`
-- ConfigDrive bool `json:"config_drive"`
-- UserData string `json:"user_data"`
--}
--
--// ResizeRequest structures are used internally to encode to JSON the parameters required to resize a server instance.
--// Client applications will not use this structure (no API accepts an instance of this structure).
--// See the Region method ResizeServer() for more details on how to resize a server.
--type ResizeRequest struct {
-- Name string `json:"name,omitempty"`
-- FlavorRef string `json:"flavorRef"`
-- DiskConfig string `json:"OS-DCF:diskConfig,omitempty"`
--}
--
--type CreateImage struct {
-- Name string `json:"name"`
-- Metadata map[string]string `json:"metadata,omitempty"`
--}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/servers_test.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/servers_test.go
+-// For objects of your own type, use the generic Arguments.Get(index) method and make a type assertion:
+-//
+-// return args.Get(0).(*MyObject), args.Get(1).(*AnotherObjectOfMine)
+-//
+-// This may cause a panic if the object you are getting is nil (the type assertion will fail), in those
+-// cases you should check for nil first.
+-package mock
+diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/mock/mock.go b/Godeps/_workspace/src/github.com/stretchr/testify/mock/mock.go
deleted file mode 100644
-index 60c71c8..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/servers_test.go
+index 4320e6f..0000000
+--- a/Godeps/_workspace/src/github.com/stretchr/testify/mock/mock.go
+++ /dev/null
-@@ -1,54 +0,0 @@
--package gophercloud
+@@ -1,505 +0,0 @@
+-package mock
-
-import (
-- "net/http"
-- "testing"
+- "fmt"
+- "github.com/stretchr/objx"
+- "github.com/stretchr/testify/assert"
+- "reflect"
+- "runtime"
+- "strings"
-)
-
--type testAccess struct {
-- public, internal string
-- calledFirstEndpointByCriteria int
+-// TestingT is an interface wrapper around *testing.T
+-type TestingT interface {
+- Logf(format string, args ...interface{})
+- Errorf(format string, args ...interface{})
-}
-
--func (ta *testAccess) FirstEndpointUrlByCriteria(ac ApiCriteria) string {
-- ta.calledFirstEndpointByCriteria++
-- urls := []string{ta.public, ta.internal}
-- return urls[ac.UrlChoice]
--}
+-/*
+- Call
+-*/
-
--func (ta *testAccess) AuthToken() string {
-- return ""
--}
+-// Call represents a method call and is used for setting expectations,
+-// as well as recording activity.
+-type Call struct {
-
--func (ta *testAccess) Revoke(string) error {
-- return nil
--}
+- // The name of the method that was or will be called.
+- Method string
-
--func (ta *testAccess) Reauthenticate() error {
-- return nil
+- // Holds the arguments of the method.
+- Arguments Arguments
+-
+- // Holds the arguments that should be returned when
+- // this method is called.
+- ReturnArguments Arguments
+-
+- // The number of times to return the return arguments when setting
+- // expectations. 0 means to always return the value.
+- Repeatability int
-}
-
--func TestGetServersApi(t *testing.T) {
-- c := TestContext().UseCustomClient(&http.Client{Transport: newTransport().WithResponse("Hello")})
+-// Mock is the workhorse used to track activity on another object.
+-// For an example of its usage, refer to the "Example Usage" section at the top of this document.
+-type Mock struct {
-
-- acc := &testAccess{
-- public: "http://localhost:8080",
-- internal: "http://localhost:8086",
-- }
+- // The method name that is currently
+- // being referred to by the On method.
+- onMethodName string
-
-- _, err := c.ServersApi(acc, ApiCriteria{
-- Name: "cloudComputeOpenStack",
-- Region: "dfw",
-- VersionId: "2",
-- })
+- // An array of the arguments that are
+- // currently being referred to by the On method.
+- onMethodArguments Arguments
-
-- if err != nil {
-- t.Error(err)
-- return
-- }
+- // Represents the calls that are expected of
+- // an object.
+- ExpectedCalls []Call
-
-- if acc.calledFirstEndpointByCriteria != 1 {
-- t.Error("Expected FirstEndpointByCriteria to be called")
-- return
+- // Holds the calls that were made to this mocked object.
+- Calls []Call
+-
+- // TestData holds any data that might be useful for testing. Testify ignores
+- // this data completely allowing you to do whatever you like with it.
+- testData objx.Map
+-}
+-
+-// TestData holds any data that might be useful for testing. Testify ignores
+-// this data completely allowing you to do whatever you like with it.
+-func (m *Mock) TestData() objx.Map {
+-
+- if m.testData == nil {
+- m.testData = make(objx.Map)
- }
+-
+- return m.testData
-}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/service_catalog.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/service_catalog.go
-deleted file mode 100644
-index e6cf4a0..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/service_catalog.go
-+++ /dev/null
-@@ -1,75 +0,0 @@
--package gophercloud
-
--import (
-- "os"
-- "strings"
--)
+-/*
+- Setting expectations
+-*/
-
--// ApiCriteria provides one or more criteria for the SDK to look for appropriate endpoints.
--// Fields left unspecified or otherwise set to their zero-values are assumed to not be
--// relevant, and do not participate in the endpoint search.
+-// On starts a description of an expectation of the specified method
+-// being called.
-//
--// Name specifies the desired service catalog entry name.
--// Type specifies the desired service catalog entry type.
--// Region specifies the desired endpoint region.
--// If unset, Gophercloud will try to use the region set in the
--// OS_REGION_NAME environment variable. If that's not set,
--// region comparison will not occur. If OS_REGION_NAME is set
--// and IgnoreEnvVars is also set, OS_REGION_NAME will be ignored.
--// VersionId specifies the desired version of the endpoint.
--// Note that this field is matched exactly, and is (at present)
--// opaque to Gophercloud. Thus, requesting a version 2
--// endpoint will _not_ match a version 3 endpoint.
--// The UrlChoice field inidicates whether or not gophercloud
--// should use the public or internal endpoint URL if a
--// candidate endpoint is found.
--// IgnoreEnvVars instructs Gophercloud to ignore helpful environment variables.
--type ApiCriteria struct {
-- Name string
-- Type string
-- Region string
-- VersionId string
-- UrlChoice int
-- IgnoreEnvVars bool
+-// Mock.On("MyMethod", arg1, arg2)
+-func (m *Mock) On(methodName string, arguments ...interface{}) *Mock {
+- m.onMethodName = methodName
+- m.onMethodArguments = arguments
+- return m
-}
-
--// The choices available for UrlChoice. See the ApiCriteria structure for details.
--const (
-- PublicURL = iota
-- InternalURL
--)
+-// Return finishes a description of an expectation of the method (and arguments)
+-// specified in the most recent On method call.
+-//
+-// Mock.On("MyMethod", arg1, arg2).Return(returnArg1, returnArg2)
+-func (m *Mock) Return(returnArguments ...interface{}) *Mock {
+- m.ExpectedCalls = append(m.ExpectedCalls, Call{m.onMethodName, m.onMethodArguments, returnArguments, 0})
+- return m
+-}
-
--// Given a set of criteria to match on, locate the first candidate endpoint
--// in the provided service catalog.
+-// Once indicates that that the mock should only return the value once.
-//
--// If nothing found, the result will be a zero-valued EntryEndpoint (all URLs
--// set to "").
--func FindFirstEndpointByCriteria(entries []CatalogEntry, ac ApiCriteria) EntryEndpoint {
-- rgn := strings.ToUpper(ac.Region)
-- if (rgn == "") && !ac.IgnoreEnvVars {
-- rgn = os.Getenv("OS_REGION_NAME")
-- }
+-// Mock.On("MyMethod", arg1, arg2).Return(returnArg1, returnArg2).Once()
+-func (m *Mock) Once() {
+- m.ExpectedCalls[len(m.ExpectedCalls)-1].Repeatability = 1
+-}
-
-- for _, entry := range entries {
-- if (ac.Name != "") && (ac.Name != entry.Name) {
-- continue
-- }
+-// Twice indicates that that the mock should only return the value twice.
+-//
+-// Mock.On("MyMethod", arg1, arg2).Return(returnArg1, returnArg2).Twice()
+-func (m *Mock) Twice() {
+- m.ExpectedCalls[len(m.ExpectedCalls)-1].Repeatability = 2
+-}
-
-- if (ac.Type != "") && (ac.Type != entry.Type) {
-- continue
-- }
+-// Times indicates that that the mock should only return the indicated number
+-// of times.
+-//
+-// Mock.On("MyMethod", arg1, arg2).Return(returnArg1, returnArg2).Times(5)
+-func (m *Mock) Times(i int) {
+- m.ExpectedCalls[len(m.ExpectedCalls)-1].Repeatability = i
+-}
-
-- for _, endpoint := range entry.Endpoints {
-- if (rgn != "") && (rgn != strings.ToUpper(endpoint.Region)) {
-- continue
-- }
+-/*
+- Recording and responding to activity
+-*/
-
-- if (ac.VersionId != "") && (ac.VersionId != endpoint.VersionId) {
-- continue
+-func (m *Mock) findExpectedCall(method string, arguments ...interface{}) (int, *Call) {
+- for i, call := range m.ExpectedCalls {
+- if call.Method == method && call.Repeatability > -1 {
+-
+- _, diffCount := call.Arguments.Diff(arguments)
+- if diffCount == 0 {
+- return i, &call
- }
-
-- return endpoint
- }
- }
-- return EntryEndpoint{}
+- return -1, nil
-}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/service_catalog_test.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/service_catalog_test.go
-deleted file mode 100644
-index b78f01f..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/service_catalog_test.go
-+++ /dev/null
-@@ -1,190 +0,0 @@
--package gophercloud
-
--import (
-- "os"
-- "testing"
--)
+-func (m *Mock) findClosestCall(method string, arguments ...interface{}) (bool, *Call) {
-
--// TestFFEBCViaEnvVariable exercises only those calls where a region
--// parameter is required, but is provided by an environment variable.
--func TestFFEBCViaEnvVariable(t *testing.T) {
-- changeRegion("RGN")
+- diffCount := 0
+- var closestCall *Call = nil
-
-- endpoint := FindFirstEndpointByCriteria(
-- catalog("test", "compute", "http://localhost", "", ""),
-- ApiCriteria{Name: "test"},
-- )
-- if endpoint.PublicURL != "" {
-- t.Error("If provided, the Region qualifier must exclude endpoints with missing or mismatching regions.")
-- return
-- }
+- for _, call := range m.ExpectedCalls {
+- if call.Method == method {
-
-- endpoint = FindFirstEndpointByCriteria(
-- catalog("test", "compute", "http://localhost", "rgn", ""),
-- ApiCriteria{Name: "test"},
-- )
-- if endpoint.PublicURL != "http://localhost" {
-- t.Error("Regions are case insensitive.")
-- return
-- }
+- _, tempDiffCount := call.Arguments.Diff(arguments)
+- if tempDiffCount < diffCount || diffCount == 0 {
+- diffCount = tempDiffCount
+- closestCall = &call
+- }
-
-- endpoint = FindFirstEndpointByCriteria(
-- catalog("test", "compute", "http://localhost", "rgn", ""),
-- ApiCriteria{Name: "test", VersionId: "2"},
-- )
-- if endpoint.PublicURL != "" {
-- t.Error("Missing version ID means no match.")
-- return
+- }
- }
-
-- endpoint = FindFirstEndpointByCriteria(
-- catalog("test", "compute", "http://localhost", "rgn", "3"),
-- ApiCriteria{Name: "test", VersionId: "2"},
-- )
-- if endpoint.PublicURL != "" {
-- t.Error("Mismatched version ID means no match.")
-- return
+- if closestCall == nil {
+- return false, nil
- }
-
-- endpoint = FindFirstEndpointByCriteria(
-- catalog("test", "compute", "http://localhost", "rgn", "2"),
-- ApiCriteria{Name: "test", VersionId: "2"},
-- )
-- if endpoint.PublicURL != "http://localhost" {
-- t.Error("All search criteria met; endpoint expected.")
-- return
-- }
+- return true, closestCall
-}
-
--// TestFFEBCViaRegionOption exercises only those calls where a region
--// parameter is specified explicitly. The region option overrides
--// any defined OS_REGION_NAME environment setting.
--func TestFFEBCViaRegionOption(t *testing.T) {
-- changeRegion("Starfleet Command")
+-func callString(method string, arguments Arguments, includeArgumentValues bool) string {
-
-- endpoint := FindFirstEndpointByCriteria(
-- catalog("test", "compute", "http://localhost", "", ""),
-- ApiCriteria{Name: "test", Region: "RGN"},
-- )
-- if endpoint.PublicURL != "" {
-- t.Error("If provided, the Region qualifier must exclude endpoints with missing or mismatching regions.")
-- return
+- var argValsString string = ""
+- if includeArgumentValues {
+- var argVals []string
+- for argIndex, arg := range arguments {
+- argVals = append(argVals, fmt.Sprintf("%d: %v", argIndex, arg))
+- }
+- argValsString = fmt.Sprintf("\n\t\t%s", strings.Join(argVals, "\n\t\t"))
- }
-
-- endpoint = FindFirstEndpointByCriteria(
-- catalog("test", "compute", "http://localhost", "rgn", ""),
-- ApiCriteria{Name: "test", Region: "RGN"},
-- )
-- if endpoint.PublicURL != "http://localhost" {
-- t.Error("Regions are case insensitive.")
-- return
-- }
+- return fmt.Sprintf("%s(%s)%s", method, arguments.String(), argValsString)
+-}
-
-- endpoint = FindFirstEndpointByCriteria(
-- catalog("test", "compute", "http://localhost", "rgn", ""),
-- ApiCriteria{Name: "test", Region: "RGN", VersionId: "2"},
-- )
-- if endpoint.PublicURL != "" {
-- t.Error("Missing version ID means no match.")
-- return
+-// Called tells the mock object that a method has been called, and gets an array
+-// of arguments to return. Panics if the call is unexpected (i.e. not preceeded by
+-// appropriate .On .Return() calls)
+-func (m *Mock) Called(arguments ...interface{}) Arguments {
+-
+- // get the calling function's name
+- pc, _, _, ok := runtime.Caller(1)
+- if !ok {
+- panic("Couldn't get the caller information")
- }
+- functionPath := runtime.FuncForPC(pc).Name()
+- parts := strings.Split(functionPath, ".")
+- functionName := parts[len(parts)-1]
-
-- endpoint = FindFirstEndpointByCriteria(
-- catalog("test", "compute", "http://localhost", "rgn", "3"),
-- ApiCriteria{Name: "test", Region: "RGN", VersionId: "2"},
-- )
-- if endpoint.PublicURL != "" {
-- t.Error("Mismatched version ID means no match.")
-- return
+- found, call := m.findExpectedCall(functionName, arguments...)
+-
+- switch {
+- case found < 0:
+- // we have to fail here - because we don't know what to do
+- // as the return arguments. This is because:
+- //
+- // a) this is a totally unexpected call to this method,
+- // b) the arguments are not what was expected, or
+- // c) the developer has forgotten to add an accompanying On...Return pair.
+-
+- closestFound, closestCall := m.findClosestCall(functionName, arguments...)
+-
+- if closestFound {
+- panic(fmt.Sprintf("\n\nmock: Unexpected Method Call\n-----------------------------\n\n%s\n\nThe closest call I have is: \n\n%s\n", callString(functionName, arguments, true), callString(functionName, closestCall.Arguments, true)))
+- } else {
+- panic(fmt.Sprintf("\nassert: mock: I don't know what to return because the method call was unexpected.\n\tEither do Mock.On(\"%s\").Return(...) first, or remove the %s() call.\n\tThis method was unexpected:\n\t\t%s\n\tat: %s", functionName, functionName, callString(functionName, arguments, true), assert.CallerInfo()))
+- }
+- case call.Repeatability == 1:
+- call.Repeatability = -1
+- m.ExpectedCalls[found] = *call
+- case call.Repeatability > 1:
+- call.Repeatability -= 1
+- m.ExpectedCalls[found] = *call
- }
-
-- endpoint = FindFirstEndpointByCriteria(
-- catalog("test", "compute", "http://localhost", "rgn", "2"),
-- ApiCriteria{Name: "test", Region: "RGN", VersionId: "2"},
-- )
-- if endpoint.PublicURL != "http://localhost" {
-- t.Error("All search criteria met; endpoint expected.")
-- return
+- // add the call
+- m.Calls = append(m.Calls, Call{functionName, arguments, make([]interface{}, 0), 0})
+-
+- return call.ReturnArguments
+-
+-}
+-
+-/*
+- Assertions
+-*/
+-
+-// AssertExpectationsForObjects asserts that everything specified with On and Return
+-// of the specified objects was in fact called as expected.
+-//
+-// Calls may have occurred in any order.
+-func AssertExpectationsForObjects(t TestingT, testObjects ...interface{}) bool {
+- var success bool = true
+- for _, obj := range testObjects {
+- mockObj := obj.(Mock)
+- success = success && mockObj.AssertExpectations(t)
- }
+- return success
-}
-
--// TestFFEBCWithoutRegion exercises only those calls where a region
--// is irrelevant. Just to make sure, though, we enforce Gophercloud
--// from paying any attention to OS_REGION_NAME if it happens to be set.
--func TestFindFirstEndpointByCriteria(t *testing.T) {
-- endpoint := FindFirstEndpointByCriteria([]CatalogEntry{}, ApiCriteria{Name: "test", IgnoreEnvVars: true})
-- if endpoint.PublicURL != "" {
-- t.Error("Not expecting to find anything in an empty service catalog.")
-- return
+-// AssertExpectations asserts that everything specified with On and Return was
+-// in fact called as expected. Calls may have occurred in any order.
+-func (m *Mock) AssertExpectations(t TestingT) bool {
+-
+- var somethingMissing bool = false
+- var failedExpectations int = 0
+-
+- // iterate through each expectation
+- for _, expectedCall := range m.ExpectedCalls {
+- switch {
+- case !m.methodWasCalled(expectedCall.Method, expectedCall.Arguments):
+- somethingMissing = true
+- failedExpectations++
+- t.Logf("\u274C\t%s(%s)", expectedCall.Method, expectedCall.Arguments.String())
+- case expectedCall.Repeatability > 0:
+- somethingMissing = true
+- failedExpectations++
+- default:
+- t.Logf("\u2705\t%s(%s)", expectedCall.Method, expectedCall.Arguments.String())
+- }
- }
-
-- endpoint = FindFirstEndpointByCriteria(
-- []CatalogEntry{
-- {Name: "test"},
-- },
-- ApiCriteria{Name: "test", IgnoreEnvVars: true},
-- )
-- if endpoint.PublicURL != "" {
-- t.Error("Even though we have a matching entry, no endpoints exist")
-- return
+- if somethingMissing {
+- t.Errorf("FAIL: %d out of %d expectation(s) were met.\n\tThe code you are testing needs to make %d more call(s).\n\tat: %s", len(m.ExpectedCalls)-failedExpectations, len(m.ExpectedCalls), failedExpectations, assert.CallerInfo())
- }
-
-- endpoint = FindFirstEndpointByCriteria(
-- catalog("test", "compute", "http://localhost", "", ""),
-- ApiCriteria{Name: "test", IgnoreEnvVars: true},
-- )
-- if endpoint.PublicURL != "http://localhost" {
-- t.Error("Looking for an endpoint by name but without region or version ID should match first entry endpoint.")
-- return
+- return !somethingMissing
+-}
+-
+-// AssertNumberOfCalls asserts that the method was called expectedCalls times.
+-func (m *Mock) AssertNumberOfCalls(t TestingT, methodName string, expectedCalls int) bool {
+- var actualCalls int = 0
+- for _, call := range m.Calls {
+- if call.Method == methodName {
+- actualCalls++
+- }
- }
+- return assert.Equal(t, actualCalls, expectedCalls, fmt.Sprintf("Expected number of calls (%d) does not match the actual number of calls (%d).", expectedCalls, actualCalls))
+-}
-
-- endpoint = FindFirstEndpointByCriteria(
-- catalog("test", "compute", "http://localhost", "", ""),
-- ApiCriteria{Type: "compute", IgnoreEnvVars: true},
-- )
-- if endpoint.PublicURL != "http://localhost" {
-- t.Error("Looking for an endpoint by type but without region or version ID should match first entry endpoint.")
-- return
+-// AssertCalled asserts that the method was called.
+-func (m *Mock) AssertCalled(t TestingT, methodName string, arguments ...interface{}) bool {
+- if !assert.True(t, m.methodWasCalled(methodName, arguments), fmt.Sprintf("The \"%s\" method should have been called with %d argument(s), but was not.", methodName, len(arguments))) {
+- t.Logf("%s", m.ExpectedCalls)
+- return false
- }
+- return true
+-}
-
-- endpoint = FindFirstEndpointByCriteria(
-- catalog("test", "compute", "http://localhost", "", ""),
-- ApiCriteria{Type: "identity", IgnoreEnvVars: true},
-- )
-- if endpoint.PublicURL != "" {
-- t.Error("Returned mismatched type.")
-- return
+-// AssertNotCalled asserts that the method was not called.
+-func (m *Mock) AssertNotCalled(t TestingT, methodName string, arguments ...interface{}) bool {
+- if !assert.False(t, m.methodWasCalled(methodName, arguments), fmt.Sprintf("The \"%s\" method was called with %d argument(s), but should NOT have been.", methodName, len(arguments))) {
+- t.Logf("%s", m.ExpectedCalls)
+- return false
- }
+- return true
+-}
-
-- endpoint = FindFirstEndpointByCriteria(
-- catalog("test", "compute", "http://localhost", "ord", "2"),
-- ApiCriteria{Name: "test", VersionId: "2", IgnoreEnvVars: true},
-- )
-- if endpoint.PublicURL != "http://localhost" {
-- t.Error("Sometimes, you might not care what region your stuff is in.")
-- return
+-func (m *Mock) methodWasCalled(methodName string, arguments []interface{}) bool {
+- for _, call := range m.Calls {
+- if call.Method == methodName {
+-
+- _, differences := call.Arguments.Diff(arguments)
+-
+- if differences == 0 {
+- // found the expected call
+- return true
+- }
+-
+- }
- }
+- // we didn't find the expected call
+- return false
-}
-
--func catalog(name, entry_type, url, region, version string) []CatalogEntry {
-- return []CatalogEntry{
-- {
-- Name: name,
-- Type: entry_type,
-- Endpoints: []EntryEndpoint{
-- {
-- PublicURL: url,
-- Region: region,
-- VersionId: version,
-- },
-- },
-- },
+-/*
+- Arguments
+-*/
+-
+-// Arguments holds an array of method arguments or return values.
+-type Arguments []interface{}
+-
+-const (
+- // The "any" argument. Used in Diff and Assert when
+- // the argument being tested shouldn't be taken into consideration.
+- Anything string = "mock.Anything"
+-)
+-
+-// AnythingOfTypeArgument is a string that contains the type of an argument
+-// for use when type checking. Used in Diff and Assert.
+-type AnythingOfTypeArgument string
+-
+-// AnythingOfType returns an AnythingOfTypeArgument object containing the
+-// name of the type to check for. Used in Diff and Assert.
+-//
+-// For example:
+-// Assert(t, AnythingOfType("string"), AnythingOfType("int"))
+-func AnythingOfType(t string) AnythingOfTypeArgument {
+- return AnythingOfTypeArgument(t)
+-}
+-
+-// Get Returns the argument at the specified index.
+-func (args Arguments) Get(index int) interface{} {
+- if index+1 > len(args) {
+- panic(fmt.Sprintf("assert: arguments: Cannot call Get(%d) because there are %d argument(s).", index, len(args)))
- }
+- return args[index]
-}
-
--func changeRegion(r string) {
-- err := os.Setenv("OS_REGION_NAME", r)
-- if err != nil {
-- panic(err)
+-// Is gets whether the objects match the arguments specified.
+-func (args Arguments) Is(objects ...interface{}) bool {
+- for i, obj := range args {
+- if obj != objects[i] {
+- return false
+- }
- }
+- return true
-}
-diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/transport_double_test.go b/Godeps/_workspace/src/github.com/rackspace/gophercloud/transport_double_test.go
-deleted file mode 100644
-index ef7f19a..0000000
---- a/Godeps/_workspace/src/github.com/rackspace/gophercloud/transport_double_test.go
-+++ /dev/null
-@@ -1,103 +0,0 @@
--package gophercloud
-
--import (
-- "encoding/json"
-- "fmt"
-- "io/ioutil"
-- "net/http"
-- "strings"
-- "testing"
--)
+-// Diff gets a string describing the differences between the arguments
+-// and the specified objects.
+-//
+-// Returns the diff string and number of differences found.
+-func (args Arguments) Diff(objects []interface{}) (string, int) {
-
--type transport struct {
-- called int
-- response string
-- expectTenantId bool
-- tenantIdFound bool
-- status int
--}
+- var output string = "\n"
+- var differences int
-
--func (t *transport) RoundTrip(req *http.Request) (rsp *http.Response, err error) {
-- var authContainer *AuthContainer
+- var maxArgCount int = len(args)
+- if len(objects) > maxArgCount {
+- maxArgCount = len(objects)
+- }
-
-- t.called++
+- for i := 0; i < maxArgCount; i++ {
+- var actual, expected interface{}
-
-- headers := make(http.Header)
-- headers.Add("Content-Type", "application/xml; charset=UTF-8")
+- if len(objects) <= i {
+- actual = "(Missing)"
+- } else {
+- actual = objects[i]
+- }
-
-- body := ioutil.NopCloser(strings.NewReader(t.response))
+- if len(args) <= i {
+- expected = "(Missing)"
+- } else {
+- expected = args[i]
+- }
-
-- if t.status == 0 {
-- t.status = 200
-- }
-- statusMsg := "OK"
-- if (t.status < 200) || (299 < t.status) {
-- statusMsg = "Error"
-- }
+- if reflect.TypeOf(expected) == reflect.TypeOf((*AnythingOfTypeArgument)(nil)).Elem() {
-
-- rsp = &http.Response{
-- Status: fmt.Sprintf("%d %s", t.status, statusMsg),
-- StatusCode: t.status,
-- Proto: "HTTP/1.1",
-- ProtoMajor: 1,
-- ProtoMinor: 1,
-- Header: headers,
-- Body: body,
-- ContentLength: -1,
-- TransferEncoding: nil,
-- Close: true,
-- Trailer: nil,
-- Request: req,
-- }
+- // type checking
+- if reflect.TypeOf(actual).Name() != string(expected.(AnythingOfTypeArgument)) && reflect.TypeOf(actual).String() != string(expected.(AnythingOfTypeArgument)) {
+- // not match
+- differences++
+- output = fmt.Sprintf("%s\t%d: \u274C type %s != type %s - %s\n", output, i, expected, reflect.TypeOf(actual).Name(), actual)
+- }
-
-- bytes, err := ioutil.ReadAll(req.Body)
-- if err != nil {
-- return nil, err
-- }
-- err = json.Unmarshal(bytes, &authContainer)
-- if err != nil {
-- return nil, err
-- }
-- t.tenantIdFound = (authContainer.Auth.TenantId != "")
+- } else {
+-
+- // normal checking
+-
+- if assert.ObjectsAreEqual(expected, Anything) || assert.ObjectsAreEqual(actual, Anything) || assert.ObjectsAreEqual(actual, expected) {
+- // match
+- output = fmt.Sprintf("%s\t%d: \u2705 %s == %s\n", output, i, actual, expected)
+- } else {
+- // not match
+- differences++
+- output = fmt.Sprintf("%s\t%d: \u274C %s != %s\n", output, i, actual, expected)
+- }
+- }
-
-- if t.tenantIdFound != t.expectTenantId {
-- rsp.Status = "500 Internal Server Error"
-- rsp.StatusCode = 500
- }
-- return
--}
-
--func newTransport() *transport {
-- return &transport{}
--}
+- if differences == 0 {
+- return "No differences.", differences
+- }
-
--func (t *transport) IgnoreTenantId() *transport {
-- t.expectTenantId = false
-- return t
--}
+- return output, differences
-
--func (t *transport) ExpectTenantId() *transport {
-- t.expectTenantId = true
-- return t
-}
-
--func (t *transport) WithResponse(r string) *transport {
-- t.response = r
-- t.status = 200
-- return t
--}
+-// Assert compares the arguments with the specified objects and fails if
+-// they do not exactly match.
+-func (args Arguments) Assert(t TestingT, objects ...interface{}) bool {
-
--func (t *transport) WithError(code int) *transport {
-- t.response = fmt.Sprintf("Error %d", code)
-- t.status = code
-- return t
--}
+- // get the differences
+- diff, diffCount := args.Diff(objects)
-
--func (t *transport) VerifyCalls(test *testing.T, n int) error {
-- if t.called != n {
-- err := fmt.Errorf("Expected Transport to be called %d times; found %d instead", n, t.called)
-- test.Error(err)
-- return err
+- if diffCount == 0 {
+- return true
- }
-- return nil
+-
+- // there are differences... report them...
+- t.Logf(diff)
+- t.Errorf("%sArguments do not match.", assert.CallerInfo())
+-
+- return false
+-
-}
-diff --git a/Godeps/_workspace/src/github.com/skratchdot/LICENSE-MIT b/Godeps/_workspace/src/github.com/skratchdot/LICENSE-MIT
-deleted file mode 100644
-index afd04c8..0000000
---- a/Godeps/_workspace/src/github.com/skratchdot/LICENSE-MIT
-+++ /dev/null
-@@ -1,22 +0,0 @@
--Copyright (c) 2013 skratchdot
-
--Permission is hereby granted, free of charge, to any person
--obtaining a copy of this software and associated documentation
--files (the "Software"), to deal in the Software without
--restriction, including without limitation the rights to use,
--copy, modify, merge, publish, distribute, sublicense, and/or sell
--copies of the Software, and to permit persons to whom the
--Software is furnished to do so, subject to the following
--conditions:
+-// String gets the argument at the specified index. Panics if there is no argument, or
+-// if the argument is of the wrong type.
+-//
+-// If no index is provided, String() returns a complete string representation
+-// of the arguments.
+-func (args Arguments) String(indexOrNil ...int) string {
-
--The above copyright notice and this permission notice shall be
--included in all copies or substantial portions of the Software.
+- if len(indexOrNil) == 0 {
+- // normal String() method - return a string representation of the args
+- var argsStr []string
+- for _, arg := range args {
+- argsStr = append(argsStr, fmt.Sprintf("%s", reflect.TypeOf(arg)))
+- }
+- return strings.Join(argsStr, ",")
+- } else if len(indexOrNil) == 1 {
+- // Index has been specified - get the argument at that index
+- var index int = indexOrNil[0]
+- var s string
+- var ok bool
+- if s, ok = args.Get(index).(string); !ok {
+- panic(fmt.Sprintf("assert: arguments: String(%d) failed because object wasn't correct type: %s", index, args.Get(index)))
+- }
+- return s
+- }
-
--THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
--EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
--OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
--NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
--HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
--WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
--FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
--OTHER DEALINGS IN THE SOFTWARE.
-diff --git a/Godeps/_workspace/src/github.com/skratchdot/open-golang/open/exec.go b/Godeps/_workspace/src/github.com/skratchdot/open-golang/open/exec.go
-deleted file mode 100644
-index cc37339..0000000
---- a/Godeps/_workspace/src/github.com/skratchdot/open-golang/open/exec.go
-+++ /dev/null
-@@ -1,15 +0,0 @@
--// +build !windows,!darwin
+- panic(fmt.Sprintf("assert: arguments: Wrong number of arguments passed to String. Must be 0 or 1, not %d", len(indexOrNil)))
-
--package open
+-}
-
--import (
-- "os/exec"
--)
+-// Int gets the argument at the specified index. Panics if there is no argument, or
+-// if the argument is of the wrong type.
+-func (args Arguments) Int(index int) int {
+- var s int
+- var ok bool
+- if s, ok = args.Get(index).(int); !ok {
+- panic(fmt.Sprintf("assert: arguments: Int(%d) failed because object wasn't correct type: %s", index, args.Get(index)))
+- }
+- return s
+-}
-
--func open(input string) *exec.Cmd {
-- return exec.Command("xdg-open", input)
+-// Error gets the argument at the specified index. Panics if there is no argument, or
+-// if the argument is of the wrong type.
+-func (args Arguments) Error(index int) error {
+- obj := args.Get(index)
+- var s error
+- var ok bool
+- if obj == nil {
+- return nil
+- }
+- if s, ok = obj.(error); !ok {
+- panic(fmt.Sprintf("assert: arguments: Error(%d) failed because object wasn't correct type: %s", index, args.Get(index)))
+- }
+- return s
-}
-
--func openWith(input string, appName string) *exec.Cmd {
-- return exec.Command(appName, input)
+-// Bool gets the argument at the specified index. Panics if there is no argument, or
+-// if the argument is of the wrong type.
+-func (args Arguments) Bool(index int) bool {
+- var s bool
+- var ok bool
+- if s, ok = args.Get(index).(bool); !ok {
+- panic(fmt.Sprintf("assert: arguments: Bool(%d) failed because object wasn't correct type: %s", index, args.Get(index)))
+- }
+- return s
-}
-diff --git a/Godeps/_workspace/src/github.com/skratchdot/open-golang/open/exec_darwin.go b/Godeps/_workspace/src/github.com/skratchdot/open-golang/open/exec_darwin.go
+diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/mock/mock_test.go b/Godeps/_workspace/src/github.com/stretchr/testify/mock/mock_test.go
deleted file mode 100644
-index 16160e6..0000000
---- a/Godeps/_workspace/src/github.com/skratchdot/open-golang/open/exec_darwin.go
+index cd06451..0000000
+--- a/Godeps/_workspace/src/github.com/stretchr/testify/mock/mock_test.go
+++ /dev/null
-@@ -1,15 +0,0 @@
--// +build darwin
--
--package open
+@@ -1,657 +0,0 @@
+-package mock
-
-import (
-- "os/exec"
+- "errors"
+- "github.com/stretchr/testify/assert"
+- "testing"
-)
-
--func open(input string) *exec.Cmd {
-- return exec.Command("open", input)
--}
+-/*
+- Test objects
+-*/
-
--func openWith(input string, appName string) *exec.Cmd {
-- return exec.Command("open", "-a", appName, input)
+-// ExampleInterface represents an example interface.
+-type ExampleInterface interface {
+- TheExampleMethod(a, b, c int) (int, error)
-}
-diff --git a/Godeps/_workspace/src/github.com/skratchdot/open-golang/open/exec_windows.go b/Godeps/_workspace/src/github.com/skratchdot/open-golang/open/exec_windows.go
-deleted file mode 100644
-index ac44cfa..0000000
---- a/Godeps/_workspace/src/github.com/skratchdot/open-golang/open/exec_windows.go
-+++ /dev/null
-@@ -1,21 +0,0 @@
--// +build windows
--
--package open
-
--import (
-- "os/exec"
-- "strings"
--)
+-// TestExampleImplementation is a test implementation of ExampleInterface
+-type TestExampleImplementation struct {
+- Mock
+-}
-
--func cleaninput(input string) string {
-- r := strings.NewReplacer("&", "^&")
-- return r.Replace(input)
+-func (i *TestExampleImplementation) TheExampleMethod(a, b, c int) (int, error) {
+- args := i.Mock.Called(a, b, c)
+- return args.Int(0), errors.New("Whoops")
-}
-
--func open(input string) *exec.Cmd {
-- return exec.Command("cmd", "/C", "start", "", cleaninput(input))
+-func (i *TestExampleImplementation) TheExampleMethod2(yesorno bool) {
+- i.Mock.Called(yesorno)
-}
-
--func openWith(input string, appName string) *exec.Cmd {
-- return exec.Command("cmd", "/C", "start", "", appName, cleaninput(input))
+-type ExampleType struct{}
+-
+-func (i *TestExampleImplementation) TheExampleMethod3(et *ExampleType) error {
+- args := i.Mock.Called(et)
+- return args.Error(0)
-}
-diff --git a/Godeps/_workspace/src/github.com/skratchdot/open-golang/open/open.go b/Godeps/_workspace/src/github.com/skratchdot/open-golang/open/open.go
-deleted file mode 100644
-index b1f648f..0000000
---- a/Godeps/_workspace/src/github.com/skratchdot/open-golang/open/open.go
-+++ /dev/null
-@@ -1,50 +0,0 @@
+-
-/*
+- Mock
+-*/
-
-- Open a file, directory, or URI using the OS's default
-- application for that object type. Optionally, you can
-- specify an application to use.
+-func Test_Mock_TestData(t *testing.T) {
-
-- This is a proxy for the following commands:
+- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-- OSX: "open"
-- Windows: "start"
-- Linux/Other: "xdg-open"
+- if assert.NotNil(t, mockedService.TestData()) {
-
-- This is a golang port of the node.js module: https://github.com/pwnall/node-open
+- mockedService.TestData().Set("something", 123)
+- assert.Equal(t, 123, mockedService.TestData().Get("something").Data())
-
--*/
--package open
+- }
-
--/*
-- Open a file, directory, or URI using the OS's default
-- application for that object type. Wait for the open
-- command to complete.
--*/
--func Run(input string) error {
-- return open(input).Run()
-}
-
--/*
-- Open a file, directory, or URI using the OS's default
-- application for that object type. Don't wait for the
-- open command to complete.
--*/
--func Start(input string) error {
-- return open(input).Start()
--}
+-func Test_Mock_On(t *testing.T) {
-
--/*
-- Open a file, directory, or URI using the specified application.
-- Wait for the open command to complete.
--*/
--func RunWith(input string, appName string) error {
-- return openWith(input, appName).Run()
--}
+- // make a test impl object
+- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
+-
+- assert.Equal(t, mockedService.Mock.On("TheExampleMethod"), &mockedService.Mock)
+- assert.Equal(t, "TheExampleMethod", mockedService.Mock.onMethodName)
-
--/*
-- Open a file, directory, or URI using the specified application.
-- Don't wait for the open command to complete.
--*/
--func StartWith(input string, appName string) error {
-- return openWith(input, appName).Start()
-}
-diff --git a/Godeps/_workspace/src/github.com/skratchdot/open-golang/open/open_test.go b/Godeps/_workspace/src/github.com/skratchdot/open-golang/open/open_test.go
-deleted file mode 100644
-index 5db2da2..0000000
---- a/Godeps/_workspace/src/github.com/skratchdot/open-golang/open/open_test.go
-+++ /dev/null
-@@ -1,70 +0,0 @@
--package open
-
--import "testing"
+-func Test_Mock_On_WithArgs(t *testing.T) {
-
--func TestRun(t *testing.T) {
-- // shouldn't error
-- input := "https://google.com/"
-- err := Run(input)
-- if err != nil {
-- t.Errorf("open.Run(\"%s\") threw an error: %s", input, err)
-- }
+- // make a test impl object
+- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
+-
+- assert.Equal(t, mockedService.Mock.On("TheExampleMethod", 1, 2, 3), &mockedService.Mock)
+- assert.Equal(t, "TheExampleMethod", mockedService.Mock.onMethodName)
+- assert.Equal(t, 1, mockedService.Mock.onMethodArguments[0])
+- assert.Equal(t, 2, mockedService.Mock.onMethodArguments[1])
+- assert.Equal(t, 3, mockedService.Mock.onMethodArguments[2])
-
-- // should error
-- input = "xxxxxxxxxxxxxxx"
-- err = Run(input)
-- if err == nil {
-- t.Errorf("Run(\"%s\") did not throw an error as expected", input)
-- }
-}
-
--func TestStart(t *testing.T) {
-- // shouldn't error
-- input := "https://google.com/"
-- err := Start(input)
-- if err != nil {
-- t.Errorf("open.Start(\"%s\") threw an error: %s", input, err)
-- }
+-func Test_Mock_Return(t *testing.T) {
-
-- // shouldn't error
-- input = "xxxxxxxxxxxxxxx"
-- err = Start(input)
-- if err != nil {
-- t.Errorf("open.Start(\"%s\") shouldn't even fail on invalid input: %s", input, err)
-- }
--}
+- // make a test impl object
+- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
--func TestRunWith(t *testing.T) {
-- // shouldn't error
-- input := "https://google.com/"
-- app := "firefox"
-- err := RunWith(input, app)
-- if err != nil {
-- t.Errorf("open.RunWith(\"%s\", \"%s\") threw an error: %s", input, app, err)
-- }
+- assert.Equal(t, mockedService.Mock.On("TheExampleMethod", "A", "B", true).Return(1, "two", true), &mockedService.Mock)
-
-- // should error
-- app = "xxxxxxxxxxxxxxx"
-- err = RunWith(input, app)
-- if err == nil {
-- t.Errorf("RunWith(\"%s\", \"%s\") did not throw an error as expected", input, app)
-- }
--}
+- // ensure the call was created
+- if assert.Equal(t, 1, len(mockedService.Mock.ExpectedCalls)) {
+- call := mockedService.Mock.ExpectedCalls[0]
-
--func TestStartWith(t *testing.T) {
-- // shouldn't error
-- input := "https://google.com/"
-- app := "firefox"
-- err := StartWith(input, app)
-- if err != nil {
-- t.Errorf("open.StartWith(\"%s\", \"%s\") threw an error: %s", input, app, err)
-- }
+- assert.Equal(t, "TheExampleMethod", call.Method)
+- assert.Equal(t, "A", call.Arguments[0])
+- assert.Equal(t, "B", call.Arguments[1])
+- assert.Equal(t, true, call.Arguments[2])
+- assert.Equal(t, 1, call.ReturnArguments[0])
+- assert.Equal(t, "two", call.ReturnArguments[1])
+- assert.Equal(t, true, call.ReturnArguments[2])
+- assert.Equal(t, 0, call.Repeatability)
-
-- // shouldn't error
-- input = "[<Invalid URL>]"
-- err = StartWith(input, app)
-- if err != nil {
-- t.Errorf("StartWith(\"%s\", \"%s\") shouldn't even fail on invalid input: %s", input, app, err)
- }
-
-}
-diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/.gitignore b/Godeps/_workspace/src/github.com/spf13/cobra/.gitignore
-deleted file mode 100644
-index 36d1a84..0000000
---- a/Godeps/_workspace/src/github.com/spf13/cobra/.gitignore
-+++ /dev/null
-@@ -1,24 +0,0 @@
--# Compiled Object files, Static and Dynamic libs (Shared Objects)
--*.o
--*.a
--*.so
-
--# Folders
--_obj
--_test
+-func Test_Mock_Return_Once(t *testing.T) {
-
--# Architecture specific extensions/prefixes
--*.[568vq]
--[568vq].out
+- // make a test impl object
+- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
--*.cgo1.go
--*.cgo2.c
--_cgo_defun.c
--_cgo_gotypes.go
--_cgo_export.*
+- mockedService.Mock.On("TheExampleMethod", "A", "B", true).Return(1, "two", true).Once()
+-
+- // ensure the call was created
+- if assert.Equal(t, 1, len(mockedService.Mock.ExpectedCalls)) {
+- call := mockedService.Mock.ExpectedCalls[0]
+-
+- assert.Equal(t, "TheExampleMethod", call.Method)
+- assert.Equal(t, "A", call.Arguments[0])
+- assert.Equal(t, "B", call.Arguments[1])
+- assert.Equal(t, true, call.Arguments[2])
+- assert.Equal(t, 1, call.ReturnArguments[0])
+- assert.Equal(t, "two", call.ReturnArguments[1])
+- assert.Equal(t, true, call.ReturnArguments[2])
+- assert.Equal(t, 1, call.Repeatability)
-
--_testmain.go
+- }
-
--*.exe
+-}
-
--cobra.test
-diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/.travis.yml b/Godeps/_workspace/src/github.com/spf13/cobra/.travis.yml
-deleted file mode 100644
-index 6de9ac2..0000000
---- a/Godeps/_workspace/src/github.com/spf13/cobra/.travis.yml
-+++ /dev/null
-@@ -1,6 +0,0 @@
--language: go
--go:
-- - 1.1
--script:
-- - go test ./...
-- - go build
-diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/LICENSE.txt b/Godeps/_workspace/src/github.com/spf13/cobra/LICENSE.txt
-deleted file mode 100644
-index 298f0e2..0000000
---- a/Godeps/_workspace/src/github.com/spf13/cobra/LICENSE.txt
-+++ /dev/null
-@@ -1,174 +0,0 @@
-- Apache License
-- Version 2.0, January 2004
-- http://www.apache.org/licenses/
+-func Test_Mock_Return_Twice(t *testing.T) {
-
-- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+- // make a test impl object
+- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-- 1. Definitions.
+- mockedService.Mock.On("TheExampleMethod", "A", "B", true).Return(1, "two", true).Twice()
-
-- "License" shall mean the terms and conditions for use, reproduction,
-- and distribution as defined by Sections 1 through 9 of this document.
+- // ensure the call was created
+- if assert.Equal(t, 1, len(mockedService.Mock.ExpectedCalls)) {
+- call := mockedService.Mock.ExpectedCalls[0]
-
-- "Licensor" shall mean the copyright owner or entity authorized by
-- the copyright owner that is granting the License.
+- assert.Equal(t, "TheExampleMethod", call.Method)
+- assert.Equal(t, "A", call.Arguments[0])
+- assert.Equal(t, "B", call.Arguments[1])
+- assert.Equal(t, true, call.Arguments[2])
+- assert.Equal(t, 1, call.ReturnArguments[0])
+- assert.Equal(t, "two", call.ReturnArguments[1])
+- assert.Equal(t, true, call.ReturnArguments[2])
+- assert.Equal(t, 2, call.Repeatability)
-
-- "Legal Entity" shall mean the union of the acting entity and all
-- other entities that control, are controlled by, or are under common
-- control with that entity. For the purposes of this definition,
-- "control" means (i) the power, direct or indirect, to cause the
-- direction or management of such entity, whether by contract or
-- otherwise, or (ii) ownership of fifty percent (50%) or more of the
-- outstanding shares, or (iii) beneficial ownership of such entity.
+- }
-
-- "You" (or "Your") shall mean an individual or Legal Entity
-- exercising permissions granted by this License.
+-}
-
-- "Source" form shall mean the preferred form for making modifications,
-- including but not limited to software source code, documentation
-- source, and configuration files.
+-func Test_Mock_Return_Times(t *testing.T) {
-
-- "Object" form shall mean any form resulting from mechanical
-- transformation or translation of a Source form, including but
-- not limited to compiled object code, generated documentation,
-- and conversions to other media types.
+- // make a test impl object
+- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-- "Work" shall mean the work of authorship, whether in Source or
-- Object form, made available under the License, as indicated by a
-- copyright notice that is included in or attached to the work
-- (an example is provided in the Appendix below).
+- mockedService.Mock.On("TheExampleMethod", "A", "B", true).Return(1, "two", true).Times(5)
-
-- "Derivative Works" shall mean any work, whether in Source or Object
-- form, that is based on (or derived from) the Work and for which the
-- editorial revisions, annotations, elaborations, or other modifications
-- represent, as a whole, an original work of authorship. For the purposes
-- of this License, Derivative Works shall not include works that remain
-- separable from, or merely link (or bind by name) to the interfaces of,
-- the Work and Derivative Works thereof.
+- // ensure the call was created
+- if assert.Equal(t, 1, len(mockedService.Mock.ExpectedCalls)) {
+- call := mockedService.Mock.ExpectedCalls[0]
-
-- "Contribution" shall mean any work of authorship, including
-- the original version of the Work and any modifications or additions
-- to that Work or Derivative Works thereof, that is intentionally
-- submitted to Licensor for inclusion in the Work by the copyright owner
-- or by an individual or Legal Entity authorized to submit on behalf of
-- the copyright owner. For the purposes of this definition, "submitted"
-- means any form of electronic, verbal, or written communication sent
-- to the Licensor or its representatives, including but not limited to
-- communication on electronic mailing lists, source code control systems,
-- and issue tracking systems that are managed by, or on behalf of, the
-- Licensor for the purpose of discussing and improving the Work, but
-- excluding communication that is conspicuously marked or otherwise
-- designated in writing by the copyright owner as "Not a Contribution."
+- assert.Equal(t, "TheExampleMethod", call.Method)
+- assert.Equal(t, "A", call.Arguments[0])
+- assert.Equal(t, "B", call.Arguments[1])
+- assert.Equal(t, true, call.Arguments[2])
+- assert.Equal(t, 1, call.ReturnArguments[0])
+- assert.Equal(t, "two", call.ReturnArguments[1])
+- assert.Equal(t, true, call.ReturnArguments[2])
+- assert.Equal(t, 5, call.Repeatability)
-
-- "Contributor" shall mean Licensor and any individual or Legal Entity
-- on behalf of whom a Contribution has been received by Licensor and
-- subsequently incorporated within the Work.
+- }
-
-- 2. Grant of Copyright License. Subject to the terms and conditions of
-- this License, each Contributor hereby grants to You a perpetual,
-- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-- copyright license to reproduce, prepare Derivative Works of,
-- publicly display, publicly perform, sublicense, and distribute the
-- Work and such Derivative Works in Source or Object form.
+-}
-
-- 3. Grant of Patent License. Subject to the terms and conditions of
-- this License, each Contributor hereby grants to You a perpetual,
-- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-- (except as stated in this section) patent license to make, have made,
-- use, offer to sell, sell, import, and otherwise transfer the Work,
-- where such license applies only to those patent claims licensable
-- by such Contributor that are necessarily infringed by their
-- Contribution(s) alone or by combination of their Contribution(s)
-- with the Work to which such Contribution(s) was submitted. If You
-- institute patent litigation against any entity (including a
-- cross-claim or counterclaim in a lawsuit) alleging that the Work
-- or a Contribution incorporated within the Work constitutes direct
-- or contributory patent infringement, then any patent licenses
-- granted to You under this License for that Work shall terminate
-- as of the date such litigation is filed.
+-func Test_Mock_Return_Nothing(t *testing.T) {
-
-- 4. Redistribution. You may reproduce and distribute copies of the
-- Work or Derivative Works thereof in any medium, with or without
-- modifications, and in Source or Object form, provided that You
-- meet the following conditions:
+- // make a test impl object
+- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-- (a) You must give any other recipients of the Work or
-- Derivative Works a copy of this License; and
+- assert.Equal(t, mockedService.Mock.On("TheExampleMethod", "A", "B", true).Return(), &mockedService.Mock)
-
-- (b) You must cause any modified files to carry prominent notices
-- stating that You changed the files; and
+- // ensure the call was created
+- if assert.Equal(t, 1, len(mockedService.Mock.ExpectedCalls)) {
+- call := mockedService.Mock.ExpectedCalls[0]
-
-- (c) You must retain, in the Source form of any Derivative Works
-- that You distribute, all copyright, patent, trademark, and
-- attribution notices from the Source form of the Work,
-- excluding those notices that do not pertain to any part of
-- the Derivative Works; and
+- assert.Equal(t, "TheExampleMethod", call.Method)
+- assert.Equal(t, "A", call.Arguments[0])
+- assert.Equal(t, "B", call.Arguments[1])
+- assert.Equal(t, true, call.Arguments[2])
+- assert.Equal(t, 0, len(call.ReturnArguments))
-
-- (d) If the Work includes a "NOTICE" text file as part of its
-- distribution, then any Derivative Works that You distribute must
-- include a readable copy of the attribution notices contained
-- within such NOTICE file, excluding those notices that do not
-- pertain to any part of the Derivative Works, in at least one
-- of the following places: within a NOTICE text file distributed
-- as part of the Derivative Works; within the Source form or
-- documentation, if provided along with the Derivative Works; or,
-- within a display generated by the Derivative Works, if and
-- wherever such third-party notices normally appear. The contents
-- of the NOTICE file are for informational purposes only and
-- do not modify the License. You may add Your own attribution
-- notices within Derivative Works that You distribute, alongside
-- or as an addendum to the NOTICE text from the Work, provided
-- that such additional attribution notices cannot be construed
-- as modifying the License.
+- }
-
-- You may add Your own copyright statement to Your modifications and
-- may provide additional or different license terms and conditions
-- for use, reproduction, or distribution of Your modifications, or
-- for any such Derivative Works as a whole, provided Your use,
-- reproduction, and distribution of the Work otherwise complies with
-- the conditions stated in this License.
+-}
-
-- 5. Submission of Contributions. Unless You explicitly state otherwise,
-- any Contribution intentionally submitted for inclusion in the Work
-- by You to the Licensor shall be under the terms and conditions of
-- this License, without any additional terms or conditions.
-- Notwithstanding the above, nothing herein shall supersede or modify
-- the terms of any separate license agreement you may have executed
-- with Licensor regarding such Contributions.
+-func Test_Mock_findExpectedCall(t *testing.T) {
-
-- 6. Trademarks. This License does not grant permission to use the trade
-- names, trademarks, service marks, or product names of the Licensor,
-- except as required for reasonable and customary use in describing the
-- origin of the Work and reproducing the content of the NOTICE file.
+- m := new(Mock)
+- m.On("One", 1).Return("one")
+- m.On("Two", 2).Return("two")
+- m.On("Two", 3).Return("three")
-
-- 7. Disclaimer of Warranty. Unless required by applicable law or
-- agreed to in writing, Licensor provides the Work (and each
-- Contributor provides its Contributions) on an "AS IS" BASIS,
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-- implied, including, without limitation, any warranties or conditions
-- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-- PARTICULAR PURPOSE. You are solely responsible for determining the
-- appropriateness of using or redistributing the Work and assume any
-- risks associated with Your exercise of permissions under this License.
+- f, c := m.findExpectedCall("Two", 3)
-
-- 8. Limitation of Liability. In no event and under no legal theory,
-- whether in tort (including negligence), contract, or otherwise,
-- unless required by applicable law (such as deliberate and grossly
-- negligent acts) or agreed to in writing, shall any Contributor be
-- liable to You for damages, including any direct, indirect, special,
-- incidental, or consequential damages of any character arising as a
-- result of this License or out of the use or inability to use the
-- Work (including but not limited to damages for loss of goodwill,
-- work stoppage, computer failure or malfunction, or any and all
-- other commercial damages or losses), even if such Contributor
-- has been advised of the possibility of such damages.
+- if assert.Equal(t, 2, f) {
+- if assert.NotNil(t, c) {
+- assert.Equal(t, "Two", c.Method)
+- assert.Equal(t, 3, c.Arguments[0])
+- assert.Equal(t, "three", c.ReturnArguments[0])
+- }
+- }
-
-- 9. Accepting Warranty or Additional Liability. While redistributing
-- the Work or Derivative Works thereof, You may choose to offer,
-- and charge a fee for, acceptance of support, warranty, indemnity,
-- or other liability obligations and/or rights consistent with this
-- License. However, in accepting such obligations, You may act only
-- on Your own behalf and on Your sole responsibility, not on behalf
-- of any other Contributor, and only if You agree to indemnify,
-- defend, and hold each Contributor harmless for any liability
-- incurred by, or claims asserted against, such Contributor by reason
-- of your accepting any such warranty or additional liability.
-diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/README.md b/Godeps/_workspace/src/github.com/spf13/cobra/README.md
-deleted file mode 100644
-index 67c4eff..0000000
---- a/Godeps/_workspace/src/github.com/spf13/cobra/README.md
-+++ /dev/null
-@@ -1,397 +0,0 @@
--# Cobra
+-}
-
--A Commander for modern go CLI interactions
+-func Test_Mock_findExpectedCall_For_Unknown_Method(t *testing.T) {
-
--[](https://travis-ci.org/spf13/cobra)
+- m := new(Mock)
+- m.On("One", 1).Return("one")
+- m.On("Two", 2).Return("two")
+- m.On("Two", 3).Return("three")
-
--## Overview
+- f, _ := m.findExpectedCall("Two")
-
--Cobra is a commander providing a simple interface to create powerful modern CLI
--interfaces similar to git & go tools. In addition to providing an interface, Cobra
--simultaneously provides a controller to organize your application code.
+- assert.Equal(t, -1, f)
-
--Inspired by go, go-Commander, gh and subcommand, Cobra improves on these by
--providing **fully posix compliant flags** (including short & long versions),
--**nesting commands**, and the ability to **define your own help and usage** for any or
--all commands.
+-}
-
--Cobra has an exceptionally clean interface and simple design without needless
--constructors or initialization methods.
+-func Test_Mock_findExpectedCall_Respects_Repeatability(t *testing.T) {
-
--Applications built with Cobra commands are designed to be as user friendly as
--possible. Flags can be placed before or after the command (as long as a
--confusing space isn’t provided). Both short and long flags can be used. A
--command need not even be fully typed. The shortest unambiguous string will
--suffice. Help is automatically generated and available for the application or
--for a specific command using either the help command or the --help flag.
+- m := new(Mock)
+- m.On("One", 1).Return("one")
+- m.On("Two", 2).Return("two").Once()
+- m.On("Two", 3).Return("three").Twice()
+- m.On("Two", 3).Return("three").Times(8)
-
--## Concepts
+- f, c := m.findExpectedCall("Two", 3)
-
--Cobra is built on a structure of commands & flags.
+- if assert.Equal(t, 2, f) {
+- if assert.NotNil(t, c) {
+- assert.Equal(t, "Two", c.Method)
+- assert.Equal(t, 3, c.Arguments[0])
+- assert.Equal(t, "three", c.ReturnArguments[0])
+- }
+- }
-
--**Commands** represent actions and **Flags** are modifiers for those actions.
+-}
-
--In the following example 'server' is a command and 'port' is a flag.
+-func Test_callString(t *testing.T) {
-
-- hugo server --port=1313
+- assert.Equal(t, `Method(int,bool,string)`, callString("Method", []interface{}{1, true, "something"}, false))
-
--### Commands
+-}
-
--Command is the central point of the application. Each interaction that
--the application supports will be contained in a Command. A command can
--have children commands and optionally run an action.
+-func Test_Mock_Called(t *testing.T) {
-
--In the example above 'server' is the command
+- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
--A Command has the following structure:
+- mockedService.Mock.On("Test_Mock_Called", 1, 2, 3).Return(5, "6", true)
-
-- type Command struct {
-- Use string // The one-line usage message.
-- Short string // The short description shown in the 'help' output.
-- Long string // The long message shown in the 'help <this-command>' output.
-- Run func(cmd *Command, args []string) // Run runs the command.
-- }
+- returnArguments := mockedService.Mock.Called(1, 2, 3)
-
--### Flags
+- if assert.Equal(t, 1, len(mockedService.Mock.Calls)) {
+- assert.Equal(t, "Test_Mock_Called", mockedService.Mock.Calls[0].Method)
+- assert.Equal(t, 1, mockedService.Mock.Calls[0].Arguments[0])
+- assert.Equal(t, 2, mockedService.Mock.Calls[0].Arguments[1])
+- assert.Equal(t, 3, mockedService.Mock.Calls[0].Arguments[2])
+- }
-
--A Flag is a way to modify the behavior of an command. Cobra supports
--fully posix compliant flags as well as the go flag package.
--A Cobra command can define flags that persist through to children commands
--and flags that are only available to that command.
+- if assert.Equal(t, 3, len(returnArguments)) {
+- assert.Equal(t, 5, returnArguments[0])
+- assert.Equal(t, "6", returnArguments[1])
+- assert.Equal(t, true, returnArguments[2])
+- }
-
--In the example above 'port' is the flag.
+-}
-
--Flag functionality is provided by the [pflag
--libary](https://github.com/ogier/pflag), a fork of the flag standard library
--which maintains the same interface while adding posix compliance.
+-func Test_Mock_Called_For_Bounded_Repeatability(t *testing.T) {
-
--## Usage
+- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
--Cobra works by creating a set of commands and then organizing them into a tree.
--The tree defines the structure of the application.
+- mockedService.Mock.On("Test_Mock_Called_For_Bounded_Repeatability", 1, 2, 3).Return(5, "6", true).Once()
+- mockedService.Mock.On("Test_Mock_Called_For_Bounded_Repeatability", 1, 2, 3).Return(-1, "hi", false)
-
--Once each command is defined with it's corresponding flags, then the
--tree is assigned to the commander which is finally executed.
+- returnArguments1 := mockedService.Mock.Called(1, 2, 3)
+- returnArguments2 := mockedService.Mock.Called(1, 2, 3)
-
--### Installing
--Using Cobra is easy. First use go get to install the latest version
--of the library.
+- if assert.Equal(t, 2, len(mockedService.Mock.Calls)) {
+- assert.Equal(t, "Test_Mock_Called_For_Bounded_Repeatability", mockedService.Mock.Calls[0].Method)
+- assert.Equal(t, 1, mockedService.Mock.Calls[0].Arguments[0])
+- assert.Equal(t, 2, mockedService.Mock.Calls[0].Arguments[1])
+- assert.Equal(t, 3, mockedService.Mock.Calls[0].Arguments[2])
-
-- $ go get github.com/spf13/cobra
+- assert.Equal(t, "Test_Mock_Called_For_Bounded_Repeatability", mockedService.Mock.Calls[1].Method)
+- assert.Equal(t, 1, mockedService.Mock.Calls[1].Arguments[0])
+- assert.Equal(t, 2, mockedService.Mock.Calls[1].Arguments[1])
+- assert.Equal(t, 3, mockedService.Mock.Calls[1].Arguments[2])
+- }
-
--Next include cobra in your application.
+- if assert.Equal(t, 3, len(returnArguments1)) {
+- assert.Equal(t, 5, returnArguments1[0])
+- assert.Equal(t, "6", returnArguments1[1])
+- assert.Equal(t, true, returnArguments1[2])
+- }
-
-- import "github.com/spf13/cobra"
+- if assert.Equal(t, 3, len(returnArguments2)) {
+- assert.Equal(t, -1, returnArguments2[0])
+- assert.Equal(t, "hi", returnArguments2[1])
+- assert.Equal(t, false, returnArguments2[2])
+- }
-
--### Create the root command
+-}
-
--The root command represents your binary itself.
+-func Test_Mock_Called_For_SetTime_Expectation(t *testing.T) {
-
--Cobra doesn't require any special constructors. Simply create your commands.
+- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-- var HugoCmd = &cobra.Command{
-- Use: "hugo",
-- Short: "Hugo is a very fast static site generator",
-- Long: `A Fast and Flexible Static Site Generator built with
-- love by spf13 and friends in Go.
-- Complete documentation is available at http://hugo.spf13.com`,
-- Run: func(cmd *cobra.Command, args []string) {
-- // Do Stuff Here
-- },
-- }
+- mockedService.Mock.On("TheExampleMethod", 1, 2, 3).Return(5, "6", true).Times(4)
-
--### Create additional commands
+- mockedService.TheExampleMethod(1, 2, 3)
+- mockedService.TheExampleMethod(1, 2, 3)
+- mockedService.TheExampleMethod(1, 2, 3)
+- mockedService.TheExampleMethod(1, 2, 3)
+- assert.Panics(t, func() {
+- mockedService.TheExampleMethod(1, 2, 3)
+- })
-
--Additional commands can be defined.
+-}
-
-- var versionCmd = &cobra.Command{
-- Use: "version",
-- Short: "Print the version number of Hugo",
-- Long: `All software has versions. This is Hugo's`,
-- Run: func(cmd *cobra.Command, args []string) {
-- fmt.Println("Hugo Static Site Generator v0.9 -- HEAD")
-- },
-- }
+-func Test_Mock_Called_Unexpected(t *testing.T) {
-
--### Attach command to its parent
--In this example we are attaching it to the root, but commands can be attached at any level.
+- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-- HugoCmd.AddCommand(versionCmd)
+- // make sure it panics if no expectation was made
+- assert.Panics(t, func() {
+- mockedService.Mock.Called(1, 2, 3)
+- }, "Calling unexpected method should panic")
-
--### Assign flags to a command
+-}
-
--Since the flags are defined and used in different locations, we need to define a variable outside with the correct scope to assign the flag to work with.
+-func Test_AssertExpectationsForObjects_Helper(t *testing.T) {
-
-- var Verbose bool
-- var Source string
+- var mockedService1 *TestExampleImplementation = new(TestExampleImplementation)
+- var mockedService2 *TestExampleImplementation = new(TestExampleImplementation)
+- var mockedService3 *TestExampleImplementation = new(TestExampleImplementation)
-
--There are two different approaches to assign a flag.
+- mockedService1.Mock.On("Test_AssertExpectationsForObjects_Helper", 1).Return()
+- mockedService2.Mock.On("Test_AssertExpectationsForObjects_Helper", 2).Return()
+- mockedService3.Mock.On("Test_AssertExpectationsForObjects_Helper", 3).Return()
-
--#### Persistent Flags
+- mockedService1.Called(1)
+- mockedService2.Called(2)
+- mockedService3.Called(3)
-
--A flag can be 'persistent' meaning that this flag will be available to the
--command it's assigned to as well as every command under that command. For
--global flags assign a flag as a persistent flag on the root.
+- assert.True(t, AssertExpectationsForObjects(t, mockedService1.Mock, mockedService2.Mock, mockedService3.Mock))
-
-- HugoCmd.PersistentFlags().BoolVarP(&Verbose, "verbose", "v", false, "verbose output")
+-}
-
--#### Local Flags
+-func Test_AssertExpectationsForObjects_Helper_Failed(t *testing.T) {
-
--A flag can also be assigned locally which will only apply to that specific command.
+- var mockedService1 *TestExampleImplementation = new(TestExampleImplementation)
+- var mockedService2 *TestExampleImplementation = new(TestExampleImplementation)
+- var mockedService3 *TestExampleImplementation = new(TestExampleImplementation)
-
-- HugoCmd.Flags().StringVarP(&Source, "source", "s", "", "Source directory to read from")
+- mockedService1.Mock.On("Test_AssertExpectationsForObjects_Helper_Failed", 1).Return()
+- mockedService2.Mock.On("Test_AssertExpectationsForObjects_Helper_Failed", 2).Return()
+- mockedService3.Mock.On("Test_AssertExpectationsForObjects_Helper_Failed", 3).Return()
-
--### Once all commands and flags are defined, Execute the commands
+- mockedService1.Called(1)
+- mockedService3.Called(3)
-
--Execute should be run on the root for clarity, though it can be called on any command.
+- tt := new(testing.T)
+- assert.False(t, AssertExpectationsForObjects(tt, mockedService1.Mock, mockedService2.Mock, mockedService3.Mock))
-
-- HugoCmd.Execute()
+-}
-
--## Example
+-func Test_Mock_AssertExpectations(t *testing.T) {
-
--In the example below we have defined three commands. Two are at the top level
--and one (cmdTimes) is a child of one of the top commands. In this case the root
--is not executable meaning that a subcommand is required. This is accomplished
--by not providing a 'Run' for the 'rootCmd'.
+- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
--We have only defined one flag for a single command.
+- mockedService.Mock.On("Test_Mock_AssertExpectations", 1, 2, 3).Return(5, 6, 7)
-
--More documentation about flags is available at https://github.com/spf13/pflag
+- tt := new(testing.T)
+- assert.False(t, mockedService.AssertExpectations(tt))
-
-- import(
-- "github.com/spf13/cobra"
-- "fmt"
-- "strings"
-- )
+- // make the call now
+- mockedService.Mock.Called(1, 2, 3)
-
-- func main() {
+- // now assert expectations
+- assert.True(t, mockedService.AssertExpectations(tt))
-
-- var echoTimes int
+-}
-
-- var cmdPrint = &cobra.Command{
-- Use: "print [string to print]",
-- Short: "Print anything to the screen",
-- Long: `print is for printing anything back to the screen.
-- For many years people have printed back to the screen.
-- `,
-- Run: func(cmd *cobra.Command, args []string) {
-- fmt.Println("Print: " + strings.Join(args, " "))
-- },
-- }
+-func Test_Mock_AssertExpectationsCustomType(t *testing.T) {
-
-- var cmdEcho = &cobra.Command{
-- Use: "echo [string to echo]",
-- Short: "Echo anything to the screen",
-- Long: `echo is for echoing anything back.
-- Echo works a lot like print, except it has a child command.
-- `,
-- Run: func(cmd *cobra.Command, args []string) {
-- fmt.Println("Print: " + strings.Join(args, " "))
-- },
-- }
+- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-- var cmdTimes = &cobra.Command{
-- Use: "times [# times] [string to echo]",
-- Short: "Echo anything to the screen more times",
-- Long: `echo things multiple times back to the user by providing
-- a count and a string.`,
-- Run: func(cmd *cobra.Command, args []string) {
-- for i:=0; i < echoTimes; i++ {
-- fmt.Println("Echo: " + strings.Join(args, " "))
-- }
-- },
-- }
+- mockedService.Mock.On("TheExampleMethod3", AnythingOfType("*mock.ExampleType")).Return(nil).Once()
-
-- cmdTimes.Flags().IntVarP(&echoTimes, "times", "t", 1, "times to echo the input")
+- tt := new(testing.T)
+- assert.False(t, mockedService.AssertExpectations(tt))
-
-- var rootCmd = &cobra.Command{Use: "app"}
-- rootCmd.AddCommand(cmdPrint, cmdEcho)
-- cmdEcho.AddCommand(cmdTimes)
-- rootCmd.Execute()
-- }
+- // make the call now
+- mockedService.TheExampleMethod3(&ExampleType{})
-
--For a more complete example of a larger application, please checkout [Hugo](http://hugo.spf13.com)
+- // now assert expectations
+- assert.True(t, mockedService.AssertExpectations(tt))
-
--## The Help Command
+-}
-
--Cobra automatically adds a help command to your application.
--This will be called when a user runs 'app help'. Additionally help will also
--support all other commands as input. Say for instance you have a command called
--'create' without any additional configuration cobra will work when 'app help
--create' is called.
+-func Test_Mock_AssertExpectations_With_Repeatability(t *testing.T) {
-
--### Example
+- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
--The following output is automatically generated by cobra. Nothing beyond the
--command and flag definitions are needed.
+- mockedService.Mock.On("Test_Mock_AssertExpectations_With_Repeatability", 1, 2, 3).Return(5, 6, 7).Twice()
-
-- > hugo help
+- tt := new(testing.T)
+- assert.False(t, mockedService.AssertExpectations(tt))
-
-- A Fast and Flexible Static Site Generator built with
-- love by spf13 and friends in Go.
+- // make the call now
+- mockedService.Mock.Called(1, 2, 3)
-
-- Complete documentation is available at http://hugo.spf13.com
+- assert.False(t, mockedService.AssertExpectations(tt))
-
-- Usage:
-- hugo [flags]
-- hugo [command]
+- mockedService.Mock.Called(1, 2, 3)
-
-- Available Commands:
-- server :: Hugo runs it's own a webserver to render the files
-- version :: Print the version number of Hugo
-- check :: Check content in the source directory
-- benchmark :: Benchmark hugo by building a site a number of times
-- help [command] :: Help about any command
+- // now assert expectations
+- assert.True(t, mockedService.AssertExpectations(tt))
-
-- Available Flags:
-- -b, --base-url="": hostname (and path) to the root eg. http://spf13.com/
-- -D, --build-drafts=false: include content marked as draft
-- --config="": config file (default is path/config.yaml|json|toml)
-- -d, --destination="": filesystem path to write files to
-- -s, --source="": filesystem path to read files relative from
-- --stepAnalysis=false: display memory and timing of different steps of the program
-- --uglyurls=false: if true, use /filename.html instead of /filename/
-- -v, --verbose=false: verbose output
-- -w, --watch=false: watch filesystem for changes and recreate as needed
+-}
-
-- Use "hugo help [command]" for more information about that command.
+-func Test_Mock_TwoCallsWithDifferentArguments(t *testing.T) {
-
+- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
+- mockedService.Mock.On("Test_Mock_TwoCallsWithDifferentArguments", 1, 2, 3).Return(5, 6, 7)
+- mockedService.Mock.On("Test_Mock_TwoCallsWithDifferentArguments", 4, 5, 6).Return(5, 6, 7)
-
--Help is just a command like any other. There is no special logic or behavior
--around it. In fact you can provide your own if you want.
+- args1 := mockedService.Mock.Called(1, 2, 3)
+- assert.Equal(t, 5, args1.Int(0))
+- assert.Equal(t, 6, args1.Int(1))
+- assert.Equal(t, 7, args1.Int(2))
-
--### Defining your own help
+- args2 := mockedService.Mock.Called(4, 5, 6)
+- assert.Equal(t, 5, args2.Int(0))
+- assert.Equal(t, 6, args2.Int(1))
+- assert.Equal(t, 7, args2.Int(2))
-
--You can provide your own Help command or you own template for the default command to use.
+-}
-
--The default help command is
+-func Test_Mock_AssertNumberOfCalls(t *testing.T) {
-
-- func (c *Command) initHelp() {
-- if c.helpCommand == nil {
-- c.helpCommand = &Command{
-- Use: "help [command]",
-- Short: "Help about any command",
-- Long: `Help provides help for any command in the application.
-- Simply type ` + c.Name() + ` help [path to command] for full details.`,
-- Run: c.HelpFunc(),
-- }
-- }
-- c.AddCommand(c.helpCommand)
-- }
+- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
--You can provide your own command, function or template through the following methods.
+- mockedService.Mock.On("Test_Mock_AssertNumberOfCalls", 1, 2, 3).Return(5, 6, 7)
-
-- command.SetHelpCommand(cmd *Command)
+- mockedService.Mock.Called(1, 2, 3)
+- assert.True(t, mockedService.AssertNumberOfCalls(t, "Test_Mock_AssertNumberOfCalls", 1))
-
-- command.SetHelpFunc(f func(*Command, []string))
+- mockedService.Mock.Called(1, 2, 3)
+- assert.True(t, mockedService.AssertNumberOfCalls(t, "Test_Mock_AssertNumberOfCalls", 2))
-
-- command.SetHelpTemplate(s string)
+-}
-
--The latter two will also apply to any children commands.
+-func Test_Mock_AssertCalled(t *testing.T) {
-
--## Usage
+- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
--When the user provides an invalid flag or invalid command Cobra responds by
--showing the user the 'usage'
+- mockedService.Mock.On("Test_Mock_AssertCalled", 1, 2, 3).Return(5, 6, 7)
-
--### Example
--You may recognize this from the help above. That's because the default help
--embeds the usage as part of it's output.
+- mockedService.Mock.Called(1, 2, 3)
-
-- Usage:
-- hugo [flags]
-- hugo [command]
+- assert.True(t, mockedService.AssertCalled(t, "Test_Mock_AssertCalled", 1, 2, 3))
-
-- Available Commands:
-- server Hugo runs it's own a webserver to render the files
-- version Print the version number of Hugo
-- check Check content in the source directory
-- benchmark Benchmark hugo by building a site a number of times
-- help [command] Help about any command
+-}
-
-- Available Flags:
-- -b, --base-url="": hostname (and path) to the root eg. http://spf13.com/
-- -D, --build-drafts=false: include content marked as draft
-- --config="": config file (default is path/config.yaml|json|toml)
-- -d, --destination="": filesystem path to write files to
-- -s, --source="": filesystem path to read files relative from
-- --stepAnalysis=false: display memory and timing of different steps of the program
-- --uglyurls=false: if true, use /filename.html instead of /filename/
-- -v, --verbose=false: verbose output
-- -w, --watch=false: watch filesystem for changes and recreate as needed
+-func Test_Mock_AssertCalled_WithArguments(t *testing.T) {
-
--### Defining your own usage
--You can provide your own usage function or template for cobra to use.
+- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
--The default usage function is
+- mockedService.Mock.On("Test_Mock_AssertCalled_WithArguments", 1, 2, 3).Return(5, 6, 7)
-
-- return func(c *Command) error {
-- err := tmpl(c.Out(), c.UsageTemplate(), c)
-- return err
-- }
+- mockedService.Mock.Called(1, 2, 3)
-
--Like help the function and template are over ridable through public methods.
+- tt := new(testing.T)
+- assert.True(t, mockedService.AssertCalled(tt, "Test_Mock_AssertCalled_WithArguments", 1, 2, 3))
+- assert.False(t, mockedService.AssertCalled(tt, "Test_Mock_AssertCalled_WithArguments", 2, 3, 4))
-
-- command.SetUsageFunc(f func(*Command) error)
+-}
-
-- command.SetUsageTemplate(s string)
+-func Test_Mock_AssertCalled_WithArguments_With_Repeatability(t *testing.T) {
-
+- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
--## Debugging
+- mockedService.Mock.On("Test_Mock_AssertCalled_WithArguments_With_Repeatability", 1, 2, 3).Return(5, 6, 7).Once()
+- mockedService.Mock.On("Test_Mock_AssertCalled_WithArguments_With_Repeatability", 2, 3, 4).Return(5, 6, 7).Once()
-
--Cobra provides a ‘DebugFlags’ method on a command which when called will print
--out everything Cobra knows about the flags for each command
+- mockedService.Mock.Called(1, 2, 3)
+- mockedService.Mock.Called(2, 3, 4)
-
--### Example
+- tt := new(testing.T)
+- assert.True(t, mockedService.AssertCalled(tt, "Test_Mock_AssertCalled_WithArguments_With_Repeatability", 1, 2, 3))
+- assert.True(t, mockedService.AssertCalled(tt, "Test_Mock_AssertCalled_WithArguments_With_Repeatability", 2, 3, 4))
+- assert.False(t, mockedService.AssertCalled(tt, "Test_Mock_AssertCalled_WithArguments_With_Repeatability", 3, 4, 5))
-
-- command.DebugFlags()
+-}
-
--## Release Notes
--* **0.9.0** June 17, 2014
-- * flags can appears anywhere in the args (provided they are unambiguous)
-- * --help prints usage screen for app or command
-- * Prefix matching for commands
-- * Cleaner looking help and usage output
-- * Extensive test suite
--* **0.8.0** Nov 5, 2013
-- * Reworked interface to remove commander completely
-- * Command now primary structure
-- * No initialization needed
-- * Usage & Help templates & functions definable at any level
-- * Updated Readme
--* **0.7.0** Sept 24, 2013
-- * Needs more eyes
-- * Test suite
-- * Support for automatic error messages
-- * Support for help command
-- * Support for printing to any io.Writer instead of os.Stderr
-- * Support for persistent flags which cascade down tree
-- * Ready for integration into Hugo
--* **0.1.0** Sept 3, 2013
-- * Implement first draft
+-func Test_Mock_AssertNotCalled(t *testing.T) {
-
--## ToDo
--* Launch proper documentation site
+- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
--## Contributing
+- mockedService.Mock.On("Test_Mock_AssertNotCalled", 1, 2, 3).Return(5, 6, 7)
-
--1. Fork it
--2. Create your feature branch (`git checkout -b my-new-feature`)
--3. Commit your changes (`git commit -am 'Add some feature'`)
--4. Push to the branch (`git push origin my-new-feature`)
--5. Create new Pull Request
+- mockedService.Mock.Called(1, 2, 3)
-
--## Contributors
+- assert.True(t, mockedService.AssertNotCalled(t, "Test_Mock_NotCalled"))
-
--Names in no particular order:
+-}
-
--* [spf13](https://github.com/spf13)
+-/*
+- Arguments helper methods
+-*/
+-func Test_Arguments_Get(t *testing.T) {
-
--## License
+- var args Arguments = []interface{}{"string", 123, true}
-
--Cobra is released under the Apache 2.0 license. See [LICENSE.txt](https://github.com/spf13/cobra/blob/master/LICENSE.txt)
+- assert.Equal(t, "string", args.Get(0).(string))
+- assert.Equal(t, 123, args.Get(1).(int))
+- assert.Equal(t, true, args.Get(2).(bool))
-
+-}
-
--[](https://bitdeli.com/free "Bitdeli Badge")
+-func Test_Arguments_Is(t *testing.T) {
-
-diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/cobra.go b/Godeps/_workspace/src/github.com/spf13/cobra/cobra.go
-deleted file mode 100644
-index e03b496..0000000
---- a/Godeps/_workspace/src/github.com/spf13/cobra/cobra.go
-+++ /dev/null
-@@ -1,98 +0,0 @@
--// Copyright © 2013 Steve Francia <spf at spf13.com>.
--//
--// Licensed under the Apache License, Version 2.0 (the "License");
--// you may not use this file except in compliance with the License.
--// You may obtain a copy of the License at
--// http://www.apache.org/licenses/LICENSE-2.0
--//
--// Unless required by applicable law or agreed to in writing, software
--// distributed under the License is distributed on an "AS IS" BASIS,
--// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--// See the License for the specific language governing permissions and
--// limitations under the License.
+- var args Arguments = []interface{}{"string", 123, true}
-
--// Commands similar to git, go tools and other modern CLI tools
--// inspired by go, go-Commander, gh and subcommand
+- assert.True(t, args.Is("string", 123, true))
+- assert.False(t, args.Is("wrong", 456, false))
-
--package cobra
+-}
-
--import (
-- "fmt"
-- "io"
-- "reflect"
-- "strconv"
-- "strings"
-- "text/template"
--)
+-func Test_Arguments_Diff(t *testing.T) {
-
--var initializers []func()
+- var args Arguments = []interface{}{"Hello World", 123, true}
+- var diff string
+- var count int
+- diff, count = args.Diff([]interface{}{"Hello World", 456, "false"})
-
--// automatic prefix matching can be a dangerous thing to automatically enable in CLI tools.
--// Set this to true to enable it
--var EnablePrefixMatching bool = false
+- assert.Equal(t, 2, count)
+- assert.Contains(t, diff, `%!s(int=456) != %!s(int=123)`)
+- assert.Contains(t, diff, `false != %!s(bool=true)`)
-
--func OnInitialize(y ...func()) {
-- for _, x := range y {
-- initializers = append(initializers, x)
-- }
-}
-
--func Gt(a interface{}, b interface{}) bool {
-- var left, right int64
-- av := reflect.ValueOf(a)
--
-- switch av.Kind() {
-- case reflect.Array, reflect.Chan, reflect.Map, reflect.Slice:
-- left = int64(av.Len())
-- case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-- left = av.Int()
-- case reflect.String:
-- left, _ = strconv.ParseInt(av.String(), 10, 64)
-- }
+-func Test_Arguments_Diff_DifferentNumberOfArgs(t *testing.T) {
-
-- bv := reflect.ValueOf(b)
+- var args Arguments = []interface{}{"string", 123, true}
+- var diff string
+- var count int
+- diff, count = args.Diff([]interface{}{"string", 456, "false", "extra"})
-
-- switch bv.Kind() {
-- case reflect.Array, reflect.Chan, reflect.Map, reflect.Slice:
-- right = int64(bv.Len())
-- case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-- right = bv.Int()
-- case reflect.String:
-- right, _ = strconv.ParseInt(bv.String(), 10, 64)
-- }
+- assert.Equal(t, 3, count)
+- assert.Contains(t, diff, `extra != (Missing)`)
-
-- return left > right
-}
-
--func Eq(a interface{}, b interface{}) bool {
-- av := reflect.ValueOf(a)
-- bv := reflect.ValueOf(b)
+-func Test_Arguments_Diff_WithAnythingArgument(t *testing.T) {
-
-- switch av.Kind() {
-- case reflect.Array, reflect.Chan, reflect.Map, reflect.Slice:
-- panic("Eq called on unsupported type")
-- case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-- return av.Int() == bv.Int()
-- case reflect.String:
-- return av.String() == bv.String()
-- }
-- return false
--}
+- var args Arguments = []interface{}{"string", 123, true}
+- var count int
+- _, count = args.Diff([]interface{}{"string", Anything, true})
-
--func rpad(s string, padding int) string {
-- template := fmt.Sprintf("%%-%ds", padding)
-- return fmt.Sprintf(template, s)
--}
+- assert.Equal(t, 0, count)
-
--// tmpl executes the given template text on data, writing the result to w.
--func tmpl(w io.Writer, text string, data interface{}) error {
-- t := template.New("top")
-- t.Funcs(template.FuncMap{
-- "trim": strings.TrimSpace,
-- "rpad": rpad,
-- "gt": Gt,
-- "eq": Eq,
-- })
-- template.Must(t.Parse(text))
-- return t.Execute(w, data)
-}
-diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/cobra_test.go b/Godeps/_workspace/src/github.com/spf13/cobra/cobra_test.go
-deleted file mode 100644
-index 05d18d0..0000000
---- a/Godeps/_workspace/src/github.com/spf13/cobra/cobra_test.go
-+++ /dev/null
-@@ -1,507 +0,0 @@
--package cobra
-
--import (
-- "bytes"
-- "fmt"
-- "strings"
-- "testing"
--)
+-func Test_Arguments_Diff_WithAnythingArgument_InActualToo(t *testing.T) {
-
--var _ = fmt.Println
+- var args Arguments = []interface{}{"string", Anything, true}
+- var count int
+- _, count = args.Diff([]interface{}{"string", 123, true})
-
--var tp, te, tt, t1 []string
--var flagb1, flagb2, flagb3, flagbr bool
--var flags1, flags2, flags3 string
--var flagi1, flagi2, flagi3, flagir int
--var globalFlag1 bool
--var flagEcho, rootcalled bool
+- assert.Equal(t, 0, count)
-
--var cmdPrint = &Command{
-- Use: "print [string to print]",
-- Short: "Print anything to the screen",
-- Long: `an utterly useless command for testing.`,
-- Run: func(cmd *Command, args []string) {
-- tp = args
-- },
-}
-
--var cmdEcho = &Command{
-- Use: "echo [string to echo]",
-- Aliases: []string{"say"},
-- Short: "Echo anything to the screen",
-- Long: `an utterly useless command for testing.`,
-- Run: func(cmd *Command, args []string) {
-- te = args
-- },
--}
+-func Test_Arguments_Diff_WithAnythingOfTypeArgument(t *testing.T) {
-
--var cmdTimes = &Command{
-- Use: "times [# times] [string to echo]",
-- Short: "Echo anything to the screen more times",
-- Long: `an slightly useless command for testing.`,
-- Run: func(cmd *Command, args []string) {
-- tt = args
-- },
--}
+- var args Arguments = []interface{}{"string", AnythingOfType("int"), true}
+- var count int
+- _, count = args.Diff([]interface{}{"string", 123, true})
-
--var cmdRootNoRun = &Command{
-- Use: "cobra-test",
-- Short: "The root can run it's own function",
-- Long: "The root description for help",
--}
+- assert.Equal(t, 0, count)
-
--var cmdRootSameName = &Command{
-- Use: "print",
-- Short: "Root with the same name as a subcommand",
-- Long: "The root description for help",
-}
-
--var cmdRootWithRun = &Command{
-- Use: "cobra-test",
-- Short: "The root can run it's own function",
-- Long: "The root description for help",
-- Run: func(cmd *Command, args []string) {
-- rootcalled = true
-- },
--}
+-func Test_Arguments_Diff_WithAnythingOfTypeArgument_Failing(t *testing.T) {
+-
+- var args Arguments = []interface{}{"string", AnythingOfType("string"), true}
+- var count int
+- var diff string
+- diff, count = args.Diff([]interface{}{"string", 123, true})
+-
+- assert.Equal(t, 1, count)
+- assert.Contains(t, diff, `string != type int - %!s(int=123)`)
-
--func flagInit() {
-- cmdEcho.ResetFlags()
-- cmdPrint.ResetFlags()
-- cmdTimes.ResetFlags()
-- cmdRootNoRun.ResetFlags()
-- cmdRootSameName.ResetFlags()
-- cmdRootWithRun.ResetFlags()
-- cmdEcho.Flags().IntVarP(&flagi1, "intone", "i", 123, "help message for flag intone")
-- cmdTimes.Flags().IntVarP(&flagi2, "inttwo", "j", 234, "help message for flag inttwo")
-- cmdPrint.Flags().IntVarP(&flagi3, "intthree", "i", 345, "help message for flag intthree")
-- cmdEcho.PersistentFlags().StringVarP(&flags1, "strone", "s", "one", "help message for flag strone")
-- cmdTimes.PersistentFlags().StringVarP(&flags2, "strtwo", "t", "two", "help message for flag strtwo")
-- cmdPrint.PersistentFlags().StringVarP(&flags3, "strthree", "s", "three", "help message for flag strthree")
-- cmdEcho.Flags().BoolVarP(&flagb1, "boolone", "b", true, "help message for flag boolone")
-- cmdTimes.Flags().BoolVarP(&flagb2, "booltwo", "c", false, "help message for flag booltwo")
-- cmdPrint.Flags().BoolVarP(&flagb3, "boolthree", "b", true, "help message for flag boolthree")
-}
-
--func commandInit() {
-- cmdEcho.ResetCommands()
-- cmdPrint.ResetCommands()
-- cmdTimes.ResetCommands()
-- cmdRootNoRun.ResetCommands()
-- cmdRootSameName.ResetCommands()
-- cmdRootWithRun.ResetCommands()
+-func Test_Arguments_Assert(t *testing.T) {
+-
+- var args Arguments = []interface{}{"string", 123, true}
+-
+- assert.True(t, args.Assert(t, "string", 123, true))
+-
-}
-
--func initialize() *Command {
-- tt, tp, te = nil, nil, nil
-- var c = cmdRootNoRun
-- flagInit()
-- commandInit()
-- return c
+-func Test_Arguments_String_Representation(t *testing.T) {
+-
+- var args Arguments = []interface{}{"string", 123, true}
+- assert.Equal(t, `string,int,bool`, args.String())
+-
-}
-
--func initializeWithSameName() *Command {
-- tt, tp, te = nil, nil, nil
-- var c = cmdRootSameName
-- flagInit()
-- commandInit()
-- return c
+-func Test_Arguments_String(t *testing.T) {
+-
+- var args Arguments = []interface{}{"string", 123, true}
+- assert.Equal(t, "string", args.String(0))
+-
-}
-
--func initializeWithRootCmd() *Command {
-- cmdRootWithRun.ResetCommands()
-- tt, tp, te, rootcalled = nil, nil, nil, false
-- flagInit()
-- cmdRootWithRun.Flags().BoolVarP(&flagbr, "boolroot", "b", false, "help message for flag boolroot")
-- cmdRootWithRun.Flags().IntVarP(&flagir, "introot", "i", 321, "help message for flag introot")
-- commandInit()
-- return cmdRootWithRun
+-func Test_Arguments_Error(t *testing.T) {
+-
+- var err error = errors.New("An Error")
+- var args Arguments = []interface{}{"string", 123, true, err}
+- assert.Equal(t, err, args.Error(3))
+-
-}
-
--type resulter struct {
-- Error error
-- Output string
-- Command *Command
+-func Test_Arguments_Error_Nil(t *testing.T) {
+-
+- var args Arguments = []interface{}{"string", 123, true, nil}
+- assert.Equal(t, nil, args.Error(3))
+-
-}
-
--func fullSetupTest(input string) resulter {
-- c := initializeWithRootCmd()
+-func Test_Arguments_Int(t *testing.T) {
+-
+- var args Arguments = []interface{}{"string", 123, true}
+- assert.Equal(t, 123, args.Int(1))
-
-- return fullTester(c, input)
-}
-
--func noRRSetupTest(input string) resulter {
-- c := initialize()
+-func Test_Arguments_Bool(t *testing.T) {
+-
+- var args Arguments = []interface{}{"string", 123, true}
+- assert.Equal(t, true, args.Bool(2))
+-
+-}
+diff --git a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/.gitignore b/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/.gitignore
+deleted file mode 100644
+index 1f0a99f..0000000
+--- a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/.gitignore
++++ /dev/null
+@@ -1,4 +0,0 @@
+-[568].out
+-_go*
+-_test*
+-_obj
+diff --git a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/License b/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/License
+deleted file mode 100644
+index 480a328..0000000
+--- a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/License
++++ /dev/null
+@@ -1,19 +0,0 @@
+-Copyright 2012 Keith Rarick
-
-- return fullTester(c, input)
--}
+-Permission is hereby granted, free of charge, to any person obtaining a copy
+-of this software and associated documentation files (the "Software"), to deal
+-in the Software without restriction, including without limitation the rights
+-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+-copies of the Software, and to permit persons to whom the Software is
+-furnished to do so, subject to the following conditions:
-
--func fullTester(c *Command, input string) resulter {
-- buf := new(bytes.Buffer)
-- // Testing flag with invalid input
-- c.SetOutput(buf)
-- cmdEcho.AddCommand(cmdTimes)
-- c.AddCommand(cmdPrint, cmdEcho)
-- c.SetArgs(strings.Split(input, " "))
+-The above copyright notice and this permission notice shall be included in
+-all copies or substantial portions of the Software.
-
-- err := c.Execute()
-- output := buf.String()
+-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+-THE SOFTWARE.
+diff --git a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/Readme b/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/Readme
+deleted file mode 100644
+index c589fc6..0000000
+--- a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/Readme
++++ /dev/null
+@@ -1,9 +0,0 @@
+-package pretty
-
-- return resulter{err, output, c}
--}
+- import "github.com/kr/pretty"
-
--func checkResultContains(t *testing.T, x resulter, check string) {
-- if !strings.Contains(x.Output, check) {
-- t.Errorf("Unexpected response.\nExpecting to contain: \n %q\nGot:\n %q\n", check, x.Output)
-- }
--}
+- Package pretty provides pretty-printing for Go values.
-
--func checkOutputContains(t *testing.T, c *Command, check string) {
-- buf := new(bytes.Buffer)
-- c.SetOutput(buf)
-- c.Execute()
+-Documentation
-
-- if !strings.Contains(buf.String(), check) {
-- t.Errorf("Unexpected response.\nExpecting to contain: \n %q\nGot:\n %q\n", check, buf.String())
-- }
--}
+- http://godoc.org/github.com/kr/pretty
+diff --git a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/changelog b/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/changelog
+deleted file mode 100644
+index 9350c05..0000000
+--- a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/changelog
++++ /dev/null
+@@ -1,5 +0,0 @@
+-golang-pretty (0.0~git20130613-1) unstable; urgency=low
-
--func TestSingleCommand(t *testing.T) {
-- noRRSetupTest("print one two")
+- * Initial release. Closes: #722983
-
-- if te != nil || tt != nil {
-- t.Error("Wrong command called")
-- }
-- if tp == nil {
-- t.Error("Wrong command called")
-- }
-- if strings.Join(tp, " ") != "one two" {
-- t.Error("Command didn't parse correctly")
-- }
--}
+- -- Tonnerre Lombard <tonnerre at ancient-solutions.com> Wed, 11 Sep 2013 02:36:12 +0200
+diff --git a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/compat b/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/compat
+deleted file mode 100644
+index ec63514..0000000
+--- a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/compat
++++ /dev/null
+@@ -1 +0,0 @@
+-9
+diff --git a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/control b/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/control
+deleted file mode 100644
+index a852fe7..0000000
+--- a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/control
++++ /dev/null
+@@ -1,22 +0,0 @@
+-Source: golang-pretty
+-Section: devel
+-Priority: extra
+-Maintainer: Tonnerre Lombard <tonnerre at ancient-solutions.com>
+-Build-Depends: debhelper (>= 9), golang-go, dh-golang,
+- golang-text-dev
+-Standards-Version: 3.9.4
+-Homepage: https://github.com/kr/pretty/
+-Vcs-Git: git://anonscm.debian.org/pkg-go/packages/golang-pretty.git
+-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-go/packages/golang-pretty.git;a=summary
-
--func TestChildCommand(t *testing.T) {
-- noRRSetupTest("echo times one two")
+-Package: golang-pretty-dev
+-Architecture: all
+-Depends: ${shlibs:Depends}, ${misc:Depends}, golang-text-dev
+-Description: Pretty printing for go values
+- Package pretty provides pretty-printing for Go values. This is useful
+- during debugging, to avoid wrapping long output lines in the
+- terminal.
+- .
+- It provides a function, Formatter, that can be used with any function
+- that accepts a format string. It also provides convenience wrappers
+- for functions in packages fmt and log.
+diff --git a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/copyright b/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/copyright
+deleted file mode 100644
+index 80b0807..0000000
+--- a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/copyright
++++ /dev/null
+@@ -1,30 +0,0 @@
+-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+-Upstream-Name: golang-pretty
+-Source: https://github.com/kr/pretty/
-
-- if te != nil || tp != nil {
-- t.Error("Wrong command called")
-- }
-- if tt == nil {
-- t.Error("Wrong command called")
-- }
-- if strings.Join(tt, " ") != "one two" {
-- t.Error("Command didn't parse correctly")
-- }
--}
+-Files: *
+-Copyright: 2011, 2012, 2013 Keith Rarick <kr at xph.us>
+-License: Expat
-
--func TestCommandAlias(t *testing.T) {
-- noRRSetupTest("say times one two")
+-Files: debian/*
+-Copyright: 2013 Tonnerre Lombard <tonnerre at ancient-solutions.com>
+-License: Expat
-
-- if te != nil || tp != nil {
-- t.Error("Wrong command called")
-- }
-- if tt == nil {
-- t.Error("Wrong command called")
-- }
-- if strings.Join(tt, " ") != "one two" {
-- t.Error("Command didn't parse correctly")
-- }
--}
+-License: Expat
+- Permission is hereby granted, free of charge, to any person obtaining a copy
+- of this software and associated documentation files (the "Software"), to deal
+- in the Software without restriction, including without limitation the rights
+- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+- copies of the Software, and to permit persons to whom the Software is
+- furnished to do so, subject to the following conditions:
+- .
+- The above copyright notice and this permission notice shall be included in
+- all copies or substantial portions of the Software.
+- .
+- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+- THE SOFTWARE.
+diff --git a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/docs b/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/docs
+deleted file mode 100644
+index 304360c..0000000
+--- a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/docs
++++ /dev/null
+@@ -1 +0,0 @@
+-Readme
+diff --git a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/rules b/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/rules
+deleted file mode 100644
+index c48a3ad..0000000
+--- a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/rules
++++ /dev/null
+@@ -1,11 +0,0 @@
+-#!/usr/bin/make -f
-
--func TestPrefixMatching(t *testing.T) {
-- EnablePrefixMatching = true
-- noRRSetupTest("ech times one two")
+-# Uncomment this to turn on verbose mode.
+-export DH_VERBOSE=1
-
-- if te != nil || tp != nil {
-- t.Error("Wrong command called")
-- }
-- if tt == nil {
-- t.Error("Wrong command called")
-- }
-- if strings.Join(tt, " ") != "one two" {
-- t.Error("Command didn't parse correctly")
-- }
+-# DH_GOPKG is the upstream path which you would normally “go get”.
+-# Using it allows us to build applications without patching locations.
+-export DH_GOPKG := github.com/kr/pretty
-
-- EnablePrefixMatching = false
--}
+-%:
+- dh $@ --buildsystem=golang --with=golang
+diff --git a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/source/format b/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/source/format
+deleted file mode 100644
+index 163aaf8..0000000
+--- a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/source/format
++++ /dev/null
+@@ -1 +0,0 @@
+-3.0 (quilt)
+diff --git a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/diff.go b/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/diff.go
+deleted file mode 100644
+index 64fac64..0000000
+--- a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/diff.go
++++ /dev/null
+@@ -1,148 +0,0 @@
+-package pretty
-
--func TestNoPrefixMatching(t *testing.T) {
-- EnablePrefixMatching = false
+-import (
+- "fmt"
+- "io"
+- "reflect"
+-)
-
-- noRRSetupTest("ech times one two")
+-type sbuf []string
-
-- if !(tt == nil && te == nil && tp == nil) {
-- t.Error("Wrong command called")
-- }
+-func (s *sbuf) Write(b []byte) (int, error) {
+- *s = append(*s, string(b))
+- return len(b), nil
-}
-
--func TestAliasPrefixMatching(t *testing.T) {
-- EnablePrefixMatching = true
-- noRRSetupTest("sa times one two")
--
-- if te != nil || tp != nil {
-- t.Error("Wrong command called")
-- }
-- if tt == nil {
-- t.Error("Wrong command called")
-- }
-- if strings.Join(tt, " ") != "one two" {
-- t.Error("Command didn't parse correctly")
-- }
-- EnablePrefixMatching = false
+-// Diff returns a slice where each element describes
+-// a difference between a and b.
+-func Diff(a, b interface{}) (desc []string) {
+- Fdiff((*sbuf)(&desc), a, b)
+- return desc
-}
-
--func TestChildSameName(t *testing.T) {
-- c := initializeWithSameName()
-- c.AddCommand(cmdPrint, cmdEcho)
-- c.SetArgs(strings.Split("print one two", " "))
-- c.Execute()
--
-- if te != nil || tt != nil {
-- t.Error("Wrong command called")
-- }
-- if tp == nil {
-- t.Error("Wrong command called")
-- }
-- if strings.Join(tp, " ") != "one two" {
-- t.Error("Command didn't parse correctly")
-- }
+-// Fdiff writes to w a description of the differences between a and b.
+-func Fdiff(w io.Writer, a, b interface{}) {
+- diffWriter{w: w}.diff(reflect.ValueOf(a), reflect.ValueOf(b))
-}
-
--func TestFlagLong(t *testing.T) {
-- noRRSetupTest("echo --intone=13 something here")
+-type diffWriter struct {
+- w io.Writer
+- l string // label
+-}
-
-- if strings.Join(te, " ") != "something here" {
-- t.Errorf("flags didn't leave proper args remaining..%s given", te)
-- }
-- if flagi1 != 13 {
-- t.Errorf("int flag didn't get correct value, had %d", flagi1)
-- }
-- if flagi2 != 234 {
-- t.Errorf("default flag value changed, 234 expected, %d given", flagi2)
+-func (w diffWriter) printf(f string, a ...interface{}) {
+- var l string
+- if w.l != "" {
+- l = w.l + ": "
- }
+- fmt.Fprintf(w.w, l+f, a...)
-}
-
--func TestFlagShort(t *testing.T) {
-- noRRSetupTest("echo -i13 something here")
--
-- if strings.Join(te, " ") != "something here" {
-- t.Errorf("flags didn't leave proper args remaining..%s given", te)
+-func (w diffWriter) diff(av, bv reflect.Value) {
+- if !av.IsValid() && bv.IsValid() {
+- w.printf("nil != %#v", bv.Interface())
+- return
- }
-- if flagi1 != 13 {
-- t.Errorf("int flag didn't get correct value, had %d", flagi1)
+- if av.IsValid() && !bv.IsValid() {
+- w.printf("%#v != nil", av.Interface())
+- return
- }
-- if flagi2 != 234 {
-- t.Errorf("default flag value changed, 234 expected, %d given", flagi2)
+- if !av.IsValid() && !bv.IsValid() {
+- return
- }
-
-- noRRSetupTest("echo -i 13 something here")
--
-- if strings.Join(te, " ") != "something here" {
-- t.Errorf("flags didn't leave proper args remaining..%s given", te)
-- }
-- if flagi1 != 13 {
-- t.Errorf("int flag didn't get correct value, had %d", flagi1)
+- at := av.Type()
+- bt := bv.Type()
+- if at != bt {
+- w.printf("%v != %v", at, bt)
+- return
- }
-- if flagi2 != 234 {
-- t.Errorf("default flag value changed, 234 expected, %d given", flagi2)
+-
+- // numeric types, including bool
+- if at.Kind() < reflect.Array {
+- a, b := av.Interface(), bv.Interface()
+- if a != b {
+- w.printf("%#v != %#v", a, b)
+- }
+- return
- }
-
-- noRRSetupTest("print -i99 one two")
+- switch at.Kind() {
+- case reflect.String:
+- a, b := av.Interface(), bv.Interface()
+- if a != b {
+- w.printf("%q != %q", a, b)
+- }
+- case reflect.Ptr:
+- switch {
+- case av.IsNil() && !bv.IsNil():
+- w.printf("nil != %v", bv.Interface())
+- case !av.IsNil() && bv.IsNil():
+- w.printf("%v != nil", av.Interface())
+- case !av.IsNil() && !bv.IsNil():
+- w.diff(av.Elem(), bv.Elem())
+- }
+- case reflect.Struct:
+- for i := 0; i < av.NumField(); i++ {
+- w.relabel(at.Field(i).Name).diff(av.Field(i), bv.Field(i))
+- }
+- case reflect.Map:
+- ak, both, bk := keyDiff(av.MapKeys(), bv.MapKeys())
+- for _, k := range ak {
+- w := w.relabel(fmt.Sprintf("[%#v]", k.Interface()))
+- w.printf("%q != (missing)", av.MapIndex(k))
+- }
+- for _, k := range both {
+- w := w.relabel(fmt.Sprintf("[%#v]", k.Interface()))
+- w.diff(av.MapIndex(k), bv.MapIndex(k))
+- }
+- for _, k := range bk {
+- w := w.relabel(fmt.Sprintf("[%#v]", k.Interface()))
+- w.printf("(missing) != %q", bv.MapIndex(k))
+- }
+- case reflect.Interface:
+- w.diff(reflect.ValueOf(av.Interface()), reflect.ValueOf(bv.Interface()))
+- default:
+- if !reflect.DeepEqual(av.Interface(), bv.Interface()) {
+- w.printf("%# v != %# v", Formatter(av.Interface()), Formatter(bv.Interface()))
+- }
+- }
+-}
-
-- if strings.Join(tp, " ") != "one two" {
-- t.Errorf("flags didn't leave proper args remaining..%s given", tp)
+-func (d diffWriter) relabel(name string) (d1 diffWriter) {
+- d1 = d
+- if d.l != "" && name[0] != '[' {
+- d1.l += "."
- }
-- if flagi3 != 99 {
-- t.Errorf("int flag didn't get correct value, had %d", flagi3)
+- d1.l += name
+- return d1
+-}
+-
+-func keyDiff(a, b []reflect.Value) (ak, both, bk []reflect.Value) {
+- for _, av := range a {
+- inBoth := false
+- for _, bv := range b {
+- if reflect.DeepEqual(av.Interface(), bv.Interface()) {
+- inBoth = true
+- both = append(both, av)
+- break
+- }
+- }
+- if !inBoth {
+- ak = append(ak, av)
+- }
- }
-- if flagi1 != 123 {
-- t.Errorf("default flag value changed on different command with same shortname, 234 expected, %d given", flagi2)
+- for _, bv := range b {
+- inBoth := false
+- for _, av := range a {
+- if reflect.DeepEqual(av.Interface(), bv.Interface()) {
+- inBoth = true
+- break
+- }
+- }
+- if !inBoth {
+- bk = append(bk, bv)
+- }
- }
+- return
-}
+diff --git a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/diff_test.go b/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/diff_test.go
+deleted file mode 100644
+index 02d1953..0000000
+--- a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/diff_test.go
++++ /dev/null
+@@ -1,73 +0,0 @@
+-package pretty
-
--func TestChildCommandFlags(t *testing.T) {
-- noRRSetupTest("echo times -j 99 one two")
--
-- if strings.Join(tt, " ") != "one two" {
-- t.Errorf("flags didn't leave proper args remaining..%s given", tt)
-- }
+-import (
+- "testing"
+-)
-
-- // Testing with flag that shouldn't be persistent
-- r := noRRSetupTest("echo times -j 99 -i77 one two")
+-type difftest struct {
+- a interface{}
+- b interface{}
+- exp []string
+-}
-
-- if r.Error == nil {
-- t.Errorf("invalid flag should generate error")
-- }
+-type S struct {
+- A int
+- S *S
+- I interface{}
+- C []int
+-}
-
-- if !strings.Contains(r.Output, "unknown shorthand") {
-- t.Errorf("Wrong error message displayed, \n %s", r.Output)
-- }
+-var diffs = []difftest{
+- {a: nil, b: nil},
+- {a: S{A: 1}, b: S{A: 1}},
-
-- if flagi2 != 99 {
-- t.Errorf("flag value should be 99, %d given", flagi2)
-- }
+- {0, "", []string{`int != string`}},
+- {0, 1, []string{`0 != 1`}},
+- {S{}, new(S), []string{`pretty.S != *pretty.S`}},
+- {"a", "b", []string{`"a" != "b"`}},
+- {S{}, S{A: 1}, []string{`A: 0 != 1`}},
+- {new(S), &S{A: 1}, []string{`A: 0 != 1`}},
+- {S{S: new(S)}, S{S: &S{A: 1}}, []string{`S.A: 0 != 1`}},
+- {S{}, S{I: 0}, []string{`I: nil != 0`}},
+- {S{I: 1}, S{I: "x"}, []string{`I: int != string`}},
+- {S{}, S{C: []int{1}}, []string{`C: []int(nil) != []int{1}`}},
+- {S{C: []int{}}, S{C: []int{1}}, []string{`C: []int{} != []int{1}`}},
+- {S{}, S{A: 1, S: new(S)}, []string{`A: 0 != 1`, `S: nil != &{0 <nil> <nil> []}`}},
+-}
-
-- if flagi1 != 123 {
-- t.Errorf("unset flag should have default value, expecting 123, given %d", flagi1)
+-func TestDiff(t *testing.T) {
+- for _, tt := range diffs {
+- got := Diff(tt.a, tt.b)
+- eq := len(got) == len(tt.exp)
+- if eq {
+- for i := range got {
+- eq = eq && got[i] == tt.exp[i]
+- }
+- }
+- if !eq {
+- t.Errorf("diffing % #v", tt.a)
+- t.Errorf("with % #v", tt.b)
+- diffdiff(t, got, tt.exp)
+- continue
+- }
- }
+-}
-
-- // Testing with flag only existing on child
-- r = noRRSetupTest("echo -j 99 -i77 one two")
--
-- if r.Error == nil {
-- t.Errorf("invalid flag should generate error")
-- }
+-func diffdiff(t *testing.T, got, exp []string) {
+- minus(t, "unexpected:", got, exp)
+- minus(t, "missing:", exp, got)
+-}
-
-- if !strings.Contains(r.Output, "intone=123") {
-- t.Errorf("Wrong error message displayed, \n %s", r.Output)
+-func minus(t *testing.T, s string, a, b []string) {
+- var i, j int
+- for i = 0; i < len(a); i++ {
+- for j = 0; j < len(b); j++ {
+- if a[i] == b[j] {
+- break
+- }
+- }
+- if j == len(b) {
+- t.Error(s, a[i])
+- }
- }
+-}
+diff --git a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/example_test.go b/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/example_test.go
+deleted file mode 100644
+index ecf40f3..0000000
+--- a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/example_test.go
++++ /dev/null
+@@ -1,20 +0,0 @@
+-package pretty_test
-
-- // Testing flag with invalid input
-- r = noRRSetupTest("echo -i10E")
--
-- if r.Error == nil {
-- t.Errorf("invalid input should generate error")
-- }
+-import (
+- "fmt"
+- "github.com/kr/pretty"
+-)
-
-- if !strings.Contains(r.Output, "invalid argument \"10E\" for -i10E") {
-- t.Errorf("Wrong error message displayed, \n %s", r.Output)
+-func Example() {
+- type myType struct {
+- a, b int
- }
+- var x = []myType{{1, 2}, {3, 4}, {5, 6}}
+- fmt.Printf("%# v", pretty.Formatter(x))
+- // output:
+- // []pretty_test.myType{
+- // {a:1, b:2},
+- // {a:3, b:4},
+- // {a:5, b:6},
+- // }
-}
+diff --git a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/formatter.go b/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/formatter.go
+deleted file mode 100644
+index 1161de7..0000000
+--- a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/formatter.go
++++ /dev/null
+@@ -1,300 +0,0 @@
+-package pretty
-
--func TestTrailingCommandFlags(t *testing.T) {
-- x := fullSetupTest("echo two -x")
+-import (
+- "fmt"
+- "github.com/kr/text"
+- "io"
+- "reflect"
+- "strconv"
+- "text/tabwriter"
+-)
-
-- if x.Error == nil {
-- t.Errorf("invalid flag should generate error")
-- }
+-const (
+- limit = 50
+-)
+-
+-type formatter struct {
+- x interface{}
+- force bool
+- quote bool
-}
-
--func TestPersistentFlags(t *testing.T) {
-- fullSetupTest("echo -s something more here")
+-// Formatter makes a wrapper, f, that will format x as go source with line
+-// breaks and tabs. Object f responds to the "%v" formatting verb when both the
+-// "#" and " " (space) flags are set, for example:
+-//
+-// fmt.Sprintf("%# v", Formatter(x))
+-//
+-// If one of these two flags is not set, or any other verb is used, f will
+-// format x according to the usual rules of package fmt.
+-// In particular, if x satisfies fmt.Formatter, then x.Format will be called.
+-func Formatter(x interface{}) (f fmt.Formatter) {
+- return formatter{x: x, quote: true}
+-}
-
-- // persistentFlag should act like normal flag on it's own command
-- if strings.Join(te, " ") != "more here" {
-- t.Errorf("flags didn't leave proper args remaining..%s given", te)
-- }
+-func (fo formatter) String() string {
+- return fmt.Sprint(fo.x) // unwrap it
+-}
-
-- // persistentFlag should act like normal flag on it's own command
-- if flags1 != "something" {
-- t.Errorf("string flag didn't get correct value, had %v", flags1)
+-func (fo formatter) passThrough(f fmt.State, c rune) {
+- s := "%"
+- for i := 0; i < 128; i++ {
+- if f.Flag(i) {
+- s += string(i)
+- }
- }
--
-- fullSetupTest("echo times -s again -c test here")
--
-- if strings.Join(tt, " ") != "test here" {
-- t.Errorf("flags didn't leave proper args remaining..%s given", tt)
+- if w, ok := f.Width(); ok {
+- s += fmt.Sprintf("%d", w)
- }
--
-- if flags1 != "again" {
-- t.Errorf("string flag didn't get correct value, had %v", flags1)
+- if p, ok := f.Precision(); ok {
+- s += fmt.Sprintf(".%d", p)
- }
+- s += string(c)
+- fmt.Fprintf(f, s, fo.x)
+-}
-
-- if flagb2 != true {
-- t.Errorf("local flag not parsed correctly. Expected false, had %v", flagb2)
+-func (fo formatter) Format(f fmt.State, c rune) {
+- if fo.force || c == 'v' && f.Flag('#') && f.Flag(' ') {
+- w := tabwriter.NewWriter(f, 4, 4, 1, ' ', 0)
+- p := &printer{tw: w, Writer: w}
+- p.printValue(reflect.ValueOf(fo.x), true, fo.quote)
+- w.Flush()
+- return
- }
+- fo.passThrough(f, c)
-}
-
--func TestHelpCommand(t *testing.T) {
-- c := fullSetupTest("help echo")
-- checkResultContains(t, c, cmdEcho.Long)
--
-- r := fullSetupTest("help echo times")
-- checkResultContains(t, r, cmdTimes.Long)
+-type printer struct {
+- io.Writer
+- tw *tabwriter.Writer
-}
-
--func TestRunnableRootCommand(t *testing.T) {
-- fullSetupTest("")
+-func (p *printer) indent() *printer {
+- q := *p
+- q.tw = tabwriter.NewWriter(p.Writer, 4, 4, 1, ' ', 0)
+- q.Writer = text.NewIndentWriter(q.tw, []byte{'\t'})
+- return &q
+-}
-
-- if rootcalled != true {
-- t.Errorf("Root Function was not called")
+-func (p *printer) printInline(v reflect.Value, x interface{}, showType bool) {
+- if showType {
+- io.WriteString(p, v.Type().String())
+- fmt.Fprintf(p, "(%#v)", x)
+- } else {
+- fmt.Fprintf(p, "%#v", x)
- }
-}
-
--func TestRootFlags(t *testing.T) {
-- fullSetupTest("-i 17 -b")
--
-- if flagbr != true {
-- t.Errorf("flag value should be true, %v given", flagbr)
+-func (p *printer) printValue(v reflect.Value, showType, quote bool) {
+- switch v.Kind() {
+- case reflect.Bool:
+- p.printInline(v, v.Bool(), showType)
+- case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+- p.printInline(v, v.Int(), showType)
+- case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
+- p.printInline(v, v.Uint(), showType)
+- case reflect.Float32, reflect.Float64:
+- p.printInline(v, v.Float(), showType)
+- case reflect.Complex64, reflect.Complex128:
+- fmt.Fprintf(p, "%#v", v.Complex())
+- case reflect.String:
+- p.fmtString(v.String(), quote)
+- case reflect.Map:
+- t := v.Type()
+- if showType {
+- io.WriteString(p, t.String())
+- }
+- writeByte(p, '{')
+- if nonzero(v) {
+- expand := !canInline(v.Type())
+- pp := p
+- if expand {
+- writeByte(p, '\n')
+- pp = p.indent()
+- }
+- keys := v.MapKeys()
+- for i := 0; i < v.Len(); i++ {
+- showTypeInStruct := true
+- k := keys[i]
+- mv := v.MapIndex(k)
+- pp.printValue(k, false, true)
+- writeByte(pp, ':')
+- if expand {
+- writeByte(pp, '\t')
+- }
+- showTypeInStruct = t.Elem().Kind() == reflect.Interface
+- pp.printValue(mv, showTypeInStruct, true)
+- if expand {
+- io.WriteString(pp, ",\n")
+- } else if i < v.Len()-1 {
+- io.WriteString(pp, ", ")
+- }
+- }
+- if expand {
+- pp.tw.Flush()
+- }
+- }
+- writeByte(p, '}')
+- case reflect.Struct:
+- t := v.Type()
+- if showType {
+- io.WriteString(p, t.String())
+- }
+- writeByte(p, '{')
+- if nonzero(v) {
+- expand := !canInline(v.Type())
+- pp := p
+- if expand {
+- writeByte(p, '\n')
+- pp = p.indent()
+- }
+- for i := 0; i < v.NumField(); i++ {
+- showTypeInStruct := true
+- if f := t.Field(i); f.Name != "" {
+- io.WriteString(pp, f.Name)
+- writeByte(pp, ':')
+- if expand {
+- writeByte(pp, '\t')
+- }
+- showTypeInStruct = f.Type.Kind() == reflect.Interface
+- }
+- pp.printValue(getField(v, i), showTypeInStruct, true)
+- if expand {
+- io.WriteString(pp, ",\n")
+- } else if i < v.NumField()-1 {
+- io.WriteString(pp, ", ")
+- }
+- }
+- if expand {
+- pp.tw.Flush()
+- }
+- }
+- writeByte(p, '}')
+- case reflect.Interface:
+- switch e := v.Elem(); {
+- case e.Kind() == reflect.Invalid:
+- io.WriteString(p, "nil")
+- case e.IsValid():
+- p.printValue(e, showType, true)
+- default:
+- io.WriteString(p, v.Type().String())
+- io.WriteString(p, "(nil)")
+- }
+- case reflect.Array, reflect.Slice:
+- t := v.Type()
+- if showType {
+- io.WriteString(p, t.String())
+- }
+- if v.Kind() == reflect.Slice && v.IsNil() && showType {
+- io.WriteString(p, "(nil)")
+- break
+- }
+- if v.Kind() == reflect.Slice && v.IsNil() {
+- io.WriteString(p, "nil")
+- break
+- }
+- writeByte(p, '{')
+- expand := !canInline(v.Type())
+- pp := p
+- if expand {
+- writeByte(p, '\n')
+- pp = p.indent()
+- }
+- for i := 0; i < v.Len(); i++ {
+- showTypeInSlice := t.Elem().Kind() == reflect.Interface
+- pp.printValue(v.Index(i), showTypeInSlice, true)
+- if expand {
+- io.WriteString(pp, ",\n")
+- } else if i < v.Len()-1 {
+- io.WriteString(pp, ", ")
+- }
+- }
+- if expand {
+- pp.tw.Flush()
+- }
+- writeByte(p, '}')
+- case reflect.Ptr:
+- e := v.Elem()
+- if !e.IsValid() {
+- writeByte(p, '(')
+- io.WriteString(p, v.Type().String())
+- io.WriteString(p, ")(nil)")
+- } else {
+- writeByte(p, '&')
+- p.printValue(e, true, true)
+- }
+- case reflect.Chan:
+- x := v.Pointer()
+- if showType {
+- writeByte(p, '(')
+- io.WriteString(p, v.Type().String())
+- fmt.Fprintf(p, ")(%#v)", x)
+- } else {
+- fmt.Fprintf(p, "%#v", x)
+- }
+- case reflect.Func:
+- io.WriteString(p, v.Type().String())
+- io.WriteString(p, " {...}")
+- case reflect.UnsafePointer:
+- p.printInline(v, v.Pointer(), showType)
+- case reflect.Invalid:
+- io.WriteString(p, "nil")
- }
+-}
-
-- if flagir != 17 {
-- t.Errorf("flag value should be 17, %d given", flagir)
+-func canInline(t reflect.Type) bool {
+- switch t.Kind() {
+- case reflect.Map:
+- return !canExpand(t.Elem())
+- case reflect.Struct:
+- for i := 0; i < t.NumField(); i++ {
+- if canExpand(t.Field(i).Type) {
+- return false
+- }
+- }
+- return true
+- case reflect.Interface:
+- return false
+- case reflect.Array, reflect.Slice:
+- return !canExpand(t.Elem())
+- case reflect.Ptr:
+- return false
+- case reflect.Chan, reflect.Func, reflect.UnsafePointer:
+- return false
- }
+- return true
-}
-
--func TestRootHelp(t *testing.T) {
-- x := fullSetupTest("--help")
--
-- checkResultContains(t, x, "Available Commands:")
+-func canExpand(t reflect.Type) bool {
+- switch t.Kind() {
+- case reflect.Map, reflect.Struct,
+- reflect.Interface, reflect.Array, reflect.Slice,
+- reflect.Ptr:
+- return true
+- }
+- return false
+-}
-
-- if strings.Contains(x.Output, "unknown flag: --help") {
-- t.Errorf("--help shouldn't trigger an error, Got: \n %s", x.Output)
+-func (p *printer) fmtString(s string, quote bool) {
+- if quote {
+- s = strconv.Quote(s)
- }
+- io.WriteString(p, s)
+-}
-
-- x = fullSetupTest("echo --help")
+-func tryDeepEqual(a, b interface{}) bool {
+- defer func() { recover() }()
+- return reflect.DeepEqual(a, b)
+-}
-
-- checkResultContains(t, x, "Available Commands:")
+-func writeByte(w io.Writer, b byte) {
+- w.Write([]byte{b})
+-}
-
-- if strings.Contains(x.Output, "unknown flag: --help") {
-- t.Errorf("--help shouldn't trigger an error, Got: \n %s", x.Output)
+-func getField(v reflect.Value, i int) reflect.Value {
+- val := v.Field(i)
+- if val.Kind() == reflect.Interface && !val.IsNil() {
+- val = val.Elem()
- }
--
+- return val
-}
+diff --git a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/formatter_test.go b/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/formatter_test.go
+deleted file mode 100644
+index 303f033..0000000
+--- a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/formatter_test.go
++++ /dev/null
+@@ -1,146 +0,0 @@
+-package pretty
-
--func TestFlagsBeforeCommand(t *testing.T) {
-- // short without space
-- x := fullSetupTest("-i10 echo")
-- if x.Error != nil {
-- t.Errorf("Valid Input shouldn't have errors, got:\n %q", x.Error)
-- }
+-import (
+- "fmt"
+- "io"
+- "testing"
+- "unsafe"
+-)
-
-- // short (int) with equals
-- // It appears that pflags doesn't support this...
-- // Commenting out until support can be added
+-type test struct {
+- v interface{}
+- s string
+-}
-
-- //x = noRRSetupTest("echo -i=10")
-- //if x.Error != nil {
-- //t.Errorf("Valid Input shouldn't have errors, got:\n %s", x.Error)
-- //}
+-type LongStructTypeName struct {
+- longFieldName interface{}
+- otherLongFieldName interface{}
+-}
-
-- // long with equals
-- x = noRRSetupTest("--intone=123 echo one two")
-- if x.Error != nil {
-- t.Errorf("Valid Input shouldn't have errors, got:\n %s", x.Error)
-- }
+-type SA struct {
+- t *T
+-}
-
-- // With parsing error properly reported
-- x = fullSetupTest("-i10E echo")
-- if !strings.Contains(x.Output, "invalid argument \"10E\" for -i10E") {
-- t.Errorf("Wrong error message displayed, \n %s", x.Output)
-- }
+-type T struct {
+- x, y int
+-}
-
-- //With quotes
-- x = fullSetupTest("-s=\"walking\" echo")
-- if x.Error != nil {
-- t.Errorf("Valid Input shouldn't have errors, got:\n %q", x.Error)
-- }
+-type F int
-
-- //With quotes and space
-- x = fullSetupTest("-s=\"walking fast\" echo")
-- if x.Error != nil {
-- t.Errorf("Valid Input shouldn't have errors, got:\n %q", x.Error)
-- }
+-func (f F) Format(s fmt.State, c rune) {
+- fmt.Fprintf(s, "F(%d)", int(f))
+-}
-
-- //With inner quote
-- x = fullSetupTest("-s=\"walking \\\"Inner Quote\\\" fast\" echo")
-- if x.Error != nil {
-- t.Errorf("Valid Input shouldn't have errors, got:\n %q", x.Error)
-- }
+-var long = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+-
+-var gosyntax = []test{
+- {nil, `nil`},
+- {"", `""`},
+- {"a", `"a"`},
+- {1, "int(1)"},
+- {1.0, "float64(1)"},
+- {[]int(nil), "[]int(nil)"},
+- {[0]int{}, "[0]int{}"},
+- {complex(1, 0), "(1+0i)"},
+- //{make(chan int), "(chan int)(0x1234)"},
+- {unsafe.Pointer(uintptr(1)), "unsafe.Pointer(0x1)"},
+- {func(int) {}, "func(int) {...}"},
+- {map[int]int{1: 1}, "map[int]int{1:1}"},
+- {int32(1), "int32(1)"},
+- {io.EOF, `&errors.errorString{s:"EOF"}`},
+- {[]string{"a"}, `[]string{"a"}`},
+- {
+- []string{long},
+- `[]string{"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"}`,
+- },
+- {F(5), "pretty.F(5)"},
+- {
+- SA{&T{1, 2}},
+- `pretty.SA{
+- t: &pretty.T{x:1, y:2},
+-}`,
+- },
+- {
+- map[int][]byte{1: []byte{}},
+- `map[int][]uint8{
+- 1: {},
+-}`,
+- },
+- {
+- map[int]T{1: T{}},
+- `map[int]pretty.T{
+- 1: {},
+-}`,
+- },
+- {
+- long,
+- `"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"`,
+- },
+- {
+- LongStructTypeName{
+- longFieldName: LongStructTypeName{},
+- otherLongFieldName: long,
+- },
+- `pretty.LongStructTypeName{
+- longFieldName: pretty.LongStructTypeName{},
+- otherLongFieldName: "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789",
+-}`,
+- },
+- {
+- &LongStructTypeName{
+- longFieldName: &LongStructTypeName{},
+- otherLongFieldName: (*LongStructTypeName)(nil),
+- },
+- `&pretty.LongStructTypeName{
+- longFieldName: &pretty.LongStructTypeName{},
+- otherLongFieldName: (*pretty.LongStructTypeName)(nil),
+-}`,
+- },
+- {
+- []LongStructTypeName{
+- {nil, nil},
+- {3, 3},
+- {long, nil},
+- },
+- `[]pretty.LongStructTypeName{
+- {},
+- {
+- longFieldName: int(3),
+- otherLongFieldName: int(3),
+- },
+- {
+- longFieldName: "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789",
+- otherLongFieldName: nil,
+- },
+-}`,
+- },
+- {
+- []interface{}{
+- LongStructTypeName{nil, nil},
+- []byte{1, 2, 3},
+- T{3, 4},
+- LongStructTypeName{long, nil},
+- },
+- `[]interface {}{
+- pretty.LongStructTypeName{},
+- []uint8{0x1, 0x2, 0x3},
+- pretty.T{x:3, y:4},
+- pretty.LongStructTypeName{
+- longFieldName: "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789",
+- otherLongFieldName: nil,
+- },
+-}`,
+- },
+-}
-
-- //With quotes and space
-- x = fullSetupTest("-s=\"walking \\\"Inner Quote\\\" fast\" echo")
-- if x.Error != nil {
-- t.Errorf("Valid Input shouldn't have errors, got:\n %q", x.Error)
+-func TestGoSyntax(t *testing.T) {
+- for _, tt := range gosyntax {
+- s := fmt.Sprintf("%# v", Formatter(tt.v))
+- if tt.s != s {
+- t.Errorf("expected %q", tt.s)
+- t.Errorf("got %q", s)
+- t.Errorf("expraw\n%s", tt.s)
+- t.Errorf("gotraw\n%s", s)
+- }
- }
--
-}
-diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/command.go b/Godeps/_workspace/src/github.com/spf13/cobra/command.go
+diff --git a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/pretty.go b/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/pretty.go
deleted file mode 100644
-index 1337065..0000000
---- a/Godeps/_workspace/src/github.com/spf13/cobra/command.go
+index d3df868..0000000
+--- a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/pretty.go
+++ /dev/null
-@@ -1,764 +0,0 @@
--// Copyright © 2013 Steve Francia <spf at spf13.com>.
--//
--// Licensed under the Apache License, Version 2.0 (the "License");
--// you may not use this file except in compliance with the License.
--// You may obtain a copy of the License at
--// http://www.apache.org/licenses/LICENSE-2.0
+@@ -1,98 +0,0 @@
+-// Package pretty provides pretty-printing for Go values. This is
+-// useful during debugging, to avoid wrapping long output lines in
+-// the terminal.
-//
--// Unless required by applicable law or agreed to in writing, software
--// distributed under the License is distributed on an "AS IS" BASIS,
--// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--// See the License for the specific language governing permissions and
--// limitations under the License.
--
--// Commands similar to git, go tools and other modern CLI tools
--// inspired by go, go-Commander, gh and subcommand
--
--package cobra
+-// It provides a function, Formatter, that can be used with any
+-// function that accepts a format string. It also provides
+-// convenience wrappers for functions in packages fmt and log.
+-package pretty
-
-import (
-- "bytes"
- "fmt"
- "io"
-- "os"
-- "strings"
--
-- flag "github.com/spf13/pflag"
+- "log"
-)
-
--// Command is just that, a command for your application.
--// eg. 'go run' ... 'run' is the command. Cobra requires
--// you to define the usage and description as part of your command
--// definition to ensure usability.
--type Command struct {
-- // Name is the command name, usually the executable's name.
-- name string
-- // The one-line usage message.
-- Use string
-- // An array of aliases that can be used instead of the first word in Use.
-- Aliases []string
-- // The short description shown in the 'help' output.
-- Short string
-- // The long message shown in the 'help <this-command>' output.
-- Long string
-- // Set of flags specific to this command.
-- flags *flag.FlagSet
-- // Set of flags children commands will inherit
-- pflags *flag.FlagSet
-- // Run runs the command.
-- // The args are the arguments after the command name.
-- Run func(cmd *Command, args []string)
-- // Commands is the list of commands supported by this program.
-- commands []*Command
-- // Parent Command for this command
-- parent *Command
-- // max lengths of commands' string lengths for use in padding
-- commandsMaxUseLen int
-- commandsMaxCommandPathLen int
--
-- flagErrorBuf *bytes.Buffer
--
-- args []string
-- output *io.Writer // nil means stderr; use Out() method instead
-- usageFunc func(*Command) error // Usage can be defined by application
-- usageTemplate string // Can be defined by Application
-- helpTemplate string // Can be defined by Application
-- helpFunc func(*Command, []string) // Help can be defined by application
-- helpCommand *Command // The help command
-- helpFlagVal bool
+-// Errorf is a convenience wrapper for fmt.Errorf.
+-//
+-// Calling Errorf(f, x, y) is equivalent to
+-// fmt.Errorf(f, Formatter(x), Formatter(y)).
+-func Errorf(format string, a ...interface{}) error {
+- return fmt.Errorf(format, wrap(a, false)...)
-}
-
--// os.Args[1:] by default, if desired, can be overridden
--// particularly useful when testing.
--func (c *Command) SetArgs(a []string) {
-- c.args = a
+-// Fprintf is a convenience wrapper for fmt.Fprintf.
+-//
+-// Calling Fprintf(w, f, x, y) is equivalent to
+-// fmt.Fprintf(w, f, Formatter(x), Formatter(y)).
+-func Fprintf(w io.Writer, format string, a ...interface{}) (n int, error error) {
+- return fmt.Fprintf(w, format, wrap(a, false)...)
-}
-
--func (c *Command) Out() io.Writer {
-- if c.output != nil {
-- return *c.output
-- }
--
-- if c.HasParent() {
-- return c.parent.Out()
-- } else {
-- return os.Stderr
-- }
+-// Log is a convenience wrapper for log.Printf.
+-//
+-// Calling Log(x, y) is equivalent to
+-// log.Print(Formatter(x), Formatter(y)), but each operand is
+-// formatted with "%# v".
+-func Log(a ...interface{}) {
+- log.Print(wrap(a, true)...)
-}
-
--// SetOutput sets the destination for usage and error messages.
--// If output is nil, os.Stderr is used.
--func (c *Command) SetOutput(output io.Writer) {
-- c.output = &output
+-// Logf is a convenience wrapper for log.Printf.
+-//
+-// Calling Logf(f, x, y) is equivalent to
+-// log.Printf(f, Formatter(x), Formatter(y)).
+-func Logf(format string, a ...interface{}) {
+- log.Printf(format, wrap(a, false)...)
-}
-
--// Usage can be defined by application
--func (c *Command) SetUsageFunc(f func(*Command) error) {
-- c.usageFunc = f
+-// Logln is a convenience wrapper for log.Printf.
+-//
+-// Calling Logln(x, y) is equivalent to
+-// log.Println(Formatter(x), Formatter(y)), but each operand is
+-// formatted with "%# v".
+-func Logln(a ...interface{}) {
+- log.Println(wrap(a, true)...)
-}
-
--// Can be defined by Application
--func (c *Command) SetUsageTemplate(s string) {
-- c.usageTemplate = s
+-// Print pretty-prints its operands and writes to standard output.
+-//
+-// Calling Print(x, y) is equivalent to
+-// fmt.Print(Formatter(x), Formatter(y)), but each operand is
+-// formatted with "%# v".
+-func Print(a ...interface{}) (n int, errno error) {
+- return fmt.Print(wrap(a, true)...)
-}
-
--// Can be defined by Application
--func (c *Command) SetHelpFunc(f func(*Command, []string)) {
-- c.helpFunc = f
+-// Printf is a convenience wrapper for fmt.Printf.
+-//
+-// Calling Printf(f, x, y) is equivalent to
+-// fmt.Printf(f, Formatter(x), Formatter(y)).
+-func Printf(format string, a ...interface{}) (n int, errno error) {
+- return fmt.Printf(format, wrap(a, false)...)
-}
-
--func (c *Command) SetHelpCommand(cmd *Command) {
-- c.helpCommand = cmd
+-// Println pretty-prints its operands and writes to standard output.
+-//
+-// Calling Print(x, y) is equivalent to
+-// fmt.Println(Formatter(x), Formatter(y)), but each operand is
+-// formatted with "%# v".
+-func Println(a ...interface{}) (n int, errno error) {
+- return fmt.Println(wrap(a, true)...)
-}
-
--// Can be defined by Application
--func (c *Command) SetHelpTemplate(s string) {
-- c.helpTemplate = s
+-// Sprintf is a convenience wrapper for fmt.Sprintf.
+-//
+-// Calling Sprintf(f, x, y) is equivalent to
+-// fmt.Sprintf(f, Formatter(x), Formatter(y)).
+-func Sprintf(format string, a ...interface{}) string {
+- return fmt.Sprintf(format, wrap(a, false)...)
-}
-
--func (c *Command) UsageFunc() (f func(*Command) error) {
-- if c.usageFunc != nil {
-- return c.usageFunc
-- }
--
-- if c.HasParent() {
-- return c.parent.UsageFunc()
-- } else {
-- return func(c *Command) error {
-- err := tmpl(c.Out(), c.UsageTemplate(), c)
-- return err
-- }
+-func wrap(a []interface{}, force bool) []interface{} {
+- w := make([]interface{}, len(a))
+- for i, x := range a {
+- w[i] = formatter{x: x, force: force}
- }
+- return w
-}
--func (c *Command) HelpFunc() func(*Command, []string) {
-- if c.helpFunc != nil {
-- return c.helpFunc
-- }
--
-- if c.HasParent() {
-- return c.parent.HelpFunc()
-- } else {
-- return func(c *Command, args []string) {
-- if len(args) == 0 {
-- // Help called without any topic, calling on root
-- c.Root().Help()
-- return
-- }
+diff --git a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/zero.go b/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/zero.go
+deleted file mode 100644
+index abb5b6f..0000000
+--- a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/zero.go
++++ /dev/null
+@@ -1,41 +0,0 @@
+-package pretty
-
-- cmd, _, e := c.Root().Find(args)
-- if cmd == nil || e != nil {
-- c.Printf("Unknown help topic %#q.", args)
+-import (
+- "reflect"
+-)
-
-- c.Root().Usage()
-- } else {
-- err := cmd.Help()
-- if err != nil {
-- c.Println(err)
-- }
+-func nonzero(v reflect.Value) bool {
+- switch v.Kind() {
+- case reflect.Bool:
+- return v.Bool()
+- case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+- return v.Int() != 0
+- case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
+- return v.Uint() != 0
+- case reflect.Float32, reflect.Float64:
+- return v.Float() != 0
+- case reflect.Complex64, reflect.Complex128:
+- return v.Complex() != complex(0, 0)
+- case reflect.String:
+- return v.String() != ""
+- case reflect.Struct:
+- for i := 0; i < v.NumField(); i++ {
+- if nonzero(getField(v, i)) {
+- return true
+- }
+- }
+- return false
+- case reflect.Array:
+- for i := 0; i < v.Len(); i++ {
+- if nonzero(v.Index(i)) {
+- return true
- }
- }
+- return false
+- case reflect.Map, reflect.Interface, reflect.Slice, reflect.Ptr, reflect.Chan, reflect.Func:
+- return !v.IsNil()
+- case reflect.UnsafePointer:
+- return v.Pointer() != 0
- }
+- return true
-}
+diff --git a/Godeps/_workspace/src/github.com/vaughan0/go-ini/LICENSE b/Godeps/_workspace/src/github.com/vaughan0/go-ini/LICENSE
+deleted file mode 100644
+index 968b453..0000000
+--- a/Godeps/_workspace/src/github.com/vaughan0/go-ini/LICENSE
++++ /dev/null
+@@ -1,14 +0,0 @@
+-Copyright (c) 2013 Vaughan Newton
-
--var minUsagePadding int = 25
+-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+-documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
+-persons to whom the Software is furnished to do so, subject to the following conditions:
-
--func (c *Command) UsagePadding() int {
-- if c.parent == nil || minUsagePadding > c.parent.commandsMaxUseLen {
-- return minUsagePadding
-- } else {
-- return c.parent.commandsMaxUseLen
-- }
--}
+-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+-Software.
-
--var minCommandPathPadding int = 11
+-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+-WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+diff --git a/Godeps/_workspace/src/github.com/vaughan0/go-ini/README.md b/Godeps/_workspace/src/github.com/vaughan0/go-ini/README.md
+deleted file mode 100644
+index d5cd4e7..0000000
+--- a/Godeps/_workspace/src/github.com/vaughan0/go-ini/README.md
++++ /dev/null
+@@ -1,70 +0,0 @@
+-go-ini
+-======
-
--func (c *Command) CommandPathPadding() int {
-- if c.parent == nil || minCommandPathPadding > c.parent.commandsMaxCommandPathLen {
-- return minCommandPathPadding
-- } else {
-- return c.parent.commandsMaxCommandPathLen
-- }
--}
+-INI parsing library for Go (golang).
-
--func (c *Command) UsageTemplate() string {
-- if c.usageTemplate != "" {
-- return c.usageTemplate
-- }
+-View the API documentation [here](http://godoc.org/github.com/vaughan0/go-ini).
-
-- if c.HasParent() {
-- return c.parent.UsageTemplate()
-- } else {
-- return `{{ $cmd := . }}
--Usage: {{if .Runnable}}
-- {{.UseLine}}{{if .HasFlags}} [flags]{{end}}{{end}}{{if .HasSubCommands}}
-- {{ .CommandPath}} [command]{{end}}{{if gt .Aliases 0}}
+-Usage
+------
-
--Aliases:
-- {{.NameAndAliases}}{{end}}
--{{ if .HasSubCommands}}
--Available Commands: {{range .Commands}}{{if .Runnable}}
-- {{rpad .Use .UsagePadding }} {{.Short}}{{end}}{{end}}
--{{end}}
--{{ if .HasFlags}} Available Flags:
--{{.Flags.FlagUsages}}{{end}}{{if .HasParent}}{{if and (gt .Commands 0) (gt .Parent.Commands 1) }}
--Additional help topics: {{if gt .Commands 0 }}{{range .Commands}}{{if not .Runnable}} {{rpad .CommandPath .CommandPathPadding}} {{.Short}}{{end}}{{end}}{{end}}{{if gt .Parent.Commands 1 }}{{range .Parent.Commands}}{{if .Runnable}}{{if not (eq .Name $cmd.Name) }}{{end}}
-- {{rpad .CommandPath .CommandPathPadding}} {{.Short}}{{end}}{{end}}{{end}}{{end}}
--{{end}}
--Use "{{.Root.Name}} help [command]" for more information about that command.
--`
-- }
+-Parse an INI file:
+-
+-```go
+-import "github.com/vaughan0/go-ini"
+-
+-file, err := ini.LoadFile("myfile.ini")
+-```
+-
+-Get data from the parsed file:
+-
+-```go
+-name, ok := file.Get("person", "name")
+-if !ok {
+- panic("'name' variable missing from 'person' section")
-}
+-```
-
--func (c *Command) HelpTemplate() string {
-- if c.helpTemplate != "" {
-- return c.helpTemplate
-- }
+-Iterate through values in a section:
-
-- if c.HasParent() {
-- return c.parent.HelpTemplate()
-- } else {
-- return `{{.Long | trim}}
--{{if or .Runnable .HasSubCommands}}{{.UsageString}}{{end}}
--`
-- }
+-```go
+-for key, value := range file["mysection"] {
+- fmt.Printf("%s => %s\n", key, value)
-}
+-```
-
--// Really only used when casting a command to a commander
--func (c *Command) resetChildrensParents() {
-- for _, x := range c.commands {
-- x.parent = c
-- }
+-Iterate through sections in a file:
+-
+-```go
+-for name, section := range file {
+- fmt.Printf("Section name: %s\n", name)
-}
+-```
-
--func stripFlags(args []string) []string {
-- if len(args) < 1 {
-- return args
-- }
+-File Format
+------------
-
-- commands := []string{}
+-INI files are parsed by go-ini line-by-line. Each line may be one of the following:
-
-- inQuote := false
-- for _, y := range args {
-- if !inQuote {
-- switch {
-- case strings.HasPrefix(y, "\""):
-- inQuote = true
-- case strings.Contains(y, "=\""):
-- inQuote = true
-- case !strings.HasPrefix(y, "-"):
-- commands = append(commands, y)
-- }
-- }
+- * A section definition: [section-name]
+- * A property: key = value
+- * A comment: #blahblah _or_ ;blahblah
+- * Blank. The line will be ignored.
-
-- if strings.HasSuffix(y, "\"") && !strings.HasSuffix(y, "\\\"") {
-- inQuote = false
-- }
-- }
+-Properties defined before any section headers are placed in the default section, which has
+-the empty string as it's key.
-
-- return commands
--}
+-Example:
-
--func argsMinusX(args []string, x string) []string {
-- newargs := []string{}
+-```ini
+-# I am a comment
+-; So am I!
-
-- for _, y := range args {
-- if x != y {
-- newargs = append(newargs, y)
-- }
-- }
-- return newargs
--}
+-[apples]
+-colour = red or green
+-shape = applish
-
--// find the target command given the args and command tree
--// Meant to be run on the highest node. Only searches down.
--func (c *Command) Find(arrs []string) (*Command, []string, error) {
-- if c == nil {
-- return nil, nil, fmt.Errorf("Called find() on a nil Command")
-- }
+-[oranges]
+-shape = square
+-colour = blue
+-```
+diff --git a/Godeps/_workspace/src/github.com/vaughan0/go-ini/ini.go b/Godeps/_workspace/src/github.com/vaughan0/go-ini/ini.go
+deleted file mode 100644
+index 81aeb32..0000000
+--- a/Godeps/_workspace/src/github.com/vaughan0/go-ini/ini.go
++++ /dev/null
+@@ -1,123 +0,0 @@
+-// Package ini provides functions for parsing INI configuration files.
+-package ini
-
-- if len(arrs) == 0 {
-- return c.Root(), arrs, nil
-- }
+-import (
+- "bufio"
+- "fmt"
+- "io"
+- "os"
+- "regexp"
+- "strings"
+-)
-
-- var innerfind func(*Command, []string) (*Command, []string)
+-var (
+- sectionRegex = regexp.MustCompile(`^\[(.*)\]$`)
+- assignRegex = regexp.MustCompile(`^([^=]+)=(.*)$`)
+-)
-
-- innerfind = func(c *Command, args []string) (*Command, []string) {
-- if len(args) > 0 && c.HasSubCommands() {
-- argsWOflags := stripFlags(args)
-- if len(argsWOflags) > 0 {
-- matches := make([]*Command, 0)
-- for _, cmd := range c.commands {
-- if cmd.Name() == argsWOflags[0] || cmd.HasAlias(argsWOflags[0]) { // exact name or alias match
-- return innerfind(cmd, argsMinusX(args, argsWOflags[0]))
-- } else if EnablePrefixMatching {
-- if strings.HasPrefix(cmd.Name(), argsWOflags[0]) { // prefix match
-- matches = append(matches, cmd)
-- }
-- for _, x := range cmd.Aliases {
-- if strings.HasPrefix(x, argsWOflags[0]) {
-- matches = append(matches, cmd)
-- }
-- }
-- }
-- }
+-// ErrSyntax is returned when there is a syntax error in an INI file.
+-type ErrSyntax struct {
+- Line int
+- Source string // The contents of the erroneous line, without leading or trailing whitespace
+-}
-
-- // only accept a single prefix match - multiple matches would be ambiguous
-- if len(matches) == 1 {
-- return innerfind(matches[0], argsMinusX(args, argsWOflags[0]))
-- }
-- }
-- }
+-func (e ErrSyntax) Error() string {
+- return fmt.Sprintf("invalid INI syntax on line %d: %s", e.Line, e.Source)
+-}
-
-- return c, args
-- }
+-// A File represents a parsed INI file.
+-type File map[string]Section
-
-- commandFound, a := innerfind(c, arrs)
+-// A Section represents a single section of an INI file.
+-type Section map[string]string
-
-- // if commander returned and the first argument (if it exists) doesn't
-- // match the command name, return nil & error
-- if commandFound.Name() == c.Name() && len(arrs[0]) > 0 && commandFound.Name() != arrs[0] {
-- return nil, a, fmt.Errorf("unknown command %q\nRun 'help' for usage.\n", a[0])
+-// Returns a named Section. A Section will be created if one does not already exist for the given name.
+-func (f File) Section(name string) Section {
+- section := f[name]
+- if section == nil {
+- section = make(Section)
+- f[name] = section
- }
--
-- return commandFound, a, nil
+- return section
-}
-
--func (c *Command) Root() *Command {
-- var findRoot func(*Command) *Command
--
-- findRoot = func(x *Command) *Command {
-- if x.HasParent() {
-- return findRoot(x.parent)
-- } else {
-- return x
-- }
+-// Looks up a value for a key in a section and returns that value, along with a boolean result similar to a map lookup.
+-func (f File) Get(section, key string) (value string, ok bool) {
+- if s := f[section]; s != nil {
+- value, ok = s[key]
- }
--
-- return findRoot(c)
+- return
-}
-
--// execute the command determined by args and the command tree
--func (c *Command) findAndExecute(args []string) (err error) {
--
-- cmd, a, e := c.Find(args)
-- if e != nil {
-- return e
+-// Loads INI data from a reader and stores the data in the File.
+-func (f File) Load(in io.Reader) (err error) {
+- bufin, ok := in.(*bufio.Reader)
+- if !ok {
+- bufin = bufio.NewReader(in)
- }
-- return cmd.execute(a)
+- return parseFile(bufin, f)
-}
-
--func (c *Command) execute(a []string) (err error) {
-- if c == nil {
-- return fmt.Errorf("Called Execute() on a nil Command")
+-// Loads INI data from a named file and stores the data in the File.
+-func (f File) LoadFile(file string) (err error) {
+- in, err := os.Open(file)
+- if err != nil {
+- return
- }
+- defer in.Close()
+- return f.Load(in)
+-}
-
-- err = c.ParseFlags(a)
+-func parseFile(in *bufio.Reader, file File) (err error) {
+- section := ""
+- lineNum := 0
+- for done := false; !done; {
+- var line string
+- if line, err = in.ReadString('\n'); err != nil {
+- if err == io.EOF {
+- done = true
+- } else {
+- return
+- }
+- }
+- lineNum++
+- line = strings.TrimSpace(line)
+- if len(line) == 0 {
+- // Skip blank lines
+- continue
+- }
+- if line[0] == ';' || line[0] == '#' {
+- // Skip comments
+- continue
+- }
-
-- if err != nil {
-- return err
-- } else {
-- // If help is called, regardless of other flags, we print that
-- if c.helpFlagVal {
-- c.Help()
-- return nil
+- if groups := assignRegex.FindStringSubmatch(line); groups != nil {
+- key, val := groups[1], groups[2]
+- key, val = strings.TrimSpace(key), strings.TrimSpace(val)
+- file.Section(section)[key] = val
+- } else if groups := sectionRegex.FindStringSubmatch(line); groups != nil {
+- name := strings.TrimSpace(groups[1])
+- section = name
+- // Create the section if it does not exist
+- file.Section(section)
+- } else {
+- return ErrSyntax{lineNum, line}
- }
-
-- c.preRun()
-- argWoFlags := c.Flags().Args()
-- c.Run(c, argWoFlags)
-- return nil
- }
+- return nil
-}
-
--func (c *Command) preRun() {
-- for _, x := range initializers {
-- x()
-- }
+-// Loads and returns a File from a reader.
+-func Load(in io.Reader) (File, error) {
+- file := make(File)
+- err := file.Load(in)
+- return file, err
-}
-
--func (c *Command) errorMsgFromParse() string {
-- s := c.flagErrorBuf.String()
--
-- x := strings.Split(s, "\n")
--
-- if len(x) > 0 {
-- return x[0]
-- } else {
-- return ""
-- }
+-// Loads and returns an INI File from a file on disk.
+-func LoadFile(filename string) (File, error) {
+- file := make(File)
+- err := file.LoadFile(filename)
+- return file, err
-}
+diff --git a/Godeps/_workspace/src/github.com/vaughan0/go-ini/ini_linux_test.go b/Godeps/_workspace/src/github.com/vaughan0/go-ini/ini_linux_test.go
+deleted file mode 100644
+index 38a6f00..0000000
+--- a/Godeps/_workspace/src/github.com/vaughan0/go-ini/ini_linux_test.go
++++ /dev/null
+@@ -1,43 +0,0 @@
+-package ini
-
--// Call execute to use the args (os.Args[1:] by default)
--// and run through the command tree finding appropriate matches
--// for commands and then corresponding flags.
--func (c *Command) Execute() (err error) {
+-import (
+- "reflect"
+- "syscall"
+- "testing"
+-)
-
-- // Regardless of what command execute is called on, run on Root only
-- if c.HasParent() {
-- return c.Root().Execute()
+-func TestLoadFile(t *testing.T) {
+- originalOpenFiles := numFilesOpen(t)
+-
+- file, err := LoadFile("test.ini")
+- if err != nil {
+- t.Fatal(err)
- }
-
-- // initialize help as the last point possible to allow for user
-- // overriding
-- c.initHelp()
+- if originalOpenFiles != numFilesOpen(t) {
+- t.Error("test.ini not closed")
+- }
-
-- var args []string
+- if !reflect.DeepEqual(file, File{"default": {"stuff": "things"}}) {
+- t.Error("file not read correctly")
+- }
+-}
-
-- if len(c.args) == 0 {
-- args = os.Args[1:]
-- } else {
-- args = c.args
+-func numFilesOpen(t *testing.T) (num uint64) {
+- var rlimit syscall.Rlimit
+- err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rlimit)
+- if err != nil {
+- t.Fatal(err)
- }
+- maxFds := int(rlimit.Cur)
-
-- if len(args) == 0 {
-- // Only the executable is called and the root is runnable, run it
-- if c.Runnable() {
-- err = c.execute([]string(nil))
+- var stat syscall.Stat_t
+- for i := 0; i < maxFds; i++ {
+- if syscall.Fstat(i, &stat) == nil {
+- num++
- } else {
-- c.Help()
+- return
- }
-- } else {
-- err = c.findAndExecute(args)
- }
+- return
+-}
+diff --git a/Godeps/_workspace/src/github.com/vaughan0/go-ini/ini_test.go b/Godeps/_workspace/src/github.com/vaughan0/go-ini/ini_test.go
+deleted file mode 100644
+index 06a4d05..0000000
+--- a/Godeps/_workspace/src/github.com/vaughan0/go-ini/ini_test.go
++++ /dev/null
+@@ -1,89 +0,0 @@
+-package ini
-
-- // Now handle the case where the root is runnable and only flags are provided
-- if err != nil && c.Runnable() {
-- // This is pretty much a custom version of the *Command.execute method
-- // with a few differences because it's the final command (no fall back)
-- e := c.ParseFlags(args)
-- if e != nil {
-- // Flags parsing had an error.
-- // If an error happens here, we have to report it to the user
-- c.Println(c.errorMsgFromParse())
-- c.Usage()
-- return e
-- } else {
-- // If help is called, regardless of other flags, we print that
-- if c.helpFlagVal {
-- c.Help()
-- return nil
-- }
+-import (
+- "reflect"
+- "strings"
+- "testing"
+-)
-
-- argWoFlags := c.Flags().Args()
-- if len(argWoFlags) > 0 {
-- // If there are arguments (not flags) one of the earlier
-- // cases should have caught it.. It means invalid usage
-- // print the usage
-- c.Usage()
-- } else {
-- // Only flags left... Call root.Run
-- c.preRun()
-- c.Run(c, argWoFlags)
-- err = nil
-- }
-- }
-- }
+-func TestLoad(t *testing.T) {
+- src := `
+- # Comments are ignored
-
-- if err != nil {
-- c.Println("Error:", err.Error())
-- c.Printf("%v: invalid command %#q\n", c.Root().Name(), os.Args[1:])
-- c.Printf("Run '%v help' for usage\n", c.Root().Name())
-- }
+- herp = derp
-
-- return
--}
+- [foo]
+- hello=world
+- whitespace should = not matter
+- ; sneaky semicolon-style comment
+- multiple = equals = signs
-
--func (c *Command) initHelp() {
-- if c.helpCommand == nil {
-- c.helpCommand = &Command{
-- Use: "help [command]",
-- Short: "Help about any command",
-- Long: `Help provides help for any command in the application.
-- Simply type ` + c.Name() + ` help [path to command] for full details.`,
-- Run: c.HelpFunc(),
+- [bar]
+- this = that`
+-
+- file, err := Load(strings.NewReader(src))
+- if err != nil {
+- t.Fatal(err)
+- }
+- check := func(section, key, expect string) {
+- if value, _ := file.Get(section, key); value != expect {
+- t.Errorf("Get(%q, %q): expected %q, got %q", section, key, expect, value)
- }
- }
-- c.AddCommand(c.helpCommand)
--}
-
--// Used for testing
--func (c *Command) ResetCommands() {
-- c.commands = nil
+- check("", "herp", "derp")
+- check("foo", "hello", "world")
+- check("foo", "whitespace should", "not matter")
+- check("foo", "multiple", "equals = signs")
+- check("bar", "this", "that")
-}
-
--func (c *Command) Commands() []*Command {
-- return c.commands
+-func TestSyntaxError(t *testing.T) {
+- src := `
+- # Line 2
+- [foo]
+- bar = baz
+- # Here's an error on line 6:
+- wut?
+- herp = derp`
+- _, err := Load(strings.NewReader(src))
+- t.Logf("%T: %v", err, err)
+- if err == nil {
+- t.Fatal("expected an error, got nil")
+- }
+- syntaxErr, ok := err.(ErrSyntax)
+- if !ok {
+- t.Fatal("expected an error of type ErrSyntax")
+- }
+- if syntaxErr.Line != 6 {
+- t.Fatal("incorrect line number")
+- }
+- if syntaxErr.Source != "wut?" {
+- t.Fatal("incorrect source")
+- }
-}
-
--// Add one or many commands as children of this
--func (c *Command) AddCommand(cmds ...*Command) {
-- for i, x := range cmds {
-- if cmds[i] == c {
-- panic("Command can't be a child of itself")
-- }
-- cmds[i].parent = c
-- // update max lengths
-- usageLen := len(x.Use)
-- if usageLen > c.commandsMaxUseLen {
-- c.commandsMaxUseLen = usageLen
+-func TestDefinedSectionBehaviour(t *testing.T) {
+- check := func(src string, expect File) {
+- file, err := Load(strings.NewReader(src))
+- if err != nil {
+- t.Fatal(err)
- }
-- commandPathLen := len(x.CommandPath())
-- if commandPathLen > c.commandsMaxCommandPathLen {
-- c.commandsMaxCommandPathLen = commandPathLen
+- if !reflect.DeepEqual(file, expect) {
+- t.Errorf("expected %v, got %v", expect, file)
- }
-- c.commands = append(c.commands, x)
- }
+- // No sections for an empty file
+- check("", File{})
+- // Default section only if there are actually values for it
+- check("foo=bar", File{"": {"foo": "bar"}})
+- // User-defined sections should always be present, even if empty
+- check("[a]\n[b]\nfoo=bar", File{
+- "a": {},
+- "b": {"foo": "bar"},
+- })
+- check("foo=bar\n[a]\nthis=that", File{
+- "": {"foo": "bar"},
+- "a": {"this": "that"},
+- })
-}
+diff --git a/Godeps/_workspace/src/github.com/vaughan0/go-ini/test.ini b/Godeps/_workspace/src/github.com/vaughan0/go-ini/test.ini
+deleted file mode 100644
+index d13c999..0000000
+--- a/Godeps/_workspace/src/github.com/vaughan0/go-ini/test.ini
++++ /dev/null
+@@ -1,2 +0,0 @@
+-[default]
+-stuff = things
+diff --git a/Godeps/_workspace/src/golang.org/x/net/context/context.go b/Godeps/_workspace/src/golang.org/x/net/context/context.go
+deleted file mode 100644
+index 66aff7c..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/context/context.go
++++ /dev/null
+@@ -1,432 +0,0 @@
+-// Copyright 2014 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
--// Convenience method to Print to the defined output
--func (c *Command) Print(i ...interface{}) {
-- fmt.Fprint(c.Out(), i...)
--}
--
--// Convenience method to Println to the defined output
--func (c *Command) Println(i ...interface{}) {
-- str := fmt.Sprintln(i...)
-- c.Print(str)
--}
--
--// Convenience method to Printf to the defined output
--func (c *Command) Printf(format string, i ...interface{}) {
-- str := fmt.Sprintf(format, i...)
-- c.Print(str)
--}
--
--// Output the usage for the command
--// Used when a user provides invalid input
--// Can be defined by user by overriding UsageFunc
--func (c *Command) Usage() error {
-- c.mergePersistentFlags()
-- err := c.UsageFunc()(c)
-- return err
--}
--
--// Output the help for the command
--// Used when a user calls help [command]
--// by the default HelpFunc in the commander
--func (c *Command) Help() error {
-- c.mergePersistentFlags()
-- err := tmpl(c.Out(), c.HelpTemplate(), c)
-- return err
--}
--
--func (c *Command) UsageString() string {
-- tmpOutput := c.output
-- bb := new(bytes.Buffer)
-- c.SetOutput(bb)
-- c.Usage()
-- c.output = tmpOutput
-- return bb.String()
--}
+-// Package context defines the Context type, which carries deadlines,
+-// cancelation signals, and other request-scoped values across API boundaries
+-// and between processes.
+-//
+-// Incoming requests to a server should create a Context, and outgoing calls to
+-// servers should accept a Context. The chain of function calls between must
+-// propagate the Context, optionally replacing it with a modified copy created
+-// using WithDeadline, WithTimeout, WithCancel, or WithValue.
+-//
+-// Programs that use Contexts should follow these rules to keep interfaces
+-// consistent across packages and enable static analysis tools to check context
+-// propagation:
+-//
+-// Do not store Contexts inside a struct type; instead, pass a Context
+-// explicitly to each function that needs it. The Context should be the first
+-// parameter, typically named ctx:
+-//
+-// func DoSomething(ctx context.Context, arg Arg) error {
+-// // ... use ctx ...
+-// }
+-//
+-// Do not pass a nil Context, even if a function permits it. Pass context.TODO
+-// if you are unsure about which Context to use.
+-//
+-// Use context Values only for request-scoped data that transits processes and
+-// APIs, not for passing optional parameters to functions.
+-//
+-// The same Context may be passed to functions running in different goroutines;
+-// Contexts are safe for simultaneous use by multiple goroutines.
+-//
+-// See http://blog.golang.org/context for example code for a server that uses
+-// Contexts.
+-package context
-
--// The full path to this command
--func (c *Command) CommandPath() string {
-- str := c.Name()
-- x := c
-- for x.HasParent() {
-- str = x.parent.Name() + " " + str
-- x = x.parent
-- }
-- return str
--}
+-import (
+- "errors"
+- "fmt"
+- "sync"
+- "time"
+-)
-
--//The full usage for a given command (including parents)
--func (c *Command) UseLine() string {
-- str := ""
-- if c.HasParent() {
-- str = c.parent.CommandPath() + " "
-- }
-- return str + c.Use
--}
+-// A Context carries a deadline, a cancelation signal, and other values across
+-// API boundaries.
+-//
+-// Context's methods may be called by multiple goroutines simultaneously.
+-type Context interface {
+- // Deadline returns the time when work done on behalf of this context
+- // should be canceled. Deadline returns ok==false when no deadline is
+- // set. Successive calls to Deadline return the same results.
+- Deadline() (deadline time.Time, ok bool)
-
--// For use in determining which flags have been assigned to which commands
--// and which persist
--func (c *Command) DebugFlags() {
-- c.Println("DebugFlags called on", c.Name())
-- var debugflags func(*Command)
+- // Done returns a channel that's closed when work done on behalf of this
+- // context should be canceled. Done may return nil if this context can
+- // never be canceled. Successive calls to Done return the same value.
+- //
+- // WithCancel arranges for Done to be closed when cancel is called;
+- // WithDeadline arranges for Done to be closed when the deadline
+- // expires; WithTimeout arranges for Done to be closed when the timeout
+- // elapses.
+- //
+- // Done is provided for use in select statements:
+- //
+- // // DoSomething calls DoSomethingSlow and returns as soon as
+- // // it returns or ctx.Done is closed.
+- // func DoSomething(ctx context.Context) (Result, error) {
+- // c := make(chan Result, 1)
+- // go func() { c <- DoSomethingSlow(ctx) }()
+- // select {
+- // case res := <-c:
+- // return res, nil
+- // case <-ctx.Done():
+- // return nil, ctx.Err()
+- // }
+- // }
+- //
+- // See http://blog.golang.org/pipelines for more examples of how to use
+- // a Done channel for cancelation.
+- Done() <-chan struct{}
-
-- debugflags = func(x *Command) {
-- if x.HasFlags() || x.HasPersistentFlags() {
-- c.Println(x.Name())
-- }
-- if x.HasFlags() {
-- x.flags.VisitAll(func(f *flag.Flag) {
-- if x.HasPersistentFlags() {
-- if x.persistentFlag(f.Name) == nil {
-- c.Println(" -"+f.Shorthand+",", "--"+f.Name, "["+f.DefValue+"]", "", f.Value, " [L]")
-- } else {
-- c.Println(" -"+f.Shorthand+",", "--"+f.Name, "["+f.DefValue+"]", "", f.Value, " [LP]")
-- }
-- } else {
-- c.Println(" -"+f.Shorthand+",", "--"+f.Name, "["+f.DefValue+"]", "", f.Value, " [L]")
-- }
-- })
-- }
-- if x.HasPersistentFlags() {
-- x.pflags.VisitAll(func(f *flag.Flag) {
-- if x.HasFlags() {
-- if x.flags.Lookup(f.Name) == nil {
-- c.Println(" -"+f.Shorthand+",", "--"+f.Name, "["+f.DefValue+"]", "", f.Value, " [P]")
-- }
-- } else {
-- c.Println(" -"+f.Shorthand+",", "--"+f.Name, "["+f.DefValue+"]", "", f.Value, " [P]")
-- }
-- })
-- }
-- c.Println(x.flagErrorBuf)
-- if x.HasSubCommands() {
-- for _, y := range x.commands {
-- debugflags(y)
-- }
-- }
-- }
+- // Err returns a non-nil error value after Done is closed. Err returns
+- // Canceled if the context was canceled or DeadlineExceeded if the
+- // context's deadline passed. No other values for Err are defined.
+- // After Done is closed, successive calls to Err return the same value.
+- Err() error
-
-- debugflags(c)
+- // Value returns the value associated with this context for key, or nil
+- // if no value is associated with key. Successive calls to Value with
+- // the same key returns the same result.
+- //
+- // Use context values only for request-scoped data that transits
+- // processes and API boundaries, not for passing optional parameters to
+- // functions.
+- //
+- // A key identifies a specific value in a Context. Functions that wish
+- // to store values in Context typically allocate a key in a global
+- // variable then use that key as the argument to context.WithValue and
+- // Context.Value. A key can be any type that supports equality;
+- // packages should define keys as an unexported type to avoid
+- // collisions.
+- //
+- // Packages that define a Context key should provide type-safe accessors
+- // for the values stores using that key:
+- //
+- // // Package user defines a User type that's stored in Contexts.
+- // package user
+- //
+- // import "golang.org/x/net/context"
+- //
+- // // User is the type of value stored in the Contexts.
+- // type User struct {...}
+- //
+- // // key is an unexported type for keys defined in this package.
+- // // This prevents collisions with keys defined in other packages.
+- // type key int
+- //
+- // // userKey is the key for user.User values in Contexts. It is
+- // // unexported; clients use user.NewContext and user.FromContext
+- // // instead of using this key directly.
+- // var userKey key = 0
+- //
+- // // NewContext returns a new Context that carries value u.
+- // func NewContext(ctx context.Context, u *User) context.Context {
+- // return context.WithValue(ctx, userKey, u)
+- // }
+- //
+- // // FromContext returns the User value stored in ctx, if any.
+- // func FromContext(ctx context.Context) (*User, bool) {
+- // u, ok := ctx.Value(userKey).(*User)
+- // return u, ok
+- // }
+- Value(key interface{}) interface{}
-}
-
--// Name returns the command's name: the first word in the use line.
--func (c *Command) Name() string {
-- if c.name != "" {
-- return c.name
-- }
-- name := c.Use
-- i := strings.Index(name, " ")
-- if i >= 0 {
-- name = name[:i]
-- }
-- return name
--}
+-// Canceled is the error returned by Context.Err when the context is canceled.
+-var Canceled = errors.New("context canceled")
-
--// Determine if a given string is an alias of the command.
--func (c *Command) HasAlias(s string) bool {
-- for _, a := range c.Aliases {
-- if a == s {
-- return true
-- }
-- }
-- return false
--}
+-// DeadlineExceeded is the error returned by Context.Err when the context's
+-// deadline passes.
+-var DeadlineExceeded = errors.New("context deadline exceeded")
-
--func (c *Command) NameAndAliases() string {
-- return strings.Join(append([]string{c.Name()}, c.Aliases...), ", ")
--}
+-// An emptyCtx is never canceled, has no values, and has no deadline. It is not
+-// struct{}, since vars of this type must have distinct addresses.
+-type emptyCtx int
-
--// Determine if the command is itself runnable
--func (c *Command) Runnable() bool {
-- return c.Run != nil
+-func (*emptyCtx) Deadline() (deadline time.Time, ok bool) {
+- return
-}
-
--// Determine if the command has children commands
--func (c *Command) HasSubCommands() bool {
-- return len(c.commands) > 0
+-func (*emptyCtx) Done() <-chan struct{} {
+- return nil
-}
-
--// Determine if the command is a child command
--func (c *Command) HasParent() bool {
-- return c.parent != nil
+-func (*emptyCtx) Err() error {
+- return nil
-}
-
--// Get the Commands FlagSet
--func (c *Command) Flags() *flag.FlagSet {
-- if c.flags == nil {
-- c.flags = flag.NewFlagSet(c.Name(), flag.ContinueOnError)
-- if c.flagErrorBuf == nil {
-- c.flagErrorBuf = new(bytes.Buffer)
-- }
-- c.flags.SetOutput(c.flagErrorBuf)
-- c.PersistentFlags().BoolVarP(&c.helpFlagVal, "help", "h", false, "help for "+c.Name())
-- }
-- return c.flags
+-func (*emptyCtx) Value(key interface{}) interface{} {
+- return nil
-}
-
--// Get the Commands Persistent FlagSet
--func (c *Command) PersistentFlags() *flag.FlagSet {
-- if c.pflags == nil {
-- c.pflags = flag.NewFlagSet(c.Name(), flag.ContinueOnError)
-- if c.flagErrorBuf == nil {
-- c.flagErrorBuf = new(bytes.Buffer)
-- }
-- c.pflags.SetOutput(c.flagErrorBuf)
+-func (e *emptyCtx) String() string {
+- switch e {
+- case background:
+- return "context.Background"
+- case todo:
+- return "context.TODO"
- }
-- return c.pflags
+- return "unknown empty Context"
-}
-
--// For use in testing
--func (c *Command) ResetFlags() {
-- c.flagErrorBuf = new(bytes.Buffer)
-- c.flagErrorBuf.Reset()
-- c.flags = flag.NewFlagSet(c.Name(), flag.ContinueOnError)
-- c.flags.SetOutput(c.flagErrorBuf)
-- c.pflags = flag.NewFlagSet(c.Name(), flag.ContinueOnError)
-- c.pflags.SetOutput(c.flagErrorBuf)
--}
+-var (
+- background = new(emptyCtx)
+- todo = new(emptyCtx)
+-)
-
--// Does the command contain flags (local not persistent)
--func (c *Command) HasFlags() bool {
-- return c.Flags().HasFlags()
+-// Background returns a non-nil, empty Context. It is never canceled, has no
+-// values, and has no deadline. It is typically used by the main function,
+-// initialization, and tests, and as the top-level Context for incoming
+-// requests.
+-func Background() Context {
+- return background
-}
-
--// Does the command contain persistent flags
--func (c *Command) HasPersistentFlags() bool {
-- return c.PersistentFlags().HasFlags()
+-// TODO returns a non-nil, empty Context. Code should use context.TODO when
+-// it's unclear which Context to use or it's is not yet available (because the
+-// surrounding function has not yet been extended to accept a Context
+-// parameter). TODO is recognized by static analysis tools that determine
+-// whether Contexts are propagated correctly in a program.
+-func TODO() Context {
+- return todo
-}
-
--// Climbs up the command tree looking for matching flag
--func (c *Command) Flag(name string) (flag *flag.Flag) {
-- flag = c.Flags().Lookup(name)
--
-- if flag == nil {
-- flag = c.persistentFlag(name)
-- }
+-// A CancelFunc tells an operation to abandon its work.
+-// A CancelFunc does not wait for the work to stop.
+-// After the first call, subsequent calls to a CancelFunc do nothing.
+-type CancelFunc func()
-
-- return
+-// WithCancel returns a copy of parent with a new Done channel. The returned
+-// context's Done channel is closed when the returned cancel function is called
+-// or when the parent context's Done channel is closed, whichever happens first.
+-func WithCancel(parent Context) (ctx Context, cancel CancelFunc) {
+- c := newCancelCtx(parent)
+- propagateCancel(parent, &c)
+- return &c, func() { c.cancel(true, Canceled) }
-}
-
--// recursively find matching persistent flag
--func (c *Command) persistentFlag(name string) (flag *flag.Flag) {
-- if c.HasPersistentFlags() {
-- flag = c.PersistentFlags().Lookup(name)
-- }
--
-- if flag == nil && c.HasParent() {
-- flag = c.parent.persistentFlag(name)
+-// newCancelCtx returns an initialized cancelCtx.
+-func newCancelCtx(parent Context) cancelCtx {
+- return cancelCtx{
+- Context: parent,
+- done: make(chan struct{}),
- }
-- return
-}
-
--// Parses persistent flag tree & local flags
--func (c *Command) ParseFlags(args []string) (err error) {
-- c.mergePersistentFlags()
-- err = c.Flags().Parse(args)
--
-- // The upstream library adds spaces to the error
-- // response regardless of success.
-- // Handling it here until fixing upstream
-- if len(strings.TrimSpace(c.flagErrorBuf.String())) > 1 {
-- return fmt.Errorf("%s", c.flagErrorBuf.String())
+-// propagateCancel arranges for child to be canceled when parent is.
+-func propagateCancel(parent Context, child canceler) {
+- if parent.Done() == nil {
+- return // parent is never canceled
+- }
+- if p, ok := parentCancelCtx(parent); ok {
+- p.mu.Lock()
+- if p.err != nil {
+- // parent has already been canceled
+- child.cancel(false, p.err)
+- } else {
+- if p.children == nil {
+- p.children = make(map[canceler]bool)
+- }
+- p.children[child] = true
+- }
+- p.mu.Unlock()
+- } else {
+- go func() {
+- select {
+- case <-parent.Done():
+- child.cancel(false, parent.Err())
+- case <-child.Done():
+- }
+- }()
- }
--
-- //always return nil because upstream library is inconsistent & we always check the error buffer anyway
-- return nil
-}
-
--func (c *Command) mergePersistentFlags() {
-- var rmerge func(x *Command)
--
-- rmerge = func(x *Command) {
-- if x.HasPersistentFlags() {
-- x.PersistentFlags().VisitAll(func(f *flag.Flag) {
-- if c.Flags().Lookup(f.Name) == nil {
-- c.Flags().AddFlag(f)
-- }
-- })
-- }
-- if x.HasParent() {
-- rmerge(x.parent)
+-// parentCancelCtx follows a chain of parent references until it finds a
+-// *cancelCtx. This function understands how each of the concrete types in this
+-// package represents its parent.
+-func parentCancelCtx(parent Context) (*cancelCtx, bool) {
+- for {
+- switch c := parent.(type) {
+- case *cancelCtx:
+- return c, true
+- case *timerCtx:
+- return &c.cancelCtx, true
+- case *valueCtx:
+- parent = c.Context
+- default:
+- return nil, false
- }
- }
--
-- rmerge(c)
-}
-
--func (c *Command) Parent() *Command {
-- return c.parent
+-// A canceler is a context type that can be canceled directly. The
+-// implementations are *cancelCtx and *timerCtx.
+-type canceler interface {
+- cancel(removeFromParent bool, err error)
+- Done() <-chan struct{}
-}
-diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/LICENSE b/Godeps/_workspace/src/github.com/spf13/pflag/LICENSE
-deleted file mode 100644
-index 63ed1cf..0000000
---- a/Godeps/_workspace/src/github.com/spf13/pflag/LICENSE
-+++ /dev/null
-@@ -1,28 +0,0 @@
--Copyright (c) 2012 Alex Ogier. All rights reserved.
--Copyright (c) 2012 The Go Authors. All rights reserved.
--
--Redistribution and use in source and binary forms, with or without
--modification, are permitted provided that the following conditions are
--met:
--
-- * Redistributions of source code must retain the above copyright
--notice, this list of conditions and the following disclaimer.
-- * Redistributions in binary form must reproduce the above
--copyright notice, this list of conditions and the following disclaimer
--in the documentation and/or other materials provided with the
--distribution.
-- * Neither the name of Google Inc. nor the names of its
--contributors may be used to endorse or promote products derived from
--this software without specific prior written permission.
--
--THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
--"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
--LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
--A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
--OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
--SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
--LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
--DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
--THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
--(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
--OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/README.md b/Godeps/_workspace/src/github.com/spf13/pflag/README.md
-deleted file mode 100644
-index a12d94d..0000000
---- a/Godeps/_workspace/src/github.com/spf13/pflag/README.md
-+++ /dev/null
-@@ -1,155 +0,0 @@
--## Description
--
--pflag is a drop-in replacement for Go's flag package, implementing
--POSIX/GNU-style --flags.
--
--pflag is compatible with the [GNU extensions to the POSIX recommendations
--for command-line options][1]. For a more precise description, see the
--"Command-line flag syntax" section below.
--
--[1]: http://www.gnu.org/software/libc/manual/html_node/Argument-Syntax.html
--
--pflag is available under the same style of BSD license as the Go language,
--which can be found in the LICENSE file.
--
--## Installation
--
--pflag is available using the standard `go get` command.
--
--Install by running:
--
-- go get github.com/ogier/pflag
--
--Run tests by running:
--
-- go test github.com/ogier/pflag
--
--## Usage
--
--pflag is a drop-in replacement of Go's native flag package. If you import
--pflag under the name "flag" then all code should continue to function
--with no changes.
--
--``` go
--import flag "github.com/ogier/pflag"
--```
--
--There is one exception to this: if you directly instantiate the Flag struct
--there is one more field "Shorthand" that you will need to set.
--Most code never instantiates this struct directly, and instead uses
--functions such as String(), BoolVar(), and Var(), and is therefore
--unaffected.
--
--Define flags using flag.String(), Bool(), Int(), etc.
--
--This declares an integer flag, -flagname, stored in the pointer ip, with type *int.
-
--``` go
--var ip *int = flag.Int("flagname", 1234, "help message for flagname")
--```
+-// A cancelCtx can be canceled. When canceled, it also cancels any children
+-// that implement canceler.
+-type cancelCtx struct {
+- Context
-
--If you like, you can bind the flag to a variable using the Var() functions.
+- done chan struct{} // closed by the first cancel call.
-
--``` go
--var flagvar int
--func init() {
-- flag.IntVar(&flagvar, "flagname", 1234, "help message for flagname")
+- mu sync.Mutex
+- children map[canceler]bool // set to nil by the first cancel call
+- err error // set to non-nil by the first cancel call
-}
--```
--
--Or you can create custom flags that satisfy the Value interface (with
--pointer receivers) and couple them to flag parsing by
--
--``` go
--flag.Var(&flagVal, "name", "help message for flagname")
--```
--
--For such flags, the default value is just the initial value of the variable.
--
--After all flags are defined, call
--
--``` go
--flag.Parse()
--```
--
--to parse the command line into the defined flags.
--
--Flags may then be used directly. If you're using the flags themselves,
--they are all pointers; if you bind to variables, they're values.
--
--``` go
--fmt.Println("ip has value ", *ip)
--fmt.Println("flagvar has value ", flagvar)
--```
--
--After parsing, the arguments after the flag are available as the
--slice flag.Args() or individually as flag.Arg(i).
--The arguments are indexed from 0 through flag.NArg()-1.
--
--The pflag package also defines some new functions that are not in flag,
--that give one-letter shorthands for flags. You can use these by appending
--'P' to the name of any function that defines a flag.
-
--``` go
--var ip = flag.IntP("flagname", "f", 1234, "help message")
--var flagvar bool
--func init() {
-- flag.BoolVarP("boolname", "b", true, "help message")
+-func (c *cancelCtx) Done() <-chan struct{} {
+- return c.done
-}
--flag.VarP(&flagVar, "varname", "v", 1234, "help message")
--```
--
--Shorthand letters can be used with single dashes on the command line.
--Boolean shorthand flags can be combined with other shorthand flags.
--
--The default set of command-line flags is controlled by
--top-level functions. The FlagSet type allows one to define
--independent sets of flags, such as to implement subcommands
--in a command-line interface. The methods of FlagSet are
--analogous to the top-level functions for the command-line
--flag set.
--
--## Command line flag syntax
--
--```
----flag // boolean flags only
----flag=x
--```
--
--Unlike the flag package, a single dash before an option means something
--different than a double dash. Single dashes signify a series of shorthand
--letters for flags. All but the last shorthand letter must be boolean flags.
--
--```
--// boolean flags
---f
---abc
--
--// non-boolean flags
---n 1234
---Ifile
--
--// mixed
---abcs "hello"
---abcn1234
--```
--
--Flag parsing stops after the terminator "--". Unlike the flag package,
--flags can be interspersed with arguments anywhere on the command line
--before this terminator.
--
--Integer flags accept 1234, 0664, 0x1234 and may be negative.
--Boolean flags (in their long form) accept 1, 0, t, f, true, false,
--TRUE, FALSE, True, False.
--Duration flags accept any input valid for time.ParseDuration.
-
--## More info
--
--You can see the full reference documentation of the pflag package
--[at godoc.org][3], or through go's standard documentation system by
--running `godoc -http=:6060` and browsing to
--[http://localhost:6060/pkg/github.com/ogier/pflag][2] after
--installation.
+-func (c *cancelCtx) Err() error {
+- c.mu.Lock()
+- defer c.mu.Unlock()
+- return c.err
+-}
-
--[2]: http://localhost:6060/pkg/github.com/ogier/pflag
--[3]: http://godoc.org/github.com/ogier/pflag
-diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/bool.go b/Godeps/_workspace/src/github.com/spf13/pflag/bool.go
-deleted file mode 100644
-index 010576c..0000000
---- a/Godeps/_workspace/src/github.com/spf13/pflag/bool.go
-+++ /dev/null
-@@ -1,74 +0,0 @@
--package pflag
+-func (c *cancelCtx) String() string {
+- return fmt.Sprintf("%v.WithCancel", c.Context)
+-}
-
--import (
-- "fmt"
-- "strconv"
--)
+-// cancel closes c.done, cancels each of c's children, and, if
+-// removeFromParent is true, removes c from its parent's children.
+-func (c *cancelCtx) cancel(removeFromParent bool, err error) {
+- if err == nil {
+- panic("context: internal error: missing cancel error")
+- }
+- c.mu.Lock()
+- if c.err != nil {
+- c.mu.Unlock()
+- return // already canceled
+- }
+- c.err = err
+- close(c.done)
+- for child := range c.children {
+- // NOTE: acquiring the child's lock while holding parent's lock.
+- child.cancel(false, err)
+- }
+- c.children = nil
+- c.mu.Unlock()
-
--// -- bool Value
--type boolValue bool
+- if removeFromParent {
+- if p, ok := parentCancelCtx(c.Context); ok {
+- p.mu.Lock()
+- if p.children != nil {
+- delete(p.children, c)
+- }
+- p.mu.Unlock()
+- }
+- }
+-}
-
--func newBoolValue(val bool, p *bool) *boolValue {
-- *p = val
-- return (*boolValue)(p)
+-// WithDeadline returns a copy of the parent context with the deadline adjusted
+-// to be no later than d. If the parent's deadline is already earlier than d,
+-// WithDeadline(parent, d) is semantically equivalent to parent. The returned
+-// context's Done channel is closed when the deadline expires, when the returned
+-// cancel function is called, or when the parent context's Done channel is
+-// closed, whichever happens first.
+-//
+-// Canceling this context releases resources associated with the deadline
+-// timer, so code should call cancel as soon as the operations running in this
+-// Context complete.
+-func WithDeadline(parent Context, deadline time.Time) (Context, CancelFunc) {
+- if cur, ok := parent.Deadline(); ok && cur.Before(deadline) {
+- // The current deadline is already sooner than the new one.
+- return WithCancel(parent)
+- }
+- c := &timerCtx{
+- cancelCtx: newCancelCtx(parent),
+- deadline: deadline,
+- }
+- propagateCancel(parent, c)
+- d := deadline.Sub(time.Now())
+- if d <= 0 {
+- c.cancel(true, DeadlineExceeded) // deadline has already passed
+- return c, func() { c.cancel(true, Canceled) }
+- }
+- c.mu.Lock()
+- defer c.mu.Unlock()
+- if c.err == nil {
+- c.timer = time.AfterFunc(d, func() {
+- c.cancel(true, DeadlineExceeded)
+- })
+- }
+- return c, func() { c.cancel(true, Canceled) }
-}
-
--func (b *boolValue) Set(s string) error {
-- v, err := strconv.ParseBool(s)
-- *b = boolValue(v)
-- return err
--}
+-// A timerCtx carries a timer and a deadline. It embeds a cancelCtx to
+-// implement Done and Err. It implements cancel by stopping its timer then
+-// delegating to cancelCtx.cancel.
+-type timerCtx struct {
+- cancelCtx
+- timer *time.Timer // Under cancelCtx.mu.
-
--func (b *boolValue) Type() string {
-- return "bool"
+- deadline time.Time
-}
-
--func (b *boolValue) String() string { return fmt.Sprintf("%v", *b) }
--
--// BoolVar defines a bool flag with specified name, default value, and usage string.
--// The argument p points to a bool variable in which to store the value of the flag.
--func (f *FlagSet) BoolVar(p *bool, name string, value bool, usage string) {
-- f.VarP(newBoolValue(value, p), name, "", usage)
+-func (c *timerCtx) Deadline() (deadline time.Time, ok bool) {
+- return c.deadline, true
-}
-
--// Like BoolVar, but accepts a shorthand letter that can be used after a single dash.
--func (f *FlagSet) BoolVarP(p *bool, name, shorthand string, value bool, usage string) {
-- f.VarP(newBoolValue(value, p), name, shorthand, usage)
+-func (c *timerCtx) String() string {
+- return fmt.Sprintf("%v.WithDeadline(%s [%s])", c.cancelCtx.Context, c.deadline, c.deadline.Sub(time.Now()))
-}
-
--// BoolVar defines a bool flag with specified name, default value, and usage string.
--// The argument p points to a bool variable in which to store the value of the flag.
--func BoolVar(p *bool, name string, value bool, usage string) {
-- CommandLine.VarP(newBoolValue(value, p), name, "", usage)
+-func (c *timerCtx) cancel(removeFromParent bool, err error) {
+- c.cancelCtx.cancel(removeFromParent, err)
+- c.mu.Lock()
+- if c.timer != nil {
+- c.timer.Stop()
+- c.timer = nil
+- }
+- c.mu.Unlock()
-}
-
--// Like BoolVar, but accepts a shorthand letter that can be used after a single dash.
--func BoolVarP(p *bool, name, shorthand string, value bool, usage string) {
-- CommandLine.VarP(newBoolValue(value, p), name, shorthand, usage)
+-// WithTimeout returns WithDeadline(parent, time.Now().Add(timeout)).
+-//
+-// Canceling this context releases resources associated with the deadline
+-// timer, so code should call cancel as soon as the operations running in this
+-// Context complete:
+-//
+-// func slowOperationWithTimeout(ctx context.Context) (Result, error) {
+-// ctx, cancel := context.WithTimeout(ctx, 100*time.Millisecond)
+-// defer cancel() // releases resources if slowOperation completes before timeout elapses
+-// return slowOperation(ctx)
+-// }
+-func WithTimeout(parent Context, timeout time.Duration) (Context, CancelFunc) {
+- return WithDeadline(parent, time.Now().Add(timeout))
-}
-
--// Bool defines a bool flag with specified name, default value, and usage string.
--// The return value is the address of a bool variable that stores the value of the flag.
--func (f *FlagSet) Bool(name string, value bool, usage string) *bool {
-- p := new(bool)
-- f.BoolVarP(p, name, "", value, usage)
-- return p
+-// WithValue returns a copy of parent in which the value associated with key is
+-// val.
+-//
+-// Use context Values only for request-scoped data that transits processes and
+-// APIs, not for passing optional parameters to functions.
+-func WithValue(parent Context, key interface{}, val interface{}) Context {
+- return &valueCtx{parent, key, val}
-}
-
--// Like Bool, but accepts a shorthand letter that can be used after a single dash.
--func (f *FlagSet) BoolP(name, shorthand string, value bool, usage string) *bool {
-- p := new(bool)
-- f.BoolVarP(p, name, shorthand, value, usage)
-- return p
+-// A valueCtx carries a key-value pair. It implements Value for that key and
+-// delegates all other calls to the embedded Context.
+-type valueCtx struct {
+- Context
+- key, val interface{}
-}
-
--// Bool defines a bool flag with specified name, default value, and usage string.
--// The return value is the address of a bool variable that stores the value of the flag.
--func Bool(name string, value bool, usage string) *bool {
-- return CommandLine.BoolP(name, "", value, usage)
+-func (c *valueCtx) String() string {
+- return fmt.Sprintf("%v.WithValue(%#v, %#v)", c.Context, c.key, c.val)
-}
-
--// Like Bool, but accepts a shorthand letter that can be used after a single dash.
--func BoolP(name, shorthand string, value bool, usage string) *bool {
-- return CommandLine.BoolP(name, shorthand, value, usage)
+-func (c *valueCtx) Value(key interface{}) interface{} {
+- if c.key == key {
+- return c.val
+- }
+- return c.Context.Value(key)
-}
-diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/duration.go b/Godeps/_workspace/src/github.com/spf13/pflag/duration.go
+diff --git a/Godeps/_workspace/src/golang.org/x/net/context/context_test.go b/Godeps/_workspace/src/golang.org/x/net/context/context_test.go
deleted file mode 100644
-index 66ed7ac..0000000
---- a/Godeps/_workspace/src/github.com/spf13/pflag/duration.go
+index 82d2494..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/context/context_test.go
+++ /dev/null
-@@ -1,71 +0,0 @@
--package pflag
--
--import "time"
+@@ -1,553 +0,0 @@
+-// Copyright 2014 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
--// -- time.Duration Value
--type durationValue time.Duration
+-package context
-
--func newDurationValue(val time.Duration, p *time.Duration) *durationValue {
-- *p = val
-- return (*durationValue)(p)
--}
+-import (
+- "fmt"
+- "math/rand"
+- "runtime"
+- "strings"
+- "sync"
+- "testing"
+- "time"
+-)
-
--func (d *durationValue) Set(s string) error {
-- v, err := time.ParseDuration(s)
-- *d = durationValue(v)
-- return err
+-// otherContext is a Context that's not one of the types defined in context.go.
+-// This lets us test code paths that differ based on the underlying type of the
+-// Context.
+-type otherContext struct {
+- Context
-}
-
--func (d *durationValue) Type() string {
-- return "duration"
+-func TestBackground(t *testing.T) {
+- c := Background()
+- if c == nil {
+- t.Fatalf("Background returned nil")
+- }
+- select {
+- case x := <-c.Done():
+- t.Errorf("<-c.Done() == %v want nothing (it should block)", x)
+- default:
+- }
+- if got, want := fmt.Sprint(c), "context.Background"; got != want {
+- t.Errorf("Background().String() = %q want %q", got, want)
+- }
-}
-
--func (d *durationValue) String() string { return (*time.Duration)(d).String() }
--
--// DurationVar defines a time.Duration flag with specified name, default value, and usage string.
--// The argument p points to a time.Duration variable in which to store the value of the flag.
--func (f *FlagSet) DurationVar(p *time.Duration, name string, value time.Duration, usage string) {
-- f.VarP(newDurationValue(value, p), name, "", usage)
+-func TestTODO(t *testing.T) {
+- c := TODO()
+- if c == nil {
+- t.Fatalf("TODO returned nil")
+- }
+- select {
+- case x := <-c.Done():
+- t.Errorf("<-c.Done() == %v want nothing (it should block)", x)
+- default:
+- }
+- if got, want := fmt.Sprint(c), "context.TODO"; got != want {
+- t.Errorf("TODO().String() = %q want %q", got, want)
+- }
-}
-
--// Like DurationVar, but accepts a shorthand letter that can be used after a single dash.
--func (f *FlagSet) DurationVarP(p *time.Duration, name, shorthand string, value time.Duration, usage string) {
-- f.VarP(newDurationValue(value, p), name, shorthand, usage)
--}
+-func TestWithCancel(t *testing.T) {
+- c1, cancel := WithCancel(Background())
-
--// DurationVar defines a time.Duration flag with specified name, default value, and usage string.
--// The argument p points to a time.Duration variable in which to store the value of the flag.
--func DurationVar(p *time.Duration, name string, value time.Duration, usage string) {
-- CommandLine.VarP(newDurationValue(value, p), name, "", usage)
--}
+- if got, want := fmt.Sprint(c1), "context.Background.WithCancel"; got != want {
+- t.Errorf("c1.String() = %q want %q", got, want)
+- }
-
--// Like DurationVar, but accepts a shorthand letter that can be used after a single dash.
--func DurationVarP(p *time.Duration, name, shorthand string, value time.Duration, usage string) {
-- CommandLine.VarP(newDurationValue(value, p), name, shorthand, usage)
--}
+- o := otherContext{c1}
+- c2, _ := WithCancel(o)
+- contexts := []Context{c1, o, c2}
-
--// Duration defines a time.Duration flag with specified name, default value, and usage string.
--// The return value is the address of a time.Duration variable that stores the value of the flag.
--func (f *FlagSet) Duration(name string, value time.Duration, usage string) *time.Duration {
-- p := new(time.Duration)
-- f.DurationVarP(p, name, "", value, usage)
-- return p
--}
+- for i, c := range contexts {
+- if d := c.Done(); d == nil {
+- t.Errorf("c[%d].Done() == %v want non-nil", i, d)
+- }
+- if e := c.Err(); e != nil {
+- t.Errorf("c[%d].Err() == %v want nil", i, e)
+- }
-
--// Like Duration, but accepts a shorthand letter that can be used after a single dash.
--func (f *FlagSet) DurationP(name, shorthand string, value time.Duration, usage string) *time.Duration {
-- p := new(time.Duration)
-- f.DurationVarP(p, name, shorthand, value, usage)
-- return p
--}
+- select {
+- case x := <-c.Done():
+- t.Errorf("<-c.Done() == %v want nothing (it should block)", x)
+- default:
+- }
+- }
-
--// Duration defines a time.Duration flag with specified name, default value, and usage string.
--// The return value is the address of a time.Duration variable that stores the value of the flag.
--func Duration(name string, value time.Duration, usage string) *time.Duration {
-- return CommandLine.DurationP(name, "", value, usage)
--}
+- cancel()
+- time.Sleep(100 * time.Millisecond) // let cancelation propagate
-
--// Like Duration, but accepts a shorthand letter that can be used after a single dash.
--func DurationP(name, shorthand string, value time.Duration, usage string) *time.Duration {
-- return CommandLine.DurationP(name, shorthand, value, usage)
+- for i, c := range contexts {
+- select {
+- case <-c.Done():
+- default:
+- t.Errorf("<-c[%d].Done() blocked, but shouldn't have", i)
+- }
+- if e := c.Err(); e != Canceled {
+- t.Errorf("c[%d].Err() == %v want %v", i, e, Canceled)
+- }
+- }
-}
-diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/example_test.go b/Godeps/_workspace/src/github.com/spf13/pflag/example_test.go
-deleted file mode 100644
-index 03ebeaa..0000000
---- a/Godeps/_workspace/src/github.com/spf13/pflag/example_test.go
-+++ /dev/null
-@@ -1,73 +0,0 @@
--// Copyright 2012 The Go Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
-
--// These examples demonstrate more intricate uses of the flag package.
--package pflag_test
+-func TestParentFinishesChild(t *testing.T) {
+- // Context tree:
+- // parent -> cancelChild
+- // parent -> valueChild -> timerChild
+- parent, cancel := WithCancel(Background())
+- cancelChild, stop := WithCancel(parent)
+- defer stop()
+- valueChild := WithValue(parent, "key", "value")
+- timerChild, stop := WithTimeout(valueChild, 10000*time.Hour)
+- defer stop()
-
--import (
-- "errors"
-- "fmt"
-- "strings"
-- "time"
+- select {
+- case x := <-parent.Done():
+- t.Errorf("<-parent.Done() == %v want nothing (it should block)", x)
+- case x := <-cancelChild.Done():
+- t.Errorf("<-cancelChild.Done() == %v want nothing (it should block)", x)
+- case x := <-timerChild.Done():
+- t.Errorf("<-timerChild.Done() == %v want nothing (it should block)", x)
+- case x := <-valueChild.Done():
+- t.Errorf("<-valueChild.Done() == %v want nothing (it should block)", x)
+- default:
+- }
-
-- flag "github.com/ogier/pflag"
--)
+- // The parent's children should contain the two cancelable children.
+- pc := parent.(*cancelCtx)
+- cc := cancelChild.(*cancelCtx)
+- tc := timerChild.(*timerCtx)
+- pc.mu.Lock()
+- if len(pc.children) != 2 || !pc.children[cc] || !pc.children[tc] {
+- t.Errorf("bad linkage: pc.children = %v, want %v and %v",
+- pc.children, cc, tc)
+- }
+- pc.mu.Unlock()
-
--// Example 1: A single string flag called "species" with default value "gopher".
--var species = flag.String("species", "gopher", "the species we are studying")
+- if p, ok := parentCancelCtx(cc.Context); !ok || p != pc {
+- t.Errorf("bad linkage: parentCancelCtx(cancelChild.Context) = %v, %v want %v, true", p, ok, pc)
+- }
+- if p, ok := parentCancelCtx(tc.Context); !ok || p != pc {
+- t.Errorf("bad linkage: parentCancelCtx(timerChild.Context) = %v, %v want %v, true", p, ok, pc)
+- }
-
--// Example 2: A flag with a shorthand letter.
--var gopherType = flag.StringP("gopher_type", "g", "pocket", "the variety of gopher")
+- cancel()
-
--// Example 3: A user-defined flag type, a slice of durations.
--type interval []time.Duration
+- pc.mu.Lock()
+- if len(pc.children) != 0 {
+- t.Errorf("pc.cancel didn't clear pc.children = %v", pc.children)
+- }
+- pc.mu.Unlock()
-
--// String is the method to format the flag's value, part of the flag.Value interface.
--// The String method's output will be used in diagnostics.
--func (i *interval) String() string {
-- return fmt.Sprint(*i)
--}
+- // parent and children should all be finished.
+- check := func(ctx Context, name string) {
+- select {
+- case <-ctx.Done():
+- default:
+- t.Errorf("<-%s.Done() blocked, but shouldn't have", name)
+- }
+- if e := ctx.Err(); e != Canceled {
+- t.Errorf("%s.Err() == %v want %v", name, e, Canceled)
+- }
+- }
+- check(parent, "parent")
+- check(cancelChild, "cancelChild")
+- check(valueChild, "valueChild")
+- check(timerChild, "timerChild")
-
--// Set is the method to set the flag value, part of the flag.Value interface.
--// Set's argument is a string to be parsed to set the flag.
--// It's a comma-separated list, so we split it.
--func (i *interval) Set(value string) error {
-- // If we wanted to allow the flag to be set multiple times,
-- // accumulating values, we would delete this if statement.
-- // That would permit usages such as
-- // -deltaT 10s -deltaT 15s
-- // and other combinations.
-- if len(*i) > 0 {
-- return errors.New("interval flag already set")
+- // WithCancel should return a canceled context on a canceled parent.
+- precanceledChild := WithValue(parent, "key", "value")
+- select {
+- case <-precanceledChild.Done():
+- default:
+- t.Errorf("<-precanceledChild.Done() blocked, but shouldn't have")
- }
-- for _, dt := range strings.Split(value, ",") {
-- duration, err := time.ParseDuration(dt)
-- if err != nil {
-- return err
-- }
-- *i = append(*i, duration)
+- if e := precanceledChild.Err(); e != Canceled {
+- t.Errorf("precanceledChild.Err() == %v want %v", e, Canceled)
- }
-- return nil
-}
-
--// Define a flag to accumulate durations. Because it has a special type,
--// we need to use the Var function and therefore create the flag during
--// init.
+-func TestChildFinishesFirst(t *testing.T) {
+- cancelable, stop := WithCancel(Background())
+- defer stop()
+- for _, parent := range []Context{Background(), cancelable} {
+- child, cancel := WithCancel(parent)
-
--var intervalFlag interval
+- select {
+- case x := <-parent.Done():
+- t.Errorf("<-parent.Done() == %v want nothing (it should block)", x)
+- case x := <-child.Done():
+- t.Errorf("<-child.Done() == %v want nothing (it should block)", x)
+- default:
+- }
-
--func init() {
-- // Tie the command-line flag to the intervalFlag variable and
-- // set a usage message.
-- flag.Var(&intervalFlag, "deltaT", "comma-separated list of intervals to use between events")
--}
+- cc := child.(*cancelCtx)
+- pc, pcok := parent.(*cancelCtx) // pcok == false when parent == Background()
+- if p, ok := parentCancelCtx(cc.Context); ok != pcok || (ok && pc != p) {
+- t.Errorf("bad linkage: parentCancelCtx(cc.Context) = %v, %v want %v, %v", p, ok, pc, pcok)
+- }
-
--func Example() {
-- // All the interesting pieces are with the variables declared above, but
-- // to enable the flag package to see the flags defined there, one must
-- // execute, typically at the start of main (not init!):
-- // flag.Parse()
-- // We don't run it here because this is not a main function and
-- // the testing suite has already parsed the flags.
--}
-diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/export_test.go b/Godeps/_workspace/src/github.com/spf13/pflag/export_test.go
-deleted file mode 100644
-index 9318fee..0000000
---- a/Godeps/_workspace/src/github.com/spf13/pflag/export_test.go
-+++ /dev/null
-@@ -1,29 +0,0 @@
--// Copyright 2010 The Go Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
+- if pcok {
+- pc.mu.Lock()
+- if len(pc.children) != 1 || !pc.children[cc] {
+- t.Errorf("bad linkage: pc.children = %v, cc = %v", pc.children, cc)
+- }
+- pc.mu.Unlock()
+- }
-
--package pflag
+- cancel()
-
--import (
-- "io/ioutil"
-- "os"
--)
+- if pcok {
+- pc.mu.Lock()
+- if len(pc.children) != 0 {
+- t.Errorf("child's cancel didn't remove self from pc.children = %v", pc.children)
+- }
+- pc.mu.Unlock()
+- }
-
--// Additional routines compiled into the package only during testing.
+- // child should be finished.
+- select {
+- case <-child.Done():
+- default:
+- t.Errorf("<-child.Done() blocked, but shouldn't have")
+- }
+- if e := child.Err(); e != Canceled {
+- t.Errorf("child.Err() == %v want %v", e, Canceled)
+- }
-
--// ResetForTesting clears all flag state and sets the usage function as directed.
--// After calling ResetForTesting, parse errors in flag handling will not
--// exit the program.
--func ResetForTesting(usage func()) {
-- CommandLine = &FlagSet{
-- name: os.Args[0],
-- errorHandling: ContinueOnError,
-- output: ioutil.Discard,
+- // parent should not be finished.
+- select {
+- case x := <-parent.Done():
+- t.Errorf("<-parent.Done() == %v want nothing (it should block)", x)
+- default:
+- }
+- if e := parent.Err(); e != nil {
+- t.Errorf("parent.Err() == %v want nil", e)
+- }
- }
-- Usage = usage
-}
-
--// GetCommandLine returns the default FlagSet.
--func GetCommandLine() *FlagSet {
-- return CommandLine
+-func testDeadline(c Context, wait time.Duration, t *testing.T) {
+- select {
+- case <-time.After(wait):
+- t.Fatalf("context should have timed out")
+- case <-c.Done():
+- }
+- if e := c.Err(); e != DeadlineExceeded {
+- t.Errorf("c.Err() == %v want %v", e, DeadlineExceeded)
+- }
-}
-diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/flag.go b/Godeps/_workspace/src/github.com/spf13/pflag/flag.go
-deleted file mode 100644
-index 47761a0..0000000
---- a/Godeps/_workspace/src/github.com/spf13/pflag/flag.go
-+++ /dev/null
-@@ -1,621 +0,0 @@
--// Copyright 2009 The Go Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--/*
-- pflag is a drop-in replacement for Go's flag package, implementing
-- POSIX/GNU-style --flags.
--
-- pflag is compatible with the GNU extensions to the POSIX recommendations
-- for command-line options. See
-- http://www.gnu.org/software/libc/manual/html_node/Argument-Syntax.html
-
-- Usage:
+-func TestDeadline(t *testing.T) {
+- c, _ := WithDeadline(Background(), time.Now().Add(100*time.Millisecond))
+- if got, prefix := fmt.Sprint(c), "context.Background.WithDeadline("; !strings.HasPrefix(got, prefix) {
+- t.Errorf("c.String() = %q want prefix %q", got, prefix)
+- }
+- testDeadline(c, 200*time.Millisecond, t)
-
-- pflag is a drop-in replacement of Go's native flag package. If you import
-- pflag under the name "flag" then all code should continue to function
-- with no changes.
+- c, _ = WithDeadline(Background(), time.Now().Add(100*time.Millisecond))
+- o := otherContext{c}
+- testDeadline(o, 200*time.Millisecond, t)
-
-- import flag "github.com/ogier/pflag"
+- c, _ = WithDeadline(Background(), time.Now().Add(100*time.Millisecond))
+- o = otherContext{c}
+- c, _ = WithDeadline(o, time.Now().Add(300*time.Millisecond))
+- testDeadline(c, 200*time.Millisecond, t)
+-}
-
-- There is one exception to this: if you directly instantiate the Flag struct
-- there is one more field "Shorthand" that you will need to set.
-- Most code never instantiates this struct directly, and instead uses
-- functions such as String(), BoolVar(), and Var(), and is therefore
-- unaffected.
+-func TestTimeout(t *testing.T) {
+- c, _ := WithTimeout(Background(), 100*time.Millisecond)
+- if got, prefix := fmt.Sprint(c), "context.Background.WithDeadline("; !strings.HasPrefix(got, prefix) {
+- t.Errorf("c.String() = %q want prefix %q", got, prefix)
+- }
+- testDeadline(c, 200*time.Millisecond, t)
-
-- Define flags using flag.String(), Bool(), Int(), etc.
+- c, _ = WithTimeout(Background(), 100*time.Millisecond)
+- o := otherContext{c}
+- testDeadline(o, 200*time.Millisecond, t)
-
-- This declares an integer flag, -flagname, stored in the pointer ip, with type *int.
-- var ip = flag.Int("flagname", 1234, "help message for flagname")
-- If you like, you can bind the flag to a variable using the Var() functions.
-- var flagvar int
-- func init() {
-- flag.IntVar(&flagvar, "flagname", 1234, "help message for flagname")
-- }
-- Or you can create custom flags that satisfy the Value interface (with
-- pointer receivers) and couple them to flag parsing by
-- flag.Var(&flagVal, "name", "help message for flagname")
-- For such flags, the default value is just the initial value of the variable.
+- c, _ = WithTimeout(Background(), 100*time.Millisecond)
+- o = otherContext{c}
+- c, _ = WithTimeout(o, 300*time.Millisecond)
+- testDeadline(c, 200*time.Millisecond, t)
+-}
-
-- After all flags are defined, call
-- flag.Parse()
-- to parse the command line into the defined flags.
+-func TestCanceledTimeout(t *testing.T) {
+- c, _ := WithTimeout(Background(), 200*time.Millisecond)
+- o := otherContext{c}
+- c, cancel := WithTimeout(o, 400*time.Millisecond)
+- cancel()
+- time.Sleep(100 * time.Millisecond) // let cancelation propagate
+- select {
+- case <-c.Done():
+- default:
+- t.Errorf("<-c.Done() blocked, but shouldn't have")
+- }
+- if e := c.Err(); e != Canceled {
+- t.Errorf("c.Err() == %v want %v", e, Canceled)
+- }
+-}
-
-- Flags may then be used directly. If you're using the flags themselves,
-- they are all pointers; if you bind to variables, they're values.
-- fmt.Println("ip has value ", *ip)
-- fmt.Println("flagvar has value ", flagvar)
+-type key1 int
+-type key2 int
-
-- After parsing, the arguments after the flag are available as the
-- slice flag.Args() or individually as flag.Arg(i).
-- The arguments are indexed from 0 through flag.NArg()-1.
+-var k1 = key1(1)
+-var k2 = key2(1) // same int as k1, different type
+-var k3 = key2(3) // same type as k2, different int
-
-- The pflag package also defines some new functions that are not in flag,
-- that give one-letter shorthands for flags. You can use these by appending
-- 'P' to the name of any function that defines a flag.
-- var ip = flag.IntP("flagname", "f", 1234, "help message")
-- var flagvar bool
-- func init() {
-- flag.BoolVarP("boolname", "b", true, "help message")
+-func TestValues(t *testing.T) {
+- check := func(c Context, nm, v1, v2, v3 string) {
+- if v, ok := c.Value(k1).(string); ok == (len(v1) == 0) || v != v1 {
+- t.Errorf(`%s.Value(k1).(string) = %q, %t want %q, %t`, nm, v, ok, v1, len(v1) != 0)
- }
-- flag.VarP(&flagVar, "varname", "v", 1234, "help message")
-- Shorthand letters can be used with single dashes on the command line.
-- Boolean shorthand flags can be combined with other shorthand flags.
--
-- Command line flag syntax:
-- --flag // boolean flags only
-- --flag=x
+- if v, ok := c.Value(k2).(string); ok == (len(v2) == 0) || v != v2 {
+- t.Errorf(`%s.Value(k2).(string) = %q, %t want %q, %t`, nm, v, ok, v2, len(v2) != 0)
+- }
+- if v, ok := c.Value(k3).(string); ok == (len(v3) == 0) || v != v3 {
+- t.Errorf(`%s.Value(k3).(string) = %q, %t want %q, %t`, nm, v, ok, v3, len(v3) != 0)
+- }
+- }
-
-- Unlike the flag package, a single dash before an option means something
-- different than a double dash. Single dashes signify a series of shorthand
-- letters for flags. All but the last shorthand letter must be boolean flags.
-- // boolean flags
-- -f
-- -abc
-- // non-boolean flags
-- -n 1234
-- -Ifile
-- // mixed
-- -abcs "hello"
-- -abcn1234
+- c0 := Background()
+- check(c0, "c0", "", "", "")
-
-- Flag parsing stops after the terminator "--". Unlike the flag package,
-- flags can be interspersed with arguments anywhere on the command line
-- before this terminator.
+- c1 := WithValue(Background(), k1, "c1k1")
+- check(c1, "c1", "c1k1", "", "")
-
-- Integer flags accept 1234, 0664, 0x1234 and may be negative.
-- Boolean flags (in their long form) accept 1, 0, t, f, true, false,
-- TRUE, FALSE, True, False.
-- Duration flags accept any input valid for time.ParseDuration.
+- if got, want := fmt.Sprint(c1), `context.Background.WithValue(1, "c1k1")`; got != want {
+- t.Errorf("c.String() = %q want %q", got, want)
+- }
-
-- The default set of command-line flags is controlled by
-- top-level functions. The FlagSet type allows one to define
-- independent sets of flags, such as to implement subcommands
-- in a command-line interface. The methods of FlagSet are
-- analogous to the top-level functions for the command-line
-- flag set.
--*/
--package pflag
+- c2 := WithValue(c1, k2, "c2k2")
+- check(c2, "c2", "c1k1", "c2k2", "")
-
--import (
-- "bytes"
-- "errors"
-- "fmt"
-- "io"
-- "os"
-- "sort"
-- "strings"
--)
+- c3 := WithValue(c2, k3, "c3k3")
+- check(c3, "c2", "c1k1", "c2k2", "c3k3")
-
--// ErrHelp is the error returned if the flag -help is invoked but no such flag is defined.
--var ErrHelp = errors.New("pflag: help requested")
+- c4 := WithValue(c3, k1, nil)
+- check(c4, "c4", "", "c2k2", "c3k3")
-
--// ErrorHandling defines how to handle flag parsing errors.
--type ErrorHandling int
+- o0 := otherContext{Background()}
+- check(o0, "o0", "", "", "")
-
--const (
-- ContinueOnError ErrorHandling = iota
-- ExitOnError
-- PanicOnError
--)
+- o1 := otherContext{WithValue(Background(), k1, "c1k1")}
+- check(o1, "o1", "c1k1", "", "")
-
--// A FlagSet represents a set of defined flags.
--type FlagSet struct {
-- // Usage is the function called when an error occurs while parsing flags.
-- // The field is a function (not a method) that may be changed to point to
-- // a custom error handler.
-- Usage func()
+- o2 := WithValue(o1, k2, "o2k2")
+- check(o2, "o2", "c1k1", "o2k2", "")
-
-- name string
-- parsed bool
-- actual map[string]*Flag
-- formal map[string]*Flag
-- shorthands map[byte]*Flag
-- args []string // arguments after flags
-- exitOnError bool // does the program exit if there's an error?
-- errorHandling ErrorHandling
-- output io.Writer // nil means stderr; use out() accessor
-- interspersed bool // allow interspersed option/non-option args
--}
+- o3 := otherContext{c4}
+- check(o3, "o3", "", "c2k2", "c3k3")
-
--// A Flag represents the state of a flag.
--type Flag struct {
-- Name string // name as it appears on command line
-- Shorthand string // one-letter abbreviated flag
-- Usage string // help message
-- Value Value // value as set
-- DefValue string // default value (as text); for usage message
-- Changed bool // If the user set the value (or if left to default)
+- o4 := WithValue(o3, k3, nil)
+- check(o4, "o4", "", "c2k2", "")
-}
-
--// Value is the interface to the dynamic value stored in a flag.
--// (The default value is represented as a string.)
--type Value interface {
-- String() string
-- Set(string) error
-- Type() string
+-func TestAllocs(t *testing.T) {
+- bg := Background()
+- for _, test := range []struct {
+- desc string
+- f func()
+- limit float64
+- gccgoLimit float64
+- }{
+- {
+- desc: "Background()",
+- f: func() { Background() },
+- limit: 0,
+- gccgoLimit: 0,
+- },
+- {
+- desc: fmt.Sprintf("WithValue(bg, %v, nil)", k1),
+- f: func() {
+- c := WithValue(bg, k1, nil)
+- c.Value(k1)
+- },
+- limit: 3,
+- gccgoLimit: 3,
+- },
+- {
+- desc: "WithTimeout(bg, 15*time.Millisecond)",
+- f: func() {
+- c, _ := WithTimeout(bg, 15*time.Millisecond)
+- <-c.Done()
+- },
+- limit: 8,
+- gccgoLimit: 13,
+- },
+- {
+- desc: "WithCancel(bg)",
+- f: func() {
+- c, cancel := WithCancel(bg)
+- cancel()
+- <-c.Done()
+- },
+- limit: 5,
+- gccgoLimit: 8,
+- },
+- {
+- desc: "WithTimeout(bg, 100*time.Millisecond)",
+- f: func() {
+- c, cancel := WithTimeout(bg, 100*time.Millisecond)
+- cancel()
+- <-c.Done()
+- },
+- limit: 8,
+- gccgoLimit: 25,
+- },
+- } {
+- limit := test.limit
+- if runtime.Compiler == "gccgo" {
+- // gccgo does not yet do escape analysis.
+- // TOOD(iant): Remove this when gccgo does do escape analysis.
+- limit = test.gccgoLimit
+- }
+- if n := testing.AllocsPerRun(100, test.f); n > limit {
+- t.Errorf("%s allocs = %f want %d", test.desc, n, int(limit))
+- }
+- }
-}
-
--// sortFlags returns the flags as a slice in lexicographical sorted order.
--func sortFlags(flags map[string]*Flag) []*Flag {
-- list := make(sort.StringSlice, len(flags))
-- i := 0
-- for _, f := range flags {
-- list[i] = f.Name
-- i++
+-func TestSimultaneousCancels(t *testing.T) {
+- root, cancel := WithCancel(Background())
+- m := map[Context]CancelFunc{root: cancel}
+- q := []Context{root}
+- // Create a tree of contexts.
+- for len(q) != 0 && len(m) < 100 {
+- parent := q[0]
+- q = q[1:]
+- for i := 0; i < 4; i++ {
+- ctx, cancel := WithCancel(parent)
+- m[ctx] = cancel
+- q = append(q, ctx)
+- }
- }
-- list.Sort()
-- result := make([]*Flag, len(list))
-- for i, name := range list {
-- result[i] = flags[name]
+- // Start all the cancels in a random order.
+- var wg sync.WaitGroup
+- wg.Add(len(m))
+- for _, cancel := range m {
+- go func(cancel CancelFunc) {
+- cancel()
+- wg.Done()
+- }(cancel)
- }
-- return result
--}
--
--func (f *FlagSet) out() io.Writer {
-- if f.output == nil {
-- return os.Stderr
+- // Wait on all the contexts in a random order.
+- for ctx := range m {
+- select {
+- case <-ctx.Done():
+- case <-time.After(1 * time.Second):
+- buf := make([]byte, 10<<10)
+- n := runtime.Stack(buf, true)
+- t.Fatalf("timed out waiting for <-ctx.Done(); stacks:\n%s", buf[:n])
+- }
- }
-- return f.output
--}
--
--// SetOutput sets the destination for usage and error messages.
--// If output is nil, os.Stderr is used.
--func (f *FlagSet) SetOutput(output io.Writer) {
-- f.output = output
--}
--
--// VisitAll visits the flags in lexicographical order, calling fn for each.
--// It visits all flags, even those not set.
--func (f *FlagSet) VisitAll(fn func(*Flag)) {
-- for _, flag := range sortFlags(f.formal) {
-- fn(flag)
+- // Wait for all the cancel functions to return.
+- done := make(chan struct{})
+- go func() {
+- wg.Wait()
+- close(done)
+- }()
+- select {
+- case <-done:
+- case <-time.After(1 * time.Second):
+- buf := make([]byte, 10<<10)
+- n := runtime.Stack(buf, true)
+- t.Fatalf("timed out waiting for cancel functions; stacks:\n%s", buf[:n])
- }
-}
-
--func (f *FlagSet) HasFlags() bool {
-- return len(f.formal) > 0
--}
--
--// VisitAll visits the command-line flags in lexicographical order, calling
--// fn for each. It visits all flags, even those not set.
--func VisitAll(fn func(*Flag)) {
-- CommandLine.VisitAll(fn)
--}
--
--// Visit visits the flags in lexicographical order, calling fn for each.
--// It visits only those flags that have been set.
--func (f *FlagSet) Visit(fn func(*Flag)) {
-- for _, flag := range sortFlags(f.actual) {
-- fn(flag)
+-func TestInterlockedCancels(t *testing.T) {
+- parent, cancelParent := WithCancel(Background())
+- child, cancelChild := WithCancel(parent)
+- go func() {
+- parent.Done()
+- cancelChild()
+- }()
+- cancelParent()
+- select {
+- case <-child.Done():
+- case <-time.After(1 * time.Second):
+- buf := make([]byte, 10<<10)
+- n := runtime.Stack(buf, true)
+- t.Fatalf("timed out waiting for child.Done(); stacks:\n%s", buf[:n])
- }
-}
-
--// Visit visits the command-line flags in lexicographical order, calling fn
--// for each. It visits only those flags that have been set.
--func Visit(fn func(*Flag)) {
-- CommandLine.Visit(fn)
--}
--
--// Lookup returns the Flag structure of the named flag, returning nil if none exists.
--func (f *FlagSet) Lookup(name string) *Flag {
-- return f.formal[name]
+-func TestLayersCancel(t *testing.T) {
+- testLayers(t, time.Now().UnixNano(), false)
-}
-
--// Lookup returns the Flag structure of the named command-line flag,
--// returning nil if none exists.
--func Lookup(name string) *Flag {
-- return CommandLine.formal[name]
+-func TestLayersTimeout(t *testing.T) {
+- testLayers(t, time.Now().UnixNano(), true)
-}
-
--// Set sets the value of the named flag.
--func (f *FlagSet) Set(name, value string) error {
-- flag, ok := f.formal[name]
-- if !ok {
-- return fmt.Errorf("no such flag -%v", name)
+-func testLayers(t *testing.T, seed int64, testTimeout bool) {
+- rand.Seed(seed)
+- errorf := func(format string, a ...interface{}) {
+- t.Errorf(fmt.Sprintf("seed=%d: %s", seed, format), a...)
- }
-- err := flag.Value.Set(value)
-- if err != nil {
-- return err
+- const (
+- timeout = 200 * time.Millisecond
+- minLayers = 30
+- )
+- type value int
+- var (
+- vals []*value
+- cancels []CancelFunc
+- numTimers int
+- ctx = Background()
+- )
+- for i := 0; i < minLayers || numTimers == 0 || len(cancels) == 0 || len(vals) == 0; i++ {
+- switch rand.Intn(3) {
+- case 0:
+- v := new(value)
+- ctx = WithValue(ctx, v, v)
+- vals = append(vals, v)
+- case 1:
+- var cancel CancelFunc
+- ctx, cancel = WithCancel(ctx)
+- cancels = append(cancels, cancel)
+- case 2:
+- var cancel CancelFunc
+- ctx, cancel = WithTimeout(ctx, timeout)
+- cancels = append(cancels, cancel)
+- numTimers++
+- }
- }
-- if f.actual == nil {
-- f.actual = make(map[string]*Flag)
+- checkValues := func(when string) {
+- for _, key := range vals {
+- if val := ctx.Value(key).(*value); key != val {
+- errorf("%s: ctx.Value(%p) = %p want %p", when, key, val, key)
+- }
+- }
- }
-- f.actual[name] = flag
-- f.Lookup(name).Changed = true
-- return nil
--}
--
--// Set sets the value of the named command-line flag.
--func Set(name, value string) error {
-- return CommandLine.Set(name, value)
--}
--
--// PrintDefaults prints, to standard error unless configured
--// otherwise, the default values of all defined flags in the set.
--func (f *FlagSet) PrintDefaults() {
-- f.VisitAll(func(flag *Flag) {
-- format := "--%s=%s: %s\n"
-- if _, ok := flag.Value.(*stringValue); ok {
-- // put quotes on the value
-- format = "--%s=%q: %s\n"
+- select {
+- case <-ctx.Done():
+- errorf("ctx should not be canceled yet")
+- default:
+- }
+- if s, prefix := fmt.Sprint(ctx), "context.Background."; !strings.HasPrefix(s, prefix) {
+- t.Errorf("ctx.String() = %q want prefix %q", s, prefix)
+- }
+- t.Log(ctx)
+- checkValues("before cancel")
+- if testTimeout {
+- select {
+- case <-ctx.Done():
+- case <-time.After(timeout + timeout/10):
+- errorf("ctx should have timed out")
- }
-- if len(flag.Shorthand) > 0 {
-- format = " -%s, " + format
-- } else {
-- format = " %s " + format
+- checkValues("after timeout")
+- } else {
+- cancel := cancels[rand.Intn(len(cancels))]
+- cancel()
+- select {
+- case <-ctx.Done():
+- default:
+- errorf("ctx should be canceled")
- }
-- fmt.Fprintf(f.out(), format, flag.Shorthand, flag.Name, flag.DefValue, flag.Usage)
-- })
+- checkValues("after cancel")
+- }
-}
+diff --git a/Godeps/_workspace/src/golang.org/x/net/context/withtimeout_test.go b/Godeps/_workspace/src/golang.org/x/net/context/withtimeout_test.go
+deleted file mode 100644
+index a6754dc..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/context/withtimeout_test.go
++++ /dev/null
+@@ -1,26 +0,0 @@
+-// Copyright 2014 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
--func (f *FlagSet) FlagUsages() string {
-- x := new(bytes.Buffer)
+-package context_test
-
-- f.VisitAll(func(flag *Flag) {
-- format := "--%s=%s: %s\n"
-- if _, ok := flag.Value.(*stringValue); ok {
-- // put quotes on the value
-- format = "--%s=%q: %s\n"
-- }
-- if len(flag.Shorthand) > 0 {
-- format = " -%s, " + format
-- } else {
-- format = " %s " + format
-- }
-- fmt.Fprintf(x, format, flag.Shorthand, flag.Name, flag.DefValue, flag.Usage)
-- })
+-import (
+- "fmt"
+- "time"
+-
+- "golang.org/x/net/context"
+-)
+-
+-func ExampleWithTimeout() {
+- // Pass a context with a timeout to tell a blocking function that it
+- // should abandon its work after the timeout elapses.
+- ctx, _ := context.WithTimeout(context.Background(), 100*time.Millisecond)
+- select {
+- case <-time.After(200 * time.Millisecond):
+- fmt.Println("overslept")
+- case <-ctx.Done():
+- fmt.Println(ctx.Err()) // prints "context deadline exceeded"
+- }
+- // Output:
+- // context deadline exceeded
+-}
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/atom/atom.go b/Godeps/_workspace/src/golang.org/x/net/html/atom/atom.go
+deleted file mode 100644
+index 227404b..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/atom/atom.go
++++ /dev/null
+@@ -1,78 +0,0 @@
+-// Copyright 2012 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-// Package atom provides integer codes (also known as atoms) for a fixed set of
+-// frequently occurring HTML strings: tag names and attribute keys such as "p"
+-// and "id".
+-//
+-// Sharing an atom's name between all elements with the same tag can result in
+-// fewer string allocations when tokenizing and parsing HTML. Integer
+-// comparisons are also generally faster than string comparisons.
+-//
+-// The value of an atom's particular code is not guaranteed to stay the same
+-// between versions of this package. Neither is any ordering guaranteed:
+-// whether atom.H1 < atom.H2 may also change. The codes are not guaranteed to
+-// be dense. The only guarantees are that e.g. looking up "div" will yield
+-// atom.Div, calling atom.Div.String will return "div", and atom.Div != 0.
+-package atom
-
-- return x.String()
--}
+-// Atom is an integer code for a string. The zero value maps to "".
+-type Atom uint32
-
--// PrintDefaults prints to standard error the default values of all defined command-line flags.
--func PrintDefaults() {
-- CommandLine.PrintDefaults()
+-// String returns the atom's name.
+-func (a Atom) String() string {
+- start := uint32(a >> 8)
+- n := uint32(a & 0xff)
+- if start+n > uint32(len(atomText)) {
+- return ""
+- }
+- return atomText[start : start+n]
-}
-
--// defaultUsage is the default function to print a usage message.
--func defaultUsage(f *FlagSet) {
-- fmt.Fprintf(f.out(), "Usage of %s:\n", f.name)
-- f.PrintDefaults()
+-func (a Atom) string() string {
+- return atomText[a>>8 : a>>8+a&0xff]
-}
-
--// NOTE: Usage is not just defaultUsage(CommandLine)
--// because it serves (via godoc flag Usage) as the example
--// for how to write your own usage function.
--
--// Usage prints to standard error a usage message documenting all defined command-line flags.
--// The function is a variable that may be changed to point to a custom function.
--var Usage = func() {
-- fmt.Fprintf(os.Stderr, "Usage of %s:\n", os.Args[0])
-- PrintDefaults()
+-// fnv computes the FNV hash with an arbitrary starting value h.
+-func fnv(h uint32, s []byte) uint32 {
+- for i := range s {
+- h ^= uint32(s[i])
+- h *= 16777619
+- }
+- return h
-}
-
--// NFlag returns the number of flags that have been set.
--func (f *FlagSet) NFlag() int { return len(f.actual) }
--
--// NFlag returns the number of command-line flags that have been set.
--func NFlag() int { return len(CommandLine.actual) }
--
--// Arg returns the i'th argument. Arg(0) is the first remaining argument
--// after flags have been processed.
--func (f *FlagSet) Arg(i int) string {
-- if i < 0 || i >= len(f.args) {
-- return ""
+-func match(s string, t []byte) bool {
+- for i, c := range t {
+- if s[i] != c {
+- return false
+- }
- }
-- return f.args[i]
+- return true
-}
-
--// Arg returns the i'th command-line argument. Arg(0) is the first remaining argument
--// after flags have been processed.
--func Arg(i int) string {
-- return CommandLine.Arg(i)
+-// Lookup returns the atom whose name is s. It returns zero if there is no
+-// such atom. The lookup is case sensitive.
+-func Lookup(s []byte) Atom {
+- if len(s) == 0 || len(s) > maxAtomLen {
+- return 0
+- }
+- h := fnv(hash0, s)
+- if a := table[h&uint32(len(table)-1)]; int(a&0xff) == len(s) && match(a.string(), s) {
+- return a
+- }
+- if a := table[(h>>16)&uint32(len(table)-1)]; int(a&0xff) == len(s) && match(a.string(), s) {
+- return a
+- }
+- return 0
-}
-
--// NArg is the number of arguments remaining after flags have been processed.
--func (f *FlagSet) NArg() int { return len(f.args) }
--
--// NArg is the number of arguments remaining after flags have been processed.
--func NArg() int { return len(CommandLine.args) }
+-// String returns a string whose contents are equal to s. In that sense, it is
+-// equivalent to string(s) but may be more efficient.
+-func String(s []byte) string {
+- if a := Lookup(s); a != 0 {
+- return a.String()
+- }
+- return string(s)
+-}
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/atom/atom_test.go b/Godeps/_workspace/src/golang.org/x/net/html/atom/atom_test.go
+deleted file mode 100644
+index 6e33704..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/atom/atom_test.go
++++ /dev/null
+@@ -1,109 +0,0 @@
+-// Copyright 2012 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
--// Args returns the non-flag arguments.
--func (f *FlagSet) Args() []string { return f.args }
+-package atom
-
--// Args returns the non-flag command-line arguments.
--func Args() []string { return CommandLine.args }
+-import (
+- "sort"
+- "testing"
+-)
-
--// Var defines a flag with the specified name and usage string. The type and
--// value of the flag are represented by the first argument, of type Value, which
--// typically holds a user-defined implementation of Value. For instance, the
--// caller could create a flag that turns a comma-separated string into a slice
--// of strings by giving the slice the methods of Value; in particular, Set would
--// decompose the comma-separated string into the slice.
--func (f *FlagSet) Var(value Value, name string, usage string) {
-- f.VarP(value, name, "", usage)
+-func TestKnown(t *testing.T) {
+- for _, s := range testAtomList {
+- if atom := Lookup([]byte(s)); atom.String() != s {
+- t.Errorf("Lookup(%q) = %#x (%q)", s, uint32(atom), atom.String())
+- }
+- }
-}
-
--// Like Var, but accepts a shorthand letter that can be used after a single dash.
--func (f *FlagSet) VarP(value Value, name, shorthand, usage string) {
-- // Remember the default value as a string; it won't change.
-- flag := &Flag{name, shorthand, usage, value, value.String(), false}
-- f.AddFlag(flag)
+-func TestHits(t *testing.T) {
+- for _, a := range table {
+- if a == 0 {
+- continue
+- }
+- got := Lookup([]byte(a.String()))
+- if got != a {
+- t.Errorf("Lookup(%q) = %#x, want %#x", a.String(), uint32(got), uint32(a))
+- }
+- }
-}
-
--func (f *FlagSet) AddFlag(flag *Flag) {
-- _, alreadythere := f.formal[flag.Name]
-- if alreadythere {
-- msg := fmt.Sprintf("%s flag redefined: %s", f.name, flag.Name)
-- fmt.Fprintln(f.out(), msg)
-- panic(msg) // Happens only if flags are declared with identical names
+-func TestMisses(t *testing.T) {
+- testCases := []string{
+- "",
+- "\x00",
+- "\xff",
+- "A",
+- "DIV",
+- "Div",
+- "dIV",
+- "aa",
+- "a\x00",
+- "ab",
+- "abb",
+- "abbr0",
+- "abbr ",
+- " abbr",
+- " a",
+- "acceptcharset",
+- "acceptCharset",
+- "accept_charset",
+- "h0",
+- "h1h2",
+- "h7",
+- "onClick",
+- "λ",
+- // The following string has the same hash (0xa1d7fab7) as "onmouseover".
+- "\x00\x00\x00\x00\x00\x50\x18\xae\x38\xd0\xb7",
- }
-- if f.formal == nil {
-- f.formal = make(map[string]*Flag)
+- for _, tc := range testCases {
+- got := Lookup([]byte(tc))
+- if got != 0 {
+- t.Errorf("Lookup(%q): got %d, want 0", tc, got)
+- }
- }
-- f.formal[flag.Name] = flag
+-}
-
-- if len(flag.Shorthand) == 0 {
-- return
+-func TestForeignObject(t *testing.T) {
+- const (
+- afo = Foreignobject
+- afO = ForeignObject
+- sfo = "foreignobject"
+- sfO = "foreignObject"
+- )
+- if got := Lookup([]byte(sfo)); got != afo {
+- t.Errorf("Lookup(%q): got %#v, want %#v", sfo, got, afo)
- }
-- if len(flag.Shorthand) > 1 {
-- fmt.Fprintf(f.out(), "%s shorthand more than ASCII character: %s\n", f.name, flag.Shorthand)
-- panic("shorthand is more than one character")
+- if got := Lookup([]byte(sfO)); got != afO {
+- t.Errorf("Lookup(%q): got %#v, want %#v", sfO, got, afO)
- }
-- if f.shorthands == nil {
-- f.shorthands = make(map[byte]*Flag)
+- if got := afo.String(); got != sfo {
+- t.Errorf("Atom(%#v).String(): got %q, want %q", afo, got, sfo)
- }
-- c := flag.Shorthand[0]
-- old, alreadythere := f.shorthands[c]
-- if alreadythere {
-- fmt.Fprintf(f.out(), "%s shorthand reused: %q for %s already used for %s\n", f.name, c, flag.Name, old.Name)
-- panic("shorthand redefinition")
+- if got := afO.String(); got != sfO {
+- t.Errorf("Atom(%#v).String(): got %q, want %q", afO, got, sfO)
- }
-- f.shorthands[c] = flag
--}
--
--// Var defines a flag with the specified name and usage string. The type and
--// value of the flag are represented by the first argument, of type Value, which
--// typically holds a user-defined implementation of Value. For instance, the
--// caller could create a flag that turns a comma-separated string into a slice
--// of strings by giving the slice the methods of Value; in particular, Set would
--// decompose the comma-separated string into the slice.
--func Var(value Value, name string, usage string) {
-- CommandLine.VarP(value, name, "", usage)
-}
-
--// Like Var, but accepts a shorthand letter that can be used after a single dash.
--func VarP(value Value, name, shorthand, usage string) {
-- CommandLine.VarP(value, name, shorthand, usage)
--}
+-func BenchmarkLookup(b *testing.B) {
+- sortedTable := make([]string, 0, len(table))
+- for _, a := range table {
+- if a != 0 {
+- sortedTable = append(sortedTable, a.String())
+- }
+- }
+- sort.Strings(sortedTable)
-
--// failf prints to standard error a formatted error and usage message and
--// returns the error.
--func (f *FlagSet) failf(format string, a ...interface{}) error {
-- err := fmt.Errorf(format, a...)
-- fmt.Fprintln(f.out(), err)
-- f.usage()
-- return err
--}
+- x := make([][]byte, 1000)
+- for i := range x {
+- x[i] = []byte(sortedTable[i%len(sortedTable)])
+- }
-
--// usage calls the Usage method for the flag set, or the usage function if
--// the flag set is CommandLine.
--func (f *FlagSet) usage() {
-- if f == CommandLine {
-- Usage()
-- } else if f.Usage == nil {
-- defaultUsage(f)
-- } else {
-- f.Usage()
+- b.ResetTimer()
+- for i := 0; i < b.N; i++ {
+- for _, s := range x {
+- Lookup(s)
+- }
- }
-}
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/atom/gen.go b/Godeps/_workspace/src/golang.org/x/net/html/atom/gen.go
+deleted file mode 100644
+index 9958a71..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/atom/gen.go
++++ /dev/null
+@@ -1,636 +0,0 @@
+-// Copyright 2012 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
--func (f *FlagSet) setFlag(flag *Flag, value string, origArg string) error {
-- if err := flag.Value.Set(value); err != nil {
-- return f.failf("invalid argument %q for %s: %v", value, origArg, err)
-- }
-- // mark as visited for Visit()
-- if f.actual == nil {
-- f.actual = make(map[string]*Flag)
+-// +build ignore
+-
+-package main
+-
+-// This program generates table.go and table_test.go.
+-// Invoke as
+-//
+-// go run gen.go |gofmt >table.go
+-// go run gen.go -test |gofmt >table_test.go
+-
+-import (
+- "flag"
+- "fmt"
+- "math/rand"
+- "os"
+- "sort"
+- "strings"
+-)
+-
+-// identifier converts s to a Go exported identifier.
+-// It converts "div" to "Div" and "accept-charset" to "AcceptCharset".
+-func identifier(s string) string {
+- b := make([]byte, 0, len(s))
+- cap := true
+- for _, c := range s {
+- if c == '-' {
+- cap = true
+- continue
+- }
+- if cap && 'a' <= c && c <= 'z' {
+- c -= 'a' - 'A'
+- }
+- cap = false
+- b = append(b, byte(c))
- }
-- f.actual[flag.Name] = flag
-- flag.Changed = true
-- return nil
+- return string(b)
-}
-
--func (f *FlagSet) parseLongArg(s string, args []string) (a []string, err error) {
-- a = args
-- if len(s) == 2 { // "--" terminates the flags
-- f.args = append(f.args, args...)
-- return
-- }
-- name := s[2:]
-- if len(name) == 0 || name[0] == '-' || name[0] == '=' {
-- err = f.failf("bad flag syntax: %s", s)
+-var test = flag.Bool("test", false, "generate table_test.go")
+-
+-func main() {
+- flag.Parse()
+-
+- var all []string
+- all = append(all, elements...)
+- all = append(all, attributes...)
+- all = append(all, eventHandlers...)
+- all = append(all, extra...)
+- sort.Strings(all)
+-
+- if *test {
+- fmt.Printf("// generated by go run gen.go -test; DO NOT EDIT\n\n")
+- fmt.Printf("package atom\n\n")
+- fmt.Printf("var testAtomList = []string{\n")
+- for _, s := range all {
+- fmt.Printf("\t%q,\n", s)
+- }
+- fmt.Printf("}\n")
- return
- }
-- split := strings.SplitN(name, "=", 2)
-- name = split[0]
-- m := f.formal
-- flag, alreadythere := m[name] // BUG
-- if !alreadythere {
-- if name == "help" { // special case for nice help message.
-- f.usage()
-- return args, ErrHelp
+-
+- // uniq - lists have dups
+- // compute max len too
+- maxLen := 0
+- w := 0
+- for _, s := range all {
+- if w == 0 || all[w-1] != s {
+- if maxLen < len(s) {
+- maxLen = len(s)
+- }
+- all[w] = s
+- w++
- }
-- err = f.failf("unknown flag: --%s", name)
-- return
- }
-- if len(split) == 1 {
-- if _, ok := flag.Value.(*boolValue); !ok {
-- err = f.failf("flag needs an argument: %s", s)
-- return
+- all = all[:w]
+-
+- // Find hash that minimizes table size.
+- var best *table
+- for i := 0; i < 1000000; i++ {
+- if best != nil && 1<<(best.k-1) < len(all) {
+- break
- }
-- f.setFlag(flag, "true", s)
-- } else {
-- if e := f.setFlag(flag, split[1], s); e != nil {
-- err = e
-- return
+- h := rand.Uint32()
+- for k := uint(0); k <= 16; k++ {
+- if best != nil && k >= best.k {
+- break
+- }
+- var t table
+- if t.init(h, k, all) {
+- best = &t
+- break
+- }
- }
- }
-- return args, nil
--}
+- if best == nil {
+- fmt.Fprintf(os.Stderr, "failed to construct string table\n")
+- os.Exit(1)
+- }
-
--func (f *FlagSet) parseShortArg(s string, args []string) (a []string, err error) {
-- a = args
-- shorthands := s[1:]
+- // Lay out strings, using overlaps when possible.
+- layout := append([]string{}, all...)
-
-- for i := 0; i < len(shorthands); i++ {
-- c := shorthands[i]
-- flag, alreadythere := f.shorthands[c]
-- if !alreadythere {
-- if c == 'h' { // special case for nice help message.
-- f.usage()
-- err = ErrHelp
-- return
+- // Remove strings that are substrings of other strings
+- for changed := true; changed; {
+- changed = false
+- for i, s := range layout {
+- if s == "" {
+- continue
- }
-- //TODO continue on error
-- err = f.failf("unknown shorthand flag: %q in -%s", c, shorthands)
-- if len(args) == 0 {
-- return
+- for j, t := range layout {
+- if i != j && t != "" && strings.Contains(s, t) {
+- changed = true
+- layout[j] = ""
+- }
- }
- }
-- if alreadythere {
-- if _, ok := flag.Value.(*boolValue); ok {
-- f.setFlag(flag, "true", s)
+- }
+-
+- // Join strings where one suffix matches another prefix.
+- for {
+- // Find best i, j, k such that layout[i][len-k:] == layout[j][:k],
+- // maximizing overlap length k.
+- besti := -1
+- bestj := -1
+- bestk := 0
+- for i, s := range layout {
+- if s == "" {
- continue
- }
-- if i < len(shorthands)-1 {
-- if e := f.setFlag(flag, shorthands[i+1:], s); e != nil {
-- err = e
-- return
+- for j, t := range layout {
+- if i == j {
+- continue
+- }
+- for k := bestk + 1; k <= len(s) && k <= len(t); k++ {
+- if s[len(s)-k:] == t[:k] {
+- besti = i
+- bestj = j
+- bestk = k
+- }
- }
-- break
-- }
-- if len(args) == 0 {
-- err = f.failf("flag needs an argument: %q in -%s", c, shorthands)
-- return
-- }
-- if e := f.setFlag(flag, args[0], s); e != nil {
-- err = e
-- return
- }
- }
-- a = args[1:]
-- break // should be unnecessary
+- if bestk > 0 {
+- layout[besti] += layout[bestj][bestk:]
+- layout[bestj] = ""
+- continue
+- }
+- break
+- }
+-
+- text := strings.Join(layout, "")
+-
+- atom := map[string]uint32{}
+- for _, s := range all {
+- off := strings.Index(text, s)
+- if off < 0 {
+- panic("lost string " + s)
+- }
+- atom[s] = uint32(off<<8 | len(s))
+- }
+-
+- // Generate the Go code.
+- fmt.Printf("// generated by go run gen.go; DO NOT EDIT\n\n")
+- fmt.Printf("package atom\n\nconst (\n")
+- for _, s := range all {
+- fmt.Printf("\t%s Atom = %#x\n", identifier(s), atom[s])
+- }
+- fmt.Printf(")\n\n")
+-
+- fmt.Printf("const hash0 = %#x\n\n", best.h0)
+- fmt.Printf("const maxAtomLen = %d\n\n", maxLen)
+-
+- fmt.Printf("var table = [1<<%d]Atom{\n", best.k)
+- for i, s := range best.tab {
+- if s == "" {
+- continue
+- }
+- fmt.Printf("\t%#x: %#x, // %s\n", i, atom[s], s)
+- }
+- fmt.Printf("}\n")
+- datasize := (1 << best.k) * 4
+-
+- fmt.Printf("const atomText =\n")
+- textsize := len(text)
+- for len(text) > 60 {
+- fmt.Printf("\t%q +\n", text[:60])
+- text = text[60:]
+- }
+- fmt.Printf("\t%q\n\n", text)
+-
+- fmt.Fprintf(os.Stderr, "%d atoms; %d string bytes + %d tables = %d total data\n", len(all), textsize, datasize, textsize+datasize)
+-}
+-
+-type byLen []string
+-
+-func (x byLen) Less(i, j int) bool { return len(x[i]) > len(x[j]) }
+-func (x byLen) Swap(i, j int) { x[i], x[j] = x[j], x[i] }
+-func (x byLen) Len() int { return len(x) }
+-
+-// fnv computes the FNV hash with an arbitrary starting value h.
+-func fnv(h uint32, s string) uint32 {
+- for i := 0; i < len(s); i++ {
+- h ^= uint32(s[i])
+- h *= 16777619
- }
+- return h
+-}
+-
+-// A table represents an attempt at constructing the lookup table.
+-// The lookup table uses cuckoo hashing, meaning that each string
+-// can be found in one of two positions.
+-type table struct {
+- h0 uint32
+- k uint
+- mask uint32
+- tab []string
+-}
-
+-// hash returns the two hashes for s.
+-func (t *table) hash(s string) (h1, h2 uint32) {
+- h := fnv(t.h0, s)
+- h1 = h & t.mask
+- h2 = (h >> 16) & t.mask
- return
-}
-
--func (f *FlagSet) parseArgs(args []string) (err error) {
-- for len(args) > 0 {
-- s := args[0]
-- args = args[1:]
-- if len(s) == 0 || s[0] != '-' || len(s) == 1 {
-- if !f.interspersed {
-- f.args = append(f.args, s)
-- f.args = append(f.args, args...)
-- return nil
-- }
-- f.args = append(f.args, s)
-- continue
+-// init initializes the table with the given parameters.
+-// h0 is the initial hash value,
+-// k is the number of bits of hash value to use, and
+-// x is the list of strings to store in the table.
+-// init returns false if the table cannot be constructed.
+-func (t *table) init(h0 uint32, k uint, x []string) bool {
+- t.h0 = h0
+- t.k = k
+- t.tab = make([]string, 1<<k)
+- t.mask = 1<<k - 1
+- for _, s := range x {
+- if !t.insert(s) {
+- return false
- }
+- }
+- return true
+-}
-
-- if s[1] == '-' {
-- args, err = f.parseLongArg(s, args)
-- } else {
-- args, err = f.parseShortArg(s, args)
-- }
+-// insert inserts s in the table.
+-func (t *table) insert(s string) bool {
+- h1, h2 := t.hash(s)
+- if t.tab[h1] == "" {
+- t.tab[h1] = s
+- return true
- }
-- return
+- if t.tab[h2] == "" {
+- t.tab[h2] = s
+- return true
+- }
+- if t.push(h1, 0) {
+- t.tab[h1] = s
+- return true
+- }
+- if t.push(h2, 0) {
+- t.tab[h2] = s
+- return true
+- }
+- return false
-}
-
--// Parse parses flag definitions from the argument list, which should not
--// include the command name. Must be called after all flags in the FlagSet
--// are defined and before flags are accessed by the program.
--// The return value will be ErrHelp if -help was set but not defined.
--func (f *FlagSet) Parse(arguments []string) error {
-- f.parsed = true
-- f.args = make([]string, 0, len(arguments))
-- err := f.parseArgs(arguments)
-- if err != nil {
-- switch f.errorHandling {
-- case ContinueOnError:
-- return err
-- case ExitOnError:
-- os.Exit(2)
-- case PanicOnError:
-- panic(err)
-- }
+-// push attempts to push aside the entry in slot i.
+-func (t *table) push(i uint32, depth int) bool {
+- if depth > len(t.tab) {
+- return false
- }
-- return nil
+- s := t.tab[i]
+- h1, h2 := t.hash(s)
+- j := h1 + h2 - i
+- if t.tab[j] != "" && !t.push(j, depth+1) {
+- return false
+- }
+- t.tab[j] = s
+- return true
-}
-
--// Parsed reports whether f.Parse has been called.
--func (f *FlagSet) Parsed() bool {
-- return f.parsed
+-// The lists of element names and attribute keys were taken from
+-// http://www.whatwg.org/specs/web-apps/current-work/multipage/section-index.html
+-// as of the "HTML Living Standard - Last Updated 30 May 2012" version.
+-
+-var elements = []string{
+- "a",
+- "abbr",
+- "address",
+- "area",
+- "article",
+- "aside",
+- "audio",
+- "b",
+- "base",
+- "bdi",
+- "bdo",
+- "blockquote",
+- "body",
+- "br",
+- "button",
+- "canvas",
+- "caption",
+- "cite",
+- "code",
+- "col",
+- "colgroup",
+- "command",
+- "data",
+- "datalist",
+- "dd",
+- "del",
+- "details",
+- "dfn",
+- "dialog",
+- "div",
+- "dl",
+- "dt",
+- "em",
+- "embed",
+- "fieldset",
+- "figcaption",
+- "figure",
+- "footer",
+- "form",
+- "h1",
+- "h2",
+- "h3",
+- "h4",
+- "h5",
+- "h6",
+- "head",
+- "header",
+- "hgroup",
+- "hr",
+- "html",
+- "i",
+- "iframe",
+- "img",
+- "input",
+- "ins",
+- "kbd",
+- "keygen",
+- "label",
+- "legend",
+- "li",
+- "link",
+- "map",
+- "mark",
+- "menu",
+- "meta",
+- "meter",
+- "nav",
+- "noscript",
+- "object",
+- "ol",
+- "optgroup",
+- "option",
+- "output",
+- "p",
+- "param",
+- "pre",
+- "progress",
+- "q",
+- "rp",
+- "rt",
+- "ruby",
+- "s",
+- "samp",
+- "script",
+- "section",
+- "select",
+- "small",
+- "source",
+- "span",
+- "strong",
+- "style",
+- "sub",
+- "summary",
+- "sup",
+- "table",
+- "tbody",
+- "td",
+- "textarea",
+- "tfoot",
+- "th",
+- "thead",
+- "time",
+- "title",
+- "tr",
+- "track",
+- "u",
+- "ul",
+- "var",
+- "video",
+- "wbr",
+-}
+-
+-var attributes = []string{
+- "accept",
+- "accept-charset",
+- "accesskey",
+- "action",
+- "alt",
+- "async",
+- "autocomplete",
+- "autofocus",
+- "autoplay",
+- "border",
+- "challenge",
+- "charset",
+- "checked",
+- "cite",
+- "class",
+- "cols",
+- "colspan",
+- "command",
+- "content",
+- "contenteditable",
+- "contextmenu",
+- "controls",
+- "coords",
+- "crossorigin",
+- "data",
+- "datetime",
+- "default",
+- "defer",
+- "dir",
+- "dirname",
+- "disabled",
+- "download",
+- "draggable",
+- "dropzone",
+- "enctype",
+- "for",
+- "form",
+- "formaction",
+- "formenctype",
+- "formmethod",
+- "formnovalidate",
+- "formtarget",
+- "headers",
+- "height",
+- "hidden",
+- "high",
+- "href",
+- "hreflang",
+- "http-equiv",
+- "icon",
+- "id",
+- "inert",
+- "ismap",
+- "itemid",
+- "itemprop",
+- "itemref",
+- "itemscope",
+- "itemtype",
+- "keytype",
+- "kind",
+- "label",
+- "lang",
+- "list",
+- "loop",
+- "low",
+- "manifest",
+- "max",
+- "maxlength",
+- "media",
+- "mediagroup",
+- "method",
+- "min",
+- "multiple",
+- "muted",
+- "name",
+- "novalidate",
+- "open",
+- "optimum",
+- "pattern",
+- "ping",
+- "placeholder",
+- "poster",
+- "preload",
+- "radiogroup",
+- "readonly",
+- "rel",
+- "required",
+- "reversed",
+- "rows",
+- "rowspan",
+- "sandbox",
+- "spellcheck",
+- "scope",
+- "scoped",
+- "seamless",
+- "selected",
+- "shape",
+- "size",
+- "sizes",
+- "span",
+- "src",
+- "srcdoc",
+- "srclang",
+- "start",
+- "step",
+- "style",
+- "tabindex",
+- "target",
+- "title",
+- "translate",
+- "type",
+- "typemustmatch",
+- "usemap",
+- "value",
+- "width",
+- "wrap",
+-}
+-
+-var eventHandlers = []string{
+- "onabort",
+- "onafterprint",
+- "onbeforeprint",
+- "onbeforeunload",
+- "onblur",
+- "oncancel",
+- "oncanplay",
+- "oncanplaythrough",
+- "onchange",
+- "onclick",
+- "onclose",
+- "oncontextmenu",
+- "oncuechange",
+- "ondblclick",
+- "ondrag",
+- "ondragend",
+- "ondragenter",
+- "ondragleave",
+- "ondragover",
+- "ondragstart",
+- "ondrop",
+- "ondurationchange",
+- "onemptied",
+- "onended",
+- "onerror",
+- "onfocus",
+- "onhashchange",
+- "oninput",
+- "oninvalid",
+- "onkeydown",
+- "onkeypress",
+- "onkeyup",
+- "onload",
+- "onloadeddata",
+- "onloadedmetadata",
+- "onloadstart",
+- "onmessage",
+- "onmousedown",
+- "onmousemove",
+- "onmouseout",
+- "onmouseover",
+- "onmouseup",
+- "onmousewheel",
+- "onoffline",
+- "ononline",
+- "onpagehide",
+- "onpageshow",
+- "onpause",
+- "onplay",
+- "onplaying",
+- "onpopstate",
+- "onprogress",
+- "onratechange",
+- "onreset",
+- "onresize",
+- "onscroll",
+- "onseeked",
+- "onseeking",
+- "onselect",
+- "onshow",
+- "onstalled",
+- "onstorage",
+- "onsubmit",
+- "onsuspend",
+- "ontimeupdate",
+- "onunload",
+- "onvolumechange",
+- "onwaiting",
+-}
+-
+-// extra are ad-hoc values not covered by any of the lists above.
+-var extra = []string{
+- "align",
+- "annotation",
+- "annotation-xml",
+- "applet",
+- "basefont",
+- "bgsound",
+- "big",
+- "blink",
+- "center",
+- "color",
+- "desc",
+- "face",
+- "font",
+- "foreignObject", // HTML is case-insensitive, but SVG-embedded-in-HTML is case-sensitive.
+- "foreignobject",
+- "frame",
+- "frameset",
+- "image",
+- "isindex",
+- "listing",
+- "malignmark",
+- "marquee",
+- "math",
+- "mglyph",
+- "mi",
+- "mn",
+- "mo",
+- "ms",
+- "mtext",
+- "nobr",
+- "noembed",
+- "noframes",
+- "plaintext",
+- "prompt",
+- "public",
+- "spacer",
+- "strike",
+- "svg",
+- "system",
+- "tt",
+- "xmp",
-}
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/atom/table.go b/Godeps/_workspace/src/golang.org/x/net/html/atom/table.go
+deleted file mode 100644
+index 20b8b8a..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/atom/table.go
++++ /dev/null
+@@ -1,694 +0,0 @@
+-// generated by go run gen.go; DO NOT EDIT
+-
+-package atom
+-
+-const (
+- A Atom = 0x1
+- Abbr Atom = 0x4
+- Accept Atom = 0x2106
+- AcceptCharset Atom = 0x210e
+- Accesskey Atom = 0x3309
+- Action Atom = 0x21b06
+- Address Atom = 0x5d507
+- Align Atom = 0x1105
+- Alt Atom = 0x4503
+- Annotation Atom = 0x18d0a
+- AnnotationXml Atom = 0x18d0e
+- Applet Atom = 0x2d106
+- Area Atom = 0x31804
+- Article Atom = 0x39907
+- Aside Atom = 0x4f05
+- Async Atom = 0x9305
+- Audio Atom = 0xaf05
+- Autocomplete Atom = 0xd50c
+- Autofocus Atom = 0xe109
+- Autoplay Atom = 0x10c08
+- B Atom = 0x101
+- Base Atom = 0x11404
+- Basefont Atom = 0x11408
+- Bdi Atom = 0x1a03
+- Bdo Atom = 0x12503
+- Bgsound Atom = 0x13807
+- Big Atom = 0x14403
+- Blink Atom = 0x14705
+- Blockquote Atom = 0x14c0a
+- Body Atom = 0x2f04
+- Border Atom = 0x15606
+- Br Atom = 0x202
+- Button Atom = 0x15c06
+- Canvas Atom = 0x4b06
+- Caption Atom = 0x1e007
+- Center Atom = 0x2df06
+- Challenge Atom = 0x23e09
+- Charset Atom = 0x2807
+- Checked Atom = 0x33f07
+- Cite Atom = 0x9704
+- Class Atom = 0x3d905
+- Code Atom = 0x16f04
+- Col Atom = 0x17603
+- Colgroup Atom = 0x17608
+- Color Atom = 0x18305
+- Cols Atom = 0x18804
+- Colspan Atom = 0x18807
+- Command Atom = 0x19b07
+- Content Atom = 0x42c07
+- Contenteditable Atom = 0x42c0f
+- Contextmenu Atom = 0x3480b
+- Controls Atom = 0x1ae08
+- Coords Atom = 0x1ba06
+- Crossorigin Atom = 0x1c40b
+- Data Atom = 0x44304
+- Datalist Atom = 0x44308
+- Datetime Atom = 0x25b08
+- Dd Atom = 0x28802
+- Default Atom = 0x5207
+- Defer Atom = 0x17105
+- Del Atom = 0x4d603
+- Desc Atom = 0x4804
+- Details Atom = 0x6507
+- Dfn Atom = 0x8303
+- Dialog Atom = 0x1b06
+- Dir Atom = 0x9d03
+- Dirname Atom = 0x9d07
+- Disabled Atom = 0x10008
+- Div Atom = 0x10703
+- Dl Atom = 0x13e02
+- Download Atom = 0x40908
+- Draggable Atom = 0x1a109
+- Dropzone Atom = 0x3a208
+- Dt Atom = 0x4e402
+- Em Atom = 0x7f02
+- Embed Atom = 0x7f05
+- Enctype Atom = 0x23007
+- Face Atom = 0x2dd04
+- Fieldset Atom = 0x1d508
+- Figcaption Atom = 0x1dd0a
+- Figure Atom = 0x1f106
+- Font Atom = 0x11804
+- Footer Atom = 0x5906
+- For Atom = 0x1fd03
+- ForeignObject Atom = 0x1fd0d
+- Foreignobject Atom = 0x20a0d
+- Form Atom = 0x21704
+- Formaction Atom = 0x2170a
+- Formenctype Atom = 0x22c0b
+- Formmethod Atom = 0x2470a
+- Formnovalidate Atom = 0x2510e
+- Formtarget Atom = 0x2660a
+- Frame Atom = 0x8705
+- Frameset Atom = 0x8708
+- H1 Atom = 0x13602
+- H2 Atom = 0x29602
+- H3 Atom = 0x2c502
+- H4 Atom = 0x30e02
+- H5 Atom = 0x4e602
+- H6 Atom = 0x27002
+- Head Atom = 0x2fa04
+- Header Atom = 0x2fa06
+- Headers Atom = 0x2fa07
+- Height Atom = 0x27206
+- Hgroup Atom = 0x27a06
+- Hidden Atom = 0x28606
+- High Atom = 0x29304
+- Hr Atom = 0x13102
+- Href Atom = 0x29804
+- Hreflang Atom = 0x29808
+- Html Atom = 0x27604
+- HttpEquiv Atom = 0x2a00a
+- I Atom = 0x601
+- Icon Atom = 0x42b04
+- Id Atom = 0x5102
+- Iframe Atom = 0x2b406
+- Image Atom = 0x2ba05
+- Img Atom = 0x2bf03
+- Inert Atom = 0x4c105
+- Input Atom = 0x3f605
+- Ins Atom = 0x1cd03
+- Isindex Atom = 0x2c707
+- Ismap Atom = 0x2ce05
+- Itemid Atom = 0x9806
+- Itemprop Atom = 0x57e08
+- Itemref Atom = 0x2d707
+- Itemscope Atom = 0x2e509
+- Itemtype Atom = 0x2ef08
+- Kbd Atom = 0x1903
+- Keygen Atom = 0x3906
+- Keytype Atom = 0x51207
+- Kind Atom = 0xfd04
+- Label Atom = 0xba05
+- Lang Atom = 0x29c04
+- Legend Atom = 0x1a806
+- Li Atom = 0x1202
+- Link Atom = 0x14804
+- List Atom = 0x44704
+- Listing Atom = 0x44707
+- Loop Atom = 0xbe04
+- Low Atom = 0x13f03
+- Malignmark Atom = 0x100a
+- Manifest Atom = 0x5b608
+- Map Atom = 0x2d003
+- Mark Atom = 0x1604
+- Marquee Atom = 0x5f207
+- Math Atom = 0x2f704
+- Max Atom = 0x30603
+- Maxlength Atom = 0x30609
+- Media Atom = 0xa205
+- Mediagroup Atom = 0xa20a
+- Menu Atom = 0x34f04
+- Meta Atom = 0x45604
+- Meter Atom = 0x26105
+- Method Atom = 0x24b06
+- Mglyph Atom = 0x2c006
+- Mi Atom = 0x9b02
+- Min Atom = 0x31003
+- Mn Atom = 0x25402
+- Mo Atom = 0x47a02
+- Ms Atom = 0x2e802
+- Mtext Atom = 0x31305
+- Multiple Atom = 0x32108
+- Muted Atom = 0x32905
+- Name Atom = 0xa004
+- Nav Atom = 0x3e03
+- Nobr Atom = 0x7404
+- Noembed Atom = 0x7d07
+- Noframes Atom = 0x8508
+- Noscript Atom = 0x28b08
+- Novalidate Atom = 0x2550a
+- Object Atom = 0x21106
+- Ol Atom = 0xcd02
+- Onabort Atom = 0x16007
+- Onafterprint Atom = 0x1e50c
+- Onbeforeprint Atom = 0x21f0d
+- Onbeforeunload Atom = 0x5c90e
+- Onblur Atom = 0x3e206
+- Oncancel Atom = 0xb308
+- Oncanplay Atom = 0x12709
+- Oncanplaythrough Atom = 0x12710
+- Onchange Atom = 0x3b808
+- Onclick Atom = 0x2ad07
+- Onclose Atom = 0x32e07
+- Oncontextmenu Atom = 0x3460d
+- Oncuechange Atom = 0x3530b
+- Ondblclick Atom = 0x35e0a
+- Ondrag Atom = 0x36806
+- Ondragend Atom = 0x36809
+- Ondragenter Atom = 0x3710b
+- Ondragleave Atom = 0x37c0b
+- Ondragover Atom = 0x3870a
+- Ondragstart Atom = 0x3910b
+- Ondrop Atom = 0x3a006
+- Ondurationchange Atom = 0x3b010
+- Onemptied Atom = 0x3a709
+- Onended Atom = 0x3c007
+- Onerror Atom = 0x3c707
+- Onfocus Atom = 0x3ce07
+- Onhashchange Atom = 0x3e80c
+- Oninput Atom = 0x3f407
+- Oninvalid Atom = 0x3fb09
+- Onkeydown Atom = 0x40409
+- Onkeypress Atom = 0x4110a
+- Onkeyup Atom = 0x42107
+- Onload Atom = 0x43b06
+- Onloadeddata Atom = 0x43b0c
+- Onloadedmetadata Atom = 0x44e10
+- Onloadstart Atom = 0x4640b
+- Onmessage Atom = 0x46f09
+- Onmousedown Atom = 0x4780b
+- Onmousemove Atom = 0x4830b
+- Onmouseout Atom = 0x48e0a
+- Onmouseover Atom = 0x49b0b
+- Onmouseup Atom = 0x4a609
+- Onmousewheel Atom = 0x4af0c
+- Onoffline Atom = 0x4bb09
+- Ononline Atom = 0x4c608
+- Onpagehide Atom = 0x4ce0a
+- Onpageshow Atom = 0x4d90a
+- Onpause Atom = 0x4e807
+- Onplay Atom = 0x4f206
+- Onplaying Atom = 0x4f209
+- Onpopstate Atom = 0x4fb0a
+- Onprogress Atom = 0x5050a
+- Onratechange Atom = 0x5190c
+- Onreset Atom = 0x52507
+- Onresize Atom = 0x52c08
+- Onscroll Atom = 0x53a08
+- Onseeked Atom = 0x54208
+- Onseeking Atom = 0x54a09
+- Onselect Atom = 0x55308
+- Onshow Atom = 0x55d06
+- Onstalled Atom = 0x56609
+- Onstorage Atom = 0x56f09
+- Onsubmit Atom = 0x57808
+- Onsuspend Atom = 0x58809
+- Ontimeupdate Atom = 0x1190c
+- Onunload Atom = 0x59108
+- Onvolumechange Atom = 0x5990e
+- Onwaiting Atom = 0x5a709
+- Open Atom = 0x58404
+- Optgroup Atom = 0xc008
+- Optimum Atom = 0x5b007
+- Option Atom = 0x5c506
+- Output Atom = 0x49506
+- P Atom = 0xc01
+- Param Atom = 0xc05
+- Pattern Atom = 0x6e07
+- Ping Atom = 0xab04
+- Placeholder Atom = 0xc70b
+- Plaintext Atom = 0xf109
+- Poster Atom = 0x17d06
+- Pre Atom = 0x27f03
+- Preload Atom = 0x27f07
+- Progress Atom = 0x50708
+- Prompt Atom = 0x5bf06
+- Public Atom = 0x42706
+- Q Atom = 0x15101
+- Radiogroup Atom = 0x30a
+- Readonly Atom = 0x31908
+- Rel Atom = 0x28003
+- Required Atom = 0x1f508
+- Reversed Atom = 0x5e08
+- Rows Atom = 0x7704
+- Rowspan Atom = 0x7707
+- Rp Atom = 0x1eb02
+- Rt Atom = 0x16502
+- Ruby Atom = 0xd104
+- S Atom = 0x2c01
+- Samp Atom = 0x6b04
+- Sandbox Atom = 0xe907
+- Scope Atom = 0x2e905
+- Scoped Atom = 0x2e906
+- Script Atom = 0x28d06
+- Seamless Atom = 0x33308
+- Section Atom = 0x3dd07
+- Select Atom = 0x55506
+- Selected Atom = 0x55508
+- Shape Atom = 0x1b505
+- Size Atom = 0x53004
+- Sizes Atom = 0x53005
+- Small Atom = 0x1bf05
+- Source Atom = 0x1cf06
+- Spacer Atom = 0x30006
+- Span Atom = 0x7a04
+- Spellcheck Atom = 0x33a0a
+- Src Atom = 0x3d403
+- Srcdoc Atom = 0x3d406
+- Srclang Atom = 0x41a07
+- Start Atom = 0x39705
+- Step Atom = 0x5bc04
+- Strike Atom = 0x50e06
+- Strong Atom = 0x53406
+- Style Atom = 0x5db05
+- Sub Atom = 0x57a03
+- Summary Atom = 0x5e007
+- Sup Atom = 0x5e703
+- Svg Atom = 0x5ea03
+- System Atom = 0x5ed06
+- Tabindex Atom = 0x45c08
+- Table Atom = 0x43605
+- Target Atom = 0x26a06
+- Tbody Atom = 0x2e05
+- Td Atom = 0x4702
+- Textarea Atom = 0x31408
+- Tfoot Atom = 0x5805
+- Th Atom = 0x13002
+- Thead Atom = 0x2f905
+- Time Atom = 0x11b04
+- Title Atom = 0x8e05
+- Tr Atom = 0xf902
+- Track Atom = 0xf905
+- Translate Atom = 0x16609
+- Tt Atom = 0x7002
+- Type Atom = 0x23304
+- Typemustmatch Atom = 0x2330d
+- U Atom = 0xb01
+- Ul Atom = 0x5602
+- Usemap Atom = 0x4ec06
+- Value Atom = 0x4005
+- Var Atom = 0x10903
+- Video Atom = 0x2a905
+- Wbr Atom = 0x14103
+- Width Atom = 0x4e205
+- Wrap Atom = 0x56204
+- Xmp Atom = 0xef03
+-)
-
--// Parse parses the command-line flags from os.Args[1:]. Must be called
--// after all flags are defined and before flags are accessed by the program.
--func Parse() {
-- // Ignore errors; CommandLine is set for ExitOnError.
-- CommandLine.Parse(os.Args[1:])
--}
+-const hash0 = 0xc17da63e
-
--// Whether to support interspersed option/non-option arguments.
--func SetInterspersed(interspersed bool) {
-- CommandLine.SetInterspersed(interspersed)
--}
+-const maxAtomLen = 16
-
--// Parsed returns true if the command-line flags have been parsed.
--func Parsed() bool {
-- return CommandLine.Parsed()
+-var table = [1 << 9]Atom{
+- 0x1: 0x4830b, // onmousemove
+- 0x2: 0x5a709, // onwaiting
+- 0x4: 0x5bf06, // prompt
+- 0x7: 0x5b007, // optimum
+- 0x8: 0x1604, // mark
+- 0xa: 0x2d707, // itemref
+- 0xb: 0x4d90a, // onpageshow
+- 0xc: 0x55506, // select
+- 0xd: 0x1a109, // draggable
+- 0xe: 0x3e03, // nav
+- 0xf: 0x19b07, // command
+- 0x11: 0xb01, // u
+- 0x14: 0x2fa07, // headers
+- 0x15: 0x44308, // datalist
+- 0x17: 0x6b04, // samp
+- 0x1a: 0x40409, // onkeydown
+- 0x1b: 0x53a08, // onscroll
+- 0x1c: 0x17603, // col
+- 0x20: 0x57e08, // itemprop
+- 0x21: 0x2a00a, // http-equiv
+- 0x22: 0x5e703, // sup
+- 0x24: 0x1f508, // required
+- 0x2b: 0x27f07, // preload
+- 0x2c: 0x21f0d, // onbeforeprint
+- 0x2d: 0x3710b, // ondragenter
+- 0x2e: 0x4e402, // dt
+- 0x2f: 0x57808, // onsubmit
+- 0x30: 0x13102, // hr
+- 0x31: 0x3460d, // oncontextmenu
+- 0x33: 0x2ba05, // image
+- 0x34: 0x4e807, // onpause
+- 0x35: 0x27a06, // hgroup
+- 0x36: 0xab04, // ping
+- 0x37: 0x55308, // onselect
+- 0x3a: 0x10703, // div
+- 0x40: 0x9b02, // mi
+- 0x41: 0x33308, // seamless
+- 0x42: 0x2807, // charset
+- 0x43: 0x5102, // id
+- 0x44: 0x4fb0a, // onpopstate
+- 0x45: 0x4d603, // del
+- 0x46: 0x5f207, // marquee
+- 0x47: 0x3309, // accesskey
+- 0x49: 0x5906, // footer
+- 0x4a: 0x2d106, // applet
+- 0x4b: 0x2ce05, // ismap
+- 0x51: 0x34f04, // menu
+- 0x52: 0x2f04, // body
+- 0x55: 0x8708, // frameset
+- 0x56: 0x52507, // onreset
+- 0x57: 0x14705, // blink
+- 0x58: 0x8e05, // title
+- 0x59: 0x39907, // article
+- 0x5b: 0x13002, // th
+- 0x5d: 0x15101, // q
+- 0x5e: 0x58404, // open
+- 0x5f: 0x31804, // area
+- 0x61: 0x43b06, // onload
+- 0x62: 0x3f605, // input
+- 0x63: 0x11404, // base
+- 0x64: 0x18807, // colspan
+- 0x65: 0x51207, // keytype
+- 0x66: 0x13e02, // dl
+- 0x68: 0x1d508, // fieldset
+- 0x6a: 0x31003, // min
+- 0x6b: 0x10903, // var
+- 0x6f: 0x2fa06, // header
+- 0x70: 0x16502, // rt
+- 0x71: 0x17608, // colgroup
+- 0x72: 0x25402, // mn
+- 0x74: 0x16007, // onabort
+- 0x75: 0x3906, // keygen
+- 0x76: 0x4bb09, // onoffline
+- 0x77: 0x23e09, // challenge
+- 0x78: 0x2d003, // map
+- 0x7a: 0x30e02, // h4
+- 0x7b: 0x3c707, // onerror
+- 0x7c: 0x30609, // maxlength
+- 0x7d: 0x31305, // mtext
+- 0x7e: 0x5805, // tfoot
+- 0x7f: 0x11804, // font
+- 0x80: 0x100a, // malignmark
+- 0x81: 0x45604, // meta
+- 0x82: 0x9305, // async
+- 0x83: 0x2c502, // h3
+- 0x84: 0x28802, // dd
+- 0x85: 0x29804, // href
+- 0x86: 0xa20a, // mediagroup
+- 0x87: 0x1ba06, // coords
+- 0x88: 0x41a07, // srclang
+- 0x89: 0x35e0a, // ondblclick
+- 0x8a: 0x4005, // value
+- 0x8c: 0xb308, // oncancel
+- 0x8e: 0x33a0a, // spellcheck
+- 0x8f: 0x8705, // frame
+- 0x91: 0x14403, // big
+- 0x94: 0x21b06, // action
+- 0x95: 0x9d03, // dir
+- 0x97: 0x31908, // readonly
+- 0x99: 0x43605, // table
+- 0x9a: 0x5e007, // summary
+- 0x9b: 0x14103, // wbr
+- 0x9c: 0x30a, // radiogroup
+- 0x9d: 0xa004, // name
+- 0x9f: 0x5ed06, // system
+- 0xa1: 0x18305, // color
+- 0xa2: 0x4b06, // canvas
+- 0xa3: 0x27604, // html
+- 0xa5: 0x54a09, // onseeking
+- 0xac: 0x1b505, // shape
+- 0xad: 0x28003, // rel
+- 0xae: 0x12710, // oncanplaythrough
+- 0xaf: 0x3870a, // ondragover
+- 0xb1: 0x1fd0d, // foreignObject
+- 0xb3: 0x7704, // rows
+- 0xb6: 0x44707, // listing
+- 0xb7: 0x49506, // output
+- 0xb9: 0x3480b, // contextmenu
+- 0xbb: 0x13f03, // low
+- 0xbc: 0x1eb02, // rp
+- 0xbd: 0x58809, // onsuspend
+- 0xbe: 0x15c06, // button
+- 0xbf: 0x4804, // desc
+- 0xc1: 0x3dd07, // section
+- 0xc2: 0x5050a, // onprogress
+- 0xc3: 0x56f09, // onstorage
+- 0xc4: 0x2f704, // math
+- 0xc5: 0x4f206, // onplay
+- 0xc7: 0x5602, // ul
+- 0xc8: 0x6e07, // pattern
+- 0xc9: 0x4af0c, // onmousewheel
+- 0xca: 0x36809, // ondragend
+- 0xcb: 0xd104, // ruby
+- 0xcc: 0xc01, // p
+- 0xcd: 0x32e07, // onclose
+- 0xce: 0x26105, // meter
+- 0xcf: 0x13807, // bgsound
+- 0xd2: 0x27206, // height
+- 0xd4: 0x101, // b
+- 0xd5: 0x2ef08, // itemtype
+- 0xd8: 0x1e007, // caption
+- 0xd9: 0x10008, // disabled
+- 0xdc: 0x5ea03, // svg
+- 0xdd: 0x1bf05, // small
+- 0xde: 0x44304, // data
+- 0xe0: 0x4c608, // ononline
+- 0xe1: 0x2c006, // mglyph
+- 0xe3: 0x7f05, // embed
+- 0xe4: 0xf902, // tr
+- 0xe5: 0x4640b, // onloadstart
+- 0xe7: 0x3b010, // ondurationchange
+- 0xed: 0x12503, // bdo
+- 0xee: 0x4702, // td
+- 0xef: 0x4f05, // aside
+- 0xf0: 0x29602, // h2
+- 0xf1: 0x50708, // progress
+- 0xf2: 0x14c0a, // blockquote
+- 0xf4: 0xba05, // label
+- 0xf5: 0x601, // i
+- 0xf7: 0x7707, // rowspan
+- 0xfb: 0x4f209, // onplaying
+- 0xfd: 0x2bf03, // img
+- 0xfe: 0xc008, // optgroup
+- 0xff: 0x42c07, // content
+- 0x101: 0x5190c, // onratechange
+- 0x103: 0x3e80c, // onhashchange
+- 0x104: 0x6507, // details
+- 0x106: 0x40908, // download
+- 0x109: 0xe907, // sandbox
+- 0x10b: 0x42c0f, // contenteditable
+- 0x10d: 0x37c0b, // ondragleave
+- 0x10e: 0x2106, // accept
+- 0x10f: 0x55508, // selected
+- 0x112: 0x2170a, // formaction
+- 0x113: 0x2df06, // center
+- 0x115: 0x44e10, // onloadedmetadata
+- 0x116: 0x14804, // link
+- 0x117: 0x11b04, // time
+- 0x118: 0x1c40b, // crossorigin
+- 0x119: 0x3ce07, // onfocus
+- 0x11a: 0x56204, // wrap
+- 0x11b: 0x42b04, // icon
+- 0x11d: 0x2a905, // video
+- 0x11e: 0x3d905, // class
+- 0x121: 0x5990e, // onvolumechange
+- 0x122: 0x3e206, // onblur
+- 0x123: 0x2e509, // itemscope
+- 0x124: 0x5db05, // style
+- 0x127: 0x42706, // public
+- 0x129: 0x2510e, // formnovalidate
+- 0x12a: 0x55d06, // onshow
+- 0x12c: 0x16609, // translate
+- 0x12d: 0x9704, // cite
+- 0x12e: 0x2e802, // ms
+- 0x12f: 0x1190c, // ontimeupdate
+- 0x130: 0xfd04, // kind
+- 0x131: 0x2660a, // formtarget
+- 0x135: 0x3c007, // onended
+- 0x136: 0x28606, // hidden
+- 0x137: 0x2c01, // s
+- 0x139: 0x2470a, // formmethod
+- 0x13a: 0x44704, // list
+- 0x13c: 0x27002, // h6
+- 0x13d: 0xcd02, // ol
+- 0x13e: 0x3530b, // oncuechange
+- 0x13f: 0x20a0d, // foreignobject
+- 0x143: 0x5c90e, // onbeforeunload
+- 0x145: 0x3a709, // onemptied
+- 0x146: 0x17105, // defer
+- 0x147: 0xef03, // xmp
+- 0x148: 0xaf05, // audio
+- 0x149: 0x1903, // kbd
+- 0x14c: 0x46f09, // onmessage
+- 0x14d: 0x5c506, // option
+- 0x14e: 0x4503, // alt
+- 0x14f: 0x33f07, // checked
+- 0x150: 0x10c08, // autoplay
+- 0x152: 0x202, // br
+- 0x153: 0x2550a, // novalidate
+- 0x156: 0x7d07, // noembed
+- 0x159: 0x2ad07, // onclick
+- 0x15a: 0x4780b, // onmousedown
+- 0x15b: 0x3b808, // onchange
+- 0x15e: 0x3fb09, // oninvalid
+- 0x15f: 0x2e906, // scoped
+- 0x160: 0x1ae08, // controls
+- 0x161: 0x32905, // muted
+- 0x163: 0x4ec06, // usemap
+- 0x164: 0x1dd0a, // figcaption
+- 0x165: 0x36806, // ondrag
+- 0x166: 0x29304, // high
+- 0x168: 0x3d403, // src
+- 0x169: 0x17d06, // poster
+- 0x16b: 0x18d0e, // annotation-xml
+- 0x16c: 0x5bc04, // step
+- 0x16d: 0x4, // abbr
+- 0x16e: 0x1b06, // dialog
+- 0x170: 0x1202, // li
+- 0x172: 0x47a02, // mo
+- 0x175: 0x1fd03, // for
+- 0x176: 0x1cd03, // ins
+- 0x178: 0x53004, // size
+- 0x17a: 0x5207, // default
+- 0x17b: 0x1a03, // bdi
+- 0x17c: 0x4ce0a, // onpagehide
+- 0x17d: 0x9d07, // dirname
+- 0x17e: 0x23304, // type
+- 0x17f: 0x21704, // form
+- 0x180: 0x4c105, // inert
+- 0x181: 0x12709, // oncanplay
+- 0x182: 0x8303, // dfn
+- 0x183: 0x45c08, // tabindex
+- 0x186: 0x7f02, // em
+- 0x187: 0x29c04, // lang
+- 0x189: 0x3a208, // dropzone
+- 0x18a: 0x4110a, // onkeypress
+- 0x18b: 0x25b08, // datetime
+- 0x18c: 0x18804, // cols
+- 0x18d: 0x1, // a
+- 0x18e: 0x43b0c, // onloadeddata
+- 0x191: 0x15606, // border
+- 0x192: 0x2e05, // tbody
+- 0x193: 0x24b06, // method
+- 0x195: 0xbe04, // loop
+- 0x196: 0x2b406, // iframe
+- 0x198: 0x2fa04, // head
+- 0x19e: 0x5b608, // manifest
+- 0x19f: 0xe109, // autofocus
+- 0x1a0: 0x16f04, // code
+- 0x1a1: 0x53406, // strong
+- 0x1a2: 0x32108, // multiple
+- 0x1a3: 0xc05, // param
+- 0x1a6: 0x23007, // enctype
+- 0x1a7: 0x2dd04, // face
+- 0x1a8: 0xf109, // plaintext
+- 0x1a9: 0x13602, // h1
+- 0x1aa: 0x56609, // onstalled
+- 0x1ad: 0x28d06, // script
+- 0x1ae: 0x30006, // spacer
+- 0x1af: 0x52c08, // onresize
+- 0x1b0: 0x49b0b, // onmouseover
+- 0x1b1: 0x59108, // onunload
+- 0x1b2: 0x54208, // onseeked
+- 0x1b4: 0x2330d, // typemustmatch
+- 0x1b5: 0x1f106, // figure
+- 0x1b6: 0x48e0a, // onmouseout
+- 0x1b7: 0x27f03, // pre
+- 0x1b8: 0x4e205, // width
+- 0x1bb: 0x7404, // nobr
+- 0x1be: 0x7002, // tt
+- 0x1bf: 0x1105, // align
+- 0x1c0: 0x3f407, // oninput
+- 0x1c3: 0x42107, // onkeyup
+- 0x1c6: 0x1e50c, // onafterprint
+- 0x1c7: 0x210e, // accept-charset
+- 0x1c8: 0x9806, // itemid
+- 0x1cb: 0x50e06, // strike
+- 0x1cc: 0x57a03, // sub
+- 0x1cd: 0xf905, // track
+- 0x1ce: 0x39705, // start
+- 0x1d0: 0x11408, // basefont
+- 0x1d6: 0x1cf06, // source
+- 0x1d7: 0x1a806, // legend
+- 0x1d8: 0x2f905, // thead
+- 0x1da: 0x2e905, // scope
+- 0x1dd: 0x21106, // object
+- 0x1de: 0xa205, // media
+- 0x1df: 0x18d0a, // annotation
+- 0x1e0: 0x22c0b, // formenctype
+- 0x1e2: 0x28b08, // noscript
+- 0x1e4: 0x53005, // sizes
+- 0x1e5: 0xd50c, // autocomplete
+- 0x1e6: 0x7a04, // span
+- 0x1e7: 0x8508, // noframes
+- 0x1e8: 0x26a06, // target
+- 0x1e9: 0x3a006, // ondrop
+- 0x1ea: 0x3d406, // srcdoc
+- 0x1ec: 0x5e08, // reversed
+- 0x1f0: 0x2c707, // isindex
+- 0x1f3: 0x29808, // hreflang
+- 0x1f5: 0x4e602, // h5
+- 0x1f6: 0x5d507, // address
+- 0x1fa: 0x30603, // max
+- 0x1fb: 0xc70b, // placeholder
+- 0x1fc: 0x31408, // textarea
+- 0x1fe: 0x4a609, // onmouseup
+- 0x1ff: 0x3910b, // ondragstart
-}
-
--// The default set of command-line flags, parsed from os.Args.
--var CommandLine = NewFlagSet(os.Args[0], ExitOnError)
--
--// NewFlagSet returns a new, empty flag set with the specified name and
--// error handling property.
--func NewFlagSet(name string, errorHandling ErrorHandling) *FlagSet {
-- f := &FlagSet{
-- name: name,
-- errorHandling: errorHandling,
-- interspersed: true,
-- }
-- return f
--}
+-const atomText = "abbradiogrouparamalignmarkbdialogaccept-charsetbodyaccesskey" +
+- "genavaluealtdescanvasidefaultfootereversedetailsampatternobr" +
+- "owspanoembedfnoframesetitleasyncitemidirnamediagroupingaudio" +
+- "ncancelabelooptgrouplaceholderubyautocompleteautofocusandbox" +
+- "mplaintextrackindisabledivarautoplaybasefontimeupdatebdoncan" +
+- "playthrough1bgsoundlowbrbigblinkblockquoteborderbuttonabortr" +
+- "anslatecodefercolgroupostercolorcolspannotation-xmlcommandra" +
+- "ggablegendcontrolshapecoordsmallcrossoriginsourcefieldsetfig" +
+- "captionafterprintfigurequiredforeignObjectforeignobjectforma" +
+- "ctionbeforeprintformenctypemustmatchallengeformmethodformnov" +
+- "alidatetimeterformtargeth6heightmlhgroupreloadhiddenoscripth" +
+- "igh2hreflanghttp-equivideonclickiframeimageimglyph3isindexis" +
+- "mappletitemrefacenteritemscopeditemtypematheaderspacermaxlen" +
+- "gth4minmtextareadonlymultiplemutedoncloseamlesspellcheckedon" +
+- "contextmenuoncuechangeondblclickondragendondragenterondragle" +
+- "aveondragoverondragstarticleondropzonemptiedondurationchange" +
+- "onendedonerroronfocusrcdoclassectionbluronhashchangeoninputo" +
+- "ninvalidonkeydownloadonkeypressrclangonkeyupublicontentedita" +
+- "bleonloadeddatalistingonloadedmetadatabindexonloadstartonmes" +
+- "sageonmousedownonmousemoveonmouseoutputonmouseoveronmouseupo" +
+- "nmousewheelonofflinertononlineonpagehidelonpageshowidth5onpa" +
+- "usemaponplayingonpopstateonprogresstrikeytypeonratechangeonr" +
+- "esetonresizestrongonscrollonseekedonseekingonselectedonshowr" +
+- "aponstalledonstorageonsubmitempropenonsuspendonunloadonvolum" +
+- "echangeonwaitingoptimumanifestepromptoptionbeforeunloaddress" +
+- "tylesummarysupsvgsystemarquee"
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/atom/table_test.go b/Godeps/_workspace/src/golang.org/x/net/html/atom/table_test.go
+deleted file mode 100644
+index db016a1..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/atom/table_test.go
++++ /dev/null
+@@ -1,341 +0,0 @@
+-// generated by go run gen.go -test; DO NOT EDIT
-
--// Whether to support interspersed option/non-option arguments.
--func (f *FlagSet) SetInterspersed(interspersed bool) {
-- f.interspersed = interspersed
--}
+-package atom
-
--// Init sets the name and error handling property for a flag set.
--// By default, the zero FlagSet uses an empty name and the
--// ContinueOnError error handling policy.
--func (f *FlagSet) Init(name string, errorHandling ErrorHandling) {
-- f.name = name
-- f.errorHandling = errorHandling
+-var testAtomList = []string{
+- "a",
+- "abbr",
+- "accept",
+- "accept-charset",
+- "accesskey",
+- "action",
+- "address",
+- "align",
+- "alt",
+- "annotation",
+- "annotation-xml",
+- "applet",
+- "area",
+- "article",
+- "aside",
+- "async",
+- "audio",
+- "autocomplete",
+- "autofocus",
+- "autoplay",
+- "b",
+- "base",
+- "basefont",
+- "bdi",
+- "bdo",
+- "bgsound",
+- "big",
+- "blink",
+- "blockquote",
+- "body",
+- "border",
+- "br",
+- "button",
+- "canvas",
+- "caption",
+- "center",
+- "challenge",
+- "charset",
+- "checked",
+- "cite",
+- "cite",
+- "class",
+- "code",
+- "col",
+- "colgroup",
+- "color",
+- "cols",
+- "colspan",
+- "command",
+- "command",
+- "content",
+- "contenteditable",
+- "contextmenu",
+- "controls",
+- "coords",
+- "crossorigin",
+- "data",
+- "data",
+- "datalist",
+- "datetime",
+- "dd",
+- "default",
+- "defer",
+- "del",
+- "desc",
+- "details",
+- "dfn",
+- "dialog",
+- "dir",
+- "dirname",
+- "disabled",
+- "div",
+- "dl",
+- "download",
+- "draggable",
+- "dropzone",
+- "dt",
+- "em",
+- "embed",
+- "enctype",
+- "face",
+- "fieldset",
+- "figcaption",
+- "figure",
+- "font",
+- "footer",
+- "for",
+- "foreignObject",
+- "foreignobject",
+- "form",
+- "form",
+- "formaction",
+- "formenctype",
+- "formmethod",
+- "formnovalidate",
+- "formtarget",
+- "frame",
+- "frameset",
+- "h1",
+- "h2",
+- "h3",
+- "h4",
+- "h5",
+- "h6",
+- "head",
+- "header",
+- "headers",
+- "height",
+- "hgroup",
+- "hidden",
+- "high",
+- "hr",
+- "href",
+- "hreflang",
+- "html",
+- "http-equiv",
+- "i",
+- "icon",
+- "id",
+- "iframe",
+- "image",
+- "img",
+- "inert",
+- "input",
+- "ins",
+- "isindex",
+- "ismap",
+- "itemid",
+- "itemprop",
+- "itemref",
+- "itemscope",
+- "itemtype",
+- "kbd",
+- "keygen",
+- "keytype",
+- "kind",
+- "label",
+- "label",
+- "lang",
+- "legend",
+- "li",
+- "link",
+- "list",
+- "listing",
+- "loop",
+- "low",
+- "malignmark",
+- "manifest",
+- "map",
+- "mark",
+- "marquee",
+- "math",
+- "max",
+- "maxlength",
+- "media",
+- "mediagroup",
+- "menu",
+- "meta",
+- "meter",
+- "method",
+- "mglyph",
+- "mi",
+- "min",
+- "mn",
+- "mo",
+- "ms",
+- "mtext",
+- "multiple",
+- "muted",
+- "name",
+- "nav",
+- "nobr",
+- "noembed",
+- "noframes",
+- "noscript",
+- "novalidate",
+- "object",
+- "ol",
+- "onabort",
+- "onafterprint",
+- "onbeforeprint",
+- "onbeforeunload",
+- "onblur",
+- "oncancel",
+- "oncanplay",
+- "oncanplaythrough",
+- "onchange",
+- "onclick",
+- "onclose",
+- "oncontextmenu",
+- "oncuechange",
+- "ondblclick",
+- "ondrag",
+- "ondragend",
+- "ondragenter",
+- "ondragleave",
+- "ondragover",
+- "ondragstart",
+- "ondrop",
+- "ondurationchange",
+- "onemptied",
+- "onended",
+- "onerror",
+- "onfocus",
+- "onhashchange",
+- "oninput",
+- "oninvalid",
+- "onkeydown",
+- "onkeypress",
+- "onkeyup",
+- "onload",
+- "onloadeddata",
+- "onloadedmetadata",
+- "onloadstart",
+- "onmessage",
+- "onmousedown",
+- "onmousemove",
+- "onmouseout",
+- "onmouseover",
+- "onmouseup",
+- "onmousewheel",
+- "onoffline",
+- "ononline",
+- "onpagehide",
+- "onpageshow",
+- "onpause",
+- "onplay",
+- "onplaying",
+- "onpopstate",
+- "onprogress",
+- "onratechange",
+- "onreset",
+- "onresize",
+- "onscroll",
+- "onseeked",
+- "onseeking",
+- "onselect",
+- "onshow",
+- "onstalled",
+- "onstorage",
+- "onsubmit",
+- "onsuspend",
+- "ontimeupdate",
+- "onunload",
+- "onvolumechange",
+- "onwaiting",
+- "open",
+- "optgroup",
+- "optimum",
+- "option",
+- "output",
+- "p",
+- "param",
+- "pattern",
+- "ping",
+- "placeholder",
+- "plaintext",
+- "poster",
+- "pre",
+- "preload",
+- "progress",
+- "prompt",
+- "public",
+- "q",
+- "radiogroup",
+- "readonly",
+- "rel",
+- "required",
+- "reversed",
+- "rows",
+- "rowspan",
+- "rp",
+- "rt",
+- "ruby",
+- "s",
+- "samp",
+- "sandbox",
+- "scope",
+- "scoped",
+- "script",
+- "seamless",
+- "section",
+- "select",
+- "selected",
+- "shape",
+- "size",
+- "sizes",
+- "small",
+- "source",
+- "spacer",
+- "span",
+- "span",
+- "spellcheck",
+- "src",
+- "srcdoc",
+- "srclang",
+- "start",
+- "step",
+- "strike",
+- "strong",
+- "style",
+- "style",
+- "sub",
+- "summary",
+- "sup",
+- "svg",
+- "system",
+- "tabindex",
+- "table",
+- "target",
+- "tbody",
+- "td",
+- "textarea",
+- "tfoot",
+- "th",
+- "thead",
+- "time",
+- "title",
+- "title",
+- "tr",
+- "track",
+- "translate",
+- "tt",
+- "type",
+- "typemustmatch",
+- "u",
+- "ul",
+- "usemap",
+- "value",
+- "var",
+- "video",
+- "wbr",
+- "width",
+- "wrap",
+- "xmp",
-}
-diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/flag_test.go b/Godeps/_workspace/src/github.com/spf13/pflag/flag_test.go
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/charset.go b/Godeps/_workspace/src/golang.org/x/net/html/charset/charset.go
deleted file mode 100644
-index 4d95b15..0000000
---- a/Godeps/_workspace/src/github.com/spf13/pflag/flag_test.go
+index b19f83b..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/charset/charset.go
+++ /dev/null
-@@ -1,354 +0,0 @@
--// Copyright 2009 The Go Authors. All rights reserved.
+@@ -1,231 +0,0 @@
+-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
--package pflag_test
+-// Package charset provides common text encodings for HTML documents.
+-//
+-// The mapping from encoding labels to encodings is defined at
+-// http://encoding.spec.whatwg.org.
+-package charset
-
-import (
- "bytes"
-- "fmt"
-- "io/ioutil"
-- "os"
-- "sort"
+- "io"
+- "mime"
- "strings"
-- "testing"
-- "time"
--
-- . "github.com/spf13/pflag"
--)
+- "unicode/utf8"
-
--var (
-- test_bool = Bool("test_bool", false, "bool value")
-- test_int = Int("test_int", 0, "int value")
-- test_int64 = Int64("test_int64", 0, "int64 value")
-- test_uint = Uint("test_uint", 0, "uint value")
-- test_uint64 = Uint64("test_uint64", 0, "uint64 value")
-- test_string = String("test_string", "0", "string value")
-- test_float64 = Float64("test_float64", 0, "float64 value")
-- test_duration = Duration("test_duration", 0, "time.Duration value")
+- "golang.org/x/net/html"
+- "golang.org/x/text/encoding"
+- "golang.org/x/text/encoding/charmap"
+- "golang.org/x/text/transform"
-)
-
--func boolString(s string) string {
-- if s == "0" {
-- return "false"
-- }
-- return "true"
--}
--
--func TestEverything(t *testing.T) {
-- m := make(map[string]*Flag)
-- desired := "0"
-- visitor := func(f *Flag) {
-- if len(f.Name) > 5 && f.Name[0:5] == "test_" {
-- m[f.Name] = f
-- ok := false
-- switch {
-- case f.Value.String() == desired:
-- ok = true
-- case f.Name == "test_bool" && f.Value.String() == boolString(desired):
-- ok = true
-- case f.Name == "test_duration" && f.Value.String() == desired+"s":
-- ok = true
-- }
-- if !ok {
-- t.Error("Visit: bad value", f.Value.String(), "for", f.Name)
-- }
-- }
-- }
-- VisitAll(visitor)
-- if len(m) != 8 {
-- t.Error("VisitAll misses some flags")
-- for k, v := range m {
-- t.Log(k, *v)
-- }
-- }
-- m = make(map[string]*Flag)
-- Visit(visitor)
-- if len(m) != 0 {
-- t.Errorf("Visit sees unset flags")
-- for k, v := range m {
-- t.Log(k, *v)
-- }
-- }
-- // Now set all flags
-- Set("test_bool", "true")
-- Set("test_int", "1")
-- Set("test_int64", "1")
-- Set("test_uint", "1")
-- Set("test_uint64", "1")
-- Set("test_string", "1")
-- Set("test_float64", "1")
-- Set("test_duration", "1s")
-- desired = "1"
-- Visit(visitor)
-- if len(m) != 8 {
-- t.Error("Visit fails after set")
-- for k, v := range m {
-- t.Log(k, *v)
-- }
-- }
-- // Now test they're visited in sort order.
-- var flagNames []string
-- Visit(func(f *Flag) { flagNames = append(flagNames, f.Name) })
-- if !sort.StringsAreSorted(flagNames) {
-- t.Errorf("flag names not sorted: %v", flagNames)
-- }
--}
--
--func TestUsage(t *testing.T) {
-- called := false
-- ResetForTesting(func() { called = true })
-- if GetCommandLine().Parse([]string{"--x"}) == nil {
-- t.Error("parse did not fail for unknown flag")
-- }
-- if !called {
-- t.Error("did not call Usage for unknown flag")
-- }
--}
--
--func testParse(f *FlagSet, t *testing.T) {
-- if f.Parsed() {
-- t.Error("f.Parse() = true before Parse")
-- }
-- boolFlag := f.Bool("bool", false, "bool value")
-- bool2Flag := f.Bool("bool2", false, "bool2 value")
-- bool3Flag := f.Bool("bool3", false, "bool3 value")
-- intFlag := f.Int("int", 0, "int value")
-- int64Flag := f.Int64("int64", 0, "int64 value")
-- uintFlag := f.Uint("uint", 0, "uint value")
-- uint64Flag := f.Uint64("uint64", 0, "uint64 value")
-- stringFlag := f.String("string", "0", "string value")
-- float64Flag := f.Float64("float64", 0, "float64 value")
-- durationFlag := f.Duration("duration", 5*time.Second, "time.Duration value")
-- extra := "one-extra-argument"
-- args := []string{
-- "--bool",
-- "--bool2=true",
-- "--bool3=false",
-- "--int=22",
-- "--int64=0x23",
-- "--uint=24",
-- "--uint64=25",
-- "--string=hello",
-- "--float64=2718e28",
-- "--duration=2m",
-- extra,
-- }
-- if err := f.Parse(args); err != nil {
-- t.Fatal(err)
-- }
-- if !f.Parsed() {
-- t.Error("f.Parse() = false after Parse")
-- }
-- if *boolFlag != true {
-- t.Error("bool flag should be true, is ", *boolFlag)
-- }
-- if *bool2Flag != true {
-- t.Error("bool2 flag should be true, is ", *bool2Flag)
-- }
-- if *bool3Flag != false {
-- t.Error("bool3 flag should be false, is ", *bool2Flag)
-- }
-- if *intFlag != 22 {
-- t.Error("int flag should be 22, is ", *intFlag)
-- }
-- if *int64Flag != 0x23 {
-- t.Error("int64 flag should be 0x23, is ", *int64Flag)
-- }
-- if *uintFlag != 24 {
-- t.Error("uint flag should be 24, is ", *uintFlag)
-- }
-- if *uint64Flag != 25 {
-- t.Error("uint64 flag should be 25, is ", *uint64Flag)
-- }
-- if *stringFlag != "hello" {
-- t.Error("string flag should be `hello`, is ", *stringFlag)
-- }
-- if *float64Flag != 2718e28 {
-- t.Error("float64 flag should be 2718e28, is ", *float64Flag)
-- }
-- if *durationFlag != 2*time.Minute {
-- t.Error("duration flag should be 2m, is ", *durationFlag)
-- }
-- if len(f.Args()) != 1 {
-- t.Error("expected one argument, got", len(f.Args()))
-- } else if f.Args()[0] != extra {
-- t.Errorf("expected argument %q got %q", extra, f.Args()[0])
-- }
--}
--
--func TestShorthand(t *testing.T) {
-- f := NewFlagSet("shorthand", ContinueOnError)
-- if f.Parsed() {
-- t.Error("f.Parse() = true before Parse")
-- }
-- boolaFlag := f.BoolP("boola", "a", false, "bool value")
-- boolbFlag := f.BoolP("boolb", "b", false, "bool2 value")
-- boolcFlag := f.BoolP("boolc", "c", false, "bool3 value")
-- stringFlag := f.StringP("string", "s", "0", "string value")
-- extra := "interspersed-argument"
-- notaflag := "--i-look-like-a-flag"
-- args := []string{
-- "-ab",
-- extra,
-- "-cs",
-- "hello",
-- "--",
-- notaflag,
-- }
-- f.SetOutput(ioutil.Discard)
-- if err := f.Parse(args); err == nil {
-- t.Error("--i-look-like-a-flag should throw an error")
-- }
-- if !f.Parsed() {
-- t.Error("f.Parse() = false after Parse")
-- }
-- if *boolaFlag != true {
-- t.Error("boola flag should be true, is ", *boolaFlag)
-- }
-- if *boolbFlag != true {
-- t.Error("boolb flag should be true, is ", *boolbFlag)
-- }
-- if *boolcFlag != true {
-- t.Error("boolc flag should be true, is ", *boolcFlag)
-- }
-- if *stringFlag != "hello" {
-- t.Error("string flag should be `hello`, is ", *stringFlag)
-- }
-- if len(f.Args()) != 2 {
-- t.Error("expected one argument, got", len(f.Args()))
-- } else if f.Args()[0] != extra {
-- t.Errorf("expected argument %q got %q", extra, f.Args()[0])
-- } else if f.Args()[1] != notaflag {
-- t.Errorf("expected argument %q got %q", notaflag, f.Args()[1])
-- }
--}
--
--func TestParse(t *testing.T) {
-- ResetForTesting(func() { t.Error("bad parse") })
-- testParse(GetCommandLine(), t)
--}
--
--func TestFlagSetParse(t *testing.T) {
-- testParse(NewFlagSet("test", ContinueOnError), t)
--}
--
--// Declare a user-defined flag type.
--type flagVar []string
--
--func (f *flagVar) String() string {
-- return fmt.Sprint([]string(*f))
--}
--
--func (f *flagVar) Set(value string) error {
-- *f = append(*f, value)
-- return nil
+-// Lookup returns the encoding with the specified label, and its canonical
+-// name. It returns nil and the empty string if label is not one of the
+-// standard encodings for HTML. Matching is case-insensitive and ignores
+-// leading and trailing whitespace.
+-func Lookup(label string) (e encoding.Encoding, name string) {
+- label = strings.ToLower(strings.Trim(label, "\t\n\r\f "))
+- enc := encodings[label]
+- return enc.e, enc.name
-}
-
--func TestUserDefined(t *testing.T) {
-- var flags FlagSet
-- flags.Init("test", ContinueOnError)
-- var v flagVar
-- flags.VarP(&v, "v", "v", "usage")
-- if err := flags.Parse([]string{"--v=1", "-v2", "-v", "3"}); err != nil {
-- t.Error(err)
-- }
-- if len(v) != 3 {
-- t.Fatal("expected 3 args; got ", len(v))
-- }
-- expect := "[1 2 3]"
-- if v.String() != expect {
-- t.Errorf("expected value %q got %q", expect, v.String())
+-// DetermineEncoding determines the encoding of an HTML document by examining
+-// up to the first 1024 bytes of content and the declared Content-Type.
+-//
+-// See http://www.whatwg.org/specs/web-apps/current-work/multipage/parsing.html#determining-the-character-encoding
+-func DetermineEncoding(content []byte, contentType string) (e encoding.Encoding, name string, certain bool) {
+- if len(content) > 1024 {
+- content = content[:1024]
- }
--}
-
--func TestSetOutput(t *testing.T) {
-- var flags FlagSet
-- var buf bytes.Buffer
-- flags.SetOutput(&buf)
-- flags.Init("test", ContinueOnError)
-- flags.Parse([]string{"--unknown"})
-- if out := buf.String(); !strings.Contains(out, "--unknown") {
-- t.Logf("expected output mentioning unknown; got %q", out)
+- for _, b := range boms {
+- if bytes.HasPrefix(content, b.bom) {
+- e, name = Lookup(b.enc)
+- return e, name, true
+- }
- }
--}
-
--// This tests that one can reset the flags. This still works but not well, and is
--// superseded by FlagSet.
--func TestChangingArgs(t *testing.T) {
-- ResetForTesting(func() { t.Fatal("bad parse") })
-- oldArgs := os.Args
-- defer func() { os.Args = oldArgs }()
-- os.Args = []string{"cmd", "--before", "subcmd"}
-- before := Bool("before", false, "")
-- if err := GetCommandLine().Parse(os.Args[1:]); err != nil {
-- t.Fatal(err)
+- if _, params, err := mime.ParseMediaType(contentType); err == nil {
+- if cs, ok := params["charset"]; ok {
+- if e, name = Lookup(cs); e != nil {
+- return e, name, true
+- }
+- }
- }
-- cmd := Arg(0)
-- os.Args = []string{"subcmd", "--after", "args"}
-- after := Bool("after", false, "")
-- Parse()
-- args := Args()
-
-- if !*before || cmd != "subcmd" || !*after || len(args) != 1 || args[0] != "args" {
-- t.Fatalf("expected true subcmd true [args] got %v %v %v %v", *before, cmd, *after, args)
+- if len(content) > 0 {
+- e, name = prescan(content)
+- if e != nil {
+- return e, name, false
+- }
- }
--}
-
--// Test that -help invokes the usage message and returns ErrHelp.
--func TestHelp(t *testing.T) {
-- var helpCalled = false
-- fs := NewFlagSet("help test", ContinueOnError)
-- fs.Usage = func() { helpCalled = true }
-- var flag bool
-- fs.BoolVar(&flag, "flag", false, "regular flag")
-- // Regular flag invocation should work
-- err := fs.Parse([]string{"--flag=true"})
-- if err != nil {
-- t.Fatal("expected no error; got ", err)
-- }
-- if !flag {
-- t.Error("flag was not set by --flag")
-- }
-- if helpCalled {
-- t.Error("help called for regular flag")
-- helpCalled = false // reset for next test
-- }
-- // Help flag should work as expected.
-- err = fs.Parse([]string{"--help"})
-- if err == nil {
-- t.Fatal("error expected")
-- }
-- if err != ErrHelp {
-- t.Fatal("expected ErrHelp; got ", err)
-- }
-- if !helpCalled {
-- t.Fatal("help was not called")
-- }
-- // If we define a help flag, that should override.
-- var help bool
-- fs.BoolVar(&help, "help", false, "help flag")
-- helpCalled = false
-- err = fs.Parse([]string{"--help"})
-- if err != nil {
-- t.Fatal("expected no error for defined --help; got ", err)
-- }
-- if helpCalled {
-- t.Fatal("help was called; should not have been for defined help flag")
+- // Try to detect UTF-8.
+- // First eliminate any partial rune at the end.
+- for i := len(content) - 1; i >= 0 && i > len(content)-4; i-- {
+- b := content[i]
+- if b < 0x80 {
+- break
+- }
+- if utf8.RuneStart(b) {
+- content = content[:i]
+- break
+- }
- }
--}
--
--func TestNoInterspersed(t *testing.T) {
-- f := NewFlagSet("test", ContinueOnError)
-- f.SetInterspersed(false)
-- f.Bool("true", true, "always true")
-- f.Bool("false", false, "always false")
-- err := f.Parse([]string{"--true", "break", "--false"})
-- if err != nil {
-- t.Fatal("expected no error; got ", err)
+- hasHighBit := false
+- for _, c := range content {
+- if c >= 0x80 {
+- hasHighBit = true
+- break
+- }
- }
-- args := f.Args()
-- if len(args) != 2 || args[0] != "break" || args[1] != "--false" {
-- t.Fatal("expected interspersed options/non-options to fail")
+- if hasHighBit && utf8.Valid(content) {
+- return encoding.Nop, "utf-8", false
- }
--}
-diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/float32.go b/Godeps/_workspace/src/github.com/spf13/pflag/float32.go
-deleted file mode 100644
-index b7ad67d..0000000
---- a/Godeps/_workspace/src/github.com/spf13/pflag/float32.go
-+++ /dev/null
-@@ -1,74 +0,0 @@
--package pflag
--
--import (
-- "fmt"
-- "strconv"
--)
--
--// -- float32 Value
--type float32Value float32
--
--func newFloat32Value(val float32, p *float32) *float32Value {
-- *p = val
-- return (*float32Value)(p)
--}
--
--func (f *float32Value) Set(s string) error {
-- v, err := strconv.ParseFloat(s, 32)
-- *f = float32Value(v)
-- return err
--}
--
--func (f *float32Value) Type() string {
-- return "float32"
--}
--
--func (f *float32Value) String() string { return fmt.Sprintf("%v", *f) }
--
--// Float32Var defines a float32 flag with specified name, default value, and usage string.
--// The argument p points to a float32 variable in which to store the value of the flag.
--func (f *FlagSet) Float32Var(p *float32, name string, value float32, usage string) {
-- f.VarP(newFloat32Value(value, p), name, "", usage)
--}
--
--// Like Float32Var, but accepts a shorthand letter that can be used after a single dash.
--func (f *FlagSet) Float32VarP(p *float32, name, shorthand string, value float32, usage string) {
-- f.VarP(newFloat32Value(value, p), name, shorthand, usage)
--}
--
--// Float32Var defines a float32 flag with specified name, default value, and usage string.
--// The argument p points to a float32 variable in which to store the value of the flag.
--func Float32Var(p *float32, name string, value float32, usage string) {
-- CommandLine.VarP(newFloat32Value(value, p), name, "", usage)
--}
--
--// Like Float32Var, but accepts a shorthand letter that can be used after a single dash.
--func Float32VarP(p *float32, name, shorthand string, value float32, usage string) {
-- CommandLine.VarP(newFloat32Value(value, p), name, shorthand, usage)
--}
--
--// Float32 defines a float32 flag with specified name, default value, and usage string.
--// The return value is the address of a float32 variable that stores the value of the flag.
--func (f *FlagSet) Float32(name string, value float32, usage string) *float32 {
-- p := new(float32)
-- f.Float32VarP(p, name, "", value, usage)
-- return p
--}
--
--// Like Float32, but accepts a shorthand letter that can be used after a single dash.
--func (f *FlagSet) Float32P(name, shorthand string, value float32, usage string) *float32 {
-- p := new(float32)
-- f.Float32VarP(p, name, shorthand, value, usage)
-- return p
--}
--
--// Float32 defines a float32 flag with specified name, default value, and usage string.
--// The return value is the address of a float32 variable that stores the value of the flag.
--func Float32(name string, value float32, usage string) *float32 {
-- return CommandLine.Float32P(name, "", value, usage)
--}
--
--// Like Float32, but accepts a shorthand letter that can be used after a single dash.
--func Float32P(name, shorthand string, value float32, usage string) *float32 {
-- return CommandLine.Float32P(name, shorthand, value, usage)
--}
-diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/float64.go b/Godeps/_workspace/src/github.com/spf13/pflag/float64.go
-deleted file mode 100644
-index 0315512..0000000
---- a/Godeps/_workspace/src/github.com/spf13/pflag/float64.go
-+++ /dev/null
-@@ -1,74 +0,0 @@
--package pflag
--
--import (
-- "fmt"
-- "strconv"
--)
--
--// -- float64 Value
--type float64Value float64
--
--func newFloat64Value(val float64, p *float64) *float64Value {
-- *p = val
-- return (*float64Value)(p)
--}
--
--func (f *float64Value) Set(s string) error {
-- v, err := strconv.ParseFloat(s, 64)
-- *f = float64Value(v)
-- return err
--}
-
--func (f *float64Value) Type() string {
-- return "float64"
+- // TODO: change default depending on user's locale?
+- return charmap.Windows1252, "windows-1252", false
-}
-
--func (f *float64Value) String() string { return fmt.Sprintf("%v", *f) }
+-// NewReader returns an io.Reader that converts the content of r to UTF-8.
+-// It calls DetermineEncoding to find out what r's encoding is.
+-func NewReader(r io.Reader, contentType string) (io.Reader, error) {
+- preview := make([]byte, 1024)
+- n, err := io.ReadFull(r, preview)
+- switch {
+- case err == io.ErrUnexpectedEOF:
+- preview = preview[:n]
+- r = bytes.NewReader(preview)
+- case err != nil:
+- return nil, err
+- default:
+- r = io.MultiReader(bytes.NewReader(preview), r)
+- }
-
--// Float64Var defines a float64 flag with specified name, default value, and usage string.
--// The argument p points to a float64 variable in which to store the value of the flag.
--func (f *FlagSet) Float64Var(p *float64, name string, value float64, usage string) {
-- f.VarP(newFloat64Value(value, p), name, "", usage)
+- if e, _, _ := DetermineEncoding(preview, contentType); e != encoding.Nop {
+- r = transform.NewReader(r, e.NewDecoder())
+- }
+- return r, nil
-}
-
--// Like Float64Var, but accepts a shorthand letter that can be used after a single dash.
--func (f *FlagSet) Float64VarP(p *float64, name, shorthand string, value float64, usage string) {
-- f.VarP(newFloat64Value(value, p), name, shorthand, usage)
--}
+-func prescan(content []byte) (e encoding.Encoding, name string) {
+- z := html.NewTokenizer(bytes.NewReader(content))
+- for {
+- switch z.Next() {
+- case html.ErrorToken:
+- return nil, ""
-
--// Float64Var defines a float64 flag with specified name, default value, and usage string.
--// The argument p points to a float64 variable in which to store the value of the flag.
--func Float64Var(p *float64, name string, value float64, usage string) {
-- CommandLine.VarP(newFloat64Value(value, p), name, "", usage)
--}
+- case html.StartTagToken, html.SelfClosingTagToken:
+- tagName, hasAttr := z.TagName()
+- if !bytes.Equal(tagName, []byte("meta")) {
+- continue
+- }
+- attrList := make(map[string]bool)
+- gotPragma := false
-
--// Like Float64Var, but accepts a shorthand letter that can be used after a single dash.
--func Float64VarP(p *float64, name, shorthand string, value float64, usage string) {
-- CommandLine.VarP(newFloat64Value(value, p), name, shorthand, usage)
--}
+- const (
+- dontKnow = iota
+- doNeedPragma
+- doNotNeedPragma
+- )
+- needPragma := dontKnow
-
--// Float64 defines a float64 flag with specified name, default value, and usage string.
--// The return value is the address of a float64 variable that stores the value of the flag.
--func (f *FlagSet) Float64(name string, value float64, usage string) *float64 {
-- p := new(float64)
-- f.Float64VarP(p, name, "", value, usage)
-- return p
--}
+- name = ""
+- e = nil
+- for hasAttr {
+- var key, val []byte
+- key, val, hasAttr = z.TagAttr()
+- ks := string(key)
+- if attrList[ks] {
+- continue
+- }
+- attrList[ks] = true
+- for i, c := range val {
+- if 'A' <= c && c <= 'Z' {
+- val[i] = c + 0x20
+- }
+- }
-
--// Like Float64, but accepts a shorthand letter that can be used after a single dash.
--func (f *FlagSet) Float64P(name, shorthand string, value float64, usage string) *float64 {
-- p := new(float64)
-- f.Float64VarP(p, name, shorthand, value, usage)
-- return p
--}
+- switch ks {
+- case "http-equiv":
+- if bytes.Equal(val, []byte("content-type")) {
+- gotPragma = true
+- }
-
--// Float64 defines a float64 flag with specified name, default value, and usage string.
--// The return value is the address of a float64 variable that stores the value of the flag.
--func Float64(name string, value float64, usage string) *float64 {
-- return CommandLine.Float64P(name, "", value, usage)
--}
+- case "content":
+- if e == nil {
+- name = fromMetaElement(string(val))
+- if name != "" {
+- e, name = Lookup(name)
+- if e != nil {
+- needPragma = doNeedPragma
+- }
+- }
+- }
-
--// Like Float64, but accepts a shorthand letter that can be used after a single dash.
--func Float64P(name, shorthand string, value float64, usage string) *float64 {
-- return CommandLine.Float64P(name, shorthand, value, usage)
--}
-diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/int.go b/Godeps/_workspace/src/github.com/spf13/pflag/int.go
-deleted file mode 100644
-index dca9da6..0000000
---- a/Godeps/_workspace/src/github.com/spf13/pflag/int.go
-+++ /dev/null
-@@ -1,74 +0,0 @@
--package pflag
+- case "charset":
+- e, name = Lookup(string(val))
+- needPragma = doNotNeedPragma
+- }
+- }
-
--import (
-- "fmt"
-- "strconv"
--)
+- if needPragma == dontKnow || needPragma == doNeedPragma && !gotPragma {
+- continue
+- }
-
--// -- int Value
--type intValue int
+- if strings.HasPrefix(name, "utf-16") {
+- name = "utf-8"
+- e = encoding.Nop
+- }
-
--func newIntValue(val int, p *int) *intValue {
-- *p = val
-- return (*intValue)(p)
+- if e != nil {
+- return e, name
+- }
+- }
+- }
-}
-
--func (i *intValue) Set(s string) error {
-- v, err := strconv.ParseInt(s, 0, 64)
-- *i = intValue(v)
-- return err
+-func fromMetaElement(s string) string {
+- for s != "" {
+- csLoc := strings.Index(s, "charset")
+- if csLoc == -1 {
+- return ""
+- }
+- s = s[csLoc+len("charset"):]
+- s = strings.TrimLeft(s, " \t\n\f\r")
+- if !strings.HasPrefix(s, "=") {
+- continue
+- }
+- s = s[1:]
+- s = strings.TrimLeft(s, " \t\n\f\r")
+- if s == "" {
+- return ""
+- }
+- if q := s[0]; q == '"' || q == '\'' {
+- s = s[1:]
+- closeQuote := strings.IndexRune(s, rune(q))
+- if closeQuote == -1 {
+- return ""
+- }
+- return s[:closeQuote]
+- }
+-
+- end := strings.IndexAny(s, "; \t\n\f\r")
+- if end == -1 {
+- end = len(s)
+- }
+- return s[:end]
+- }
+- return ""
-}
-
--func (i *intValue) Type() string {
-- return "int"
+-var boms = []struct {
+- bom []byte
+- enc string
+-}{
+- {[]byte{0xfe, 0xff}, "utf-16be"},
+- {[]byte{0xff, 0xfe}, "utf-16le"},
+- {[]byte{0xef, 0xbb, 0xbf}, "utf-8"},
-}
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/charset_test.go b/Godeps/_workspace/src/golang.org/x/net/html/charset/charset_test.go
+deleted file mode 100644
+index d309f75..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/charset/charset_test.go
++++ /dev/null
+@@ -1,215 +0,0 @@
+-// Copyright 2013 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
--func (i *intValue) String() string { return fmt.Sprintf("%v", *i) }
+-package charset
-
--// IntVar defines an int flag with specified name, default value, and usage string.
--// The argument p points to an int variable in which to store the value of the flag.
--func (f *FlagSet) IntVar(p *int, name string, value int, usage string) {
-- f.VarP(newIntValue(value, p), name, "", usage)
--}
+-import (
+- "bytes"
+- "io/ioutil"
+- "runtime"
+- "strings"
+- "testing"
-
--// Like IntVar, but accepts a shorthand letter that can be used after a single dash.
--func (f *FlagSet) IntVarP(p *int, name, shorthand string, value int, usage string) {
-- f.VarP(newIntValue(value, p), name, shorthand, usage)
--}
+- "golang.org/x/text/transform"
+-)
-
--// IntVar defines an int flag with specified name, default value, and usage string.
--// The argument p points to an int variable in which to store the value of the flag.
--func IntVar(p *int, name string, value int, usage string) {
-- CommandLine.VarP(newIntValue(value, p), name, "", usage)
+-func transformString(t transform.Transformer, s string) (string, error) {
+- r := transform.NewReader(strings.NewReader(s), t)
+- b, err := ioutil.ReadAll(r)
+- return string(b), err
-}
-
--// Like IntVar, but accepts a shorthand letter that can be used after a single dash.
--func IntVarP(p *int, name, shorthand string, value int, usage string) {
-- CommandLine.VarP(newIntValue(value, p), name, shorthand, usage)
+-var testCases = []struct {
+- utf8, other, otherEncoding string
+-}{
+- {"Résumé", "Résumé", "utf8"},
+- {"Résumé", "R\xe9sum\xe9", "latin1"},
+- {"これは漢字です。", "S0\x8c0o0\"oW[g0Y0\x020", "UTF-16LE"},
+- {"これは漢字です。", "0S0\x8c0oo\"[W0g0Y0\x02", "UTF-16BE"},
+- {"Hello, world", "Hello, world", "ASCII"},
+- {"Gdańsk", "Gda\xf1sk", "ISO-8859-2"},
+- {"Ââ Čč Đđ Ŋŋ Õõ Šš Žž Åå Ää", "\xc2\xe2 \xc8\xe8 \xa9\xb9 \xaf\xbf \xd5\xf5 \xaa\xba \xac\xbc \xc5\xe5 \xc4\xe4", "ISO-8859-10"},
+- {"สำหรับ", "\xca\xd3\xcb\xc3\u047a", "ISO-8859-11"},
+- {"latviešu", "latvie\xf0u", "ISO-8859-13"},
+- {"Seònaid", "Se\xf2naid", "ISO-8859-14"},
+- {"€1 is cheap", "\xa41 is cheap", "ISO-8859-15"},
+- {"românește", "rom\xe2ne\xbate", "ISO-8859-16"},
+- {"nutraĵo", "nutra\xbco", "ISO-8859-3"},
+- {"Kalâdlit", "Kal\xe2dlit", "ISO-8859-4"},
+- {"русский", "\xe0\xe3\xe1\xe1\xda\xd8\xd9", "ISO-8859-5"},
+- {"ελληνικά", "\xe5\xeb\xeb\xe7\xed\xe9\xea\xdc", "ISO-8859-7"},
+- {"Kağan", "Ka\xf0an", "ISO-8859-9"},
+- {"Résumé", "R\x8esum\x8e", "macintosh"},
+- {"Gdańsk", "Gda\xf1sk", "windows-1250"},
+- {"русский", "\xf0\xf3\xf1\xf1\xea\xe8\xe9", "windows-1251"},
+- {"Résumé", "R\xe9sum\xe9", "windows-1252"},
+- {"ελληνικά", "\xe5\xeb\xeb\xe7\xed\xe9\xea\xdc", "windows-1253"},
+- {"Kağan", "Ka\xf0an", "windows-1254"},
+- {"עִבְרִית", "\xf2\xc4\xe1\xc0\xf8\xc4\xe9\xfa", "windows-1255"},
+- {"العربية", "\xc7\xe1\xda\xd1\xc8\xed\xc9", "windows-1256"},
+- {"latviešu", "latvie\xf0u", "windows-1257"},
+- {"Việt", "Vi\xea\xf2t", "windows-1258"},
+- {"สำหรับ", "\xca\xd3\xcb\xc3\u047a", "windows-874"},
+- {"русский", "\xd2\xd5\xd3\xd3\xcb\xc9\xca", "KOI8-R"},
+- {"українська", "\xd5\xcb\xd2\xc1\xa7\xce\xd3\xd8\xcb\xc1", "KOI8-U"},
+- {"Hello 常用國字標準字體表", "Hello \xb1`\xa5\u03b0\xea\xa6r\xbc\u0437\u01e6r\xc5\xe9\xaa\xed", "big5"},
+- {"Hello 常用國字標準字體表", "Hello \xb3\xa3\xd3\xc3\x87\xf8\xd7\xd6\x98\xcb\x9c\xca\xd7\xd6\xf3\x77\xb1\xed", "gbk"},
+- {"Hello 常用國字標準字體表", "Hello \xb3\xa3\xd3\xc3\x87\xf8\xd7\xd6\x98\xcb\x9c\xca\xd7\xd6\xf3\x77\xb1\xed", "gb18030"},
+- {"עִבְרִית", "\x81\x30\xfb\x30\x81\x30\xf6\x34\x81\x30\xf9\x33\x81\x30\xf6\x30\x81\x30\xfb\x36\x81\x30\xf6\x34\x81\x30\xfa\x31\x81\x30\xfb\x38", "gb18030"},
+- {"㧯", "\x82\x31\x89\x38", "gb18030"},
+- {"これは漢字です。", "\x82\xb1\x82\xea\x82\xcd\x8a\xbf\x8e\x9a\x82\xc5\x82\xb7\x81B", "SJIS"},
+- {"Hello, 世界!", "Hello, \x90\xa2\x8aE!", "SJIS"},
+- {"ｲｳｴｵｶ", "\xb2\xb3\xb4\xb5\xb6", "SJIS"},
+- {"これは漢字です。", "\xa4\xb3\xa4\xec\xa4\u03f4\xc1\xbb\xfa\xa4\u01e4\xb9\xa1\xa3", "EUC-JP"},
+- {"Hello, 世界!", "Hello, \x1b$B@$3&\x1b(B!", "ISO-2022-JP"},
+- {"네이트 | 즐거움의 시작, 슈파스(Spaβ) NATE", "\xb3\xd7\xc0\xcc\xc6\xae | \xc1\xf1\xb0\xc5\xbf\xf2\xc0\xc7 \xbd\xc3\xc0\xdb, \xbd\xb4\xc6\xc4\xbd\xba(Spa\xa5\xe2) NATE", "EUC-KR"},
-}
-
--// Int defines an int flag with specified name, default value, and usage string.
--// The return value is the address of an int variable that stores the value of the flag.
--func (f *FlagSet) Int(name string, value int, usage string) *int {
-- p := new(int)
-- f.IntVarP(p, name, "", value, usage)
-- return p
+-func TestDecode(t *testing.T) {
+- for _, tc := range testCases {
+- e, _ := Lookup(tc.otherEncoding)
+- if e == nil {
+- t.Errorf("%s: not found", tc.otherEncoding)
+- continue
+- }
+- s, err := transformString(e.NewDecoder(), tc.other)
+- if err != nil {
+- t.Errorf("%s: decode %q: %v", tc.otherEncoding, tc.other, err)
+- continue
+- }
+- if s != tc.utf8 {
+- t.Errorf("%s: got %q, want %q", tc.otherEncoding, s, tc.utf8)
+- }
+- }
-}
-
--// Like Int, but accepts a shorthand letter that can be used after a single dash.
--func (f *FlagSet) IntP(name, shorthand string, value int, usage string) *int {
-- p := new(int)
-- f.IntVarP(p, name, shorthand, value, usage)
-- return p
+-func TestEncode(t *testing.T) {
+- for _, tc := range testCases {
+- e, _ := Lookup(tc.otherEncoding)
+- if e == nil {
+- t.Errorf("%s: not found", tc.otherEncoding)
+- continue
+- }
+- s, err := transformString(e.NewEncoder(), tc.utf8)
+- if err != nil {
+- t.Errorf("%s: encode %q: %s", tc.otherEncoding, tc.utf8, err)
+- continue
+- }
+- if s != tc.other {
+- t.Errorf("%s: got %q, want %q", tc.otherEncoding, s, tc.other)
+- }
+- }
-}
-
--// Int defines an int flag with specified name, default value, and usage string.
--// The return value is the address of an int variable that stores the value of the flag.
--func Int(name string, value int, usage string) *int {
-- return CommandLine.IntP(name, "", value, usage)
+-// TestNames verifies that you can pass an encoding's name to Lookup and get
+-// the same encoding back (except for "replacement").
+-func TestNames(t *testing.T) {
+- for _, e := range encodings {
+- if e.name == "replacement" {
+- continue
+- }
+- _, got := Lookup(e.name)
+- if got != e.name {
+- t.Errorf("got %q, want %q", got, e.name)
+- continue
+- }
+- }
-}
-
--// Like Int, but accepts a shorthand letter that can be used after a single dash.
--func IntP(name, shorthand string, value int, usage string) *int {
-- return CommandLine.IntP(name, shorthand, value, usage)
+-var sniffTestCases = []struct {
+- filename, declared, want string
+-}{
+- {"HTTP-charset.html", "text/html; charset=iso-8859-15", "iso-8859-15"},
+- {"UTF-16LE-BOM.html", "", "utf-16le"},
+- {"UTF-16BE-BOM.html", "", "utf-16be"},
+- {"meta-content-attribute.html", "text/html", "iso-8859-15"},
+- {"meta-charset-attribute.html", "text/html", "iso-8859-15"},
+- {"No-encoding-declaration.html", "text/html", "utf-8"},
+- {"HTTP-vs-UTF-8-BOM.html", "text/html; charset=iso-8859-15", "utf-8"},
+- {"HTTP-vs-meta-content.html", "text/html; charset=iso-8859-15", "iso-8859-15"},
+- {"HTTP-vs-meta-charset.html", "text/html; charset=iso-8859-15", "iso-8859-15"},
+- {"UTF-8-BOM-vs-meta-content.html", "text/html", "utf-8"},
+- {"UTF-8-BOM-vs-meta-charset.html", "text/html", "utf-8"},
-}
-diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/int32.go b/Godeps/_workspace/src/github.com/spf13/pflag/int32.go
-deleted file mode 100644
-index 18eaacd..0000000
---- a/Godeps/_workspace/src/github.com/spf13/pflag/int32.go
-+++ /dev/null
-@@ -1,74 +0,0 @@
--package pflag
-
--import (
-- "fmt"
-- "strconv"
--)
+-func TestSniff(t *testing.T) {
+- switch runtime.GOOS {
+- case "nacl": // platforms that don't permit direct file system access
+- t.Skipf("not supported on %q", runtime.GOOS)
+- }
-
--// -- int32 Value
--type int32Value int32
+- for _, tc := range sniffTestCases {
+- content, err := ioutil.ReadFile("testdata/" + tc.filename)
+- if err != nil {
+- t.Errorf("%s: error reading file: %v", tc.filename, err)
+- continue
+- }
-
--func newInt32Value(val int32, p *int32) *int32Value {
-- *p = val
-- return (*int32Value)(p)
+- _, name, _ := DetermineEncoding(content, tc.declared)
+- if name != tc.want {
+- t.Errorf("%s: got %q, want %q", tc.filename, name, tc.want)
+- continue
+- }
+- }
-}
-
--func (i *int32Value) Set(s string) error {
-- v, err := strconv.ParseInt(s, 0, 32)
-- *i = int32Value(v)
-- return err
--}
+-func TestReader(t *testing.T) {
+- switch runtime.GOOS {
+- case "nacl": // platforms that don't permit direct file system access
+- t.Skipf("not supported on %q", runtime.GOOS)
+- }
-
--func (i *int32Value) Type() string {
-- return "int32"
--}
+- for _, tc := range sniffTestCases {
+- content, err := ioutil.ReadFile("testdata/" + tc.filename)
+- if err != nil {
+- t.Errorf("%s: error reading file: %v", tc.filename, err)
+- continue
+- }
-
--func (i *int32Value) String() string { return fmt.Sprintf("%v", *i) }
+- r, err := NewReader(bytes.NewReader(content), tc.declared)
+- if err != nil {
+- t.Errorf("%s: error creating reader: %v", tc.filename, err)
+- continue
+- }
-
--// Int32Var defines an int32 flag with specified name, default value, and usage string.
--// The argument p points to an int32 variable in which to store the value of the flag.
--func (f *FlagSet) Int32Var(p *int32, name string, value int32, usage string) {
-- f.VarP(newInt32Value(value, p), name, "", usage)
--}
+- got, err := ioutil.ReadAll(r)
+- if err != nil {
+- t.Errorf("%s: error reading from charset.NewReader: %v", tc.filename, err)
+- continue
+- }
-
--// Like Int32Var, but accepts a shorthand letter that can be used after a single dash.
--func (f *FlagSet) Int32VarP(p *int32, name, shorthand string, value int32, usage string) {
-- f.VarP(newInt32Value(value, p), name, shorthand, usage)
--}
+- e, _ := Lookup(tc.want)
+- want, err := ioutil.ReadAll(transform.NewReader(bytes.NewReader(content), e.NewDecoder()))
+- if err != nil {
+- t.Errorf("%s: error decoding with hard-coded charset name: %v", tc.filename, err)
+- continue
+- }
-
--// Int32Var defines an int32 flag with specified name, default value, and usage string.
--// The argument p points to an int32 variable in which to store the value of the flag.
--func Int32Var(p *int32, name string, value int32, usage string) {
-- CommandLine.VarP(newInt32Value(value, p), name, "", usage)
+- if !bytes.Equal(got, want) {
+- t.Errorf("%s: got %q, want %q", tc.filename, got, want)
+- continue
+- }
+- }
-}
-
--// Like Int32Var, but accepts a shorthand letter that can be used after a single dash.
--func Int32VarP(p *int32, name, shorthand string, value int32, usage string) {
-- CommandLine.VarP(newInt32Value(value, p), name, shorthand, usage)
+-var metaTestCases = []struct {
+- meta, want string
+-}{
+- {"", ""},
+- {"text/html", ""},
+- {"text/html; charset utf-8", ""},
+- {"text/html; charset=latin-2", "latin-2"},
+- {"text/html; charset; charset = utf-8", "utf-8"},
+- {`charset="big5"`, "big5"},
+- {"charset='shift_jis'", "shift_jis"},
-}
-
--// Int32 defines an int32 flag with specified name, default value, and usage string.
--// The return value is the address of an int32 variable that stores the value of the flag.
--func (f *FlagSet) Int32(name string, value int32, usage string) *int32 {
-- p := new(int32)
-- f.Int32VarP(p, name, "", value, usage)
-- return p
+-func TestFromMeta(t *testing.T) {
+- for _, tc := range metaTestCases {
+- got := fromMetaElement(tc.meta)
+- if got != tc.want {
+- t.Errorf("%q: got %q, want %q", tc.meta, got, tc.want)
+- }
+- }
-}
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/gen.go b/Godeps/_workspace/src/golang.org/x/net/html/charset/gen.go
+deleted file mode 100644
+index 8b76909..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/charset/gen.go
++++ /dev/null
+@@ -1,111 +0,0 @@
+-// Copyright 2013 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
--// Like Int32, but accepts a shorthand letter that can be used after a single dash.
--func (f *FlagSet) Int32P(name, shorthand string, value int32, usage string) *int32 {
-- p := new(int32)
-- f.Int32VarP(p, name, shorthand, value, usage)
-- return p
--}
+-// +build ignore
-
--// Int32 defines an int32 flag with specified name, default value, and usage string.
--// The return value is the address of an int32 variable that stores the value of the flag.
--func Int32(name string, value int32, usage string) *int32 {
-- return CommandLine.Int32P(name, "", value, usage)
--}
+-package main
-
--// Like Int32, but accepts a shorthand letter that can be used after a single dash.
--func Int32P(name, shorthand string, value int32, usage string) *int32 {
-- return CommandLine.Int32P(name, shorthand, value, usage)
--}
-diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/int64.go b/Godeps/_workspace/src/github.com/spf13/pflag/int64.go
-deleted file mode 100644
-index 0114aaa..0000000
---- a/Godeps/_workspace/src/github.com/spf13/pflag/int64.go
-+++ /dev/null
-@@ -1,74 +0,0 @@
--package pflag
+-// Download http://encoding.spec.whatwg.org/encodings.json and use it to
+-// generate table.go.
-
-import (
+- "encoding/json"
- "fmt"
-- "strconv"
+- "log"
+- "net/http"
+- "strings"
-)
-
--// -- int64 Value
--type int64Value int64
--
--func newInt64Value(val int64, p *int64) *int64Value {
-- *p = val
-- return (*int64Value)(p)
--}
--
--func (i *int64Value) Set(s string) error {
-- v, err := strconv.ParseInt(s, 0, 64)
-- *i = int64Value(v)
-- return err
+-type enc struct {
+- Name string
+- Labels []string
-}
-
--func (i *int64Value) Type() string {
-- return "int64"
+-type group struct {
+- Encodings []enc
+- Heading string
-}
-
--func (i *int64Value) String() string { return fmt.Sprintf("%v", *i) }
+-const specURL = "http://encoding.spec.whatwg.org/encodings.json"
-
--// Int64Var defines an int64 flag with specified name, default value, and usage string.
--// The argument p points to an int64 variable in which to store the value of the flag.
--func (f *FlagSet) Int64Var(p *int64, name string, value int64, usage string) {
-- f.VarP(newInt64Value(value, p), name, "", usage)
--}
+-func main() {
+- resp, err := http.Get(specURL)
+- if err != nil {
+- log.Fatalf("error fetching %s: %s", specURL, err)
+- }
+- if resp.StatusCode != 200 {
+- log.Fatalf("error fetching %s: HTTP status %s", specURL, resp.Status)
+- }
+- defer resp.Body.Close()
-
--// Like Int64Var, but accepts a shorthand letter that can be used after a single dash.
--func (f *FlagSet) Int64VarP(p *int64, name, shorthand string, value int64, usage string) {
-- f.VarP(newInt64Value(value, p), name, shorthand, usage)
--}
+- var groups []group
+- d := json.NewDecoder(resp.Body)
+- err = d.Decode(&groups)
+- if err != nil {
+- log.Fatalf("error reading encodings.json: %s", err)
+- }
-
--// Int64Var defines an int64 flag with specified name, default value, and usage string.
--// The argument p points to an int64 variable in which to store the value of the flag.
--func Int64Var(p *int64, name string, value int64, usage string) {
-- CommandLine.VarP(newInt64Value(value, p), name, "", usage)
--}
+- fmt.Println("// generated by go run gen.go; DO NOT EDIT")
+- fmt.Println()
+- fmt.Println("package charset")
+- fmt.Println()
-
--// Like Int64Var, but accepts a shorthand letter that can be used after a single dash.
--func Int64VarP(p *int64, name, shorthand string, value int64, usage string) {
-- CommandLine.VarP(newInt64Value(value, p), name, shorthand, usage)
--}
+- fmt.Println("import (")
+- fmt.Println(`"golang.org/x/text/encoding"`)
+- for _, pkg := range []string{"charmap", "japanese", "korean", "simplifiedchinese", "traditionalchinese", "unicode"} {
+- fmt.Printf("\"golang.org/x/text/encoding/%s\"\n", pkg)
+- }
+- fmt.Println(")")
+- fmt.Println()
-
--// Int64 defines an int64 flag with specified name, default value, and usage string.
--// The return value is the address of an int64 variable that stores the value of the flag.
--func (f *FlagSet) Int64(name string, value int64, usage string) *int64 {
-- p := new(int64)
-- f.Int64VarP(p, name, "", value, usage)
-- return p
--}
+- fmt.Println("var encodings = map[string]struct{e encoding.Encoding; name string} {")
+- for _, g := range groups {
+- for _, e := range g.Encodings {
+- goName, ok := miscNames[e.Name]
+- if !ok {
+- for k, v := range prefixes {
+- if strings.HasPrefix(e.Name, k) {
+- goName = v + e.Name[len(k):]
+- break
+- }
+- }
+- if goName == "" {
+- log.Fatalf("unrecognized encoding name: %s", e.Name)
+- }
+- }
-
--// Like Int64, but accepts a shorthand letter that can be used after a single dash.
--func (f *FlagSet) Int64P(name, shorthand string, value int64, usage string) *int64 {
-- p := new(int64)
-- f.Int64VarP(p, name, shorthand, value, usage)
-- return p
+- for _, label := range e.Labels {
+- fmt.Printf("%q: {%s, %q},\n", label, goName, e.Name)
+- }
+- }
+- }
+- fmt.Println("}")
-}
-
--// Int64 defines an int64 flag with specified name, default value, and usage string.
--// The return value is the address of an int64 variable that stores the value of the flag.
--func Int64(name string, value int64, usage string) *int64 {
-- return CommandLine.Int64P(name, "", value, usage)
+-var prefixes = map[string]string{
+- "iso-8859-": "charmap.ISO8859_",
+- "windows-": "charmap.Windows",
-}
-
--// Like Int64, but accepts a shorthand letter that can be used after a single dash.
--func Int64P(name, shorthand string, value int64, usage string) *int64 {
-- return CommandLine.Int64P(name, shorthand, value, usage)
+-var miscNames = map[string]string{
+- "utf-8": "encoding.Nop",
+- "ibm866": "charmap.CodePage866",
+- "iso-8859-8-i": "charmap.ISO8859_8",
+- "koi8-r": "charmap.KOI8R",
+- "koi8-u": "charmap.KOI8U",
+- "macintosh": "charmap.Macintosh",
+- "x-mac-cyrillic": "charmap.MacintoshCyrillic",
+- "gbk": "simplifiedchinese.GBK",
+- "gb18030": "simplifiedchinese.GB18030",
+- "hz-gb-2312": "simplifiedchinese.HZGB2312",
+- "big5": "traditionalchinese.Big5",
+- "euc-jp": "japanese.EUCJP",
+- "iso-2022-jp": "japanese.ISO2022JP",
+- "shift_jis": "japanese.ShiftJIS",
+- "euc-kr": "korean.EUCKR",
+- "replacement": "encoding.Replacement",
+- "utf-16be": "unicode.UTF16(unicode.BigEndian, unicode.IgnoreBOM)",
+- "utf-16le": "unicode.UTF16(unicode.LittleEndian, unicode.IgnoreBOM)",
+- "x-user-defined": "charmap.XUserDefined",
-}
-diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/int8.go b/Godeps/_workspace/src/github.com/spf13/pflag/int8.go
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/table.go b/Godeps/_workspace/src/golang.org/x/net/html/charset/table.go
deleted file mode 100644
-index aab1022..0000000
---- a/Godeps/_workspace/src/github.com/spf13/pflag/int8.go
+index aa0d948..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/charset/table.go
+++ /dev/null
-@@ -1,74 +0,0 @@
--package pflag
+@@ -1,235 +0,0 @@
+-// generated by go run gen.go; DO NOT EDIT
+-
+-package charset
-
-import (
-- "fmt"
-- "strconv"
+- "golang.org/x/text/encoding"
+- "golang.org/x/text/encoding/charmap"
+- "golang.org/x/text/encoding/japanese"
+- "golang.org/x/text/encoding/korean"
+- "golang.org/x/text/encoding/simplifiedchinese"
+- "golang.org/x/text/encoding/traditionalchinese"
+- "golang.org/x/text/encoding/unicode"
-)
-
--// -- int8 Value
--type int8Value int8
--
--func newInt8Value(val int8, p *int8) *int8Value {
-- *p = val
-- return (*int8Value)(p)
+-var encodings = map[string]struct {
+- e encoding.Encoding
+- name string
+-}{
+- "unicode-1-1-utf-8": {encoding.Nop, "utf-8"},
+- "utf-8": {encoding.Nop, "utf-8"},
+- "utf8": {encoding.Nop, "utf-8"},
+- "866": {charmap.CodePage866, "ibm866"},
+- "cp866": {charmap.CodePage866, "ibm866"},
+- "csibm866": {charmap.CodePage866, "ibm866"},
+- "ibm866": {charmap.CodePage866, "ibm866"},
+- "csisolatin2": {charmap.ISO8859_2, "iso-8859-2"},
+- "iso-8859-2": {charmap.ISO8859_2, "iso-8859-2"},
+- "iso-ir-101": {charmap.ISO8859_2, "iso-8859-2"},
+- "iso8859-2": {charmap.ISO8859_2, "iso-8859-2"},
+- "iso88592": {charmap.ISO8859_2, "iso-8859-2"},
+- "iso_8859-2": {charmap.ISO8859_2, "iso-8859-2"},
+- "iso_8859-2:1987": {charmap.ISO8859_2, "iso-8859-2"},
+- "l2": {charmap.ISO8859_2, "iso-8859-2"},
+- "latin2": {charmap.ISO8859_2, "iso-8859-2"},
+- "csisolatin3": {charmap.ISO8859_3, "iso-8859-3"},
+- "iso-8859-3": {charmap.ISO8859_3, "iso-8859-3"},
+- "iso-ir-109": {charmap.ISO8859_3, "iso-8859-3"},
+- "iso8859-3": {charmap.ISO8859_3, "iso-8859-3"},
+- "iso88593": {charmap.ISO8859_3, "iso-8859-3"},
+- "iso_8859-3": {charmap.ISO8859_3, "iso-8859-3"},
+- "iso_8859-3:1988": {charmap.ISO8859_3, "iso-8859-3"},
+- "l3": {charmap.ISO8859_3, "iso-8859-3"},
+- "latin3": {charmap.ISO8859_3, "iso-8859-3"},
+- "csisolatin4": {charmap.ISO8859_4, "iso-8859-4"},
+- "iso-8859-4": {charmap.ISO8859_4, "iso-8859-4"},
+- "iso-ir-110": {charmap.ISO8859_4, "iso-8859-4"},
+- "iso8859-4": {charmap.ISO8859_4, "iso-8859-4"},
+- "iso88594": {charmap.ISO8859_4, "iso-8859-4"},
+- "iso_8859-4": {charmap.ISO8859_4, "iso-8859-4"},
+- "iso_8859-4:1988": {charmap.ISO8859_4, "iso-8859-4"},
+- "l4": {charmap.ISO8859_4, "iso-8859-4"},
+- "latin4": {charmap.ISO8859_4, "iso-8859-4"},
+- "csisolatincyrillic": {charmap.ISO8859_5, "iso-8859-5"},
+- "cyrillic": {charmap.ISO8859_5, "iso-8859-5"},
+- "iso-8859-5": {charmap.ISO8859_5, "iso-8859-5"},
+- "iso-ir-144": {charmap.ISO8859_5, "iso-8859-5"},
+- "iso8859-5": {charmap.ISO8859_5, "iso-8859-5"},
+- "iso88595": {charmap.ISO8859_5, "iso-8859-5"},
+- "iso_8859-5": {charmap.ISO8859_5, "iso-8859-5"},
+- "iso_8859-5:1988": {charmap.ISO8859_5, "iso-8859-5"},
+- "arabic": {charmap.ISO8859_6, "iso-8859-6"},
+- "asmo-708": {charmap.ISO8859_6, "iso-8859-6"},
+- "csiso88596e": {charmap.ISO8859_6, "iso-8859-6"},
+- "csiso88596i": {charmap.ISO8859_6, "iso-8859-6"},
+- "csisolatinarabic": {charmap.ISO8859_6, "iso-8859-6"},
+- "ecma-114": {charmap.ISO8859_6, "iso-8859-6"},
+- "iso-8859-6": {charmap.ISO8859_6, "iso-8859-6"},
+- "iso-8859-6-e": {charmap.ISO8859_6, "iso-8859-6"},
+- "iso-8859-6-i": {charmap.ISO8859_6, "iso-8859-6"},
+- "iso-ir-127": {charmap.ISO8859_6, "iso-8859-6"},
+- "iso8859-6": {charmap.ISO8859_6, "iso-8859-6"},
+- "iso88596": {charmap.ISO8859_6, "iso-8859-6"},
+- "iso_8859-6": {charmap.ISO8859_6, "iso-8859-6"},
+- "iso_8859-6:1987": {charmap.ISO8859_6, "iso-8859-6"},
+- "csisolatingreek": {charmap.ISO8859_7, "iso-8859-7"},
+- "ecma-118": {charmap.ISO8859_7, "iso-8859-7"},
+- "elot_928": {charmap.ISO8859_7, "iso-8859-7"},
+- "greek": {charmap.ISO8859_7, "iso-8859-7"},
+- "greek8": {charmap.ISO8859_7, "iso-8859-7"},
+- "iso-8859-7": {charmap.ISO8859_7, "iso-8859-7"},
+- "iso-ir-126": {charmap.ISO8859_7, "iso-8859-7"},
+- "iso8859-7": {charmap.ISO8859_7, "iso-8859-7"},
+- "iso88597": {charmap.ISO8859_7, "iso-8859-7"},
+- "iso_8859-7": {charmap.ISO8859_7, "iso-8859-7"},
+- "iso_8859-7:1987": {charmap.ISO8859_7, "iso-8859-7"},
+- "sun_eu_greek": {charmap.ISO8859_7, "iso-8859-7"},
+- "csiso88598e": {charmap.ISO8859_8, "iso-8859-8"},
+- "csisolatinhebrew": {charmap.ISO8859_8, "iso-8859-8"},
+- "hebrew": {charmap.ISO8859_8, "iso-8859-8"},
+- "iso-8859-8": {charmap.ISO8859_8, "iso-8859-8"},
+- "iso-8859-8-e": {charmap.ISO8859_8, "iso-8859-8"},
+- "iso-ir-138": {charmap.ISO8859_8, "iso-8859-8"},
+- "iso8859-8": {charmap.ISO8859_8, "iso-8859-8"},
+- "iso88598": {charmap.ISO8859_8, "iso-8859-8"},
+- "iso_8859-8": {charmap.ISO8859_8, "iso-8859-8"},
+- "iso_8859-8:1988": {charmap.ISO8859_8, "iso-8859-8"},
+- "visual": {charmap.ISO8859_8, "iso-8859-8"},
+- "csiso88598i": {charmap.ISO8859_8, "iso-8859-8-i"},
+- "iso-8859-8-i": {charmap.ISO8859_8, "iso-8859-8-i"},
+- "logical": {charmap.ISO8859_8, "iso-8859-8-i"},
+- "csisolatin6": {charmap.ISO8859_10, "iso-8859-10"},
+- "iso-8859-10": {charmap.ISO8859_10, "iso-8859-10"},
+- "iso-ir-157": {charmap.ISO8859_10, "iso-8859-10"},
+- "iso8859-10": {charmap.ISO8859_10, "iso-8859-10"},
+- "iso885910": {charmap.ISO8859_10, "iso-8859-10"},
+- "l6": {charmap.ISO8859_10, "iso-8859-10"},
+- "latin6": {charmap.ISO8859_10, "iso-8859-10"},
+- "iso-8859-13": {charmap.ISO8859_13, "iso-8859-13"},
+- "iso8859-13": {charmap.ISO8859_13, "iso-8859-13"},
+- "iso885913": {charmap.ISO8859_13, "iso-8859-13"},
+- "iso-8859-14": {charmap.ISO8859_14, "iso-8859-14"},
+- "iso8859-14": {charmap.ISO8859_14, "iso-8859-14"},
+- "iso885914": {charmap.ISO8859_14, "iso-8859-14"},
+- "csisolatin9": {charmap.ISO8859_15, "iso-8859-15"},
+- "iso-8859-15": {charmap.ISO8859_15, "iso-8859-15"},
+- "iso8859-15": {charmap.ISO8859_15, "iso-8859-15"},
+- "iso885915": {charmap.ISO8859_15, "iso-8859-15"},
+- "iso_8859-15": {charmap.ISO8859_15, "iso-8859-15"},
+- "l9": {charmap.ISO8859_15, "iso-8859-15"},
+- "iso-8859-16": {charmap.ISO8859_16, "iso-8859-16"},
+- "cskoi8r": {charmap.KOI8R, "koi8-r"},
+- "koi": {charmap.KOI8R, "koi8-r"},
+- "koi8": {charmap.KOI8R, "koi8-r"},
+- "koi8-r": {charmap.KOI8R, "koi8-r"},
+- "koi8_r": {charmap.KOI8R, "koi8-r"},
+- "koi8-u": {charmap.KOI8U, "koi8-u"},
+- "csmacintosh": {charmap.Macintosh, "macintosh"},
+- "mac": {charmap.Macintosh, "macintosh"},
+- "macintosh": {charmap.Macintosh, "macintosh"},
+- "x-mac-roman": {charmap.Macintosh, "macintosh"},
+- "dos-874": {charmap.Windows874, "windows-874"},
+- "iso-8859-11": {charmap.Windows874, "windows-874"},
+- "iso8859-11": {charmap.Windows874, "windows-874"},
+- "iso885911": {charmap.Windows874, "windows-874"},
+- "tis-620": {charmap.Windows874, "windows-874"},
+- "windows-874": {charmap.Windows874, "windows-874"},
+- "cp1250": {charmap.Windows1250, "windows-1250"},
+- "windows-1250": {charmap.Windows1250, "windows-1250"},
+- "x-cp1250": {charmap.Windows1250, "windows-1250"},
+- "cp1251": {charmap.Windows1251, "windows-1251"},
+- "windows-1251": {charmap.Windows1251, "windows-1251"},
+- "x-cp1251": {charmap.Windows1251, "windows-1251"},
+- "ansi_x3.4-1968": {charmap.Windows1252, "windows-1252"},
+- "ascii": {charmap.Windows1252, "windows-1252"},
+- "cp1252": {charmap.Windows1252, "windows-1252"},
+- "cp819": {charmap.Windows1252, "windows-1252"},
+- "csisolatin1": {charmap.Windows1252, "windows-1252"},
+- "ibm819": {charmap.Windows1252, "windows-1252"},
+- "iso-8859-1": {charmap.Windows1252, "windows-1252"},
+- "iso-ir-100": {charmap.Windows1252, "windows-1252"},
+- "iso8859-1": {charmap.Windows1252, "windows-1252"},
+- "iso88591": {charmap.Windows1252, "windows-1252"},
+- "iso_8859-1": {charmap.Windows1252, "windows-1252"},
+- "iso_8859-1:1987": {charmap.Windows1252, "windows-1252"},
+- "l1": {charmap.Windows1252, "windows-1252"},
+- "latin1": {charmap.Windows1252, "windows-1252"},
+- "us-ascii": {charmap.Windows1252, "windows-1252"},
+- "windows-1252": {charmap.Windows1252, "windows-1252"},
+- "x-cp1252": {charmap.Windows1252, "windows-1252"},
+- "cp1253": {charmap.Windows1253, "windows-1253"},
+- "windows-1253": {charmap.Windows1253, "windows-1253"},
+- "x-cp1253": {charmap.Windows1253, "windows-1253"},
+- "cp1254": {charmap.Windows1254, "windows-1254"},
+- "csisolatin5": {charmap.Windows1254, "windows-1254"},
+- "iso-8859-9": {charmap.Windows1254, "windows-1254"},
+- "iso-ir-148": {charmap.Windows1254, "windows-1254"},
+- "iso8859-9": {charmap.Windows1254, "windows-1254"},
+- "iso88599": {charmap.Windows1254, "windows-1254"},
+- "iso_8859-9": {charmap.Windows1254, "windows-1254"},
+- "iso_8859-9:1989": {charmap.Windows1254, "windows-1254"},
+- "l5": {charmap.Windows1254, "windows-1254"},
+- "latin5": {charmap.Windows1254, "windows-1254"},
+- "windows-1254": {charmap.Windows1254, "windows-1254"},
+- "x-cp1254": {charmap.Windows1254, "windows-1254"},
+- "cp1255": {charmap.Windows1255, "windows-1255"},
+- "windows-1255": {charmap.Windows1255, "windows-1255"},
+- "x-cp1255": {charmap.Windows1255, "windows-1255"},
+- "cp1256": {charmap.Windows1256, "windows-1256"},
+- "windows-1256": {charmap.Windows1256, "windows-1256"},
+- "x-cp1256": {charmap.Windows1256, "windows-1256"},
+- "cp1257": {charmap.Windows1257, "windows-1257"},
+- "windows-1257": {charmap.Windows1257, "windows-1257"},
+- "x-cp1257": {charmap.Windows1257, "windows-1257"},
+- "cp1258": {charmap.Windows1258, "windows-1258"},
+- "windows-1258": {charmap.Windows1258, "windows-1258"},
+- "x-cp1258": {charmap.Windows1258, "windows-1258"},
+- "x-mac-cyrillic": {charmap.MacintoshCyrillic, "x-mac-cyrillic"},
+- "x-mac-ukrainian": {charmap.MacintoshCyrillic, "x-mac-cyrillic"},
+- "chinese": {simplifiedchinese.GBK, "gbk"},
+- "csgb2312": {simplifiedchinese.GBK, "gbk"},
+- "csiso58gb231280": {simplifiedchinese.GBK, "gbk"},
+- "gb2312": {simplifiedchinese.GBK, "gbk"},
+- "gb_2312": {simplifiedchinese.GBK, "gbk"},
+- "gb_2312-80": {simplifiedchinese.GBK, "gbk"},
+- "gbk": {simplifiedchinese.GBK, "gbk"},
+- "iso-ir-58": {simplifiedchinese.GBK, "gbk"},
+- "x-gbk": {simplifiedchinese.GBK, "gbk"},
+- "gb18030": {simplifiedchinese.GB18030, "gb18030"},
+- "hz-gb-2312": {simplifiedchinese.HZGB2312, "hz-gb-2312"},
+- "big5": {traditionalchinese.Big5, "big5"},
+- "big5-hkscs": {traditionalchinese.Big5, "big5"},
+- "cn-big5": {traditionalchinese.Big5, "big5"},
+- "csbig5": {traditionalchinese.Big5, "big5"},
+- "x-x-big5": {traditionalchinese.Big5, "big5"},
+- "cseucpkdfmtjapanese": {japanese.EUCJP, "euc-jp"},
+- "euc-jp": {japanese.EUCJP, "euc-jp"},
+- "x-euc-jp": {japanese.EUCJP, "euc-jp"},
+- "csiso2022jp": {japanese.ISO2022JP, "iso-2022-jp"},
+- "iso-2022-jp": {japanese.ISO2022JP, "iso-2022-jp"},
+- "csshiftjis": {japanese.ShiftJIS, "shift_jis"},
+- "ms_kanji": {japanese.ShiftJIS, "shift_jis"},
+- "shift-jis": {japanese.ShiftJIS, "shift_jis"},
+- "shift_jis": {japanese.ShiftJIS, "shift_jis"},
+- "sjis": {japanese.ShiftJIS, "shift_jis"},
+- "windows-31j": {japanese.ShiftJIS, "shift_jis"},
+- "x-sjis": {japanese.ShiftJIS, "shift_jis"},
+- "cseuckr": {korean.EUCKR, "euc-kr"},
+- "csksc56011987": {korean.EUCKR, "euc-kr"},
+- "euc-kr": {korean.EUCKR, "euc-kr"},
+- "iso-ir-149": {korean.EUCKR, "euc-kr"},
+- "korean": {korean.EUCKR, "euc-kr"},
+- "ks_c_5601-1987": {korean.EUCKR, "euc-kr"},
+- "ks_c_5601-1989": {korean.EUCKR, "euc-kr"},
+- "ksc5601": {korean.EUCKR, "euc-kr"},
+- "ksc_5601": {korean.EUCKR, "euc-kr"},
+- "windows-949": {korean.EUCKR, "euc-kr"},
+- "csiso2022kr": {encoding.Replacement, "replacement"},
+- "iso-2022-kr": {encoding.Replacement, "replacement"},
+- "iso-2022-cn": {encoding.Replacement, "replacement"},
+- "iso-2022-cn-ext": {encoding.Replacement, "replacement"},
+- "utf-16be": {unicode.UTF16(unicode.BigEndian, unicode.IgnoreBOM), "utf-16be"},
+- "utf-16": {unicode.UTF16(unicode.LittleEndian, unicode.IgnoreBOM), "utf-16le"},
+- "utf-16le": {unicode.UTF16(unicode.LittleEndian, unicode.IgnoreBOM), "utf-16le"},
+- "x-user-defined": {charmap.XUserDefined, "x-user-defined"},
-}
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/HTTP-charset.html b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/HTTP-charset.html
+deleted file mode 100644
+index 9915fa0..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/HTTP-charset.html
++++ /dev/null
+@@ -1,48 +0,0 @@
+-<!DOCTYPE html>
+-<html lang="en" >
+-<head>
+- <title>HTTP charset</title>
+-<link rel='author' title='Richard Ishida' href='mailto:ishida at w3.org'>
+-<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
+-<link rel="stylesheet" type="text/css" href="./generatedtests.css">
+-<script src="http://w3c-test.org/resources/testharness.js"></script>
+-<script src="http://w3c-test.org/resources/testharnessreport.js"></script>
+-<meta name='flags' content='http'>
+-<meta name="assert" content="The character encoding of a page can be set using the HTTP header charset declaration.">
+-<style type='text/css'>
+-.test div { width: 50px; }</style>
+-<link rel="stylesheet" type="text/css" href="the-input-byte-stream/support/encodingtests-15.css">
+-</head>
+-<body>
+-<p class='title'>HTTP charset</p>
-
--func (i *int8Value) Set(s string) error {
-- v, err := strconv.ParseInt(s, 0, 8)
-- *i = int8Value(v)
-- return err
--}
-
--func (i *int8Value) Type() string {
-- return "int8"
--}
+-<div id='log'></div>
-
--func (i *int8Value) String() string { return fmt.Sprintf("%v", *i) }
-
--// Int8Var defines an int8 flag with specified name, default value, and usage string.
--// The argument p points to an int8 variable in which to store the value of the flag.
--func (f *FlagSet) Int8Var(p *int8, name string, value int8, usage string) {
-- f.VarP(newInt8Value(value, p), name, "", usage)
--}
+-<div class='test'><div id='box' class='ýäè'> </div></div>
-
--// Like Int8Var, but accepts a shorthand letter that can be used after a single dash.
--func (f *FlagSet) Int8VarP(p *int8, name, shorthand string, value int8, usage string) {
-- f.VarP(newInt8Value(value, p), name, shorthand, usage)
--}
-
--// Int8Var defines an int8 flag with specified name, default value, and usage string.
--// The argument p points to an int8 variable in which to store the value of the flag.
--func Int8Var(p *int8, name string, value int8, usage string) {
-- CommandLine.VarP(newInt8Value(value, p), name, "", usage)
--}
-
--// Like Int8Var, but accepts a shorthand letter that can be used after a single dash.
--func Int8VarP(p *int8, name, shorthand string, value int8, usage string) {
-- CommandLine.VarP(newInt8Value(value, p), name, shorthand, usage)
--}
-
--// Int8 defines an int8 flag with specified name, default value, and usage string.
--// The return value is the address of an int8 variable that stores the value of the flag.
--func (f *FlagSet) Int8(name string, value int8, usage string) *int8 {
-- p := new(int8)
-- f.Int8VarP(p, name, "", value, usage)
-- return p
--}
-
--// Like Int8, but accepts a shorthand letter that can be used after a single dash.
--func (f *FlagSet) Int8P(name, shorthand string, value int8, usage string) *int8 {
-- p := new(int8)
-- f.Int8VarP(p, name, shorthand, value, usage)
-- return p
--}
+-<div class='description'>
+-<p class="assertion" title="Assertion">The character encoding of a page can be set using the HTTP header charset declaration.</p>
+-<div class="notes"><p><p>The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector <code>.test div.ÜÀÚ</code>. This matches the sequence of bytes above when they are interpreted as ISO 8859-15. If the class name matches the selector then the test will pass.</p><p>The only character encoding declaration for this HTML file is in the HTTP header, which sets the encoding to ISO 8859-15.</p></p>
+-</div>
+-</div>
+-<div class="nexttest"><div><a href="generate?test=the-input-byte-stream-003">Next test</a></div><div class="doctype">HTML5</div>
+-<p class="jump">the-input-byte-stream-001<br /><a href="/International/tests/html5/the-input-byte-stream/results-basics#basics" target="_blank">Result summary & related tests</a><br /><a href="http://w3c-test.org/framework/details/i18n-html5/the-input-byte-stream-001" target="_blank">Detailed results for this test</a><br/> <a href="http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream" target="_blank">Link to spec</a></p>
+-<div class='prereq'>Assumptions: <ul><li>The default encoding for the browser you are testing is not set to ISO 8859-15.</li>
+- <li>The test is read from a server that supports HTTP.</li></ul></div>
+-</div>
+-<script>
+-test(function() {
+-assert_equals(document.getElementById('box').offsetWidth, 100);
+-}, " ");
+-</script>
-
--// Int8 defines an int8 flag with specified name, default value, and usage string.
--// The return value is the address of an int8 variable that stores the value of the flag.
--func Int8(name string, value int8, usage string) *int8 {
-- return CommandLine.Int8P(name, "", value, usage)
--}
+-</body>
+-</html>
-
--// Like Int8, but accepts a shorthand letter that can be used after a single dash.
--func Int8P(name, shorthand string, value int8, usage string) *int8 {
-- return CommandLine.Int8P(name, shorthand, value, usage)
--}
-diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/ip.go b/Godeps/_workspace/src/github.com/spf13/pflag/ip.go
+-
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/HTTP-vs-UTF-8-BOM.html b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/HTTP-vs-UTF-8-BOM.html
deleted file mode 100644
-index 9d53bd3..0000000
---- a/Godeps/_workspace/src/github.com/spf13/pflag/ip.go
+index 26e5d8b..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/HTTP-vs-UTF-8-BOM.html
+++ /dev/null
-@@ -1,79 +0,0 @@
--package pflag
--
--import (
-- "fmt"
-- "net"
--)
--
--// -- net.IP value
--type ipValue net.IP
+@@ -1,48 +0,0 @@
+-<!DOCTYPE html>
+-<html lang="en" >
+-<head>
+- <title>HTTP vs UTF-8 BOM</title>
+-<link rel='author' title='Richard Ishida' href='mailto:ishida at w3.org'>
+-<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
+-<link rel="stylesheet" type="text/css" href="./generatedtests.css">
+-<script src="http://w3c-test.org/resources/testharness.js"></script>
+-<script src="http://w3c-test.org/resources/testharnessreport.js"></script>
+-<meta name='flags' content='http'>
+-<meta name="assert" content="A character encoding set in the HTTP header has lower precedence than the UTF-8 signature.">
+-<style type='text/css'>
+-.test div { width: 50px; }</style>
+-<link rel="stylesheet" type="text/css" href="the-input-byte-stream/support/encodingtests-utf8.css">
+-</head>
+-<body>
+-<p class='title'>HTTP vs UTF-8 BOM</p>
-
--func newIPValue(val net.IP, p *net.IP) *ipValue {
-- *p = val
-- return (*ipValue)(p)
--}
-
--func (i *ipValue) String() string { return net.IP(*i).String() }
--func (i *ipValue) Set(s string) error {
-- ip := net.ParseIP(s)
-- if ip == nil {
-- return fmt.Errorf("failed to parse IP: %q", s)
-- }
-- *i = ipValue(ip)
-- return nil
--}
--func (i *ipValue) Get() interface{} {
-- return net.IP(*i)
--}
+-<div id='log'></div>
-
--func (i *ipValue) Type() string {
-- return "ip"
--}
-
--// IPVar defines an net.IP flag with specified name, default value, and usage string.
--// The argument p points to an net.IP variable in which to store the value of the flag.
--func (f *FlagSet) IPVar(p *net.IP, name string, value net.IP, usage string) {
-- f.VarP(newIPValue(value, p), name, "", usage)
--}
+-<div class='test'><div id='box' class='ýäè'> </div></div>
-
--// Like IPVar, but accepts a shorthand letter that can be used after a single dash.
--func (f *FlagSet) IPVarP(p *net.IP, name, shorthand string, value net.IP, usage string) {
-- f.VarP(newIPValue(value, p), name, shorthand, usage)
--}
-
--// IPVar defines an net.IP flag with specified name, default value, and usage string.
--// The argument p points to an net.IP variable in which to store the value of the flag.
--func IPVar(p *net.IP, name string, value net.IP, usage string) {
-- CommandLine.VarP(newIPValue(value, p), name, "", usage)
--}
-
--// Like IPVar, but accepts a shorthand letter that can be used after a single dash.
--func IPVarP(p *net.IP, name, shorthand string, value net.IP, usage string) {
-- CommandLine.VarP(newIPValue(value, p), name, shorthand, usage)
--}
-
--// IP defines an net.IP flag with specified name, default value, and usage string.
--// The return value is the address of an net.IP variable that stores the value of the flag.
--func (f *FlagSet) IP(name string, value net.IP, usage string) *net.IP {
-- p := new(net.IP)
-- f.IPVarP(p, name, "", value, usage)
-- return p
--}
-
--// Like IP, but accepts a shorthand letter that can be used after a single dash.
--func (f *FlagSet) IPP(name, shorthand string, value net.IP, usage string) *net.IP {
-- p := new(net.IP)
-- f.IPVarP(p, name, shorthand, value, usage)
-- return p
--}
+-<div class='description'>
+-<p class="assertion" title="Assertion">A character encoding set in the HTTP header has lower precedence than the UTF-8 signature.</p>
+-<div class="notes"><p><p>The HTTP header attempts to set the character encoding to ISO 8859-15. The page starts with a UTF-8 signature.</p><p>The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector <code>.test div.ýäè</code>. This matches the sequence of bytes above when they are interpreted as UTF-8. If the class name matches the selector then the test will pass.</p><p>If the test is unsuccessful, the characters  should appear at the top of the page. These represent the bytes that make up the UTF-8 signature when encountered in the ISO 8859-15 encoding.</p></p>
+-</div>
+-</div>
+-<div class="nexttest"><div><a href="generate?test=the-input-byte-stream-022">Next test</a></div><div class="doctype">HTML5</div>
+-<p class="jump">the-input-byte-stream-034<br /><a href="/International/tests/html5/the-input-byte-stream/results-basics#precedence" target="_blank">Result summary & related tests</a><br /><a href="http://w3c-test.org/framework/details/i18n-html5/the-input-byte-stream-034" target="_blank">Detailed results for this test</a><br/> <a href="http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream" target="_blank">Link to spec</a></p>
+-<div class='prereq'>Assumptions: <ul><li>The default encoding for the browser you are testing is not set to ISO 8859-15.</li>
+- <li>The test is read from a server that supports HTTP.</li></ul></div>
+-</div>
+-<script>
+-test(function() {
+-assert_equals(document.getElementById('box').offsetWidth, 100);
+-}, " ");
+-</script>
-
--// IP defines an net.IP flag with specified name, default value, and usage string.
--// The return value is the address of an net.IP variable that stores the value of the flag.
--func IP(name string, value net.IP, usage string) *net.IP {
-- return CommandLine.IPP(name, "", value, usage)
--}
+-</body>
+-</html>
-
--// Like IP, but accepts a shorthand letter that can be used after a single dash.
--func IPP(name, shorthand string, value net.IP, usage string) *net.IP {
-- return CommandLine.IPP(name, shorthand, value, usage)
--}
-diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/ipmask.go b/Godeps/_workspace/src/github.com/spf13/pflag/ipmask.go
+-
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/HTTP-vs-meta-charset.html b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/HTTP-vs-meta-charset.html
deleted file mode 100644
-index 6f85be9..0000000
---- a/Godeps/_workspace/src/github.com/spf13/pflag/ipmask.go
+index 2f07e95..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/HTTP-vs-meta-charset.html
+++ /dev/null
-@@ -1,89 +0,0 @@
--package pflag
--
--import (
-- "fmt"
-- "net"
--)
--
--// -- net.IPMask value
--type ipMaskValue net.IPMask
+@@ -1,49 +0,0 @@
+-<!DOCTYPE html>
+-<html lang="en" >
+-<head>
+- <meta charset="iso-8859-1" > <title>HTTP vs meta charset</title>
+-<link rel='author' title='Richard Ishida' href='mailto:ishida at w3.org'>
+-<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
+-<link rel="stylesheet" type="text/css" href="./generatedtests.css">
+-<script src="http://w3c-test.org/resources/testharness.js"></script>
+-<script src="http://w3c-test.org/resources/testharnessreport.js"></script>
+-<meta name='flags' content='http'>
+-<meta name="assert" content="The HTTP header has a higher precedence than an encoding declaration in a meta charset attribute.">
+-<style type='text/css'>
+-.test div { width: 50px; }.test div { width: 90px; }
+-</style>
+-<link rel="stylesheet" type="text/css" href="the-input-byte-stream/support/encodingtests-15.css">
+-</head>
+-<body>
+-<p class='title'>HTTP vs meta charset</p>
-
--func newIPMaskValue(val net.IPMask, p *net.IPMask) *ipMaskValue {
-- *p = val
-- return (*ipMaskValue)(p)
--}
-
--func (i *ipMaskValue) String() string { return net.IPMask(*i).String() }
--func (i *ipMaskValue) Set(s string) error {
-- ip := ParseIPv4Mask(s)
-- if ip == nil {
-- return fmt.Errorf("failed to parse IP mask: %q", s)
-- }
-- *i = ipMaskValue(ip)
-- return nil
--}
--func (i *ipMaskValue) Get() interface{} {
-- return net.IPMask(*i)
--}
+-<div id='log'></div>
-
--func (i *ipMaskValue) Type() string {
-- return "ipMask"
--}
-
--// Parse IPv4 netmask written in IP form (e.g. 255.255.255.0).
--// This function should really belong to the net package.
--func ParseIPv4Mask(s string) net.IPMask {
-- mask := net.ParseIP(s)
-- if mask == nil {
-- return nil
-- }
-- return net.IPv4Mask(mask[12], mask[13], mask[14], mask[15])
--}
+-<div class='test'><div id='box' class='ýäè'> </div></div>
-
--// IPMaskVar defines an net.IPMask flag with specified name, default value, and usage string.
--// The argument p points to an net.IPMask variable in which to store the value of the flag.
--func (f *FlagSet) IPMaskVar(p *net.IPMask, name string, value net.IPMask, usage string) {
-- f.VarP(newIPMaskValue(value, p), name, "", usage)
--}
-
--// Like IPMaskVar, but accepts a shorthand letter that can be used after a single dash.
--func (f *FlagSet) IPMaskVarP(p *net.IPMask, name, shorthand string, value net.IPMask, usage string) {
-- f.VarP(newIPMaskValue(value, p), name, shorthand, usage)
--}
-
--// IPMaskVar defines an net.IPMask flag with specified name, default value, and usage string.
--// The argument p points to an net.IPMask variable in which to store the value of the flag.
--func IPMaskVar(p *net.IPMask, name string, value net.IPMask, usage string) {
-- CommandLine.VarP(newIPMaskValue(value, p), name, "", usage)
--}
-
--// Like IPMaskVar, but accepts a shorthand letter that can be used after a single dash.
--func IPMaskVarP(p *net.IPMask, name, shorthand string, value net.IPMask, usage string) {
-- CommandLine.VarP(newIPMaskValue(value, p), name, shorthand, usage)
--}
-
--// IPMask defines an net.IPMask flag with specified name, default value, and usage string.
--// The return value is the address of an net.IPMask variable that stores the value of the flag.
--func (f *FlagSet) IPMask(name string, value net.IPMask, usage string) *net.IPMask {
-- p := new(net.IPMask)
-- f.IPMaskVarP(p, name, "", value, usage)
-- return p
--}
+-<div class='description'>
+-<p class="assertion" title="Assertion">The HTTP header has a higher precedence than an encoding declaration in a meta charset attribute.</p>
+-<div class="notes"><p><p>The HTTP header attempts to set the character encoding to ISO 8859-15. The page contains an encoding declaration in a meta charset attribute that attempts to set the character encoding to ISO 8859-1.</p><p>The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector <code>.test div.ÜÀÚ</code>. This matches the sequence of bytes above when they are interpreted as ISO 8859-15. If the class name matches the selector then the test will pass.</p></p>
+-</div>
+-</div>
+-<div class="nexttest"><div><a href="generate?test=the-input-byte-stream-037">Next test</a></div><div class="doctype">HTML5</div>
+-<p class="jump">the-input-byte-stream-018<br /><a href="/International/tests/html5/the-input-byte-stream/results-basics#precedence" target="_blank">Result summary & related tests</a><br /><a href="http://w3c-test.org/framework/details/i18n-html5/the-input-byte-stream-018" target="_blank">Detailed results for this test</a><br/> <a href="http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream" target="_blank">Link to spec</a></p>
+-<div class='prereq'>Assumptions: <ul><li>The default encoding for the browser you are testing is not set to ISO 8859-15.</li>
+- <li>The test is read from a server that supports HTTP.</li></ul></div>
+-</div>
+-<script>
+-test(function() {
+-assert_equals(document.getElementById('box').offsetWidth, 100);
+-}, " ");
+-</script>
-
--// Like IPMask, but accepts a shorthand letter that can be used after a single dash.
--func (f *FlagSet) IPMaskP(name, shorthand string, value net.IPMask, usage string) *net.IPMask {
-- p := new(net.IPMask)
-- f.IPMaskVarP(p, name, shorthand, value, usage)
-- return p
--}
+-</body>
+-</html>
-
--// IPMask defines an net.IPMask flag with specified name, default value, and usage string.
--// The return value is the address of an net.IPMask variable that stores the value of the flag.
--func IPMask(name string, value net.IPMask, usage string) *net.IPMask {
-- return CommandLine.IPMaskP(name, "", value, usage)
--}
-
--// Like IP, but accepts a shorthand letter that can be used after a single dash.
--func IPMaskP(name, shorthand string, value net.IPMask, usage string) *net.IPMask {
-- return CommandLine.IPMaskP(name, shorthand, value, usage)
--}
-diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/string.go b/Godeps/_workspace/src/github.com/spf13/pflag/string.go
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/HTTP-vs-meta-content.html b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/HTTP-vs-meta-content.html
deleted file mode 100644
-index 362fbf8..0000000
---- a/Godeps/_workspace/src/github.com/spf13/pflag/string.go
+index 6853cdd..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/HTTP-vs-meta-content.html
+++ /dev/null
-@@ -1,69 +0,0 @@
--package pflag
--
--import "fmt"
+@@ -1,49 +0,0 @@
+-<!DOCTYPE html>
+-<html lang="en" >
+-<head>
+- <meta http-equiv="content-type" content="text/html;charset=iso-8859-1" > <title>HTTP vs meta content</title>
+-<link rel='author' title='Richard Ishida' href='mailto:ishida at w3.org'>
+-<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
+-<link rel="stylesheet" type="text/css" href="./generatedtests.css">
+-<script src="http://w3c-test.org/resources/testharness.js"></script>
+-<script src="http://w3c-test.org/resources/testharnessreport.js"></script>
+-<meta name='flags' content='http'>
+-<meta name="assert" content="The HTTP header has a higher precedence than an encoding declaration in a meta content attribute.">
+-<style type='text/css'>
+-.test div { width: 50px; }.test div { width: 90px; }
+-</style>
+-<link rel="stylesheet" type="text/css" href="the-input-byte-stream/support/encodingtests-15.css">
+-</head>
+-<body>
+-<p class='title'>HTTP vs meta content</p>
-
--// -- string Value
--type stringValue string
-
--func newStringValue(val string, p *string) *stringValue {
-- *p = val
-- return (*stringValue)(p)
--}
+-<div id='log'></div>
-
--func (s *stringValue) Set(val string) error {
-- *s = stringValue(val)
-- return nil
--}
--func (s *stringValue) Type() string {
-- return "string"
--}
-
--func (s *stringValue) String() string { return fmt.Sprintf("%s", *s) }
+-<div class='test'><div id='box' class='ýäè'> </div></div>
-
--// StringVar defines a string flag with specified name, default value, and usage string.
--// The argument p points to a string variable in which to store the value of the flag.
--func (f *FlagSet) StringVar(p *string, name string, value string, usage string) {
-- f.VarP(newStringValue(value, p), name, "", usage)
--}
-
--// Like StringVar, but accepts a shorthand letter that can be used after a single dash.
--func (f *FlagSet) StringVarP(p *string, name, shorthand string, value string, usage string) {
-- f.VarP(newStringValue(value, p), name, shorthand, usage)
--}
-
--// StringVar defines a string flag with specified name, default value, and usage string.
--// The argument p points to a string variable in which to store the value of the flag.
--func StringVar(p *string, name string, value string, usage string) {
-- CommandLine.VarP(newStringValue(value, p), name, "", usage)
--}
-
--// Like StringVar, but accepts a shorthand letter that can be used after a single dash.
--func StringVarP(p *string, name, shorthand string, value string, usage string) {
-- CommandLine.VarP(newStringValue(value, p), name, shorthand, usage)
--}
-
--// String defines a string flag with specified name, default value, and usage string.
--// The return value is the address of a string variable that stores the value of the flag.
--func (f *FlagSet) String(name string, value string, usage string) *string {
-- p := new(string)
-- f.StringVarP(p, name, "", value, usage)
-- return p
--}
+-<div class='description'>
+-<p class="assertion" title="Assertion">The HTTP header has a higher precedence than an encoding declaration in a meta content attribute.</p>
+-<div class="notes"><p><p>The HTTP header attempts to set the character encoding to ISO 8859-15. The page contains an encoding declaration in a meta content attribute that attempts to set the character encoding to ISO 8859-1.</p><p>The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector <code>.test div.ÜÀÚ</code>. This matches the sequence of bytes above when they are interpreted as ISO 8859-15. If the class name matches the selector then the test will pass.</p></p>
+-</div>
+-</div>
+-<div class="nexttest"><div><a href="generate?test=the-input-byte-stream-018">Next test</a></div><div class="doctype">HTML5</div>
+-<p class="jump">the-input-byte-stream-016<br /><a href="/International/tests/html5/the-input-byte-stream/results-basics#precedence" target="_blank">Result summary & related tests</a><br /><a href="http://w3c-test.org/framework/details/i18n-html5/the-input-byte-stream-016" target="_blank">Detailed results for this test</a><br/> <a href="http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream" target="_blank">Link to spec</a></p>
+-<div class='prereq'>Assumptions: <ul><li>The default encoding for the browser you are testing is not set to ISO 8859-15.</li>
+- <li>The test is read from a server that supports HTTP.</li></ul></div>
+-</div>
+-<script>
+-test(function() {
+-assert_equals(document.getElementById('box').offsetWidth, 100);
+-}, " ");
+-</script>
-
--// Like String, but accepts a shorthand letter that can be used after a single dash.
--func (f *FlagSet) StringP(name, shorthand string, value string, usage string) *string {
-- p := new(string)
-- f.StringVarP(p, name, shorthand, value, usage)
-- return p
--}
+-</body>
+-</html>
-
--// String defines a string flag with specified name, default value, and usage string.
--// The return value is the address of a string variable that stores the value of the flag.
--func String(name string, value string, usage string) *string {
-- return CommandLine.StringP(name, "", value, usage)
--}
-
--// Like String, but accepts a shorthand letter that can be used after a single dash.
--func StringP(name, shorthand string, value string, usage string) *string {
-- return CommandLine.StringP(name, shorthand, value, usage)
--}
-diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/uint.go b/Godeps/_workspace/src/github.com/spf13/pflag/uint.go
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/No-encoding-declaration.html b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/No-encoding-declaration.html
deleted file mode 100644
-index c063fe7..0000000
---- a/Godeps/_workspace/src/github.com/spf13/pflag/uint.go
+index 612e26c..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/No-encoding-declaration.html
+++ /dev/null
-@@ -1,74 +0,0 @@
--package pflag
--
--import (
-- "fmt"
-- "strconv"
--)
--
--// -- uint Value
--type uintValue uint
+@@ -1,47 +0,0 @@
+-<!DOCTYPE html>
+-<html lang="en" >
+-<head>
+- <title>No encoding declaration</title>
+-<link rel='author' title='Richard Ishida' href='mailto:ishida at w3.org'>
+-<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
+-<link rel="stylesheet" type="text/css" href="./generatedtests.css">
+-<script src="http://w3c-test.org/resources/testharness.js"></script>
+-<script src="http://w3c-test.org/resources/testharnessreport.js"></script>
+-<meta name='flags' content='http'>
+-<meta name="assert" content="A page with no encoding information in HTTP, BOM, XML declaration or meta element will be treated as UTF-8.">
+-<style type='text/css'>
+-.test div { width: 50px; }</style>
+-<link rel="stylesheet" type="text/css" href="the-input-byte-stream/support/encodingtests-utf8.css">
+-</head>
+-<body>
+-<p class='title'>No encoding declaration</p>
-
--func newUintValue(val uint, p *uint) *uintValue {
-- *p = val
-- return (*uintValue)(p)
--}
-
--func (i *uintValue) Set(s string) error {
-- v, err := strconv.ParseUint(s, 0, 64)
-- *i = uintValue(v)
-- return err
--}
+-<div id='log'></div>
-
--func (i *uintValue) Type() string {
-- return "uint"
--}
-
--func (i *uintValue) String() string { return fmt.Sprintf("%v", *i) }
+-<div class='test'><div id='box' class='ýäè'> </div></div>
-
--// UintVar defines a uint flag with specified name, default value, and usage string.
--// The argument p points to a uint variable in which to store the value of the flag.
--func (f *FlagSet) UintVar(p *uint, name string, value uint, usage string) {
-- f.VarP(newUintValue(value, p), name, "", usage)
--}
-
--// Like UintVar, but accepts a shorthand letter that can be used after a single dash.
--func (f *FlagSet) UintVarP(p *uint, name, shorthand string, value uint, usage string) {
-- f.VarP(newUintValue(value, p), name, shorthand, usage)
--}
-
--// UintVar defines a uint flag with specified name, default value, and usage string.
--// The argument p points to a uint variable in which to store the value of the flag.
--func UintVar(p *uint, name string, value uint, usage string) {
-- CommandLine.VarP(newUintValue(value, p), name, "", usage)
--}
-
--// Like UintVar, but accepts a shorthand letter that can be used after a single dash.
--func UintVarP(p *uint, name, shorthand string, value uint, usage string) {
-- CommandLine.VarP(newUintValue(value, p), name, shorthand, usage)
--}
-
--// Uint defines a uint flag with specified name, default value, and usage string.
--// The return value is the address of a uint variable that stores the value of the flag.
--func (f *FlagSet) Uint(name string, value uint, usage string) *uint {
-- p := new(uint)
-- f.UintVarP(p, name, "", value, usage)
-- return p
--}
+-<div class='description'>
+-<p class="assertion" title="Assertion">A page with no encoding information in HTTP, BOM, XML declaration or meta element will be treated as UTF-8.</p>
+-<div class="notes"><p><p>The test on this page contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector <code>.test div.ýäè</code>. This matches the sequence of bytes above when they are interpreted as UTF-8. If the class name matches the selector then the test will pass.</p></p>
+-</div>
+-</div>
+-<div class="nexttest"><div><a href="generate?test=the-input-byte-stream-034">Next test</a></div><div class="doctype">HTML5</div>
+-<p class="jump">the-input-byte-stream-015<br /><a href="/International/tests/html5/the-input-byte-stream/results-basics#basics" target="_blank">Result summary & related tests</a><br /><a href="http://w3c-test.org/framework/details/i18n-html5/the-input-byte-stream-015" target="_blank">Detailed results for this test</a><br/> <a href="http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream" target="_blank">Link to spec</a></p>
+-<div class='prereq'>Assumptions: <ul><li>The test is read from a server that supports HTTP.</li></ul></div>
+-</div>
+-<script>
+-test(function() {
+-assert_equals(document.getElementById('box').offsetWidth, 100);
+-}, " ");
+-</script>
-
--// Like Uint, but accepts a shorthand letter that can be used after a single dash.
--func (f *FlagSet) UintP(name, shorthand string, value uint, usage string) *uint {
-- p := new(uint)
-- f.UintVarP(p, name, shorthand, value, usage)
-- return p
--}
+-</body>
+-</html>
-
--// Uint defines a uint flag with specified name, default value, and usage string.
--// The return value is the address of a uint variable that stores the value of the flag.
--func Uint(name string, value uint, usage string) *uint {
-- return CommandLine.UintP(name, "", value, usage)
--}
-
--// Like Uint, but accepts a shorthand letter that can be used after a single dash.
--func UintP(name, shorthand string, value uint, usage string) *uint {
-- return CommandLine.UintP(name, shorthand, value, usage)
--}
-diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/uint16.go b/Godeps/_workspace/src/github.com/spf13/pflag/uint16.go
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/README b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/README
deleted file mode 100644
-index ec14ab0..0000000
---- a/Godeps/_workspace/src/github.com/spf13/pflag/uint16.go
+index a8e1fa4..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/README
+++ /dev/null
-@@ -1,76 +0,0 @@
--package pflag
--
--import (
-- "fmt"
-- "strconv"
--)
+@@ -1 +0,0 @@
+-These test cases come from http://www.w3.org/International/tests/html5/the-input-byte-stream/results-basics
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/UTF-16BE-BOM.html b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/UTF-16BE-BOM.html
+deleted file mode 100644
+index 3abf7a9343c20518e57dfea58b374fb0f4fb58a1..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 2670
+zcmcJR?QRoS5Qc}JAoU&=BQ-(7b^;2j8i*i3RV1JlO@;VXIsPurV!WHiDdLW}i`*CO
+z^UnC>tih=KsVr;H&Y7?C&O3AV(?534uG?e##U9y_y|!QNi4``n+D>d{2lky^LnFNx
+z?9HrarH$>rwQR_$g)Hk0*&STI*EYq|47~&U9sfUB+ji})9eR{QqCUra7oDsZ5obtB
+zdxP%<)-$4Q;rSHJiM>U(#ZI=;?n^BC?Dp6lu=~_1-lnX3u03&2BlmQIY>L+!Uq7<S
+znh)&E?pViTjIm26+mz45Gn;?mU1-%d$8(q8ng2R#e!F1tlD&lM9_z}^IdM&9OX8=U
+z8%PwVO_n7-g+SYm(XCxt at f1Qm>XoytKw^Q#oZSM?3*J?)&ojG&yzQRkC!M<M9xE_7
+zb;}_hR3kl=jSw#Vt-|I{q%Ck#9h-3za!uL)n~QLmd*yVN|H|tGZJ}Lo7NIwEW{jNQ
+zV@@K5_3@^fi08HMCj^^V*Hl9s7bDNfAUw%xiKL5{%KZf*9rq_B3%EJ8zj(gqf5v)%
+zbOLV*+p`@!Ep4CmhgBB}-xMo+eXUno4NY--$glQJ%^9|ktY at fB&Rr7SEd-RMIzBO=
+z at -E&3<2aeBADM{J>l5JE?ax;lp_NYEcdUht`ZswOviB~L5hmJ|pXI71nn20w;>vG!
+zQGB$EE9&wC``&J#_Ym~<oskhM*qPSKA~LzoN!pzH1>PgRu-Bd>1!pOp0||k`kr=VJ
+zfH6I6rmRaeHA7U-A^OTsT+|d2a^i(>DePzZ{)ibXoCBvJnuYrd-3kkN$u<La`*flh
+zDi+>y{qQK;=*Y;S87ro12aTgu^i*%f8zC3>a}9DIe4cfxOzsCw&(cqvP9{ud{N6f`
+z#TNDY(B6 at Gpr|uN+%&x^XZjBHdc at 2vsM(Tyc2=vshHQ5w+obmp>tuWT(t4BTUGAQw
+zxeI$UGSLUBg=WFbF;4f at 4=^P2AgY at CFn8A`bcC=_&~)fiDe)#cUARRBzJ^k|%X)69
+z+{Cb`wq}Rsg%B62CC_tK!AV(W{(MV?#mndR46CU#BUN<{8e?*oT+!pE5wF#O#TR#a
+z$9qRT)tpbw8zAI~QQJg2C3|6$I%(T(;`zOMy6SO+&;pG=c#2P|P-WZn$$DpWJlC3U
+z3*nvm<q%|^qPyLgA~&hNxH!U(CgUrj$Lv*i?ZToRve;kc at WJ`8#Z)Pn$q5nRA5|>z
+zwP{u~r$L?-m3uqp9I1+#3yE|3M$(s-BE<Joa8PqdUta}ZQ2KUivf!ALM1?f7$7oIM
+sZ)BUR)d7uk!p%4L`mByQto|PReD2~`cUQB{U7yke at NV7*jW5Z60Z{<B#sB~S
+
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/UTF-16LE-BOM.html b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/UTF-16LE-BOM.html
+deleted file mode 100644
+index 76254c980c29954f1bbd96e145c79f64c43e3355..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 2682
+zcmcJR?QRoS5Qc}JMdBV7Bat9sI{^h%O^8Y;RgubvAPDiRa{S#oi<{jL2gDuqE^=SM
+z^UnC>tih=LQ>`qYoiktOop<K!=TCcf-F~rW_RtRPjXk$VR at lU9JGPna+cmptdzbG8
+zdo$}<X=A%@EgQ0GA<KG0b_bX5wN3FfLvP<+;r~}_+qT`a-#y9!QJ>(wi%!;yh%+Rm
+z{e|xntY<{q!1F1Z6MKtngPm-p-4|H&+3m4AVE3_AyiHm6Tzlf4M(*ht*%YrezJ6kr
+zHGj4<yK5bfF~%;PY+XJR&uspUccE9?9M4^zGk-cOe!F1tg1v<E4(rO!IdM&93*x7p
+z8%PwVO_n7-g+SYm(5+os at h^mW)GKFOfy4<Gb9M_npYX1FeVy4|<ZbsPKk3w6_gI0!
+zsap>5pc?64*$Cm%-zseWMA`x;)v*~jA=i}szqts9xmQkS`M11|(H7bTXAycsXU53+
+zJ?120SRZeyiFjW7enPN`bxk$IaWV3o48oJF7D&2ysoY;6(s6%6vVfaYd&mC=erK!)
+zNGI^7upQgN)53OHe_VE<@J+G8*Y|p*)zB2Thdi}+YR<5QWHm!|a_*AoZXuv7)$xe|
+zm3Q$D7{|#}{m4X&UY!6(ZhyYi2(5JLzGE$H)W6BQklnjPMwn<<eiqA`XaXgx3wwFx
+z!u}~PtanA0H|+*`4?u6%85yyHooTHsB9rT!q|K?H;yvOEd+kY5aF)_JkPs*wi4l7z
+zFs6sily!-wW{B!JL|^%di<&}0PP`B<h5bg~A2MTwbKo>Yvv7Z*TVWwD*=E3QpH37*
+z#lqXJA0A~J9T_<^W5smspmDg2p6ac5Bjn<Ku0igDud_~-$^D?|S^A07$%M&_=dJTt
+zY*DWd?Qb#<6m_PEo2FOgOy8nj51F|IHCvF+)^fGekZmtz>+~LAoow%1TCdZ*$K8`O
+zw_$HaCi+0N&@7la#_7KL5r$+QL{)Pi=I&aDjt~|Knht#`CEi4*3%97i_fSfAS<fw%
+zn-~_=*6h%{5aL3$<o}#ia8j0;KmVn|;^h-=WmR6xNL8JK#+ckCSM<1P#A|h6v2v#$
+zaHn^?chpnO`P94t_OVibB~EP;@09$7PU at viyM@*V*V7k=p6Ga?P}?75Bwndfm2J{5
+zs~ytuoNMwC?x}AMK<F{Ln~iC5i;Ts|5q>lwUz0=3V0GCxY}z81UC-nP=CGt2OqYV$
+zoRCo+qM9YX*3FFORLC=<a&JeRBULkVB5_aOO8Vkbg!qmME@~d>E3B~S at +KROyk4r5
+yX7?DaslDfIebqXgC!KKp4IYy+W~X?ddE6o=`A+x#x0AK&6MF#W&AXxbRrv+SX}PNa
+
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/UTF-8-BOM-vs-meta-charset.html b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/UTF-8-BOM-vs-meta-charset.html
+deleted file mode 100644
+index 83de433..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/UTF-8-BOM-vs-meta-charset.html
++++ /dev/null
+@@ -1,49 +0,0 @@
+-<!DOCTYPE html>
+-<html lang="en" >
+-<head>
+- <meta charset="iso-8859-15"> <title>UTF-8 BOM vs meta charset</title>
+-<link rel='author' title='Richard Ishida' href='mailto:ishida at w3.org'>
+-<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
+-<link rel="stylesheet" type="text/css" href="./generatedtests.css">
+-<script src="http://w3c-test.org/resources/testharness.js"></script>
+-<script src="http://w3c-test.org/resources/testharnessreport.js"></script>
+-<meta name='flags' content='http'>
+-<meta name="assert" content="A page with a UTF-8 BOM will be recognized as UTF-8 even if the meta charset attribute declares a different encoding.">
+-<style type='text/css'>
+-.test div { width: 50px; }.test div { width: 90px; }
+-</style>
+-<link rel="stylesheet" type="text/css" href="the-input-byte-stream/support/encodingtests-utf8.css">
+-</head>
+-<body>
+-<p class='title'>UTF-8 BOM vs meta charset</p>
-
--// -- uint16 value
--type uint16Value uint16
-
--func newUint16Value(val uint16, p *uint16) *uint16Value {
-- *p = val
-- return (*uint16Value)(p)
--}
--func (i *uint16Value) String() string { return fmt.Sprintf("%d", *i) }
--func (i *uint16Value) Set(s string) error {
-- v, err := strconv.ParseUint(s, 0, 16)
-- *i = uint16Value(v)
-- return err
--}
+-<div id='log'></div>
-
--func (i *uint16Value) Get() interface{} {
-- return uint16(*i)
--}
-
--func (i *uint16Value) Type() string {
-- return "uint16"
--}
+-<div class='test'><div id='box' class='ýäè'> </div></div>
-
--// Uint16Var defines a uint flag with specified name, default value, and usage string.
--// The argument p points to a uint variable in which to store the value of the flag.
--func (f *FlagSet) Uint16Var(p *uint16, name string, value uint16, usage string) {
-- f.VarP(newUint16Value(value, p), name, "", usage)
--}
-
--// Like Uint16Var, but accepts a shorthand letter that can be used after a single dash.
--func (f *FlagSet) Uint16VarP(p *uint16, name, shorthand string, value uint16, usage string) {
-- f.VarP(newUint16Value(value, p), name, shorthand, usage)
--}
-
--// Uint16Var defines a uint flag with specified name, default value, and usage string.
--// The argument p points to a uint variable in which to store the value of the flag.
--func Uint16Var(p *uint16, name string, value uint16, usage string) {
-- CommandLine.VarP(newUint16Value(value, p), name, "", usage)
--}
-
--// Like Uint16Var, but accepts a shorthand letter that can be used after a single dash.
--func Uint16VarP(p *uint16, name, shorthand string, value uint16, usage string) {
-- CommandLine.VarP(newUint16Value(value, p), name, shorthand, usage)
--}
-
--// Uint16 defines a uint flag with specified name, default value, and usage string.
--// The return value is the address of a uint variable that stores the value of the flag.
--func (f *FlagSet) Uint16(name string, value uint16, usage string) *uint16 {
-- p := new(uint16)
-- f.Uint16VarP(p, name, "", value, usage)
-- return p
--}
+-<div class='description'>
+-<p class="assertion" title="Assertion">A page with a UTF-8 BOM will be recognized as UTF-8 even if the meta charset attribute declares a different encoding.</p>
+-<div class="notes"><p><p>The page contains an encoding declaration in a meta charset attribute that attempts to set the character encoding to ISO 8859-15, but the file starts with a UTF-8 signature.</p><p>The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector <code>.test div.ýäè</code>. This matches the sequence of bytes above when they are interpreted as UTF-8. If the class name matches the selector then the test will pass.</p></p>
+-</div>
+-</div>
+-<div class="nexttest"><div><a href="generate?test=the-input-byte-stream-024">Next test</a></div><div class="doctype">HTML5</div>
+-<p class="jump">the-input-byte-stream-038<br /><a href="/International/tests/html5/the-input-byte-stream/results-basics#precedence" target="_blank">Result summary & related tests</a><br /><a href="http://w3c-test.org/framework/details/i18n-html5/the-input-byte-stream-038" target="_blank">Detailed results for this test</a><br/> <a href="http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream" target="_blank">Link to spec</a></p>
+-<div class='prereq'>Assumptions: <ul><li>The default encoding for the browser you are testing is not set to ISO 8859-15.</li>
+- <li>The test is read from a server that supports HTTP.</li></ul></div>
+-</div>
+-<script>
+-test(function() {
+-assert_equals(document.getElementById('box').offsetWidth, 100);
+-}, " ");
+-</script>
-
--// Like Uint16, but accepts a shorthand letter that can be used after a single dash.
--func (f *FlagSet) Uint16P(name, shorthand string, value uint16, usage string) *uint16 {
-- p := new(uint16)
-- f.Uint16VarP(p, name, shorthand, value, usage)
-- return p
--}
+-</body>
+-</html>
-
--// Uint16 defines a uint flag with specified name, default value, and usage string.
--// The return value is the address of a uint variable that stores the value of the flag.
--func Uint16(name string, value uint16, usage string) *uint16 {
-- return CommandLine.Uint16P(name, "", value, usage)
--}
-
--// Like Uint16, but accepts a shorthand letter that can be used after a single dash.
--func Uint16P(name, shorthand string, value uint16, usage string) *uint16 {
-- return CommandLine.Uint16P(name, shorthand, value, usage)
--}
-diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/uint32.go b/Godeps/_workspace/src/github.com/spf13/pflag/uint32.go
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/UTF-8-BOM-vs-meta-content.html b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/UTF-8-BOM-vs-meta-content.html
deleted file mode 100644
-index 05bc3bd..0000000
---- a/Godeps/_workspace/src/github.com/spf13/pflag/uint32.go
+index 501aac2..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/UTF-8-BOM-vs-meta-content.html
+++ /dev/null
-@@ -1,75 +0,0 @@
--package pflag
+@@ -1,48 +0,0 @@
+-<!DOCTYPE html>
+-<html lang="en" >
+-<head>
+- <meta http-equiv="content-type" content="text/html; charset=iso-8859-15"> <title>UTF-8 BOM vs meta content</title>
+-<link rel='author' title='Richard Ishida' href='mailto:ishida at w3.org'>
+-<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
+-<link rel="stylesheet" type="text/css" href="./generatedtests.css">
+-<script src="http://w3c-test.org/resources/testharness.js"></script>
+-<script src="http://w3c-test.org/resources/testharnessreport.js"></script>
+-<meta name='flags' content='http'>
+-<meta name="assert" content="A page with a UTF-8 BOM will be recognized as UTF-8 even if the meta content attribute declares a different encoding.">
+-<style type='text/css'>
+-.test div { width: 50px; }</style>
+-<link rel="stylesheet" type="text/css" href="the-input-byte-stream/support/encodingtests-utf8.css">
+-</head>
+-<body>
+-<p class='title'>UTF-8 BOM vs meta content</p>
-
--import (
-- "fmt"
-- "strconv"
--)
-
--// -- uint16 value
--type uint32Value uint32
+-<div id='log'></div>
-
--func newUint32Value(val uint32, p *uint32) *uint32Value {
-- *p = val
-- return (*uint32Value)(p)
--}
--func (i *uint32Value) String() string { return fmt.Sprintf("%d", *i) }
--func (i *uint32Value) Set(s string) error {
-- v, err := strconv.ParseUint(s, 0, 32)
-- *i = uint32Value(v)
-- return err
--}
--func (i *uint32Value) Get() interface{} {
-- return uint32(*i)
--}
-
--func (i *uint32Value) Type() string {
-- return "uint32"
--}
+-<div class='test'><div id='box' class='ýäè'> </div></div>
-
--// Uint32Var defines a uint32 flag with specified name, default value, and usage string.
--// The argument p points to a uint32 variable in which to store the value of the flag.
--func (f *FlagSet) Uint32Var(p *uint32, name string, value uint32, usage string) {
-- f.VarP(newUint32Value(value, p), name, "", usage)
--}
-
--// Like Uint32Var, but accepts a shorthand letter that can be used after a single dash.
--func (f *FlagSet) Uint32VarP(p *uint32, name, shorthand string, value uint32, usage string) {
-- f.VarP(newUint32Value(value, p), name, shorthand, usage)
--}
-
--// Uint32Var defines a uint32 flag with specified name, default value, and usage string.
--// The argument p points to a uint32 variable in which to store the value of the flag.
--func Uint32Var(p *uint32, name string, value uint32, usage string) {
-- CommandLine.VarP(newUint32Value(value, p), name, "", usage)
--}
-
--// Like Uint32Var, but accepts a shorthand letter that can be used after a single dash.
--func Uint32VarP(p *uint32, name, shorthand string, value uint32, usage string) {
-- CommandLine.VarP(newUint32Value(value, p), name, shorthand, usage)
--}
-
--// Uint32 defines a uint32 flag with specified name, default value, and usage string.
--// The return value is the address of a uint32 variable that stores the value of the flag.
--func (f *FlagSet) Uint32(name string, value uint32, usage string) *uint32 {
-- p := new(uint32)
-- f.Uint32VarP(p, name, "", value, usage)
-- return p
--}
+-<div class='description'>
+-<p class="assertion" title="Assertion">A page with a UTF-8 BOM will be recognized as UTF-8 even if the meta content attribute declares a different encoding.</p>
+-<div class="notes"><p><p>The page contains an encoding declaration in a meta content attribute that attempts to set the character encoding to ISO 8859-15, but the file starts with a UTF-8 signature.</p><p>The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector <code>.test div.ýäè</code>. This matches the sequence of bytes above when they are interpreted as UTF-8. If the class name matches the selector then the test will pass.</p></p>
+-</div>
+-</div>
+-<div class="nexttest"><div><a href="generate?test=the-input-byte-stream-038">Next test</a></div><div class="doctype">HTML5</div>
+-<p class="jump">the-input-byte-stream-037<br /><a href="/International/tests/html5/the-input-byte-stream/results-basics#precedence" target="_blank">Result summary & related tests</a><br /><a href="http://w3c-test.org/framework/details/i18n-html5/the-input-byte-stream-037" target="_blank">Detailed results for this test</a><br/> <a href="http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream" target="_blank">Link to spec</a></p>
+-<div class='prereq'>Assumptions: <ul><li>The default encoding for the browser you are testing is not set to ISO 8859-15.</li>
+- <li>The test is read from a server that supports HTTP.</li></ul></div>
+-</div>
+-<script>
+-test(function() {
+-assert_equals(document.getElementById('box').offsetWidth, 100);
+-}, " ");
+-</script>
-
--// Like Uint32, but accepts a shorthand letter that can be used after a single dash.
--func (f *FlagSet) Uint32P(name, shorthand string, value uint32, usage string) *uint32 {
-- p := new(uint32)
-- f.Uint32VarP(p, name, shorthand, value, usage)
-- return p
--}
+-</body>
+-</html>
-
--// Uint32 defines a uint32 flag with specified name, default value, and usage string.
--// The return value is the address of a uint32 variable that stores the value of the flag.
--func Uint32(name string, value uint32, usage string) *uint32 {
-- return CommandLine.Uint32P(name, "", value, usage)
--}
-
--// Like Uint32, but accepts a shorthand letter that can be used after a single dash.
--func Uint32P(name, shorthand string, value uint32, usage string) *uint32 {
-- return CommandLine.Uint32P(name, shorthand, value, usage)
--}
-diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/uint64.go b/Godeps/_workspace/src/github.com/spf13/pflag/uint64.go
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/meta-charset-attribute.html b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/meta-charset-attribute.html
deleted file mode 100644
-index 99c7e80..0000000
---- a/Godeps/_workspace/src/github.com/spf13/pflag/uint64.go
+index 2d7d25a..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/meta-charset-attribute.html
+++ /dev/null
-@@ -1,74 +0,0 @@
--package pflag
--
--import (
-- "fmt"
-- "strconv"
--)
--
--// -- uint64 Value
--type uint64Value uint64
+@@ -1,48 +0,0 @@
+-<!DOCTYPE html>
+-<html lang="en" >
+-<head>
+- <meta charset="iso-8859-15"> <title>meta charset attribute</title>
+-<link rel='author' title='Richard Ishida' href='mailto:ishida at w3.org'>
+-<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
+-<link rel="stylesheet" type="text/css" href="./generatedtests.css">
+-<script src="http://w3c-test.org/resources/testharness.js"></script>
+-<script src="http://w3c-test.org/resources/testharnessreport.js"></script>
+-<meta name='flags' content='http'>
+-<meta name="assert" content="The character encoding of the page can be set by a meta element with charset attribute.">
+-<style type='text/css'>
+-.test div { width: 50px; }</style>
+-<link rel="stylesheet" type="text/css" href="the-input-byte-stream/support/encodingtests-15.css">
+-</head>
+-<body>
+-<p class='title'>meta charset attribute</p>
-
--func newUint64Value(val uint64, p *uint64) *uint64Value {
-- *p = val
-- return (*uint64Value)(p)
--}
-
--func (i *uint64Value) Set(s string) error {
-- v, err := strconv.ParseUint(s, 0, 64)
-- *i = uint64Value(v)
-- return err
--}
+-<div id='log'></div>
-
--func (i *uint64Value) Type() string {
-- return "uint64"
--}
-
--func (i *uint64Value) String() string { return fmt.Sprintf("%v", *i) }
+-<div class='test'><div id='box' class='ýäè'> </div></div>
-
--// Uint64Var defines a uint64 flag with specified name, default value, and usage string.
--// The argument p points to a uint64 variable in which to store the value of the flag.
--func (f *FlagSet) Uint64Var(p *uint64, name string, value uint64, usage string) {
-- f.VarP(newUint64Value(value, p), name, "", usage)
--}
-
--// Like Uint64Var, but accepts a shorthand letter that can be used after a single dash.
--func (f *FlagSet) Uint64VarP(p *uint64, name, shorthand string, value uint64, usage string) {
-- f.VarP(newUint64Value(value, p), name, shorthand, usage)
--}
-
--// Uint64Var defines a uint64 flag with specified name, default value, and usage string.
--// The argument p points to a uint64 variable in which to store the value of the flag.
--func Uint64Var(p *uint64, name string, value uint64, usage string) {
-- CommandLine.VarP(newUint64Value(value, p), name, "", usage)
--}
-
--// Like Uint64Var, but accepts a shorthand letter that can be used after a single dash.
--func Uint64VarP(p *uint64, name, shorthand string, value uint64, usage string) {
-- CommandLine.VarP(newUint64Value(value, p), name, shorthand, usage)
--}
-
--// Uint64 defines a uint64 flag with specified name, default value, and usage string.
--// The return value is the address of a uint64 variable that stores the value of the flag.
--func (f *FlagSet) Uint64(name string, value uint64, usage string) *uint64 {
-- p := new(uint64)
-- f.Uint64VarP(p, name, "", value, usage)
-- return p
--}
+-<div class='description'>
+-<p class="assertion" title="Assertion">The character encoding of the page can be set by a meta element with charset attribute.</p>
+-<div class="notes"><p><p>The only character encoding declaration for this HTML file is in the charset attribute of the meta element, which declares the encoding to be ISO 8859-15.</p><p>The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector <code>.test div.ÜÀÚ</code>. This matches the sequence of bytes above when they are interpreted as ISO 8859-15. If the class name matches the selector then the test will pass.</p></p>
+-</div>
+-</div>
+-<div class="nexttest"><div><a href="generate?test=the-input-byte-stream-015">Next test</a></div><div class="doctype">HTML5</div>
+-<p class="jump">the-input-byte-stream-009<br /><a href="/International/tests/html5/the-input-byte-stream/results-basics#basics" target="_blank">Result summary & related tests</a><br /><a href="http://w3c-test.org/framework/details/i18n-html5/the-input-byte-stream-009" target="_blank">Detailed results for this test</a><br/> <a href="http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream" target="_blank">Link to spec</a></p>
+-<div class='prereq'>Assumptions: <ul><li>The default encoding for the browser you are testing is not set to ISO 8859-15.</li>
+- <li>The test is read from a server that supports HTTP.</li></ul></div>
+-</div>
+-<script>
+-test(function() {
+-assert_equals(document.getElementById('box').offsetWidth, 100);
+-}, " ");
+-</script>
-
--// Like Uint64, but accepts a shorthand letter that can be used after a single dash.
--func (f *FlagSet) Uint64P(name, shorthand string, value uint64, usage string) *uint64 {
-- p := new(uint64)
-- f.Uint64VarP(p, name, shorthand, value, usage)
-- return p
--}
+-</body>
+-</html>
-
--// Uint64 defines a uint64 flag with specified name, default value, and usage string.
--// The return value is the address of a uint64 variable that stores the value of the flag.
--func Uint64(name string, value uint64, usage string) *uint64 {
-- return CommandLine.Uint64P(name, "", value, usage)
--}
-
--// Like Uint64, but accepts a shorthand letter that can be used after a single dash.
--func Uint64P(name, shorthand string, value uint64, usage string) *uint64 {
-- return CommandLine.Uint64P(name, shorthand, value, usage)
--}
-diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/uint8.go b/Godeps/_workspace/src/github.com/spf13/pflag/uint8.go
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/meta-content-attribute.html b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/meta-content-attribute.html
deleted file mode 100644
-index 6fef508..0000000
---- a/Godeps/_workspace/src/github.com/spf13/pflag/uint8.go
+index 1c3f228..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/meta-content-attribute.html
+++ /dev/null
-@@ -1,74 +0,0 @@
--package pflag
--
--import (
-- "fmt"
-- "strconv"
--)
--
--// -- uint8 Value
--type uint8Value uint8
+@@ -1,48 +0,0 @@
+-<!DOCTYPE html>
+-<html lang="en" >
+-<head>
+- <meta http-equiv="content-type" content="text/html; charset=iso-8859-15"> <title>meta content attribute</title>
+-<link rel='author' title='Richard Ishida' href='mailto:ishida at w3.org'>
+-<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
+-<link rel="stylesheet" type="text/css" href="./generatedtests.css">
+-<script src="http://w3c-test.org/resources/testharness.js"></script>
+-<script src="http://w3c-test.org/resources/testharnessreport.js"></script>
+-<meta name='flags' content='http'>
+-<meta name="assert" content="The character encoding of the page can be set by a meta element with http-equiv and content attributes.">
+-<style type='text/css'>
+-.test div { width: 50px; }</style>
+-<link rel="stylesheet" type="text/css" href="the-input-byte-stream/support/encodingtests-15.css">
+-</head>
+-<body>
+-<p class='title'>meta content attribute</p>
-
--func newUint8Value(val uint8, p *uint8) *uint8Value {
-- *p = val
-- return (*uint8Value)(p)
--}
-
--func (i *uint8Value) Set(s string) error {
-- v, err := strconv.ParseUint(s, 0, 8)
-- *i = uint8Value(v)
-- return err
--}
+-<div id='log'></div>
-
--func (i *uint8Value) Type() string {
-- return "uint8"
--}
-
--func (i *uint8Value) String() string { return fmt.Sprintf("%v", *i) }
+-<div class='test'><div id='box' class='ýäè'> </div></div>
-
--// Uint8Var defines a uint8 flag with specified name, default value, and usage string.
--// The argument p points to a uint8 variable in which to store the value of the flag.
--func (f *FlagSet) Uint8Var(p *uint8, name string, value uint8, usage string) {
-- f.VarP(newUint8Value(value, p), name, "", usage)
--}
-
--// Like Uint8Var, but accepts a shorthand letter that can be used after a single dash.
--func (f *FlagSet) Uint8VarP(p *uint8, name, shorthand string, value uint8, usage string) {
-- f.VarP(newUint8Value(value, p), name, shorthand, usage)
--}
-
--// Uint8Var defines a uint8 flag with specified name, default value, and usage string.
--// The argument p points to a uint8 variable in which to store the value of the flag.
--func Uint8Var(p *uint8, name string, value uint8, usage string) {
-- CommandLine.VarP(newUint8Value(value, p), name, "", usage)
--}
-
--// Like Uint8Var, but accepts a shorthand letter that can be used after a single dash.
--func Uint8VarP(p *uint8, name, shorthand string, value uint8, usage string) {
-- CommandLine.VarP(newUint8Value(value, p), name, shorthand, usage)
--}
-
--// Uint8 defines a uint8 flag with specified name, default value, and usage string.
--// The return value is the address of a uint8 variable that stores the value of the flag.
--func (f *FlagSet) Uint8(name string, value uint8, usage string) *uint8 {
-- p := new(uint8)
-- f.Uint8VarP(p, name, "", value, usage)
-- return p
--}
+-<div class='description'>
+-<p class="assertion" title="Assertion">The character encoding of the page can be set by a meta element with http-equiv and content attributes.</p>
+-<div class="notes"><p><p>The only character encoding declaration for this HTML file is in the content attribute of the meta element, which declares the encoding to be ISO 8859-15.</p><p>The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector <code>.test div.ÜÀÚ</code>. This matches the sequence of bytes above when they are interpreted as ISO 8859-15. If the class name matches the selector then the test will pass.</p></p>
+-</div>
+-</div>
+-<div class="nexttest"><div><a href="generate?test=the-input-byte-stream-009">Next test</a></div><div class="doctype">HTML5</div>
+-<p class="jump">the-input-byte-stream-007<br /><a href="/International/tests/html5/the-input-byte-stream/results-basics#basics" target="_blank">Result summary & related tests</a><br /><a href="http://w3c-test.org/framework/details/i18n-html5/the-input-byte-stream-007" target="_blank">Detailed results for this test</a><br/> <a href="http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream" target="_blank">Link to spec</a></p>
+-<div class='prereq'>Assumptions: <ul><li>The default encoding for the browser you are testing is not set to ISO 8859-15.</li>
+- <li>The test is read from a server that supports HTTP.</li></ul></div>
+-</div>
+-<script>
+-test(function() {
+-assert_equals(document.getElementById('box').offsetWidth, 100);
+-}, " ");
+-</script>
-
--// Like Uint8, but accepts a shorthand letter that can be used after a single dash.
--func (f *FlagSet) Uint8P(name, shorthand string, value uint8, usage string) *uint8 {
-- p := new(uint8)
-- f.Uint8VarP(p, name, shorthand, value, usage)
-- return p
--}
+-</body>
+-</html>
-
--// Uint8 defines a uint8 flag with specified name, default value, and usage string.
--// The return value is the address of a uint8 variable that stores the value of the flag.
--func Uint8(name string, value uint8, usage string) *uint8 {
-- return CommandLine.Uint8P(name, "", value, usage)
--}
-
--// Like Uint8, but accepts a shorthand letter that can be used after a single dash.
--func Uint8P(name, shorthand string, value uint8, usage string) *uint8 {
-- return CommandLine.Uint8P(name, shorthand, value, usage)
--}
-diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/.gitignore b/Godeps/_workspace/src/github.com/stretchr/objx/.gitignore
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/const.go b/Godeps/_workspace/src/golang.org/x/net/html/const.go
deleted file mode 100644
-index 0026861..0000000
---- a/Godeps/_workspace/src/github.com/stretchr/objx/.gitignore
+index d7cc8bb..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/const.go
+++ /dev/null
-@@ -1,22 +0,0 @@
--# Compiled Object files, Static and Dynamic libs (Shared Objects)
--*.o
--*.a
--*.so
--
--# Folders
--_obj
--_test
--
--# Architecture specific extensions/prefixes
--*.[568vq]
--[568vq].out
+@@ -1,100 +0,0 @@
+-// Copyright 2011 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
--*.cgo1.go
--*.cgo2.c
--_cgo_defun.c
--_cgo_gotypes.go
--_cgo_export.*
+-package html
-
--_testmain.go
+-// Section 12.2.3.2 of the HTML5 specification says "The following elements
+-// have varying levels of special parsing rules".
+-// http://www.whatwg.org/specs/web-apps/current-work/multipage/parsing.html#the-stack-of-open-elements
+-var isSpecialElementMap = map[string]bool{
+- "address": true,
+- "applet": true,
+- "area": true,
+- "article": true,
+- "aside": true,
+- "base": true,
+- "basefont": true,
+- "bgsound": true,
+- "blockquote": true,
+- "body": true,
+- "br": true,
+- "button": true,
+- "caption": true,
+- "center": true,
+- "col": true,
+- "colgroup": true,
+- "command": true,
+- "dd": true,
+- "details": true,
+- "dir": true,
+- "div": true,
+- "dl": true,
+- "dt": true,
+- "embed": true,
+- "fieldset": true,
+- "figcaption": true,
+- "figure": true,
+- "footer": true,
+- "form": true,
+- "frame": true,
+- "frameset": true,
+- "h1": true,
+- "h2": true,
+- "h3": true,
+- "h4": true,
+- "h5": true,
+- "h6": true,
+- "head": true,
+- "header": true,
+- "hgroup": true,
+- "hr": true,
+- "html": true,
+- "iframe": true,
+- "img": true,
+- "input": true,
+- "isindex": true,
+- "li": true,
+- "link": true,
+- "listing": true,
+- "marquee": true,
+- "menu": true,
+- "meta": true,
+- "nav": true,
+- "noembed": true,
+- "noframes": true,
+- "noscript": true,
+- "object": true,
+- "ol": true,
+- "p": true,
+- "param": true,
+- "plaintext": true,
+- "pre": true,
+- "script": true,
+- "section": true,
+- "select": true,
+- "style": true,
+- "summary": true,
+- "table": true,
+- "tbody": true,
+- "td": true,
+- "textarea": true,
+- "tfoot": true,
+- "th": true,
+- "thead": true,
+- "title": true,
+- "tr": true,
+- "ul": true,
+- "wbr": true,
+- "xmp": true,
+-}
-
--*.exe
-diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/README.md b/Godeps/_workspace/src/github.com/stretchr/objx/README.md
+-func isSpecialElement(element *Node) bool {
+- switch element.Namespace {
+- case "", "html":
+- return isSpecialElementMap[element.Data]
+- case "svg":
+- return element.Data == "foreignObject"
+- }
+- return false
+-}
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/doc.go b/Godeps/_workspace/src/golang.org/x/net/html/doc.go
deleted file mode 100644
-index 4aa1806..0000000
---- a/Godeps/_workspace/src/github.com/stretchr/objx/README.md
+index fac0f54..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/doc.go
+++ /dev/null
-@@ -1,3 +0,0 @@
--# objx
+@@ -1,106 +0,0 @@
+-// Copyright 2010 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
-- * Jump into the [API Documentation](http://godoc.org/github.com/stretchr/objx)
-diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/accessors.go b/Godeps/_workspace/src/github.com/stretchr/objx/accessors.go
-deleted file mode 100644
-index 721bcac..0000000
---- a/Godeps/_workspace/src/github.com/stretchr/objx/accessors.go
-+++ /dev/null
-@@ -1,179 +0,0 @@
--package objx
+-/*
+-Package html implements an HTML5-compliant tokenizer and parser.
-
--import (
-- "fmt"
-- "regexp"
-- "strconv"
-- "strings"
--)
+-Tokenization is done by creating a Tokenizer for an io.Reader r. It is the
+-caller's responsibility to ensure that r provides UTF-8 encoded HTML.
-
--// arrayAccesRegexString is the regex used to extract the array number
--// from the access path
--const arrayAccesRegexString = `^(.+)\[([0-9]+)\]$`
+- z := html.NewTokenizer(r)
-
--// arrayAccesRegex is the compiled arrayAccesRegexString
--var arrayAccesRegex = regexp.MustCompile(arrayAccesRegexString)
+-Given a Tokenizer z, the HTML is tokenized by repeatedly calling z.Next(),
+-which parses the next token and returns its type, or an error:
-
--// Get gets the value using the specified selector and
--// returns it inside a new Obj object.
--//
--// If it cannot find the value, Get will return a nil
--// value inside an instance of Obj.
--//
--// Get can only operate directly on map[string]interface{} and []interface.
--//
--// Example
--//
--// To access the title of the third chapter of the second book, do:
--//
--// o.Get("books[1].chapters[2].title")
--func (m Map) Get(selector string) *Value {
-- rawObj := access(m, selector, nil, false, false)
-- return &Value{data: rawObj}
--}
+- for {
+- tt := z.Next()
+- if tt == html.ErrorToken {
+- // ...
+- return ...
+- }
+- // Process the current token.
+- }
-
--// Set sets the value using the specified selector and
--// returns the object on which Set was called.
--//
--// Set can only operate directly on map[string]interface{} and []interface
--//
--// Example
--//
--// To set the title of the third chapter of the second book, do:
--//
--// o.Set("books[1].chapters[2].title","Time to Go")
--func (m Map) Set(selector string, value interface{}) Map {
-- access(m, selector, value, true, false)
-- return m
--}
+-There are two APIs for retrieving the current token. The high-level API is to
+-call Token; the low-level API is to call Text or TagName / TagAttr. Both APIs
+-allow optionally calling Raw after Next but before Token, Text, TagName, or
+-TagAttr. In EBNF notation, the valid call sequence per token is:
-
--// access accesses the object using the selector and performs the
--// appropriate action.
--func access(current, selector, value interface{}, isSet, panics bool) interface{} {
+- Next {Raw} [ Token | Text | TagName {TagAttr} ]
+-
+-Token returns an independent data structure that completely describes a token.
+-Entities (such as "<") are unescaped, tag names and attribute keys are
+-lower-cased, and attributes are collected into a []Attribute. For example:
-
-- switch selector.(type) {
-- case int, int8, int16, int32, int64, uint, uint8, uint16, uint32, uint64:
+- for {
+- if z.Next() == html.ErrorToken {
+- // Returning io.EOF indicates success.
+- return z.Err()
+- }
+- emitToken(z.Token())
+- }
-
-- if array, ok := current.([]interface{}); ok {
-- index := intFromInterface(selector)
+-The low-level API performs fewer allocations and copies, but the contents of
+-the []byte values returned by Text, TagName and TagAttr may change on the next
+-call to Next. For example, to extract an HTML page's anchor text:
-
-- if index >= len(array) {
-- if panics {
-- panic(fmt.Sprintf("objx: Index %d is out of range. Slice only contains %d items.", index, len(array)))
+- depth := 0
+- for {
+- tt := z.Next()
+- switch tt {
+- case ErrorToken:
+- return z.Err()
+- case TextToken:
+- if depth > 0 {
+- // emitBytes should copy the []byte it receives,
+- // if it doesn't process it immediately.
+- emitBytes(z.Text())
+- }
+- case StartTagToken, EndTagToken:
+- tn, _ := z.TagName()
+- if len(tn) == 1 && tn[0] == 'a' {
+- if tt == StartTagToken {
+- depth++
+- } else {
+- depth--
- }
-- return nil
- }
--
-- return array[index]
- }
+- }
-
-- return nil
+-Parsing is done by calling Parse with an io.Reader, which returns the root of
+-the parse tree (the document element) as a *Node. It is the caller's
+-responsibility to ensure that the Reader provides UTF-8 encoded HTML. For
+-example, to process each anchor node in depth-first order:
-
-- case string:
+- doc, err := html.Parse(r)
+- if err != nil {
+- // ...
+- }
+- var f func(*html.Node)
+- f = func(n *html.Node) {
+- if n.Type == html.ElementNode && n.Data == "a" {
+- // Do something with n...
+- }
+- for c := n.FirstChild; c != nil; c = c.NextSibling {
+- f(c)
+- }
+- }
+- f(doc)
-
-- selStr := selector.(string)
-- selSegs := strings.SplitN(selStr, PathSeparator, 2)
-- thisSel := selSegs[0]
-- index := -1
-- var err error
+-The relevant specifications include:
+-http://www.whatwg.org/specs/web-apps/current-work/multipage/syntax.html and
+-http://www.whatwg.org/specs/web-apps/current-work/multipage/tokenization.html
+-*/
+-package html
-
-- // https://github.com/stretchr/objx/issues/12
-- if strings.Contains(thisSel, "[") {
+-// The tokenization algorithm implemented by this package is not a line-by-line
+-// transliteration of the relatively verbose state-machine in the WHATWG
+-// specification. A more direct approach is used instead, where the program
+-// counter implies the state, such as whether it is tokenizing a tag or a text
+-// node. Specification compliance is verified by checking expected and actual
+-// outputs over a test suite rather than aiming for algorithmic fidelity.
-
-- arrayMatches := arrayAccesRegex.FindStringSubmatch(thisSel)
+-// TODO(nigeltao): Does a DOM API belong in this package or a separate one?
+-// TODO(nigeltao): How does parsing interact with a JavaScript engine?
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/doctype.go b/Godeps/_workspace/src/golang.org/x/net/html/doctype.go
+deleted file mode 100644
+index c484e5a..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/doctype.go
++++ /dev/null
+@@ -1,156 +0,0 @@
+-// Copyright 2011 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
-- if len(arrayMatches) > 0 {
+-package html
-
-- // Get the key into the map
-- thisSel = arrayMatches[1]
+-import (
+- "strings"
+-)
-
-- // Get the index into the array at the key
-- index, err = strconv.Atoi(arrayMatches[2])
+-// parseDoctype parses the data from a DoctypeToken into a name,
+-// public identifier, and system identifier. It returns a Node whose Type
+-// is DoctypeNode, whose Data is the name, and which has attributes
+-// named "system" and "public" for the two identifiers if they were present.
+-// quirks is whether the document should be parsed in "quirks mode".
+-func parseDoctype(s string) (n *Node, quirks bool) {
+- n = &Node{Type: DoctypeNode}
-
-- if err != nil {
-- // This should never happen. If it does, something has gone
-- // seriously wrong. Panic.
-- panic("objx: Array index is not an integer. Must use array[int].")
-- }
+- // Find the name.
+- space := strings.IndexAny(s, whitespace)
+- if space == -1 {
+- space = len(s)
+- }
+- n.Data = s[:space]
+- // The comparison to "html" is case-sensitive.
+- if n.Data != "html" {
+- quirks = true
+- }
+- n.Data = strings.ToLower(n.Data)
+- s = strings.TrimLeft(s[space:], whitespace)
-
-- }
-- }
+- if len(s) < 6 {
+- // It can't start with "PUBLIC" or "SYSTEM".
+- // Ignore the rest of the string.
+- return n, quirks || s != ""
+- }
-
-- if curMap, ok := current.(Map); ok {
-- current = map[string]interface{}(curMap)
+- key := strings.ToLower(s[:6])
+- s = s[6:]
+- for key == "public" || key == "system" {
+- s = strings.TrimLeft(s, whitespace)
+- if s == "" {
+- break
- }
--
-- // get the object in question
-- switch current.(type) {
-- case map[string]interface{}:
-- curMSI := current.(map[string]interface{})
-- if len(selSegs) <= 1 && isSet {
-- curMSI[thisSel] = value
-- return nil
-- } else {
-- current = curMSI[thisSel]
-- }
-- default:
-- current = nil
+- quote := s[0]
+- if quote != '"' && quote != '\'' {
+- break
- }
--
-- if current == nil && panics {
-- panic(fmt.Sprintf("objx: '%v' invalid on object.", selector))
+- s = s[1:]
+- q := strings.IndexRune(s, rune(quote))
+- var id string
+- if q == -1 {
+- id = s
+- s = ""
+- } else {
+- id = s[:q]
+- s = s[q+1:]
+- }
+- n.Attr = append(n.Attr, Attribute{Key: key, Val: id})
+- if key == "public" {
+- key = "system"
+- } else {
+- key = ""
- }
+- }
-
-- // do we need to access the item of an array?
-- if index > -1 {
-- if array, ok := current.([]interface{}); ok {
-- if index < len(array) {
-- current = array[index]
-- } else {
-- if panics {
-- panic(fmt.Sprintf("objx: Index %d is out of range. Slice only contains %d items.", index, len(array)))
+- if key != "" || s != "" {
+- quirks = true
+- } else if len(n.Attr) > 0 {
+- if n.Attr[0].Key == "public" {
+- public := strings.ToLower(n.Attr[0].Val)
+- switch public {
+- case "-//w3o//dtd w3 html strict 3.0//en//", "-/w3d/dtd html 4.0 transitional/en", "html":
+- quirks = true
+- default:
+- for _, q := range quirkyIDs {
+- if strings.HasPrefix(public, q) {
+- quirks = true
+- break
- }
-- current = nil
- }
- }
+- // The following two public IDs only cause quirks mode if there is no system ID.
+- if len(n.Attr) == 1 && (strings.HasPrefix(public, "-//w3c//dtd html 4.01 frameset//") ||
+- strings.HasPrefix(public, "-//w3c//dtd html 4.01 transitional//")) {
+- quirks = true
+- }
- }
--
-- if len(selSegs) > 1 {
-- current = access(current, selSegs[1], value, isSet, panics)
+- if lastAttr := n.Attr[len(n.Attr)-1]; lastAttr.Key == "system" &&
+- strings.ToLower(lastAttr.Val) == "http://www.ibm.com/data/dtd/v11/ibmxhtml1-transitional.dtd" {
+- quirks = true
- }
--
- }
-
-- return current
--
+- return n, quirks
-}
-
--// intFromInterface converts an interface object to the largest
--// representation of an unsigned integer using a type switch and
--// assertions
--func intFromInterface(selector interface{}) int {
-- var value int
-- switch selector.(type) {
-- case int:
-- value = selector.(int)
-- case int8:
-- value = int(selector.(int8))
-- case int16:
-- value = int(selector.(int16))
-- case int32:
-- value = int(selector.(int32))
-- case int64:
-- value = int(selector.(int64))
-- case uint:
-- value = int(selector.(uint))
-- case uint8:
-- value = int(selector.(uint8))
-- case uint16:
-- value = int(selector.(uint16))
-- case uint32:
-- value = int(selector.(uint32))
-- case uint64:
-- value = int(selector.(uint64))
-- default:
-- panic("objx: array access argument is not an integer type (this should never happen)")
-- }
--
-- return value
+-// quirkyIDs is a list of public doctype identifiers that cause a document
+-// to be interpreted in quirks mode. The identifiers should be in lower case.
+-var quirkyIDs = []string{
+- "+//silmaril//dtd html pro v0r11 19970101//",
+- "-//advasoft ltd//dtd html 3.0 aswedit + extensions//",
+- "-//as//dtd html 3.0 aswedit + extensions//",
+- "-//ietf//dtd html 2.0 level 1//",
+- "-//ietf//dtd html 2.0 level 2//",
+- "-//ietf//dtd html 2.0 strict level 1//",
+- "-//ietf//dtd html 2.0 strict level 2//",
+- "-//ietf//dtd html 2.0 strict//",
+- "-//ietf//dtd html 2.0//",
+- "-//ietf//dtd html 2.1e//",
+- "-//ietf//dtd html 3.0//",
+- "-//ietf//dtd html 3.2 final//",
+- "-//ietf//dtd html 3.2//",
+- "-//ietf//dtd html 3//",
+- "-//ietf//dtd html level 0//",
+- "-//ietf//dtd html level 1//",
+- "-//ietf//dtd html level 2//",
+- "-//ietf//dtd html level 3//",
+- "-//ietf//dtd html strict level 0//",
+- "-//ietf//dtd html strict level 1//",
+- "-//ietf//dtd html strict level 2//",
+- "-//ietf//dtd html strict level 3//",
+- "-//ietf//dtd html strict//",
+- "-//ietf//dtd html//",
+- "-//metrius//dtd metrius presentational//",
+- "-//microsoft//dtd internet explorer 2.0 html strict//",
+- "-//microsoft//dtd internet explorer 2.0 html//",
+- "-//microsoft//dtd internet explorer 2.0 tables//",
+- "-//microsoft//dtd internet explorer 3.0 html strict//",
+- "-//microsoft//dtd internet explorer 3.0 html//",
+- "-//microsoft//dtd internet explorer 3.0 tables//",
+- "-//netscape comm. corp.//dtd html//",
+- "-//netscape comm. corp.//dtd strict html//",
+- "-//o'reilly and associates//dtd html 2.0//",
+- "-//o'reilly and associates//dtd html extended 1.0//",
+- "-//o'reilly and associates//dtd html extended relaxed 1.0//",
+- "-//softquad software//dtd hotmetal pro 6.0::19990601::extensions to html 4.0//",
+- "-//softquad//dtd hotmetal pro 4.0::19971010::extensions to html 4.0//",
+- "-//spyglass//dtd html 2.0 extended//",
+- "-//sq//dtd html 2.0 hotmetal + extensions//",
+- "-//sun microsystems corp.//dtd hotjava html//",
+- "-//sun microsystems corp.//dtd hotjava strict html//",
+- "-//w3c//dtd html 3 1995-03-24//",
+- "-//w3c//dtd html 3.2 draft//",
+- "-//w3c//dtd html 3.2 final//",
+- "-//w3c//dtd html 3.2//",
+- "-//w3c//dtd html 3.2s draft//",
+- "-//w3c//dtd html 4.0 frameset//",
+- "-//w3c//dtd html 4.0 transitional//",
+- "-//w3c//dtd html experimental 19960712//",
+- "-//w3c//dtd html experimental 970421//",
+- "-//w3c//dtd w3 html//",
+- "-//w3o//dtd w3 html 3.0//",
+- "-//webtechs//dtd mozilla html 2.0//",
+- "-//webtechs//dtd mozilla html//",
-}
-diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/accessors_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/accessors_test.go
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/entity.go b/Godeps/_workspace/src/golang.org/x/net/html/entity.go
deleted file mode 100644
-index ce5d8e4..0000000
---- a/Godeps/_workspace/src/github.com/stretchr/objx/accessors_test.go
+index af8a007..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/entity.go
+++ /dev/null
-@@ -1,145 +0,0 @@
--package objx
--
--import (
-- "github.com/stretchr/testify/assert"
-- "testing"
--)
--
--func TestAccessorsAccessGetSingleField(t *testing.T) {
--
-- current := map[string]interface{}{"name": "Tyler"}
-- assert.Equal(t, "Tyler", access(current, "name", nil, false, true))
--
--}
--func TestAccessorsAccessGetDeep(t *testing.T) {
--
-- current := map[string]interface{}{"name": map[string]interface{}{"first": "Tyler", "last": "Bunnell"}}
-- assert.Equal(t, "Tyler", access(current, "name.first", nil, false, true))
-- assert.Equal(t, "Bunnell", access(current, "name.last", nil, false, true))
+@@ -1,2253 +0,0 @@
+-// Copyright 2010 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
--}
--func TestAccessorsAccessGetDeepDeep(t *testing.T) {
+-package html
-
-- current := map[string]interface{}{"one": map[string]interface{}{"two": map[string]interface{}{"three": map[string]interface{}{"four": 4}}}}
-- assert.Equal(t, 4, access(current, "one.two.three.four", nil, false, true))
+-// All entities that do not end with ';' are 6 or fewer bytes long.
+-const longestEntityWithoutSemicolon = 6
-
+-// entity is a map from HTML entity names to their values. The semicolon matters:
+-// http://www.whatwg.org/specs/web-apps/current-work/multipage/named-character-references.html
+-// lists both "amp" and "amp;" as two separate entries.
+-//
+-// Note that the HTML5 list is larger than the HTML4 list at
+-// http://www.w3.org/TR/html4/sgml/entities.html
+-var entity = map[string]rune{
+- "AElig;": '\U000000C6',
+- "AMP;": '\U00000026',
+- "Aacute;": '\U000000C1',
+- "Abreve;": '\U00000102',
+- "Acirc;": '\U000000C2',
+- "Acy;": '\U00000410',
+- "Afr;": '\U0001D504',
+- "Agrave;": '\U000000C0',
+- "Alpha;": '\U00000391',
+- "Amacr;": '\U00000100',
+- "And;": '\U00002A53',
+- "Aogon;": '\U00000104',
+- "Aopf;": '\U0001D538',
+- "ApplyFunction;": '\U00002061',
+- "Aring;": '\U000000C5',
+- "Ascr;": '\U0001D49C',
+- "Assign;": '\U00002254',
+- "Atilde;": '\U000000C3',
+- "Auml;": '\U000000C4',
+- "Backslash;": '\U00002216',
+- "Barv;": '\U00002AE7',
+- "Barwed;": '\U00002306',
+- "Bcy;": '\U00000411',
+- "Because;": '\U00002235',
+- "Bernoullis;": '\U0000212C',
+- "Beta;": '\U00000392',
+- "Bfr;": '\U0001D505',
+- "Bopf;": '\U0001D539',
+- "Breve;": '\U000002D8',
+- "Bscr;": '\U0000212C',
+- "Bumpeq;": '\U0000224E',
+- "CHcy;": '\U00000427',
+- "COPY;": '\U000000A9',
+- "Cacute;": '\U00000106',
+- "Cap;": '\U000022D2',
+- "CapitalDifferentialD;": '\U00002145',
+- "Cayleys;": '\U0000212D',
+- "Ccaron;": '\U0000010C',
+- "Ccedil;": '\U000000C7',
+- "Ccirc;": '\U00000108',
+- "Cconint;": '\U00002230',
+- "Cdot;": '\U0000010A',
+- "Cedilla;": '\U000000B8',
+- "CenterDot;": '\U000000B7',
+- "Cfr;": '\U0000212D',
+- "Chi;": '\U000003A7',
+- "CircleDot;": '\U00002299',
+- "CircleMinus;": '\U00002296',
+- "CirclePlus;": '\U00002295',
+- "CircleTimes;": '\U00002297',
+- "ClockwiseContourIntegral;": '\U00002232',
+- "CloseCurlyDoubleQuote;": '\U0000201D',
+- "CloseCurlyQuote;": '\U00002019',
+- "Colon;": '\U00002237',
+- "Colone;": '\U00002A74',
+- "Congruent;": '\U00002261',
+- "Conint;": '\U0000222F',
+- "ContourIntegral;": '\U0000222E',
+- "Copf;": '\U00002102',
+- "Coproduct;": '\U00002210',
+- "CounterClockwiseContourIntegral;": '\U00002233',
+- "Cross;": '\U00002A2F',
+- "Cscr;": '\U0001D49E',
+- "Cup;": '\U000022D3',
+- "CupCap;": '\U0000224D',
+- "DD;": '\U00002145',
+- "DDotrahd;": '\U00002911',
+- "DJcy;": '\U00000402',
+- "DScy;": '\U00000405',
+- "DZcy;": '\U0000040F',
+- "Dagger;": '\U00002021',
+- "Darr;": '\U000021A1',
+- "Dashv;": '\U00002AE4',
+- "Dcaron;": '\U0000010E',
+- "Dcy;": '\U00000414',
+- "Del;": '\U00002207',
+- "Delta;": '\U00000394',
+- "Dfr;": '\U0001D507',
+- "DiacriticalAcute;": '\U000000B4',
+- "DiacriticalDot;": '\U000002D9',
+- "DiacriticalDoubleAcute;": '\U000002DD',
+- "DiacriticalGrave;": '\U00000060',
+- "DiacriticalTilde;": '\U000002DC',
+- "Diamond;": '\U000022C4',
+- "DifferentialD;": '\U00002146',
+- "Dopf;": '\U0001D53B',
+- "Dot;": '\U000000A8',
+- "DotDot;": '\U000020DC',
+- "DotEqual;": '\U00002250',
+- "DoubleContourIntegral;": '\U0000222F',
+- "DoubleDot;": '\U000000A8',
+- "DoubleDownArrow;": '\U000021D3',
+- "DoubleLeftArrow;": '\U000021D0',
+- "DoubleLeftRightArrow;": '\U000021D4',
+- "DoubleLeftTee;": '\U00002AE4',
+- "DoubleLongLeftArrow;": '\U000027F8',
+- "DoubleLongLeftRightArrow;": '\U000027FA',
+- "DoubleLongRightArrow;": '\U000027F9',
+- "DoubleRightArrow;": '\U000021D2',
+- "DoubleRightTee;": '\U000022A8',
+- "DoubleUpArrow;": '\U000021D1',
+- "DoubleUpDownArrow;": '\U000021D5',
+- "DoubleVerticalBar;": '\U00002225',
+- "DownArrow;": '\U00002193',
+- "DownArrowBar;": '\U00002913',
+- "DownArrowUpArrow;": '\U000021F5',
+- "DownBreve;": '\U00000311',
+- "DownLeftRightVector;": '\U00002950',
+- "DownLeftTeeVector;": '\U0000295E',
+- "DownLeftVector;": '\U000021BD',
+- "DownLeftVectorBar;": '\U00002956',
+- "DownRightTeeVector;": '\U0000295F',
+- "DownRightVector;": '\U000021C1',
+- "DownRightVectorBar;": '\U00002957',
+- "DownTee;": '\U000022A4',
+- "DownTeeArrow;": '\U000021A7',
+- "Downarrow;": '\U000021D3',
+- "Dscr;": '\U0001D49F',
+- "Dstrok;": '\U00000110',
+- "ENG;": '\U0000014A',
+- "ETH;": '\U000000D0',
+- "Eacute;": '\U000000C9',
+- "Ecaron;": '\U0000011A',
+- "Ecirc;": '\U000000CA',
+- "Ecy;": '\U0000042D',
+- "Edot;": '\U00000116',
+- "Efr;": '\U0001D508',
+- "Egrave;": '\U000000C8',
+- "Element;": '\U00002208',
+- "Emacr;": '\U00000112',
+- "EmptySmallSquare;": '\U000025FB',
+- "EmptyVerySmallSquare;": '\U000025AB',
+- "Eogon;": '\U00000118',
+- "Eopf;": '\U0001D53C',
+- "Epsilon;": '\U00000395',
+- "Equal;": '\U00002A75',
+- "EqualTilde;": '\U00002242',
+- "Equilibrium;": '\U000021CC',
+- "Escr;": '\U00002130',
+- "Esim;": '\U00002A73',
+- "Eta;": '\U00000397',
+- "Euml;": '\U000000CB',
+- "Exists;": '\U00002203',
+- "ExponentialE;": '\U00002147',
+- "Fcy;": '\U00000424',
+- "Ffr;": '\U0001D509',
+- "FilledSmallSquare;": '\U000025FC',
+- "FilledVerySmallSquare;": '\U000025AA',
+- "Fopf;": '\U0001D53D',
+- "ForAll;": '\U00002200',
+- "Fouriertrf;": '\U00002131',
+- "Fscr;": '\U00002131',
+- "GJcy;": '\U00000403',
+- "GT;": '\U0000003E',
+- "Gamma;": '\U00000393',
+- "Gammad;": '\U000003DC',
+- "Gbreve;": '\U0000011E',
+- "Gcedil;": '\U00000122',
+- "Gcirc;": '\U0000011C',
+- "Gcy;": '\U00000413',
+- "Gdot;": '\U00000120',
+- "Gfr;": '\U0001D50A',
+- "Gg;": '\U000022D9',
+- "Gopf;": '\U0001D53E',
+- "GreaterEqual;": '\U00002265',
+- "GreaterEqualLess;": '\U000022DB',
+- "GreaterFullEqual;": '\U00002267',
+- "GreaterGreater;": '\U00002AA2',
+- "GreaterLess;": '\U00002277',
+- "GreaterSlantEqual;": '\U00002A7E',
+- "GreaterTilde;": '\U00002273',
+- "Gscr;": '\U0001D4A2',
+- "Gt;": '\U0000226B',
+- "HARDcy;": '\U0000042A',
+- "Hacek;": '\U000002C7',
+- "Hat;": '\U0000005E',
+- "Hcirc;": '\U00000124',
+- "Hfr;": '\U0000210C',
+- "HilbertSpace;": '\U0000210B',
+- "Hopf;": '\U0000210D',
+- "HorizontalLine;": '\U00002500',
+- "Hscr;": '\U0000210B',
+- "Hstrok;": '\U00000126',
+- "HumpDownHump;": '\U0000224E',
+- "HumpEqual;": '\U0000224F',
+- "IEcy;": '\U00000415',
+- "IJlig;": '\U00000132',
+- "IOcy;": '\U00000401',
+- "Iacute;": '\U000000CD',
+- "Icirc;": '\U000000CE',
+- "Icy;": '\U00000418',
+- "Idot;": '\U00000130',
+- "Ifr;": '\U00002111',
+- "Igrave;": '\U000000CC',
+- "Im;": '\U00002111',
+- "Imacr;": '\U0000012A',
+- "ImaginaryI;": '\U00002148',
+- "Implies;": '\U000021D2',
+- "Int;": '\U0000222C',
+- "Integral;": '\U0000222B',
+- "Intersection;": '\U000022C2',
+- "InvisibleComma;": '\U00002063',
+- "InvisibleTimes;": '\U00002062',
+- "Iogon;": '\U0000012E',
+- "Iopf;": '\U0001D540',
+- "Iota;": '\U00000399',
+- "Iscr;": '\U00002110',
+- "Itilde;": '\U00000128',
+- "Iukcy;": '\U00000406',
+- "Iuml;": '\U000000CF',
+- "Jcirc;": '\U00000134',
+- "Jcy;": '\U00000419',
+- "Jfr;": '\U0001D50D',
+- "Jopf;": '\U0001D541',
+- "Jscr;": '\U0001D4A5',
+- "Jsercy;": '\U00000408',
+- "Jukcy;": '\U00000404',
+- "KHcy;": '\U00000425',
+- "KJcy;": '\U0000040C',
+- "Kappa;": '\U0000039A',
+- "Kcedil;": '\U00000136',
+- "Kcy;": '\U0000041A',
+- "Kfr;": '\U0001D50E',
+- "Kopf;": '\U0001D542',
+- "Kscr;": '\U0001D4A6',
+- "LJcy;": '\U00000409',
+- "LT;": '\U0000003C',
+- "Lacute;": '\U00000139',
+- "Lambda;": '\U0000039B',
+- "Lang;": '\U000027EA',
+- "Laplacetrf;": '\U00002112',
+- "Larr;": '\U0000219E',
+- "Lcaron;": '\U0000013D',
+- "Lcedil;": '\U0000013B',
+- "Lcy;": '\U0000041B',
+- "LeftAngleBracket;": '\U000027E8',
+- "LeftArrow;": '\U00002190',
+- "LeftArrowBar;": '\U000021E4',
+- "LeftArrowRightArrow;": '\U000021C6',
+- "LeftCeiling;": '\U00002308',
+- "LeftDoubleBracket;": '\U000027E6',
+- "LeftDownTeeVector;": '\U00002961',
+- "LeftDownVector;": '\U000021C3',
+- "LeftDownVectorBar;": '\U00002959',
+- "LeftFloor;": '\U0000230A',
+- "LeftRightArrow;": '\U00002194',
+- "LeftRightVector;": '\U0000294E',
+- "LeftTee;": '\U000022A3',
+- "LeftTeeArrow;": '\U000021A4',
+- "LeftTeeVector;": '\U0000295A',
+- "LeftTriangle;": '\U000022B2',
+- "LeftTriangleBar;": '\U000029CF',
+- "LeftTriangleEqual;": '\U000022B4',
+- "LeftUpDownVector;": '\U00002951',
+- "LeftUpTeeVector;": '\U00002960',
+- "LeftUpVector;": '\U000021BF',
+- "LeftUpVectorBar;": '\U00002958',
+- "LeftVector;": '\U000021BC',
+- "LeftVectorBar;": '\U00002952',
+- "Leftarrow;": '\U000021D0',
+- "Leftrightarrow;": '\U000021D4',
+- "LessEqualGreater;": '\U000022DA',
+- "LessFullEqual;": '\U00002266',
+- "LessGreater;": '\U00002276',
+- "LessLess;": '\U00002AA1',
+- "LessSlantEqual;": '\U00002A7D',
+- "LessTilde;": '\U00002272',
+- "Lfr;": '\U0001D50F',
+- "Ll;": '\U000022D8',
+- "Lleftarrow;": '\U000021DA',
+- "Lmidot;": '\U0000013F',
+- "LongLeftArrow;": '\U000027F5',
+- "LongLeftRightArrow;": '\U000027F7',
+- "LongRightArrow;": '\U000027F6',
+- "Longleftarrow;": '\U000027F8',
+- "Longleftrightarrow;": '\U000027FA',
+- "Longrightarrow;": '\U000027F9',
+- "Lopf;": '\U0001D543',
+- "LowerLeftArrow;": '\U00002199',
+- "LowerRightArrow;": '\U00002198',
+- "Lscr;": '\U00002112',
+- "Lsh;": '\U000021B0',
+- "Lstrok;": '\U00000141',
+- "Lt;": '\U0000226A',
+- "Map;": '\U00002905',
+- "Mcy;": '\U0000041C',
+- "MediumSpace;": '\U0000205F',
+- "Mellintrf;": '\U00002133',
+- "Mfr;": '\U0001D510',
+- "MinusPlus;": '\U00002213',
+- "Mopf;": '\U0001D544',
+- "Mscr;": '\U00002133',
+- "Mu;": '\U0000039C',
+- "NJcy;": '\U0000040A',
+- "Nacute;": '\U00000143',
+- "Ncaron;": '\U00000147',
+- "Ncedil;": '\U00000145',
+- "Ncy;": '\U0000041D',
+- "NegativeMediumSpace;": '\U0000200B',
+- "NegativeThickSpace;": '\U0000200B',
+- "NegativeThinSpace;": '\U0000200B',
+- "NegativeVeryThinSpace;": '\U0000200B',
+- "NestedGreaterGreater;": '\U0000226B',
+- "NestedLessLess;": '\U0000226A',
+- "NewLine;": '\U0000000A',
+- "Nfr;": '\U0001D511',
+- "NoBreak;": '\U00002060',
+- "NonBreakingSpace;": '\U000000A0',
+- "Nopf;": '\U00002115',
+- "Not;": '\U00002AEC',
+- "NotCongruent;": '\U00002262',
+- "NotCupCap;": '\U0000226D',
+- "NotDoubleVerticalBar;": '\U00002226',
+- "NotElement;": '\U00002209',
+- "NotEqual;": '\U00002260',
+- "NotExists;": '\U00002204',
+- "NotGreater;": '\U0000226F',
+- "NotGreaterEqual;": '\U00002271',
+- "NotGreaterLess;": '\U00002279',
+- "NotGreaterTilde;": '\U00002275',
+- "NotLeftTriangle;": '\U000022EA',
+- "NotLeftTriangleEqual;": '\U000022EC',
+- "NotLess;": '\U0000226E',
+- "NotLessEqual;": '\U00002270',
+- "NotLessGreater;": '\U00002278',
+- "NotLessTilde;": '\U00002274',
+- "NotPrecedes;": '\U00002280',
+- "NotPrecedesSlantEqual;": '\U000022E0',
+- "NotReverseElement;": '\U0000220C',
+- "NotRightTriangle;": '\U000022EB',
+- "NotRightTriangleEqual;": '\U000022ED',
+- "NotSquareSubsetEqual;": '\U000022E2',
+- "NotSquareSupersetEqual;": '\U000022E3',
+- "NotSubsetEqual;": '\U00002288',
+- "NotSucceeds;": '\U00002281',
+- "NotSucceedsSlantEqual;": '\U000022E1',
+- "NotSupersetEqual;": '\U00002289',
+- "NotTilde;": '\U00002241',
+- "NotTildeEqual;": '\U00002244',
+- "NotTildeFullEqual;": '\U00002247',
+- "NotTildeTilde;": '\U00002249',
+- "NotVerticalBar;": '\U00002224',
+- "Nscr;": '\U0001D4A9',
+- "Ntilde;": '\U000000D1',
+- "Nu;": '\U0000039D',
+- "OElig;": '\U00000152',
+- "Oacute;": '\U000000D3',
+- "Ocirc;": '\U000000D4',
+- "Ocy;": '\U0000041E',
+- "Odblac;": '\U00000150',
+- "Ofr;": '\U0001D512',
+- "Ograve;": '\U000000D2',
+- "Omacr;": '\U0000014C',
+- "Omega;": '\U000003A9',
+- "Omicron;": '\U0000039F',
+- "Oopf;": '\U0001D546',
+- "OpenCurlyDoubleQuote;": '\U0000201C',
+- "OpenCurlyQuote;": '\U00002018',
+- "Or;": '\U00002A54',
+- "Oscr;": '\U0001D4AA',
+- "Oslash;": '\U000000D8',
+- "Otilde;": '\U000000D5',
+- "Otimes;": '\U00002A37',
+- "Ouml;": '\U000000D6',
+- "OverBar;": '\U0000203E',
+- "OverBrace;": '\U000023DE',
+- "OverBracket;": '\U000023B4',
+- "OverParenthesis;": '\U000023DC',
+- "PartialD;": '\U00002202',
+- "Pcy;": '\U0000041F',
+- "Pfr;": '\U0001D513',
+- "Phi;": '\U000003A6',
+- "Pi;": '\U000003A0',
+- "PlusMinus;": '\U000000B1',
+- "Poincareplane;": '\U0000210C',
+- "Popf;": '\U00002119',
+- "Pr;": '\U00002ABB',
+- "Precedes;": '\U0000227A',
+- "PrecedesEqual;": '\U00002AAF',
+- "PrecedesSlantEqual;": '\U0000227C',
+- "PrecedesTilde;": '\U0000227E',
+- "Prime;": '\U00002033',
+- "Product;": '\U0000220F',
+- "Proportion;": '\U00002237',
+- "Proportional;": '\U0000221D',
+- "Pscr;": '\U0001D4AB',
+- "Psi;": '\U000003A8',
+- "QUOT;": '\U00000022',
+- "Qfr;": '\U0001D514',
+- "Qopf;": '\U0000211A',
+- "Qscr;": '\U0001D4AC',
+- "RBarr;": '\U00002910',
+- "REG;": '\U000000AE',
+- "Racute;": '\U00000154',
+- "Rang;": '\U000027EB',
+- "Rarr;": '\U000021A0',
+- "Rarrtl;": '\U00002916',
+- "Rcaron;": '\U00000158',
+- "Rcedil;": '\U00000156',
+- "Rcy;": '\U00000420',
+- "Re;": '\U0000211C',
+- "ReverseElement;": '\U0000220B',
+- "ReverseEquilibrium;": '\U000021CB',
+- "ReverseUpEquilibrium;": '\U0000296F',
+- "Rfr;": '\U0000211C',
+- "Rho;": '\U000003A1',
+- "RightAngleBracket;": '\U000027E9',
+- "RightArrow;": '\U00002192',
+- "RightArrowBar;": '\U000021E5',
+- "RightArrowLeftArrow;": '\U000021C4',
+- "RightCeiling;": '\U00002309',
+- "RightDoubleBracket;": '\U000027E7',
+- "RightDownTeeVector;": '\U0000295D',
+- "RightDownVector;": '\U000021C2',
+- "RightDownVectorBar;": '\U00002955',
+- "RightFloor;": '\U0000230B',
+- "RightTee;": '\U000022A2',
+- "RightTeeArrow;": '\U000021A6',
+- "RightTeeVector;": '\U0000295B',
+- "RightTriangle;": '\U000022B3',
+- "RightTriangleBar;": '\U000029D0',
+- "RightTriangleEqual;": '\U000022B5',
+- "RightUpDownVector;": '\U0000294F',
+- "RightUpTeeVector;": '\U0000295C',
+- "RightUpVector;": '\U000021BE',
+- "RightUpVectorBar;": '\U00002954',
+- "RightVector;": '\U000021C0',
+- "RightVectorBar;": '\U00002953',
+- "Rightarrow;": '\U000021D2',
+- "Ropf;": '\U0000211D',
+- "RoundImplies;": '\U00002970',
+- "Rrightarrow;": '\U000021DB',
+- "Rscr;": '\U0000211B',
+- "Rsh;": '\U000021B1',
+- "RuleDelayed;": '\U000029F4',
+- "SHCHcy;": '\U00000429',
+- "SHcy;": '\U00000428',
+- "SOFTcy;": '\U0000042C',
+- "Sacute;": '\U0000015A',
+- "Sc;": '\U00002ABC',
+- "Scaron;": '\U00000160',
+- "Scedil;": '\U0000015E',
+- "Scirc;": '\U0000015C',
+- "Scy;": '\U00000421',
+- "Sfr;": '\U0001D516',
+- "ShortDownArrow;": '\U00002193',
+- "ShortLeftArrow;": '\U00002190',
+- "ShortRightArrow;": '\U00002192',
+- "ShortUpArrow;": '\U00002191',
+- "Sigma;": '\U000003A3',
+- "SmallCircle;": '\U00002218',
+- "Sopf;": '\U0001D54A',
+- "Sqrt;": '\U0000221A',
+- "Square;": '\U000025A1',
+- "SquareIntersection;": '\U00002293',
+- "SquareSubset;": '\U0000228F',
+- "SquareSubsetEqual;": '\U00002291',
+- "SquareSuperset;": '\U00002290',
+- "SquareSupersetEqual;": '\U00002292',
+- "SquareUnion;": '\U00002294',
+- "Sscr;": '\U0001D4AE',
+- "Star;": '\U000022C6',
+- "Sub;": '\U000022D0',
+- "Subset;": '\U000022D0',
+- "SubsetEqual;": '\U00002286',
+- "Succeeds;": '\U0000227B',
+- "SucceedsEqual;": '\U00002AB0',
+- "SucceedsSlantEqual;": '\U0000227D',
+- "SucceedsTilde;": '\U0000227F',
+- "SuchThat;": '\U0000220B',
+- "Sum;": '\U00002211',
+- "Sup;": '\U000022D1',
+- "Superset;": '\U00002283',
+- "SupersetEqual;": '\U00002287',
+- "Supset;": '\U000022D1',
+- "THORN;": '\U000000DE',
+- "TRADE;": '\U00002122',
+- "TSHcy;": '\U0000040B',
+- "TScy;": '\U00000426',
+- "Tab;": '\U00000009',
+- "Tau;": '\U000003A4',
+- "Tcaron;": '\U00000164',
+- "Tcedil;": '\U00000162',
+- "Tcy;": '\U00000422',
+- "Tfr;": '\U0001D517',
+- "Therefore;": '\U00002234',
+- "Theta;": '\U00000398',
+- "ThinSpace;": '\U00002009',
+- "Tilde;": '\U0000223C',
+- "TildeEqual;": '\U00002243',
+- "TildeFullEqual;": '\U00002245',
+- "TildeTilde;": '\U00002248',
+- "Topf;": '\U0001D54B',
+- "TripleDot;": '\U000020DB',
+- "Tscr;": '\U0001D4AF',
+- "Tstrok;": '\U00000166',
+- "Uacute;": '\U000000DA',
+- "Uarr;": '\U0000219F',
+- "Uarrocir;": '\U00002949',
+- "Ubrcy;": '\U0000040E',
+- "Ubreve;": '\U0000016C',
+- "Ucirc;": '\U000000DB',
+- "Ucy;": '\U00000423',
+- "Udblac;": '\U00000170',
+- "Ufr;": '\U0001D518',
+- "Ugrave;": '\U000000D9',
+- "Umacr;": '\U0000016A',
+- "UnderBar;": '\U0000005F',
+- "UnderBrace;": '\U000023DF',
+- "UnderBracket;": '\U000023B5',
+- "UnderParenthesis;": '\U000023DD',
+- "Union;": '\U000022C3',
+- "UnionPlus;": '\U0000228E',
+- "Uogon;": '\U00000172',
+- "Uopf;": '\U0001D54C',
+- "UpArrow;": '\U00002191',
+- "UpArrowBar;": '\U00002912',
+- "UpArrowDownArrow;": '\U000021C5',
+- "UpDownArrow;": '\U00002195',
+- "UpEquilibrium;": '\U0000296E',
+- "UpTee;": '\U000022A5',
+- "UpTeeArrow;": '\U000021A5',
+- "Uparrow;": '\U000021D1',
+- "Updownarrow;": '\U000021D5',
+- "UpperLeftArrow;": '\U00002196',
+- "UpperRightArrow;": '\U00002197',
+- "Upsi;": '\U000003D2',
+- "Upsilon;": '\U000003A5',
+- "Uring;": '\U0000016E',
+- "Uscr;": '\U0001D4B0',
+- "Utilde;": '\U00000168',
+- "Uuml;": '\U000000DC',
+- "VDash;": '\U000022AB',
+- "Vbar;": '\U00002AEB',
+- "Vcy;": '\U00000412',
+- "Vdash;": '\U000022A9',
+- "Vdashl;": '\U00002AE6',
+- "Vee;": '\U000022C1',
+- "Verbar;": '\U00002016',
+- "Vert;": '\U00002016',
+- "VerticalBar;": '\U00002223',
+- "VerticalLine;": '\U0000007C',
+- "VerticalSeparator;": '\U00002758',
+- "VerticalTilde;": '\U00002240',
+- "VeryThinSpace;": '\U0000200A',
+- "Vfr;": '\U0001D519',
+- "Vopf;": '\U0001D54D',
+- "Vscr;": '\U0001D4B1',
+- "Vvdash;": '\U000022AA',
+- "Wcirc;": '\U00000174',
+- "Wedge;": '\U000022C0',
+- "Wfr;": '\U0001D51A',
+- "Wopf;": '\U0001D54E',
+- "Wscr;": '\U0001D4B2',
+- "Xfr;": '\U0001D51B',
+- "Xi;": '\U0000039E',
+- "Xopf;": '\U0001D54F',
+- "Xscr;": '\U0001D4B3',
+- "YAcy;": '\U0000042F',
+- "YIcy;": '\U00000407',
+- "YUcy;": '\U0000042E',
+- "Yacute;": '\U000000DD',
+- "Ycirc;": '\U00000176',
+- "Ycy;": '\U0000042B',
+- "Yfr;": '\U0001D51C',
+- "Yopf;": '\U0001D550',
+- "Yscr;": '\U0001D4B4',
+- "Yuml;": '\U00000178',
+- "ZHcy;": '\U00000416',
+- "Zacute;": '\U00000179',
+- "Zcaron;": '\U0000017D',
+- "Zcy;": '\U00000417',
+- "Zdot;": '\U0000017B',
+- "ZeroWidthSpace;": '\U0000200B',
+- "Zeta;": '\U00000396',
+- "Zfr;": '\U00002128',
+- "Zopf;": '\U00002124',
+- "Zscr;": '\U0001D4B5',
+- "aacute;": '\U000000E1',
+- "abreve;": '\U00000103',
+- "ac;": '\U0000223E',
+- "acd;": '\U0000223F',
+- "acirc;": '\U000000E2',
+- "acute;": '\U000000B4',
+- "acy;": '\U00000430',
+- "aelig;": '\U000000E6',
+- "af;": '\U00002061',
+- "afr;": '\U0001D51E',
+- "agrave;": '\U000000E0',
+- "alefsym;": '\U00002135',
+- "aleph;": '\U00002135',
+- "alpha;": '\U000003B1',
+- "amacr;": '\U00000101',
+- "amalg;": '\U00002A3F',
+- "amp;": '\U00000026',
+- "and;": '\U00002227',
+- "andand;": '\U00002A55',
+- "andd;": '\U00002A5C',
+- "andslope;": '\U00002A58',
+- "andv;": '\U00002A5A',
+- "ang;": '\U00002220',
+- "ange;": '\U000029A4',
+- "angle;": '\U00002220',
+- "angmsd;": '\U00002221',
+- "angmsdaa;": '\U000029A8',
+- "angmsdab;": '\U000029A9',
+- "angmsdac;": '\U000029AA',
+- "angmsdad;": '\U000029AB',
+- "angmsdae;": '\U000029AC',
+- "angmsdaf;": '\U000029AD',
+- "angmsdag;": '\U000029AE',
+- "angmsdah;": '\U000029AF',
+- "angrt;": '\U0000221F',
+- "angrtvb;": '\U000022BE',
+- "angrtvbd;": '\U0000299D',
+- "angsph;": '\U00002222',
+- "angst;": '\U000000C5',
+- "angzarr;": '\U0000237C',
+- "aogon;": '\U00000105',
+- "aopf;": '\U0001D552',
+- "ap;": '\U00002248',
+- "apE;": '\U00002A70',
+- "apacir;": '\U00002A6F',
+- "ape;": '\U0000224A',
+- "apid;": '\U0000224B',
+- "apos;": '\U00000027',
+- "approx;": '\U00002248',
+- "approxeq;": '\U0000224A',
+- "aring;": '\U000000E5',
+- "ascr;": '\U0001D4B6',
+- "ast;": '\U0000002A',
+- "asymp;": '\U00002248',
+- "asympeq;": '\U0000224D',
+- "atilde;": '\U000000E3',
+- "auml;": '\U000000E4',
+- "awconint;": '\U00002233',
+- "awint;": '\U00002A11',
+- "bNot;": '\U00002AED',
+- "backcong;": '\U0000224C',
+- "backepsilon;": '\U000003F6',
+- "backprime;": '\U00002035',
+- "backsim;": '\U0000223D',
+- "backsimeq;": '\U000022CD',
+- "barvee;": '\U000022BD',
+- "barwed;": '\U00002305',
+- "barwedge;": '\U00002305',
+- "bbrk;": '\U000023B5',
+- "bbrktbrk;": '\U000023B6',
+- "bcong;": '\U0000224C',
+- "bcy;": '\U00000431',
+- "bdquo;": '\U0000201E',
+- "becaus;": '\U00002235',
+- "because;": '\U00002235',
+- "bemptyv;": '\U000029B0',
+- "bepsi;": '\U000003F6',
+- "bernou;": '\U0000212C',
+- "beta;": '\U000003B2',
+- "beth;": '\U00002136',
+- "between;": '\U0000226C',
+- "bfr;": '\U0001D51F',
+- "bigcap;": '\U000022C2',
+- "bigcirc;": '\U000025EF',
+- "bigcup;": '\U000022C3',
+- "bigodot;": '\U00002A00',
+- "bigoplus;": '\U00002A01',
+- "bigotimes;": '\U00002A02',
+- "bigsqcup;": '\U00002A06',
+- "bigstar;": '\U00002605',
+- "bigtriangledown;": '\U000025BD',
+- "bigtriangleup;": '\U000025B3',
+- "biguplus;": '\U00002A04',
+- "bigvee;": '\U000022C1',
+- "bigwedge;": '\U000022C0',
+- "bkarow;": '\U0000290D',
+- "blacklozenge;": '\U000029EB',
+- "blacksquare;": '\U000025AA',
+- "blacktriangle;": '\U000025B4',
+- "blacktriangledown;": '\U000025BE',
+- "blacktriangleleft;": '\U000025C2',
+- "blacktriangleright;": '\U000025B8',
+- "blank;": '\U00002423',
+- "blk12;": '\U00002592',
+- "blk14;": '\U00002591',
+- "blk34;": '\U00002593',
+- "block;": '\U00002588',
+- "bnot;": '\U00002310',
+- "bopf;": '\U0001D553',
+- "bot;": '\U000022A5',
+- "bottom;": '\U000022A5',
+- "bowtie;": '\U000022C8',
+- "boxDL;": '\U00002557',
+- "boxDR;": '\U00002554',
+- "boxDl;": '\U00002556',
+- "boxDr;": '\U00002553',
+- "boxH;": '\U00002550',
+- "boxHD;": '\U00002566',
+- "boxHU;": '\U00002569',
+- "boxHd;": '\U00002564',
+- "boxHu;": '\U00002567',
+- "boxUL;": '\U0000255D',
+- "boxUR;": '\U0000255A',
+- "boxUl;": '\U0000255C',
+- "boxUr;": '\U00002559',
+- "boxV;": '\U00002551',
+- "boxVH;": '\U0000256C',
+- "boxVL;": '\U00002563',
+- "boxVR;": '\U00002560',
+- "boxVh;": '\U0000256B',
+- "boxVl;": '\U00002562',
+- "boxVr;": '\U0000255F',
+- "boxbox;": '\U000029C9',
+- "boxdL;": '\U00002555',
+- "boxdR;": '\U00002552',
+- "boxdl;": '\U00002510',
+- "boxdr;": '\U0000250C',
+- "boxh;": '\U00002500',
+- "boxhD;": '\U00002565',
+- "boxhU;": '\U00002568',
+- "boxhd;": '\U0000252C',
+- "boxhu;": '\U00002534',
+- "boxminus;": '\U0000229F',
+- "boxplus;": '\U0000229E',
+- "boxtimes;": '\U000022A0',
+- "boxuL;": '\U0000255B',
+- "boxuR;": '\U00002558',
+- "boxul;": '\U00002518',
+- "boxur;": '\U00002514',
+- "boxv;": '\U00002502',
+- "boxvH;": '\U0000256A',
+- "boxvL;": '\U00002561',
+- "boxvR;": '\U0000255E',
+- "boxvh;": '\U0000253C',
+- "boxvl;": '\U00002524',
+- "boxvr;": '\U0000251C',
+- "bprime;": '\U00002035',
+- "breve;": '\U000002D8',
+- "brvbar;": '\U000000A6',
+- "bscr;": '\U0001D4B7',
+- "bsemi;": '\U0000204F',
+- "bsim;": '\U0000223D',
+- "bsime;": '\U000022CD',
+- "bsol;": '\U0000005C',
+- "bsolb;": '\U000029C5',
+- "bsolhsub;": '\U000027C8',
+- "bull;": '\U00002022',
+- "bullet;": '\U00002022',
+- "bump;": '\U0000224E',
+- "bumpE;": '\U00002AAE',
+- "bumpe;": '\U0000224F',
+- "bumpeq;": '\U0000224F',
+- "cacute;": '\U00000107',
+- "cap;": '\U00002229',
+- "capand;": '\U00002A44',
+- "capbrcup;": '\U00002A49',
+- "capcap;": '\U00002A4B',
+- "capcup;": '\U00002A47',
+- "capdot;": '\U00002A40',
+- "caret;": '\U00002041',
+- "caron;": '\U000002C7',
+- "ccaps;": '\U00002A4D',
+- "ccaron;": '\U0000010D',
+- "ccedil;": '\U000000E7',
+- "ccirc;": '\U00000109',
+- "ccups;": '\U00002A4C',
+- "ccupssm;": '\U00002A50',
+- "cdot;": '\U0000010B',
+- "cedil;": '\U000000B8',
+- "cemptyv;": '\U000029B2',
+- "cent;": '\U000000A2',
+- "centerdot;": '\U000000B7',
+- "cfr;": '\U0001D520',
+- "chcy;": '\U00000447',
+- "check;": '\U00002713',
+- "checkmark;": '\U00002713',
+- "chi;": '\U000003C7',
+- "cir;": '\U000025CB',
+- "cirE;": '\U000029C3',
+- "circ;": '\U000002C6',
+- "circeq;": '\U00002257',
+- "circlearrowleft;": '\U000021BA',
+- "circlearrowright;": '\U000021BB',
+- "circledR;": '\U000000AE',
+- "circledS;": '\U000024C8',
+- "circledast;": '\U0000229B',
+- "circledcirc;": '\U0000229A',
+- "circleddash;": '\U0000229D',
+- "cire;": '\U00002257',
+- "cirfnint;": '\U00002A10',
+- "cirmid;": '\U00002AEF',
+- "cirscir;": '\U000029C2',
+- "clubs;": '\U00002663',
+- "clubsuit;": '\U00002663',
+- "colon;": '\U0000003A',
+- "colone;": '\U00002254',
+- "coloneq;": '\U00002254',
+- "comma;": '\U0000002C',
+- "commat;": '\U00000040',
+- "comp;": '\U00002201',
+- "compfn;": '\U00002218',
+- "complement;": '\U00002201',
+- "complexes;": '\U00002102',
+- "cong;": '\U00002245',
+- "congdot;": '\U00002A6D',
+- "conint;": '\U0000222E',
+- "copf;": '\U0001D554',
+- "coprod;": '\U00002210',
+- "copy;": '\U000000A9',
+- "copysr;": '\U00002117',
+- "crarr;": '\U000021B5',
+- "cross;": '\U00002717',
+- "cscr;": '\U0001D4B8',
+- "csub;": '\U00002ACF',
+- "csube;": '\U00002AD1',
+- "csup;": '\U00002AD0',
+- "csupe;": '\U00002AD2',
+- "ctdot;": '\U000022EF',
+- "cudarrl;": '\U00002938',
+- "cudarrr;": '\U00002935',
+- "cuepr;": '\U000022DE',
+- "cuesc;": '\U000022DF',
+- "cularr;": '\U000021B6',
+- "cularrp;": '\U0000293D',
+- "cup;": '\U0000222A',
+- "cupbrcap;": '\U00002A48',
+- "cupcap;": '\U00002A46',
+- "cupcup;": '\U00002A4A',
+- "cupdot;": '\U0000228D',
+- "cupor;": '\U00002A45',
+- "curarr;": '\U000021B7',
+- "curarrm;": '\U0000293C',
+- "curlyeqprec;": '\U000022DE',
+- "curlyeqsucc;": '\U000022DF',
+- "curlyvee;": '\U000022CE',
+- "curlywedge;": '\U000022CF',
+- "curren;": '\U000000A4',
+- "curvearrowleft;": '\U000021B6',
+- "curvearrowright;": '\U000021B7',
+- "cuvee;": '\U000022CE',
+- "cuwed;": '\U000022CF',
+- "cwconint;": '\U00002232',
+- "cwint;": '\U00002231',
+- "cylcty;": '\U0000232D',
+- "dArr;": '\U000021D3',
+- "dHar;": '\U00002965',
+- "dagger;": '\U00002020',
+- "daleth;": '\U00002138',
+- "darr;": '\U00002193',
+- "dash;": '\U00002010',
+- "dashv;": '\U000022A3',
+- "dbkarow;": '\U0000290F',
+- "dblac;": '\U000002DD',
+- "dcaron;": '\U0000010F',
+- "dcy;": '\U00000434',
+- "dd;": '\U00002146',
+- "ddagger;": '\U00002021',
+- "ddarr;": '\U000021CA',
+- "ddotseq;": '\U00002A77',
+- "deg;": '\U000000B0',
+- "delta;": '\U000003B4',
+- "demptyv;": '\U000029B1',
+- "dfisht;": '\U0000297F',
+- "dfr;": '\U0001D521',
+- "dharl;": '\U000021C3',
+- "dharr;": '\U000021C2',
+- "diam;": '\U000022C4',
+- "diamond;": '\U000022C4',
+- "diamondsuit;": '\U00002666',
+- "diams;": '\U00002666',
+- "die;": '\U000000A8',
+- "digamma;": '\U000003DD',
+- "disin;": '\U000022F2',
+- "div;": '\U000000F7',
+- "divide;": '\U000000F7',
+- "divideontimes;": '\U000022C7',
+- "divonx;": '\U000022C7',
+- "djcy;": '\U00000452',
+- "dlcorn;": '\U0000231E',
+- "dlcrop;": '\U0000230D',
+- "dollar;": '\U00000024',
+- "dopf;": '\U0001D555',
+- "dot;": '\U000002D9',
+- "doteq;": '\U00002250',
+- "doteqdot;": '\U00002251',
+- "dotminus;": '\U00002238',
+- "dotplus;": '\U00002214',
+- "dotsquare;": '\U000022A1',
+- "doublebarwedge;": '\U00002306',
+- "downarrow;": '\U00002193',
+- "downdownarrows;": '\U000021CA',
+- "downharpoonleft;": '\U000021C3',
+- "downharpoonright;": '\U000021C2',
+- "drbkarow;": '\U00002910',
+- "drcorn;": '\U0000231F',
+- "drcrop;": '\U0000230C',
+- "dscr;": '\U0001D4B9',
+- "dscy;": '\U00000455',
+- "dsol;": '\U000029F6',
+- "dstrok;": '\U00000111',
+- "dtdot;": '\U000022F1',
+- "dtri;": '\U000025BF',
+- "dtrif;": '\U000025BE',
+- "duarr;": '\U000021F5',
+- "duhar;": '\U0000296F',
+- "dwangle;": '\U000029A6',
+- "dzcy;": '\U0000045F',
+- "dzigrarr;": '\U000027FF',
+- "eDDot;": '\U00002A77',
+- "eDot;": '\U00002251',
+- "eacute;": '\U000000E9',
+- "easter;": '\U00002A6E',
+- "ecaron;": '\U0000011B',
+- "ecir;": '\U00002256',
+- "ecirc;": '\U000000EA',
+- "ecolon;": '\U00002255',
+- "ecy;": '\U0000044D',
+- "edot;": '\U00000117',
+- "ee;": '\U00002147',
+- "efDot;": '\U00002252',
+- "efr;": '\U0001D522',
+- "eg;": '\U00002A9A',
+- "egrave;": '\U000000E8',
+- "egs;": '\U00002A96',
+- "egsdot;": '\U00002A98',
+- "el;": '\U00002A99',
+- "elinters;": '\U000023E7',
+- "ell;": '\U00002113',
+- "els;": '\U00002A95',
+- "elsdot;": '\U00002A97',
+- "emacr;": '\U00000113',
+- "empty;": '\U00002205',
+- "emptyset;": '\U00002205',
+- "emptyv;": '\U00002205',
+- "emsp;": '\U00002003',
+- "emsp13;": '\U00002004',
+- "emsp14;": '\U00002005',
+- "eng;": '\U0000014B',
+- "ensp;": '\U00002002',
+- "eogon;": '\U00000119',
+- "eopf;": '\U0001D556',
+- "epar;": '\U000022D5',
+- "eparsl;": '\U000029E3',
+- "eplus;": '\U00002A71',
+- "epsi;": '\U000003B5',
+- "epsilon;": '\U000003B5',
+- "epsiv;": '\U000003F5',
+- "eqcirc;": '\U00002256',
+- "eqcolon;": '\U00002255',
+- "eqsim;": '\U00002242',
+- "eqslantgtr;": '\U00002A96',
+- "eqslantless;": '\U00002A95',
+- "equals;": '\U0000003D',
+- "equest;": '\U0000225F',
+- "equiv;": '\U00002261',
+- "equivDD;": '\U00002A78',
+- "eqvparsl;": '\U000029E5',
+- "erDot;": '\U00002253',
+- "erarr;": '\U00002971',
+- "escr;": '\U0000212F',
+- "esdot;": '\U00002250',
+- "esim;": '\U00002242',
+- "eta;": '\U000003B7',
+- "eth;": '\U000000F0',
+- "euml;": '\U000000EB',
+- "euro;": '\U000020AC',
+- "excl;": '\U00000021',
+- "exist;": '\U00002203',
+- "expectation;": '\U00002130',
+- "exponentiale;": '\U00002147',
+- "fallingdotseq;": '\U00002252',
+- "fcy;": '\U00000444',
+- "female;": '\U00002640',
+- "ffilig;": '\U0000FB03',
+- "fflig;": '\U0000FB00',
+- "ffllig;": '\U0000FB04',
+- "ffr;": '\U0001D523',
+- "filig;": '\U0000FB01',
+- "flat;": '\U0000266D',
+- "fllig;": '\U0000FB02',
+- "fltns;": '\U000025B1',
+- "fnof;": '\U00000192',
+- "fopf;": '\U0001D557',
+- "forall;": '\U00002200',
+- "fork;": '\U000022D4',
+- "forkv;": '\U00002AD9',
+- "fpartint;": '\U00002A0D',
+- "frac12;": '\U000000BD',
+- "frac13;": '\U00002153',
+- "frac14;": '\U000000BC',
+- "frac15;": '\U00002155',
+- "frac16;": '\U00002159',
+- "frac18;": '\U0000215B',
+- "frac23;": '\U00002154',
+- "frac25;": '\U00002156',
+- "frac34;": '\U000000BE',
+- "frac35;": '\U00002157',
+- "frac38;": '\U0000215C',
+- "frac45;": '\U00002158',
+- "frac56;": '\U0000215A',
+- "frac58;": '\U0000215D',
+- "frac78;": '\U0000215E',
+- "frasl;": '\U00002044',
+- "frown;": '\U00002322',
+- "fscr;": '\U0001D4BB',
+- "gE;": '\U00002267',
+- "gEl;": '\U00002A8C',
+- "gacute;": '\U000001F5',
+- "gamma;": '\U000003B3',
+- "gammad;": '\U000003DD',
+- "gap;": '\U00002A86',
+- "gbreve;": '\U0000011F',
+- "gcirc;": '\U0000011D',
+- "gcy;": '\U00000433',
+- "gdot;": '\U00000121',
+- "ge;": '\U00002265',
+- "gel;": '\U000022DB',
+- "geq;": '\U00002265',
+- "geqq;": '\U00002267',
+- "geqslant;": '\U00002A7E',
+- "ges;": '\U00002A7E',
+- "gescc;": '\U00002AA9',
+- "gesdot;": '\U00002A80',
+- "gesdoto;": '\U00002A82',
+- "gesdotol;": '\U00002A84',
+- "gesles;": '\U00002A94',
+- "gfr;": '\U0001D524',
+- "gg;": '\U0000226B',
+- "ggg;": '\U000022D9',
+- "gimel;": '\U00002137',
+- "gjcy;": '\U00000453',
+- "gl;": '\U00002277',
+- "glE;": '\U00002A92',
+- "gla;": '\U00002AA5',
+- "glj;": '\U00002AA4',
+- "gnE;": '\U00002269',
+- "gnap;": '\U00002A8A',
+- "gnapprox;": '\U00002A8A',
+- "gne;": '\U00002A88',
+- "gneq;": '\U00002A88',
+- "gneqq;": '\U00002269',
+- "gnsim;": '\U000022E7',
+- "gopf;": '\U0001D558',
+- "grave;": '\U00000060',
+- "gscr;": '\U0000210A',
+- "gsim;": '\U00002273',
+- "gsime;": '\U00002A8E',
+- "gsiml;": '\U00002A90',
+- "gt;": '\U0000003E',
+- "gtcc;": '\U00002AA7',
+- "gtcir;": '\U00002A7A',
+- "gtdot;": '\U000022D7',
+- "gtlPar;": '\U00002995',
+- "gtquest;": '\U00002A7C',
+- "gtrapprox;": '\U00002A86',
+- "gtrarr;": '\U00002978',
+- "gtrdot;": '\U000022D7',
+- "gtreqless;": '\U000022DB',
+- "gtreqqless;": '\U00002A8C',
+- "gtrless;": '\U00002277',
+- "gtrsim;": '\U00002273',
+- "hArr;": '\U000021D4',
+- "hairsp;": '\U0000200A',
+- "half;": '\U000000BD',
+- "hamilt;": '\U0000210B',
+- "hardcy;": '\U0000044A',
+- "harr;": '\U00002194',
+- "harrcir;": '\U00002948',
+- "harrw;": '\U000021AD',
+- "hbar;": '\U0000210F',
+- "hcirc;": '\U00000125',
+- "hearts;": '\U00002665',
+- "heartsuit;": '\U00002665',
+- "hellip;": '\U00002026',
+- "hercon;": '\U000022B9',
+- "hfr;": '\U0001D525',
+- "hksearow;": '\U00002925',
+- "hkswarow;": '\U00002926',
+- "hoarr;": '\U000021FF',
+- "homtht;": '\U0000223B',
+- "hookleftarrow;": '\U000021A9',
+- "hookrightarrow;": '\U000021AA',
+- "hopf;": '\U0001D559',
+- "horbar;": '\U00002015',
+- "hscr;": '\U0001D4BD',
+- "hslash;": '\U0000210F',
+- "hstrok;": '\U00000127',
+- "hybull;": '\U00002043',
+- "hyphen;": '\U00002010',
+- "iacute;": '\U000000ED',
+- "ic;": '\U00002063',
+- "icirc;": '\U000000EE',
+- "icy;": '\U00000438',
+- "iecy;": '\U00000435',
+- "iexcl;": '\U000000A1',
+- "iff;": '\U000021D4',
+- "ifr;": '\U0001D526',
+- "igrave;": '\U000000EC',
+- "ii;": '\U00002148',
+- "iiiint;": '\U00002A0C',
+- "iiint;": '\U0000222D',
+- "iinfin;": '\U000029DC',
+- "iiota;": '\U00002129',
+- "ijlig;": '\U00000133',
+- "imacr;": '\U0000012B',
+- "image;": '\U00002111',
+- "imagline;": '\U00002110',
+- "imagpart;": '\U00002111',
+- "imath;": '\U00000131',
+- "imof;": '\U000022B7',
+- "imped;": '\U000001B5',
+- "in;": '\U00002208',
+- "incare;": '\U00002105',
+- "infin;": '\U0000221E',
+- "infintie;": '\U000029DD',
+- "inodot;": '\U00000131',
+- "int;": '\U0000222B',
+- "intcal;": '\U000022BA',
+- "integers;": '\U00002124',
+- "intercal;": '\U000022BA',
+- "intlarhk;": '\U00002A17',
+- "intprod;": '\U00002A3C',
+- "iocy;": '\U00000451',
+- "iogon;": '\U0000012F',
+- "iopf;": '\U0001D55A',
+- "iota;": '\U000003B9',
+- "iprod;": '\U00002A3C',
+- "iquest;": '\U000000BF',
+- "iscr;": '\U0001D4BE',
+- "isin;": '\U00002208',
+- "isinE;": '\U000022F9',
+- "isindot;": '\U000022F5',
+- "isins;": '\U000022F4',
+- "isinsv;": '\U000022F3',
+- "isinv;": '\U00002208',
+- "it;": '\U00002062',
+- "itilde;": '\U00000129',
+- "iukcy;": '\U00000456',
+- "iuml;": '\U000000EF',
+- "jcirc;": '\U00000135',
+- "jcy;": '\U00000439',
+- "jfr;": '\U0001D527',
+- "jmath;": '\U00000237',
+- "jopf;": '\U0001D55B',
+- "jscr;": '\U0001D4BF',
+- "jsercy;": '\U00000458',
+- "jukcy;": '\U00000454',
+- "kappa;": '\U000003BA',
+- "kappav;": '\U000003F0',
+- "kcedil;": '\U00000137',
+- "kcy;": '\U0000043A',
+- "kfr;": '\U0001D528',
+- "kgreen;": '\U00000138',
+- "khcy;": '\U00000445',
+- "kjcy;": '\U0000045C',
+- "kopf;": '\U0001D55C',
+- "kscr;": '\U0001D4C0',
+- "lAarr;": '\U000021DA',
+- "lArr;": '\U000021D0',
+- "lAtail;": '\U0000291B',
+- "lBarr;": '\U0000290E',
+- "lE;": '\U00002266',
+- "lEg;": '\U00002A8B',
+- "lHar;": '\U00002962',
+- "lacute;": '\U0000013A',
+- "laemptyv;": '\U000029B4',
+- "lagran;": '\U00002112',
+- "lambda;": '\U000003BB',
+- "lang;": '\U000027E8',
+- "langd;": '\U00002991',
+- "langle;": '\U000027E8',
+- "lap;": '\U00002A85',
+- "laquo;": '\U000000AB',
+- "larr;": '\U00002190',
+- "larrb;": '\U000021E4',
+- "larrbfs;": '\U0000291F',
+- "larrfs;": '\U0000291D',
+- "larrhk;": '\U000021A9',
+- "larrlp;": '\U000021AB',
+- "larrpl;": '\U00002939',
+- "larrsim;": '\U00002973',
+- "larrtl;": '\U000021A2',
+- "lat;": '\U00002AAB',
+- "latail;": '\U00002919',
+- "late;": '\U00002AAD',
+- "lbarr;": '\U0000290C',
+- "lbbrk;": '\U00002772',
+- "lbrace;": '\U0000007B',
+- "lbrack;": '\U0000005B',
+- "lbrke;": '\U0000298B',
+- "lbrksld;": '\U0000298F',
+- "lbrkslu;": '\U0000298D',
+- "lcaron;": '\U0000013E',
+- "lcedil;": '\U0000013C',
+- "lceil;": '\U00002308',
+- "lcub;": '\U0000007B',
+- "lcy;": '\U0000043B',
+- "ldca;": '\U00002936',
+- "ldquo;": '\U0000201C',
+- "ldquor;": '\U0000201E',
+- "ldrdhar;": '\U00002967',
+- "ldrushar;": '\U0000294B',
+- "ldsh;": '\U000021B2',
+- "le;": '\U00002264',
+- "leftarrow;": '\U00002190',
+- "leftarrowtail;": '\U000021A2',
+- "leftharpoondown;": '\U000021BD',
+- "leftharpoonup;": '\U000021BC',
+- "leftleftarrows;": '\U000021C7',
+- "leftrightarrow;": '\U00002194',
+- "leftrightarrows;": '\U000021C6',
+- "leftrightharpoons;": '\U000021CB',
+- "leftrightsquigarrow;": '\U000021AD',
+- "leftthreetimes;": '\U000022CB',
+- "leg;": '\U000022DA',
+- "leq;": '\U00002264',
+- "leqq;": '\U00002266',
+- "leqslant;": '\U00002A7D',
+- "les;": '\U00002A7D',
+- "lescc;": '\U00002AA8',
+- "lesdot;": '\U00002A7F',
+- "lesdoto;": '\U00002A81',
+- "lesdotor;": '\U00002A83',
+- "lesges;": '\U00002A93',
+- "lessapprox;": '\U00002A85',
+- "lessdot;": '\U000022D6',
+- "lesseqgtr;": '\U000022DA',
+- "lesseqqgtr;": '\U00002A8B',
+- "lessgtr;": '\U00002276',
+- "lesssim;": '\U00002272',
+- "lfisht;": '\U0000297C',
+- "lfloor;": '\U0000230A',
+- "lfr;": '\U0001D529',
+- "lg;": '\U00002276',
+- "lgE;": '\U00002A91',
+- "lhard;": '\U000021BD',
+- "lharu;": '\U000021BC',
+- "lharul;": '\U0000296A',
+- "lhblk;": '\U00002584',
+- "ljcy;": '\U00000459',
+- "ll;": '\U0000226A',
+- "llarr;": '\U000021C7',
+- "llcorner;": '\U0000231E',
+- "llhard;": '\U0000296B',
+- "lltri;": '\U000025FA',
+- "lmidot;": '\U00000140',
+- "lmoust;": '\U000023B0',
+- "lmoustache;": '\U000023B0',
+- "lnE;": '\U00002268',
+- "lnap;": '\U00002A89',
+- "lnapprox;": '\U00002A89',
+- "lne;": '\U00002A87',
+- "lneq;": '\U00002A87',
+- "lneqq;": '\U00002268',
+- "lnsim;": '\U000022E6',
+- "loang;": '\U000027EC',
+- "loarr;": '\U000021FD',
+- "lobrk;": '\U000027E6',
+- "longleftarrow;": '\U000027F5',
+- "longleftrightarrow;": '\U000027F7',
+- "longmapsto;": '\U000027FC',
+- "longrightarrow;": '\U000027F6',
+- "looparrowleft;": '\U000021AB',
+- "looparrowright;": '\U000021AC',
+- "lopar;": '\U00002985',
+- "lopf;": '\U0001D55D',
+- "loplus;": '\U00002A2D',
+- "lotimes;": '\U00002A34',
+- "lowast;": '\U00002217',
+- "lowbar;": '\U0000005F',
+- "loz;": '\U000025CA',
+- "lozenge;": '\U000025CA',
+- "lozf;": '\U000029EB',
+- "lpar;": '\U00000028',
+- "lparlt;": '\U00002993',
+- "lrarr;": '\U000021C6',
+- "lrcorner;": '\U0000231F',
+- "lrhar;": '\U000021CB',
+- "lrhard;": '\U0000296D',
+- "lrm;": '\U0000200E',
+- "lrtri;": '\U000022BF',
+- "lsaquo;": '\U00002039',
+- "lscr;": '\U0001D4C1',
+- "lsh;": '\U000021B0',
+- "lsim;": '\U00002272',
+- "lsime;": '\U00002A8D',
+- "lsimg;": '\U00002A8F',
+- "lsqb;": '\U0000005B',
+- "lsquo;": '\U00002018',
+- "lsquor;": '\U0000201A',
+- "lstrok;": '\U00000142',
+- "lt;": '\U0000003C',
+- "ltcc;": '\U00002AA6',
+- "ltcir;": '\U00002A79',
+- "ltdot;": '\U000022D6',
+- "lthree;": '\U000022CB',
+- "ltimes;": '\U000022C9',
+- "ltlarr;": '\U00002976',
+- "ltquest;": '\U00002A7B',
+- "ltrPar;": '\U00002996',
+- "ltri;": '\U000025C3',
+- "ltrie;": '\U000022B4',
+- "ltrif;": '\U000025C2',
+- "lurdshar;": '\U0000294A',
+- "luruhar;": '\U00002966',
+- "mDDot;": '\U0000223A',
+- "macr;": '\U000000AF',
+- "male;": '\U00002642',
+- "malt;": '\U00002720',
+- "maltese;": '\U00002720',
+- "map;": '\U000021A6',
+- "mapsto;": '\U000021A6',
+- "mapstodown;": '\U000021A7',
+- "mapstoleft;": '\U000021A4',
+- "mapstoup;": '\U000021A5',
+- "marker;": '\U000025AE',
+- "mcomma;": '\U00002A29',
+- "mcy;": '\U0000043C',
+- "mdash;": '\U00002014',
+- "measuredangle;": '\U00002221',
+- "mfr;": '\U0001D52A',
+- "mho;": '\U00002127',
+- "micro;": '\U000000B5',
+- "mid;": '\U00002223',
+- "midast;": '\U0000002A',
+- "midcir;": '\U00002AF0',
+- "middot;": '\U000000B7',
+- "minus;": '\U00002212',
+- "minusb;": '\U0000229F',
+- "minusd;": '\U00002238',
+- "minusdu;": '\U00002A2A',
+- "mlcp;": '\U00002ADB',
+- "mldr;": '\U00002026',
+- "mnplus;": '\U00002213',
+- "models;": '\U000022A7',
+- "mopf;": '\U0001D55E',
+- "mp;": '\U00002213',
+- "mscr;": '\U0001D4C2',
+- "mstpos;": '\U0000223E',
+- "mu;": '\U000003BC',
+- "multimap;": '\U000022B8',
+- "mumap;": '\U000022B8',
+- "nLeftarrow;": '\U000021CD',
+- "nLeftrightarrow;": '\U000021CE',
+- "nRightarrow;": '\U000021CF',
+- "nVDash;": '\U000022AF',
+- "nVdash;": '\U000022AE',
+- "nabla;": '\U00002207',
+- "nacute;": '\U00000144',
+- "nap;": '\U00002249',
+- "napos;": '\U00000149',
+- "napprox;": '\U00002249',
+- "natur;": '\U0000266E',
+- "natural;": '\U0000266E',
+- "naturals;": '\U00002115',
+- "nbsp;": '\U000000A0',
+- "ncap;": '\U00002A43',
+- "ncaron;": '\U00000148',
+- "ncedil;": '\U00000146',
+- "ncong;": '\U00002247',
+- "ncup;": '\U00002A42',
+- "ncy;": '\U0000043D',
+- "ndash;": '\U00002013',
+- "ne;": '\U00002260',
+- "neArr;": '\U000021D7',
+- "nearhk;": '\U00002924',
+- "nearr;": '\U00002197',
+- "nearrow;": '\U00002197',
+- "nequiv;": '\U00002262',
+- "nesear;": '\U00002928',
+- "nexist;": '\U00002204',
+- "nexists;": '\U00002204',
+- "nfr;": '\U0001D52B',
+- "nge;": '\U00002271',
+- "ngeq;": '\U00002271',
+- "ngsim;": '\U00002275',
+- "ngt;": '\U0000226F',
+- "ngtr;": '\U0000226F',
+- "nhArr;": '\U000021CE',
+- "nharr;": '\U000021AE',
+- "nhpar;": '\U00002AF2',
+- "ni;": '\U0000220B',
+- "nis;": '\U000022FC',
+- "nisd;": '\U000022FA',
+- "niv;": '\U0000220B',
+- "njcy;": '\U0000045A',
+- "nlArr;": '\U000021CD',
+- "nlarr;": '\U0000219A',
+- "nldr;": '\U00002025',
+- "nle;": '\U00002270',
+- "nleftarrow;": '\U0000219A',
+- "nleftrightarrow;": '\U000021AE',
+- "nleq;": '\U00002270',
+- "nless;": '\U0000226E',
+- "nlsim;": '\U00002274',
+- "nlt;": '\U0000226E',
+- "nltri;": '\U000022EA',
+- "nltrie;": '\U000022EC',
+- "nmid;": '\U00002224',
+- "nopf;": '\U0001D55F',
+- "not;": '\U000000AC',
+- "notin;": '\U00002209',
+- "notinva;": '\U00002209',
+- "notinvb;": '\U000022F7',
+- "notinvc;": '\U000022F6',
+- "notni;": '\U0000220C',
+- "notniva;": '\U0000220C',
+- "notnivb;": '\U000022FE',
+- "notnivc;": '\U000022FD',
+- "npar;": '\U00002226',
+- "nparallel;": '\U00002226',
+- "npolint;": '\U00002A14',
+- "npr;": '\U00002280',
+- "nprcue;": '\U000022E0',
+- "nprec;": '\U00002280',
+- "nrArr;": '\U000021CF',
+- "nrarr;": '\U0000219B',
+- "nrightarrow;": '\U0000219B',
+- "nrtri;": '\U000022EB',
+- "nrtrie;": '\U000022ED',
+- "nsc;": '\U00002281',
+- "nsccue;": '\U000022E1',
+- "nscr;": '\U0001D4C3',
+- "nshortmid;": '\U00002224',
+- "nshortparallel;": '\U00002226',
+- "nsim;": '\U00002241',
+- "nsime;": '\U00002244',
+- "nsimeq;": '\U00002244',
+- "nsmid;": '\U00002224',
+- "nspar;": '\U00002226',
+- "nsqsube;": '\U000022E2',
+- "nsqsupe;": '\U000022E3',
+- "nsub;": '\U00002284',
+- "nsube;": '\U00002288',
+- "nsubseteq;": '\U00002288',
+- "nsucc;": '\U00002281',
+- "nsup;": '\U00002285',
+- "nsupe;": '\U00002289',
+- "nsupseteq;": '\U00002289',
+- "ntgl;": '\U00002279',
+- "ntilde;": '\U000000F1',
+- "ntlg;": '\U00002278',
+- "ntriangleleft;": '\U000022EA',
+- "ntrianglelefteq;": '\U000022EC',
+- "ntriangleright;": '\U000022EB',
+- "ntrianglerighteq;": '\U000022ED',
+- "nu;": '\U000003BD',
+- "num;": '\U00000023',
+- "numero;": '\U00002116',
+- "numsp;": '\U00002007',
+- "nvDash;": '\U000022AD',
+- "nvHarr;": '\U00002904',
+- "nvdash;": '\U000022AC',
+- "nvinfin;": '\U000029DE',
+- "nvlArr;": '\U00002902',
+- "nvrArr;": '\U00002903',
+- "nwArr;": '\U000021D6',
+- "nwarhk;": '\U00002923',
+- "nwarr;": '\U00002196',
+- "nwarrow;": '\U00002196',
+- "nwnear;": '\U00002927',
+- "oS;": '\U000024C8',
+- "oacute;": '\U000000F3',
+- "oast;": '\U0000229B',
+- "ocir;": '\U0000229A',
+- "ocirc;": '\U000000F4',
+- "ocy;": '\U0000043E',
+- "odash;": '\U0000229D',
+- "odblac;": '\U00000151',
+- "odiv;": '\U00002A38',
+- "odot;": '\U00002299',
+- "odsold;": '\U000029BC',
+- "oelig;": '\U00000153',
+- "ofcir;": '\U000029BF',
+- "ofr;": '\U0001D52C',
+- "ogon;": '\U000002DB',
+- "ograve;": '\U000000F2',
+- "ogt;": '\U000029C1',
+- "ohbar;": '\U000029B5',
+- "ohm;": '\U000003A9',
+- "oint;": '\U0000222E',
+- "olarr;": '\U000021BA',
+- "olcir;": '\U000029BE',
+- "olcross;": '\U000029BB',
+- "oline;": '\U0000203E',
+- "olt;": '\U000029C0',
+- "omacr;": '\U0000014D',
+- "omega;": '\U000003C9',
+- "omicron;": '\U000003BF',
+- "omid;": '\U000029B6',
+- "ominus;": '\U00002296',
+- "oopf;": '\U0001D560',
+- "opar;": '\U000029B7',
+- "operp;": '\U000029B9',
+- "oplus;": '\U00002295',
+- "or;": '\U00002228',
+- "orarr;": '\U000021BB',
+- "ord;": '\U00002A5D',
+- "order;": '\U00002134',
+- "orderof;": '\U00002134',
+- "ordf;": '\U000000AA',
+- "ordm;": '\U000000BA',
+- "origof;": '\U000022B6',
+- "oror;": '\U00002A56',
+- "orslope;": '\U00002A57',
+- "orv;": '\U00002A5B',
+- "oscr;": '\U00002134',
+- "oslash;": '\U000000F8',
+- "osol;": '\U00002298',
+- "otilde;": '\U000000F5',
+- "otimes;": '\U00002297',
+- "otimesas;": '\U00002A36',
+- "ouml;": '\U000000F6',
+- "ovbar;": '\U0000233D',
+- "par;": '\U00002225',
+- "para;": '\U000000B6',
+- "parallel;": '\U00002225',
+- "parsim;": '\U00002AF3',
+- "parsl;": '\U00002AFD',
+- "part;": '\U00002202',
+- "pcy;": '\U0000043F',
+- "percnt;": '\U00000025',
+- "period;": '\U0000002E',
+- "permil;": '\U00002030',
+- "perp;": '\U000022A5',
+- "pertenk;": '\U00002031',
+- "pfr;": '\U0001D52D',
+- "phi;": '\U000003C6',
+- "phiv;": '\U000003D5',
+- "phmmat;": '\U00002133',
+- "phone;": '\U0000260E',
+- "pi;": '\U000003C0',
+- "pitchfork;": '\U000022D4',
+- "piv;": '\U000003D6',
+- "planck;": '\U0000210F',
+- "planckh;": '\U0000210E',
+- "plankv;": '\U0000210F',
+- "plus;": '\U0000002B',
+- "plusacir;": '\U00002A23',
+- "plusb;": '\U0000229E',
+- "pluscir;": '\U00002A22',
+- "plusdo;": '\U00002214',
+- "plusdu;": '\U00002A25',
+- "pluse;": '\U00002A72',
+- "plusmn;": '\U000000B1',
+- "plussim;": '\U00002A26',
+- "plustwo;": '\U00002A27',
+- "pm;": '\U000000B1',
+- "pointint;": '\U00002A15',
+- "popf;": '\U0001D561',
+- "pound;": '\U000000A3',
+- "pr;": '\U0000227A',
+- "prE;": '\U00002AB3',
+- "prap;": '\U00002AB7',
+- "prcue;": '\U0000227C',
+- "pre;": '\U00002AAF',
+- "prec;": '\U0000227A',
+- "precapprox;": '\U00002AB7',
+- "preccurlyeq;": '\U0000227C',
+- "preceq;": '\U00002AAF',
+- "precnapprox;": '\U00002AB9',
+- "precneqq;": '\U00002AB5',
+- "precnsim;": '\U000022E8',
+- "precsim;": '\U0000227E',
+- "prime;": '\U00002032',
+- "primes;": '\U00002119',
+- "prnE;": '\U00002AB5',
+- "prnap;": '\U00002AB9',
+- "prnsim;": '\U000022E8',
+- "prod;": '\U0000220F',
+- "profalar;": '\U0000232E',
+- "profline;": '\U00002312',
+- "profsurf;": '\U00002313',
+- "prop;": '\U0000221D',
+- "propto;": '\U0000221D',
+- "prsim;": '\U0000227E',
+- "prurel;": '\U000022B0',
+- "pscr;": '\U0001D4C5',
+- "psi;": '\U000003C8',
+- "puncsp;": '\U00002008',
+- "qfr;": '\U0001D52E',
+- "qint;": '\U00002A0C',
+- "qopf;": '\U0001D562',
+- "qprime;": '\U00002057',
+- "qscr;": '\U0001D4C6',
+- "quaternions;": '\U0000210D',
+- "quatint;": '\U00002A16',
+- "quest;": '\U0000003F',
+- "questeq;": '\U0000225F',
+- "quot;": '\U00000022',
+- "rAarr;": '\U000021DB',
+- "rArr;": '\U000021D2',
+- "rAtail;": '\U0000291C',
+- "rBarr;": '\U0000290F',
+- "rHar;": '\U00002964',
+- "racute;": '\U00000155',
+- "radic;": '\U0000221A',
+- "raemptyv;": '\U000029B3',
+- "rang;": '\U000027E9',
+- "rangd;": '\U00002992',
+- "range;": '\U000029A5',
+- "rangle;": '\U000027E9',
+- "raquo;": '\U000000BB',
+- "rarr;": '\U00002192',
+- "rarrap;": '\U00002975',
+- "rarrb;": '\U000021E5',
+- "rarrbfs;": '\U00002920',
+- "rarrc;": '\U00002933',
+- "rarrfs;": '\U0000291E',
+- "rarrhk;": '\U000021AA',
+- "rarrlp;": '\U000021AC',
+- "rarrpl;": '\U00002945',
+- "rarrsim;": '\U00002974',
+- "rarrtl;": '\U000021A3',
+- "rarrw;": '\U0000219D',
+- "ratail;": '\U0000291A',
+- "ratio;": '\U00002236',
+- "rationals;": '\U0000211A',
+- "rbarr;": '\U0000290D',
+- "rbbrk;": '\U00002773',
+- "rbrace;": '\U0000007D',
+- "rbrack;": '\U0000005D',
+- "rbrke;": '\U0000298C',
+- "rbrksld;": '\U0000298E',
+- "rbrkslu;": '\U00002990',
+- "rcaron;": '\U00000159',
+- "rcedil;": '\U00000157',
+- "rceil;": '\U00002309',
+- "rcub;": '\U0000007D',
+- "rcy;": '\U00000440',
+- "rdca;": '\U00002937',
+- "rdldhar;": '\U00002969',
+- "rdquo;": '\U0000201D',
+- "rdquor;": '\U0000201D',
+- "rdsh;": '\U000021B3',
+- "real;": '\U0000211C',
+- "realine;": '\U0000211B',
+- "realpart;": '\U0000211C',
+- "reals;": '\U0000211D',
+- "rect;": '\U000025AD',
+- "reg;": '\U000000AE',
+- "rfisht;": '\U0000297D',
+- "rfloor;": '\U0000230B',
+- "rfr;": '\U0001D52F',
+- "rhard;": '\U000021C1',
+- "rharu;": '\U000021C0',
+- "rharul;": '\U0000296C',
+- "rho;": '\U000003C1',
+- "rhov;": '\U000003F1',
+- "rightarrow;": '\U00002192',
+- "rightarrowtail;": '\U000021A3',
+- "rightharpoondown;": '\U000021C1',
+- "rightharpoonup;": '\U000021C0',
+- "rightleftarrows;": '\U000021C4',
+- "rightleftharpoons;": '\U000021CC',
+- "rightrightarrows;": '\U000021C9',
+- "rightsquigarrow;": '\U0000219D',
+- "rightthreetimes;": '\U000022CC',
+- "ring;": '\U000002DA',
+- "risingdotseq;": '\U00002253',
+- "rlarr;": '\U000021C4',
+- "rlhar;": '\U000021CC',
+- "rlm;": '\U0000200F',
+- "rmoust;": '\U000023B1',
+- "rmoustache;": '\U000023B1',
+- "rnmid;": '\U00002AEE',
+- "roang;": '\U000027ED',
+- "roarr;": '\U000021FE',
+- "robrk;": '\U000027E7',
+- "ropar;": '\U00002986',
+- "ropf;": '\U0001D563',
+- "roplus;": '\U00002A2E',
+- "rotimes;": '\U00002A35',
+- "rpar;": '\U00000029',
+- "rpargt;": '\U00002994',
+- "rppolint;": '\U00002A12',
+- "rrarr;": '\U000021C9',
+- "rsaquo;": '\U0000203A',
+- "rscr;": '\U0001D4C7',
+- "rsh;": '\U000021B1',
+- "rsqb;": '\U0000005D',
+- "rsquo;": '\U00002019',
+- "rsquor;": '\U00002019',
+- "rthree;": '\U000022CC',
+- "rtimes;": '\U000022CA',
+- "rtri;": '\U000025B9',
+- "rtrie;": '\U000022B5',
+- "rtrif;": '\U000025B8',
+- "rtriltri;": '\U000029CE',
+- "ruluhar;": '\U00002968',
+- "rx;": '\U0000211E',
+- "sacute;": '\U0000015B',
+- "sbquo;": '\U0000201A',
+- "sc;": '\U0000227B',
+- "scE;": '\U00002AB4',
+- "scap;": '\U00002AB8',
+- "scaron;": '\U00000161',
+- "sccue;": '\U0000227D',
+- "sce;": '\U00002AB0',
+- "scedil;": '\U0000015F',
+- "scirc;": '\U0000015D',
+- "scnE;": '\U00002AB6',
+- "scnap;": '\U00002ABA',
+- "scnsim;": '\U000022E9',
+- "scpolint;": '\U00002A13',
+- "scsim;": '\U0000227F',
+- "scy;": '\U00000441',
+- "sdot;": '\U000022C5',
+- "sdotb;": '\U000022A1',
+- "sdote;": '\U00002A66',
+- "seArr;": '\U000021D8',
+- "searhk;": '\U00002925',
+- "searr;": '\U00002198',
+- "searrow;": '\U00002198',
+- "sect;": '\U000000A7',
+- "semi;": '\U0000003B',
+- "seswar;": '\U00002929',
+- "setminus;": '\U00002216',
+- "setmn;": '\U00002216',
+- "sext;": '\U00002736',
+- "sfr;": '\U0001D530',
+- "sfrown;": '\U00002322',
+- "sharp;": '\U0000266F',
+- "shchcy;": '\U00000449',
+- "shcy;": '\U00000448',
+- "shortmid;": '\U00002223',
+- "shortparallel;": '\U00002225',
+- "shy;": '\U000000AD',
+- "sigma;": '\U000003C3',
+- "sigmaf;": '\U000003C2',
+- "sigmav;": '\U000003C2',
+- "sim;": '\U0000223C',
+- "simdot;": '\U00002A6A',
+- "sime;": '\U00002243',
+- "simeq;": '\U00002243',
+- "simg;": '\U00002A9E',
+- "simgE;": '\U00002AA0',
+- "siml;": '\U00002A9D',
+- "simlE;": '\U00002A9F',
+- "simne;": '\U00002246',
+- "simplus;": '\U00002A24',
+- "simrarr;": '\U00002972',
+- "slarr;": '\U00002190',
+- "smallsetminus;": '\U00002216',
+- "smashp;": '\U00002A33',
+- "smeparsl;": '\U000029E4',
+- "smid;": '\U00002223',
+- "smile;": '\U00002323',
+- "smt;": '\U00002AAA',
+- "smte;": '\U00002AAC',
+- "softcy;": '\U0000044C',
+- "sol;": '\U0000002F',
+- "solb;": '\U000029C4',
+- "solbar;": '\U0000233F',
+- "sopf;": '\U0001D564',
+- "spades;": '\U00002660',
+- "spadesuit;": '\U00002660',
+- "spar;": '\U00002225',
+- "sqcap;": '\U00002293',
+- "sqcup;": '\U00002294',
+- "sqsub;": '\U0000228F',
+- "sqsube;": '\U00002291',
+- "sqsubset;": '\U0000228F',
+- "sqsubseteq;": '\U00002291',
+- "sqsup;": '\U00002290',
+- "sqsupe;": '\U00002292',
+- "sqsupset;": '\U00002290',
+- "sqsupseteq;": '\U00002292',
+- "squ;": '\U000025A1',
+- "square;": '\U000025A1',
+- "squarf;": '\U000025AA',
+- "squf;": '\U000025AA',
+- "srarr;": '\U00002192',
+- "sscr;": '\U0001D4C8',
+- "ssetmn;": '\U00002216',
+- "ssmile;": '\U00002323',
+- "sstarf;": '\U000022C6',
+- "star;": '\U00002606',
+- "starf;": '\U00002605',
+- "straightepsilon;": '\U000003F5',
+- "straightphi;": '\U000003D5',
+- "strns;": '\U000000AF',
+- "sub;": '\U00002282',
+- "subE;": '\U00002AC5',
+- "subdot;": '\U00002ABD',
+- "sube;": '\U00002286',
+- "subedot;": '\U00002AC3',
+- "submult;": '\U00002AC1',
+- "subnE;": '\U00002ACB',
+- "subne;": '\U0000228A',
+- "subplus;": '\U00002ABF',
+- "subrarr;": '\U00002979',
+- "subset;": '\U00002282',
+- "subseteq;": '\U00002286',
+- "subseteqq;": '\U00002AC5',
+- "subsetneq;": '\U0000228A',
+- "subsetneqq;": '\U00002ACB',
+- "subsim;": '\U00002AC7',
+- "subsub;": '\U00002AD5',
+- "subsup;": '\U00002AD3',
+- "succ;": '\U0000227B',
+- "succapprox;": '\U00002AB8',
+- "succcurlyeq;": '\U0000227D',
+- "succeq;": '\U00002AB0',
+- "succnapprox;": '\U00002ABA',
+- "succneqq;": '\U00002AB6',
+- "succnsim;": '\U000022E9',
+- "succsim;": '\U0000227F',
+- "sum;": '\U00002211',
+- "sung;": '\U0000266A',
+- "sup;": '\U00002283',
+- "sup1;": '\U000000B9',
+- "sup2;": '\U000000B2',
+- "sup3;": '\U000000B3',
+- "supE;": '\U00002AC6',
+- "supdot;": '\U00002ABE',
+- "supdsub;": '\U00002AD8',
+- "supe;": '\U00002287',
+- "supedot;": '\U00002AC4',
+- "suphsol;": '\U000027C9',
+- "suphsub;": '\U00002AD7',
+- "suplarr;": '\U0000297B',
+- "supmult;": '\U00002AC2',
+- "supnE;": '\U00002ACC',
+- "supne;": '\U0000228B',
+- "supplus;": '\U00002AC0',
+- "supset;": '\U00002283',
+- "supseteq;": '\U00002287',
+- "supseteqq;": '\U00002AC6',
+- "supsetneq;": '\U0000228B',
+- "supsetneqq;": '\U00002ACC',
+- "supsim;": '\U00002AC8',
+- "supsub;": '\U00002AD4',
+- "supsup;": '\U00002AD6',
+- "swArr;": '\U000021D9',
+- "swarhk;": '\U00002926',
+- "swarr;": '\U00002199',
+- "swarrow;": '\U00002199',
+- "swnwar;": '\U0000292A',
+- "szlig;": '\U000000DF',
+- "target;": '\U00002316',
+- "tau;": '\U000003C4',
+- "tbrk;": '\U000023B4',
+- "tcaron;": '\U00000165',
+- "tcedil;": '\U00000163',
+- "tcy;": '\U00000442',
+- "tdot;": '\U000020DB',
+- "telrec;": '\U00002315',
+- "tfr;": '\U0001D531',
+- "there4;": '\U00002234',
+- "therefore;": '\U00002234',
+- "theta;": '\U000003B8',
+- "thetasym;": '\U000003D1',
+- "thetav;": '\U000003D1',
+- "thickapprox;": '\U00002248',
+- "thicksim;": '\U0000223C',
+- "thinsp;": '\U00002009',
+- "thkap;": '\U00002248',
+- "thksim;": '\U0000223C',
+- "thorn;": '\U000000FE',
+- "tilde;": '\U000002DC',
+- "times;": '\U000000D7',
+- "timesb;": '\U000022A0',
+- "timesbar;": '\U00002A31',
+- "timesd;": '\U00002A30',
+- "tint;": '\U0000222D',
+- "toea;": '\U00002928',
+- "top;": '\U000022A4',
+- "topbot;": '\U00002336',
+- "topcir;": '\U00002AF1',
+- "topf;": '\U0001D565',
+- "topfork;": '\U00002ADA',
+- "tosa;": '\U00002929',
+- "tprime;": '\U00002034',
+- "trade;": '\U00002122',
+- "triangle;": '\U000025B5',
+- "triangledown;": '\U000025BF',
+- "triangleleft;": '\U000025C3',
+- "trianglelefteq;": '\U000022B4',
+- "triangleq;": '\U0000225C',
+- "triangleright;": '\U000025B9',
+- "trianglerighteq;": '\U000022B5',
+- "tridot;": '\U000025EC',
+- "trie;": '\U0000225C',
+- "triminus;": '\U00002A3A',
+- "triplus;": '\U00002A39',
+- "trisb;": '\U000029CD',
+- "tritime;": '\U00002A3B',
+- "trpezium;": '\U000023E2',
+- "tscr;": '\U0001D4C9',
+- "tscy;": '\U00000446',
+- "tshcy;": '\U0000045B',
+- "tstrok;": '\U00000167',
+- "twixt;": '\U0000226C',
+- "twoheadleftarrow;": '\U0000219E',
+- "twoheadrightarrow;": '\U000021A0',
+- "uArr;": '\U000021D1',
+- "uHar;": '\U00002963',
+- "uacute;": '\U000000FA',
+- "uarr;": '\U00002191',
+- "ubrcy;": '\U0000045E',
+- "ubreve;": '\U0000016D',
+- "ucirc;": '\U000000FB',
+- "ucy;": '\U00000443',
+- "udarr;": '\U000021C5',
+- "udblac;": '\U00000171',
+- "udhar;": '\U0000296E',
+- "ufisht;": '\U0000297E',
+- "ufr;": '\U0001D532',
+- "ugrave;": '\U000000F9',
+- "uharl;": '\U000021BF',
+- "uharr;": '\U000021BE',
+- "uhblk;": '\U00002580',
+- "ulcorn;": '\U0000231C',
+- "ulcorner;": '\U0000231C',
+- "ulcrop;": '\U0000230F',
+- "ultri;": '\U000025F8',
+- "umacr;": '\U0000016B',
+- "uml;": '\U000000A8',
+- "uogon;": '\U00000173',
+- "uopf;": '\U0001D566',
+- "uparrow;": '\U00002191',
+- "updownarrow;": '\U00002195',
+- "upharpoonleft;": '\U000021BF',
+- "upharpoonright;": '\U000021BE',
+- "uplus;": '\U0000228E',
+- "upsi;": '\U000003C5',
+- "upsih;": '\U000003D2',
+- "upsilon;": '\U000003C5',
+- "upuparrows;": '\U000021C8',
+- "urcorn;": '\U0000231D',
+- "urcorner;": '\U0000231D',
+- "urcrop;": '\U0000230E',
+- "uring;": '\U0000016F',
+- "urtri;": '\U000025F9',
+- "uscr;": '\U0001D4CA',
+- "utdot;": '\U000022F0',
+- "utilde;": '\U00000169',
+- "utri;": '\U000025B5',
+- "utrif;": '\U000025B4',
+- "uuarr;": '\U000021C8',
+- "uuml;": '\U000000FC',
+- "uwangle;": '\U000029A7',
+- "vArr;": '\U000021D5',
+- "vBar;": '\U00002AE8',
+- "vBarv;": '\U00002AE9',
+- "vDash;": '\U000022A8',
+- "vangrt;": '\U0000299C',
+- "varepsilon;": '\U000003F5',
+- "varkappa;": '\U000003F0',
+- "varnothing;": '\U00002205',
+- "varphi;": '\U000003D5',
+- "varpi;": '\U000003D6',
+- "varpropto;": '\U0000221D',
+- "varr;": '\U00002195',
+- "varrho;": '\U000003F1',
+- "varsigma;": '\U000003C2',
+- "vartheta;": '\U000003D1',
+- "vartriangleleft;": '\U000022B2',
+- "vartriangleright;": '\U000022B3',
+- "vcy;": '\U00000432',
+- "vdash;": '\U000022A2',
+- "vee;": '\U00002228',
+- "veebar;": '\U000022BB',
+- "veeeq;": '\U0000225A',
+- "vellip;": '\U000022EE',
+- "verbar;": '\U0000007C',
+- "vert;": '\U0000007C',
+- "vfr;": '\U0001D533',
+- "vltri;": '\U000022B2',
+- "vopf;": '\U0001D567',
+- "vprop;": '\U0000221D',
+- "vrtri;": '\U000022B3',
+- "vscr;": '\U0001D4CB',
+- "vzigzag;": '\U0000299A',
+- "wcirc;": '\U00000175',
+- "wedbar;": '\U00002A5F',
+- "wedge;": '\U00002227',
+- "wedgeq;": '\U00002259',
+- "weierp;": '\U00002118',
+- "wfr;": '\U0001D534',
+- "wopf;": '\U0001D568',
+- "wp;": '\U00002118',
+- "wr;": '\U00002240',
+- "wreath;": '\U00002240',
+- "wscr;": '\U0001D4CC',
+- "xcap;": '\U000022C2',
+- "xcirc;": '\U000025EF',
+- "xcup;": '\U000022C3',
+- "xdtri;": '\U000025BD',
+- "xfr;": '\U0001D535',
+- "xhArr;": '\U000027FA',
+- "xharr;": '\U000027F7',
+- "xi;": '\U000003BE',
+- "xlArr;": '\U000027F8',
+- "xlarr;": '\U000027F5',
+- "xmap;": '\U000027FC',
+- "xnis;": '\U000022FB',
+- "xodot;": '\U00002A00',
+- "xopf;": '\U0001D569',
+- "xoplus;": '\U00002A01',
+- "xotime;": '\U00002A02',
+- "xrArr;": '\U000027F9',
+- "xrarr;": '\U000027F6',
+- "xscr;": '\U0001D4CD',
+- "xsqcup;": '\U00002A06',
+- "xuplus;": '\U00002A04',
+- "xutri;": '\U000025B3',
+- "xvee;": '\U000022C1',
+- "xwedge;": '\U000022C0',
+- "yacute;": '\U000000FD',
+- "yacy;": '\U0000044F',
+- "ycirc;": '\U00000177',
+- "ycy;": '\U0000044B',
+- "yen;": '\U000000A5',
+- "yfr;": '\U0001D536',
+- "yicy;": '\U00000457',
+- "yopf;": '\U0001D56A',
+- "yscr;": '\U0001D4CE',
+- "yucy;": '\U0000044E',
+- "yuml;": '\U000000FF',
+- "zacute;": '\U0000017A',
+- "zcaron;": '\U0000017E',
+- "zcy;": '\U00000437',
+- "zdot;": '\U0000017C',
+- "zeetrf;": '\U00002128',
+- "zeta;": '\U000003B6',
+- "zfr;": '\U0001D537',
+- "zhcy;": '\U00000436',
+- "zigrarr;": '\U000021DD',
+- "zopf;": '\U0001D56B',
+- "zscr;": '\U0001D4CF',
+- "zwj;": '\U0000200D',
+- "zwnj;": '\U0000200C',
+- "AElig": '\U000000C6',
+- "AMP": '\U00000026',
+- "Aacute": '\U000000C1',
+- "Acirc": '\U000000C2',
+- "Agrave": '\U000000C0',
+- "Aring": '\U000000C5',
+- "Atilde": '\U000000C3',
+- "Auml": '\U000000C4',
+- "COPY": '\U000000A9',
+- "Ccedil": '\U000000C7',
+- "ETH": '\U000000D0',
+- "Eacute": '\U000000C9',
+- "Ecirc": '\U000000CA',
+- "Egrave": '\U000000C8',
+- "Euml": '\U000000CB',
+- "GT": '\U0000003E',
+- "Iacute": '\U000000CD',
+- "Icirc": '\U000000CE',
+- "Igrave": '\U000000CC',
+- "Iuml": '\U000000CF',
+- "LT": '\U0000003C',
+- "Ntilde": '\U000000D1',
+- "Oacute": '\U000000D3',
+- "Ocirc": '\U000000D4',
+- "Ograve": '\U000000D2',
+- "Oslash": '\U000000D8',
+- "Otilde": '\U000000D5',
+- "Ouml": '\U000000D6',
+- "QUOT": '\U00000022',
+- "REG": '\U000000AE',
+- "THORN": '\U000000DE',
+- "Uacute": '\U000000DA',
+- "Ucirc": '\U000000DB',
+- "Ugrave": '\U000000D9',
+- "Uuml": '\U000000DC',
+- "Yacute": '\U000000DD',
+- "aacute": '\U000000E1',
+- "acirc": '\U000000E2',
+- "acute": '\U000000B4',
+- "aelig": '\U000000E6',
+- "agrave": '\U000000E0',
+- "amp": '\U00000026',
+- "aring": '\U000000E5',
+- "atilde": '\U000000E3',
+- "auml": '\U000000E4',
+- "brvbar": '\U000000A6',
+- "ccedil": '\U000000E7',
+- "cedil": '\U000000B8',
+- "cent": '\U000000A2',
+- "copy": '\U000000A9',
+- "curren": '\U000000A4',
+- "deg": '\U000000B0',
+- "divide": '\U000000F7',
+- "eacute": '\U000000E9',
+- "ecirc": '\U000000EA',
+- "egrave": '\U000000E8',
+- "eth": '\U000000F0',
+- "euml": '\U000000EB',
+- "frac12": '\U000000BD',
+- "frac14": '\U000000BC',
+- "frac34": '\U000000BE',
+- "gt": '\U0000003E',
+- "iacute": '\U000000ED',
+- "icirc": '\U000000EE',
+- "iexcl": '\U000000A1',
+- "igrave": '\U000000EC',
+- "iquest": '\U000000BF',
+- "iuml": '\U000000EF',
+- "laquo": '\U000000AB',
+- "lt": '\U0000003C',
+- "macr": '\U000000AF',
+- "micro": '\U000000B5',
+- "middot": '\U000000B7',
+- "nbsp": '\U000000A0',
+- "not": '\U000000AC',
+- "ntilde": '\U000000F1',
+- "oacute": '\U000000F3',
+- "ocirc": '\U000000F4',
+- "ograve": '\U000000F2',
+- "ordf": '\U000000AA',
+- "ordm": '\U000000BA',
+- "oslash": '\U000000F8',
+- "otilde": '\U000000F5',
+- "ouml": '\U000000F6',
+- "para": '\U000000B6',
+- "plusmn": '\U000000B1',
+- "pound": '\U000000A3',
+- "quot": '\U00000022',
+- "raquo": '\U000000BB',
+- "reg": '\U000000AE',
+- "sect": '\U000000A7',
+- "shy": '\U000000AD',
+- "sup1": '\U000000B9',
+- "sup2": '\U000000B2',
+- "sup3": '\U000000B3',
+- "szlig": '\U000000DF',
+- "thorn": '\U000000FE',
+- "times": '\U000000D7',
+- "uacute": '\U000000FA',
+- "ucirc": '\U000000FB',
+- "ugrave": '\U000000F9',
+- "uml": '\U000000A8',
+- "uuml": '\U000000FC',
+- "yacute": '\U000000FD',
+- "yen": '\U000000A5',
+- "yuml": '\U000000FF',
-}
--func TestAccessorsAccessGetInsideArray(t *testing.T) {
--
-- current := map[string]interface{}{"names": []interface{}{map[string]interface{}{"first": "Tyler", "last": "Bunnell"}, map[string]interface{}{"first": "Capitol", "last": "Bollocks"}}}
-- assert.Equal(t, "Tyler", access(current, "names[0].first", nil, false, true))
-- assert.Equal(t, "Bunnell", access(current, "names[0].last", nil, false, true))
-- assert.Equal(t, "Capitol", access(current, "names[1].first", nil, false, true))
-- assert.Equal(t, "Bollocks", access(current, "names[1].last", nil, false, true))
--
-- assert.Panics(t, func() {
-- access(current, "names[2]", nil, false, true)
-- })
-- assert.Nil(t, access(current, "names[2]", nil, false, false))
-
+-// HTML entities that are two unicode codepoints.
+-var entity2 = map[string][2]rune{
+- // TODO(nigeltao): Handle replacements that are wider than their names.
+- // "nLt;": {'\u226A', '\u20D2'},
+- // "nGt;": {'\u226B', '\u20D2'},
+- "NotEqualTilde;": {'\u2242', '\u0338'},
+- "NotGreaterFullEqual;": {'\u2267', '\u0338'},
+- "NotGreaterGreater;": {'\u226B', '\u0338'},
+- "NotGreaterSlantEqual;": {'\u2A7E', '\u0338'},
+- "NotHumpDownHump;": {'\u224E', '\u0338'},
+- "NotHumpEqual;": {'\u224F', '\u0338'},
+- "NotLeftTriangleBar;": {'\u29CF', '\u0338'},
+- "NotLessLess;": {'\u226A', '\u0338'},
+- "NotLessSlantEqual;": {'\u2A7D', '\u0338'},
+- "NotNestedGreaterGreater;": {'\u2AA2', '\u0338'},
+- "NotNestedLessLess;": {'\u2AA1', '\u0338'},
+- "NotPrecedesEqual;": {'\u2AAF', '\u0338'},
+- "NotRightTriangleBar;": {'\u29D0', '\u0338'},
+- "NotSquareSubset;": {'\u228F', '\u0338'},
+- "NotSquareSuperset;": {'\u2290', '\u0338'},
+- "NotSubset;": {'\u2282', '\u20D2'},
+- "NotSucceedsEqual;": {'\u2AB0', '\u0338'},
+- "NotSucceedsTilde;": {'\u227F', '\u0338'},
+- "NotSuperset;": {'\u2283', '\u20D2'},
+- "ThickSpace;": {'\u205F', '\u200A'},
+- "acE;": {'\u223E', '\u0333'},
+- "bne;": {'\u003D', '\u20E5'},
+- "bnequiv;": {'\u2261', '\u20E5'},
+- "caps;": {'\u2229', '\uFE00'},
+- "cups;": {'\u222A', '\uFE00'},
+- "fjlig;": {'\u0066', '\u006A'},
+- "gesl;": {'\u22DB', '\uFE00'},
+- "gvertneqq;": {'\u2269', '\uFE00'},
+- "gvnE;": {'\u2269', '\uFE00'},
+- "lates;": {'\u2AAD', '\uFE00'},
+- "lesg;": {'\u22DA', '\uFE00'},
+- "lvertneqq;": {'\u2268', '\uFE00'},
+- "lvnE;": {'\u2268', '\uFE00'},
+- "nGg;": {'\u22D9', '\u0338'},
+- "nGtv;": {'\u226B', '\u0338'},
+- "nLl;": {'\u22D8', '\u0338'},
+- "nLtv;": {'\u226A', '\u0338'},
+- "nang;": {'\u2220', '\u20D2'},
+- "napE;": {'\u2A70', '\u0338'},
+- "napid;": {'\u224B', '\u0338'},
+- "nbump;": {'\u224E', '\u0338'},
+- "nbumpe;": {'\u224F', '\u0338'},
+- "ncongdot;": {'\u2A6D', '\u0338'},
+- "nedot;": {'\u2250', '\u0338'},
+- "nesim;": {'\u2242', '\u0338'},
+- "ngE;": {'\u2267', '\u0338'},
+- "ngeqq;": {'\u2267', '\u0338'},
+- "ngeqslant;": {'\u2A7E', '\u0338'},
+- "nges;": {'\u2A7E', '\u0338'},
+- "nlE;": {'\u2266', '\u0338'},
+- "nleqq;": {'\u2266', '\u0338'},
+- "nleqslant;": {'\u2A7D', '\u0338'},
+- "nles;": {'\u2A7D', '\u0338'},
+- "notinE;": {'\u22F9', '\u0338'},
+- "notindot;": {'\u22F5', '\u0338'},
+- "nparsl;": {'\u2AFD', '\u20E5'},
+- "npart;": {'\u2202', '\u0338'},
+- "npre;": {'\u2AAF', '\u0338'},
+- "npreceq;": {'\u2AAF', '\u0338'},
+- "nrarrc;": {'\u2933', '\u0338'},
+- "nrarrw;": {'\u219D', '\u0338'},
+- "nsce;": {'\u2AB0', '\u0338'},
+- "nsubE;": {'\u2AC5', '\u0338'},
+- "nsubset;": {'\u2282', '\u20D2'},
+- "nsubseteqq;": {'\u2AC5', '\u0338'},
+- "nsucceq;": {'\u2AB0', '\u0338'},
+- "nsupE;": {'\u2AC6', '\u0338'},
+- "nsupset;": {'\u2283', '\u20D2'},
+- "nsupseteqq;": {'\u2AC6', '\u0338'},
+- "nvap;": {'\u224D', '\u20D2'},
+- "nvge;": {'\u2265', '\u20D2'},
+- "nvgt;": {'\u003E', '\u20D2'},
+- "nvle;": {'\u2264', '\u20D2'},
+- "nvlt;": {'\u003C', '\u20D2'},
+- "nvltrie;": {'\u22B4', '\u20D2'},
+- "nvrtrie;": {'\u22B5', '\u20D2'},
+- "nvsim;": {'\u223C', '\u20D2'},
+- "race;": {'\u223D', '\u0331'},
+- "smtes;": {'\u2AAC', '\uFE00'},
+- "sqcaps;": {'\u2293', '\uFE00'},
+- "sqcups;": {'\u2294', '\uFE00'},
+- "varsubsetneq;": {'\u228A', '\uFE00'},
+- "varsubsetneqq;": {'\u2ACB', '\uFE00'},
+- "varsupsetneq;": {'\u228B', '\uFE00'},
+- "varsupsetneqq;": {'\u2ACC', '\uFE00'},
+- "vnsub;": {'\u2282', '\u20D2'},
+- "vnsup;": {'\u2283', '\u20D2'},
+- "vsubnE;": {'\u2ACB', '\uFE00'},
+- "vsubne;": {'\u228A', '\uFE00'},
+- "vsupnE;": {'\u2ACC', '\uFE00'},
+- "vsupne;": {'\u228B', '\uFE00'},
-}
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/entity_test.go b/Godeps/_workspace/src/golang.org/x/net/html/entity_test.go
+deleted file mode 100644
+index b53f866..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/entity_test.go
++++ /dev/null
+@@ -1,29 +0,0 @@
+-// Copyright 2010 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
--func TestAccessorsAccessGetFromArrayWithInt(t *testing.T) {
--
-- current := []interface{}{map[string]interface{}{"first": "Tyler", "last": "Bunnell"}, map[string]interface{}{"first": "Capitol", "last": "Bollocks"}}
-- one := access(current, 0, nil, false, false)
-- two := access(current, 1, nil, false, false)
-- three := access(current, 2, nil, false, false)
+-package html
-
-- assert.Equal(t, "Tyler", one.(map[string]interface{})["first"])
-- assert.Equal(t, "Capitol", two.(map[string]interface{})["first"])
-- assert.Nil(t, three)
+-import (
+- "testing"
+- "unicode/utf8"
+-)
-
+-func TestEntityLength(t *testing.T) {
+- // We verify that the length of UTF-8 encoding of each value is <= 1 + len(key).
+- // The +1 comes from the leading "&". This property implies that the length of
+- // unescaped text is <= the length of escaped text.
+- for k, v := range entity {
+- if 1+len(k) < utf8.RuneLen(v) {
+- t.Error("escaped entity &" + k + " is shorter than its UTF-8 encoding " + string(v))
+- }
+- if len(k) > longestEntityWithoutSemicolon && k[len(k)-1] != ';' {
+- t.Errorf("entity name %s is %d characters, but longestEntityWithoutSemicolon=%d", k, len(k), longestEntityWithoutSemicolon)
+- }
+- }
+- for k, v := range entity2 {
+- if 1+len(k) < utf8.RuneLen(v[0])+utf8.RuneLen(v[1]) {
+- t.Error("escaped entity &" + k + " is shorter than its UTF-8 encoding " + string(v[0]) + string(v[1]))
+- }
+- }
-}
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/escape.go b/Godeps/_workspace/src/golang.org/x/net/html/escape.go
+deleted file mode 100644
+index 75bddff..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/escape.go
++++ /dev/null
+@@ -1,258 +0,0 @@
+-// Copyright 2010 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
--func TestAccessorsGet(t *testing.T) {
+-package html
-
-- current := New(map[string]interface{}{"name": "Tyler"})
-- assert.Equal(t, "Tyler", current.Get("name").data)
+-import (
+- "bytes"
+- "strings"
+- "unicode/utf8"
+-)
-
+-// These replacements permit compatibility with old numeric entities that
+-// assumed Windows-1252 encoding.
+-// http://www.whatwg.org/specs/web-apps/current-work/multipage/tokenization.html#consume-a-character-reference
+-var replacementTable = [...]rune{
+- '\u20AC', // First entry is what 0x80 should be replaced with.
+- '\u0081',
+- '\u201A',
+- '\u0192',
+- '\u201E',
+- '\u2026',
+- '\u2020',
+- '\u2021',
+- '\u02C6',
+- '\u2030',
+- '\u0160',
+- '\u2039',
+- '\u0152',
+- '\u008D',
+- '\u017D',
+- '\u008F',
+- '\u0090',
+- '\u2018',
+- '\u2019',
+- '\u201C',
+- '\u201D',
+- '\u2022',
+- '\u2013',
+- '\u2014',
+- '\u02DC',
+- '\u2122',
+- '\u0161',
+- '\u203A',
+- '\u0153',
+- '\u009D',
+- '\u017E',
+- '\u0178', // Last entry is 0x9F.
+- // 0x00->'\uFFFD' is handled programmatically.
+- // 0x0D->'\u000D' is a no-op.
-}
-
--func TestAccessorsAccessSetSingleField(t *testing.T) {
+-// unescapeEntity reads an entity like "<" from b[src:] and writes the
+-// corresponding "<" to b[dst:], returning the incremented dst and src cursors.
+-// Precondition: b[src] == '&' && dst <= src.
+-// attribute should be true if parsing an attribute value.
+-func unescapeEntity(b []byte, dst, src int, attribute bool) (dst1, src1 int) {
+- // http://www.whatwg.org/specs/web-apps/current-work/multipage/tokenization.html#consume-a-character-reference
-
-- current := map[string]interface{}{"name": "Tyler"}
-- access(current, "name", "Mat", true, false)
-- assert.Equal(t, current["name"], "Mat")
+- // i starts at 1 because we already know that s[0] == '&'.
+- i, s := 1, b[src:]
-
-- access(current, "age", 29, true, true)
-- assert.Equal(t, current["age"], 29)
+- if len(s) <= 1 {
+- b[dst] = b[src]
+- return dst + 1, src + 1
+- }
-
--}
+- if s[i] == '#' {
+- if len(s) <= 3 { // We need to have at least "&#.".
+- b[dst] = b[src]
+- return dst + 1, src + 1
+- }
+- i++
+- c := s[i]
+- hex := false
+- if c == 'x' || c == 'X' {
+- hex = true
+- i++
+- }
-
--func TestAccessorsAccessSetSingleFieldNotExisting(t *testing.T) {
+- x := '\x00'
+- for i < len(s) {
+- c = s[i]
+- i++
+- if hex {
+- if '0' <= c && c <= '9' {
+- x = 16*x + rune(c) - '0'
+- continue
+- } else if 'a' <= c && c <= 'f' {
+- x = 16*x + rune(c) - 'a' + 10
+- continue
+- } else if 'A' <= c && c <= 'F' {
+- x = 16*x + rune(c) - 'A' + 10
+- continue
+- }
+- } else if '0' <= c && c <= '9' {
+- x = 10*x + rune(c) - '0'
+- continue
+- }
+- if c != ';' {
+- i--
+- }
+- break
+- }
-
-- current := map[string]interface{}{}
-- access(current, "name", "Mat", true, false)
-- assert.Equal(t, current["name"], "Mat")
+- if i <= 3 { // No characters matched.
+- b[dst] = b[src]
+- return dst + 1, src + 1
+- }
-
--}
+- if 0x80 <= x && x <= 0x9F {
+- // Replace characters from Windows-1252 with UTF-8 equivalents.
+- x = replacementTable[x-0x80]
+- } else if x == 0 || (0xD800 <= x && x <= 0xDFFF) || x > 0x10FFFF {
+- // Replace invalid characters with the replacement character.
+- x = '\uFFFD'
+- }
-
--func TestAccessorsAccessSetDeep(t *testing.T) {
+- return dst + utf8.EncodeRune(b[dst:], x), src + i
+- }
-
-- current := map[string]interface{}{"name": map[string]interface{}{"first": "Tyler", "last": "Bunnell"}}
+- // Consume the maximum number of characters possible, with the
+- // consumed characters matching one of the named references.
-
-- access(current, "name.first", "Mat", true, true)
-- access(current, "name.last", "Ryer", true, true)
+- for i < len(s) {
+- c := s[i]
+- i++
+- // Lower-cased characters are more common in entities, so we check for them first.
+- if 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' || '0' <= c && c <= '9' {
+- continue
+- }
+- if c != ';' {
+- i--
+- }
+- break
+- }
-
-- assert.Equal(t, "Mat", access(current, "name.first", nil, false, true))
-- assert.Equal(t, "Ryer", access(current, "name.last", nil, false, true))
+- entityName := string(s[1:i])
+- if entityName == "" {
+- // No-op.
+- } else if attribute && entityName[len(entityName)-1] != ';' && len(s) > i && s[i] == '=' {
+- // No-op.
+- } else if x := entity[entityName]; x != 0 {
+- return dst + utf8.EncodeRune(b[dst:], x), src + i
+- } else if x := entity2[entityName]; x[0] != 0 {
+- dst1 := dst + utf8.EncodeRune(b[dst:], x[0])
+- return dst1 + utf8.EncodeRune(b[dst1:], x[1]), src + i
+- } else if !attribute {
+- maxLen := len(entityName) - 1
+- if maxLen > longestEntityWithoutSemicolon {
+- maxLen = longestEntityWithoutSemicolon
+- }
+- for j := maxLen; j > 1; j-- {
+- if x := entity[entityName[:j]]; x != 0 {
+- return dst + utf8.EncodeRune(b[dst:], x), src + j + 1
+- }
+- }
+- }
-
+- dst1, src1 = dst+i, src+i
+- copy(b[dst:dst1], b[src:src1])
+- return dst1, src1
-}
--func TestAccessorsAccessSetDeepDeep(t *testing.T) {
--
-- current := map[string]interface{}{"one": map[string]interface{}{"two": map[string]interface{}{"three": map[string]interface{}{"four": 4}}}}
--
-- access(current, "one.two.three.four", 5, true, true)
--
-- assert.Equal(t, 5, access(current, "one.two.three.four", nil, false, true))
-
+-// unescape unescapes b's entities in-place, so that "a<b" becomes "a<b".
+-// attribute should be true if parsing an attribute value.
+-func unescape(b []byte, attribute bool) []byte {
+- for i, c := range b {
+- if c == '&' {
+- dst, src := unescapeEntity(b, i, i, attribute)
+- for src < len(b) {
+- c := b[src]
+- if c == '&' {
+- dst, src = unescapeEntity(b, dst, src, attribute)
+- } else {
+- b[dst] = c
+- dst, src = dst+1, src+1
+- }
+- }
+- return b[0:dst]
+- }
+- }
+- return b
-}
--func TestAccessorsAccessSetArray(t *testing.T) {
--
-- current := map[string]interface{}{"names": []interface{}{"Tyler"}}
--
-- access(current, "names[0]", "Mat", true, true)
--
-- assert.Equal(t, "Mat", access(current, "names[0]", nil, false, true))
-
+-// lower lower-cases the A-Z bytes in b in-place, so that "aBc" becomes "abc".
+-func lower(b []byte) []byte {
+- for i, c := range b {
+- if 'A' <= c && c <= 'Z' {
+- b[i] = c + 'a' - 'A'
+- }
+- }
+- return b
-}
--func TestAccessorsAccessSetInsideArray(t *testing.T) {
--
-- current := map[string]interface{}{"names": []interface{}{map[string]interface{}{"first": "Tyler", "last": "Bunnell"}, map[string]interface{}{"first": "Capitol", "last": "Bollocks"}}}
--
-- access(current, "names[0].first", "Mat", true, true)
-- access(current, "names[0].last", "Ryer", true, true)
-- access(current, "names[1].first", "Captain", true, true)
-- access(current, "names[1].last", "Underpants", true, true)
-
-- assert.Equal(t, "Mat", access(current, "names[0].first", nil, false, true))
-- assert.Equal(t, "Ryer", access(current, "names[0].last", nil, false, true))
-- assert.Equal(t, "Captain", access(current, "names[1].first", nil, false, true))
-- assert.Equal(t, "Underpants", access(current, "names[1].last", nil, false, true))
+-const escapedChars = "&'<>\"\r"
-
+-func escape(w writer, s string) error {
+- i := strings.IndexAny(s, escapedChars)
+- for i != -1 {
+- if _, err := w.WriteString(s[:i]); err != nil {
+- return err
+- }
+- var esc string
+- switch s[i] {
+- case '&':
+- esc = "&"
+- case '\'':
+- // "'" is shorter than "'" and apos was not in HTML until HTML5.
+- esc = "'"
+- case '<':
+- esc = "<"
+- case '>':
+- esc = ">"
+- case '"':
+- // """ is shorter than """.
+- esc = """
+- case '\r':
+- esc = " "
+- default:
+- panic("unrecognized escape character")
+- }
+- s = s[i+1:]
+- if _, err := w.WriteString(esc); err != nil {
+- return err
+- }
+- i = strings.IndexAny(s, escapedChars)
+- }
+- _, err := w.WriteString(s)
+- return err
-}
-
--func TestAccessorsAccessSetFromArrayWithInt(t *testing.T) {
--
-- current := []interface{}{map[string]interface{}{"first": "Tyler", "last": "Bunnell"}, map[string]interface{}{"first": "Capitol", "last": "Bollocks"}}
-- one := access(current, 0, nil, false, false)
-- two := access(current, 1, nil, false, false)
-- three := access(current, 2, nil, false, false)
--
-- assert.Equal(t, "Tyler", one.(map[string]interface{})["first"])
-- assert.Equal(t, "Capitol", two.(map[string]interface{})["first"])
-- assert.Nil(t, three)
--
+-// EscapeString escapes special characters like "<" to become "<". It
+-// escapes only five such characters: <, >, &, ' and ".
+-// UnescapeString(EscapeString(s)) == s always holds, but the converse isn't
+-// always true.
+-func EscapeString(s string) string {
+- if strings.IndexAny(s, escapedChars) == -1 {
+- return s
+- }
+- var buf bytes.Buffer
+- escape(&buf, s)
+- return buf.String()
-}
-
--func TestAccessorsSet(t *testing.T) {
--
-- current := New(map[string]interface{}{"name": "Tyler"})
-- current.Set("name", "Mat")
-- assert.Equal(t, "Mat", current.Get("name").data)
--
+-// UnescapeString unescapes entities like "<" to become "<". It unescapes a
+-// larger range of entities than EscapeString escapes. For example, "á"
+-// unescapes to "á", as does "á" and "&xE1;".
+-// UnescapeString(EscapeString(s)) == s always holds, but the converse isn't
+-// always true.
+-func UnescapeString(s string) string {
+- for _, c := range s {
+- if c == '&' {
+- return string(unescape([]byte(s), false))
+- }
+- }
+- return s
-}
-diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/codegen/array-access.txt b/Godeps/_workspace/src/github.com/stretchr/objx/codegen/array-access.txt
-deleted file mode 100644
-index 3060234..0000000
---- a/Godeps/_workspace/src/github.com/stretchr/objx/codegen/array-access.txt
-+++ /dev/null
-@@ -1,14 +0,0 @@
-- case []{1}:
-- a := object.([]{1})
-- if isSet {
-- a[index] = value.({1})
-- } else {
-- if index >= len(a) {
-- if panics {
-- panic(fmt.Sprintf("objx: Index %d is out of range because the []{1} only contains %d items.", index, len(a)))
-- }
-- return nil
-- } else {
-- return a[index]
-- }
-- }
-diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/codegen/index.html b/Godeps/_workspace/src/github.com/stretchr/objx/codegen/index.html
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/escape_test.go b/Godeps/_workspace/src/golang.org/x/net/html/escape_test.go
deleted file mode 100644
-index 379ffc3..0000000
---- a/Godeps/_workspace/src/github.com/stretchr/objx/codegen/index.html
+index b405d4b..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/escape_test.go
+++ /dev/null
-@@ -1,86 +0,0 @@
--<html>
-- <head>
-- <title>
-- Codegen
-- </title>
-- <style>
-- body {
-- width: 800px;
-- margin: auto;
-- }
-- textarea {
-- width: 100%;
-- min-height: 100px;
-- font-family: Courier;
-- }
-- </style>
-- </head>
-- <body>
--
-- <h2>
-- Template
-- </h2>
-- <p>
-- Use <code>{x}</code> as a placeholder for each argument.
-- </p>
-- <textarea id="template"></textarea>
--
-- <h2>
-- Arguments (comma separated)
-- </h2>
-- <p>
-- One block per line
-- </p>
-- <textarea id="args"></textarea>
--
-- <h2>
-- Output
-- </h2>
-- <input id="go" type="button" value="Generate code" />
--
-- <textarea id="output"></textarea>
--
-- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-- <script>
--
-- $(function(){
--
-- $("#go").click(function(){
--
-- var output = ""
-- var template = $("#template").val()
-- var args = $("#args").val()
--
-- // collect the args
-- var argLines = args.split("\n")
-- for (var line in argLines) {
--
-- var argLine = argLines[line];
-- var thisTemp = template
+@@ -1,97 +0,0 @@
+-// Copyright 2013 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
-- // get individual args
-- var args = argLine.split(",")
+-package html
-
-- for (var argI in args) {
-- var argText = args[argI];
-- var argPlaceholder = "{" + argI + "}";
+-import "testing"
-
-- while (thisTemp.indexOf(argPlaceholder) > -1) {
-- thisTemp = thisTemp.replace(argPlaceholder, argText);
-- }
+-type unescapeTest struct {
+- // A short description of the test case.
+- desc string
+- // The HTML text.
+- html string
+- // The unescaped text.
+- unescaped string
+-}
-
-- }
+-var unescapeTests = []unescapeTest{
+- // Handle no entities.
+- {
+- "copy",
+- "A\ttext\nstring",
+- "A\ttext\nstring",
+- },
+- // Handle simple named entities.
+- {
+- "simple",
+- "& > <",
+- "& > <",
+- },
+- // Handle hitting the end of the string.
+- {
+- "stringEnd",
+- "& &",
+- "& &",
+- },
+- // Handle entities with two codepoints.
+- {
+- "multiCodepoint",
+- "text ⋛︀ blah",
+- "text \u22db\ufe00 blah",
+- },
+- // Handle decimal numeric entities.
+- {
+- "decimalEntity",
+- "Delta = Δ ",
+- "Delta = Δ ",
+- },
+- // Handle hexadecimal numeric entities.
+- {
+- "hexadecimalEntity",
+- "Lambda = λ = λ ",
+- "Lambda = λ = λ ",
+- },
+- // Handle numeric early termination.
+- {
+- "numericEnds",
+- "&# &#x €43 © = ©f = ©",
+- "&# &#x €43 © = ©f = ©",
+- },
+- // Handle numeric ISO-8859-1 entity replacements.
+- {
+- "numericReplacements",
+- "Footnote‡",
+- "Footnote‡",
+- },
+-}
-
-- output += thisTemp
+-func TestUnescape(t *testing.T) {
+- for _, tt := range unescapeTests {
+- unescaped := UnescapeString(tt.html)
+- if unescaped != tt.unescaped {
+- t.Errorf("TestUnescape %s: want %q, got %q", tt.desc, tt.unescaped, unescaped)
+- }
+- }
+-}
-
-- }
+-func TestUnescapeEscape(t *testing.T) {
+- ss := []string{
+- ``,
+- `abc def`,
+- `a & b`,
+- `a&b`,
+- `a & b`,
+- `"`,
+- `"`,
+- `"<&>"`,
+- `"<&>"`,
+- `3&5==1 && 0<1, "0<1", a+acute=á`,
+- `The special characters are: <, >, &, ' and "`,
+- }
+- for _, s := range ss {
+- if got := UnescapeString(EscapeString(s)); got != s {
+- t.Errorf("got %q want %q", got, s)
+- }
+- }
+-}
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/example_test.go b/Godeps/_workspace/src/golang.org/x/net/html/example_test.go
+deleted file mode 100644
+index 0b06ed7..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/example_test.go
++++ /dev/null
+@@ -1,40 +0,0 @@
+-// Copyright 2012 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
-- $("#output").val(output);
+-// This example demonstrates parsing HTML data and walking the resulting tree.
+-package html_test
-
-- });
+-import (
+- "fmt"
+- "log"
+- "strings"
-
-- });
+- "golang.org/x/net/html"
+-)
-
-- </script>
-- </body>
--</html>
-diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/codegen/template.txt b/Godeps/_workspace/src/github.com/stretchr/objx/codegen/template.txt
+-func ExampleParse() {
+- s := `<p>Links:</p><ul><li><a href="foo">Foo</a><li><a href="/bar/baz">BarBaz</a></ul>`
+- doc, err := html.Parse(strings.NewReader(s))
+- if err != nil {
+- log.Fatal(err)
+- }
+- var f func(*html.Node)
+- f = func(n *html.Node) {
+- if n.Type == html.ElementNode && n.Data == "a" {
+- for _, a := range n.Attr {
+- if a.Key == "href" {
+- fmt.Println(a.Val)
+- break
+- }
+- }
+- }
+- for c := n.FirstChild; c != nil; c = c.NextSibling {
+- f(c)
+- }
+- }
+- f(doc)
+- // Output:
+- // foo
+- // /bar/baz
+-}
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/foreign.go b/Godeps/_workspace/src/golang.org/x/net/html/foreign.go
deleted file mode 100644
-index b396900..0000000
---- a/Godeps/_workspace/src/github.com/stretchr/objx/codegen/template.txt
+index d3b3844..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/foreign.go
+++ /dev/null
-@@ -1,286 +0,0 @@
--/*
-- {4} ({1} and []{1})
-- --------------------------------------------------
--*/
+@@ -1,226 +0,0 @@
+-// Copyright 2011 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
--// {4} gets the value as a {1}, returns the optionalDefault
--// value or a system default object if the value is the wrong type.
--func (v *Value) {4}(optionalDefault ...{1}) {1} {
-- if s, ok := v.data.({1}); ok {
-- return s
-- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
+-package html
+-
+-import (
+- "strings"
+-)
+-
+-func adjustAttributeNames(aa []Attribute, nameMap map[string]string) {
+- for i := range aa {
+- if newName, ok := nameMap[aa[i].Key]; ok {
+- aa[i].Key = newName
+- }
- }
-- return {3}
-}
-
--// Must{4} gets the value as a {1}.
--//
--// Panics if the object is not a {1}.
--func (v *Value) Must{4}() {1} {
-- return v.data.({1})
+-func adjustForeignAttributes(aa []Attribute) {
+- for i, a := range aa {
+- if a.Key == "" || a.Key[0] != 'x' {
+- continue
+- }
+- switch a.Key {
+- case "xlink:actuate", "xlink:arcrole", "xlink:href", "xlink:role", "xlink:show",
+- "xlink:title", "xlink:type", "xml:base", "xml:lang", "xml:space", "xmlns:xlink":
+- j := strings.Index(a.Key, ":")
+- aa[i].Namespace = a.Key[:j]
+- aa[i].Key = a.Key[j+1:]
+- }
+- }
-}
-
--// {4}Slice gets the value as a []{1}, returns the optionalDefault
--// value or nil if the value is not a []{1}.
--func (v *Value) {4}Slice(optionalDefault ...[]{1}) []{1} {
-- if s, ok := v.data.([]{1}); ok {
-- return s
+-func htmlIntegrationPoint(n *Node) bool {
+- if n.Type != ElementNode {
+- return false
- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
+- switch n.Namespace {
+- case "math":
+- if n.Data == "annotation-xml" {
+- for _, a := range n.Attr {
+- if a.Key == "encoding" {
+- val := strings.ToLower(a.Val)
+- if val == "text/html" || val == "application/xhtml+xml" {
+- return true
+- }
+- }
+- }
+- }
+- case "svg":
+- switch n.Data {
+- case "desc", "foreignObject", "title":
+- return true
+- }
- }
-- return nil
+- return false
-}
-
--// Must{4}Slice gets the value as a []{1}.
--//
--// Panics if the object is not a []{1}.
--func (v *Value) Must{4}Slice() []{1} {
-- return v.data.([]{1})
+-func mathMLTextIntegrationPoint(n *Node) bool {
+- if n.Namespace != "math" {
+- return false
+- }
+- switch n.Data {
+- case "mi", "mo", "mn", "ms", "mtext":
+- return true
+- }
+- return false
-}
-
--// Is{4} gets whether the object contained is a {1} or not.
--func (v *Value) Is{4}() bool {
-- _, ok := v.data.({1})
-- return ok
+-// Section 12.2.5.5.
+-var breakout = map[string]bool{
+- "b": true,
+- "big": true,
+- "blockquote": true,
+- "body": true,
+- "br": true,
+- "center": true,
+- "code": true,
+- "dd": true,
+- "div": true,
+- "dl": true,
+- "dt": true,
+- "em": true,
+- "embed": true,
+- "h1": true,
+- "h2": true,
+- "h3": true,
+- "h4": true,
+- "h5": true,
+- "h6": true,
+- "head": true,
+- "hr": true,
+- "i": true,
+- "img": true,
+- "li": true,
+- "listing": true,
+- "menu": true,
+- "meta": true,
+- "nobr": true,
+- "ol": true,
+- "p": true,
+- "pre": true,
+- "ruby": true,
+- "s": true,
+- "small": true,
+- "span": true,
+- "strong": true,
+- "strike": true,
+- "sub": true,
+- "sup": true,
+- "table": true,
+- "tt": true,
+- "u": true,
+- "ul": true,
+- "var": true,
-}
-
--// Is{4}Slice gets whether the object contained is a []{1} or not.
--func (v *Value) Is{4}Slice() bool {
-- _, ok := v.data.([]{1})
-- return ok
+-// Section 12.2.5.5.
+-var svgTagNameAdjustments = map[string]string{
+- "altglyph": "altGlyph",
+- "altglyphdef": "altGlyphDef",
+- "altglyphitem": "altGlyphItem",
+- "animatecolor": "animateColor",
+- "animatemotion": "animateMotion",
+- "animatetransform": "animateTransform",
+- "clippath": "clipPath",
+- "feblend": "feBlend",
+- "fecolormatrix": "feColorMatrix",
+- "fecomponenttransfer": "feComponentTransfer",
+- "fecomposite": "feComposite",
+- "feconvolvematrix": "feConvolveMatrix",
+- "fediffuselighting": "feDiffuseLighting",
+- "fedisplacementmap": "feDisplacementMap",
+- "fedistantlight": "feDistantLight",
+- "feflood": "feFlood",
+- "fefunca": "feFuncA",
+- "fefuncb": "feFuncB",
+- "fefuncg": "feFuncG",
+- "fefuncr": "feFuncR",
+- "fegaussianblur": "feGaussianBlur",
+- "feimage": "feImage",
+- "femerge": "feMerge",
+- "femergenode": "feMergeNode",
+- "femorphology": "feMorphology",
+- "feoffset": "feOffset",
+- "fepointlight": "fePointLight",
+- "fespecularlighting": "feSpecularLighting",
+- "fespotlight": "feSpotLight",
+- "fetile": "feTile",
+- "feturbulence": "feTurbulence",
+- "foreignobject": "foreignObject",
+- "glyphref": "glyphRef",
+- "lineargradient": "linearGradient",
+- "radialgradient": "radialGradient",
+- "textpath": "textPath",
-}
-
--// Each{4} calls the specified callback for each object
--// in the []{1}.
--//
--// Panics if the object is the wrong type.
--func (v *Value) Each{4}(callback func(int, {1}) bool) *Value {
--
-- for index, val := range v.Must{4}Slice() {
-- carryon := callback(index, val)
-- if carryon == false {
-- break
-- }
-- }
--
-- return v
--
+-// Section 12.2.5.1
+-var mathMLAttributeAdjustments = map[string]string{
+- "definitionurl": "definitionURL",
-}
-
--// Where{4} uses the specified decider function to select items
--// from the []{1}. The object contained in the result will contain
--// only the selected items.
--func (v *Value) Where{4}(decider func(int, {1}) bool) *Value {
--
-- var selected []{1}
--
-- v.Each{4}(func(index int, val {1}) bool {
-- shouldSelect := decider(index, val)
-- if shouldSelect == false {
-- selected = append(selected, val)
-- }
-- return true
-- })
--
-- return &Value{data:selected}
--
+-var svgAttributeAdjustments = map[string]string{
+- "attributename": "attributeName",
+- "attributetype": "attributeType",
+- "basefrequency": "baseFrequency",
+- "baseprofile": "baseProfile",
+- "calcmode": "calcMode",
+- "clippathunits": "clipPathUnits",
+- "contentscripttype": "contentScriptType",
+- "contentstyletype": "contentStyleType",
+- "diffuseconstant": "diffuseConstant",
+- "edgemode": "edgeMode",
+- "externalresourcesrequired": "externalResourcesRequired",
+- "filterres": "filterRes",
+- "filterunits": "filterUnits",
+- "glyphref": "glyphRef",
+- "gradienttransform": "gradientTransform",
+- "gradientunits": "gradientUnits",
+- "kernelmatrix": "kernelMatrix",
+- "kernelunitlength": "kernelUnitLength",
+- "keypoints": "keyPoints",
+- "keysplines": "keySplines",
+- "keytimes": "keyTimes",
+- "lengthadjust": "lengthAdjust",
+- "limitingconeangle": "limitingConeAngle",
+- "markerheight": "markerHeight",
+- "markerunits": "markerUnits",
+- "markerwidth": "markerWidth",
+- "maskcontentunits": "maskContentUnits",
+- "maskunits": "maskUnits",
+- "numoctaves": "numOctaves",
+- "pathlength": "pathLength",
+- "patterncontentunits": "patternContentUnits",
+- "patterntransform": "patternTransform",
+- "patternunits": "patternUnits",
+- "pointsatx": "pointsAtX",
+- "pointsaty": "pointsAtY",
+- "pointsatz": "pointsAtZ",
+- "preservealpha": "preserveAlpha",
+- "preserveaspectratio": "preserveAspectRatio",
+- "primitiveunits": "primitiveUnits",
+- "refx": "refX",
+- "refy": "refY",
+- "repeatcount": "repeatCount",
+- "repeatdur": "repeatDur",
+- "requiredextensions": "requiredExtensions",
+- "requiredfeatures": "requiredFeatures",
+- "specularconstant": "specularConstant",
+- "specularexponent": "specularExponent",
+- "spreadmethod": "spreadMethod",
+- "startoffset": "startOffset",
+- "stddeviation": "stdDeviation",
+- "stitchtiles": "stitchTiles",
+- "surfacescale": "surfaceScale",
+- "systemlanguage": "systemLanguage",
+- "tablevalues": "tableValues",
+- "targetx": "targetX",
+- "targety": "targetY",
+- "textlength": "textLength",
+- "viewbox": "viewBox",
+- "viewtarget": "viewTarget",
+- "xchannelselector": "xChannelSelector",
+- "ychannelselector": "yChannelSelector",
+- "zoomandpan": "zoomAndPan",
-}
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/node.go b/Godeps/_workspace/src/golang.org/x/net/html/node.go
+deleted file mode 100644
+index 26b657a..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/node.go
++++ /dev/null
+@@ -1,193 +0,0 @@
+-// Copyright 2011 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
--// Group{4} uses the specified grouper function to group the items
--// keyed by the return of the grouper. The object contained in the
--// result will contain a map[string][]{1}.
--func (v *Value) Group{4}(grouper func(int, {1}) string) *Value {
--
-- groups := make(map[string][]{1})
--
-- v.Each{4}(func(index int, val {1}) bool {
-- group := grouper(index, val)
-- if _, ok := groups[group]; !ok {
-- groups[group] = make([]{1}, 0)
-- }
-- groups[group] = append(groups[group], val)
-- return true
-- })
--
-- return &Value{data:groups}
+-package html
-
--}
+-import (
+- "golang.org/x/net/html/atom"
+-)
-
--// Replace{4} uses the specified function to replace each {1}s
--// by iterating each item. The data in the returned result will be a
--// []{1} containing the replaced items.
--func (v *Value) Replace{4}(replacer func(int, {1}) {1}) *Value {
+-// A NodeType is the type of a Node.
+-type NodeType uint32
-
-- arr := v.Must{4}Slice()
-- replaced := make([]{1}, len(arr))
+-const (
+- ErrorNode NodeType = iota
+- TextNode
+- DocumentNode
+- ElementNode
+- CommentNode
+- DoctypeNode
+- scopeMarkerNode
+-)
-
-- v.Each{4}(func(index int, val {1}) bool {
-- replaced[index] = replacer(index, val)
-- return true
-- })
+-// Section 12.2.3.3 says "scope markers are inserted when entering applet
+-// elements, buttons, object elements, marquees, table cells, and table
+-// captions, and are used to prevent formatting from 'leaking'".
+-var scopeMarker = Node{Type: scopeMarkerNode}
-
-- return &Value{data:replaced}
+-// A Node consists of a NodeType and some Data (tag name for element nodes,
+-// content for text) and are part of a tree of Nodes. Element nodes may also
+-// have a Namespace and contain a slice of Attributes. Data is unescaped, so
+-// that it looks like "a<b" rather than "a<b". For element nodes, DataAtom
+-// is the atom for Data, or zero if Data is not a known tag name.
+-//
+-// An empty Namespace implies a "http://www.w3.org/1999/xhtml" namespace.
+-// Similarly, "math" is short for "http://www.w3.org/1998/Math/MathML", and
+-// "svg" is short for "http://www.w3.org/2000/svg".
+-type Node struct {
+- Parent, FirstChild, LastChild, PrevSibling, NextSibling *Node
-
+- Type NodeType
+- DataAtom atom.Atom
+- Data string
+- Namespace string
+- Attr []Attribute
-}
-
--// Collect{4} uses the specified collector function to collect a value
--// for each of the {1}s in the slice. The data returned will be a
--// []interface{}.
--func (v *Value) Collect{4}(collector func(int, {1}) interface{}) *Value {
--
-- arr := v.Must{4}Slice()
-- collected := make([]interface{}, len(arr))
+-// InsertBefore inserts newChild as a child of n, immediately before oldChild
+-// in the sequence of n's children. oldChild may be nil, in which case newChild
+-// is appended to the end of n's children.
+-//
+-// It will panic if newChild already has a parent or siblings.
+-func (n *Node) InsertBefore(newChild, oldChild *Node) {
+- if newChild.Parent != nil || newChild.PrevSibling != nil || newChild.NextSibling != nil {
+- panic("html: InsertBefore called for an attached child Node")
+- }
+- var prev, next *Node
+- if oldChild != nil {
+- prev, next = oldChild.PrevSibling, oldChild
+- } else {
+- prev = n.LastChild
+- }
+- if prev != nil {
+- prev.NextSibling = newChild
+- } else {
+- n.FirstChild = newChild
+- }
+- if next != nil {
+- next.PrevSibling = newChild
+- } else {
+- n.LastChild = newChild
+- }
+- newChild.Parent = n
+- newChild.PrevSibling = prev
+- newChild.NextSibling = next
+-}
-
-- v.Each{4}(func(index int, val {1}) bool {
-- collected[index] = collector(index, val)
-- return true
-- })
+-// AppendChild adds a node c as a child of n.
+-//
+-// It will panic if c already has a parent or siblings.
+-func (n *Node) AppendChild(c *Node) {
+- if c.Parent != nil || c.PrevSibling != nil || c.NextSibling != nil {
+- panic("html: AppendChild called for an attached child Node")
+- }
+- last := n.LastChild
+- if last != nil {
+- last.NextSibling = c
+- } else {
+- n.FirstChild = c
+- }
+- n.LastChild = c
+- c.Parent = n
+- c.PrevSibling = last
+-}
-
-- return &Value{data:collected}
+-// RemoveChild removes a node c that is a child of n. Afterwards, c will have
+-// no parent and no siblings.
+-//
+-// It will panic if c's parent is not n.
+-func (n *Node) RemoveChild(c *Node) {
+- if c.Parent != n {
+- panic("html: RemoveChild called for a non-child Node")
+- }
+- if n.FirstChild == c {
+- n.FirstChild = c.NextSibling
+- }
+- if c.NextSibling != nil {
+- c.NextSibling.PrevSibling = c.PrevSibling
+- }
+- if n.LastChild == c {
+- n.LastChild = c.PrevSibling
+- }
+- if c.PrevSibling != nil {
+- c.PrevSibling.NextSibling = c.NextSibling
+- }
+- c.Parent = nil
+- c.PrevSibling = nil
+- c.NextSibling = nil
-}
-
--// ************************************************************
--// TESTS
--// ************************************************************
--
--func Test{4}(t *testing.T) {
+-// reparentChildren reparents all of src's child nodes to dst.
+-func reparentChildren(dst, src *Node) {
+- for {
+- child := src.FirstChild
+- if child == nil {
+- break
+- }
+- src.RemoveChild(child)
+- dst.AppendChild(child)
+- }
+-}
-
-- val := {1}( {2} )
-- m := map[string]interface{}{"value": val, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").{4}())
-- assert.Equal(t, val, New(m).Get("value").Must{4}())
-- assert.Equal(t, {1}({3}), New(m).Get("nothing").{4}())
-- assert.Equal(t, val, New(m).Get("nothing").{4}({2}))
+-// clone returns a new node with the same type, data and attributes.
+-// The clone has no parent, no siblings and no children.
+-func (n *Node) clone() *Node {
+- m := &Node{
+- Type: n.Type,
+- DataAtom: n.DataAtom,
+- Data: n.Data,
+- Attr: make([]Attribute, len(n.Attr)),
+- }
+- copy(m.Attr, n.Attr)
+- return m
+-}
-
-- assert.Panics(t, func() {
-- New(m).Get("age").Must{4}()
-- })
+-// nodeStack is a stack of nodes.
+-type nodeStack []*Node
-
+-// pop pops the stack. It will panic if s is empty.
+-func (s *nodeStack) pop() *Node {
+- i := len(*s)
+- n := (*s)[i-1]
+- *s = (*s)[:i-1]
+- return n
-}
-
--func Test{4}Slice(t *testing.T) {
--
-- val := {1}( {2} )
-- m := map[string]interface{}{"value": []{1}{ val }, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").{4}Slice()[0])
-- assert.Equal(t, val, New(m).Get("value").Must{4}Slice()[0])
-- assert.Equal(t, []{1}(nil), New(m).Get("nothing").{4}Slice())
-- assert.Equal(t, val, New(m).Get("nothing").{4}Slice( []{1}{ {1}({2}) } )[0])
+-// top returns the most recently pushed node, or nil if s is empty.
+-func (s *nodeStack) top() *Node {
+- if i := len(*s); i > 0 {
+- return (*s)[i-1]
+- }
+- return nil
+-}
-
-- assert.Panics(t, func() {
-- New(m).Get("nothing").Must{4}Slice()
-- })
+-// index returns the index of the top-most occurrence of n in the stack, or -1
+-// if n is not present.
+-func (s *nodeStack) index(n *Node) int {
+- for i := len(*s) - 1; i >= 0; i-- {
+- if (*s)[i] == n {
+- return i
+- }
+- }
+- return -1
+-}
-
+-// insert inserts a node at the given index.
+-func (s *nodeStack) insert(i int, n *Node) {
+- (*s) = append(*s, nil)
+- copy((*s)[i+1:], (*s)[i:])
+- (*s)[i] = n
-}
-
--func TestIs{4}(t *testing.T) {
+-// remove removes a node from the stack. It is a no-op if n is not present.
+-func (s *nodeStack) remove(n *Node) {
+- i := s.index(n)
+- if i == -1 {
+- return
+- }
+- copy((*s)[i:], (*s)[i+1:])
+- j := len(*s) - 1
+- (*s)[j] = nil
+- *s = (*s)[:j]
+-}
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/node_test.go b/Godeps/_workspace/src/golang.org/x/net/html/node_test.go
+deleted file mode 100644
+index 471102f..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/node_test.go
++++ /dev/null
+@@ -1,146 +0,0 @@
+-// Copyright 2010 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
-- var v *Value
+-package html
-
-- v = &Value{data: {1}({2})}
-- assert.True(t, v.Is{4}())
+-import (
+- "fmt"
+-)
-
-- v = &Value{data: []{1}{ {1}({2}) }}
-- assert.True(t, v.Is{4}Slice())
+-// checkTreeConsistency checks that a node and its descendants are all
+-// consistent in their parent/child/sibling relationships.
+-func checkTreeConsistency(n *Node) error {
+- return checkTreeConsistency1(n, 0)
+-}
-
+-func checkTreeConsistency1(n *Node, depth int) error {
+- if depth == 1e4 {
+- return fmt.Errorf("html: tree looks like it contains a cycle")
+- }
+- if err := checkNodeConsistency(n); err != nil {
+- return err
+- }
+- for c := n.FirstChild; c != nil; c = c.NextSibling {
+- if err := checkTreeConsistency1(c, depth+1); err != nil {
+- return err
+- }
+- }
+- return nil
-}
-
--func TestEach{4}(t *testing.T) {
+-// checkNodeConsistency checks that a node's parent/child/sibling relationships
+-// are consistent.
+-func checkNodeConsistency(n *Node) error {
+- if n == nil {
+- return nil
+- }
-
-- v := &Value{data: []{1}{ {1}({2}), {1}({2}), {1}({2}), {1}({2}), {1}({2}) }}
-- count := 0
-- replacedVals := make([]{1}, 0)
-- assert.Equal(t, v, v.Each{4}(func(i int, val {1}) bool {
+- nParent := 0
+- for p := n.Parent; p != nil; p = p.Parent {
+- nParent++
+- if nParent == 1e4 {
+- return fmt.Errorf("html: parent list looks like an infinite loop")
+- }
+- }
-
-- count++
-- replacedVals = append(replacedVals, val)
+- nForward := 0
+- for c := n.FirstChild; c != nil; c = c.NextSibling {
+- nForward++
+- if nForward == 1e6 {
+- return fmt.Errorf("html: forward list of children looks like an infinite loop")
+- }
+- if c.Parent != n {
+- return fmt.Errorf("html: inconsistent child/parent relationship")
+- }
+- }
-
-- // abort early
-- if i == 2 {
-- return false
+- nBackward := 0
+- for c := n.LastChild; c != nil; c = c.PrevSibling {
+- nBackward++
+- if nBackward == 1e6 {
+- return fmt.Errorf("html: backward list of children looks like an infinite loop")
- }
+- if c.Parent != n {
+- return fmt.Errorf("html: inconsistent child/parent relationship")
+- }
+- }
-
-- return true
+- if n.Parent != nil {
+- if n.Parent == n {
+- return fmt.Errorf("html: inconsistent parent relationship")
+- }
+- if n.Parent == n.FirstChild {
+- return fmt.Errorf("html: inconsistent parent/first relationship")
+- }
+- if n.Parent == n.LastChild {
+- return fmt.Errorf("html: inconsistent parent/last relationship")
+- }
+- if n.Parent == n.PrevSibling {
+- return fmt.Errorf("html: inconsistent parent/prev relationship")
+- }
+- if n.Parent == n.NextSibling {
+- return fmt.Errorf("html: inconsistent parent/next relationship")
+- }
-
-- }))
+- parentHasNAsAChild := false
+- for c := n.Parent.FirstChild; c != nil; c = c.NextSibling {
+- if c == n {
+- parentHasNAsAChild = true
+- break
+- }
+- }
+- if !parentHasNAsAChild {
+- return fmt.Errorf("html: inconsistent parent/child relationship")
+- }
+- }
-
-- assert.Equal(t, count, 3)
-- assert.Equal(t, replacedVals[0], v.Must{4}Slice()[0])
-- assert.Equal(t, replacedVals[1], v.Must{4}Slice()[1])
-- assert.Equal(t, replacedVals[2], v.Must{4}Slice()[2])
+- if n.PrevSibling != nil && n.PrevSibling.NextSibling != n {
+- return fmt.Errorf("html: inconsistent prev/next relationship")
+- }
+- if n.NextSibling != nil && n.NextSibling.PrevSibling != n {
+- return fmt.Errorf("html: inconsistent next/prev relationship")
+- }
-
--}
+- if (n.FirstChild == nil) != (n.LastChild == nil) {
+- return fmt.Errorf("html: inconsistent first/last relationship")
+- }
+- if n.FirstChild != nil && n.FirstChild == n.LastChild {
+- // We have a sole child.
+- if n.FirstChild.PrevSibling != nil || n.FirstChild.NextSibling != nil {
+- return fmt.Errorf("html: inconsistent sole child's sibling relationship")
+- }
+- }
-
--func TestWhere{4}(t *testing.T) {
+- seen := map[*Node]bool{}
-
-- v := &Value{data: []{1}{ {1}({2}), {1}({2}), {1}({2}), {1}({2}), {1}({2}), {1}({2}) }}
+- var last *Node
+- for c := n.FirstChild; c != nil; c = c.NextSibling {
+- if seen[c] {
+- return fmt.Errorf("html: inconsistent repeated child")
+- }
+- seen[c] = true
+- last = c
+- }
+- if last != n.LastChild {
+- return fmt.Errorf("html: inconsistent last relationship")
+- }
-
-- selected := v.Where{4}(func(i int, val {1}) bool {
-- return i%2==0
-- }).Must{4}Slice()
+- var first *Node
+- for c := n.LastChild; c != nil; c = c.PrevSibling {
+- if !seen[c] {
+- return fmt.Errorf("html: inconsistent missing child")
+- }
+- delete(seen, c)
+- first = c
+- }
+- if first != n.FirstChild {
+- return fmt.Errorf("html: inconsistent first relationship")
+- }
-
-- assert.Equal(t, 3, len(selected))
+- if len(seen) != 0 {
+- return fmt.Errorf("html: inconsistent forwards/backwards child list")
+- }
-
+- return nil
-}
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/parse.go b/Godeps/_workspace/src/golang.org/x/net/html/parse.go
+deleted file mode 100644
+index b42a323..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/parse.go
++++ /dev/null
+@@ -1,2092 +0,0 @@
+-// Copyright 2010 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
--func TestGroup{4}(t *testing.T) {
--
-- v := &Value{data: []{1}{ {1}({2}), {1}({2}), {1}({2}), {1}({2}), {1}({2}), {1}({2}) }}
+-package html
-
-- grouped := v.Group{4}(func(i int, val {1}) string {
-- return fmt.Sprintf("%v", i%2==0)
-- }).data.(map[string][]{1})
+-import (
+- "errors"
+- "fmt"
+- "io"
+- "strings"
-
-- assert.Equal(t, 2, len(grouped))
-- assert.Equal(t, 3, len(grouped["true"]))
-- assert.Equal(t, 3, len(grouped["false"]))
+- a "golang.org/x/net/html/atom"
+-)
-
+-// A parser implements the HTML5 parsing algorithm:
+-// http://www.whatwg.org/specs/web-apps/current-work/multipage/tokenization.html#tree-construction
+-type parser struct {
+- // tokenizer provides the tokens for the parser.
+- tokenizer *Tokenizer
+- // tok is the most recently read token.
+- tok Token
+- // Self-closing tags like <hr/> are treated as start tags, except that
+- // hasSelfClosingToken is set while they are being processed.
+- hasSelfClosingToken bool
+- // doc is the document root element.
+- doc *Node
+- // The stack of open elements (section 12.2.3.2) and active formatting
+- // elements (section 12.2.3.3).
+- oe, afe nodeStack
+- // Element pointers (section 12.2.3.4).
+- head, form *Node
+- // Other parsing state flags (section 12.2.3.5).
+- scripting, framesetOK bool
+- // im is the current insertion mode.
+- im insertionMode
+- // originalIM is the insertion mode to go back to after completing a text
+- // or inTableText insertion mode.
+- originalIM insertionMode
+- // fosterParenting is whether new elements should be inserted according to
+- // the foster parenting rules (section 12.2.5.3).
+- fosterParenting bool
+- // quirks is whether the parser is operating in "quirks mode."
+- quirks bool
+- // fragment is whether the parser is parsing an HTML fragment.
+- fragment bool
+- // context is the context element when parsing an HTML fragment
+- // (section 12.4).
+- context *Node
-}
-
--func TestReplace{4}(t *testing.T) {
--
-- v := &Value{data: []{1}{ {1}({2}), {1}({2}), {1}({2}), {1}({2}), {1}({2}), {1}({2}) }}
--
-- rawArr := v.Must{4}Slice()
--
-- replaced := v.Replace{4}(func(index int, val {1}) {1} {
-- if index < len(rawArr)-1 {
-- return rawArr[index+1]
-- }
-- return rawArr[0]
-- })
--
-- replacedArr := replaced.Must{4}Slice()
-- if assert.Equal(t, 6, len(replacedArr)) {
-- assert.Equal(t, replacedArr[0], rawArr[1])
-- assert.Equal(t, replacedArr[1], rawArr[2])
-- assert.Equal(t, replacedArr[2], rawArr[3])
-- assert.Equal(t, replacedArr[3], rawArr[4])
-- assert.Equal(t, replacedArr[4], rawArr[5])
-- assert.Equal(t, replacedArr[5], rawArr[0])
+-func (p *parser) top() *Node {
+- if n := p.oe.top(); n != nil {
+- return n
- }
--
+- return p.doc
-}
-
--func TestCollect{4}(t *testing.T) {
--
-- v := &Value{data: []{1}{ {1}({2}), {1}({2}), {1}({2}), {1}({2}), {1}({2}), {1}({2}) }}
--
-- collected := v.Collect{4}(func(index int, val {1}) interface{} {
-- return index
-- })
--
-- collectedArr := collected.MustInterSlice()
-- if assert.Equal(t, 6, len(collectedArr)) {
-- assert.Equal(t, collectedArr[0], 0)
-- assert.Equal(t, collectedArr[1], 1)
-- assert.Equal(t, collectedArr[2], 2)
-- assert.Equal(t, collectedArr[3], 3)
-- assert.Equal(t, collectedArr[4], 4)
-- assert.Equal(t, collectedArr[5], 5)
+-// Stop tags for use in popUntil. These come from section 12.2.3.2.
+-var (
+- defaultScopeStopTags = map[string][]a.Atom{
+- "": {a.Applet, a.Caption, a.Html, a.Table, a.Td, a.Th, a.Marquee, a.Object},
+- "math": {a.AnnotationXml, a.Mi, a.Mn, a.Mo, a.Ms, a.Mtext},
+- "svg": {a.Desc, a.ForeignObject, a.Title},
- }
+-)
-
--}
-diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/codegen/types_list.txt b/Godeps/_workspace/src/github.com/stretchr/objx/codegen/types_list.txt
-deleted file mode 100644
-index 069d43d..0000000
---- a/Godeps/_workspace/src/github.com/stretchr/objx/codegen/types_list.txt
-+++ /dev/null
-@@ -1,20 +0,0 @@
--Interface,interface{},"something",nil,Inter
--Map,map[string]interface{},map[string]interface{}{"name":"Tyler"},nil,MSI
--ObjxMap,(Map),New(1),New(nil),ObjxMap
--Bool,bool,true,false,Bool
--String,string,"hello","",Str
--Int,int,1,0,Int
--Int8,int8,1,0,Int8
--Int16,int16,1,0,Int16
--Int32,int32,1,0,Int32
--Int64,int64,1,0,Int64
--Uint,uint,1,0,Uint
--Uint8,uint8,1,0,Uint8
--Uint16,uint16,1,0,Uint16
--Uint32,uint32,1,0,Uint32
--Uint64,uint64,1,0,Uint64
--Uintptr,uintptr,1,0,Uintptr
--Float32,float32,1,0,Float32
--Float64,float64,1,0,Float64
--Complex64,complex64,1,0,Complex64
--Complex128,complex128,1,0,Complex128
-diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/constants.go b/Godeps/_workspace/src/github.com/stretchr/objx/constants.go
-deleted file mode 100644
-index f9eb42a..0000000
---- a/Godeps/_workspace/src/github.com/stretchr/objx/constants.go
-+++ /dev/null
-@@ -1,13 +0,0 @@
--package objx
+-type scope int
-
-const (
-- // PathSeparator is the character used to separate the elements
-- // of the keypath.
-- //
-- // For example, `location.address.city`
-- PathSeparator string = "."
--
-- // SignatureSeparator is the character that is used to
-- // separate the Base64 string from the security signature.
-- SignatureSeparator = "_"
+- defaultScope scope = iota
+- listItemScope
+- buttonScope
+- tableScope
+- tableRowScope
+- tableBodyScope
+- selectScope
-)
-diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/conversions.go b/Godeps/_workspace/src/github.com/stretchr/objx/conversions.go
-deleted file mode 100644
-index 9cdfa9f..0000000
---- a/Godeps/_workspace/src/github.com/stretchr/objx/conversions.go
-+++ /dev/null
-@@ -1,117 +0,0 @@
--package objx
-
--import (
-- "bytes"
-- "encoding/base64"
-- "encoding/json"
-- "errors"
-- "fmt"
-- "net/url"
--)
+-// popUntil pops the stack of open elements at the highest element whose tag
+-// is in matchTags, provided there is no higher element in the scope's stop
+-// tags (as defined in section 12.2.3.2). It returns whether or not there was
+-// such an element. If there was not, popUntil leaves the stack unchanged.
+-//
+-// For example, the set of stop tags for table scope is: "html", "table". If
+-// the stack was:
+-// ["html", "body", "font", "table", "b", "i", "u"]
+-// then popUntil(tableScope, "font") would return false, but
+-// popUntil(tableScope, "i") would return true and the stack would become:
+-// ["html", "body", "font", "table", "b"]
+-//
+-// If an element's tag is in both the stop tags and matchTags, then the stack
+-// will be popped and the function returns true (provided, of course, there was
+-// no higher element in the stack that was also in the stop tags). For example,
+-// popUntil(tableScope, "table") returns true and leaves:
+-// ["html", "body", "font"]
+-func (p *parser) popUntil(s scope, matchTags ...a.Atom) bool {
+- if i := p.indexOfElementInScope(s, matchTags...); i != -1 {
+- p.oe = p.oe[:i]
+- return true
+- }
+- return false
+-}
-
--// JSON converts the contained object to a JSON string
--// representation
--func (m Map) JSON() (string, error) {
+-// indexOfElementInScope returns the index in p.oe of the highest element whose
+-// tag is in matchTags that is in scope. If no matching element is in scope, it
+-// returns -1.
+-func (p *parser) indexOfElementInScope(s scope, matchTags ...a.Atom) int {
+- for i := len(p.oe) - 1; i >= 0; i-- {
+- tagAtom := p.oe[i].DataAtom
+- if p.oe[i].Namespace == "" {
+- for _, t := range matchTags {
+- if t == tagAtom {
+- return i
+- }
+- }
+- switch s {
+- case defaultScope:
+- // No-op.
+- case listItemScope:
+- if tagAtom == a.Ol || tagAtom == a.Ul {
+- return -1
+- }
+- case buttonScope:
+- if tagAtom == a.Button {
+- return -1
+- }
+- case tableScope:
+- if tagAtom == a.Html || tagAtom == a.Table {
+- return -1
+- }
+- case selectScope:
+- if tagAtom != a.Optgroup && tagAtom != a.Option {
+- return -1
+- }
+- default:
+- panic("unreachable")
+- }
+- }
+- switch s {
+- case defaultScope, listItemScope, buttonScope:
+- for _, t := range defaultScopeStopTags[p.oe[i].Namespace] {
+- if t == tagAtom {
+- return -1
+- }
+- }
+- }
+- }
+- return -1
+-}
-
-- result, err := json.Marshal(m)
+-// elementInScope is like popUntil, except that it doesn't modify the stack of
+-// open elements.
+-func (p *parser) elementInScope(s scope, matchTags ...a.Atom) bool {
+- return p.indexOfElementInScope(s, matchTags...) != -1
+-}
-
-- if err != nil {
-- err = errors.New("objx: JSON encode failed with: " + err.Error())
+-// clearStackToContext pops elements off the stack of open elements until a
+-// scope-defined element is found.
+-func (p *parser) clearStackToContext(s scope) {
+- for i := len(p.oe) - 1; i >= 0; i-- {
+- tagAtom := p.oe[i].DataAtom
+- switch s {
+- case tableScope:
+- if tagAtom == a.Html || tagAtom == a.Table {
+- p.oe = p.oe[:i+1]
+- return
+- }
+- case tableRowScope:
+- if tagAtom == a.Html || tagAtom == a.Tr {
+- p.oe = p.oe[:i+1]
+- return
+- }
+- case tableBodyScope:
+- if tagAtom == a.Html || tagAtom == a.Tbody || tagAtom == a.Tfoot || tagAtom == a.Thead {
+- p.oe = p.oe[:i+1]
+- return
+- }
+- default:
+- panic("unreachable")
+- }
- }
--
-- return string(result), err
--
-}
-
--// MustJSON converts the contained object to a JSON string
--// representation and panics if there is an error
--func (m Map) MustJSON() string {
-- result, err := m.JSON()
-- if err != nil {
-- panic(err.Error())
+-// generateImpliedEndTags pops nodes off the stack of open elements as long as
+-// the top node has a tag name of dd, dt, li, option, optgroup, p, rp, or rt.
+-// If exceptions are specified, nodes with that name will not be popped off.
+-func (p *parser) generateImpliedEndTags(exceptions ...string) {
+- var i int
+-loop:
+- for i = len(p.oe) - 1; i >= 0; i-- {
+- n := p.oe[i]
+- if n.Type == ElementNode {
+- switch n.DataAtom {
+- case a.Dd, a.Dt, a.Li, a.Option, a.Optgroup, a.P, a.Rp, a.Rt:
+- for _, except := range exceptions {
+- if n.Data == except {
+- break loop
+- }
+- }
+- continue
+- }
+- }
+- break
- }
-- return result
--}
--
--// Base64 converts the contained object to a Base64 string
--// representation of the JSON string representation
--func (m Map) Base64() (string, error) {
-
-- var buf bytes.Buffer
+- p.oe = p.oe[:i+1]
+-}
-
-- jsonData, err := m.JSON()
-- if err != nil {
-- return "", err
+-// addChild adds a child node n to the top element, and pushes n onto the stack
+-// of open elements if it is an element node.
+-func (p *parser) addChild(n *Node) {
+- if p.shouldFosterParent() {
+- p.fosterParent(n)
+- } else {
+- p.top().AppendChild(n)
- }
-
-- encoder := base64.NewEncoder(base64.StdEncoding, &buf)
-- encoder.Write([]byte(jsonData))
-- encoder.Close()
--
-- return buf.String(), nil
--
+- if n.Type == ElementNode {
+- p.oe = append(p.oe, n)
+- }
-}
-
--// MustBase64 converts the contained object to a Base64 string
--// representation of the JSON string representation and panics
--// if there is an error
--func (m Map) MustBase64() string {
-- result, err := m.Base64()
-- if err != nil {
-- panic(err.Error())
+-// shouldFosterParent returns whether the next node to be added should be
+-// foster parented.
+-func (p *parser) shouldFosterParent() bool {
+- if p.fosterParenting {
+- switch p.top().DataAtom {
+- case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr:
+- return true
+- }
- }
-- return result
+- return false
-}
-
--// SignedBase64 converts the contained object to a Base64 string
--// representation of the JSON string representation and signs it
--// using the provided key.
--func (m Map) SignedBase64(key string) (string, error) {
--
-- base64, err := m.Base64()
-- if err != nil {
-- return "", err
+-// fosterParent adds a child node according to the foster parenting rules.
+-// Section 12.2.5.3, "foster parenting".
+-func (p *parser) fosterParent(n *Node) {
+- var table, parent, prev *Node
+- var i int
+- for i = len(p.oe) - 1; i >= 0; i-- {
+- if p.oe[i].DataAtom == a.Table {
+- table = p.oe[i]
+- break
+- }
- }
-
-- sig := HashWithKey(base64, key)
+- if table == nil {
+- // The foster parent is the html element.
+- parent = p.oe[0]
+- } else {
+- parent = table.Parent
+- }
+- if parent == nil {
+- parent = p.oe[i-1]
+- }
-
-- return base64 + SignatureSeparator + sig, nil
+- if table != nil {
+- prev = table.PrevSibling
+- } else {
+- prev = parent.LastChild
+- }
+- if prev != nil && prev.Type == TextNode && n.Type == TextNode {
+- prev.Data += n.Data
+- return
+- }
-
+- parent.InsertBefore(n, table)
-}
-
--// MustSignedBase64 converts the contained object to a Base64 string
--// representation of the JSON string representation and signs it
--// using the provided key and panics if there is an error
--func (m Map) MustSignedBase64(key string) string {
-- result, err := m.SignedBase64(key)
-- if err != nil {
-- panic(err.Error())
+-// addText adds text to the preceding node if it is a text node, or else it
+-// calls addChild with a new text node.
+-func (p *parser) addText(text string) {
+- if text == "" {
+- return
- }
-- return result
--}
--
--/*
-- URL Query
-- ------------------------------------------------
--*/
--
--// URLValues creates a url.Values object from an Obj. This
--// function requires that the wrapped object be a map[string]interface{}
--func (m Map) URLValues() url.Values {
--
-- vals := make(url.Values)
-
-- for k, v := range m {
-- //TODO: can this be done without sprintf?
-- vals.Set(k, fmt.Sprintf("%v", v))
+- if p.shouldFosterParent() {
+- p.fosterParent(&Node{
+- Type: TextNode,
+- Data: text,
+- })
+- return
- }
-
-- return vals
+- t := p.top()
+- if n := t.LastChild; n != nil && n.Type == TextNode {
+- n.Data += text
+- return
+- }
+- p.addChild(&Node{
+- Type: TextNode,
+- Data: text,
+- })
-}
-
--// URLQuery gets an encoded URL query representing the given
--// Obj. This function requires that the wrapped object be a
--// map[string]interface{}
--func (m Map) URLQuery() (string, error) {
-- return m.URLValues().Encode(), nil
+-// addElement adds a child element based on the current token.
+-func (p *parser) addElement() {
+- p.addChild(&Node{
+- Type: ElementNode,
+- DataAtom: p.tok.DataAtom,
+- Data: p.tok.Data,
+- Attr: p.tok.Attr,
+- })
-}
-diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/conversions_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/conversions_test.go
-deleted file mode 100644
-index e9ccd29..0000000
---- a/Godeps/_workspace/src/github.com/stretchr/objx/conversions_test.go
-+++ /dev/null
-@@ -1,94 +0,0 @@
--package objx
--
--import (
-- "github.com/stretchr/testify/assert"
-- "testing"
--)
-
--func TestConversionJSON(t *testing.T) {
--
-- jsonString := `{"name":"Mat"}`
-- o := MustFromJSON(jsonString)
+-// Section 12.2.3.3.
+-func (p *parser) addFormattingElement() {
+- tagAtom, attr := p.tok.DataAtom, p.tok.Attr
+- p.addElement()
-
-- result, err := o.JSON()
+- // Implement the Noah's Ark clause, but with three per family instead of two.
+- identicalElements := 0
+-findIdenticalElements:
+- for i := len(p.afe) - 1; i >= 0; i-- {
+- n := p.afe[i]
+- if n.Type == scopeMarkerNode {
+- break
+- }
+- if n.Type != ElementNode {
+- continue
+- }
+- if n.Namespace != "" {
+- continue
+- }
+- if n.DataAtom != tagAtom {
+- continue
+- }
+- if len(n.Attr) != len(attr) {
+- continue
+- }
+- compareAttributes:
+- for _, t0 := range n.Attr {
+- for _, t1 := range attr {
+- if t0.Key == t1.Key && t0.Namespace == t1.Namespace && t0.Val == t1.Val {
+- // Found a match for this attribute, continue with the next attribute.
+- continue compareAttributes
+- }
+- }
+- // If we get here, there is no attribute that matches a.
+- // Therefore the element is not identical to the new one.
+- continue findIdenticalElements
+- }
-
-- if assert.NoError(t, err) {
-- assert.Equal(t, jsonString, result)
+- identicalElements++
+- if identicalElements >= 3 {
+- p.afe.remove(n)
+- }
- }
-
-- assert.Equal(t, jsonString, o.MustJSON())
--
+- p.afe = append(p.afe, p.top())
-}
-
--func TestConversionJSONWithError(t *testing.T) {
--
-- o := MSI()
-- o["test"] = func() {}
--
-- assert.Panics(t, func() {
-- o.MustJSON()
-- })
--
-- _, err := o.JSON()
+-// Section 12.2.3.3.
+-func (p *parser) clearActiveFormattingElements() {
+- for {
+- n := p.afe.pop()
+- if len(p.afe) == 0 || n.Type == scopeMarkerNode {
+- return
+- }
+- }
+-}
-
-- assert.Error(t, err)
+-// Section 12.2.3.3.
+-func (p *parser) reconstructActiveFormattingElements() {
+- n := p.afe.top()
+- if n == nil {
+- return
+- }
+- if n.Type == scopeMarkerNode || p.oe.index(n) != -1 {
+- return
+- }
+- i := len(p.afe) - 1
+- for n.Type != scopeMarkerNode && p.oe.index(n) == -1 {
+- if i == 0 {
+- i = -1
+- break
+- }
+- i--
+- n = p.afe[i]
+- }
+- for {
+- i++
+- clone := p.afe[i].clone()
+- p.addChild(clone)
+- p.afe[i] = clone
+- if i == len(p.afe)-1 {
+- break
+- }
+- }
+-}
-
+-// Section 12.2.4.
+-func (p *parser) acknowledgeSelfClosingTag() {
+- p.hasSelfClosingToken = false
-}
-
--func TestConversionBase64(t *testing.T) {
+-// An insertion mode (section 12.2.3.1) is the state transition function from
+-// a particular state in the HTML5 parser's state machine. It updates the
+-// parser's fields depending on parser.tok (where ErrorToken means EOF).
+-// It returns whether the token was consumed.
+-type insertionMode func(*parser) bool
-
-- o := New(map[string]interface{}{"name": "Mat"})
+-// setOriginalIM sets the insertion mode to return to after completing a text or
+-// inTableText insertion mode.
+-// Section 12.2.3.1, "using the rules for".
+-func (p *parser) setOriginalIM() {
+- if p.originalIM != nil {
+- panic("html: bad parser state: originalIM was set twice")
+- }
+- p.originalIM = p.im
+-}
-
-- result, err := o.Base64()
+-// Section 12.2.3.1, "reset the insertion mode".
+-func (p *parser) resetInsertionMode() {
+- for i := len(p.oe) - 1; i >= 0; i-- {
+- n := p.oe[i]
+- if i == 0 && p.context != nil {
+- n = p.context
+- }
-
-- if assert.NoError(t, err) {
-- assert.Equal(t, "eyJuYW1lIjoiTWF0In0=", result)
+- switch n.DataAtom {
+- case a.Select:
+- p.im = inSelectIM
+- case a.Td, a.Th:
+- p.im = inCellIM
+- case a.Tr:
+- p.im = inRowIM
+- case a.Tbody, a.Thead, a.Tfoot:
+- p.im = inTableBodyIM
+- case a.Caption:
+- p.im = inCaptionIM
+- case a.Colgroup:
+- p.im = inColumnGroupIM
+- case a.Table:
+- p.im = inTableIM
+- case a.Head:
+- p.im = inBodyIM
+- case a.Body:
+- p.im = inBodyIM
+- case a.Frameset:
+- p.im = inFramesetIM
+- case a.Html:
+- p.im = beforeHeadIM
+- default:
+- continue
+- }
+- return
- }
+- p.im = inBodyIM
+-}
-
-- assert.Equal(t, "eyJuYW1lIjoiTWF0In0=", o.MustBase64())
+-const whitespace = " \t\r\n\f"
-
+-// Section 12.2.5.4.1.
+-func initialIM(p *parser) bool {
+- switch p.tok.Type {
+- case TextToken:
+- p.tok.Data = strings.TrimLeft(p.tok.Data, whitespace)
+- if len(p.tok.Data) == 0 {
+- // It was all whitespace, so ignore it.
+- return true
+- }
+- case CommentToken:
+- p.doc.AppendChild(&Node{
+- Type: CommentNode,
+- Data: p.tok.Data,
+- })
+- return true
+- case DoctypeToken:
+- n, quirks := parseDoctype(p.tok.Data)
+- p.doc.AppendChild(n)
+- p.quirks = quirks
+- p.im = beforeHTMLIM
+- return true
+- }
+- p.quirks = true
+- p.im = beforeHTMLIM
+- return false
-}
-
--func TestConversionBase64WithError(t *testing.T) {
--
-- o := MSI()
-- o["test"] = func() {}
+-// Section 12.2.5.4.2.
+-func beforeHTMLIM(p *parser) bool {
+- switch p.tok.Type {
+- case DoctypeToken:
+- // Ignore the token.
+- return true
+- case TextToken:
+- p.tok.Data = strings.TrimLeft(p.tok.Data, whitespace)
+- if len(p.tok.Data) == 0 {
+- // It was all whitespace, so ignore it.
+- return true
+- }
+- case StartTagToken:
+- if p.tok.DataAtom == a.Html {
+- p.addElement()
+- p.im = beforeHeadIM
+- return true
+- }
+- case EndTagToken:
+- switch p.tok.DataAtom {
+- case a.Head, a.Body, a.Html, a.Br:
+- p.parseImpliedToken(StartTagToken, a.Html, a.Html.String())
+- return false
+- default:
+- // Ignore the token.
+- return true
+- }
+- case CommentToken:
+- p.doc.AppendChild(&Node{
+- Type: CommentNode,
+- Data: p.tok.Data,
+- })
+- return true
+- }
+- p.parseImpliedToken(StartTagToken, a.Html, a.Html.String())
+- return false
+-}
-
-- assert.Panics(t, func() {
-- o.MustBase64()
-- })
+-// Section 12.2.5.4.3.
+-func beforeHeadIM(p *parser) bool {
+- switch p.tok.Type {
+- case TextToken:
+- p.tok.Data = strings.TrimLeft(p.tok.Data, whitespace)
+- if len(p.tok.Data) == 0 {
+- // It was all whitespace, so ignore it.
+- return true
+- }
+- case StartTagToken:
+- switch p.tok.DataAtom {
+- case a.Head:
+- p.addElement()
+- p.head = p.top()
+- p.im = inHeadIM
+- return true
+- case a.Html:
+- return inBodyIM(p)
+- }
+- case EndTagToken:
+- switch p.tok.DataAtom {
+- case a.Head, a.Body, a.Html, a.Br:
+- p.parseImpliedToken(StartTagToken, a.Head, a.Head.String())
+- return false
+- default:
+- // Ignore the token.
+- return true
+- }
+- case CommentToken:
+- p.addChild(&Node{
+- Type: CommentNode,
+- Data: p.tok.Data,
+- })
+- return true
+- case DoctypeToken:
+- // Ignore the token.
+- return true
+- }
-
-- _, err := o.Base64()
+- p.parseImpliedToken(StartTagToken, a.Head, a.Head.String())
+- return false
+-}
-
-- assert.Error(t, err)
+-// Section 12.2.5.4.4.
+-func inHeadIM(p *parser) bool {
+- switch p.tok.Type {
+- case TextToken:
+- s := strings.TrimLeft(p.tok.Data, whitespace)
+- if len(s) < len(p.tok.Data) {
+- // Add the initial whitespace to the current node.
+- p.addText(p.tok.Data[:len(p.tok.Data)-len(s)])
+- if s == "" {
+- return true
+- }
+- p.tok.Data = s
+- }
+- case StartTagToken:
+- switch p.tok.DataAtom {
+- case a.Html:
+- return inBodyIM(p)
+- case a.Base, a.Basefont, a.Bgsound, a.Command, a.Link, a.Meta:
+- p.addElement()
+- p.oe.pop()
+- p.acknowledgeSelfClosingTag()
+- return true
+- case a.Script, a.Title, a.Noscript, a.Noframes, a.Style:
+- p.addElement()
+- p.setOriginalIM()
+- p.im = textIM
+- return true
+- case a.Head:
+- // Ignore the token.
+- return true
+- }
+- case EndTagToken:
+- switch p.tok.DataAtom {
+- case a.Head:
+- n := p.oe.pop()
+- if n.DataAtom != a.Head {
+- panic("html: bad parser state: <head> element not found, in the in-head insertion mode")
+- }
+- p.im = afterHeadIM
+- return true
+- case a.Body, a.Html, a.Br:
+- p.parseImpliedToken(EndTagToken, a.Head, a.Head.String())
+- return false
+- default:
+- // Ignore the token.
+- return true
+- }
+- case CommentToken:
+- p.addChild(&Node{
+- Type: CommentNode,
+- Data: p.tok.Data,
+- })
+- return true
+- case DoctypeToken:
+- // Ignore the token.
+- return true
+- }
-
+- p.parseImpliedToken(EndTagToken, a.Head, a.Head.String())
+- return false
-}
-
--func TestConversionSignedBase64(t *testing.T) {
--
-- o := New(map[string]interface{}{"name": "Mat"})
--
-- result, err := o.SignedBase64("key")
--
-- if assert.NoError(t, err) {
-- assert.Equal(t, "eyJuYW1lIjoiTWF0In0=_67ee82916f90b2c0d68c903266e8998c9ef0c3d6", result)
+-// Section 12.2.5.4.6.
+-func afterHeadIM(p *parser) bool {
+- switch p.tok.Type {
+- case TextToken:
+- s := strings.TrimLeft(p.tok.Data, whitespace)
+- if len(s) < len(p.tok.Data) {
+- // Add the initial whitespace to the current node.
+- p.addText(p.tok.Data[:len(p.tok.Data)-len(s)])
+- if s == "" {
+- return true
+- }
+- p.tok.Data = s
+- }
+- case StartTagToken:
+- switch p.tok.DataAtom {
+- case a.Html:
+- return inBodyIM(p)
+- case a.Body:
+- p.addElement()
+- p.framesetOK = false
+- p.im = inBodyIM
+- return true
+- case a.Frameset:
+- p.addElement()
+- p.im = inFramesetIM
+- return true
+- case a.Base, a.Basefont, a.Bgsound, a.Link, a.Meta, a.Noframes, a.Script, a.Style, a.Title:
+- p.oe = append(p.oe, p.head)
+- defer p.oe.remove(p.head)
+- return inHeadIM(p)
+- case a.Head:
+- // Ignore the token.
+- return true
+- }
+- case EndTagToken:
+- switch p.tok.DataAtom {
+- case a.Body, a.Html, a.Br:
+- // Drop down to creating an implied <body> tag.
+- default:
+- // Ignore the token.
+- return true
+- }
+- case CommentToken:
+- p.addChild(&Node{
+- Type: CommentNode,
+- Data: p.tok.Data,
+- })
+- return true
+- case DoctypeToken:
+- // Ignore the token.
+- return true
- }
-
-- assert.Equal(t, "eyJuYW1lIjoiTWF0In0=_67ee82916f90b2c0d68c903266e8998c9ef0c3d6", o.MustSignedBase64("key"))
--
+- p.parseImpliedToken(StartTagToken, a.Body, a.Body.String())
+- p.framesetOK = true
+- return false
-}
-
--func TestConversionSignedBase64WithError(t *testing.T) {
--
-- o := MSI()
-- o["test"] = func() {}
--
-- assert.Panics(t, func() {
-- o.MustSignedBase64("key")
-- })
--
-- _, err := o.SignedBase64("key")
--
-- assert.Error(t, err)
--
+-// copyAttributes copies attributes of src not found on dst to dst.
+-func copyAttributes(dst *Node, src Token) {
+- if len(src.Attr) == 0 {
+- return
+- }
+- attr := map[string]string{}
+- for _, t := range dst.Attr {
+- attr[t.Key] = t.Val
+- }
+- for _, t := range src.Attr {
+- if _, ok := attr[t.Key]; !ok {
+- dst.Attr = append(dst.Attr, t)
+- attr[t.Key] = t.Val
+- }
+- }
-}
-diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/doc.go b/Godeps/_workspace/src/github.com/stretchr/objx/doc.go
-deleted file mode 100644
-index 47bf85e..0000000
---- a/Godeps/_workspace/src/github.com/stretchr/objx/doc.go
-+++ /dev/null
-@@ -1,72 +0,0 @@
--// objx - Go package for dealing with maps, slices, JSON and other data.
--//
--// Overview
--//
--// Objx provides the `objx.Map` type, which is a `map[string]interface{}` that exposes
--// a powerful `Get` method (among others) that allows you to easily and quickly get
--// access to data within the map, without having to worry too much about type assertions,
--// missing data, default values etc.
--//
--// Pattern
--//
--// Objx uses a preditable pattern to make access data from within `map[string]interface{}'s
--// easy.
--//
--// Call one of the `objx.` functions to create your `objx.Map` to get going:
--//
--// m, err := objx.FromJSON(json)
--//
--// NOTE: Any methods or functions with the `Must` prefix will panic if something goes wrong,
--// the rest will be optimistic and try to figure things out without panicking.
--//
--// Use `Get` to access the value you're interested in. You can use dot and array
--// notation too:
--//
--// m.Get("places[0].latlng")
--//
--// Once you have saught the `Value` you're interested in, you can use the `Is*` methods
--// to determine its type.
--//
--// if m.Get("code").IsStr() { /* ... */ }
--//
--// Or you can just assume the type, and use one of the strong type methods to
--// extract the real value:
--//
--// m.Get("code").Int()
--//
--// If there's no value there (or if it's the wrong type) then a default value
--// will be returned, or you can be explicit about the default value.
--//
--// Get("code").Int(-1)
--//
--// If you're dealing with a slice of data as a value, Objx provides many useful
--// methods for iterating, manipulating and selecting that data. You can find out more
--// by exploring the index below.
--//
--// Reading data
--//
--// A simple example of how to use Objx:
--//
--// // use MustFromJSON to make an objx.Map from some JSON
--// m := objx.MustFromJSON(`{"name": "Mat", "age": 30}`)
--//
--// // get the details
--// name := m.Get("name").Str()
--// age := m.Get("age").Int()
--//
--// // get their nickname (or use their name if they
--// // don't have one)
--// nickname := m.Get("nickname").Str(name)
--//
--// Ranging
--//
--// Since `objx.Map` is a `map[string]interface{}` you can treat it as such. For
--// example, to `range` the data, do what you would expect:
--//
--// m := objx.MustFromJSON(json)
--// for key, value := range m {
--//
--// /* ... do your magic ... */
--//
--// }
--package objx
-diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/fixture_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/fixture_test.go
-deleted file mode 100644
-index 27f7d90..0000000
---- a/Godeps/_workspace/src/github.com/stretchr/objx/fixture_test.go
-+++ /dev/null
-@@ -1,98 +0,0 @@
--package objx
-
--import (
-- "github.com/stretchr/testify/assert"
-- "testing"
--)
+-// Section 12.2.5.4.7.
+-func inBodyIM(p *parser) bool {
+- switch p.tok.Type {
+- case TextToken:
+- d := p.tok.Data
+- switch n := p.oe.top(); n.DataAtom {
+- case a.Pre, a.Listing:
+- if n.FirstChild == nil {
+- // Ignore a newline at the start of a <pre> block.
+- if d != "" && d[0] == '\r' {
+- d = d[1:]
+- }
+- if d != "" && d[0] == '\n' {
+- d = d[1:]
+- }
+- }
+- }
+- d = strings.Replace(d, "\x00", "", -1)
+- if d == "" {
+- return true
+- }
+- p.reconstructActiveFormattingElements()
+- p.addText(d)
+- if p.framesetOK && strings.TrimLeft(d, whitespace) != "" {
+- // There were non-whitespace characters inserted.
+- p.framesetOK = false
+- }
+- case StartTagToken:
+- switch p.tok.DataAtom {
+- case a.Html:
+- copyAttributes(p.oe[0], p.tok)
+- case a.Base, a.Basefont, a.Bgsound, a.Command, a.Link, a.Meta, a.Noframes, a.Script, a.Style, a.Title:
+- return inHeadIM(p)
+- case a.Body:
+- if len(p.oe) >= 2 {
+- body := p.oe[1]
+- if body.Type == ElementNode && body.DataAtom == a.Body {
+- p.framesetOK = false
+- copyAttributes(body, p.tok)
+- }
+- }
+- case a.Frameset:
+- if !p.framesetOK || len(p.oe) < 2 || p.oe[1].DataAtom != a.Body {
+- // Ignore the token.
+- return true
+- }
+- body := p.oe[1]
+- if body.Parent != nil {
+- body.Parent.RemoveChild(body)
+- }
+- p.oe = p.oe[:1]
+- p.addElement()
+- p.im = inFramesetIM
+- return true
+- case a.Address, a.Article, a.Aside, a.Blockquote, a.Center, a.Details, a.Dir, a.Div, a.Dl, a.Fieldset, a.Figcaption, a.Figure, a.Footer, a.Header, a.Hgroup, a.Menu, a.Nav, a.Ol, a.P, a.Section, a.Summary, a.Ul:
+- p.popUntil(buttonScope, a.P)
+- p.addElement()
+- case a.H1, a.H2, a.H3, a.H4, a.H5, a.H6:
+- p.popUntil(buttonScope, a.P)
+- switch n := p.top(); n.DataAtom {
+- case a.H1, a.H2, a.H3, a.H4, a.H5, a.H6:
+- p.oe.pop()
+- }
+- p.addElement()
+- case a.Pre, a.Listing:
+- p.popUntil(buttonScope, a.P)
+- p.addElement()
+- // The newline, if any, will be dealt with by the TextToken case.
+- p.framesetOK = false
+- case a.Form:
+- if p.form == nil {
+- p.popUntil(buttonScope, a.P)
+- p.addElement()
+- p.form = p.top()
+- }
+- case a.Li:
+- p.framesetOK = false
+- for i := len(p.oe) - 1; i >= 0; i-- {
+- node := p.oe[i]
+- switch node.DataAtom {
+- case a.Li:
+- p.oe = p.oe[:i]
+- case a.Address, a.Div, a.P:
+- continue
+- default:
+- if !isSpecialElement(node) {
+- continue
+- }
+- }
+- break
+- }
+- p.popUntil(buttonScope, a.P)
+- p.addElement()
+- case a.Dd, a.Dt:
+- p.framesetOK = false
+- for i := len(p.oe) - 1; i >= 0; i-- {
+- node := p.oe[i]
+- switch node.DataAtom {
+- case a.Dd, a.Dt:
+- p.oe = p.oe[:i]
+- case a.Address, a.Div, a.P:
+- continue
+- default:
+- if !isSpecialElement(node) {
+- continue
+- }
+- }
+- break
+- }
+- p.popUntil(buttonScope, a.P)
+- p.addElement()
+- case a.Plaintext:
+- p.popUntil(buttonScope, a.P)
+- p.addElement()
+- case a.Button:
+- p.popUntil(defaultScope, a.Button)
+- p.reconstructActiveFormattingElements()
+- p.addElement()
+- p.framesetOK = false
+- case a.A:
+- for i := len(p.afe) - 1; i >= 0 && p.afe[i].Type != scopeMarkerNode; i-- {
+- if n := p.afe[i]; n.Type == ElementNode && n.DataAtom == a.A {
+- p.inBodyEndTagFormatting(a.A)
+- p.oe.remove(n)
+- p.afe.remove(n)
+- break
+- }
+- }
+- p.reconstructActiveFormattingElements()
+- p.addFormattingElement()
+- case a.B, a.Big, a.Code, a.Em, a.Font, a.I, a.S, a.Small, a.Strike, a.Strong, a.Tt, a.U:
+- p.reconstructActiveFormattingElements()
+- p.addFormattingElement()
+- case a.Nobr:
+- p.reconstructActiveFormattingElements()
+- if p.elementInScope(defaultScope, a.Nobr) {
+- p.inBodyEndTagFormatting(a.Nobr)
+- p.reconstructActiveFormattingElements()
+- }
+- p.addFormattingElement()
+- case a.Applet, a.Marquee, a.Object:
+- p.reconstructActiveFormattingElements()
+- p.addElement()
+- p.afe = append(p.afe, &scopeMarker)
+- p.framesetOK = false
+- case a.Table:
+- if !p.quirks {
+- p.popUntil(buttonScope, a.P)
+- }
+- p.addElement()
+- p.framesetOK = false
+- p.im = inTableIM
+- return true
+- case a.Area, a.Br, a.Embed, a.Img, a.Input, a.Keygen, a.Wbr:
+- p.reconstructActiveFormattingElements()
+- p.addElement()
+- p.oe.pop()
+- p.acknowledgeSelfClosingTag()
+- if p.tok.DataAtom == a.Input {
+- for _, t := range p.tok.Attr {
+- if t.Key == "type" {
+- if strings.ToLower(t.Val) == "hidden" {
+- // Skip setting framesetOK = false
+- return true
+- }
+- }
+- }
+- }
+- p.framesetOK = false
+- case a.Param, a.Source, a.Track:
+- p.addElement()
+- p.oe.pop()
+- p.acknowledgeSelfClosingTag()
+- case a.Hr:
+- p.popUntil(buttonScope, a.P)
+- p.addElement()
+- p.oe.pop()
+- p.acknowledgeSelfClosingTag()
+- p.framesetOK = false
+- case a.Image:
+- p.tok.DataAtom = a.Img
+- p.tok.Data = a.Img.String()
+- return false
+- case a.Isindex:
+- if p.form != nil {
+- // Ignore the token.
+- return true
+- }
+- action := ""
+- prompt := "This is a searchable index. Enter search keywords: "
+- attr := []Attribute{{Key: "name", Val: "isindex"}}
+- for _, t := range p.tok.Attr {
+- switch t.Key {
+- case "action":
+- action = t.Val
+- case "name":
+- // Ignore the attribute.
+- case "prompt":
+- prompt = t.Val
+- default:
+- attr = append(attr, t)
+- }
+- }
+- p.acknowledgeSelfClosingTag()
+- p.popUntil(buttonScope, a.P)
+- p.parseImpliedToken(StartTagToken, a.Form, a.Form.String())
+- if action != "" {
+- p.form.Attr = []Attribute{{Key: "action", Val: action}}
+- }
+- p.parseImpliedToken(StartTagToken, a.Hr, a.Hr.String())
+- p.parseImpliedToken(StartTagToken, a.Label, a.Label.String())
+- p.addText(prompt)
+- p.addChild(&Node{
+- Type: ElementNode,
+- DataAtom: a.Input,
+- Data: a.Input.String(),
+- Attr: attr,
+- })
+- p.oe.pop()
+- p.parseImpliedToken(EndTagToken, a.Label, a.Label.String())
+- p.parseImpliedToken(StartTagToken, a.Hr, a.Hr.String())
+- p.parseImpliedToken(EndTagToken, a.Form, a.Form.String())
+- case a.Textarea:
+- p.addElement()
+- p.setOriginalIM()
+- p.framesetOK = false
+- p.im = textIM
+- case a.Xmp:
+- p.popUntil(buttonScope, a.P)
+- p.reconstructActiveFormattingElements()
+- p.framesetOK = false
+- p.addElement()
+- p.setOriginalIM()
+- p.im = textIM
+- case a.Iframe:
+- p.framesetOK = false
+- p.addElement()
+- p.setOriginalIM()
+- p.im = textIM
+- case a.Noembed, a.Noscript:
+- p.addElement()
+- p.setOriginalIM()
+- p.im = textIM
+- case a.Select:
+- p.reconstructActiveFormattingElements()
+- p.addElement()
+- p.framesetOK = false
+- p.im = inSelectIM
+- return true
+- case a.Optgroup, a.Option:
+- if p.top().DataAtom == a.Option {
+- p.oe.pop()
+- }
+- p.reconstructActiveFormattingElements()
+- p.addElement()
+- case a.Rp, a.Rt:
+- if p.elementInScope(defaultScope, a.Ruby) {
+- p.generateImpliedEndTags()
+- }
+- p.addElement()
+- case a.Math, a.Svg:
+- p.reconstructActiveFormattingElements()
+- if p.tok.DataAtom == a.Math {
+- adjustAttributeNames(p.tok.Attr, mathMLAttributeAdjustments)
+- } else {
+- adjustAttributeNames(p.tok.Attr, svgAttributeAdjustments)
+- }
+- adjustForeignAttributes(p.tok.Attr)
+- p.addElement()
+- p.top().Namespace = p.tok.Data
+- if p.hasSelfClosingToken {
+- p.oe.pop()
+- p.acknowledgeSelfClosingTag()
+- }
+- return true
+- case a.Caption, a.Col, a.Colgroup, a.Frame, a.Head, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr:
+- // Ignore the token.
+- default:
+- p.reconstructActiveFormattingElements()
+- p.addElement()
+- }
+- case EndTagToken:
+- switch p.tok.DataAtom {
+- case a.Body:
+- if p.elementInScope(defaultScope, a.Body) {
+- p.im = afterBodyIM
+- }
+- case a.Html:
+- if p.elementInScope(defaultScope, a.Body) {
+- p.parseImpliedToken(EndTagToken, a.Body, a.Body.String())
+- return false
+- }
+- return true
+- case a.Address, a.Article, a.Aside, a.Blockquote, a.Button, a.Center, a.Details, a.Dir, a.Div, a.Dl, a.Fieldset, a.Figcaption, a.Figure, a.Footer, a.Header, a.Hgroup, a.Listing, a.Menu, a.Nav, a.Ol, a.Pre, a.Section, a.Summary, a.Ul:
+- p.popUntil(defaultScope, p.tok.DataAtom)
+- case a.Form:
+- node := p.form
+- p.form = nil
+- i := p.indexOfElementInScope(defaultScope, a.Form)
+- if node == nil || i == -1 || p.oe[i] != node {
+- // Ignore the token.
+- return true
+- }
+- p.generateImpliedEndTags()
+- p.oe.remove(node)
+- case a.P:
+- if !p.elementInScope(buttonScope, a.P) {
+- p.parseImpliedToken(StartTagToken, a.P, a.P.String())
+- }
+- p.popUntil(buttonScope, a.P)
+- case a.Li:
+- p.popUntil(listItemScope, a.Li)
+- case a.Dd, a.Dt:
+- p.popUntil(defaultScope, p.tok.DataAtom)
+- case a.H1, a.H2, a.H3, a.H4, a.H5, a.H6:
+- p.popUntil(defaultScope, a.H1, a.H2, a.H3, a.H4, a.H5, a.H6)
+- case a.A, a.B, a.Big, a.Code, a.Em, a.Font, a.I, a.Nobr, a.S, a.Small, a.Strike, a.Strong, a.Tt, a.U:
+- p.inBodyEndTagFormatting(p.tok.DataAtom)
+- case a.Applet, a.Marquee, a.Object:
+- if p.popUntil(defaultScope, p.tok.DataAtom) {
+- p.clearActiveFormattingElements()
+- }
+- case a.Br:
+- p.tok.Type = StartTagToken
+- return false
+- default:
+- p.inBodyEndTagOther(p.tok.DataAtom)
+- }
+- case CommentToken:
+- p.addChild(&Node{
+- Type: CommentNode,
+- Data: p.tok.Data,
+- })
+- }
-
--var fixtures = []struct {
-- // name is the name of the fixture (used for reporting
-- // failures)
-- name string
-- // data is the JSON data to be worked on
-- data string
-- // get is the argument(s) to pass to Get
-- get interface{}
-- // output is the expected output
-- output interface{}
--}{
-- {
-- name: "Simple get",
-- data: `{"name": "Mat"}`,
-- get: "name",
-- output: "Mat",
-- },
-- {
-- name: "Get with dot notation",
-- data: `{"address": {"city": "Boulder"}}`,
-- get: "address.city",
-- output: "Boulder",
-- },
-- {
-- name: "Deep get with dot notation",
-- data: `{"one": {"two": {"three": {"four": "hello"}}}}`,
-- get: "one.two.three.four",
-- output: "hello",
-- },
-- {
-- name: "Get missing with dot notation",
-- data: `{"one": {"two": {"three": {"four": "hello"}}}}`,
-- get: "one.ten",
-- output: nil,
-- },
-- {
-- name: "Get with array notation",
-- data: `{"tags": ["one", "two", "three"]}`,
-- get: "tags[1]",
-- output: "two",
-- },
-- {
-- name: "Get with array and dot notation",
-- data: `{"types": { "tags": ["one", "two", "three"]}}`,
-- get: "types.tags[1]",
-- output: "two",
-- },
-- {
-- name: "Get with array and dot notation - field after array",
-- data: `{"tags": [{"name":"one"}, {"name":"two"}, {"name":"three"}]}`,
-- get: "tags[1].name",
-- output: "two",
-- },
-- {
-- name: "Complex get with array and dot notation",
-- data: `{"tags": [{"list": [{"one":"pizza"}]}]}`,
-- get: "tags[0].list[0].one",
-- output: "pizza",
-- },
-- {
-- name: "Get field from within string should be nil",
-- data: `{"name":"Tyler"}`,
-- get: "name.something",
-- output: nil,
-- },
-- {
-- name: "Get field from within string (using array accessor) should be nil",
-- data: `{"numbers":["one", "two", "three"]}`,
-- get: "numbers[0].nope",
-- output: nil,
-- },
+- return true
-}
-
--func TestFixtures(t *testing.T) {
--
-- for _, fixture := range fixtures {
+-func (p *parser) inBodyEndTagFormatting(tagAtom a.Atom) {
+- // This is the "adoption agency" algorithm, described at
+- // http://www.whatwg.org/specs/web-apps/current-work/multipage/tokenization.html#adoptionAgency
-
-- m := MustFromJSON(fixture.data)
+- // TODO: this is a fairly literal line-by-line translation of that algorithm.
+- // Once the code successfully parses the comprehensive test suite, we should
+- // refactor this code to be more idiomatic.
-
-- // get the value
-- t.Logf("Running get fixture: \"%s\" (%v)", fixture.name, fixture)
-- value := m.Get(fixture.get.(string))
+- // Steps 1-3. The outer loop.
+- for i := 0; i < 8; i++ {
+- // Step 4. Find the formatting element.
+- var formattingElement *Node
+- for j := len(p.afe) - 1; j >= 0; j-- {
+- if p.afe[j].Type == scopeMarkerNode {
+- break
+- }
+- if p.afe[j].DataAtom == tagAtom {
+- formattingElement = p.afe[j]
+- break
+- }
+- }
+- if formattingElement == nil {
+- p.inBodyEndTagOther(tagAtom)
+- return
+- }
+- feIndex := p.oe.index(formattingElement)
+- if feIndex == -1 {
+- p.afe.remove(formattingElement)
+- return
+- }
+- if !p.elementInScope(defaultScope, tagAtom) {
+- // Ignore the tag.
+- return
+- }
-
-- // make sure it matches
-- assert.Equal(t, fixture.output, value.data,
-- "Get fixture \"%s\" failed: %v", fixture.name, fixture,
-- )
+- // Steps 5-6. Find the furthest block.
+- var furthestBlock *Node
+- for _, e := range p.oe[feIndex:] {
+- if isSpecialElement(e) {
+- furthestBlock = e
+- break
+- }
+- }
+- if furthestBlock == nil {
+- e := p.oe.pop()
+- for e != formattingElement {
+- e = p.oe.pop()
+- }
+- p.afe.remove(e)
+- return
+- }
-
-- }
+- // Steps 7-8. Find the common ancestor and bookmark node.
+- commonAncestor := p.oe[feIndex-1]
+- bookmark := p.afe.index(formattingElement)
-
--}
-diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/map.go b/Godeps/_workspace/src/github.com/stretchr/objx/map.go
-deleted file mode 100644
-index eb6ed8e..0000000
---- a/Godeps/_workspace/src/github.com/stretchr/objx/map.go
-+++ /dev/null
-@@ -1,222 +0,0 @@
--package objx
+- // Step 9. The inner loop. Find the lastNode to reparent.
+- lastNode := furthestBlock
+- node := furthestBlock
+- x := p.oe.index(node)
+- // Steps 9.1-9.3.
+- for j := 0; j < 3; j++ {
+- // Step 9.4.
+- x--
+- node = p.oe[x]
+- // Step 9.5.
+- if p.afe.index(node) == -1 {
+- p.oe.remove(node)
+- continue
+- }
+- // Step 9.6.
+- if node == formattingElement {
+- break
+- }
+- // Step 9.7.
+- clone := node.clone()
+- p.afe[p.afe.index(node)] = clone
+- p.oe[p.oe.index(node)] = clone
+- node = clone
+- // Step 9.8.
+- if lastNode == furthestBlock {
+- bookmark = p.afe.index(node) + 1
+- }
+- // Step 9.9.
+- if lastNode.Parent != nil {
+- lastNode.Parent.RemoveChild(lastNode)
+- }
+- node.AppendChild(lastNode)
+- // Step 9.10.
+- lastNode = node
+- }
-
--import (
-- "encoding/base64"
-- "encoding/json"
-- "errors"
-- "io/ioutil"
-- "net/url"
-- "strings"
--)
+- // Step 10. Reparent lastNode to the common ancestor,
+- // or for misnested table nodes, to the foster parent.
+- if lastNode.Parent != nil {
+- lastNode.Parent.RemoveChild(lastNode)
+- }
+- switch commonAncestor.DataAtom {
+- case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr:
+- p.fosterParent(lastNode)
+- default:
+- commonAncestor.AppendChild(lastNode)
+- }
-
--// MSIConvertable is an interface that defines methods for converting your
--// custom types to a map[string]interface{} representation.
--type MSIConvertable interface {
-- // MSI gets a map[string]interface{} (msi) representing the
-- // object.
-- MSI() map[string]interface{}
--}
+- // Steps 11-13. Reparent nodes from the furthest block's children
+- // to a clone of the formatting element.
+- clone := formattingElement.clone()
+- reparentChildren(clone, furthestBlock)
+- furthestBlock.AppendChild(clone)
-
--// Map provides extended functionality for working with
--// untyped data, in particular map[string]interface (msi).
--type Map map[string]interface{}
+- // Step 14. Fix up the list of active formatting elements.
+- if oldLoc := p.afe.index(formattingElement); oldLoc != -1 && oldLoc < bookmark {
+- // Move the bookmark with the rest of the list.
+- bookmark--
+- }
+- p.afe.remove(formattingElement)
+- p.afe.insert(bookmark, clone)
-
--// Value returns the internal value instance
--func (m Map) Value() *Value {
-- return &Value{data: m}
+- // Step 15. Fix up the stack of open elements.
+- p.oe.remove(formattingElement)
+- p.oe.insert(p.oe.index(furthestBlock)+1, clone)
+- }
-}
-
--// Nil represents a nil Map.
--var Nil Map = New(nil)
--
--// New creates a new Map containing the map[string]interface{} in the data argument.
--// If the data argument is not a map[string]interface, New attempts to call the
--// MSI() method on the MSIConvertable interface to create one.
--func New(data interface{}) Map {
-- if _, ok := data.(map[string]interface{}); !ok {
-- if converter, ok := data.(MSIConvertable); ok {
-- data = converter.MSI()
-- } else {
-- return nil
+-// inBodyEndTagOther performs the "any other end tag" algorithm for inBodyIM.
+-func (p *parser) inBodyEndTagOther(tagAtom a.Atom) {
+- for i := len(p.oe) - 1; i >= 0; i-- {
+- if p.oe[i].DataAtom == tagAtom {
+- p.oe = p.oe[:i]
+- break
+- }
+- if isSpecialElement(p.oe[i]) {
+- break
- }
- }
-- return Map(data.(map[string]interface{}))
-}
-
--// MSI creates a map[string]interface{} and puts it inside a new Map.
--//
--// The arguments follow a key, value pattern.
--//
--// Panics
--//
--// Panics if any key arugment is non-string or if there are an odd number of arguments.
--//
--// Example
--//
--// To easily create Maps:
--//
--// m := objx.MSI("name", "Mat", "age", 29, "subobj", objx.MSI("active", true))
--//
--// // creates an Map equivalent to
--// m := objx.New(map[string]interface{}{"name": "Mat", "age": 29, "subobj": map[string]interface{}{"active": true}})
--func MSI(keyAndValuePairs ...interface{}) Map {
--
-- newMap := make(map[string]interface{})
-- keyAndValuePairsLen := len(keyAndValuePairs)
+-// Section 12.2.5.4.8.
+-func textIM(p *parser) bool {
+- switch p.tok.Type {
+- case ErrorToken:
+- p.oe.pop()
+- case TextToken:
+- d := p.tok.Data
+- if n := p.oe.top(); n.DataAtom == a.Textarea && n.FirstChild == nil {
+- // Ignore a newline at the start of a <textarea> block.
+- if d != "" && d[0] == '\r' {
+- d = d[1:]
+- }
+- if d != "" && d[0] == '\n' {
+- d = d[1:]
+- }
+- }
+- if d == "" {
+- return true
+- }
+- p.addText(d)
+- return true
+- case EndTagToken:
+- p.oe.pop()
+- }
+- p.im = p.originalIM
+- p.originalIM = nil
+- return p.tok.Type == EndTagToken
+-}
-
-- if keyAndValuePairsLen%2 != 0 {
-- panic("objx: MSI must have an even number of arguments following the 'key, value' pattern.")
+-// Section 12.2.5.4.9.
+-func inTableIM(p *parser) bool {
+- switch p.tok.Type {
+- case ErrorToken:
+- // Stop parsing.
+- return true
+- case TextToken:
+- p.tok.Data = strings.Replace(p.tok.Data, "\x00", "", -1)
+- switch p.oe.top().DataAtom {
+- case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr:
+- if strings.Trim(p.tok.Data, whitespace) == "" {
+- p.addText(p.tok.Data)
+- return true
+- }
+- }
+- case StartTagToken:
+- switch p.tok.DataAtom {
+- case a.Caption:
+- p.clearStackToContext(tableScope)
+- p.afe = append(p.afe, &scopeMarker)
+- p.addElement()
+- p.im = inCaptionIM
+- return true
+- case a.Colgroup:
+- p.clearStackToContext(tableScope)
+- p.addElement()
+- p.im = inColumnGroupIM
+- return true
+- case a.Col:
+- p.parseImpliedToken(StartTagToken, a.Colgroup, a.Colgroup.String())
+- return false
+- case a.Tbody, a.Tfoot, a.Thead:
+- p.clearStackToContext(tableScope)
+- p.addElement()
+- p.im = inTableBodyIM
+- return true
+- case a.Td, a.Th, a.Tr:
+- p.parseImpliedToken(StartTagToken, a.Tbody, a.Tbody.String())
+- return false
+- case a.Table:
+- if p.popUntil(tableScope, a.Table) {
+- p.resetInsertionMode()
+- return false
+- }
+- // Ignore the token.
+- return true
+- case a.Style, a.Script:
+- return inHeadIM(p)
+- case a.Input:
+- for _, t := range p.tok.Attr {
+- if t.Key == "type" && strings.ToLower(t.Val) == "hidden" {
+- p.addElement()
+- p.oe.pop()
+- return true
+- }
+- }
+- // Otherwise drop down to the default action.
+- case a.Form:
+- if p.form != nil {
+- // Ignore the token.
+- return true
+- }
+- p.addElement()
+- p.form = p.oe.pop()
+- case a.Select:
+- p.reconstructActiveFormattingElements()
+- switch p.top().DataAtom {
+- case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr:
+- p.fosterParenting = true
+- }
+- p.addElement()
+- p.fosterParenting = false
+- p.framesetOK = false
+- p.im = inSelectInTableIM
+- return true
+- }
+- case EndTagToken:
+- switch p.tok.DataAtom {
+- case a.Table:
+- if p.popUntil(tableScope, a.Table) {
+- p.resetInsertionMode()
+- return true
+- }
+- // Ignore the token.
+- return true
+- case a.Body, a.Caption, a.Col, a.Colgroup, a.Html, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr:
+- // Ignore the token.
+- return true
+- }
+- case CommentToken:
+- p.addChild(&Node{
+- Type: CommentNode,
+- Data: p.tok.Data,
+- })
+- return true
+- case DoctypeToken:
+- // Ignore the token.
+- return true
- }
-
-- for i := 0; i < keyAndValuePairsLen; i = i + 2 {
+- p.fosterParenting = true
+- defer func() { p.fosterParenting = false }()
-
-- key := keyAndValuePairs[i]
-- value := keyAndValuePairs[i+1]
+- return inBodyIM(p)
+-}
-
-- // make sure the key is a string
-- keyString, keyStringOK := key.(string)
-- if !keyStringOK {
-- panic("objx: MSI must follow 'string, interface{}' pattern. " + keyString + " is not a valid key.")
+-// Section 12.2.5.4.11.
+-func inCaptionIM(p *parser) bool {
+- switch p.tok.Type {
+- case StartTagToken:
+- switch p.tok.DataAtom {
+- case a.Caption, a.Col, a.Colgroup, a.Tbody, a.Td, a.Tfoot, a.Thead, a.Tr:
+- if p.popUntil(tableScope, a.Caption) {
+- p.clearActiveFormattingElements()
+- p.im = inTableIM
+- return false
+- } else {
+- // Ignore the token.
+- return true
+- }
+- case a.Select:
+- p.reconstructActiveFormattingElements()
+- p.addElement()
+- p.framesetOK = false
+- p.im = inSelectInTableIM
+- return true
+- }
+- case EndTagToken:
+- switch p.tok.DataAtom {
+- case a.Caption:
+- if p.popUntil(tableScope, a.Caption) {
+- p.clearActiveFormattingElements()
+- p.im = inTableIM
+- }
+- return true
+- case a.Table:
+- if p.popUntil(tableScope, a.Caption) {
+- p.clearActiveFormattingElements()
+- p.im = inTableIM
+- return false
+- } else {
+- // Ignore the token.
+- return true
+- }
+- case a.Body, a.Col, a.Colgroup, a.Html, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr:
+- // Ignore the token.
+- return true
+- }
+- }
+- return inBodyIM(p)
+-}
+-
+-// Section 12.2.5.4.12.
+-func inColumnGroupIM(p *parser) bool {
+- switch p.tok.Type {
+- case TextToken:
+- s := strings.TrimLeft(p.tok.Data, whitespace)
+- if len(s) < len(p.tok.Data) {
+- // Add the initial whitespace to the current node.
+- p.addText(p.tok.Data[:len(p.tok.Data)-len(s)])
+- if s == "" {
+- return true
+- }
+- p.tok.Data = s
+- }
+- case CommentToken:
+- p.addChild(&Node{
+- Type: CommentNode,
+- Data: p.tok.Data,
+- })
+- return true
+- case DoctypeToken:
+- // Ignore the token.
+- return true
+- case StartTagToken:
+- switch p.tok.DataAtom {
+- case a.Html:
+- return inBodyIM(p)
+- case a.Col:
+- p.addElement()
+- p.oe.pop()
+- p.acknowledgeSelfClosingTag()
+- return true
+- }
+- case EndTagToken:
+- switch p.tok.DataAtom {
+- case a.Colgroup:
+- if p.oe.top().DataAtom != a.Html {
+- p.oe.pop()
+- p.im = inTableIM
+- }
+- return true
+- case a.Col:
+- // Ignore the token.
+- return true
- }
--
-- newMap[keyString] = value
--
- }
--
-- return New(newMap)
--}
--
--// ****** Conversion Constructors
--
--// MustFromJSON creates a new Map containing the data specified in the
--// jsonString.
--//
--// Panics if the JSON is invalid.
--func MustFromJSON(jsonString string) Map {
-- o, err := FromJSON(jsonString)
--
-- if err != nil {
-- panic("objx: MustFromJSON failed with error: " + err.Error())
+- if p.oe.top().DataAtom != a.Html {
+- p.oe.pop()
+- p.im = inTableIM
+- return false
- }
--
-- return o
+- return true
-}
-
--// FromJSON creates a new Map containing the data specified in the
--// jsonString.
--//
--// Returns an error if the JSON is invalid.
--func FromJSON(jsonString string) (Map, error) {
--
-- var data interface{}
-- err := json.Unmarshal([]byte(jsonString), &data)
--
-- if err != nil {
-- return Nil, err
+-// Section 12.2.5.4.13.
+-func inTableBodyIM(p *parser) bool {
+- switch p.tok.Type {
+- case StartTagToken:
+- switch p.tok.DataAtom {
+- case a.Tr:
+- p.clearStackToContext(tableBodyScope)
+- p.addElement()
+- p.im = inRowIM
+- return true
+- case a.Td, a.Th:
+- p.parseImpliedToken(StartTagToken, a.Tr, a.Tr.String())
+- return false
+- case a.Caption, a.Col, a.Colgroup, a.Tbody, a.Tfoot, a.Thead:
+- if p.popUntil(tableScope, a.Tbody, a.Thead, a.Tfoot) {
+- p.im = inTableIM
+- return false
+- }
+- // Ignore the token.
+- return true
+- }
+- case EndTagToken:
+- switch p.tok.DataAtom {
+- case a.Tbody, a.Tfoot, a.Thead:
+- if p.elementInScope(tableScope, p.tok.DataAtom) {
+- p.clearStackToContext(tableBodyScope)
+- p.oe.pop()
+- p.im = inTableIM
+- }
+- return true
+- case a.Table:
+- if p.popUntil(tableScope, a.Tbody, a.Thead, a.Tfoot) {
+- p.im = inTableIM
+- return false
+- }
+- // Ignore the token.
+- return true
+- case a.Body, a.Caption, a.Col, a.Colgroup, a.Html, a.Td, a.Th, a.Tr:
+- // Ignore the token.
+- return true
+- }
+- case CommentToken:
+- p.addChild(&Node{
+- Type: CommentNode,
+- Data: p.tok.Data,
+- })
+- return true
- }
-
-- return New(data), nil
--
+- return inTableIM(p)
-}
-
--// FromBase64 creates a new Obj containing the data specified
--// in the Base64 string.
--//
--// The string is an encoded JSON string returned by Base64
--func FromBase64(base64String string) (Map, error) {
--
-- decoder := base64.NewDecoder(base64.StdEncoding, strings.NewReader(base64String))
--
-- decoded, err := ioutil.ReadAll(decoder)
-- if err != nil {
-- return nil, err
+-// Section 12.2.5.4.14.
+-func inRowIM(p *parser) bool {
+- switch p.tok.Type {
+- case StartTagToken:
+- switch p.tok.DataAtom {
+- case a.Td, a.Th:
+- p.clearStackToContext(tableRowScope)
+- p.addElement()
+- p.afe = append(p.afe, &scopeMarker)
+- p.im = inCellIM
+- return true
+- case a.Caption, a.Col, a.Colgroup, a.Tbody, a.Tfoot, a.Thead, a.Tr:
+- if p.popUntil(tableScope, a.Tr) {
+- p.im = inTableBodyIM
+- return false
+- }
+- // Ignore the token.
+- return true
+- }
+- case EndTagToken:
+- switch p.tok.DataAtom {
+- case a.Tr:
+- if p.popUntil(tableScope, a.Tr) {
+- p.im = inTableBodyIM
+- return true
+- }
+- // Ignore the token.
+- return true
+- case a.Table:
+- if p.popUntil(tableScope, a.Tr) {
+- p.im = inTableBodyIM
+- return false
+- }
+- // Ignore the token.
+- return true
+- case a.Tbody, a.Tfoot, a.Thead:
+- if p.elementInScope(tableScope, p.tok.DataAtom) {
+- p.parseImpliedToken(EndTagToken, a.Tr, a.Tr.String())
+- return false
+- }
+- // Ignore the token.
+- return true
+- case a.Body, a.Caption, a.Col, a.Colgroup, a.Html, a.Td, a.Th:
+- // Ignore the token.
+- return true
+- }
- }
-
-- return FromJSON(string(decoded))
+- return inTableIM(p)
-}
-
--// MustFromBase64 creates a new Obj containing the data specified
--// in the Base64 string and panics if there is an error.
--//
--// The string is an encoded JSON string returned by Base64
--func MustFromBase64(base64String string) Map {
--
-- result, err := FromBase64(base64String)
--
-- if err != nil {
-- panic("objx: MustFromBase64 failed with error: " + err.Error())
+-// Section 12.2.5.4.15.
+-func inCellIM(p *parser) bool {
+- switch p.tok.Type {
+- case StartTagToken:
+- switch p.tok.DataAtom {
+- case a.Caption, a.Col, a.Colgroup, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr:
+- if p.popUntil(tableScope, a.Td, a.Th) {
+- // Close the cell and reprocess.
+- p.clearActiveFormattingElements()
+- p.im = inRowIM
+- return false
+- }
+- // Ignore the token.
+- return true
+- case a.Select:
+- p.reconstructActiveFormattingElements()
+- p.addElement()
+- p.framesetOK = false
+- p.im = inSelectInTableIM
+- return true
+- }
+- case EndTagToken:
+- switch p.tok.DataAtom {
+- case a.Td, a.Th:
+- if !p.popUntil(tableScope, p.tok.DataAtom) {
+- // Ignore the token.
+- return true
+- }
+- p.clearActiveFormattingElements()
+- p.im = inRowIM
+- return true
+- case a.Body, a.Caption, a.Col, a.Colgroup, a.Html:
+- // Ignore the token.
+- return true
+- case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr:
+- if !p.elementInScope(tableScope, p.tok.DataAtom) {
+- // Ignore the token.
+- return true
+- }
+- // Close the cell and reprocess.
+- p.popUntil(tableScope, a.Td, a.Th)
+- p.clearActiveFormattingElements()
+- p.im = inRowIM
+- return false
+- }
- }
--
-- return result
+- return inBodyIM(p)
-}
-
--// FromSignedBase64 creates a new Obj containing the data specified
--// in the Base64 string.
--//
--// The string is an encoded JSON string returned by SignedBase64
--func FromSignedBase64(base64String, key string) (Map, error) {
-- parts := strings.Split(base64String, SignatureSeparator)
-- if len(parts) != 2 {
-- return nil, errors.New("objx: Signed base64 string is malformed.")
-- }
--
-- sig := HashWithKey(parts[0], key)
-- if parts[1] != sig {
-- return nil, errors.New("objx: Signature for base64 data does not match.")
+-// Section 12.2.5.4.16.
+-func inSelectIM(p *parser) bool {
+- switch p.tok.Type {
+- case ErrorToken:
+- // Stop parsing.
+- return true
+- case TextToken:
+- p.addText(strings.Replace(p.tok.Data, "\x00", "", -1))
+- case StartTagToken:
+- switch p.tok.DataAtom {
+- case a.Html:
+- return inBodyIM(p)
+- case a.Option:
+- if p.top().DataAtom == a.Option {
+- p.oe.pop()
+- }
+- p.addElement()
+- case a.Optgroup:
+- if p.top().DataAtom == a.Option {
+- p.oe.pop()
+- }
+- if p.top().DataAtom == a.Optgroup {
+- p.oe.pop()
+- }
+- p.addElement()
+- case a.Select:
+- p.tok.Type = EndTagToken
+- return false
+- case a.Input, a.Keygen, a.Textarea:
+- if p.elementInScope(selectScope, a.Select) {
+- p.parseImpliedToken(EndTagToken, a.Select, a.Select.String())
+- return false
+- }
+- // In order to properly ignore <textarea>, we need to change the tokenizer mode.
+- p.tokenizer.NextIsNotRawText()
+- // Ignore the token.
+- return true
+- case a.Script:
+- return inHeadIM(p)
+- }
+- case EndTagToken:
+- switch p.tok.DataAtom {
+- case a.Option:
+- if p.top().DataAtom == a.Option {
+- p.oe.pop()
+- }
+- case a.Optgroup:
+- i := len(p.oe) - 1
+- if p.oe[i].DataAtom == a.Option {
+- i--
+- }
+- if p.oe[i].DataAtom == a.Optgroup {
+- p.oe = p.oe[:i]
+- }
+- case a.Select:
+- if p.popUntil(selectScope, a.Select) {
+- p.resetInsertionMode()
+- }
+- }
+- case CommentToken:
+- p.addChild(&Node{
+- Type: CommentNode,
+- Data: p.tok.Data,
+- })
+- case DoctypeToken:
+- // Ignore the token.
+- return true
- }
-
-- return FromBase64(parts[0])
+- return true
-}
-
--// MustFromSignedBase64 creates a new Obj containing the data specified
--// in the Base64 string and panics if there is an error.
--//
--// The string is an encoded JSON string returned by Base64
--func MustFromSignedBase64(base64String, key string) Map {
--
-- result, err := FromSignedBase64(base64String, key)
--
-- if err != nil {
-- panic("objx: MustFromSignedBase64 failed with error: " + err.Error())
+-// Section 12.2.5.4.17.
+-func inSelectInTableIM(p *parser) bool {
+- switch p.tok.Type {
+- case StartTagToken, EndTagToken:
+- switch p.tok.DataAtom {
+- case a.Caption, a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr, a.Td, a.Th:
+- if p.tok.Type == StartTagToken || p.elementInScope(tableScope, p.tok.DataAtom) {
+- p.parseImpliedToken(EndTagToken, a.Select, a.Select.String())
+- return false
+- } else {
+- // Ignore the token.
+- return true
+- }
+- }
- }
--
-- return result
+- return inSelectIM(p)
-}
-
--// FromURLQuery generates a new Obj by parsing the specified
--// query.
--//
--// For queries with multiple values, the first value is selected.
--func FromURLQuery(query string) (Map, error) {
--
-- vals, err := url.ParseQuery(query)
--
-- if err != nil {
-- return nil, err
-- }
--
-- m := make(map[string]interface{})
-- for k, vals := range vals {
-- m[k] = vals[0]
+-// Section 12.2.5.4.18.
+-func afterBodyIM(p *parser) bool {
+- switch p.tok.Type {
+- case ErrorToken:
+- // Stop parsing.
+- return true
+- case TextToken:
+- s := strings.TrimLeft(p.tok.Data, whitespace)
+- if len(s) == 0 {
+- // It was all whitespace.
+- return inBodyIM(p)
+- }
+- case StartTagToken:
+- if p.tok.DataAtom == a.Html {
+- return inBodyIM(p)
+- }
+- case EndTagToken:
+- if p.tok.DataAtom == a.Html {
+- if !p.fragment {
+- p.im = afterAfterBodyIM
+- }
+- return true
+- }
+- case CommentToken:
+- // The comment is attached to the <html> element.
+- if len(p.oe) < 1 || p.oe[0].DataAtom != a.Html {
+- panic("html: bad parser state: <html> element not found, in the after-body insertion mode")
+- }
+- p.oe[0].AppendChild(&Node{
+- Type: CommentNode,
+- Data: p.tok.Data,
+- })
+- return true
- }
--
-- return New(m), nil
+- p.im = inBodyIM
+- return false
-}
-
--// MustFromURLQuery generates a new Obj by parsing the specified
--// query.
--//
--// For queries with multiple values, the first value is selected.
--//
--// Panics if it encounters an error
--func MustFromURLQuery(query string) Map {
--
-- o, err := FromURLQuery(query)
--
-- if err != nil {
-- panic("objx: MustFromURLQuery failed with error: " + err.Error())
+-// Section 12.2.5.4.19.
+-func inFramesetIM(p *parser) bool {
+- switch p.tok.Type {
+- case CommentToken:
+- p.addChild(&Node{
+- Type: CommentNode,
+- Data: p.tok.Data,
+- })
+- case TextToken:
+- // Ignore all text but whitespace.
+- s := strings.Map(func(c rune) rune {
+- switch c {
+- case ' ', '\t', '\n', '\f', '\r':
+- return c
+- }
+- return -1
+- }, p.tok.Data)
+- if s != "" {
+- p.addText(s)
+- }
+- case StartTagToken:
+- switch p.tok.DataAtom {
+- case a.Html:
+- return inBodyIM(p)
+- case a.Frameset:
+- p.addElement()
+- case a.Frame:
+- p.addElement()
+- p.oe.pop()
+- p.acknowledgeSelfClosingTag()
+- case a.Noframes:
+- return inHeadIM(p)
+- }
+- case EndTagToken:
+- switch p.tok.DataAtom {
+- case a.Frameset:
+- if p.oe.top().DataAtom != a.Html {
+- p.oe.pop()
+- if p.oe.top().DataAtom != a.Frameset {
+- p.im = afterFramesetIM
+- return true
+- }
+- }
+- }
+- default:
+- // Ignore the token.
- }
--
-- return o
--
--}
-diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/map_for_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/map_for_test.go
-deleted file mode 100644
-index 6beb506..0000000
---- a/Godeps/_workspace/src/github.com/stretchr/objx/map_for_test.go
-+++ /dev/null
-@@ -1,10 +0,0 @@
--package objx
--
--var TestMap map[string]interface{} = map[string]interface{}{
-- "name": "Tyler",
-- "address": map[string]interface{}{
-- "city": "Salt Lake City",
-- "state": "UT",
-- },
-- "numbers": []interface{}{"one", "two", "three", "four", "five"},
--}
-diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/map_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/map_test.go
-deleted file mode 100644
-index 1f8b45c..0000000
---- a/Godeps/_workspace/src/github.com/stretchr/objx/map_test.go
-+++ /dev/null
-@@ -1,147 +0,0 @@
--package objx
--
--import (
-- "github.com/stretchr/testify/assert"
-- "testing"
--)
--
--type Convertable struct {
-- name string
--}
--
--func (c *Convertable) MSI() map[string]interface{} {
-- return map[string]interface{}{"name": c.name}
--}
--
--type Unconvertable struct {
-- name string
+- return true
-}
-
--func TestMapCreation(t *testing.T) {
--
-- o := New(nil)
-- assert.Nil(t, o)
--
-- o = New("Tyler")
-- assert.Nil(t, o)
--
-- unconvertable := &Unconvertable{name: "Tyler"}
-- o = New(unconvertable)
-- assert.Nil(t, o)
--
-- convertable := &Convertable{name: "Tyler"}
-- o = New(convertable)
-- if assert.NotNil(t, convertable) {
-- assert.Equal(t, "Tyler", o["name"], "Tyler")
-- }
--
-- o = MSI()
-- if assert.NotNil(t, o) {
-- assert.NotNil(t, o)
-- }
--
-- o = MSI("name", "Tyler")
-- if assert.NotNil(t, o) {
-- if assert.NotNil(t, o) {
-- assert.Equal(t, o["name"], "Tyler")
+-// Section 12.2.5.4.20.
+-func afterFramesetIM(p *parser) bool {
+- switch p.tok.Type {
+- case CommentToken:
+- p.addChild(&Node{
+- Type: CommentNode,
+- Data: p.tok.Data,
+- })
+- case TextToken:
+- // Ignore all text but whitespace.
+- s := strings.Map(func(c rune) rune {
+- switch c {
+- case ' ', '\t', '\n', '\f', '\r':
+- return c
+- }
+- return -1
+- }, p.tok.Data)
+- if s != "" {
+- p.addText(s)
- }
+- case StartTagToken:
+- switch p.tok.DataAtom {
+- case a.Html:
+- return inBodyIM(p)
+- case a.Noframes:
+- return inHeadIM(p)
+- }
+- case EndTagToken:
+- switch p.tok.DataAtom {
+- case a.Html:
+- p.im = afterAfterFramesetIM
+- return true
+- }
+- default:
+- // Ignore the token.
- }
--
--}
--
--func TestMapMustFromJSONWithError(t *testing.T) {
--
-- _, err := FromJSON(`"name":"Mat"}`)
-- assert.Error(t, err)
--
+- return true
-}
-
--func TestMapFromJSON(t *testing.T) {
--
-- o := MustFromJSON(`{"name":"Mat"}`)
--
-- if assert.NotNil(t, o) {
-- if assert.NotNil(t, o) {
-- assert.Equal(t, "Mat", o["name"])
+-// Section 12.2.5.4.21.
+-func afterAfterBodyIM(p *parser) bool {
+- switch p.tok.Type {
+- case ErrorToken:
+- // Stop parsing.
+- return true
+- case TextToken:
+- s := strings.TrimLeft(p.tok.Data, whitespace)
+- if len(s) == 0 {
+- // It was all whitespace.
+- return inBodyIM(p)
+- }
+- case StartTagToken:
+- if p.tok.DataAtom == a.Html {
+- return inBodyIM(p)
- }
+- case CommentToken:
+- p.doc.AppendChild(&Node{
+- Type: CommentNode,
+- Data: p.tok.Data,
+- })
+- return true
+- case DoctypeToken:
+- return inBodyIM(p)
- }
--
--}
--
--func TestMapFromJSONWithError(t *testing.T) {
--
-- var m Map
--
-- assert.Panics(t, func() {
-- m = MustFromJSON(`"name":"Mat"}`)
-- })
--
-- assert.Nil(t, m)
--
+- p.im = inBodyIM
+- return false
-}
-
--func TestMapFromBase64String(t *testing.T) {
--
-- base64String := "eyJuYW1lIjoiTWF0In0="
--
-- o, err := FromBase64(base64String)
--
-- if assert.NoError(t, err) {
-- assert.Equal(t, o.Get("name").Str(), "Mat")
+-// Section 12.2.5.4.22.
+-func afterAfterFramesetIM(p *parser) bool {
+- switch p.tok.Type {
+- case CommentToken:
+- p.doc.AppendChild(&Node{
+- Type: CommentNode,
+- Data: p.tok.Data,
+- })
+- case TextToken:
+- // Ignore all text but whitespace.
+- s := strings.Map(func(c rune) rune {
+- switch c {
+- case ' ', '\t', '\n', '\f', '\r':
+- return c
+- }
+- return -1
+- }, p.tok.Data)
+- if s != "" {
+- p.tok.Data = s
+- return inBodyIM(p)
+- }
+- case StartTagToken:
+- switch p.tok.DataAtom {
+- case a.Html:
+- return inBodyIM(p)
+- case a.Noframes:
+- return inHeadIM(p)
+- }
+- case DoctypeToken:
+- return inBodyIM(p)
+- default:
+- // Ignore the token.
- }
--
-- assert.Equal(t, MustFromBase64(base64String).Get("name").Str(), "Mat")
--
--}
--
--func TestMapFromBase64StringWithError(t *testing.T) {
--
-- base64String := "eyJuYW1lIjoiTWFasd0In0="
--
-- _, err := FromBase64(base64String)
--
-- assert.Error(t, err)
--
-- assert.Panics(t, func() {
-- MustFromBase64(base64String)
-- })
--
+- return true
-}
-
--func TestMapFromSignedBase64String(t *testing.T) {
--
-- base64String := "eyJuYW1lIjoiTWF0In0=_67ee82916f90b2c0d68c903266e8998c9ef0c3d6"
--
-- o, err := FromSignedBase64(base64String, "key")
+-const whitespaceOrNUL = whitespace + "\x00"
-
-- if assert.NoError(t, err) {
-- assert.Equal(t, o.Get("name").Str(), "Mat")
+-// Section 12.2.5.5.
+-func parseForeignContent(p *parser) bool {
+- switch p.tok.Type {
+- case TextToken:
+- if p.framesetOK {
+- p.framesetOK = strings.TrimLeft(p.tok.Data, whitespaceOrNUL) == ""
+- }
+- p.tok.Data = strings.Replace(p.tok.Data, "\x00", "\ufffd", -1)
+- p.addText(p.tok.Data)
+- case CommentToken:
+- p.addChild(&Node{
+- Type: CommentNode,
+- Data: p.tok.Data,
+- })
+- case StartTagToken:
+- b := breakout[p.tok.Data]
+- if p.tok.DataAtom == a.Font {
+- loop:
+- for _, attr := range p.tok.Attr {
+- switch attr.Key {
+- case "color", "face", "size":
+- b = true
+- break loop
+- }
+- }
+- }
+- if b {
+- for i := len(p.oe) - 1; i >= 0; i-- {
+- n := p.oe[i]
+- if n.Namespace == "" || htmlIntegrationPoint(n) || mathMLTextIntegrationPoint(n) {
+- p.oe = p.oe[:i+1]
+- break
+- }
+- }
+- return false
+- }
+- switch p.top().Namespace {
+- case "math":
+- adjustAttributeNames(p.tok.Attr, mathMLAttributeAdjustments)
+- case "svg":
+- // Adjust SVG tag names. The tokenizer lower-cases tag names, but
+- // SVG wants e.g. "foreignObject" with a capital second "O".
+- if x := svgTagNameAdjustments[p.tok.Data]; x != "" {
+- p.tok.DataAtom = a.Lookup([]byte(x))
+- p.tok.Data = x
+- }
+- adjustAttributeNames(p.tok.Attr, svgAttributeAdjustments)
+- default:
+- panic("html: bad parser state: unexpected namespace")
+- }
+- adjustForeignAttributes(p.tok.Attr)
+- namespace := p.top().Namespace
+- p.addElement()
+- p.top().Namespace = namespace
+- if namespace != "" {
+- // Don't let the tokenizer go into raw text mode in foreign content
+- // (e.g. in an SVG <title> tag).
+- p.tokenizer.NextIsNotRawText()
+- }
+- if p.hasSelfClosingToken {
+- p.oe.pop()
+- p.acknowledgeSelfClosingTag()
+- }
+- case EndTagToken:
+- for i := len(p.oe) - 1; i >= 0; i-- {
+- if p.oe[i].Namespace == "" {
+- return p.im(p)
+- }
+- if strings.EqualFold(p.oe[i].Data, p.tok.Data) {
+- p.oe = p.oe[:i]
+- break
+- }
+- }
+- return true
+- default:
+- // Ignore the token.
- }
--
-- assert.Equal(t, MustFromSignedBase64(base64String, "key").Get("name").Str(), "Mat")
--
--}
--
--func TestMapFromSignedBase64StringWithError(t *testing.T) {
--
-- base64String := "eyJuYW1lasdIjoiTWF0In0=_67ee82916f90b2c0d68c903266e8998c9ef0c3d6"
--
-- _, err := FromSignedBase64(base64String, "key")
--
-- assert.Error(t, err)
--
-- assert.Panics(t, func() {
-- MustFromSignedBase64(base64String, "key")
-- })
--
+- return true
-}
-
--func TestMapFromURLQuery(t *testing.T) {
--
-- m, err := FromURLQuery("name=tyler&state=UT")
-- if assert.NoError(t, err) && assert.NotNil(t, m) {
-- assert.Equal(t, "tyler", m.Get("name").Str())
-- assert.Equal(t, "UT", m.Get("state").Str())
+-// Section 12.2.5.
+-func (p *parser) inForeignContent() bool {
+- if len(p.oe) == 0 {
+- return false
- }
--
--}
-diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/mutations.go b/Godeps/_workspace/src/github.com/stretchr/objx/mutations.go
-deleted file mode 100644
-index b35c863..0000000
---- a/Godeps/_workspace/src/github.com/stretchr/objx/mutations.go
-+++ /dev/null
-@@ -1,81 +0,0 @@
--package objx
--
--// Exclude returns a new Map with the keys in the specified []string
--// excluded.
--func (d Map) Exclude(exclude []string) Map {
--
-- excluded := make(Map)
-- for k, v := range d {
-- var shouldInclude bool = true
-- for _, toExclude := range exclude {
-- if k == toExclude {
-- shouldInclude = false
-- break
-- }
+- n := p.oe[len(p.oe)-1]
+- if n.Namespace == "" {
+- return false
+- }
+- if mathMLTextIntegrationPoint(n) {
+- if p.tok.Type == StartTagToken && p.tok.DataAtom != a.Mglyph && p.tok.DataAtom != a.Malignmark {
+- return false
- }
-- if shouldInclude {
-- excluded[k] = v
+- if p.tok.Type == TextToken {
+- return false
- }
- }
--
-- return excluded
--}
--
--// Copy creates a shallow copy of the Obj.
--func (m Map) Copy() Map {
-- copied := make(map[string]interface{})
-- for k, v := range m {
-- copied[k] = v
+- if n.Namespace == "math" && n.DataAtom == a.AnnotationXml && p.tok.Type == StartTagToken && p.tok.DataAtom == a.Svg {
+- return false
- }
-- return New(copied)
--}
--
--// Merge blends the specified map with a copy of this map and returns the result.
--//
--// Keys that appear in both will be selected from the specified map.
--// This method requires that the wrapped object be a map[string]interface{}
--func (m Map) Merge(merge Map) Map {
-- return m.Copy().MergeHere(merge)
--}
--
--// Merge blends the specified map with this map and returns the current map.
--//
--// Keys that appear in both will be selected from the specified map. The original map
--// will be modified. This method requires that
--// the wrapped object be a map[string]interface{}
--func (m Map) MergeHere(merge Map) Map {
--
-- for k, v := range merge {
-- m[k] = v
+- if htmlIntegrationPoint(n) && (p.tok.Type == StartTagToken || p.tok.Type == TextToken) {
+- return false
- }
--
-- return m
--
+- if p.tok.Type == ErrorToken {
+- return false
+- }
+- return true
-}
-
--// Transform builds a new Obj giving the transformer a chance
--// to change the keys and values as it goes. This method requires that
--// the wrapped object be a map[string]interface{}
--func (m Map) Transform(transformer func(key string, value interface{}) (string, interface{})) Map {
-- newMap := make(map[string]interface{})
-- for k, v := range m {
-- modifiedKey, modifiedVal := transformer(k, v)
-- newMap[modifiedKey] = modifiedVal
+-// parseImpliedToken parses a token as though it had appeared in the parser's
+-// input.
+-func (p *parser) parseImpliedToken(t TokenType, dataAtom a.Atom, data string) {
+- realToken, selfClosing := p.tok, p.hasSelfClosingToken
+- p.tok = Token{
+- Type: t,
+- DataAtom: dataAtom,
+- Data: data,
- }
-- return New(newMap)
+- p.hasSelfClosingToken = false
+- p.parseCurrentToken()
+- p.tok, p.hasSelfClosingToken = realToken, selfClosing
-}
-
--// TransformKeys builds a new map using the specified key mapping.
--//
--// Unspecified keys will be unaltered.
--// This method requires that the wrapped object be a map[string]interface{}
--func (m Map) TransformKeys(mapping map[string]string) Map {
-- return m.Transform(func(key string, value interface{}) (string, interface{}) {
+-// parseCurrentToken runs the current token through the parsing routines
+-// until it is consumed.
+-func (p *parser) parseCurrentToken() {
+- if p.tok.Type == SelfClosingTagToken {
+- p.hasSelfClosingToken = true
+- p.tok.Type = StartTagToken
+- }
-
-- if newKey, ok := mapping[key]; ok {
-- return newKey, value
+- consumed := false
+- for !consumed {
+- if p.inForeignContent() {
+- consumed = parseForeignContent(p)
+- } else {
+- consumed = p.im(p)
- }
+- }
-
-- return key, value
-- })
--}
-diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/mutations_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/mutations_test.go
-deleted file mode 100644
-index e20ee23..0000000
---- a/Godeps/_workspace/src/github.com/stretchr/objx/mutations_test.go
-+++ /dev/null
-@@ -1,77 +0,0 @@
--package objx
--
--import (
-- "github.com/stretchr/testify/assert"
-- "testing"
--)
--
--func TestExclude(t *testing.T) {
--
-- d := make(Map)
-- d["name"] = "Mat"
-- d["age"] = 29
-- d["secret"] = "ABC"
--
-- excluded := d.Exclude([]string{"secret"})
--
-- assert.Equal(t, d["name"], excluded["name"])
-- assert.Equal(t, d["age"], excluded["age"])
-- assert.False(t, excluded.Has("secret"), "secret should be excluded")
--
--}
--
--func TestCopy(t *testing.T) {
--
-- d1 := make(map[string]interface{})
-- d1["name"] = "Tyler"
-- d1["location"] = "UT"
--
-- d1Obj := New(d1)
-- d2Obj := d1Obj.Copy()
--
-- d2Obj["name"] = "Mat"
--
-- assert.Equal(t, d1Obj.Get("name").Str(), "Tyler")
-- assert.Equal(t, d2Obj.Get("name").Str(), "Mat")
--
+- if p.hasSelfClosingToken {
+- // This is a parse error, but ignore it.
+- p.hasSelfClosingToken = false
+- }
-}
-
--func TestMerge(t *testing.T) {
--
-- d := make(map[string]interface{})
-- d["name"] = "Mat"
--
-- d1 := make(map[string]interface{})
-- d1["name"] = "Tyler"
-- d1["location"] = "UT"
--
-- dObj := New(d)
-- d1Obj := New(d1)
--
-- merged := dObj.Merge(d1Obj)
--
-- assert.Equal(t, merged.Get("name").Str(), d1Obj.Get("name").Str())
-- assert.Equal(t, merged.Get("location").Str(), d1Obj.Get("location").Str())
-- assert.Empty(t, dObj.Get("location").Str())
--
+-func (p *parser) parse() error {
+- // Iterate until EOF. Any other error will cause an early return.
+- var err error
+- for err != io.EOF {
+- // CDATA sections are allowed only in foreign content.
+- n := p.oe.top()
+- p.tokenizer.AllowCDATA(n != nil && n.Namespace != "")
+- // Read and parse the next token.
+- p.tokenizer.Next()
+- p.tok = p.tokenizer.Token()
+- if p.tok.Type == ErrorToken {
+- err = p.tokenizer.Err()
+- if err != nil && err != io.EOF {
+- return err
+- }
+- }
+- p.parseCurrentToken()
+- }
+- return nil
-}
-
--func TestMergeHere(t *testing.T) {
--
-- d := make(map[string]interface{})
-- d["name"] = "Mat"
--
-- d1 := make(map[string]interface{})
-- d1["name"] = "Tyler"
-- d1["location"] = "UT"
--
-- dObj := New(d)
-- d1Obj := New(d1)
--
-- merged := dObj.MergeHere(d1Obj)
--
-- assert.Equal(t, dObj, merged, "With MergeHere, it should return the first modified map")
-- assert.Equal(t, merged.Get("name").Str(), d1Obj.Get("name").Str())
-- assert.Equal(t, merged.Get("location").Str(), d1Obj.Get("location").Str())
-- assert.Equal(t, merged.Get("location").Str(), dObj.Get("location").Str())
+-// Parse returns the parse tree for the HTML from the given Reader.
+-// The input is assumed to be UTF-8 encoded.
+-func Parse(r io.Reader) (*Node, error) {
+- p := &parser{
+- tokenizer: NewTokenizer(r),
+- doc: &Node{
+- Type: DocumentNode,
+- },
+- scripting: true,
+- framesetOK: true,
+- im: initialIM,
+- }
+- err := p.parse()
+- if err != nil {
+- return nil, err
+- }
+- return p.doc, nil
-}
-diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/security.go b/Godeps/_workspace/src/github.com/stretchr/objx/security.go
-deleted file mode 100644
-index fdd6be9..0000000
---- a/Godeps/_workspace/src/github.com/stretchr/objx/security.go
-+++ /dev/null
-@@ -1,14 +0,0 @@
--package objx
-
--import (
-- "crypto/sha1"
-- "encoding/hex"
--)
+-// ParseFragment parses a fragment of HTML and returns the nodes that were
+-// found. If the fragment is the InnerHTML for an existing element, pass that
+-// element in context.
+-func ParseFragment(r io.Reader, context *Node) ([]*Node, error) {
+- contextTag := ""
+- if context != nil {
+- if context.Type != ElementNode {
+- return nil, errors.New("html: ParseFragment of non-element Node")
+- }
+- // The next check isn't just context.DataAtom.String() == context.Data because
+- // it is valid to pass an element whose tag isn't a known atom. For example,
+- // DataAtom == 0 and Data = "tagfromthefuture" is perfectly consistent.
+- if context.DataAtom != a.Lookup([]byte(context.Data)) {
+- return nil, fmt.Errorf("html: inconsistent Node: DataAtom=%q, Data=%q", context.DataAtom, context.Data)
+- }
+- contextTag = context.DataAtom.String()
+- }
+- p := &parser{
+- tokenizer: NewTokenizerFragment(r, contextTag),
+- doc: &Node{
+- Type: DocumentNode,
+- },
+- scripting: true,
+- fragment: true,
+- context: context,
+- }
-
--// HashWithKey hashes the specified string using the security
--// key.
--func HashWithKey(data, key string) string {
-- hash := sha1.New()
-- hash.Write([]byte(data + ":" + key))
-- return hex.EncodeToString(hash.Sum(nil))
--}
-diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/security_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/security_test.go
-deleted file mode 100644
-index 8f0898f..0000000
---- a/Godeps/_workspace/src/github.com/stretchr/objx/security_test.go
-+++ /dev/null
-@@ -1,12 +0,0 @@
--package objx
+- root := &Node{
+- Type: ElementNode,
+- DataAtom: a.Html,
+- Data: a.Html.String(),
+- }
+- p.doc.AppendChild(root)
+- p.oe = nodeStack{root}
+- p.resetInsertionMode()
-
--import (
-- "github.com/stretchr/testify/assert"
-- "testing"
--)
+- for n := context; n != nil; n = n.Parent {
+- if n.Type == ElementNode && n.DataAtom == a.Form {
+- p.form = n
+- break
+- }
+- }
-
--func TestHashWithKey(t *testing.T) {
+- err := p.parse()
+- if err != nil {
+- return nil, err
+- }
-
-- assert.Equal(t, "0ce84d8d01f2c7b6e0882b784429c54d280ea2d9", HashWithKey("abc", "def"))
+- parent := p.doc
+- if context != nil {
+- parent = root
+- }
-
+- var result []*Node
+- for c := parent.FirstChild; c != nil; {
+- next := c.NextSibling
+- parent.RemoveChild(c)
+- result = append(result, c)
+- c = next
+- }
+- return result, nil
-}
-diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/simple_example_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/simple_example_test.go
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/parse_test.go b/Godeps/_workspace/src/golang.org/x/net/html/parse_test.go
deleted file mode 100644
-index 5408c7f..0000000
---- a/Godeps/_workspace/src/github.com/stretchr/objx/simple_example_test.go
+index 7e47d11..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/parse_test.go
+++ /dev/null
-@@ -1,41 +0,0 @@
--package objx
+@@ -1,388 +0,0 @@
+-// Copyright 2010 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-package html
-
-import (
-- "github.com/stretchr/testify/assert"
+- "bufio"
+- "bytes"
+- "errors"
+- "fmt"
+- "io"
+- "io/ioutil"
+- "os"
+- "path/filepath"
+- "runtime"
+- "sort"
+- "strings"
- "testing"
--)
-
--func TestSimpleExample(t *testing.T) {
+- "golang.org/x/net/html/atom"
+-)
-
-- // build a map from a JSON object
-- o := MustFromJSON(`{"name":"Mat","foods":["indian","chinese"], "location":{"county":"hobbiton","city":"the shire"}}`)
+-// readParseTest reads a single test case from r.
+-func readParseTest(r *bufio.Reader) (text, want, context string, err error) {
+- line, err := r.ReadSlice('\n')
+- if err != nil {
+- return "", "", "", err
+- }
+- var b []byte
-
-- // Map can be used as a straight map[string]interface{}
-- assert.Equal(t, o["name"], "Mat")
+- // Read the HTML.
+- if string(line) != "#data\n" {
+- return "", "", "", fmt.Errorf(`got %q want "#data\n"`, line)
+- }
+- for {
+- line, err = r.ReadSlice('\n')
+- if err != nil {
+- return "", "", "", err
+- }
+- if line[0] == '#' {
+- break
+- }
+- b = append(b, line...)
+- }
+- text = strings.TrimSuffix(string(b), "\n")
+- b = b[:0]
-
-- // Get an Value object
-- v := o.Get("name")
-- assert.Equal(t, v, &Value{data: "Mat"})
+- // Skip the error list.
+- if string(line) != "#errors\n" {
+- return "", "", "", fmt.Errorf(`got %q want "#errors\n"`, line)
+- }
+- for {
+- line, err = r.ReadSlice('\n')
+- if err != nil {
+- return "", "", "", err
+- }
+- if line[0] == '#' {
+- break
+- }
+- }
-
-- // Test the contained value
-- assert.False(t, v.IsInt())
-- assert.False(t, v.IsBool())
-- assert.True(t, v.IsStr())
+- if string(line) == "#document-fragment\n" {
+- line, err = r.ReadSlice('\n')
+- if err != nil {
+- return "", "", "", err
+- }
+- context = strings.TrimSpace(string(line))
+- line, err = r.ReadSlice('\n')
+- if err != nil {
+- return "", "", "", err
+- }
+- }
-
-- // Get the contained value
-- assert.Equal(t, v.Str(), "Mat")
+- // Read the dump of what the parse tree should be.
+- if string(line) != "#document\n" {
+- return "", "", "", fmt.Errorf(`got %q want "#document\n"`, line)
+- }
+- inQuote := false
+- for {
+- line, err = r.ReadSlice('\n')
+- if err != nil && err != io.EOF {
+- return "", "", "", err
+- }
+- trimmed := bytes.Trim(line, "| \n")
+- if len(trimmed) > 0 {
+- if line[0] == '|' && trimmed[0] == '"' {
+- inQuote = true
+- }
+- if trimmed[len(trimmed)-1] == '"' && !(line[0] == '|' && len(trimmed) == 1) {
+- inQuote = false
+- }
+- }
+- if len(line) == 0 || len(line) == 1 && line[0] == '\n' && !inQuote {
+- break
+- }
+- b = append(b, line...)
+- }
+- return text, string(b), context, nil
+-}
-
-- // Get a default value if the contained value is not of the expected type or does not exist
-- assert.Equal(t, 1, v.Int(1))
+-func dumpIndent(w io.Writer, level int) {
+- io.WriteString(w, "| ")
+- for i := 0; i < level; i++ {
+- io.WriteString(w, " ")
+- }
+-}
-
-- // Get a value by using array notation
-- assert.Equal(t, "indian", o.Get("foods[0]").Data())
+-type sortedAttributes []Attribute
-
-- // Set a value by using array notation
-- o.Set("foods[0]", "italian")
-- assert.Equal(t, "italian", o.Get("foods[0]").Str())
+-func (a sortedAttributes) Len() int {
+- return len(a)
+-}
-
-- // Get a value by using dot notation
-- assert.Equal(t, "hobbiton", o.Get("location.county").Str())
+-func (a sortedAttributes) Less(i, j int) bool {
+- if a[i].Namespace != a[j].Namespace {
+- return a[i].Namespace < a[j].Namespace
+- }
+- return a[i].Key < a[j].Key
+-}
-
+-func (a sortedAttributes) Swap(i, j int) {
+- a[i], a[j] = a[j], a[i]
-}
-diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/tests.go b/Godeps/_workspace/src/github.com/stretchr/objx/tests.go
-deleted file mode 100644
-index d9e0b47..0000000
---- a/Godeps/_workspace/src/github.com/stretchr/objx/tests.go
-+++ /dev/null
-@@ -1,17 +0,0 @@
--package objx
-
--// Has gets whether there is something at the specified selector
--// or not.
--//
--// If m is nil, Has will always return false.
--func (m Map) Has(selector string) bool {
-- if m == nil {
-- return false
+-func dumpLevel(w io.Writer, n *Node, level int) error {
+- dumpIndent(w, level)
+- switch n.Type {
+- case ErrorNode:
+- return errors.New("unexpected ErrorNode")
+- case DocumentNode:
+- return errors.New("unexpected DocumentNode")
+- case ElementNode:
+- if n.Namespace != "" {
+- fmt.Fprintf(w, "<%s %s>", n.Namespace, n.Data)
+- } else {
+- fmt.Fprintf(w, "<%s>", n.Data)
+- }
+- attr := sortedAttributes(n.Attr)
+- sort.Sort(attr)
+- for _, a := range attr {
+- io.WriteString(w, "\n")
+- dumpIndent(w, level+1)
+- if a.Namespace != "" {
+- fmt.Fprintf(w, `%s %s="%s"`, a.Namespace, a.Key, a.Val)
+- } else {
+- fmt.Fprintf(w, `%s="%s"`, a.Key, a.Val)
+- }
+- }
+- case TextNode:
+- fmt.Fprintf(w, `"%s"`, n.Data)
+- case CommentNode:
+- fmt.Fprintf(w, "<!-- %s -->", n.Data)
+- case DoctypeNode:
+- fmt.Fprintf(w, "<!DOCTYPE %s", n.Data)
+- if n.Attr != nil {
+- var p, s string
+- for _, a := range n.Attr {
+- switch a.Key {
+- case "public":
+- p = a.Val
+- case "system":
+- s = a.Val
+- }
+- }
+- if p != "" || s != "" {
+- fmt.Fprintf(w, ` "%s"`, p)
+- fmt.Fprintf(w, ` "%s"`, s)
+- }
+- }
+- io.WriteString(w, ">")
+- case scopeMarkerNode:
+- return errors.New("unexpected scopeMarkerNode")
+- default:
+- return errors.New("unknown node type")
- }
-- return !m.Get(selector).IsNil()
+- io.WriteString(w, "\n")
+- for c := n.FirstChild; c != nil; c = c.NextSibling {
+- if err := dumpLevel(w, c, level+1); err != nil {
+- return err
+- }
+- }
+- return nil
-}
-
--// IsNil gets whether the data is nil or not.
--func (v *Value) IsNil() bool {
-- return v == nil || v.data == nil
+-func dump(n *Node) (string, error) {
+- if n == nil || n.FirstChild == nil {
+- return "", nil
+- }
+- var b bytes.Buffer
+- for c := n.FirstChild; c != nil; c = c.NextSibling {
+- if err := dumpLevel(&b, c, 0); err != nil {
+- return "", err
+- }
+- }
+- return b.String(), nil
-}
-diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/tests_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/tests_test.go
-deleted file mode 100644
-index bcc1eb0..0000000
---- a/Godeps/_workspace/src/github.com/stretchr/objx/tests_test.go
-+++ /dev/null
-@@ -1,24 +0,0 @@
--package objx
-
--import (
-- "github.com/stretchr/testify/assert"
-- "testing"
--)
+-const testDataDir = "testdata/webkit/"
-
--func TestHas(t *testing.T) {
+-func TestParser(t *testing.T) {
+- testFiles, err := filepath.Glob(testDataDir + "*.dat")
+- if err != nil {
+- t.Fatal(err)
+- }
+- for _, tf := range testFiles {
+- f, err := os.Open(tf)
+- if err != nil {
+- t.Fatal(err)
+- }
+- defer f.Close()
+- r := bufio.NewReader(f)
-
-- m := New(TestMap)
+- for i := 0; ; i++ {
+- text, want, context, err := readParseTest(r)
+- if err == io.EOF {
+- break
+- }
+- if err != nil {
+- t.Fatal(err)
+- }
-
-- assert.True(t, m.Has("name"))
-- assert.True(t, m.Has("address.state"))
-- assert.True(t, m.Has("numbers[4]"))
+- err = testParseCase(text, want, context)
-
-- assert.False(t, m.Has("address.state.nope"))
-- assert.False(t, m.Has("address.nope"))
-- assert.False(t, m.Has("nope"))
-- assert.False(t, m.Has("numbers[5]"))
+- if err != nil {
+- t.Errorf("%s test #%d %q, %s", tf, i, text, err)
+- }
+- }
+- }
+-}
-
-- m = nil
-- assert.False(t, m.Has("nothing"))
+-// testParseCase tests one test case from the test files. If the test does not
+-// pass, it returns an error that explains the failure.
+-// text is the HTML to be parsed, want is a dump of the correct parse tree,
+-// and context is the name of the context node, if any.
+-func testParseCase(text, want, context string) (err error) {
+- defer func() {
+- if x := recover(); x != nil {
+- switch e := x.(type) {
+- case error:
+- err = e
+- default:
+- err = fmt.Errorf("%v", e)
+- }
+- }
+- }()
-
--}
-diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/type_specific_codegen.go b/Godeps/_workspace/src/github.com/stretchr/objx/type_specific_codegen.go
-deleted file mode 100644
-index f3ecb29..0000000
---- a/Godeps/_workspace/src/github.com/stretchr/objx/type_specific_codegen.go
-+++ /dev/null
-@@ -1,2881 +0,0 @@
--package objx
+- var doc *Node
+- if context == "" {
+- doc, err = Parse(strings.NewReader(text))
+- if err != nil {
+- return err
+- }
+- } else {
+- contextNode := &Node{
+- Type: ElementNode,
+- DataAtom: atom.Lookup([]byte(context)),
+- Data: context,
+- }
+- nodes, err := ParseFragment(strings.NewReader(text), contextNode)
+- if err != nil {
+- return err
+- }
+- doc = &Node{
+- Type: DocumentNode,
+- }
+- for _, n := range nodes {
+- doc.AppendChild(n)
+- }
+- }
-
--/*
-- Inter (interface{} and []interface{})
-- --------------------------------------------------
--*/
+- if err := checkTreeConsistency(doc); err != nil {
+- return err
+- }
-
--// Inter gets the value as a interface{}, returns the optionalDefault
--// value or a system default object if the value is the wrong type.
--func (v *Value) Inter(optionalDefault ...interface{}) interface{} {
-- if s, ok := v.data.(interface{}); ok {
-- return s
+- got, err := dump(doc)
+- if err != nil {
+- return err
- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
+- // Compare the parsed tree to the #document section.
+- if got != want {
+- return fmt.Errorf("got vs want:\n----\n%s----\n%s----", got, want)
- }
-- return nil
--}
-
--// MustInter gets the value as a interface{}.
--//
--// Panics if the object is not a interface{}.
--func (v *Value) MustInter() interface{} {
-- return v.data.(interface{})
--}
+- if renderTestBlacklist[text] || context != "" {
+- return nil
+- }
-
--// InterSlice gets the value as a []interface{}, returns the optionalDefault
--// value or nil if the value is not a []interface{}.
--func (v *Value) InterSlice(optionalDefault ...[]interface{}) []interface{} {
-- if s, ok := v.data.([]interface{}); ok {
-- return s
+- // Check that rendering and re-parsing results in an identical tree.
+- pr, pw := io.Pipe()
+- go func() {
+- pw.CloseWithError(Render(pw, doc))
+- }()
+- doc1, err := Parse(pr)
+- if err != nil {
+- return err
- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
+- got1, err := dump(doc1)
+- if err != nil {
+- return err
+- }
+- if got != got1 {
+- return fmt.Errorf("got vs got1:\n----\n%s----\n%s----", got, got1)
- }
-- return nil
--}
--
--// MustInterSlice gets the value as a []interface{}.
--//
--// Panics if the object is not a []interface{}.
--func (v *Value) MustInterSlice() []interface{} {
-- return v.data.([]interface{})
--}
-
--// IsInter gets whether the object contained is a interface{} or not.
--func (v *Value) IsInter() bool {
-- _, ok := v.data.(interface{})
-- return ok
+- return nil
-}
-
--// IsInterSlice gets whether the object contained is a []interface{} or not.
--func (v *Value) IsInterSlice() bool {
-- _, ok := v.data.([]interface{})
-- return ok
+-// Some test input result in parse trees are not 'well-formed' despite
+-// following the HTML5 recovery algorithms. Rendering and re-parsing such a
+-// tree will not result in an exact clone of that tree. We blacklist such
+-// inputs from the render test.
+-var renderTestBlacklist = map[string]bool{
+- // The second <a> will be reparented to the first <table>'s parent. This
+- // results in an <a> whose parent is an <a>, which is not 'well-formed'.
+- `<a><table><td><a><table></table><a></tr><a></table><b>X</b>C<a>Y`: true,
+- // The same thing with a <p>:
+- `<p><table></p>`: true,
+- // More cases of <a> being reparented:
+- `<a href="blah">aba<table><a href="foo">br<tr><td></td></tr>x</table>aoe`: true,
+- `<a><table><a></table><p><a><div><a>`: true,
+- `<a><table><td><a><table></table><a></tr><a></table><a>`: true,
+- // A similar reparenting situation involving <nobr>:
+- `<!DOCTYPE html><body><b><nobr>1<table><nobr></b><i><nobr>2<nobr></i>3`: true,
+- // A <plaintext> element is reparented, putting it before a table.
+- // A <plaintext> element can't have anything after it in HTML.
+- `<table><plaintext><td>`: true,
+- `<!doctype html><table><plaintext></plaintext>`: true,
+- `<!doctype html><table><tbody><plaintext></plaintext>`: true,
+- `<!doctype html><table><tbody><tr><plaintext></plaintext>`: true,
+- // A form inside a table inside a form doesn't work either.
+- `<!doctype html><form><table></form><form></table></form>`: true,
+- // A script that ends at EOF may escape its own closing tag when rendered.
+- `<!doctype html><script><!--<script `: true,
+- `<!doctype html><script><!--<script <`: true,
+- `<!doctype html><script><!--<script <a`: true,
+- `<!doctype html><script><!--<script </`: true,
+- `<!doctype html><script><!--<script </s`: true,
+- `<!doctype html><script><!--<script </script`: true,
+- `<!doctype html><script><!--<script </scripta`: true,
+- `<!doctype html><script><!--<script -`: true,
+- `<!doctype html><script><!--<script -a`: true,
+- `<!doctype html><script><!--<script -<`: true,
+- `<!doctype html><script><!--<script --`: true,
+- `<!doctype html><script><!--<script --a`: true,
+- `<!doctype html><script><!--<script --<`: true,
+- `<script><!--<script `: true,
+- `<script><!--<script <a`: true,
+- `<script><!--<script </script`: true,
+- `<script><!--<script </scripta`: true,
+- `<script><!--<script -`: true,
+- `<script><!--<script -a`: true,
+- `<script><!--<script --`: true,
+- `<script><!--<script --a`: true,
+- `<script><!--<script <`: true,
+- `<script><!--<script </`: true,
+- `<script><!--<script </s`: true,
+- // Reconstructing the active formatting elements results in a <plaintext>
+- // element that contains an <a> element.
+- `<!doctype html><p><a><plaintext>b`: true,
-}
-
--// EachInter calls the specified callback for each object
--// in the []interface{}.
--//
--// Panics if the object is the wrong type.
--func (v *Value) EachInter(callback func(int, interface{}) bool) *Value {
--
-- for index, val := range v.MustInterSlice() {
-- carryon := callback(index, val)
-- if carryon == false {
-- break
-- }
+-func TestNodeConsistency(t *testing.T) {
+- // inconsistentNode is a Node whose DataAtom and Data do not agree.
+- inconsistentNode := &Node{
+- Type: ElementNode,
+- DataAtom: atom.Frameset,
+- Data: "table",
+- }
+- _, err := ParseFragment(strings.NewReader("<p>hello</p>"), inconsistentNode)
+- if err == nil {
+- t.Errorf("got nil error, want non-nil")
- }
--
-- return v
--
-}
-
--// WhereInter uses the specified decider function to select items
--// from the []interface{}. The object contained in the result will contain
--// only the selected items.
--func (v *Value) WhereInter(decider func(int, interface{}) bool) *Value {
--
-- var selected []interface{}
--
-- v.EachInter(func(index int, val interface{}) bool {
-- shouldSelect := decider(index, val)
-- if shouldSelect == false {
-- selected = append(selected, val)
-- }
-- return true
-- })
--
-- return &Value{data: selected}
--
+-func BenchmarkParser(b *testing.B) {
+- buf, err := ioutil.ReadFile("testdata/go1.html")
+- if err != nil {
+- b.Fatalf("could not read testdata/go1.html: %v", err)
+- }
+- b.SetBytes(int64(len(buf)))
+- runtime.GC()
+- b.ReportAllocs()
+- b.ResetTimer()
+- for i := 0; i < b.N; i++ {
+- Parse(bytes.NewBuffer(buf))
+- }
-}
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/render.go b/Godeps/_workspace/src/golang.org/x/net/html/render.go
+deleted file mode 100644
+index 4a833b4..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/render.go
++++ /dev/null
+@@ -1,271 +0,0 @@
+-// Copyright 2011 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
--// GroupInter uses the specified grouper function to group the items
--// keyed by the return of the grouper. The object contained in the
--// result will contain a map[string][]interface{}.
--func (v *Value) GroupInter(grouper func(int, interface{}) string) *Value {
--
-- groups := make(map[string][]interface{})
--
-- v.EachInter(func(index int, val interface{}) bool {
-- group := grouper(index, val)
-- if _, ok := groups[group]; !ok {
-- groups[group] = make([]interface{}, 0)
-- }
-- groups[group] = append(groups[group], val)
-- return true
-- })
+-package html
-
-- return &Value{data: groups}
+-import (
+- "bufio"
+- "errors"
+- "fmt"
+- "io"
+- "strings"
+-)
-
+-type writer interface {
+- io.Writer
+- WriteByte(c byte) error // in Go 1.1, use io.ByteWriter
+- WriteString(string) (int, error)
-}
-
--// ReplaceInter uses the specified function to replace each interface{}s
--// by iterating each item. The data in the returned result will be a
--// []interface{} containing the replaced items.
--func (v *Value) ReplaceInter(replacer func(int, interface{}) interface{}) *Value {
--
-- arr := v.MustInterSlice()
-- replaced := make([]interface{}, len(arr))
--
-- v.EachInter(func(index int, val interface{}) bool {
-- replaced[index] = replacer(index, val)
-- return true
-- })
+-// Render renders the parse tree n to the given writer.
+-//
+-// Rendering is done on a 'best effort' basis: calling Parse on the output of
+-// Render will always result in something similar to the original tree, but it
+-// is not necessarily an exact clone unless the original tree was 'well-formed'.
+-// 'Well-formed' is not easily specified; the HTML5 specification is
+-// complicated.
+-//
+-// Calling Parse on arbitrary input typically results in a 'well-formed' parse
+-// tree. However, it is possible for Parse to yield a 'badly-formed' parse tree.
+-// For example, in a 'well-formed' parse tree, no <a> element is a child of
+-// another <a> element: parsing "<a><a>" results in two sibling elements.
+-// Similarly, in a 'well-formed' parse tree, no <a> element is a child of a
+-// <table> element: parsing "<p><table><a>" results in a <p> with two sibling
+-// children; the <a> is reparented to the <table>'s parent. However, calling
+-// Parse on "<a><table><a>" does not return an error, but the result has an <a>
+-// element with an <a> child, and is therefore not 'well-formed'.
+-//
+-// Programmatically constructed trees are typically also 'well-formed', but it
+-// is possible to construct a tree that looks innocuous but, when rendered and
+-// re-parsed, results in a different tree. A simple example is that a solitary
+-// text node would become a tree containing <html>, <head> and <body> elements.
+-// Another example is that the programmatic equivalent of "a<head>b</head>c"
+-// becomes "<html><head><head/><body>abc</body></html>".
+-func Render(w io.Writer, n *Node) error {
+- if x, ok := w.(writer); ok {
+- return render(x, n)
+- }
+- buf := bufio.NewWriter(w)
+- if err := render(buf, n); err != nil {
+- return err
+- }
+- return buf.Flush()
+-}
-
-- return &Value{data: replaced}
+-// plaintextAbort is returned from render1 when a <plaintext> element
+-// has been rendered. No more end tags should be rendered after that.
+-var plaintextAbort = errors.New("html: internal error (plaintext abort)")
-
+-func render(w writer, n *Node) error {
+- err := render1(w, n)
+- if err == plaintextAbort {
+- err = nil
+- }
+- return err
-}
-
--// CollectInter uses the specified collector function to collect a value
--// for each of the interface{}s in the slice. The data returned will be a
--// []interface{}.
--func (v *Value) CollectInter(collector func(int, interface{}) interface{}) *Value {
--
-- arr := v.MustInterSlice()
-- collected := make([]interface{}, len(arr))
+-func render1(w writer, n *Node) error {
+- // Render non-element nodes; these are the easy cases.
+- switch n.Type {
+- case ErrorNode:
+- return errors.New("html: cannot render an ErrorNode node")
+- case TextNode:
+- return escape(w, n.Data)
+- case DocumentNode:
+- for c := n.FirstChild; c != nil; c = c.NextSibling {
+- if err := render1(w, c); err != nil {
+- return err
+- }
+- }
+- return nil
+- case ElementNode:
+- // No-op.
+- case CommentNode:
+- if _, err := w.WriteString("<!--"); err != nil {
+- return err
+- }
+- if _, err := w.WriteString(n.Data); err != nil {
+- return err
+- }
+- if _, err := w.WriteString("-->"); err != nil {
+- return err
+- }
+- return nil
+- case DoctypeNode:
+- if _, err := w.WriteString("<!DOCTYPE "); err != nil {
+- return err
+- }
+- if _, err := w.WriteString(n.Data); err != nil {
+- return err
+- }
+- if n.Attr != nil {
+- var p, s string
+- for _, a := range n.Attr {
+- switch a.Key {
+- case "public":
+- p = a.Val
+- case "system":
+- s = a.Val
+- }
+- }
+- if p != "" {
+- if _, err := w.WriteString(" PUBLIC "); err != nil {
+- return err
+- }
+- if err := writeQuoted(w, p); err != nil {
+- return err
+- }
+- if s != "" {
+- if err := w.WriteByte(' '); err != nil {
+- return err
+- }
+- if err := writeQuoted(w, s); err != nil {
+- return err
+- }
+- }
+- } else if s != "" {
+- if _, err := w.WriteString(" SYSTEM "); err != nil {
+- return err
+- }
+- if err := writeQuoted(w, s); err != nil {
+- return err
+- }
+- }
+- }
+- return w.WriteByte('>')
+- default:
+- return errors.New("html: unknown node type")
+- }
-
-- v.EachInter(func(index int, val interface{}) bool {
-- collected[index] = collector(index, val)
-- return true
-- })
+- // Render the <xxx> opening tag.
+- if err := w.WriteByte('<'); err != nil {
+- return err
+- }
+- if _, err := w.WriteString(n.Data); err != nil {
+- return err
+- }
+- for _, a := range n.Attr {
+- if err := w.WriteByte(' '); err != nil {
+- return err
+- }
+- if a.Namespace != "" {
+- if _, err := w.WriteString(a.Namespace); err != nil {
+- return err
+- }
+- if err := w.WriteByte(':'); err != nil {
+- return err
+- }
+- }
+- if _, err := w.WriteString(a.Key); err != nil {
+- return err
+- }
+- if _, err := w.WriteString(`="`); err != nil {
+- return err
+- }
+- if err := escape(w, a.Val); err != nil {
+- return err
+- }
+- if err := w.WriteByte('"'); err != nil {
+- return err
+- }
+- }
+- if voidElements[n.Data] {
+- if n.FirstChild != nil {
+- return fmt.Errorf("html: void element <%s> has child nodes", n.Data)
+- }
+- _, err := w.WriteString("/>")
+- return err
+- }
+- if err := w.WriteByte('>'); err != nil {
+- return err
+- }
-
-- return &Value{data: collected}
--}
+- // Add initial newline where there is danger of a newline beging ignored.
+- if c := n.FirstChild; c != nil && c.Type == TextNode && strings.HasPrefix(c.Data, "\n") {
+- switch n.Data {
+- case "pre", "listing", "textarea":
+- if err := w.WriteByte('\n'); err != nil {
+- return err
+- }
+- }
+- }
-
--/*
-- MSI (map[string]interface{} and []map[string]interface{})
-- --------------------------------------------------
--*/
+- // Render any child nodes.
+- switch n.Data {
+- case "iframe", "noembed", "noframes", "noscript", "plaintext", "script", "style", "xmp":
+- for c := n.FirstChild; c != nil; c = c.NextSibling {
+- if c.Type == TextNode {
+- if _, err := w.WriteString(c.Data); err != nil {
+- return err
+- }
+- } else {
+- if err := render1(w, c); err != nil {
+- return err
+- }
+- }
+- }
+- if n.Data == "plaintext" {
+- // Don't render anything else. <plaintext> must be the
+- // last element in the file, with no closing tag.
+- return plaintextAbort
+- }
+- default:
+- for c := n.FirstChild; c != nil; c = c.NextSibling {
+- if err := render1(w, c); err != nil {
+- return err
+- }
+- }
+- }
-
--// MSI gets the value as a map[string]interface{}, returns the optionalDefault
--// value or a system default object if the value is the wrong type.
--func (v *Value) MSI(optionalDefault ...map[string]interface{}) map[string]interface{} {
-- if s, ok := v.data.(map[string]interface{}); ok {
-- return s
+- // Render the </xxx> closing tag.
+- if _, err := w.WriteString("</"); err != nil {
+- return err
- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
+- if _, err := w.WriteString(n.Data); err != nil {
+- return err
- }
-- return nil
--}
--
--// MustMSI gets the value as a map[string]interface{}.
--//
--// Panics if the object is not a map[string]interface{}.
--func (v *Value) MustMSI() map[string]interface{} {
-- return v.data.(map[string]interface{})
+- return w.WriteByte('>')
-}
-
--// MSISlice gets the value as a []map[string]interface{}, returns the optionalDefault
--// value or nil if the value is not a []map[string]interface{}.
--func (v *Value) MSISlice(optionalDefault ...[]map[string]interface{}) []map[string]interface{} {
-- if s, ok := v.data.([]map[string]interface{}); ok {
-- return s
+-// writeQuoted writes s to w surrounded by quotes. Normally it will use double
+-// quotes, but if s contains a double quote, it will use single quotes.
+-// It is used for writing the identifiers in a doctype declaration.
+-// In valid HTML, they can't contain both types of quotes.
+-func writeQuoted(w writer, s string) error {
+- var q byte = '"'
+- if strings.Contains(s, `"`) {
+- q = '\''
- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
+- if err := w.WriteByte(q); err != nil {
+- return err
+- }
+- if _, err := w.WriteString(s); err != nil {
+- return err
+- }
+- if err := w.WriteByte(q); err != nil {
+- return err
- }
- return nil
-}
-
--// MustMSISlice gets the value as a []map[string]interface{}.
--//
--// Panics if the object is not a []map[string]interface{}.
--func (v *Value) MustMSISlice() []map[string]interface{} {
-- return v.data.([]map[string]interface{})
--}
--
--// IsMSI gets whether the object contained is a map[string]interface{} or not.
--func (v *Value) IsMSI() bool {
-- _, ok := v.data.(map[string]interface{})
-- return ok
+-// Section 12.1.2, "Elements", gives this list of void elements. Void elements
+-// are those that can't have any contents.
+-var voidElements = map[string]bool{
+- "area": true,
+- "base": true,
+- "br": true,
+- "col": true,
+- "command": true,
+- "embed": true,
+- "hr": true,
+- "img": true,
+- "input": true,
+- "keygen": true,
+- "link": true,
+- "meta": true,
+- "param": true,
+- "source": true,
+- "track": true,
+- "wbr": true,
-}
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/render_test.go b/Godeps/_workspace/src/golang.org/x/net/html/render_test.go
+deleted file mode 100644
+index 11da54b..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/render_test.go
++++ /dev/null
+@@ -1,156 +0,0 @@
+-// Copyright 2010 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
--// IsMSISlice gets whether the object contained is a []map[string]interface{} or not.
--func (v *Value) IsMSISlice() bool {
-- _, ok := v.data.([]map[string]interface{})
-- return ok
--}
+-package html
-
--// EachMSI calls the specified callback for each object
--// in the []map[string]interface{}.
--//
--// Panics if the object is the wrong type.
--func (v *Value) EachMSI(callback func(int, map[string]interface{}) bool) *Value {
+-import (
+- "bytes"
+- "testing"
+-)
-
-- for index, val := range v.MustMSISlice() {
-- carryon := callback(index, val)
-- if carryon == false {
-- break
-- }
+-func TestRenderer(t *testing.T) {
+- nodes := [...]*Node{
+- 0: {
+- Type: ElementNode,
+- Data: "html",
+- },
+- 1: {
+- Type: ElementNode,
+- Data: "head",
+- },
+- 2: {
+- Type: ElementNode,
+- Data: "body",
+- },
+- 3: {
+- Type: TextNode,
+- Data: "0<1",
+- },
+- 4: {
+- Type: ElementNode,
+- Data: "p",
+- Attr: []Attribute{
+- {
+- Key: "id",
+- Val: "A",
+- },
+- {
+- Key: "foo",
+- Val: `abc"def`,
+- },
+- },
+- },
+- 5: {
+- Type: TextNode,
+- Data: "2",
+- },
+- 6: {
+- Type: ElementNode,
+- Data: "b",
+- Attr: []Attribute{
+- {
+- Key: "empty",
+- Val: "",
+- },
+- },
+- },
+- 7: {
+- Type: TextNode,
+- Data: "3",
+- },
+- 8: {
+- Type: ElementNode,
+- Data: "i",
+- Attr: []Attribute{
+- {
+- Key: "backslash",
+- Val: `\`,
+- },
+- },
+- },
+- 9: {
+- Type: TextNode,
+- Data: "&4",
+- },
+- 10: {
+- Type: TextNode,
+- Data: "5",
+- },
+- 11: {
+- Type: ElementNode,
+- Data: "blockquote",
+- },
+- 12: {
+- Type: ElementNode,
+- Data: "br",
+- },
+- 13: {
+- Type: TextNode,
+- Data: "6",
+- },
- }
-
-- return v
--
--}
--
--// WhereMSI uses the specified decider function to select items
--// from the []map[string]interface{}. The object contained in the result will contain
--// only the selected items.
--func (v *Value) WhereMSI(decider func(int, map[string]interface{}) bool) *Value {
--
-- var selected []map[string]interface{}
--
-- v.EachMSI(func(index int, val map[string]interface{}) bool {
-- shouldSelect := decider(index, val)
-- if shouldSelect == false {
-- selected = append(selected, val)
+- // Build a tree out of those nodes, based on a textual representation.
+- // Only the ".\t"s are significant. The trailing HTML-like text is
+- // just commentary. The "0:" prefixes are for easy cross-reference with
+- // the nodes array.
+- treeAsText := [...]string{
+- 0: `<html>`,
+- 1: `. <head>`,
+- 2: `. <body>`,
+- 3: `. . "0<1"`,
+- 4: `. . <p id="A" foo="abc"def">`,
+- 5: `. . . "2"`,
+- 6: `. . . <b empty="">`,
+- 7: `. . . . "3"`,
+- 8: `. . . <i backslash="\">`,
+- 9: `. . . . "&4"`,
+- 10: `. . "5"`,
+- 11: `. . <blockquote>`,
+- 12: `. . <br>`,
+- 13: `. . "6"`,
+- }
+- if len(nodes) != len(treeAsText) {
+- t.Fatal("len(nodes) != len(treeAsText)")
+- }
+- var stack [8]*Node
+- for i, line := range treeAsText {
+- level := 0
+- for line[0] == '.' {
+- // Strip a leading ".\t".
+- line = line[2:]
+- level++
- }
-- return true
-- })
--
-- return &Value{data: selected}
--
--}
--
--// GroupMSI uses the specified grouper function to group the items
--// keyed by the return of the grouper. The object contained in the
--// result will contain a map[string][]map[string]interface{}.
--func (v *Value) GroupMSI(grouper func(int, map[string]interface{}) string) *Value {
--
-- groups := make(map[string][]map[string]interface{})
--
-- v.EachMSI(func(index int, val map[string]interface{}) bool {
-- group := grouper(index, val)
-- if _, ok := groups[group]; !ok {
-- groups[group] = make([]map[string]interface{}, 0)
+- n := nodes[i]
+- if level == 0 {
+- if stack[0] != nil {
+- t.Fatal("multiple root nodes")
+- }
+- stack[0] = n
+- } else {
+- stack[level-1].AppendChild(n)
+- stack[level] = n
+- for i := level + 1; i < len(stack); i++ {
+- stack[i] = nil
+- }
- }
-- groups[group] = append(groups[group], val)
-- return true
-- })
--
-- return &Value{data: groups}
--
--}
--
--// ReplaceMSI uses the specified function to replace each map[string]interface{}s
--// by iterating each item. The data in the returned result will be a
--// []map[string]interface{} containing the replaced items.
--func (v *Value) ReplaceMSI(replacer func(int, map[string]interface{}) map[string]interface{}) *Value {
--
-- arr := v.MustMSISlice()
-- replaced := make([]map[string]interface{}, len(arr))
--
-- v.EachMSI(func(index int, val map[string]interface{}) bool {
-- replaced[index] = replacer(index, val)
-- return true
-- })
--
-- return &Value{data: replaced}
+- // At each stage of tree construction, we check all nodes for consistency.
+- for j, m := range nodes {
+- if err := checkNodeConsistency(m); err != nil {
+- t.Fatalf("i=%d, j=%d: %v", i, j, err)
+- }
+- }
+- }
-
+- want := `<html><head></head><body>0<1<p id="A" foo="abc"def">` +
+- `2<b empty="">3</b><i backslash="\">&4</i></p>` +
+- `5<blockquote></blockquote><br/>6</body></html>`
+- b := new(bytes.Buffer)
+- if err := Render(b, nodes[0]); err != nil {
+- t.Fatal(err)
+- }
+- if got := b.String(); got != want {
+- t.Errorf("got vs want:\n%s\n%s\n", got, want)
+- }
-}
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/go1.html b/Godeps/_workspace/src/golang.org/x/net/html/testdata/go1.html
+deleted file mode 100644
+index a782cc7..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/go1.html
++++ /dev/null
+@@ -1,2237 +0,0 @@
+-<!DOCTYPE html>
+-<html>
+-<head>
+-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-
--// CollectMSI uses the specified collector function to collect a value
--// for each of the map[string]interface{}s in the slice. The data returned will be a
--// []interface{}.
--func (v *Value) CollectMSI(collector func(int, map[string]interface{}) interface{}) *Value {
--
-- arr := v.MustMSISlice()
-- collected := make([]interface{}, len(arr))
--
-- v.EachMSI(func(index int, val map[string]interface{}) bool {
-- collected[index] = collector(index, val)
-- return true
-- })
--
-- return &Value{data: collected}
--}
+- <title>Go 1 Release Notes - The Go Programming Language</title>
-
--/*
-- ObjxMap ((Map) and [](Map))
-- --------------------------------------------------
--*/
+-<link type="text/css" rel="stylesheet" href="/doc/style.css">
+-<script type="text/javascript" src="/doc/godocs.js"></script>
-
--// ObjxMap gets the value as a (Map), returns the optionalDefault
--// value or a system default object if the value is the wrong type.
--func (v *Value) ObjxMap(optionalDefault ...(Map)) Map {
-- if s, ok := v.data.((Map)); ok {
-- return s
-- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
-- }
-- return New(nil)
--}
+-<link rel="search" type="application/opensearchdescription+xml" title="godoc" href="/opensearch.xml" />
-
--// MustObjxMap gets the value as a (Map).
--//
--// Panics if the object is not a (Map).
--func (v *Value) MustObjxMap() Map {
-- return v.data.((Map))
--}
+-<script type="text/javascript">
+-var _gaq = _gaq || [];
+-_gaq.push(["_setAccount", "UA-11222381-2"]);
+-_gaq.push(["_trackPageview"]);
+-</script>
+-</head>
+-<body>
-
--// ObjxMapSlice gets the value as a [](Map), returns the optionalDefault
--// value or nil if the value is not a [](Map).
--func (v *Value) ObjxMapSlice(optionalDefault ...[](Map)) [](Map) {
-- if s, ok := v.data.([](Map)); ok {
-- return s
-- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
-- }
-- return nil
--}
+-<div id="topbar"><div class="container wide">
-
--// MustObjxMapSlice gets the value as a [](Map).
--//
--// Panics if the object is not a [](Map).
--func (v *Value) MustObjxMapSlice() [](Map) {
-- return v.data.([](Map))
--}
+-<form method="GET" action="/search">
+-<div id="menu">
+-<a href="/doc/">Documents</a>
+-<a href="/ref/">References</a>
+-<a href="/pkg/">Packages</a>
+-<a href="/project/">The Project</a>
+-<a href="/help/">Help</a>
+-<input type="text" id="search" name="q" class="inactive" value="Search">
+-</div>
+-<div id="heading"><a href="/">The Go Programming Language</a></div>
+-</form>
-
--// IsObjxMap gets whether the object contained is a (Map) or not.
--func (v *Value) IsObjxMap() bool {
-- _, ok := v.data.((Map))
-- return ok
--}
+-</div></div>
-
--// IsObjxMapSlice gets whether the object contained is a [](Map) or not.
--func (v *Value) IsObjxMapSlice() bool {
-- _, ok := v.data.([](Map))
-- return ok
--}
+-<div id="page" class="wide">
-
--// EachObjxMap calls the specified callback for each object
--// in the [](Map).
--//
--// Panics if the object is the wrong type.
--func (v *Value) EachObjxMap(callback func(int, Map) bool) *Value {
-
-- for index, val := range v.MustObjxMapSlice() {
-- carryon := callback(index, val)
-- if carryon == false {
-- break
-- }
-- }
+- <div id="plusone"><g:plusone size="small" annotation="none"></g:plusone></div>
+- <h1>Go 1 Release Notes</h1>
-
-- return v
-
--}
-
--// WhereObjxMap uses the specified decider function to select items
--// from the [](Map). The object contained in the result will contain
--// only the selected items.
--func (v *Value) WhereObjxMap(decider func(int, Map) bool) *Value {
-
-- var selected [](Map)
+-<div id="nav"></div>
-
-- v.EachObjxMap(func(index int, val Map) bool {
-- shouldSelect := decider(index, val)
-- if shouldSelect == false {
-- selected = append(selected, val)
-- }
-- return true
-- })
-
-- return &Value{data: selected}
-
--}
-
--// GroupObjxMap uses the specified grouper function to group the items
--// keyed by the return of the grouper. The object contained in the
--// result will contain a map[string][](Map).
--func (v *Value) GroupObjxMap(grouper func(int, Map) string) *Value {
+-<h2 id="introduction">Introduction to Go 1</h2>
-
-- groups := make(map[string][](Map))
+-<p>
+-Go version 1, Go 1 for short, defines a language and a set of core libraries
+-that provide a stable foundation for creating reliable products, projects, and
+-publications.
+-</p>
-
-- v.EachObjxMap(func(index int, val Map) bool {
-- group := grouper(index, val)
-- if _, ok := groups[group]; !ok {
-- groups[group] = make([](Map), 0)
-- }
-- groups[group] = append(groups[group], val)
-- return true
-- })
+-<p>
+-The driving motivation for Go 1 is stability for its users. People should be able to
+-write Go programs and expect that they will continue to compile and run without
+-change, on a time scale of years, including in production environments such as
+-Google App Engine. Similarly, people should be able to write books about Go, be
+-able to say which version of Go the book is describing, and have that version
+-number still be meaningful much later.
+-</p>
-
-- return &Value{data: groups}
+-<p>
+-Code that compiles in Go 1 should, with few exceptions, continue to compile and
+-run throughout the lifetime of that version, even as we issue updates and bug
+-fixes such as Go version 1.1, 1.2, and so on. Other than critical fixes, changes
+-made to the language and library for subsequent releases of Go 1 may
+-add functionality but will not break existing Go 1 programs.
+-<a href="go1compat.html">The Go 1 compatibility document</a>
+-explains the compatibility guidelines in more detail.
+-</p>
-
--}
+-<p>
+-Go 1 is a representation of Go as it used today, not a wholesale rethinking of
+-the language. We avoided designing new features and instead focused on cleaning
+-up problems and inconsistencies and improving portability. There are a number
+-changes to the Go language and packages that we had considered for some time and
+-prototyped but not released primarily because they are significant and
+-backwards-incompatible. Go 1 was an opportunity to get them out, which is
+-helpful for the long term, but also means that Go 1 introduces incompatibilities
+-for old programs. Fortunately, the <code>go</code> <code>fix</code> tool can
+-automate much of the work needed to bring programs up to the Go 1 standard.
+-</p>
-
--// ReplaceObjxMap uses the specified function to replace each (Map)s
--// by iterating each item. The data in the returned result will be a
--// [](Map) containing the replaced items.
--func (v *Value) ReplaceObjxMap(replacer func(int, Map) Map) *Value {
+-<p>
+-This document outlines the major changes in Go 1 that will affect programmers
+-updating existing code; its reference point is the prior release, r60 (tagged as
+-r60.3). It also explains how to update code from r60 to run under Go 1.
+-</p>
-
-- arr := v.MustObjxMapSlice()
-- replaced := make([](Map), len(arr))
+-<h2 id="language">Changes to the language</h2>
-
-- v.EachObjxMap(func(index int, val Map) bool {
-- replaced[index] = replacer(index, val)
-- return true
-- })
+-<h3 id="append">Append</h3>
-
-- return &Value{data: replaced}
+-<p>
+-The <code>append</code> predeclared variadic function makes it easy to grow a slice
+-by adding elements to the end.
+-A common use is to add bytes to the end of a byte slice when generating output.
+-However, <code>append</code> did not provide a way to append a string to a <code>[]byte</code>,
+-which is another common case.
+-</p>
-
--}
+-<pre><!--{{code "/doc/progs/go1.go" `/greeting := ..byte/` `/append.*hello/`}}
+---> greeting := []byte{}
+- greeting = append(greeting, []byte("hello ")...)</pre>
-
--// CollectObjxMap uses the specified collector function to collect a value
--// for each of the (Map)s in the slice. The data returned will be a
--// []interface{}.
--func (v *Value) CollectObjxMap(collector func(int, Map) interface{}) *Value {
+-<p>
+-By analogy with the similar property of <code>copy</code>, Go 1
+-permits a string to be appended (byte-wise) directly to a byte
+-slice, reducing the friction between strings and byte slices.
+-The conversion is no longer necessary:
+-</p>
-
-- arr := v.MustObjxMapSlice()
-- collected := make([]interface{}, len(arr))
+-<pre><!--{{code "/doc/progs/go1.go" `/append.*world/`}}
+---> greeting = append(greeting, "world"...)</pre>
-
-- v.EachObjxMap(func(index int, val Map) bool {
-- collected[index] = collector(index, val)
-- return true
-- })
+-<p>
+-<em>Updating</em>:
+-This is a new feature, so existing code needs no changes.
+-</p>
-
-- return &Value{data: collected}
--}
+-<h3 id="close">Close</h3>
-
--/*
-- Bool (bool and []bool)
-- --------------------------------------------------
--*/
+-<p>
+-The <code>close</code> predeclared function provides a mechanism
+-for a sender to signal that no more values will be sent.
+-It is important to the implementation of <code>for</code> <code>range</code>
+-loops over channels and is helpful in other situations.
+-Partly by design and partly because of race conditions that can occur otherwise,
+-it is intended for use only by the goroutine sending on the channel,
+-not by the goroutine receiving data.
+-However, before Go 1 there was no compile-time checking that <code>close</code>
+-was being used correctly.
+-</p>
-
--// Bool gets the value as a bool, returns the optionalDefault
--// value or a system default object if the value is the wrong type.
--func (v *Value) Bool(optionalDefault ...bool) bool {
-- if s, ok := v.data.(bool); ok {
-- return s
-- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
-- }
-- return false
--}
+-<p>
+-To close this gap, at least in part, Go 1 disallows <code>close</code> on receive-only channels.
+-Attempting to close such a channel is a compile-time error.
+-</p>
-
--// MustBool gets the value as a bool.
--//
--// Panics if the object is not a bool.
--func (v *Value) MustBool() bool {
-- return v.data.(bool)
--}
+-<pre>
+- var c chan int
+- var csend chan<- int = c
+- var crecv <-chan int = c
+- close(c) // legal
+- close(csend) // legal
+- close(crecv) // illegal
+-</pre>
-
--// BoolSlice gets the value as a []bool, returns the optionalDefault
--// value or nil if the value is not a []bool.
--func (v *Value) BoolSlice(optionalDefault ...[]bool) []bool {
-- if s, ok := v.data.([]bool); ok {
-- return s
-- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
-- }
-- return nil
--}
+-<p>
+-<em>Updating</em>:
+-Existing code that attempts to close a receive-only channel was
+-erroneous even before Go 1 and should be fixed. The compiler will
+-now reject such code.
+-</p>
-
--// MustBoolSlice gets the value as a []bool.
--//
--// Panics if the object is not a []bool.
--func (v *Value) MustBoolSlice() []bool {
-- return v.data.([]bool)
--}
+-<h3 id="literals">Composite literals</h3>
-
--// IsBool gets whether the object contained is a bool or not.
--func (v *Value) IsBool() bool {
-- _, ok := v.data.(bool)
-- return ok
--}
+-<p>
+-In Go 1, a composite literal of array, slice, or map type can elide the
+-type specification for the elements' initializers if they are of pointer type.
+-All four of the initializations in this example are legal; the last one was illegal before Go 1.
+-</p>
-
--// IsBoolSlice gets whether the object contained is a []bool or not.
--func (v *Value) IsBoolSlice() bool {
-- _, ok := v.data.([]bool)
-- return ok
--}
+-<pre><!--{{code "/doc/progs/go1.go" `/type Date struct/` `/STOP/`}}
+---> type Date struct {
+- month string
+- day int
+- }
+- <span class="comment">// Struct values, fully qualified; always legal.</span>
+- holiday1 := []Date{
+- Date{"Feb", 14},
+- Date{"Nov", 11},
+- Date{"Dec", 25},
+- }
+- <span class="comment">// Struct values, type name elided; always legal.</span>
+- holiday2 := []Date{
+- {"Feb", 14},
+- {"Nov", 11},
+- {"Dec", 25},
+- }
+- <span class="comment">// Pointers, fully qualified, always legal.</span>
+- holiday3 := []*Date{
+- &Date{"Feb", 14},
+- &Date{"Nov", 11},
+- &Date{"Dec", 25},
+- }
+- <span class="comment">// Pointers, type name elided; legal in Go 1.</span>
+- holiday4 := []*Date{
+- {"Feb", 14},
+- {"Nov", 11},
+- {"Dec", 25},
+- }</pre>
-
--// EachBool calls the specified callback for each object
--// in the []bool.
--//
--// Panics if the object is the wrong type.
--func (v *Value) EachBool(callback func(int, bool) bool) *Value {
+-<p>
+-<em>Updating</em>:
+-This change has no effect on existing code, but the command
+-<code>gofmt</code> <code>-s</code> applied to existing source
+-will, among other things, elide explicit element types wherever permitted.
+-</p>
-
-- for index, val := range v.MustBoolSlice() {
-- carryon := callback(index, val)
-- if carryon == false {
-- break
-- }
-- }
-
-- return v
+-<h3 id="init">Goroutines during init</h3>
-
--}
+-<p>
+-The old language defined that <code>go</code> statements executed during initialization created goroutines but that they did not begin to run until initialization of the entire program was complete.
+-This introduced clumsiness in many places and, in effect, limited the utility
+-of the <code>init</code> construct:
+-if it was possible for another package to use the library during initialization, the library
+-was forced to avoid goroutines.
+-This design was done for reasons of simplicity and safety but,
+-as our confidence in the language grew, it seemed unnecessary.
+-Running goroutines during initialization is no more complex or unsafe than running them during normal execution.
+-</p>
-
--// WhereBool uses the specified decider function to select items
--// from the []bool. The object contained in the result will contain
--// only the selected items.
--func (v *Value) WhereBool(decider func(int, bool) bool) *Value {
+-<p>
+-In Go 1, code that uses goroutines can be called from
+-<code>init</code> routines and global initialization expressions
+-without introducing a deadlock.
+-</p>
-
-- var selected []bool
+-<pre><!--{{code "/doc/progs/go1.go" `/PackageGlobal/` `/^}/`}}
+--->var PackageGlobal int
-
-- v.EachBool(func(index int, val bool) bool {
-- shouldSelect := decider(index, val)
-- if shouldSelect == false {
-- selected = append(selected, val)
-- }
-- return true
-- })
+-func init() {
+- c := make(chan int)
+- go initializationFunction(c)
+- PackageGlobal = <-c
+-}</pre>
-
-- return &Value{data: selected}
+-<p>
+-<em>Updating</em>:
+-This is a new feature, so existing code needs no changes,
+-although it's possible that code that depends on goroutines not starting before <code>main</code> will break.
+-There was no such code in the standard repository.
+-</p>
-
--}
+-<h3 id="rune">The rune type</h3>
-
--// GroupBool uses the specified grouper function to group the items
--// keyed by the return of the grouper. The object contained in the
--// result will contain a map[string][]bool.
--func (v *Value) GroupBool(grouper func(int, bool) string) *Value {
+-<p>
+-The language spec allows the <code>int</code> type to be 32 or 64 bits wide, but current implementations set <code>int</code> to 32 bits even on 64-bit platforms.
+-It would be preferable to have <code>int</code> be 64 bits on 64-bit platforms.
+-(There are important consequences for indexing large slices.)
+-However, this change would waste space when processing Unicode characters with
+-the old language because the <code>int</code> type was also used to hold Unicode code points: each code point would waste an extra 32 bits of storage if <code>int</code> grew from 32 bits to 64.
+-</p>
-
-- groups := make(map[string][]bool)
+-<p>
+-To make changing to 64-bit <code>int</code> feasible,
+-Go 1 introduces a new basic type, <code>rune</code>, to represent
+-individual Unicode code points.
+-It is an alias for <code>int32</code>, analogous to <code>byte</code>
+-as an alias for <code>uint8</code>.
+-</p>
-
-- v.EachBool(func(index int, val bool) bool {
-- group := grouper(index, val)
-- if _, ok := groups[group]; !ok {
-- groups[group] = make([]bool, 0)
-- }
-- groups[group] = append(groups[group], val)
-- return true
-- })
+-<p>
+-Character literals such as <code>'a'</code>, <code>'語'</code>, and <code>'\u0345'</code>
+-now have default type <code>rune</code>,
+-analogous to <code>1.0</code> having default type <code>float64</code>.
+-A variable initialized to a character constant will therefore
+-have type <code>rune</code> unless otherwise specified.
+-</p>
-
-- return &Value{data: groups}
+-<p>
+-Libraries have been updated to use <code>rune</code> rather than <code>int</code>
+-when appropriate. For instance, the functions <code>unicode.ToLower</code> and
+-relatives now take and return a <code>rune</code>.
+-</p>
-
--}
+-<pre><!--{{code "/doc/progs/go1.go" `/STARTRUNE/` `/ENDRUNE/`}}
+---> delta := 'δ' <span class="comment">// delta has type rune.</span>
+- var DELTA rune
+- DELTA = unicode.ToUpper(delta)
+- epsilon := unicode.ToLower(DELTA + 1)
+- if epsilon != 'δ'+1 {
+- log.Fatal("inconsistent casing for Greek")
+- }</pre>
-
--// ReplaceBool uses the specified function to replace each bools
--// by iterating each item. The data in the returned result will be a
--// []bool containing the replaced items.
--func (v *Value) ReplaceBool(replacer func(int, bool) bool) *Value {
+-<p>
+-<em>Updating</em>:
+-Most source code will be unaffected by this because the type inference from
+-<code>:=</code> initializers introduces the new type silently, and it propagates
+-from there.
+-Some code may get type errors that a trivial conversion will resolve.
+-</p>
-
-- arr := v.MustBoolSlice()
-- replaced := make([]bool, len(arr))
+-<h3 id="error">The error type</h3>
-
-- v.EachBool(func(index int, val bool) bool {
-- replaced[index] = replacer(index, val)
-- return true
-- })
+-<p>
+-Go 1 introduces a new built-in type, <code>error</code>, which has the following definition:
+-</p>
-
-- return &Value{data: replaced}
+-<pre>
+- type error interface {
+- Error() string
+- }
+-</pre>
-
--}
+-<p>
+-Since the consequences of this type are all in the package library,
+-it is discussed <a href="#errors">below</a>.
+-</p>
-
--// CollectBool uses the specified collector function to collect a value
--// for each of the bools in the slice. The data returned will be a
--// []interface{}.
--func (v *Value) CollectBool(collector func(int, bool) interface{}) *Value {
+-<h3 id="delete">Deleting from maps</h3>
-
-- arr := v.MustBoolSlice()
-- collected := make([]interface{}, len(arr))
+-<p>
+-In the old language, to delete the entry with key <code>k</code> from map <code>m</code>, one wrote the statement,
+-</p>
-
-- v.EachBool(func(index int, val bool) bool {
-- collected[index] = collector(index, val)
-- return true
-- })
+-<pre>
+- m[k] = value, false
+-</pre>
-
-- return &Value{data: collected}
--}
+-<p>
+-This syntax was a peculiar special case, the only two-to-one assignment.
+-It required passing a value (usually ignored) that is evaluated but discarded,
+-plus a boolean that was nearly always the constant <code>false</code>.
+-It did the job but was odd and a point of contention.
+-</p>
-
--/*
-- Str (string and []string)
-- --------------------------------------------------
--*/
+-<p>
+-In Go 1, that syntax has gone; instead there is a new built-in
+-function, <code>delete</code>. The call
+-</p>
-
--// Str gets the value as a string, returns the optionalDefault
--// value or a system default object if the value is the wrong type.
--func (v *Value) Str(optionalDefault ...string) string {
-- if s, ok := v.data.(string); ok {
-- return s
-- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
-- }
-- return ""
--}
+-<pre><!--{{code "/doc/progs/go1.go" `/delete\(m, k\)/`}}
+---> delete(m, k)</pre>
-
--// MustStr gets the value as a string.
--//
--// Panics if the object is not a string.
--func (v *Value) MustStr() string {
-- return v.data.(string)
--}
+-<p>
+-will delete the map entry retrieved by the expression <code>m[k]</code>.
+-There is no return value. Deleting a non-existent entry is a no-op.
+-</p>
-
--// StrSlice gets the value as a []string, returns the optionalDefault
--// value or nil if the value is not a []string.
--func (v *Value) StrSlice(optionalDefault ...[]string) []string {
-- if s, ok := v.data.([]string); ok {
-- return s
-- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
-- }
-- return nil
--}
+-<p>
+-<em>Updating</em>:
+-Running <code>go</code> <code>fix</code> will convert expressions of the form <code>m[k] = value,
+-false</code> into <code>delete(m, k)</code> when it is clear that
+-the ignored value can be safely discarded from the program and
+-<code>false</code> refers to the predefined boolean constant.
+-The fix tool
+-will flag other uses of the syntax for inspection by the programmer.
+-</p>
-
--// MustStrSlice gets the value as a []string.
--//
--// Panics if the object is not a []string.
--func (v *Value) MustStrSlice() []string {
-- return v.data.([]string)
--}
+-<h3 id="iteration">Iterating in maps</h3>
-
--// IsStr gets whether the object contained is a string or not.
--func (v *Value) IsStr() bool {
-- _, ok := v.data.(string)
-- return ok
--}
+-<p>
+-The old language specification did not define the order of iteration for maps,
+-and in practice it differed across hardware platforms.
+-This caused tests that iterated over maps to be fragile and non-portable, with the
+-unpleasant property that a test might always pass on one machine but break on another.
+-</p>
-
--// IsStrSlice gets whether the object contained is a []string or not.
--func (v *Value) IsStrSlice() bool {
-- _, ok := v.data.([]string)
-- return ok
--}
+-<p>
+-In Go 1, the order in which elements are visited when iterating
+-over a map using a <code>for</code> <code>range</code> statement
+-is defined to be unpredictable, even if the same loop is run multiple
+-times with the same map.
+-Code should not assume that the elements are visited in any particular order.
+-</p>
-
--// EachStr calls the specified callback for each object
--// in the []string.
--//
--// Panics if the object is the wrong type.
--func (v *Value) EachStr(callback func(int, string) bool) *Value {
+-<p>
+-This change means that code that depends on iteration order is very likely to break early and be fixed long before it becomes a problem.
+-Just as important, it allows the map implementation to ensure better map balancing even when programs are using range loops to select an element from a map.
+-</p>
-
-- for index, val := range v.MustStrSlice() {
-- carryon := callback(index, val)
-- if carryon == false {
-- break
-- }
-- }
+-<pre><!--{{code "/doc/progs/go1.go" `/Sunday/` `/^ }/`}}
+---> m := map[string]int{"Sunday": 0, "Monday": 1}
+- for name, value := range m {
+- <span class="comment">// This loop should not assume Sunday will be visited first.</span>
+- f(name, value)
+- }</pre>
-
-- return v
+-<p>
+-<em>Updating</em>:
+-This is one change where tools cannot help. Most existing code
+-will be unaffected, but some programs may break or misbehave; we
+-recommend manual checking of all range statements over maps to
+-verify they do not depend on iteration order. There were a few such
+-examples in the standard repository; they have been fixed.
+-Note that it was already incorrect to depend on the iteration order, which
+-was unspecified. This change codifies the unpredictability.
+-</p>
-
--}
+-<h3 id="multiple_assignment">Multiple assignment</h3>
-
--// WhereStr uses the specified decider function to select items
--// from the []string. The object contained in the result will contain
--// only the selected items.
--func (v *Value) WhereStr(decider func(int, string) bool) *Value {
+-<p>
+-The language specification has long guaranteed that in assignments
+-the right-hand-side expressions are all evaluated before any left-hand-side expressions are assigned.
+-To guarantee predictable behavior,
+-Go 1 refines the specification further.
+-</p>
-
-- var selected []string
+-<p>
+-If the left-hand side of the assignment
+-statement contains expressions that require evaluation, such as
+-function calls or array indexing operations, these will all be done
+-using the usual left-to-right rule before any variables are assigned
+-their value. Once everything is evaluated, the actual assignments
+-proceed in left-to-right order.
+-</p>
-
-- v.EachStr(func(index int, val string) bool {
-- shouldSelect := decider(index, val)
-- if shouldSelect == false {
-- selected = append(selected, val)
-- }
-- return true
-- })
+-<p>
+-These examples illustrate the behavior.
+-</p>
-
-- return &Value{data: selected}
+-<pre><!--{{code "/doc/progs/go1.go" `/sa :=/` `/then sc.0. = 2/`}}
+---> sa := []int{1, 2, 3}
+- i := 0
+- i, sa[i] = 1, 2 <span class="comment">// sets i = 1, sa[0] = 2</span>
-
--}
+- sb := []int{1, 2, 3}
+- j := 0
+- sb[j], j = 2, 1 <span class="comment">// sets sb[0] = 2, j = 1</span>
-
--// GroupStr uses the specified grouper function to group the items
--// keyed by the return of the grouper. The object contained in the
--// result will contain a map[string][]string.
--func (v *Value) GroupStr(grouper func(int, string) string) *Value {
+- sc := []int{1, 2, 3}
+- sc[0], sc[0] = 1, 2 <span class="comment">// sets sc[0] = 1, then sc[0] = 2 (so sc[0] = 2 at end)</span></pre>
-
-- groups := make(map[string][]string)
+-<p>
+-<em>Updating</em>:
+-This is one change where tools cannot help, but breakage is unlikely.
+-No code in the standard repository was broken by this change, and code
+-that depended on the previous unspecified behavior was already incorrect.
+-</p>
-
-- v.EachStr(func(index int, val string) bool {
-- group := grouper(index, val)
-- if _, ok := groups[group]; !ok {
-- groups[group] = make([]string, 0)
-- }
-- groups[group] = append(groups[group], val)
-- return true
-- })
+-<h3 id="shadowing">Returns and shadowed variables</h3>
-
-- return &Value{data: groups}
+-<p>
+-A common mistake is to use <code>return</code> (without arguments) after an assignment to a variable that has the same name as a result variable but is not the same variable.
+-This situation is called <em>shadowing</em>: the result variable has been shadowed by another variable with the same name declared in an inner scope.
+-</p>
-
--}
+-<p>
+-In functions with named return values,
+-the Go 1 compilers disallow return statements without arguments if any of the named return values is shadowed at the point of the return statement.
+-(It isn't part of the specification, because this is one area we are still exploring;
+-the situation is analogous to the compilers rejecting functions that do not end with an explicit return statement.)
+-</p>
-
--// ReplaceStr uses the specified function to replace each strings
--// by iterating each item. The data in the returned result will be a
--// []string containing the replaced items.
--func (v *Value) ReplaceStr(replacer func(int, string) string) *Value {
+-<p>
+-This function implicitly returns a shadowed return value and will be rejected by the compiler:
+-</p>
-
-- arr := v.MustStrSlice()
-- replaced := make([]string, len(arr))
+-<pre>
+- func Bug() (i, j, k int) {
+- for i = 0; i < 5; i++ {
+- for j := 0; j < 5; j++ { // Redeclares j.
+- k += i*j
+- if k > 100 {
+- return // Rejected: j is shadowed here.
+- }
+- }
+- }
+- return // OK: j is not shadowed here.
+- }
+-</pre>
-
-- v.EachStr(func(index int, val string) bool {
-- replaced[index] = replacer(index, val)
-- return true
-- })
+-<p>
+-<em>Updating</em>:
+-Code that shadows return values in this way will be rejected by the compiler and will need to be fixed by hand.
+-The few cases that arose in the standard repository were mostly bugs.
+-</p>
-
-- return &Value{data: replaced}
+-<h3 id="unexported">Copying structs with unexported fields</h3>
-
--}
+-<p>
+-The old language did not allow a package to make a copy of a struct value containing unexported fields belonging to a different package.
+-There was, however, a required exception for a method receiver;
+-also, the implementations of <code>copy</code> and <code>append</code> have never honored the restriction.
+-</p>
-
--// CollectStr uses the specified collector function to collect a value
--// for each of the strings in the slice. The data returned will be a
--// []interface{}.
--func (v *Value) CollectStr(collector func(int, string) interface{}) *Value {
+-<p>
+-Go 1 will allow packages to copy struct values containing unexported fields from other packages.
+-Besides resolving the inconsistency,
+-this change admits a new kind of API: a package can return an opaque value without resorting to a pointer or interface.
+-The new implementations of <code>time.Time</code> and
+-<code>reflect.Value</code> are examples of types taking advantage of this new property.
+-</p>
-
-- arr := v.MustStrSlice()
-- collected := make([]interface{}, len(arr))
+-<p>
+-As an example, if package <code>p</code> includes the definitions,
+-</p>
-
-- v.EachStr(func(index int, val string) bool {
-- collected[index] = collector(index, val)
-- return true
-- })
+-<pre>
+- type Struct struct {
+- Public int
+- secret int
+- }
+- func NewStruct(a int) Struct { // Note: not a pointer.
+- return Struct{a, f(a)}
+- }
+- func (s Struct) String() string {
+- return fmt.Sprintf("{%d (secret %d)}", s.Public, s.secret)
+- }
+-</pre>
-
-- return &Value{data: collected}
--}
+-<p>
+-a package that imports <code>p</code> can assign and copy values of type
+-<code>p.Struct</code> at will.
+-Behind the scenes the unexported fields will be assigned and copied just
+-as if they were exported,
+-but the client code will never be aware of them. The code
+-</p>
-
--/*
-- Int (int and []int)
-- --------------------------------------------------
--*/
+-<pre>
+- import "p"
-
--// Int gets the value as a int, returns the optionalDefault
--// value or a system default object if the value is the wrong type.
--func (v *Value) Int(optionalDefault ...int) int {
-- if s, ok := v.data.(int); ok {
-- return s
-- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
-- }
-- return 0
--}
+- myStruct := p.NewStruct(23)
+- copyOfMyStruct := myStruct
+- fmt.Println(myStruct, copyOfMyStruct)
+-</pre>
-
--// MustInt gets the value as a int.
--//
--// Panics if the object is not a int.
--func (v *Value) MustInt() int {
-- return v.data.(int)
--}
+-<p>
+-will show that the secret field of the struct has been copied to the new value.
+-</p>
-
--// IntSlice gets the value as a []int, returns the optionalDefault
--// value or nil if the value is not a []int.
--func (v *Value) IntSlice(optionalDefault ...[]int) []int {
-- if s, ok := v.data.([]int); ok {
-- return s
-- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
-- }
-- return nil
--}
+-<p>
+-<em>Updating</em>:
+-This is a new feature, so existing code needs no changes.
+-</p>
-
--// MustIntSlice gets the value as a []int.
--//
--// Panics if the object is not a []int.
--func (v *Value) MustIntSlice() []int {
-- return v.data.([]int)
--}
+-<h3 id="equality">Equality</h3>
-
--// IsInt gets whether the object contained is a int or not.
--func (v *Value) IsInt() bool {
-- _, ok := v.data.(int)
-- return ok
--}
+-<p>
+-Before Go 1, the language did not define equality on struct and array values.
+-This meant,
+-among other things, that structs and arrays could not be used as map keys.
+-On the other hand, Go did define equality on function and map values.
+-Function equality was problematic in the presence of closures
+-(when are two closures equal?)
+-while map equality compared pointers, not the maps' content, which was usually
+-not what the user would want.
+-</p>
-
--// IsIntSlice gets whether the object contained is a []int or not.
--func (v *Value) IsIntSlice() bool {
-- _, ok := v.data.([]int)
-- return ok
--}
+-<p>
+-Go 1 addressed these issues.
+-First, structs and arrays can be compared for equality and inequality
+-(<code>==</code> and <code>!=</code>),
+-and therefore be used as map keys,
+-provided they are composed from elements for which equality is also defined,
+-using element-wise comparison.
+-</p>
-
--// EachInt calls the specified callback for each object
--// in the []int.
--//
--// Panics if the object is the wrong type.
--func (v *Value) EachInt(callback func(int, int) bool) *Value {
+-<pre><!--{{code "/doc/progs/go1.go" `/type Day struct/` `/Printf/`}}
+---> type Day struct {
+- long string
+- short string
+- }
+- Christmas := Day{"Christmas", "XMas"}
+- Thanksgiving := Day{"Thanksgiving", "Turkey"}
+- holiday := map[Day]bool{
+- Christmas: true,
+- Thanksgiving: true,
+- }
+- fmt.Printf("Christmas is a holiday: %t\n", holiday[Christmas])</pre>
-
-- for index, val := range v.MustIntSlice() {
-- carryon := callback(index, val)
-- if carryon == false {
-- break
-- }
-- }
+-<p>
+-Second, Go 1 removes the definition of equality for function values,
+-except for comparison with <code>nil</code>.
+-Finally, map equality is gone too, also except for comparison with <code>nil</code>.
+-</p>
-
-- return v
+-<p>
+-Note that equality is still undefined for slices, for which the
+-calculation is in general infeasible. Also note that the ordered
+-comparison operators (<code><</code> <code><=</code>
+-<code>></code> <code>>=</code>) are still undefined for
+-structs and arrays.
-
--}
+-<p>
+-<em>Updating</em>:
+-Struct and array equality is a new feature, so existing code needs no changes.
+-Existing code that depends on function or map equality will be
+-rejected by the compiler and will need to be fixed by hand.
+-Few programs will be affected, but the fix may require some
+-redesign.
+-</p>
-
--// WhereInt uses the specified decider function to select items
--// from the []int. The object contained in the result will contain
--// only the selected items.
--func (v *Value) WhereInt(decider func(int, int) bool) *Value {
+-<h2 id="packages">The package hierarchy</h2>
-
-- var selected []int
+-<p>
+-Go 1 addresses many deficiencies in the old standard library and
+-cleans up a number of packages, making them more internally consistent
+-and portable.
+-</p>
-
-- v.EachInt(func(index int, val int) bool {
-- shouldSelect := decider(index, val)
-- if shouldSelect == false {
-- selected = append(selected, val)
-- }
-- return true
-- })
+-<p>
+-This section describes how the packages have been rearranged in Go 1.
+-Some have moved, some have been renamed, some have been deleted.
+-New packages are described in later sections.
+-</p>
-
-- return &Value{data: selected}
+-<h3 id="hierarchy">The package hierarchy</h3>
-
--}
+-<p>
+-Go 1 has a rearranged package hierarchy that groups related items
+-into subdirectories. For instance, <code>utf8</code> and
+-<code>utf16</code> now occupy subdirectories of <code>unicode</code>.
+-Also, <a href="#subrepo">some packages</a> have moved into
+-subrepositories of
+-<a href="http://code.google.com/p/go"><code>code.google.com/p/go</code></a>
+-while <a href="#deleted">others</a> have been deleted outright.
+-</p>
-
--// GroupInt uses the specified grouper function to group the items
--// keyed by the return of the grouper. The object contained in the
--// result will contain a map[string][]int.
--func (v *Value) GroupInt(grouper func(int, int) string) *Value {
+-<table class="codetable" frame="border" summary="Moved packages">
+-<colgroup align="left" width="60%"></colgroup>
+-<colgroup align="left" width="40%"></colgroup>
+-<tr>
+-<th align="left">Old path</th>
+-<th align="left">New path</th>
+-</tr>
+-<tr>
+-<td colspan="2"><hr></td>
+-</tr>
+-<tr><td>asn1</td> <td>encoding/asn1</td></tr>
+-<tr><td>csv</td> <td>encoding/csv</td></tr>
+-<tr><td>gob</td> <td>encoding/gob</td></tr>
+-<tr><td>json</td> <td>encoding/json</td></tr>
+-<tr><td>xml</td> <td>encoding/xml</td></tr>
+-<tr>
+-<td colspan="2"><hr></td>
+-</tr>
+-<tr><td>exp/template/html</td> <td>html/template</td></tr>
+-<tr>
+-<td colspan="2"><hr></td>
+-</tr>
+-<tr><td>big</td> <td>math/big</td></tr>
+-<tr><td>cmath</td> <td>math/cmplx</td></tr>
+-<tr><td>rand</td> <td>math/rand</td></tr>
+-<tr>
+-<td colspan="2"><hr></td>
+-</tr>
+-<tr><td>http</td> <td>net/http</td></tr>
+-<tr><td>http/cgi</td> <td>net/http/cgi</td></tr>
+-<tr><td>http/fcgi</td> <td>net/http/fcgi</td></tr>
+-<tr><td>http/httptest</td> <td>net/http/httptest</td></tr>
+-<tr><td>http/pprof</td> <td>net/http/pprof</td></tr>
+-<tr><td>mail</td> <td>net/mail</td></tr>
+-<tr><td>rpc</td> <td>net/rpc</td></tr>
+-<tr><td>rpc/jsonrpc</td> <td>net/rpc/jsonrpc</td></tr>
+-<tr><td>smtp</td> <td>net/smtp</td></tr>
+-<tr><td>url</td> <td>net/url</td></tr>
+-<tr>
+-<td colspan="2"><hr></td>
+-</tr>
+-<tr><td>exec</td> <td>os/exec</td></tr>
+-<tr>
+-<td colspan="2"><hr></td>
+-</tr>
+-<tr><td>scanner</td> <td>text/scanner</td></tr>
+-<tr><td>tabwriter</td> <td>text/tabwriter</td></tr>
+-<tr><td>template</td> <td>text/template</td></tr>
+-<tr><td>template/parse</td> <td>text/template/parse</td></tr>
+-<tr>
+-<td colspan="2"><hr></td>
+-</tr>
+-<tr><td>utf8</td> <td>unicode/utf8</td></tr>
+-<tr><td>utf16</td> <td>unicode/utf16</td></tr>
+-</table>
-
-- groups := make(map[string][]int)
+-<p>
+-Note that the package names for the old <code>cmath</code> and
+-<code>exp/template/html</code> packages have changed to <code>cmplx</code>
+-and <code>template</code>.
+-</p>
-
-- v.EachInt(func(index int, val int) bool {
-- group := grouper(index, val)
-- if _, ok := groups[group]; !ok {
-- groups[group] = make([]int, 0)
-- }
-- groups[group] = append(groups[group], val)
-- return true
-- })
+-<p>
+-<em>Updating</em>:
+-Running <code>go</code> <code>fix</code> will update all imports and package renames for packages that
+-remain inside the standard repository. Programs that import packages
+-that are no longer in the standard repository will need to be edited
+-by hand.
+-</p>
-
-- return &Value{data: groups}
+-<h3 id="exp">The package tree exp</h3>
-
--}
+-<p>
+-Because they are not standardized, the packages under the <code>exp</code> directory will not be available in the
+-standard Go 1 release distributions, although they will be available in source code form
+-in <a href="http://code.google.com/p/go/">the repository</a> for
+-developers who wish to use them.
+-</p>
-
--// ReplaceInt uses the specified function to replace each ints
--// by iterating each item. The data in the returned result will be a
--// []int containing the replaced items.
--func (v *Value) ReplaceInt(replacer func(int, int) int) *Value {
+-<p>
+-Several packages have moved under <code>exp</code> at the time of Go 1's release:
+-</p>
-
-- arr := v.MustIntSlice()
-- replaced := make([]int, len(arr))
+-<ul>
+-<li><code>ebnf</code></li>
+-<li><code>html</code><sup>†</sup></li>
+-<li><code>go/types</code></li>
+-</ul>
-
-- v.EachInt(func(index int, val int) bool {
-- replaced[index] = replacer(index, val)
-- return true
-- })
+-<p>
+-(<sup>†</sup>The <code>EscapeString</code> and <code>UnescapeString</code> types remain
+-in package <code>html</code>.)
+-</p>
-
-- return &Value{data: replaced}
+-<p>
+-All these packages are available under the same names, with the prefix <code>exp/</code>: <code>exp/ebnf</code> etc.
+-</p>
-
--}
+-<p>
+-Also, the <code>utf8.String</code> type has been moved to its own package, <code>exp/utf8string</code>.
+-</p>
-
--// CollectInt uses the specified collector function to collect a value
--// for each of the ints in the slice. The data returned will be a
--// []interface{}.
--func (v *Value) CollectInt(collector func(int, int) interface{}) *Value {
+-<p>
+-Finally, the <code>gotype</code> command now resides in <code>exp/gotype</code>, while
+-<code>ebnflint</code> is now in <code>exp/ebnflint</code>.
+-If they are installed, they now reside in <code>$GOROOT/bin/tool</code>.
+-</p>
-
-- arr := v.MustIntSlice()
-- collected := make([]interface{}, len(arr))
+-<p>
+-<em>Updating</em>:
+-Code that uses packages in <code>exp</code> will need to be updated by hand,
+-or else compiled from an installation that has <code>exp</code> available.
+-The <code>go</code> <code>fix</code> tool or the compiler will complain about such uses.
+-</p>
-
-- v.EachInt(func(index int, val int) bool {
-- collected[index] = collector(index, val)
-- return true
-- })
+-<h3 id="old">The package tree old</h3>
-
-- return &Value{data: collected}
--}
+-<p>
+-Because they are deprecated, the packages under the <code>old</code> directory will not be available in the
+-standard Go 1 release distributions, although they will be available in source code form for
+-developers who wish to use them.
+-</p>
-
--/*
-- Int8 (int8 and []int8)
-- --------------------------------------------------
--*/
+-<p>
+-The packages in their new locations are:
+-</p>
-
--// Int8 gets the value as a int8, returns the optionalDefault
--// value or a system default object if the value is the wrong type.
--func (v *Value) Int8(optionalDefault ...int8) int8 {
-- if s, ok := v.data.(int8); ok {
-- return s
-- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
-- }
-- return 0
--}
+-<ul>
+-<li><code>old/netchan</code></li>
+-<li><code>old/regexp</code></li>
+-<li><code>old/template</code></li>
+-</ul>
-
--// MustInt8 gets the value as a int8.
--//
--// Panics if the object is not a int8.
--func (v *Value) MustInt8() int8 {
-- return v.data.(int8)
--}
+-<p>
+-<em>Updating</em>:
+-Code that uses packages now in <code>old</code> will need to be updated by hand,
+-or else compiled from an installation that has <code>old</code> available.
+-The <code>go</code> <code>fix</code> tool will warn about such uses.
+-</p>
-
--// Int8Slice gets the value as a []int8, returns the optionalDefault
--// value or nil if the value is not a []int8.
--func (v *Value) Int8Slice(optionalDefault ...[]int8) []int8 {
-- if s, ok := v.data.([]int8); ok {
-- return s
-- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
-- }
-- return nil
--}
+-<h3 id="deleted">Deleted packages</h3>
-
--// MustInt8Slice gets the value as a []int8.
--//
--// Panics if the object is not a []int8.
--func (v *Value) MustInt8Slice() []int8 {
-- return v.data.([]int8)
--}
+-<p>
+-Go 1 deletes several packages outright:
+-</p>
-
--// IsInt8 gets whether the object contained is a int8 or not.
--func (v *Value) IsInt8() bool {
-- _, ok := v.data.(int8)
-- return ok
--}
+-<ul>
+-<li><code>container/vector</code></li>
+-<li><code>exp/datafmt</code></li>
+-<li><code>go/typechecker</code></li>
+-<li><code>try</code></li>
+-</ul>
-
--// IsInt8Slice gets whether the object contained is a []int8 or not.
--func (v *Value) IsInt8Slice() bool {
-- _, ok := v.data.([]int8)
-- return ok
--}
+-<p>
+-and also the command <code>gotry</code>.
+-</p>
-
--// EachInt8 calls the specified callback for each object
--// in the []int8.
--//
--// Panics if the object is the wrong type.
--func (v *Value) EachInt8(callback func(int, int8) bool) *Value {
+-<p>
+-<em>Updating</em>:
+-Code that uses <code>container/vector</code> should be updated to use
+-slices directly. See
+-<a href="http://code.google.com/p/go-wiki/wiki/SliceTricks">the Go
+-Language Community Wiki</a> for some suggestions.
+-Code that uses the other packages (there should be almost zero) will need to be rethought.
+-</p>
-
-- for index, val := range v.MustInt8Slice() {
-- carryon := callback(index, val)
-- if carryon == false {
-- break
-- }
-- }
+-<h3 id="subrepo">Packages moving to subrepositories</h3>
-
-- return v
+-<p>
+-Go 1 has moved a number of packages into other repositories, usually sub-repositories of
+-<a href="http://code.google.com/p/go/">the main Go repository</a>.
+-This table lists the old and new import paths:
-
--}
+-<table class="codetable" frame="border" summary="Sub-repositories">
+-<colgroup align="left" width="40%"></colgroup>
+-<colgroup align="left" width="60%"></colgroup>
+-<tr>
+-<th align="left">Old</th>
+-<th align="left">New</th>
+-</tr>
+-<tr>
+-<td colspan="2"><hr></td>
+-</tr>
+-<tr><td>crypto/bcrypt</td> <td>code.google.com/p/go.crypto/bcrypt</tr>
+-<tr><td>crypto/blowfish</td> <td>code.google.com/p/go.crypto/blowfish</tr>
+-<tr><td>crypto/cast5</td> <td>code.google.com/p/go.crypto/cast5</tr>
+-<tr><td>crypto/md4</td> <td>code.google.com/p/go.crypto/md4</tr>
+-<tr><td>crypto/ocsp</td> <td>code.google.com/p/go.crypto/ocsp</tr>
+-<tr><td>crypto/openpgp</td> <td>code.google.com/p/go.crypto/openpgp</tr>
+-<tr><td>crypto/openpgp/armor</td> <td>code.google.com/p/go.crypto/openpgp/armor</tr>
+-<tr><td>crypto/openpgp/elgamal</td> <td>code.google.com/p/go.crypto/openpgp/elgamal</tr>
+-<tr><td>crypto/openpgp/errors</td> <td>code.google.com/p/go.crypto/openpgp/errors</tr>
+-<tr><td>crypto/openpgp/packet</td> <td>code.google.com/p/go.crypto/openpgp/packet</tr>
+-<tr><td>crypto/openpgp/s2k</td> <td>code.google.com/p/go.crypto/openpgp/s2k</tr>
+-<tr><td>crypto/ripemd160</td> <td>code.google.com/p/go.crypto/ripemd160</tr>
+-<tr><td>crypto/twofish</td> <td>code.google.com/p/go.crypto/twofish</tr>
+-<tr><td>crypto/xtea</td> <td>code.google.com/p/go.crypto/xtea</tr>
+-<tr><td>exp/ssh</td> <td>code.google.com/p/go.crypto/ssh</tr>
+-<tr>
+-<td colspan="2"><hr></td>
+-</tr>
+-<tr><td>image/bmp</td> <td>code.google.com/p/go.image/bmp</tr>
+-<tr><td>image/tiff</td> <td>code.google.com/p/go.image/tiff</tr>
+-<tr>
+-<td colspan="2"><hr></td>
+-</tr>
+-<tr><td>net/dict</td> <td>code.google.com/p/go.net/dict</tr>
+-<tr><td>net/websocket</td> <td>code.google.com/p/go.net/websocket</tr>
+-<tr><td>exp/spdy</td> <td>code.google.com/p/go.net/spdy</tr>
+-<tr>
+-<td colspan="2"><hr></td>
+-</tr>
+-<tr><td>encoding/git85</td> <td>code.google.com/p/go.codereview/git85</tr>
+-<tr><td>patch</td> <td>code.google.com/p/go.codereview/patch</tr>
+-<tr>
+-<td colspan="2"><hr></td>
+-</tr>
+-<tr><td>exp/wingui</td> <td>code.google.com/p/gowingui</tr>
+-</table>
-
--// WhereInt8 uses the specified decider function to select items
--// from the []int8. The object contained in the result will contain
--// only the selected items.
--func (v *Value) WhereInt8(decider func(int, int8) bool) *Value {
+-<p>
+-<em>Updating</em>:
+-Running <code>go</code> <code>fix</code> will update imports of these packages to use the new import paths.
+-Installations that depend on these packages will need to install them using
+-a <code>go get</code> command.
+-</p>
-
-- var selected []int8
+-<h2 id="major">Major changes to the library</h2>
-
-- v.EachInt8(func(index int, val int8) bool {
-- shouldSelect := decider(index, val)
-- if shouldSelect == false {
-- selected = append(selected, val)
-- }
-- return true
-- })
+-<p>
+-This section describes significant changes to the core libraries, the ones that
+-affect the most programs.
+-</p>
-
-- return &Value{data: selected}
+-<h3 id="errors">The error type and errors package</h3>
-
--}
+-<p>
+-The placement of <code>os.Error</code> in package <code>os</code> is mostly historical: errors first came up when implementing package <code>os</code>, and they seemed system-related at the time.
+-Since then it has become clear that errors are more fundamental than the operating system. For example, it would be nice to use <code>Errors</code> in packages that <code>os</code> depends on, like <code>syscall</code>.
+-Also, having <code>Error</code> in <code>os</code> introduces many dependencies on <code>os</code> that would otherwise not exist.
+-</p>
-
--// GroupInt8 uses the specified grouper function to group the items
--// keyed by the return of the grouper. The object contained in the
--// result will contain a map[string][]int8.
--func (v *Value) GroupInt8(grouper func(int, int8) string) *Value {
+-<p>
+-Go 1 solves these problems by introducing a built-in <code>error</code> interface type and a separate <code>errors</code> package (analogous to <code>bytes</code> and <code>strings</code>) that contains utility functions.
+-It replaces <code>os.NewError</code> with
+-<a href="/pkg/errors/#New"><code>errors.New</code></a>,
+-giving errors a more central place in the environment.
+-</p>
-
-- groups := make(map[string][]int8)
+-<p>
+-So the widely-used <code>String</code> method does not cause accidental satisfaction
+-of the <code>error</code> interface, the <code>error</code> interface uses instead
+-the name <code>Error</code> for that method:
+-</p>
-
-- v.EachInt8(func(index int, val int8) bool {
-- group := grouper(index, val)
-- if _, ok := groups[group]; !ok {
-- groups[group] = make([]int8, 0)
-- }
-- groups[group] = append(groups[group], val)
-- return true
-- })
+-<pre>
+- type error interface {
+- Error() string
+- }
+-</pre>
-
-- return &Value{data: groups}
+-<p>
+-The <code>fmt</code> library automatically invokes <code>Error</code>, as it already
+-does for <code>String</code>, for easy printing of error values.
+-</p>
-
+-<pre><!--{{code "/doc/progs/go1.go" `/START ERROR EXAMPLE/` `/END ERROR EXAMPLE/`}}
+--->type SyntaxError struct {
+- File string
+- Line int
+- Message string
-}
-
--// ReplaceInt8 uses the specified function to replace each int8s
--// by iterating each item. The data in the returned result will be a
--// []int8 containing the replaced items.
--func (v *Value) ReplaceInt8(replacer func(int, int8) int8) *Value {
+-func (se *SyntaxError) Error() string {
+- return fmt.Sprintf("%s:%d: %s", se.File, se.Line, se.Message)
+-}</pre>
-
-- arr := v.MustInt8Slice()
-- replaced := make([]int8, len(arr))
+-<p>
+-All standard packages have been updated to use the new interface; the old <code>os.Error</code> is gone.
+-</p>
-
-- v.EachInt8(func(index int, val int8) bool {
-- replaced[index] = replacer(index, val)
-- return true
-- })
+-<p>
+-A new package, <a href="/pkg/errors/"><code>errors</code></a>, contains the function
+-</p>
-
-- return &Value{data: replaced}
+-<pre>
+-func New(text string) error
+-</pre>
-
--}
+-<p>
+-to turn a string into an error. It replaces the old <code>os.NewError</code>.
+-</p>
-
--// CollectInt8 uses the specified collector function to collect a value
--// for each of the int8s in the slice. The data returned will be a
--// []interface{}.
--func (v *Value) CollectInt8(collector func(int, int8) interface{}) *Value {
+-<pre><!--{{code "/doc/progs/go1.go" `/ErrSyntax/`}}
+---> var ErrSyntax = errors.New("syntax error")</pre>
+-
+-<p>
+-<em>Updating</em>:
+-Running <code>go</code> <code>fix</code> will update almost all code affected by the change.
+-Code that defines error types with a <code>String</code> method will need to be updated
+-by hand to rename the methods to <code>Error</code>.
+-</p>
-
-- arr := v.MustInt8Slice()
-- collected := make([]interface{}, len(arr))
+-<h3 id="errno">System call errors</h3>
-
-- v.EachInt8(func(index int, val int8) bool {
-- collected[index] = collector(index, val)
-- return true
-- })
+-<p>
+-The old <code>syscall</code> package, which predated <code>os.Error</code>
+-(and just about everything else),
+-returned errors as <code>int</code> values.
+-In turn, the <code>os</code> package forwarded many of these errors, such
+-as <code>EINVAL</code>, but using a different set of errors on each platform.
+-This behavior was unpleasant and unportable.
+-</p>
-
-- return &Value{data: collected}
--}
+-<p>
+-In Go 1, the
+-<a href="/pkg/syscall/"><code>syscall</code></a>
+-package instead returns an <code>error</code> for system call errors.
+-On Unix, the implementation is done by a
+-<a href="/pkg/syscall/#Errno"><code>syscall.Errno</code></a> type
+-that satisfies <code>error</code> and replaces the old <code>os.Errno</code>.
+-</p>
-
--/*
-- Int16 (int16 and []int16)
-- --------------------------------------------------
--*/
+-<p>
+-The changes affecting <code>os.EINVAL</code> and relatives are
+-described <a href="#os">elsewhere</a>.
-
--// Int16 gets the value as a int16, returns the optionalDefault
--// value or a system default object if the value is the wrong type.
--func (v *Value) Int16(optionalDefault ...int16) int16 {
-- if s, ok := v.data.(int16); ok {
-- return s
-- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
-- }
-- return 0
--}
+-<p>
+-<em>Updating</em>:
+-Running <code>go</code> <code>fix</code> will update almost all code affected by the change.
+-Regardless, most code should use the <code>os</code> package
+-rather than <code>syscall</code> and so will be unaffected.
+-</p>
-
--// MustInt16 gets the value as a int16.
--//
--// Panics if the object is not a int16.
--func (v *Value) MustInt16() int16 {
-- return v.data.(int16)
--}
+-<h3 id="time">Time</h3>
-
--// Int16Slice gets the value as a []int16, returns the optionalDefault
--// value or nil if the value is not a []int16.
--func (v *Value) Int16Slice(optionalDefault ...[]int16) []int16 {
-- if s, ok := v.data.([]int16); ok {
-- return s
-- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
-- }
-- return nil
--}
+-<p>
+-Time is always a challenge to support well in a programming language.
+-The old Go <code>time</code> package had <code>int64</code> units, no
+-real type safety,
+-and no distinction between absolute times and durations.
+-</p>
-
--// MustInt16Slice gets the value as a []int16.
--//
--// Panics if the object is not a []int16.
--func (v *Value) MustInt16Slice() []int16 {
-- return v.data.([]int16)
--}
+-<p>
+-One of the most sweeping changes in the Go 1 library is therefore a
+-complete redesign of the
+-<a href="/pkg/time/"><code>time</code></a> package.
+-Instead of an integer number of nanoseconds as an <code>int64</code>,
+-and a separate <code>*time.Time</code> type to deal with human
+-units such as hours and years,
+-there are now two fundamental types:
+-<a href="/pkg/time/#Time"><code>time.Time</code></a>
+-(a value, so the <code>*</code> is gone), which represents a moment in time;
+-and <a href="/pkg/time/#Duration"><code>time.Duration</code></a>,
+-which represents an interval.
+-Both have nanosecond resolution.
+-A <code>Time</code> can represent any time into the ancient
+-past and remote future, while a <code>Duration</code> can
+-span plus or minus only about 290 years.
+-There are methods on these types, plus a number of helpful
+-predefined constant durations such as <code>time.Second</code>.
+-</p>
-
--// IsInt16 gets whether the object contained is a int16 or not.
--func (v *Value) IsInt16() bool {
-- _, ok := v.data.(int16)
-- return ok
--}
+-<p>
+-Among the new methods are things like
+-<a href="/pkg/time/#Time.Add"><code>Time.Add</code></a>,
+-which adds a <code>Duration</code> to a <code>Time</code>, and
+-<a href="/pkg/time/#Time.Sub"><code>Time.Sub</code></a>,
+-which subtracts two <code>Times</code> to yield a <code>Duration</code>.
+-</p>
-
--// IsInt16Slice gets whether the object contained is a []int16 or not.
--func (v *Value) IsInt16Slice() bool {
-- _, ok := v.data.([]int16)
-- return ok
--}
+-<p>
+-The most important semantic change is that the Unix epoch (Jan 1, 1970) is now
+-relevant only for those functions and methods that mention Unix:
+-<a href="/pkg/time/#Unix"><code>time.Unix</code></a>
+-and the <a href="/pkg/time/#Time.Unix"><code>Unix</code></a>
+-and <a href="/pkg/time/#Time.UnixNano"><code>UnixNano</code></a> methods
+-of the <code>Time</code> type.
+-In particular,
+-<a href="/pkg/time/#Now"><code>time.Now</code></a>
+-returns a <code>time.Time</code> value rather than, in the old
+-API, an integer nanosecond count since the Unix epoch.
+-</p>
-
--// EachInt16 calls the specified callback for each object
--// in the []int16.
--//
--// Panics if the object is the wrong type.
--func (v *Value) EachInt16(callback func(int, int16) bool) *Value {
+-<pre><!--{{code "/doc/progs/go1.go" `/sleepUntil/` `/^}/`}}
+---><span class="comment">// sleepUntil sleeps until the specified time. It returns immediately if it's too late.</span>
+-func sleepUntil(wakeup time.Time) {
+- now := time.Now() <span class="comment">// A Time.</span>
+- if !wakeup.After(now) {
+- return
+- }
+- delta := wakeup.Sub(now) <span class="comment">// A Duration.</span>
+- fmt.Printf("Sleeping for %.3fs\n", delta.Seconds())
+- time.Sleep(delta)
+-}</pre>
-
-- for index, val := range v.MustInt16Slice() {
-- carryon := callback(index, val)
-- if carryon == false {
-- break
-- }
-- }
+-<p>
+-The new types, methods, and constants have been propagated through
+-all the standard packages that use time, such as <code>os</code> and
+-its representation of file time stamps.
+-</p>
-
-- return v
+-<p>
+-<em>Updating</em>:
+-The <code>go</code> <code>fix</code> tool will update many uses of the old <code>time</code> package to use the new
+-types and methods, although it does not replace values such as <code>1e9</code>
+-representing nanoseconds per second.
+-Also, because of type changes in some of the values that arise,
+-some of the expressions rewritten by the fix tool may require
+-further hand editing; in such cases the rewrite will include
+-the correct function or method for the old functionality, but
+-may have the wrong type or require further analysis.
+-</p>
-
--}
+-<h2 id="minor">Minor changes to the library</h2>
-
--// WhereInt16 uses the specified decider function to select items
--// from the []int16. The object contained in the result will contain
--// only the selected items.
--func (v *Value) WhereInt16(decider func(int, int16) bool) *Value {
+-<p>
+-This section describes smaller changes, such as those to less commonly
+-used packages or that affect
+-few programs beyond the need to run <code>go</code> <code>fix</code>.
+-This category includes packages that are new in Go 1.
+-Collectively they improve portability, regularize behavior, and
+-make the interfaces more modern and Go-like.
+-</p>
-
-- var selected []int16
+-<h3 id="archive_zip">The archive/zip package</h3>
-
-- v.EachInt16(func(index int, val int16) bool {
-- shouldSelect := decider(index, val)
-- if shouldSelect == false {
-- selected = append(selected, val)
-- }
-- return true
-- })
+-<p>
+-In Go 1, <a href="/pkg/archive/zip/#Writer"><code>*zip.Writer</code></a> no
+-longer has a <code>Write</code> method. Its presence was a mistake.
+-</p>
-
-- return &Value{data: selected}
+-<p>
+-<em>Updating</em>:
+-What little code is affected will be caught by the compiler and must be updated by hand.
+-</p>
-
--}
+-<h3 id="bufio">The bufio package</h3>
-
--// GroupInt16 uses the specified grouper function to group the items
--// keyed by the return of the grouper. The object contained in the
--// result will contain a map[string][]int16.
--func (v *Value) GroupInt16(grouper func(int, int16) string) *Value {
+-<p>
+-In Go 1, <a href="/pkg/bufio/#NewReaderSize"><code>bufio.NewReaderSize</code></a>
+-and
+-<a href="/pkg/bufio/#NewWriterSize"><code>bufio.NewWriterSize</code></a>
+-functions no longer return an error for invalid sizes.
+-If the argument size is too small or invalid, it is adjusted.
+-</p>
-
-- groups := make(map[string][]int16)
+-<p>
+-<em>Updating</em>:
+-Running <code>go</code> <code>fix</code> will update calls that assign the error to _.
+-Calls that aren't fixed will be caught by the compiler and must be updated by hand.
+-</p>
-
-- v.EachInt16(func(index int, val int16) bool {
-- group := grouper(index, val)
-- if _, ok := groups[group]; !ok {
-- groups[group] = make([]int16, 0)
-- }
-- groups[group] = append(groups[group], val)
-- return true
-- })
+-<h3 id="compress">The compress/flate, compress/gzip and compress/zlib packages</h3>
-
-- return &Value{data: groups}
+-<p>
+-In Go 1, the <code>NewWriterXxx</code> functions in
+-<a href="/pkg/compress/flate"><code>compress/flate</code></a>,
+-<a href="/pkg/compress/gzip"><code>compress/gzip</code></a> and
+-<a href="/pkg/compress/zlib"><code>compress/zlib</code></a>
+-all return <code>(*Writer, error)</code> if they take a compression level,
+-and <code>*Writer</code> otherwise. Package <code>gzip</code>'s
+-<code>Compressor</code> and <code>Decompressor</code> types have been renamed
+-to <code>Writer</code> and <code>Reader</code>. Package <code>flate</code>'s
+-<code>WrongValueError</code> type has been removed.
+-</p>
-
--}
+-<p>
+-<em>Updating</em>
+-Running <code>go</code> <code>fix</code> will update old names and calls that assign the error to _.
+-Calls that aren't fixed will be caught by the compiler and must be updated by hand.
+-</p>
-
--// ReplaceInt16 uses the specified function to replace each int16s
--// by iterating each item. The data in the returned result will be a
--// []int16 containing the replaced items.
--func (v *Value) ReplaceInt16(replacer func(int, int16) int16) *Value {
+-<h3 id="crypto_aes_des">The crypto/aes and crypto/des packages</h3>
-
-- arr := v.MustInt16Slice()
-- replaced := make([]int16, len(arr))
+-<p>
+-In Go 1, the <code>Reset</code> method has been removed. Go does not guarantee
+-that memory is not copied and therefore this method was misleading.
+-</p>
-
-- v.EachInt16(func(index int, val int16) bool {
-- replaced[index] = replacer(index, val)
-- return true
-- })
+-<p>
+-The cipher-specific types <code>*aes.Cipher</code>, <code>*des.Cipher</code>,
+-and <code>*des.TripleDESCipher</code> have been removed in favor of
+-<code>cipher.Block</code>.
+-</p>
-
-- return &Value{data: replaced}
+-<p>
+-<em>Updating</em>:
+-Remove the calls to Reset. Replace uses of the specific cipher types with
+-cipher.Block.
+-</p>
-
--}
+-<h3 id="crypto_elliptic">The crypto/elliptic package</h3>
-
--// CollectInt16 uses the specified collector function to collect a value
--// for each of the int16s in the slice. The data returned will be a
--// []interface{}.
--func (v *Value) CollectInt16(collector func(int, int16) interface{}) *Value {
+-<p>
+-In Go 1, <a href="/pkg/crypto/elliptic/#Curve"><code>elliptic.Curve</code></a>
+-has been made an interface to permit alternative implementations. The curve
+-parameters have been moved to the
+-<a href="/pkg/crypto/elliptic/#CurveParams"><code>elliptic.CurveParams</code></a>
+-structure.
+-</p>
-
-- arr := v.MustInt16Slice()
-- collected := make([]interface{}, len(arr))
+-<p>
+-<em>Updating</em>:
+-Existing users of <code>*elliptic.Curve</code> will need to change to
+-simply <code>elliptic.Curve</code>. Calls to <code>Marshal</code>,
+-<code>Unmarshal</code> and <code>GenerateKey</code> are now functions
+-in <code>crypto/elliptic</code> that take an <code>elliptic.Curve</code>
+-as their first argument.
+-</p>
-
-- v.EachInt16(func(index int, val int16) bool {
-- collected[index] = collector(index, val)
-- return true
-- })
+-<h3 id="crypto_hmac">The crypto/hmac package</h3>
-
-- return &Value{data: collected}
--}
+-<p>
+-In Go 1, the hash-specific functions, such as <code>hmac.NewMD5</code>, have
+-been removed from <code>crypto/hmac</code>. Instead, <code>hmac.New</code> takes
+-a function that returns a <code>hash.Hash</code>, such as <code>md5.New</code>.
+-</p>
-
--/*
-- Int32 (int32 and []int32)
-- --------------------------------------------------
--*/
+-<p>
+-<em>Updating</em>:
+-Running <code>go</code> <code>fix</code> will perform the needed changes.
+-</p>
-
--// Int32 gets the value as a int32, returns the optionalDefault
--// value or a system default object if the value is the wrong type.
--func (v *Value) Int32(optionalDefault ...int32) int32 {
-- if s, ok := v.data.(int32); ok {
-- return s
-- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
-- }
-- return 0
--}
+-<h3 id="crypto_x509">The crypto/x509 package</h3>
-
--// MustInt32 gets the value as a int32.
--//
--// Panics if the object is not a int32.
--func (v *Value) MustInt32() int32 {
-- return v.data.(int32)
--}
+-<p>
+-In Go 1, the
+-<a href="/pkg/crypto/x509/#CreateCertificate"><code>CreateCertificate</code></a>
+-and
+-<a href="/pkg/crypto/x509/#CreateCRL"><code>CreateCRL</code></a>
+-functions in <code>crypto/x509</code> have been altered to take an
+-<code>interface{}</code> where they previously took a <code>*rsa.PublicKey</code>
+-or <code>*rsa.PrivateKey</code>. This will allow other public key algorithms
+-to be implemented in the future.
+-</p>
-
--// Int32Slice gets the value as a []int32, returns the optionalDefault
--// value or nil if the value is not a []int32.
--func (v *Value) Int32Slice(optionalDefault ...[]int32) []int32 {
-- if s, ok := v.data.([]int32); ok {
-- return s
-- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
-- }
-- return nil
--}
+-<p>
+-<em>Updating</em>:
+-No changes will be needed.
+-</p>
-
--// MustInt32Slice gets the value as a []int32.
--//
--// Panics if the object is not a []int32.
--func (v *Value) MustInt32Slice() []int32 {
-- return v.data.([]int32)
--}
+-<h3 id="encoding_binary">The encoding/binary package</h3>
-
--// IsInt32 gets whether the object contained is a int32 or not.
--func (v *Value) IsInt32() bool {
-- _, ok := v.data.(int32)
-- return ok
--}
+-<p>
+-In Go 1, the <code>binary.TotalSize</code> function has been replaced by
+-<a href="/pkg/encoding/binary/#Size"><code>Size</code></a>,
+-which takes an <code>interface{}</code> argument rather than
+-a <code>reflect.Value</code>.
+-</p>
-
--// IsInt32Slice gets whether the object contained is a []int32 or not.
--func (v *Value) IsInt32Slice() bool {
-- _, ok := v.data.([]int32)
-- return ok
--}
+-<p>
+-<em>Updating</em>:
+-What little code is affected will be caught by the compiler and must be updated by hand.
+-</p>
-
--// EachInt32 calls the specified callback for each object
--// in the []int32.
--//
--// Panics if the object is the wrong type.
--func (v *Value) EachInt32(callback func(int, int32) bool) *Value {
+-<h3 id="encoding_xml">The encoding/xml package</h3>
-
-- for index, val := range v.MustInt32Slice() {
-- carryon := callback(index, val)
-- if carryon == false {
-- break
-- }
-- }
+-<p>
+-In Go 1, the <a href="/pkg/encoding/xml/"><code>xml</code></a> package
+-has been brought closer in design to the other marshaling packages such
+-as <a href="/pkg/encoding/gob/"><code>encoding/gob</code></a>.
+-</p>
-
-- return v
+-<p>
+-The old <code>Parser</code> type is renamed
+-<a href="/pkg/encoding/xml/#Decoder"><code>Decoder</code></a> and has a new
+-<a href="/pkg/encoding/xml/#Decoder.Decode"><code>Decode</code></a> method. An
+-<a href="/pkg/encoding/xml/#Encoder"><code>Encoder</code></a> type was also introduced.
+-</p>
-
--}
+-<p>
+-The functions <a href="/pkg/encoding/xml/#Marshal"><code>Marshal</code></a>
+-and <a href="/pkg/encoding/xml/#Unmarshal"><code>Unmarshal</code></a>
+-work with <code>[]byte</code> values now. To work with streams,
+-use the new <a href="/pkg/encoding/xml/#Encoder"><code>Encoder</code></a>
+-and <a href="/pkg/encoding/xml/#Decoder"><code>Decoder</code></a> types.
+-</p>
-
--// WhereInt32 uses the specified decider function to select items
--// from the []int32. The object contained in the result will contain
--// only the selected items.
--func (v *Value) WhereInt32(decider func(int, int32) bool) *Value {
+-<p>
+-When marshaling or unmarshaling values, the format of supported flags in
+-field tags has changed to be closer to the
+-<a href="/pkg/encoding/json"><code>json</code></a> package
+-(<code>`xml:"name,flag"`</code>). The matching done between field tags, field
+-names, and the XML attribute and element names is now case-sensitive.
+-The <code>XMLName</code> field tag, if present, must also match the name
+-of the XML element being marshaled.
+-</p>
-
-- var selected []int32
+-<p>
+-<em>Updating</em>:
+-Running <code>go</code> <code>fix</code> will update most uses of the package except for some calls to
+-<code>Unmarshal</code>. Special care must be taken with field tags,
+-since the fix tool will not update them and if not fixed by hand they will
+-misbehave silently in some cases. For example, the old
+-<code>"attr"</code> is now written <code>",attr"</code> while plain
+-<code>"attr"</code> remains valid but with a different meaning.
+-</p>
-
-- v.EachInt32(func(index int, val int32) bool {
-- shouldSelect := decider(index, val)
-- if shouldSelect == false {
-- selected = append(selected, val)
-- }
-- return true
-- })
+-<h3 id="expvar">The expvar package</h3>
-
-- return &Value{data: selected}
+-<p>
+-In Go 1, the <code>RemoveAll</code> function has been removed.
+-The <code>Iter</code> function and Iter method on <code>*Map</code> have
+-been replaced by
+-<a href="/pkg/expvar/#Do"><code>Do</code></a>
+-and
+-<a href="/pkg/expvar/#Map.Do"><code>(*Map).Do</code></a>.
+-</p>
-
--}
+-<p>
+-<em>Updating</em>:
+-Most code using <code>expvar</code> will not need changing. The rare code that used
+-<code>Iter</code> can be updated to pass a closure to <code>Do</code> to achieve the same effect.
+-</p>
-
--// GroupInt32 uses the specified grouper function to group the items
--// keyed by the return of the grouper. The object contained in the
--// result will contain a map[string][]int32.
--func (v *Value) GroupInt32(grouper func(int, int32) string) *Value {
+-<h3 id="flag">The flag package</h3>
-
-- groups := make(map[string][]int32)
+-<p>
+-In Go 1, the interface <a href="/pkg/flag/#Value"><code>flag.Value</code></a> has changed slightly.
+-The <code>Set</code> method now returns an <code>error</code> instead of
+-a <code>bool</code> to indicate success or failure.
+-</p>
-
-- v.EachInt32(func(index int, val int32) bool {
-- group := grouper(index, val)
-- if _, ok := groups[group]; !ok {
-- groups[group] = make([]int32, 0)
-- }
-- groups[group] = append(groups[group], val)
-- return true
-- })
+-<p>
+-There is also a new kind of flag, <code>Duration</code>, to support argument
+-values specifying time intervals.
+-Values for such flags must be given units, just as <code>time.Duration</code>
+-formats them: <code>10s</code>, <code>1h30m</code>, etc.
+-</p>
-
-- return &Value{data: groups}
+-<pre><!--{{code "/doc/progs/go1.go" `/timeout/`}}
+--->var timeout = flag.Duration("timeout", 30*time.Second, "how long to wait for completion")</pre>
-
--}
+-<p>
+-<em>Updating</em>:
+-Programs that implement their own flags will need minor manual fixes to update their
+-<code>Set</code> methods.
+-The <code>Duration</code> flag is new and affects no existing code.
+-</p>
-
--// ReplaceInt32 uses the specified function to replace each int32s
--// by iterating each item. The data in the returned result will be a
--// []int32 containing the replaced items.
--func (v *Value) ReplaceInt32(replacer func(int, int32) int32) *Value {
-
-- arr := v.MustInt32Slice()
-- replaced := make([]int32, len(arr))
+-<h3 id="go">The go/* packages</h3>
-
-- v.EachInt32(func(index int, val int32) bool {
-- replaced[index] = replacer(index, val)
-- return true
-- })
+-<p>
+-Several packages under <code>go</code> have slightly revised APIs.
+-</p>
-
-- return &Value{data: replaced}
+-<p>
+-A concrete <code>Mode</code> type was introduced for configuration mode flags
+-in the packages
+-<a href="/pkg/go/scanner/"><code>go/scanner</code></a>,
+-<a href="/pkg/go/parser/"><code>go/parser</code></a>,
+-<a href="/pkg/go/printer/"><code>go/printer</code></a>, and
+-<a href="/pkg/go/doc/"><code>go/doc</code></a>.
+-</p>
-
--}
+-<p>
+-The modes <code>AllowIllegalChars</code> and <code>InsertSemis</code> have been removed
+-from the <a href="/pkg/go/scanner/"><code>go/scanner</code></a> package. They were mostly
+-useful for scanning text other then Go source files. Instead, the
+-<a href="/pkg/text/scanner/"><code>text/scanner</code></a> package should be used
+-for that purpose.
+-</p>
-
--// CollectInt32 uses the specified collector function to collect a value
--// for each of the int32s in the slice. The data returned will be a
--// []interface{}.
--func (v *Value) CollectInt32(collector func(int, int32) interface{}) *Value {
+-<p>
+-The <a href="/pkg/go/scanner/#ErrorHandler"><code>ErrorHandler</code></a> provided
+-to the scanner's <a href="/pkg/go/scanner/#Scanner.Init"><code>Init</code></a> method is
+-now simply a function rather than an interface. The <code>ErrorVector</code> type has
+-been removed in favor of the (existing) <a href="/pkg/go/scanner/#ErrorList"><code>ErrorList</code></a>
+-type, and the <code>ErrorVector</code> methods have been migrated. Instead of embedding
+-an <code>ErrorVector</code> in a client of the scanner, now a client should maintain
+-an <code>ErrorList</code>.
+-</p>
-
-- arr := v.MustInt32Slice()
-- collected := make([]interface{}, len(arr))
+-<p>
+-The set of parse functions provided by the <a href="/pkg/go/parser/"><code>go/parser</code></a>
+-package has been reduced to the primary parse function
+-<a href="/pkg/go/parser/#ParseFile"><code>ParseFile</code></a>, and a couple of
+-convenience functions <a href="/pkg/go/parser/#ParseDir"><code>ParseDir</code></a>
+-and <a href="/pkg/go/parser/#ParseExpr"><code>ParseExpr</code></a>.
+-</p>
-
-- v.EachInt32(func(index int, val int32) bool {
-- collected[index] = collector(index, val)
-- return true
-- })
+-<p>
+-The <a href="/pkg/go/printer/"><code>go/printer</code></a> package supports an additional
+-configuration mode <a href="/pkg/go/printer/#Mode"><code>SourcePos</code></a>;
+-if set, the printer will emit <code>//line</code> comments such that the generated
+-output contains the original source code position information. The new type
+-<a href="/pkg/go/printer/#CommentedNode"><code>CommentedNode</code></a> can be
+-used to provide comments associated with an arbitrary
+-<a href="/pkg/go/ast/#Node"><code>ast.Node</code></a> (until now only
+-<a href="/pkg/go/ast/#File"><code>ast.File</code></a> carried comment information).
+-</p>
-
-- return &Value{data: collected}
--}
+-<p>
+-The type names of the <a href="/pkg/go/doc/"><code>go/doc</code></a> package have been
+-streamlined by removing the <code>Doc</code> suffix: <code>PackageDoc</code>
+-is now <code>Package</code>, <code>ValueDoc</code> is <code>Value</code>, etc.
+-Also, all types now consistently have a <code>Name</code> field (or <code>Names</code>,
+-in the case of type <code>Value</code>) and <code>Type.Factories</code> has become
+-<code>Type.Funcs</code>.
+-Instead of calling <code>doc.NewPackageDoc(pkg, importpath)</code>,
+-documentation for a package is created with:
+-</p>
-
--/*
-- Int64 (int64 and []int64)
-- --------------------------------------------------
--*/
+-<pre>
+- doc.New(pkg, importpath, mode)
+-</pre>
-
--// Int64 gets the value as a int64, returns the optionalDefault
--// value or a system default object if the value is the wrong type.
--func (v *Value) Int64(optionalDefault ...int64) int64 {
-- if s, ok := v.data.(int64); ok {
-- return s
-- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
-- }
-- return 0
--}
+-<p>
+-where the new <code>mode</code> parameter specifies the operation mode:
+-if set to <a href="/pkg/go/doc/#AllDecls"><code>AllDecls</code></a>, all declarations
+-(not just exported ones) are considered.
+-The function <code>NewFileDoc</code> was removed, and the function
+-<code>CommentText</code> has become the method
+-<a href="/pkg/go/ast/#Text"><code>Text</code></a> of
+-<a href="/pkg/go/ast/#CommentGroup"><code>ast.CommentGroup</code></a>.
+-</p>
-
--// MustInt64 gets the value as a int64.
--//
--// Panics if the object is not a int64.
--func (v *Value) MustInt64() int64 {
-- return v.data.(int64)
--}
+-<p>
+-In package <a href="/pkg/go/token/"><code>go/token</code></a>, the
+-<a href="/pkg/go/token/#FileSet"><code>token.FileSet</code></a> method <code>Files</code>
+-(which originally returned a channel of <code>*token.File</code>s) has been replaced
+-with the iterator <a href="/pkg/go/token/#FileSet.Iterate"><code>Iterate</code></a> that
+-accepts a function argument instead.
+-</p>
-
--// Int64Slice gets the value as a []int64, returns the optionalDefault
--// value or nil if the value is not a []int64.
--func (v *Value) Int64Slice(optionalDefault ...[]int64) []int64 {
-- if s, ok := v.data.([]int64); ok {
-- return s
-- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
-- }
-- return nil
--}
+-<p>
+-In package <a href="/pkg/go/build/"><code>go/build</code></a>, the API
+-has been nearly completely replaced.
+-The package still computes Go package information
+-but it does not run the build: the <code>Cmd</code> and <code>Script</code>
+-types are gone.
+-(To build code, use the new
+-<a href="/cmd/go/"><code>go</code></a> command instead.)
+-The <code>DirInfo</code> type is now named
+-<a href="/pkg/go/build/#Package"><code>Package</code></a>.
+-<code>FindTree</code> and <code>ScanDir</code> are replaced by
+-<a href="/pkg/go/build/#Import"><code>Import</code></a>
+-and
+-<a href="/pkg/go/build/#ImportDir"><code>ImportDir</code></a>.
+-</p>
-
--// MustInt64Slice gets the value as a []int64.
--//
--// Panics if the object is not a []int64.
--func (v *Value) MustInt64Slice() []int64 {
-- return v.data.([]int64)
--}
+-<p>
+-<em>Updating</em>:
+-Code that uses packages in <code>go</code> will have to be updated by hand; the
+-compiler will reject incorrect uses. Templates used in conjunction with any of the
+-<code>go/doc</code> types may need manual fixes; the renamed fields will lead
+-to run-time errors.
+-</p>
-
--// IsInt64 gets whether the object contained is a int64 or not.
--func (v *Value) IsInt64() bool {
-- _, ok := v.data.(int64)
-- return ok
--}
+-<h3 id="hash">The hash package</h3>
-
--// IsInt64Slice gets whether the object contained is a []int64 or not.
--func (v *Value) IsInt64Slice() bool {
-- _, ok := v.data.([]int64)
-- return ok
--}
+-<p>
+-In Go 1, the definition of <a href="/pkg/hash/#Hash"><code>hash.Hash</code></a> includes
+-a new method, <code>BlockSize</code>. This new method is used primarily in the
+-cryptographic libraries.
+-</p>
-
--// EachInt64 calls the specified callback for each object
--// in the []int64.
--//
--// Panics if the object is the wrong type.
--func (v *Value) EachInt64(callback func(int, int64) bool) *Value {
+-<p>
+-The <code>Sum</code> method of the
+-<a href="/pkg/hash/#Hash"><code>hash.Hash</code></a> interface now takes a
+-<code>[]byte</code> argument, to which the hash value will be appended.
+-The previous behavior can be recreated by adding a <code>nil</code> argument to the call.
+-</p>
-
-- for index, val := range v.MustInt64Slice() {
-- carryon := callback(index, val)
-- if carryon == false {
-- break
-- }
-- }
+-<p>
+-<em>Updating</em>:
+-Existing implementations of <code>hash.Hash</code> will need to add a
+-<code>BlockSize</code> method. Hashes that process the input one byte at
+-a time can implement <code>BlockSize</code> to return 1.
+-Running <code>go</code> <code>fix</code> will update calls to the <code>Sum</code> methods of the various
+-implementations of <code>hash.Hash</code>.
+-</p>
-
-- return v
+-<p>
+-<em>Updating</em>:
+-Since the package's functionality is new, no updating is necessary.
+-</p>
-
--}
+-<h3 id="http">The http package</h3>
-
--// WhereInt64 uses the specified decider function to select items
--// from the []int64. The object contained in the result will contain
--// only the selected items.
--func (v *Value) WhereInt64(decider func(int, int64) bool) *Value {
+-<p>
+-In Go 1 the <a href="/pkg/net/http/"><code>http</code></a> package is refactored,
+-putting some of the utilities into a
+-<a href="/pkg/net/http/httputil/"><code>httputil</code></a> subdirectory.
+-These pieces are only rarely needed by HTTP clients.
+-The affected items are:
+-</p>
-
-- var selected []int64
+-<ul>
+-<li>ClientConn</li>
+-<li>DumpRequest</li>
+-<li>DumpRequestOut</li>
+-<li>DumpResponse</li>
+-<li>NewChunkedReader</li>
+-<li>NewChunkedWriter</li>
+-<li>NewClientConn</li>
+-<li>NewProxyClientConn</li>
+-<li>NewServerConn</li>
+-<li>NewSingleHostReverseProxy</li>
+-<li>ReverseProxy</li>
+-<li>ServerConn</li>
+-</ul>
-
-- v.EachInt64(func(index int, val int64) bool {
-- shouldSelect := decider(index, val)
-- if shouldSelect == false {
-- selected = append(selected, val)
-- }
-- return true
-- })
+-<p>
+-The <code>Request.RawURL</code> field has been removed; it was a
+-historical artifact.
+-</p>
-
-- return &Value{data: selected}
+-<p>
+-The <code>Handle</code> and <code>HandleFunc</code>
+-functions, and the similarly-named methods of <code>ServeMux</code>,
+-now panic if an attempt is made to register the same pattern twice.
+-</p>
-
--}
+-<p>
+-<em>Updating</em>:
+-Running <code>go</code> <code>fix</code> will update the few programs that are affected except for
+-uses of <code>RawURL</code>, which must be fixed by hand.
+-</p>
-
--// GroupInt64 uses the specified grouper function to group the items
--// keyed by the return of the grouper. The object contained in the
--// result will contain a map[string][]int64.
--func (v *Value) GroupInt64(grouper func(int, int64) string) *Value {
+-<h3 id="image">The image package</h3>
-
-- groups := make(map[string][]int64)
+-<p>
+-The <a href="/pkg/image/"><code>image</code></a> package has had a number of
+-minor changes, rearrangements and renamings.
+-</p>
-
-- v.EachInt64(func(index int, val int64) bool {
-- group := grouper(index, val)
-- if _, ok := groups[group]; !ok {
-- groups[group] = make([]int64, 0)
-- }
-- groups[group] = append(groups[group], val)
-- return true
-- })
+-<p>
+-Most of the color handling code has been moved into its own package,
+-<a href="/pkg/image/color/"><code>image/color</code></a>.
+-For the elements that moved, a symmetry arises; for instance,
+-each pixel of an
+-<a href="/pkg/image/#RGBA"><code>image.RGBA</code></a>
+-is a
+-<a href="/pkg/image/color/#RGBA"><code>color.RGBA</code></a>.
+-</p>
-
-- return &Value{data: groups}
+-<p>
+-The old <code>image/ycbcr</code> package has been folded, with some
+-renamings, into the
+-<a href="/pkg/image/"><code>image</code></a>
+-and
+-<a href="/pkg/image/color/"><code>image/color</code></a>
+-packages.
+-</p>
-
--}
+-<p>
+-The old <code>image.ColorImage</code> type is still in the <code>image</code>
+-package but has been renamed
+-<a href="/pkg/image/#Uniform"><code>image.Uniform</code></a>,
+-while <code>image.Tiled</code> has been removed.
+-</p>
-
--// ReplaceInt64 uses the specified function to replace each int64s
--// by iterating each item. The data in the returned result will be a
--// []int64 containing the replaced items.
--func (v *Value) ReplaceInt64(replacer func(int, int64) int64) *Value {
+-<p>
+-This table lists the renamings.
+-</p>
-
-- arr := v.MustInt64Slice()
-- replaced := make([]int64, len(arr))
+-<table class="codetable" frame="border" summary="image renames">
+-<colgroup align="left" width="50%"></colgroup>
+-<colgroup align="left" width="50%"></colgroup>
+-<tr>
+-<th align="left">Old</th>
+-<th align="left">New</th>
+-</tr>
+-<tr>
+-<td colspan="2"><hr></td>
+-</tr>
+-<tr><td>image.Color</td> <td>color.Color</td></tr>
+-<tr><td>image.ColorModel</td> <td>color.Model</td></tr>
+-<tr><td>image.ColorModelFunc</td> <td>color.ModelFunc</td></tr>
+-<tr><td>image.PalettedColorModel</td> <td>color.Palette</td></tr>
+-<tr>
+-<td colspan="2"><hr></td>
+-</tr>
+-<tr><td>image.RGBAColor</td> <td>color.RGBA</td></tr>
+-<tr><td>image.RGBA64Color</td> <td>color.RGBA64</td></tr>
+-<tr><td>image.NRGBAColor</td> <td>color.NRGBA</td></tr>
+-<tr><td>image.NRGBA64Color</td> <td>color.NRGBA64</td></tr>
+-<tr><td>image.AlphaColor</td> <td>color.Alpha</td></tr>
+-<tr><td>image.Alpha16Color</td> <td>color.Alpha16</td></tr>
+-<tr><td>image.GrayColor</td> <td>color.Gray</td></tr>
+-<tr><td>image.Gray16Color</td> <td>color.Gray16</td></tr>
+-<tr>
+-<td colspan="2"><hr></td>
+-</tr>
+-<tr><td>image.RGBAColorModel</td> <td>color.RGBAModel</td></tr>
+-<tr><td>image.RGBA64ColorModel</td> <td>color.RGBA64Model</td></tr>
+-<tr><td>image.NRGBAColorModel</td> <td>color.NRGBAModel</td></tr>
+-<tr><td>image.NRGBA64ColorModel</td> <td>color.NRGBA64Model</td></tr>
+-<tr><td>image.AlphaColorModel</td> <td>color.AlphaModel</td></tr>
+-<tr><td>image.Alpha16ColorModel</td> <td>color.Alpha16Model</td></tr>
+-<tr><td>image.GrayColorModel</td> <td>color.GrayModel</td></tr>
+-<tr><td>image.Gray16ColorModel</td> <td>color.Gray16Model</td></tr>
+-<tr>
+-<td colspan="2"><hr></td>
+-</tr>
+-<tr><td>ycbcr.RGBToYCbCr</td> <td>color.RGBToYCbCr</td></tr>
+-<tr><td>ycbcr.YCbCrToRGB</td> <td>color.YCbCrToRGB</td></tr>
+-<tr><td>ycbcr.YCbCrColorModel</td> <td>color.YCbCrModel</td></tr>
+-<tr><td>ycbcr.YCbCrColor</td> <td>color.YCbCr</td></tr>
+-<tr><td>ycbcr.YCbCr</td> <td>image.YCbCr</td></tr>
+-<tr>
+-<td colspan="2"><hr></td>
+-</tr>
+-<tr><td>ycbcr.SubsampleRatio444</td> <td>image.YCbCrSubsampleRatio444</td></tr>
+-<tr><td>ycbcr.SubsampleRatio422</td> <td>image.YCbCrSubsampleRatio422</td></tr>
+-<tr><td>ycbcr.SubsampleRatio420</td> <td>image.YCbCrSubsampleRatio420</td></tr>
+-<tr>
+-<td colspan="2"><hr></td>
+-</tr>
+-<tr><td>image.ColorImage</td> <td>image.Uniform</td></tr>
+-</table>
-
-- v.EachInt64(func(index int, val int64) bool {
-- replaced[index] = replacer(index, val)
-- return true
-- })
+-<p>
+-The image package's <code>New</code> functions
+-(<a href="/pkg/image/#NewRGBA"><code>NewRGBA</code></a>,
+-<a href="/pkg/image/#NewRGBA64"><code>NewRGBA64</code></a>, etc.)
+-take an <a href="/pkg/image/#Rectangle"><code>image.Rectangle</code></a> as an argument
+-instead of four integers.
+-</p>
-
-- return &Value{data: replaced}
+-<p>
+-Finally, there are new predefined <code>color.Color</code> variables
+-<a href="/pkg/image/color/#Black"><code>color.Black</code></a>,
+-<a href="/pkg/image/color/#White"><code>color.White</code></a>,
+-<a href="/pkg/image/color/#Opaque"><code>color.Opaque</code></a>
+-and
+-<a href="/pkg/image/color/#Transparent"><code>color.Transparent</code></a>.
+-</p>
-
--}
+-<p>
+-<em>Updating</em>:
+-Running <code>go</code> <code>fix</code> will update almost all code affected by the change.
+-</p>
-
--// CollectInt64 uses the specified collector function to collect a value
--// for each of the int64s in the slice. The data returned will be a
--// []interface{}.
--func (v *Value) CollectInt64(collector func(int, int64) interface{}) *Value {
+-<h3 id="log_syslog">The log/syslog package</h3>
-
-- arr := v.MustInt64Slice()
-- collected := make([]interface{}, len(arr))
+-<p>
+-In Go 1, the <a href="/pkg/log/syslog/#NewLogger"><code>syslog.NewLogger</code></a>
+-function returns an error as well as a <code>log.Logger</code>.
+-</p>
-
-- v.EachInt64(func(index int, val int64) bool {
-- collected[index] = collector(index, val)
-- return true
-- })
+-<p>
+-<em>Updating</em>:
+-What little code is affected will be caught by the compiler and must be updated by hand.
+-</p>
-
-- return &Value{data: collected}
--}
+-<h3 id="mime">The mime package</h3>
-
--/*
-- Uint (uint and []uint)
-- --------------------------------------------------
--*/
+-<p>
+-In Go 1, the <a href="/pkg/mime/#FormatMediaType"><code>FormatMediaType</code></a> function
+-of the <code>mime</code> package has been simplified to make it
+-consistent with
+-<a href="/pkg/mime/#ParseMediaType"><code>ParseMediaType</code></a>.
+-It now takes <code>"text/html"</code> rather than <code>"text"</code> and <code>"html"</code>.
+-</p>
-
--// Uint gets the value as a uint, returns the optionalDefault
--// value or a system default object if the value is the wrong type.
--func (v *Value) Uint(optionalDefault ...uint) uint {
-- if s, ok := v.data.(uint); ok {
-- return s
-- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
-- }
-- return 0
--}
+-<p>
+-<em>Updating</em>:
+-What little code is affected will be caught by the compiler and must be updated by hand.
+-</p>
-
--// MustUint gets the value as a uint.
--//
--// Panics if the object is not a uint.
--func (v *Value) MustUint() uint {
-- return v.data.(uint)
--}
+-<h3 id="net">The net package</h3>
-
--// UintSlice gets the value as a []uint, returns the optionalDefault
--// value or nil if the value is not a []uint.
--func (v *Value) UintSlice(optionalDefault ...[]uint) []uint {
-- if s, ok := v.data.([]uint); ok {
-- return s
-- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
-- }
-- return nil
--}
+-<p>
+-In Go 1, the various <code>SetTimeout</code>,
+-<code>SetReadTimeout</code>, and <code>SetWriteTimeout</code> methods
+-have been replaced with
+-<a href="/pkg/net/#IPConn.SetDeadline"><code>SetDeadline</code></a>,
+-<a href="/pkg/net/#IPConn.SetReadDeadline"><code>SetReadDeadline</code></a>, and
+-<a href="/pkg/net/#IPConn.SetWriteDeadline"><code>SetWriteDeadline</code></a>,
+-respectively. Rather than taking a timeout value in nanoseconds that
+-apply to any activity on the connection, the new methods set an
+-absolute deadline (as a <code>time.Time</code> value) after which
+-reads and writes will time out and no longer block.
+-</p>
-
--// MustUintSlice gets the value as a []uint.
--//
--// Panics if the object is not a []uint.
--func (v *Value) MustUintSlice() []uint {
-- return v.data.([]uint)
--}
+-<p>
+-There are also new functions
+-<a href="/pkg/net/#DialTimeout"><code>net.DialTimeout</code></a>
+-to simplify timing out dialing a network address and
+-<a href="/pkg/net/#ListenMulticastUDP"><code>net.ListenMulticastUDP</code></a>
+-to allow multicast UDP to listen concurrently across multiple listeners.
+-The <code>net.ListenMulticastUDP</code> function replaces the old
+-<code>JoinGroup</code> and <code>LeaveGroup</code> methods.
+-</p>
-
--// IsUint gets whether the object contained is a uint or not.
--func (v *Value) IsUint() bool {
-- _, ok := v.data.(uint)
-- return ok
--}
+-<p>
+-<em>Updating</em>:
+-Code that uses the old methods will fail to compile and must be updated by hand.
+-The semantic change makes it difficult for the fix tool to update automatically.
+-</p>
-
--// IsUintSlice gets whether the object contained is a []uint or not.
--func (v *Value) IsUintSlice() bool {
-- _, ok := v.data.([]uint)
-- return ok
--}
+-<h3 id="os">The os package</h3>
-
--// EachUint calls the specified callback for each object
--// in the []uint.
--//
--// Panics if the object is the wrong type.
--func (v *Value) EachUint(callback func(int, uint) bool) *Value {
+-<p>
+-The <code>Time</code> function has been removed; callers should use
+-the <a href="/pkg/time/#Time"><code>Time</code></a> type from the
+-<code>time</code> package.
+-</p>
-
-- for index, val := range v.MustUintSlice() {
-- carryon := callback(index, val)
-- if carryon == false {
-- break
-- }
-- }
+-<p>
+-The <code>Exec</code> function has been removed; callers should use
+-<code>Exec</code> from the <code>syscall</code> package, where available.
+-</p>
-
-- return v
+-<p>
+-The <code>ShellExpand</code> function has been renamed to <a
+-href="/pkg/os/#ExpandEnv"><code>ExpandEnv</code></a>.
+-</p>
-
--}
+-<p>
+-The <a href="/pkg/os/#NewFile"><code>NewFile</code></a> function
+-now takes a <code>uintptr</code> fd, instead of an <code>int</code>.
+-The <a href="/pkg/os/#File.Fd"><code>Fd</code></a> method on files now
+-also returns a <code>uintptr</code>.
+-</p>
-
--// WhereUint uses the specified decider function to select items
--// from the []uint. The object contained in the result will contain
--// only the selected items.
--func (v *Value) WhereUint(decider func(int, uint) bool) *Value {
+-<p>
+-There are no longer error constants such as <code>EINVAL</code>
+-in the <code>os</code> package, since the set of values varied with
+-the underlying operating system. There are new portable functions like
+-<a href="/pkg/os/#IsPermission"><code>IsPermission</code></a>
+-to test common error properties, plus a few new error values
+-with more Go-like names, such as
+-<a href="/pkg/os/#ErrPermission"><code>ErrPermission</code></a>
+-and
+-<a href="/pkg/os/#ErrNoEnv"><code>ErrNoEnv</code></a>.
+-</p>
-
-- var selected []uint
+-<p>
+-The <code>Getenverror</code> function has been removed. To distinguish
+-between a non-existent environment variable and an empty string,
+-use <a href="/pkg/os/#Environ"><code>os.Environ</code></a> or
+-<a href="/pkg/syscall/#Getenv"><code>syscall.Getenv</code></a>.
+-</p>
-
-- v.EachUint(func(index int, val uint) bool {
-- shouldSelect := decider(index, val)
-- if shouldSelect == false {
-- selected = append(selected, val)
-- }
-- return true
-- })
-
-- return &Value{data: selected}
+-<p>
+-The <a href="/pkg/os/#Process.Wait"><code>Process.Wait</code></a> method has
+-dropped its option argument and the associated constants are gone
+-from the package.
+-Also, the function <code>Wait</code> is gone; only the method of
+-the <code>Process</code> type persists.
+-</p>
-
--}
+-<p>
+-The <code>Waitmsg</code> type returned by
+-<a href="/pkg/os/#Process.Wait"><code>Process.Wait</code></a>
+-has been replaced with a more portable
+-<a href="/pkg/os/#ProcessState"><code>ProcessState</code></a>
+-type with accessor methods to recover information about the
+-process.
+-Because of changes to <code>Wait</code>, the <code>ProcessState</code>
+-value always describes an exited process.
+-Portability concerns simplified the interface in other ways, but the values returned by the
+-<a href="/pkg/os/#ProcessState.Sys"><code>ProcessState.Sys</code></a> and
+-<a href="/pkg/os/#ProcessState.SysUsage"><code>ProcessState.SysUsage</code></a>
+-methods can be type-asserted to underlying system-specific data structures such as
+-<a href="/pkg/syscall/#WaitStatus"><code>syscall.WaitStatus</code></a> and
+-<a href="/pkg/syscall/#Rusage"><code>syscall.Rusage</code></a> on Unix.
+-</p>
-
--// GroupUint uses the specified grouper function to group the items
--// keyed by the return of the grouper. The object contained in the
--// result will contain a map[string][]uint.
--func (v *Value) GroupUint(grouper func(int, uint) string) *Value {
+-<p>
+-<em>Updating</em>:
+-Running <code>go</code> <code>fix</code> will drop a zero argument to <code>Process.Wait</code>.
+-All other changes will be caught by the compiler and must be updated by hand.
+-</p>
-
-- groups := make(map[string][]uint)
+-<h4 id="os_fileinfo">The os.FileInfo type</h4>
-
-- v.EachUint(func(index int, val uint) bool {
-- group := grouper(index, val)
-- if _, ok := groups[group]; !ok {
-- groups[group] = make([]uint, 0)
-- }
-- groups[group] = append(groups[group], val)
-- return true
-- })
+-<p>
+-Go 1 redefines the <a href="/pkg/os/#FileInfo"><code>os.FileInfo</code></a> type,
+-changing it from a struct to an interface:
+-</p>
-
-- return &Value{data: groups}
+-<pre>
+- type FileInfo interface {
+- Name() string // base name of the file
+- Size() int64 // length in bytes
+- Mode() FileMode // file mode bits
+- ModTime() time.Time // modification time
+- IsDir() bool // abbreviation for Mode().IsDir()
+- Sys() interface{} // underlying data source (can return nil)
+- }
+-</pre>
-
--}
+-<p>
+-The file mode information has been moved into a subtype called
+-<a href="/pkg/os/#FileMode"><code>os.FileMode</code></a>,
+-a simple integer type with <code>IsDir</code>, <code>Perm</code>, and <code>String</code>
+-methods.
+-</p>
-
--// ReplaceUint uses the specified function to replace each uints
--// by iterating each item. The data in the returned result will be a
--// []uint containing the replaced items.
--func (v *Value) ReplaceUint(replacer func(int, uint) uint) *Value {
+-<p>
+-The system-specific details of file modes and properties such as (on Unix)
+-i-number have been removed from <code>FileInfo</code> altogether.
+-Instead, each operating system's <code>os</code> package provides an
+-implementation of the <code>FileInfo</code> interface, which
+-has a <code>Sys</code> method that returns the
+-system-specific representation of file metadata.
+-For instance, to discover the i-number of a file on a Unix system, unpack
+-the <code>FileInfo</code> like this:
+-</p>
+-
+-<pre>
+- fi, err := os.Stat("hello.go")
+- if err != nil {
+- log.Fatal(err)
+- }
+- // Check that it's a Unix file.
+- unixStat, ok := fi.Sys().(*syscall.Stat_t)
+- if !ok {
+- log.Fatal("hello.go: not a Unix file")
+- }
+- fmt.Printf("file i-number: %d\n", unixStat.Ino)
+-</pre>
-
-- arr := v.MustUintSlice()
-- replaced := make([]uint, len(arr))
+-<p>
+-Assuming (which is unwise) that <code>"hello.go"</code> is a Unix file,
+-the i-number expression could be contracted to
+-</p>
-
-- v.EachUint(func(index int, val uint) bool {
-- replaced[index] = replacer(index, val)
-- return true
-- })
+-<pre>
+- fi.Sys().(*syscall.Stat_t).Ino
+-</pre>
-
-- return &Value{data: replaced}
+-<p>
+-The vast majority of uses of <code>FileInfo</code> need only the methods
+-of the standard interface.
+-</p>
-
--}
+-<p>
+-The <code>os</code> package no longer contains wrappers for the POSIX errors
+-such as <code>ENOENT</code>.
+-For the few programs that need to verify particular error conditions, there are
+-now the boolean functions
+-<a href="/pkg/os/#IsExist"><code>IsExist</code></a>,
+-<a href="/pkg/os/#IsNotExist"><code>IsNotExist</code></a>
+-and
+-<a href="/pkg/os/#IsPermission"><code>IsPermission</code></a>.
+-</p>
-
--// CollectUint uses the specified collector function to collect a value
--// for each of the uints in the slice. The data returned will be a
--// []interface{}.
--func (v *Value) CollectUint(collector func(int, uint) interface{}) *Value {
+-<pre><!--{{code "/doc/progs/go1.go" `/os\.Open/` `/}/`}}
+---> f, err := os.OpenFile(name, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0600)
+- if os.IsExist(err) {
+- log.Printf("%s already exists", name)
+- }</pre>
-
-- arr := v.MustUintSlice()
-- collected := make([]interface{}, len(arr))
+-<p>
+-<em>Updating</em>:
+-Running <code>go</code> <code>fix</code> will update code that uses the old equivalent of the current <code>os.FileInfo</code>
+-and <code>os.FileMode</code> API.
+-Code that needs system-specific file details will need to be updated by hand.
+-Code that uses the old POSIX error values from the <code>os</code> package
+-will fail to compile and will also need to be updated by hand.
+-</p>
-
-- v.EachUint(func(index int, val uint) bool {
-- collected[index] = collector(index, val)
-- return true
-- })
+-<h3 id="os_signal">The os/signal package</h3>
-
-- return &Value{data: collected}
--}
+-<p>
+-The <code>os/signal</code> package in Go 1 replaces the
+-<code>Incoming</code> function, which returned a channel
+-that received all incoming signals,
+-with the selective <code>Notify</code> function, which asks
+-for delivery of specific signals on an existing channel.
+-</p>
-
--/*
-- Uint8 (uint8 and []uint8)
-- --------------------------------------------------
--*/
+-<p>
+-<em>Updating</em>:
+-Code must be updated by hand.
+-A literal translation of
+-</p>
+-<pre>
+-c := signal.Incoming()
+-</pre>
+-<p>
+-is
+-</p>
+-<pre>
+-c := make(chan os.Signal)
+-signal.Notify(c) // ask for all signals
+-</pre>
+-<p>
+-but most code should list the specific signals it wants to handle instead:
+-</p>
+-<pre>
+-c := make(chan os.Signal)
+-signal.Notify(c, syscall.SIGHUP, syscall.SIGQUIT)
+-</pre>
-
--// Uint8 gets the value as a uint8, returns the optionalDefault
--// value or a system default object if the value is the wrong type.
--func (v *Value) Uint8(optionalDefault ...uint8) uint8 {
-- if s, ok := v.data.(uint8); ok {
-- return s
-- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
-- }
-- return 0
--}
+-<h3 id="path_filepath">The path/filepath package</h3>
-
--// MustUint8 gets the value as a uint8.
--//
--// Panics if the object is not a uint8.
--func (v *Value) MustUint8() uint8 {
-- return v.data.(uint8)
--}
+-<p>
+-In Go 1, the <a href="/pkg/path/filepath/#Walk"><code>Walk</code></a> function of the
+-<code>path/filepath</code> package
+-has been changed to take a function value of type
+-<a href="/pkg/path/filepath/#WalkFunc"><code>WalkFunc</code></a>
+-instead of a <code>Visitor</code> interface value.
+-<code>WalkFunc</code> unifies the handling of both files and directories.
+-</p>
-
--// Uint8Slice gets the value as a []uint8, returns the optionalDefault
--// value or nil if the value is not a []uint8.
--func (v *Value) Uint8Slice(optionalDefault ...[]uint8) []uint8 {
-- if s, ok := v.data.([]uint8); ok {
-- return s
-- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
-- }
-- return nil
--}
+-<pre>
+- type WalkFunc func(path string, info os.FileInfo, err error) error
+-</pre>
-
--// MustUint8Slice gets the value as a []uint8.
--//
--// Panics if the object is not a []uint8.
--func (v *Value) MustUint8Slice() []uint8 {
-- return v.data.([]uint8)
--}
+-<p>
+-The <code>WalkFunc</code> function will be called even for files or directories that could not be opened;
+-in such cases the error argument will describe the failure.
+-If a directory's contents are to be skipped,
+-the function should return the value <a href="/pkg/path/filepath/#variables"><code>filepath.SkipDir</code></a>
+-</p>
-
--// IsUint8 gets whether the object contained is a uint8 or not.
--func (v *Value) IsUint8() bool {
-- _, ok := v.data.(uint8)
-- return ok
--}
+-<pre><!--{{code "/doc/progs/go1.go" `/STARTWALK/` `/ENDWALK/`}}
+---> markFn := func(path string, info os.FileInfo, err error) error {
+- if path == "pictures" { <span class="comment">// Will skip walking of directory pictures and its contents.</span>
+- return filepath.SkipDir
+- }
+- if err != nil {
+- return err
+- }
+- log.Println(path)
+- return nil
+- }
+- err := filepath.Walk(".", markFn)
+- if err != nil {
+- log.Fatal(err)
+- }</pre>
-
--// IsUint8Slice gets whether the object contained is a []uint8 or not.
--func (v *Value) IsUint8Slice() bool {
-- _, ok := v.data.([]uint8)
-- return ok
--}
+-<p>
+-<em>Updating</em>:
+-The change simplifies most code but has subtle consequences, so affected programs
+-will need to be updated by hand.
+-The compiler will catch code using the old interface.
+-</p>
-
--// EachUint8 calls the specified callback for each object
--// in the []uint8.
--//
--// Panics if the object is the wrong type.
--func (v *Value) EachUint8(callback func(int, uint8) bool) *Value {
+-<h3 id="regexp">The regexp package</h3>
-
-- for index, val := range v.MustUint8Slice() {
-- carryon := callback(index, val)
-- if carryon == false {
-- break
-- }
-- }
+-<p>
+-The <a href="/pkg/regexp/"><code>regexp</code></a> package has been rewritten.
+-It has the same interface but the specification of the regular expressions
+-it supports has changed from the old "egrep" form to that of
+-<a href="http://code.google.com/p/re2/">RE2</a>.
+-</p>
-
-- return v
+-<p>
+-<em>Updating</em>:
+-Code that uses the package should have its regular expressions checked by hand.
+-</p>
-
--}
+-<h3 id="runtime">The runtime package</h3>
-
--// WhereUint8 uses the specified decider function to select items
--// from the []uint8. The object contained in the result will contain
--// only the selected items.
--func (v *Value) WhereUint8(decider func(int, uint8) bool) *Value {
+-<p>
+-In Go 1, much of the API exported by package
+-<code>runtime</code> has been removed in favor of
+-functionality provided by other packages.
+-Code using the <code>runtime.Type</code> interface
+-or its specific concrete type implementations should
+-now use package <a href="/pkg/reflect/"><code>reflect</code></a>.
+-Code using <code>runtime.Semacquire</code> or <code>runtime.Semrelease</code>
+-should use channels or the abstractions in package <a href="/pkg/sync/"><code>sync</code></a>.
+-The <code>runtime.Alloc</code>, <code>runtime.Free</code>,
+-and <code>runtime.Lookup</code> functions, an unsafe API created for
+-debugging the memory allocator, have no replacement.
+-</p>
-
-- var selected []uint8
+-<p>
+-Before, <code>runtime.MemStats</code> was a global variable holding
+-statistics about memory allocation, and calls to <code>runtime.UpdateMemStats</code>
+-ensured that it was up to date.
+-In Go 1, <code>runtime.MemStats</code> is a struct type, and code should use
+-<a href="/pkg/runtime/#ReadMemStats"><code>runtime.ReadMemStats</code></a>
+-to obtain the current statistics.
+-</p>
-
-- v.EachUint8(func(index int, val uint8) bool {
-- shouldSelect := decider(index, val)
-- if shouldSelect == false {
-- selected = append(selected, val)
-- }
-- return true
-- })
+-<p>
+-The package adds a new function,
+-<a href="/pkg/runtime/#NumCPU"><code>runtime.NumCPU</code></a>, that returns the number of CPUs available
+-for parallel execution, as reported by the operating system kernel.
+-Its value can inform the setting of <code>GOMAXPROCS</code>.
+-The <code>runtime.Cgocalls</code> and <code>runtime.Goroutines</code> functions
+-have been renamed to <code>runtime.NumCgoCall</code> and <code>runtime.NumGoroutine</code>.
+-</p>
-
-- return &Value{data: selected}
+-<p>
+-<em>Updating</em>:
+-Running <code>go</code> <code>fix</code> will update code for the function renamings.
+-Other code will need to be updated by hand.
+-</p>
-
--}
+-<h3 id="strconv">The strconv package</h3>
-
--// GroupUint8 uses the specified grouper function to group the items
--// keyed by the return of the grouper. The object contained in the
--// result will contain a map[string][]uint8.
--func (v *Value) GroupUint8(grouper func(int, uint8) string) *Value {
+-<p>
+-In Go 1, the
+-<a href="/pkg/strconv/"><code>strconv</code></a>
+-package has been significantly reworked to make it more Go-like and less C-like,
+-although <code>Atoi</code> lives on (it's similar to
+-<code>int(ParseInt(x, 10, 0))</code>, as does
+-<code>Itoa(x)</code> (<code>FormatInt(int64(x), 10)</code>).
+-There are also new variants of some of the functions that append to byte slices rather than
+-return strings, to allow control over allocation.
+-</p>
-
-- groups := make(map[string][]uint8)
+-<p>
+-This table summarizes the renamings; see the
+-<a href="/pkg/strconv/">package documentation</a>
+-for full details.
+-</p>
-
-- v.EachUint8(func(index int, val uint8) bool {
-- group := grouper(index, val)
-- if _, ok := groups[group]; !ok {
-- groups[group] = make([]uint8, 0)
-- }
-- groups[group] = append(groups[group], val)
-- return true
-- })
+-<table class="codetable" frame="border" summary="strconv renames">
+-<colgroup align="left" width="50%"></colgroup>
+-<colgroup align="left" width="50%"></colgroup>
+-<tr>
+-<th align="left">Old call</th>
+-<th align="left">New call</th>
+-</tr>
+-<tr>
+-<td colspan="2"><hr></td>
+-</tr>
+-<tr><td>Atob(x)</td> <td>ParseBool(x)</td></tr>
+-<tr>
+-<td colspan="2"><hr></td>
+-</tr>
+-<tr><td>Atof32(x)</td> <td>ParseFloat(x, 32)§</td></tr>
+-<tr><td>Atof64(x)</td> <td>ParseFloat(x, 64)</td></tr>
+-<tr><td>AtofN(x, n)</td> <td>ParseFloat(x, n)</td></tr>
+-<tr>
+-<td colspan="2"><hr></td>
+-</tr>
+-<tr><td>Atoi(x)</td> <td>Atoi(x)</td></tr>
+-<tr><td>Atoi(x)</td> <td>ParseInt(x, 10, 0)§</td></tr>
+-<tr><td>Atoi64(x)</td> <td>ParseInt(x, 10, 64)</td></tr>
+-<tr>
+-<td colspan="2"><hr></td>
+-</tr>
+-<tr><td>Atoui(x)</td> <td>ParseUint(x, 10, 0)§</td></tr>
+-<tr><td>Atoui64(x)</td> <td>ParseUint(x, 10, 64)</td></tr>
+-<tr>
+-<td colspan="2"><hr></td>
+-</tr>
+-<tr><td>Btoi64(x, b)</td> <td>ParseInt(x, b, 64)</td></tr>
+-<tr><td>Btoui64(x, b)</td> <td>ParseUint(x, b, 64)</td></tr>
+-<tr>
+-<td colspan="2"><hr></td>
+-</tr>
+-<tr><td>Btoa(x)</td> <td>FormatBool(x)</td></tr>
+-<tr>
+-<td colspan="2"><hr></td>
+-</tr>
+-<tr><td>Ftoa32(x, f, p)</td> <td>FormatFloat(float64(x), f, p, 32)</td></tr>
+-<tr><td>Ftoa64(x, f, p)</td> <td>FormatFloat(x, f, p, 64)</td></tr>
+-<tr><td>FtoaN(x, f, p, n)</td> <td>FormatFloat(x, f, p, n)</td></tr>
+-<tr>
+-<td colspan="2"><hr></td>
+-</tr>
+-<tr><td>Itoa(x)</td> <td>Itoa(x)</td></tr>
+-<tr><td>Itoa(x)</td> <td>FormatInt(int64(x), 10)</td></tr>
+-<tr><td>Itoa64(x)</td> <td>FormatInt(x, 10)</td></tr>
+-<tr>
+-<td colspan="2"><hr></td>
+-</tr>
+-<tr><td>Itob(x, b)</td> <td>FormatInt(int64(x), b)</td></tr>
+-<tr><td>Itob64(x, b)</td> <td>FormatInt(x, b)</td></tr>
+-<tr>
+-<td colspan="2"><hr></td>
+-</tr>
+-<tr><td>Uitoa(x)</td> <td>FormatUint(uint64(x), 10)</td></tr>
+-<tr><td>Uitoa64(x)</td> <td>FormatUint(x, 10)</td></tr>
+-<tr>
+-<td colspan="2"><hr></td>
+-</tr>
+-<tr><td>Uitob(x, b)</td> <td>FormatUint(uint64(x), b)</td></tr>
+-<tr><td>Uitob64(x, b)</td> <td>FormatUint(x, b)</td></tr>
+-</table>
+-
+-<p>
+-<em>Updating</em>:
+-Running <code>go</code> <code>fix</code> will update almost all code affected by the change.
+-<br>
+-§ <code>Atoi</code> persists but <code>Atoui</code> and <code>Atof32</code> do not, so
+-they may require
+-a cast that must be added by hand; the <code>go</code> <code>fix</code> tool will warn about it.
+-</p>
-
-- return &Value{data: groups}
-
--}
+-<h3 id="templates">The template packages</h3>
-
--// ReplaceUint8 uses the specified function to replace each uint8s
--// by iterating each item. The data in the returned result will be a
--// []uint8 containing the replaced items.
--func (v *Value) ReplaceUint8(replacer func(int, uint8) uint8) *Value {
+-<p>
+-The <code>template</code> and <code>exp/template/html</code> packages have moved to
+-<a href="/pkg/text/template/"><code>text/template</code></a> and
+-<a href="/pkg/html/template/"><code>html/template</code></a>.
+-More significant, the interface to these packages has been simplified.
+-The template language is the same, but the concept of "template set" is gone
+-and the functions and methods of the packages have changed accordingly,
+-often by elimination.
+-</p>
-
-- arr := v.MustUint8Slice()
-- replaced := make([]uint8, len(arr))
+-<p>
+-Instead of sets, a <code>Template</code> object
+-may contain multiple named template definitions,
+-in effect constructing
+-name spaces for template invocation.
+-A template can invoke any other template associated with it, but only those
+-templates associated with it.
+-The simplest way to associate templates is to parse them together, something
+-made easier with the new structure of the packages.
+-</p>
-
-- v.EachUint8(func(index int, val uint8) bool {
-- replaced[index] = replacer(index, val)
-- return true
-- })
+-<p>
+-<em>Updating</em>:
+-The imports will be updated by fix tool.
+-Single-template uses will be otherwise be largely unaffected.
+-Code that uses multiple templates in concert will need to be updated by hand.
+-The <a href="/pkg/text/template/#examples">examples</a> in
+-the documentation for <code>text/template</code> can provide guidance.
+-</p>
-
-- return &Value{data: replaced}
+-<h3 id="testing">The testing package</h3>
-
--}
+-<p>
+-The testing package has a type, <code>B</code>, passed as an argument to benchmark functions.
+-In Go 1, <code>B</code> has new methods, analogous to those of <code>T</code>, enabling
+-logging and failure reporting.
+-</p>
-
--// CollectUint8 uses the specified collector function to collect a value
--// for each of the uint8s in the slice. The data returned will be a
--// []interface{}.
--func (v *Value) CollectUint8(collector func(int, uint8) interface{}) *Value {
+-<pre><!--{{code "/doc/progs/go1.go" `/func.*Benchmark/` `/^}/`}}
+--->func BenchmarkSprintf(b *testing.B) {
+- <span class="comment">// Verify correctness before running benchmark.</span>
+- b.StopTimer()
+- got := fmt.Sprintf("%x", 23)
+- const expect = "17"
+- if expect != got {
+- b.Fatalf("expected %q; got %q", expect, got)
+- }
+- b.StartTimer()
+- for i := 0; i < b.N; i++ {
+- fmt.Sprintf("%x", 23)
+- }
+-}</pre>
-
-- arr := v.MustUint8Slice()
-- collected := make([]interface{}, len(arr))
+-<p>
+-<em>Updating</em>:
+-Existing code is unaffected, although benchmarks that use <code>println</code>
+-or <code>panic</code> should be updated to use the new methods.
+-</p>
-
-- v.EachUint8(func(index int, val uint8) bool {
-- collected[index] = collector(index, val)
-- return true
-- })
+-<h3 id="testing_script">The testing/script package</h3>
-
-- return &Value{data: collected}
--}
+-<p>
+-The testing/script package has been deleted. It was a dreg.
+-</p>
-
--/*
-- Uint16 (uint16 and []uint16)
-- --------------------------------------------------
--*/
+-<p>
+-<em>Updating</em>:
+-No code is likely to be affected.
+-</p>
-
--// Uint16 gets the value as a uint16, returns the optionalDefault
--// value or a system default object if the value is the wrong type.
--func (v *Value) Uint16(optionalDefault ...uint16) uint16 {
-- if s, ok := v.data.(uint16); ok {
-- return s
-- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
-- }
-- return 0
--}
+-<h3 id="unsafe">The unsafe package</h3>
-
--// MustUint16 gets the value as a uint16.
--//
--// Panics if the object is not a uint16.
--func (v *Value) MustUint16() uint16 {
-- return v.data.(uint16)
--}
+-<p>
+-In Go 1, the functions
+-<code>unsafe.Typeof</code>, <code>unsafe.Reflect</code>,
+-<code>unsafe.Unreflect</code>, <code>unsafe.New</code>, and
+-<code>unsafe.NewArray</code> have been removed;
+-they duplicated safer functionality provided by
+-package <a href="/pkg/reflect/"><code>reflect</code></a>.
+-</p>
-
--// Uint16Slice gets the value as a []uint16, returns the optionalDefault
--// value or nil if the value is not a []uint16.
--func (v *Value) Uint16Slice(optionalDefault ...[]uint16) []uint16 {
-- if s, ok := v.data.([]uint16); ok {
-- return s
-- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
-- }
-- return nil
--}
+-<p>
+-<em>Updating</em>:
+-Code using these functions must be rewritten to use
+-package <a href="/pkg/reflect/"><code>reflect</code></a>.
+-The changes to <a href="http://code.google.com/p/go/source/detail?r=2646dc956207">encoding/gob</a> and the <a href="http://code.google.com/p/goprotobuf/source/detail?r=5340ad310031">protocol buffer library</a>
+-may be helpful as examples.
+-</p>
-
--// MustUint16Slice gets the value as a []uint16.
--//
--// Panics if the object is not a []uint16.
--func (v *Value) MustUint16Slice() []uint16 {
-- return v.data.([]uint16)
--}
+-<h3 id="url">The url package</h3>
-
--// IsUint16 gets whether the object contained is a uint16 or not.
--func (v *Value) IsUint16() bool {
-- _, ok := v.data.(uint16)
-- return ok
--}
+-<p>
+-In Go 1 several fields from the <a href="/pkg/net/url/#URL"><code>url.URL</code></a> type
+-were removed or replaced.
+-</p>
-
--// IsUint16Slice gets whether the object contained is a []uint16 or not.
--func (v *Value) IsUint16Slice() bool {
-- _, ok := v.data.([]uint16)
-- return ok
--}
+-<p>
+-The <a href="/pkg/net/url/#URL.String"><code>String</code></a> method now
+-predictably rebuilds an encoded URL string using all of <code>URL</code>'s
+-fields as necessary. The resulting string will also no longer have
+-passwords escaped.
+-</p>
+-
+-<p>
+-The <code>Raw</code> field has been removed. In most cases the <code>String</code>
+-method may be used in its place.
+-</p>
-
--// EachUint16 calls the specified callback for each object
--// in the []uint16.
--//
--// Panics if the object is the wrong type.
--func (v *Value) EachUint16(callback func(int, uint16) bool) *Value {
+-<p>
+-The old <code>RawUserinfo</code> field is replaced by the <code>User</code>
+-field, of type <a href="/pkg/net/url/#Userinfo"><code>*net.Userinfo</code></a>.
+-Values of this type may be created using the new <a href="/pkg/net/url/#User"><code>net.User</code></a>
+-and <a href="/pkg/net/url/#UserPassword"><code>net.UserPassword</code></a>
+-functions. The <code>EscapeUserinfo</code> and <code>UnescapeUserinfo</code>
+-functions are also gone.
+-</p>
-
-- for index, val := range v.MustUint16Slice() {
-- carryon := callback(index, val)
-- if carryon == false {
-- break
-- }
-- }
+-<p>
+-The <code>RawAuthority</code> field has been removed. The same information is
+-available in the <code>Host</code> and <code>User</code> fields.
+-</p>
-
-- return v
+-<p>
+-The <code>RawPath</code> field and the <code>EncodedPath</code> method have
+-been removed. The path information in rooted URLs (with a slash following the
+-schema) is now available only in decoded form in the <code>Path</code> field.
+-Occasionally, the encoded data may be required to obtain information that
+-was lost in the decoding process. These cases must be handled by accessing
+-the data the URL was built from.
+-</p>
-
--}
+-<p>
+-URLs with non-rooted paths, such as <code>"mailto:dev at golang.org?subject=Hi"</code>,
+-are also handled differently. The <code>OpaquePath</code> boolean field has been
+-removed and a new <code>Opaque</code> string field introduced to hold the encoded
+-path for such URLs. In Go 1, the cited URL parses as:
+-</p>
-
--// WhereUint16 uses the specified decider function to select items
--// from the []uint16. The object contained in the result will contain
--// only the selected items.
--func (v *Value) WhereUint16(decider func(int, uint16) bool) *Value {
+-<pre>
+- URL{
+- Scheme: "mailto",
+- Opaque: "dev at golang.org",
+- RawQuery: "subject=Hi",
+- }
+-</pre>
-
-- var selected []uint16
+-<p>
+-A new <a href="/pkg/net/url/#URL.RequestURI"><code>RequestURI</code></a> method was
+-added to <code>URL</code>.
+-</p>
-
-- v.EachUint16(func(index int, val uint16) bool {
-- shouldSelect := decider(index, val)
-- if shouldSelect == false {
-- selected = append(selected, val)
-- }
-- return true
-- })
+-<p>
+-The <code>ParseWithReference</code> function has been renamed to <code>ParseWithFragment</code>.
+-</p>
-
-- return &Value{data: selected}
+-<p>
+-<em>Updating</em>:
+-Code that uses the old fields will fail to compile and must be updated by hand.
+-The semantic changes make it difficult for the fix tool to update automatically.
+-</p>
-
--}
+-<h2 id="cmd_go">The go command</h2>
-
--// GroupUint16 uses the specified grouper function to group the items
--// keyed by the return of the grouper. The object contained in the
--// result will contain a map[string][]uint16.
--func (v *Value) GroupUint16(grouper func(int, uint16) string) *Value {
+-<p>
+-Go 1 introduces the <a href="/cmd/go/">go command</a>, a tool for fetching,
+-building, and installing Go packages and commands. The <code>go</code> command
+-does away with makefiles, instead using Go source code to find dependencies and
+-determine build conditions. Most existing Go programs will no longer require
+-makefiles to be built.
+-</p>
-
-- groups := make(map[string][]uint16)
+-<p>
+-See <a href="/doc/code.html">How to Write Go Code</a> for a primer on the
+-<code>go</code> command and the <a href="/cmd/go/">go command documentation</a>
+-for the full details.
+-</p>
-
-- v.EachUint16(func(index int, val uint16) bool {
-- group := grouper(index, val)
-- if _, ok := groups[group]; !ok {
-- groups[group] = make([]uint16, 0)
-- }
-- groups[group] = append(groups[group], val)
-- return true
-- })
+-<p>
+-<em>Updating</em>:
+-Projects that depend on the Go project's old makefile-based build
+-infrastructure (<code>Make.pkg</code>, <code>Make.cmd</code>, and so on) should
+-switch to using the <code>go</code> command for building Go code and, if
+-necessary, rewrite their makefiles to perform any auxiliary build tasks.
+-</p>
-
-- return &Value{data: groups}
+-<h2 id="cmd_cgo">The cgo command</h2>
-
--}
+-<p>
+-In Go 1, the <a href="/cmd/cgo">cgo command</a>
+-uses a different <code>_cgo_export.h</code>
+-file, which is generated for packages containing <code>//export</code> lines.
+-The <code>_cgo_export.h</code> file now begins with the C preamble comment,
+-so that exported function definitions can use types defined there.
+-This has the effect of compiling the preamble multiple times, so a
+-package using <code>//export</code> must not put function definitions
+-or variable initializations in the C preamble.
+-</p>
-
--// ReplaceUint16 uses the specified function to replace each uint16s
--// by iterating each item. The data in the returned result will be a
--// []uint16 containing the replaced items.
--func (v *Value) ReplaceUint16(replacer func(int, uint16) uint16) *Value {
+-<h2 id="releases">Packaged releases</h2>
-
-- arr := v.MustUint16Slice()
-- replaced := make([]uint16, len(arr))
+-<p>
+-One of the most significant changes associated with Go 1 is the availability
+-of prepackaged, downloadable distributions.
+-They are available for many combinations of architecture and operating system
+-(including Windows) and the list will grow.
+-Installation details are described on the
+-<a href="/doc/install">Getting Started</a> page, while
+-the distributions themselves are listed on the
+-<a href="http://code.google.com/p/go/downloads/list">downloads page</a>.
-
-- v.EachUint16(func(index int, val uint16) bool {
-- replaced[index] = replacer(index, val)
-- return true
-- })
-
-- return &Value{data: replaced}
+-</div>
-
--}
+-<div id="footer">
+-Build version go1.0.1.<br>
+-Except as <a href="http://code.google.com/policies.html#restrictions">noted</a>,
+-the content of this page is licensed under the
+-Creative Commons Attribution 3.0 License,
+-and code is licensed under a <a href="/LICENSE">BSD license</a>.<br>
+-<a href="/doc/tos.html">Terms of Service</a> |
+-<a href="http://www.google.com/intl/en/privacy/privacy-policy.html">Privacy Policy</a>
+-</div>
-
--// CollectUint16 uses the specified collector function to collect a value
--// for each of the uint16s in the slice. The data returned will be a
--// []interface{}.
--func (v *Value) CollectUint16(collector func(int, uint16) interface{}) *Value {
+-<script type="text/javascript">
+-(function() {
+- var ga = document.createElement("script"); ga.type = "text/javascript"; ga.async = true;
+- ga.src = ("https:" == document.location.protocol ? "https://ssl" : "http://www") + ".google-analytics.com/ga.js";
+- var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(ga, s);
+-})();
+-</script>
+-</body>
+-<script type="text/javascript">
+- (function() {
+- var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
+- po.src = 'https://apis.google.com/js/plusone.js';
+- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
+- })();
+-</script>
+-</html>
-
-- arr := v.MustUint16Slice()
-- collected := make([]interface{}, len(arr))
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/README b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/README
+deleted file mode 100644
+index 9b4c2d8..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/README
++++ /dev/null
+@@ -1,28 +0,0 @@
+-The *.dat files in this directory are copied from The WebKit Open Source
+-Project, specifically $WEBKITROOT/LayoutTests/html5lib/resources.
+-WebKit is licensed under a BSD style license.
+-http://webkit.org/coding/bsd-license.html says:
-
-- v.EachUint16(func(index int, val uint16) bool {
-- collected[index] = collector(index, val)
-- return true
-- })
+-Copyright (C) 2009 Apple Inc. All rights reserved.
-
-- return &Value{data: collected}
--}
+-Redistribution and use in source and binary forms, with or without
+-modification, are permitted provided that the following conditions are met:
-
--/*
-- Uint32 (uint32 and []uint32)
-- --------------------------------------------------
--*/
+-1. Redistributions of source code must retain the above copyright notice,
+-this list of conditions and the following disclaimer.
-
--// Uint32 gets the value as a uint32, returns the optionalDefault
--// value or a system default object if the value is the wrong type.
--func (v *Value) Uint32(optionalDefault ...uint32) uint32 {
-- if s, ok := v.data.(uint32); ok {
-- return s
-- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
-- }
-- return 0
--}
+-2. Redistributions in binary form must reproduce the above copyright notice,
+-this list of conditions and the following disclaimer in the documentation
+-and/or other materials provided with the distribution.
-
--// MustUint32 gets the value as a uint32.
--//
--// Panics if the object is not a uint32.
--func (v *Value) MustUint32() uint32 {
-- return v.data.(uint32)
--}
+-THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS "AS IS" AND ANY
+-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+-DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
--// Uint32Slice gets the value as a []uint32, returns the optionalDefault
--// value or nil if the value is not a []uint32.
--func (v *Value) Uint32Slice(optionalDefault ...[]uint32) []uint32 {
-- if s, ok := v.data.([]uint32); ok {
-- return s
-- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
-- }
-- return nil
--}
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/adoption01.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/adoption01.dat
+deleted file mode 100644
+index 787e1b0..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/adoption01.dat
++++ /dev/null
+@@ -1,194 +0,0 @@
+-#data
+-<a><p></a></p>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <a>
+-| <p>
+-| <a>
-
--// MustUint32Slice gets the value as a []uint32.
--//
--// Panics if the object is not a []uint32.
--func (v *Value) MustUint32Slice() []uint32 {
-- return v.data.([]uint32)
--}
+-#data
+-<a>1<p>2</a>3</p>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <a>
+-| "1"
+-| <p>
+-| <a>
+-| "2"
+-| "3"
-
--// IsUint32 gets whether the object contained is a uint32 or not.
--func (v *Value) IsUint32() bool {
-- _, ok := v.data.(uint32)
-- return ok
--}
+-#data
+-<a>1<button>2</a>3</button>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <a>
+-| "1"
+-| <button>
+-| <a>
+-| "2"
+-| "3"
-
--// IsUint32Slice gets whether the object contained is a []uint32 or not.
--func (v *Value) IsUint32Slice() bool {
-- _, ok := v.data.([]uint32)
-- return ok
--}
+-#data
+-<a>1<b>2</a>3</b>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <a>
+-| "1"
+-| <b>
+-| "2"
+-| <b>
+-| "3"
-
--// EachUint32 calls the specified callback for each object
--// in the []uint32.
--//
--// Panics if the object is the wrong type.
--func (v *Value) EachUint32(callback func(int, uint32) bool) *Value {
+-#data
+-<a>1<div>2<div>3</a>4</div>5</div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <a>
+-| "1"
+-| <div>
+-| <a>
+-| "2"
+-| <div>
+-| <a>
+-| "3"
+-| "4"
+-| "5"
-
-- for index, val := range v.MustUint32Slice() {
-- carryon := callback(index, val)
-- if carryon == false {
-- break
-- }
-- }
+-#data
+-<table><a>1<p>2</a>3</p>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <a>
+-| "1"
+-| <p>
+-| <a>
+-| "2"
+-| "3"
+-| <table>
-
-- return v
+-#data
+-<b><b><a><p></a>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <b>
+-| <b>
+-| <a>
+-| <p>
+-| <a>
-
--}
+-#data
+-<b><a><b><p></a>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <b>
+-| <a>
+-| <b>
+-| <b>
+-| <p>
+-| <a>
-
--// WhereUint32 uses the specified decider function to select items
--// from the []uint32. The object contained in the result will contain
--// only the selected items.
--func (v *Value) WhereUint32(decider func(int, uint32) bool) *Value {
+-#data
+-<a><b><b><p></a>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <a>
+-| <b>
+-| <b>
+-| <b>
+-| <b>
+-| <p>
+-| <a>
-
-- var selected []uint32
+-#data
+-<p>1<s id="A">2<b id="B">3</p>4</s>5</b>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| "1"
+-| <s>
+-| id="A"
+-| "2"
+-| <b>
+-| id="B"
+-| "3"
+-| <s>
+-| id="A"
+-| <b>
+-| id="B"
+-| "4"
+-| <b>
+-| id="B"
+-| "5"
-
-- v.EachUint32(func(index int, val uint32) bool {
-- shouldSelect := decider(index, val)
-- if shouldSelect == false {
-- selected = append(selected, val)
-- }
-- return true
-- })
+-#data
+-<table><a>1<td>2</td>3</table>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <a>
+-| "1"
+-| <a>
+-| "3"
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| "2"
-
-- return &Value{data: selected}
+-#data
+-<table>A<td>B</td>C</table>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "AC"
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| "B"
-
--}
+-#data
+-<a><svg><tr><input></a>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <a>
+-| <svg svg>
+-| <svg tr>
+-| <svg input>
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/adoption02.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/adoption02.dat
+deleted file mode 100644
+index d18151b..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/adoption02.dat
++++ /dev/null
+@@ -1,31 +0,0 @@
+-#data
+-<b>1<i>2<p>3</b>4
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <b>
+-| "1"
+-| <i>
+-| "2"
+-| <i>
+-| <p>
+-| <b>
+-| "3"
+-| "4"
-
--// GroupUint32 uses the specified grouper function to group the items
--// keyed by the return of the grouper. The object contained in the
--// result will contain a map[string][]uint32.
--func (v *Value) GroupUint32(grouper func(int, uint32) string) *Value {
+-#data
+-<a><div><style></style><address><a>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <a>
+-| <div>
+-| <a>
+-| <style>
+-| <address>
+-| <a>
+-| <a>
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/comments01.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/comments01.dat
+deleted file mode 100644
+index 44f1876..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/comments01.dat
++++ /dev/null
+@@ -1,135 +0,0 @@
+-#data
+-FOO<!-- BAR -->BAZ
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO"
+-| <!-- BAR -->
+-| "BAZ"
-
-- groups := make(map[string][]uint32)
+-#data
+-FOO<!-- BAR --!>BAZ
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO"
+-| <!-- BAR -->
+-| "BAZ"
-
-- v.EachUint32(func(index int, val uint32) bool {
-- group := grouper(index, val)
-- if _, ok := groups[group]; !ok {
-- groups[group] = make([]uint32, 0)
-- }
-- groups[group] = append(groups[group], val)
-- return true
-- })
+-#data
+-FOO<!-- BAR -- >BAZ
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO"
+-| <!-- BAR -- >BAZ -->
-
-- return &Value{data: groups}
+-#data
+-FOO<!-- BAR -- <QUX> -- MUX -->BAZ
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO"
+-| <!-- BAR -- <QUX> -- MUX -->
+-| "BAZ"
-
--}
+-#data
+-FOO<!-- BAR -- <QUX> -- MUX --!>BAZ
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO"
+-| <!-- BAR -- <QUX> -- MUX -->
+-| "BAZ"
-
--// ReplaceUint32 uses the specified function to replace each uint32s
--// by iterating each item. The data in the returned result will be a
--// []uint32 containing the replaced items.
--func (v *Value) ReplaceUint32(replacer func(int, uint32) uint32) *Value {
+-#data
+-FOO<!-- BAR -- <QUX> -- MUX -- >BAZ
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO"
+-| <!-- BAR -- <QUX> -- MUX -- >BAZ -->
-
-- arr := v.MustUint32Slice()
-- replaced := make([]uint32, len(arr))
+-#data
+-FOO<!---->BAZ
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO"
+-| <!-- -->
+-| "BAZ"
-
-- v.EachUint32(func(index int, val uint32) bool {
-- replaced[index] = replacer(index, val)
-- return true
-- })
+-#data
+-FOO<!--->BAZ
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO"
+-| <!-- -->
+-| "BAZ"
-
-- return &Value{data: replaced}
+-#data
+-FOO<!-->BAZ
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO"
+-| <!-- -->
+-| "BAZ"
-
--}
+-#data
+-<?xml version="1.0">Hi
+-#errors
+-#document
+-| <!-- ?xml version="1.0" -->
+-| <html>
+-| <head>
+-| <body>
+-| "Hi"
-
--// CollectUint32 uses the specified collector function to collect a value
--// for each of the uint32s in the slice. The data returned will be a
--// []interface{}.
--func (v *Value) CollectUint32(collector func(int, uint32) interface{}) *Value {
+-#data
+-<?xml version="1.0">
+-#errors
+-#document
+-| <!-- ?xml version="1.0" -->
+-| <html>
+-| <head>
+-| <body>
-
-- arr := v.MustUint32Slice()
-- collected := make([]interface{}, len(arr))
+-#data
+-<?xml version
+-#errors
+-#document
+-| <!-- ?xml version -->
+-| <html>
+-| <head>
+-| <body>
-
-- v.EachUint32(func(index int, val uint32) bool {
-- collected[index] = collector(index, val)
-- return true
-- })
+-#data
+-FOO<!----->BAZ
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO"
+-| <!-- - -->
+-| "BAZ"
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/doctype01.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/doctype01.dat
+deleted file mode 100644
+index ae45732..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/doctype01.dat
++++ /dev/null
+@@ -1,370 +0,0 @@
+-#data
+-<!DOCTYPE html>Hello
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| "Hello"
-
-- return &Value{data: collected}
--}
+-#data
+-<!dOctYpE HtMl>Hello
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| "Hello"
-
--/*
-- Uint64 (uint64 and []uint64)
-- --------------------------------------------------
--*/
+-#data
+-<!DOCTYPEhtml>Hello
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| "Hello"
-
--// Uint64 gets the value as a uint64, returns the optionalDefault
--// value or a system default object if the value is the wrong type.
--func (v *Value) Uint64(optionalDefault ...uint64) uint64 {
-- if s, ok := v.data.(uint64); ok {
-- return s
-- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
-- }
-- return 0
--}
+-#data
+-<!DOCTYPE>Hello
+-#errors
+-#document
+-| <!DOCTYPE >
+-| <html>
+-| <head>
+-| <body>
+-| "Hello"
-
--// MustUint64 gets the value as a uint64.
--//
--// Panics if the object is not a uint64.
--func (v *Value) MustUint64() uint64 {
-- return v.data.(uint64)
--}
+-#data
+-<!DOCTYPE >Hello
+-#errors
+-#document
+-| <!DOCTYPE >
+-| <html>
+-| <head>
+-| <body>
+-| "Hello"
-
--// Uint64Slice gets the value as a []uint64, returns the optionalDefault
--// value or nil if the value is not a []uint64.
--func (v *Value) Uint64Slice(optionalDefault ...[]uint64) []uint64 {
-- if s, ok := v.data.([]uint64); ok {
-- return s
-- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
-- }
-- return nil
--}
+-#data
+-<!DOCTYPE potato>Hello
+-#errors
+-#document
+-| <!DOCTYPE potato>
+-| <html>
+-| <head>
+-| <body>
+-| "Hello"
-
--// MustUint64Slice gets the value as a []uint64.
--//
--// Panics if the object is not a []uint64.
--func (v *Value) MustUint64Slice() []uint64 {
-- return v.data.([]uint64)
--}
+-#data
+-<!DOCTYPE potato >Hello
+-#errors
+-#document
+-| <!DOCTYPE potato>
+-| <html>
+-| <head>
+-| <body>
+-| "Hello"
-
--// IsUint64 gets whether the object contained is a uint64 or not.
--func (v *Value) IsUint64() bool {
-- _, ok := v.data.(uint64)
-- return ok
--}
+-#data
+-<!DOCTYPE potato taco>Hello
+-#errors
+-#document
+-| <!DOCTYPE potato>
+-| <html>
+-| <head>
+-| <body>
+-| "Hello"
-
--// IsUint64Slice gets whether the object contained is a []uint64 or not.
--func (v *Value) IsUint64Slice() bool {
-- _, ok := v.data.([]uint64)
-- return ok
--}
+-#data
+-<!DOCTYPE potato taco "ddd>Hello
+-#errors
+-#document
+-| <!DOCTYPE potato>
+-| <html>
+-| <head>
+-| <body>
+-| "Hello"
-
--// EachUint64 calls the specified callback for each object
--// in the []uint64.
--//
--// Panics if the object is the wrong type.
--func (v *Value) EachUint64(callback func(int, uint64) bool) *Value {
+-#data
+-<!DOCTYPE potato sYstEM>Hello
+-#errors
+-#document
+-| <!DOCTYPE potato>
+-| <html>
+-| <head>
+-| <body>
+-| "Hello"
-
-- for index, val := range v.MustUint64Slice() {
-- carryon := callback(index, val)
-- if carryon == false {
-- break
-- }
-- }
+-#data
+-<!DOCTYPE potato sYstEM >Hello
+-#errors
+-#document
+-| <!DOCTYPE potato>
+-| <html>
+-| <head>
+-| <body>
+-| "Hello"
-
-- return v
+-#data
+-<!DOCTYPE potato sYstEM ggg>Hello
+-#errors
+-#document
+-| <!DOCTYPE potato>
+-| <html>
+-| <head>
+-| <body>
+-| "Hello"
-
--}
+-#data
+-<!DOCTYPE potato SYSTEM taco >Hello
+-#errors
+-#document
+-| <!DOCTYPE potato>
+-| <html>
+-| <head>
+-| <body>
+-| "Hello"
-
--// WhereUint64 uses the specified decider function to select items
--// from the []uint64. The object contained in the result will contain
--// only the selected items.
--func (v *Value) WhereUint64(decider func(int, uint64) bool) *Value {
+-#data
+-<!DOCTYPE potato SYSTEM 'taco"'>Hello
+-#errors
+-#document
+-| <!DOCTYPE potato "" "taco"">
+-| <html>
+-| <head>
+-| <body>
+-| "Hello"
-
-- var selected []uint64
+-#data
+-<!DOCTYPE potato SYSTEM "taco">Hello
+-#errors
+-#document
+-| <!DOCTYPE potato "" "taco">
+-| <html>
+-| <head>
+-| <body>
+-| "Hello"
-
-- v.EachUint64(func(index int, val uint64) bool {
-- shouldSelect := decider(index, val)
-- if shouldSelect == false {
-- selected = append(selected, val)
-- }
-- return true
-- })
+-#data
+-<!DOCTYPE potato SYSTEM "tai'co">Hello
+-#errors
+-#document
+-| <!DOCTYPE potato "" "tai'co">
+-| <html>
+-| <head>
+-| <body>
+-| "Hello"
-
-- return &Value{data: selected}
+-#data
+-<!DOCTYPE potato SYSTEMtaco "ddd">Hello
+-#errors
+-#document
+-| <!DOCTYPE potato>
+-| <html>
+-| <head>
+-| <body>
+-| "Hello"
-
--}
+-#data
+-<!DOCTYPE potato grass SYSTEM taco>Hello
+-#errors
+-#document
+-| <!DOCTYPE potato>
+-| <html>
+-| <head>
+-| <body>
+-| "Hello"
-
--// GroupUint64 uses the specified grouper function to group the items
--// keyed by the return of the grouper. The object contained in the
--// result will contain a map[string][]uint64.
--func (v *Value) GroupUint64(grouper func(int, uint64) string) *Value {
+-#data
+-<!DOCTYPE potato pUbLIc>Hello
+-#errors
+-#document
+-| <!DOCTYPE potato>
+-| <html>
+-| <head>
+-| <body>
+-| "Hello"
-
-- groups := make(map[string][]uint64)
+-#data
+-<!DOCTYPE potato pUbLIc >Hello
+-#errors
+-#document
+-| <!DOCTYPE potato>
+-| <html>
+-| <head>
+-| <body>
+-| "Hello"
-
-- v.EachUint64(func(index int, val uint64) bool {
-- group := grouper(index, val)
-- if _, ok := groups[group]; !ok {
-- groups[group] = make([]uint64, 0)
-- }
-- groups[group] = append(groups[group], val)
-- return true
-- })
+-#data
+-<!DOCTYPE potato pUbLIcgoof>Hello
+-#errors
+-#document
+-| <!DOCTYPE potato>
+-| <html>
+-| <head>
+-| <body>
+-| "Hello"
-
-- return &Value{data: groups}
+-#data
+-<!DOCTYPE potato PUBLIC goof>Hello
+-#errors
+-#document
+-| <!DOCTYPE potato>
+-| <html>
+-| <head>
+-| <body>
+-| "Hello"
-
--}
+-#data
+-<!DOCTYPE potato PUBLIC "go'of">Hello
+-#errors
+-#document
+-| <!DOCTYPE potato "go'of" "">
+-| <html>
+-| <head>
+-| <body>
+-| "Hello"
-
--// ReplaceUint64 uses the specified function to replace each uint64s
--// by iterating each item. The data in the returned result will be a
--// []uint64 containing the replaced items.
--func (v *Value) ReplaceUint64(replacer func(int, uint64) uint64) *Value {
+-#data
+-<!DOCTYPE potato PUBLIC 'go'of'>Hello
+-#errors
+-#document
+-| <!DOCTYPE potato "go" "">
+-| <html>
+-| <head>
+-| <body>
+-| "Hello"
-
-- arr := v.MustUint64Slice()
-- replaced := make([]uint64, len(arr))
+-#data
+-<!DOCTYPE potato PUBLIC 'go:hh of' >Hello
+-#errors
+-#document
+-| <!DOCTYPE potato "go:hh of" "">
+-| <html>
+-| <head>
+-| <body>
+-| "Hello"
-
-- v.EachUint64(func(index int, val uint64) bool {
-- replaced[index] = replacer(index, val)
-- return true
-- })
+-#data
+-<!DOCTYPE potato PUBLIC "W3C-//dfdf" SYSTEM ggg>Hello
+-#errors
+-#document
+-| <!DOCTYPE potato "W3C-//dfdf" "">
+-| <html>
+-| <head>
+-| <body>
+-| "Hello"
-
-- return &Value{data: replaced}
+-#data
+-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+- "http://www.w3.org/TR/html4/strict.dtd">Hello
+-#errors
+-#document
+-| <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+-| <html>
+-| <head>
+-| <body>
+-| "Hello"
-
--}
+-#data
+-<!DOCTYPE ...>Hello
+-#errors
+-#document
+-| <!DOCTYPE ...>
+-| <html>
+-| <head>
+-| <body>
+-| "Hello"
-
--// CollectUint64 uses the specified collector function to collect a value
--// for each of the uint64s in the slice. The data returned will be a
--// []interface{}.
--func (v *Value) CollectUint64(collector func(int, uint64) interface{}) *Value {
+-#data
+-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+-#errors
+-#document
+-| <!DOCTYPE html "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+-| <html>
+-| <head>
+-| <body>
-
-- arr := v.MustUint64Slice()
-- collected := make([]interface{}, len(arr))
+-#data
+-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
+-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
+-#errors
+-#document
+-| <!DOCTYPE html "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
+-| <html>
+-| <head>
+-| <body>
-
-- v.EachUint64(func(index int, val uint64) bool {
-- collected[index] = collector(index, val)
-- return true
-- })
+-#data
+-<!DOCTYPE root-element [SYSTEM OR PUBLIC FPI] "uri" [
+-<!-- internal declarations -->
+-]>
+-#errors
+-#document
+-| <!DOCTYPE root-element>
+-| <html>
+-| <head>
+-| <body>
+-| "]>"
-
-- return &Value{data: collected}
--}
+-#data
+-<!DOCTYPE html PUBLIC
+- "-//WAPFORUM//DTD XHTML Mobile 1.0//EN"
+- "http://www.wapforum.org/DTD/xhtml-mobile10.dtd">
+-#errors
+-#document
+-| <!DOCTYPE html "-//WAPFORUM//DTD XHTML Mobile 1.0//EN" "http://www.wapforum.org/DTD/xhtml-mobile10.dtd">
+-| <html>
+-| <head>
+-| <body>
-
--/*
-- Uintptr (uintptr and []uintptr)
-- --------------------------------------------------
--*/
+-#data
+-<!DOCTYPE HTML SYSTEM "http://www.w3.org/DTD/HTML4-strict.dtd"><body><b>Mine!</b></body>
+-#errors
+-#document
+-| <!DOCTYPE html "" "http://www.w3.org/DTD/HTML4-strict.dtd">
+-| <html>
+-| <head>
+-| <body>
+-| <b>
+-| "Mine!"
-
--// Uintptr gets the value as a uintptr, returns the optionalDefault
--// value or a system default object if the value is the wrong type.
--func (v *Value) Uintptr(optionalDefault ...uintptr) uintptr {
-- if s, ok := v.data.(uintptr); ok {
-- return s
-- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
-- }
-- return 0
--}
+-#data
+-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN""http://www.w3.org/TR/html4/strict.dtd">
+-#errors
+-#document
+-| <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+-| <html>
+-| <head>
+-| <body>
-
--// MustUintptr gets the value as a uintptr.
--//
--// Panics if the object is not a uintptr.
--func (v *Value) MustUintptr() uintptr {
-- return v.data.(uintptr)
--}
+-#data
+-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"'http://www.w3.org/TR/html4/strict.dtd'>
+-#errors
+-#document
+-| <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+-| <html>
+-| <head>
+-| <body>
-
--// UintptrSlice gets the value as a []uintptr, returns the optionalDefault
--// value or nil if the value is not a []uintptr.
--func (v *Value) UintptrSlice(optionalDefault ...[]uintptr) []uintptr {
-- if s, ok := v.data.([]uintptr); ok {
-- return s
-- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
-- }
-- return nil
--}
+-#data
+-<!DOCTYPE HTML PUBLIC"-//W3C//DTD HTML 4.01//EN"'http://www.w3.org/TR/html4/strict.dtd'>
+-#errors
+-#document
+-| <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+-| <html>
+-| <head>
+-| <body>
-
--// MustUintptrSlice gets the value as a []uintptr.
--//
--// Panics if the object is not a []uintptr.
--func (v *Value) MustUintptrSlice() []uintptr {
-- return v.data.([]uintptr)
--}
+-#data
+-<!DOCTYPE HTML PUBLIC'-//W3C//DTD HTML 4.01//EN''http://www.w3.org/TR/html4/strict.dtd'>
+-#errors
+-#document
+-| <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+-| <html>
+-| <head>
+-| <body>
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/entities01.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/entities01.dat
+deleted file mode 100644
+index c8073b7..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/entities01.dat
++++ /dev/null
+@@ -1,603 +0,0 @@
+-#data
+-FOO>BAR
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO>BAR"
-
--// IsUintptr gets whether the object contained is a uintptr or not.
--func (v *Value) IsUintptr() bool {
-- _, ok := v.data.(uintptr)
-- return ok
--}
+-#data
+-FOO>BAR
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO>BAR"
-
--// IsUintptrSlice gets whether the object contained is a []uintptr or not.
--func (v *Value) IsUintptrSlice() bool {
-- _, ok := v.data.([]uintptr)
-- return ok
--}
+-#data
+-FOO> BAR
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO> BAR"
-
--// EachUintptr calls the specified callback for each object
--// in the []uintptr.
--//
--// Panics if the object is the wrong type.
--func (v *Value) EachUintptr(callback func(int, uintptr) bool) *Value {
+-#data
+-FOO>;;BAR
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO>;;BAR"
-
-- for index, val := range v.MustUintptrSlice() {
-- carryon := callback(index, val)
-- if carryon == false {
-- break
-- }
-- }
+-#data
+-I'm ¬it; I tell you
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "I'm ¬it; I tell you"
-
-- return v
+-#data
+-I'm ∉ I tell you
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "I'm ∉ I tell you"
-
--}
+-#data
+-FOO& BAR
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO& BAR"
-
--// WhereUintptr uses the specified decider function to select items
--// from the []uintptr. The object contained in the result will contain
--// only the selected items.
--func (v *Value) WhereUintptr(decider func(int, uintptr) bool) *Value {
+-#data
+-FOO&<BAR>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO&"
+-| <bar>
-
-- var selected []uintptr
+-#data
+-FOO&&&>BAR
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO&&&>BAR"
-
-- v.EachUintptr(func(index int, val uintptr) bool {
-- shouldSelect := decider(index, val)
-- if shouldSelect == false {
-- selected = append(selected, val)
-- }
-- return true
-- })
+-#data
+-FOO)BAR
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO)BAR"
-
-- return &Value{data: selected}
+-#data
+-FOOABAR
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOOABAR"
-
--}
+-#data
+-FOOABAR
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOOABAR"
-
--// GroupUintptr uses the specified grouper function to group the items
--// keyed by the return of the grouper. The object contained in the
--// result will contain a map[string][]uintptr.
--func (v *Value) GroupUintptr(grouper func(int, uintptr) string) *Value {
+-#data
+-FOO&#BAR
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO&#BAR"
-
-- groups := make(map[string][]uintptr)
+-#data
+-FOO&#ZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO&#ZOO"
-
-- v.EachUintptr(func(index int, val uintptr) bool {
-- group := grouper(index, val)
-- if _, ok := groups[group]; !ok {
-- groups[group] = make([]uintptr, 0)
-- }
-- groups[group] = append(groups[group], val)
-- return true
-- })
+-#data
+-FOOºR
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOOºR"
-
-- return &Value{data: groups}
+-#data
+-FOO&#xZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO&#xZOO"
-
--}
+-#data
+-FOO&#XZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO&#XZOO"
-
--// ReplaceUintptr uses the specified function to replace each uintptrs
--// by iterating each item. The data in the returned result will be a
--// []uintptr containing the replaced items.
--func (v *Value) ReplaceUintptr(replacer func(int, uintptr) uintptr) *Value {
+-#data
+-FOO)BAR
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO)BAR"
-
-- arr := v.MustUintptrSlice()
-- replaced := make([]uintptr, len(arr))
+-#data
+-FOO䆺R
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO䆺R"
-
-- v.EachUintptr(func(index int, val uintptr) bool {
-- replaced[index] = replacer(index, val)
-- return true
-- })
+-#data
+-FOOAZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOOAZOO"
-
-- return &Value{data: replaced}
+-#data
+-FOO�ZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO�ZOO"
-
--}
+-#data
+-FOOxZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOOxZOO"
-
--// CollectUintptr uses the specified collector function to collect a value
--// for each of the uintptrs in the slice. The data returned will be a
--// []interface{}.
--func (v *Value) CollectUintptr(collector func(int, uintptr) interface{}) *Value {
+-#data
+-FOOyZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOOyZOO"
-
-- arr := v.MustUintptrSlice()
-- collected := make([]interface{}, len(arr))
+-#data
+-FOO€ZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO€ZOO"
-
-- v.EachUintptr(func(index int, val uintptr) bool {
-- collected[index] = collector(index, val)
-- return true
-- })
+-#data
+-FOOZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOOZOO"
-
-- return &Value{data: collected}
--}
+-#data
+-FOO‚ZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO‚ZOO"
-
--/*
-- Float32 (float32 and []float32)
-- --------------------------------------------------
--*/
+-#data
+-FOOƒZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOOƒZOO"
-
--// Float32 gets the value as a float32, returns the optionalDefault
--// value or a system default object if the value is the wrong type.
--func (v *Value) Float32(optionalDefault ...float32) float32 {
-- if s, ok := v.data.(float32); ok {
-- return s
-- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
-- }
-- return 0
--}
+-#data
+-FOO„ZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO„ZOO"
-
--// MustFloat32 gets the value as a float32.
--//
--// Panics if the object is not a float32.
--func (v *Value) MustFloat32() float32 {
-- return v.data.(float32)
--}
+-#data
+-FOO…ZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO…ZOO"
-
--// Float32Slice gets the value as a []float32, returns the optionalDefault
--// value or nil if the value is not a []float32.
--func (v *Value) Float32Slice(optionalDefault ...[]float32) []float32 {
-- if s, ok := v.data.([]float32); ok {
-- return s
-- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
-- }
-- return nil
--}
+-#data
+-FOO†ZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO†ZOO"
-
--// MustFloat32Slice gets the value as a []float32.
--//
--// Panics if the object is not a []float32.
--func (v *Value) MustFloat32Slice() []float32 {
-- return v.data.([]float32)
--}
+-#data
+-FOO‡ZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO‡ZOO"
-
--// IsFloat32 gets whether the object contained is a float32 or not.
--func (v *Value) IsFloat32() bool {
-- _, ok := v.data.(float32)
-- return ok
--}
+-#data
+-FOOˆZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOOˆZOO"
-
--// IsFloat32Slice gets whether the object contained is a []float32 or not.
--func (v *Value) IsFloat32Slice() bool {
-- _, ok := v.data.([]float32)
-- return ok
--}
+-#data
+-FOO‰ZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO‰ZOO"
-
--// EachFloat32 calls the specified callback for each object
--// in the []float32.
--//
--// Panics if the object is the wrong type.
--func (v *Value) EachFloat32(callback func(int, float32) bool) *Value {
+-#data
+-FOOŠZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOOŠZOO"
-
-- for index, val := range v.MustFloat32Slice() {
-- carryon := callback(index, val)
-- if carryon == false {
-- break
-- }
-- }
+-#data
+-FOO‹ZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO‹ZOO"
-
-- return v
+-#data
+-FOOŒZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOOŒZOO"
-
--}
+-#data
+-FOOZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOOZOO"
-
--// WhereFloat32 uses the specified decider function to select items
--// from the []float32. The object contained in the result will contain
--// only the selected items.
--func (v *Value) WhereFloat32(decider func(int, float32) bool) *Value {
+-#data
+-FOOŽZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOOŽZOO"
-
-- var selected []float32
+-#data
+-FOOZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOOZOO"
-
-- v.EachFloat32(func(index int, val float32) bool {
-- shouldSelect := decider(index, val)
-- if shouldSelect == false {
-- selected = append(selected, val)
-- }
-- return true
-- })
+-#data
+-FOOZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOOZOO"
-
-- return &Value{data: selected}
+-#data
+-FOO‘ZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO‘ZOO"
-
--}
+-#data
+-FOO’ZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO’ZOO"
-
--// GroupFloat32 uses the specified grouper function to group the items
--// keyed by the return of the grouper. The object contained in the
--// result will contain a map[string][]float32.
--func (v *Value) GroupFloat32(grouper func(int, float32) string) *Value {
+-#data
+-FOO“ZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO“ZOO"
-
-- groups := make(map[string][]float32)
+-#data
+-FOO”ZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO”ZOO"
-
-- v.EachFloat32(func(index int, val float32) bool {
-- group := grouper(index, val)
-- if _, ok := groups[group]; !ok {
-- groups[group] = make([]float32, 0)
-- }
-- groups[group] = append(groups[group], val)
-- return true
-- })
+-#data
+-FOO•ZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO•ZOO"
-
-- return &Value{data: groups}
+-#data
+-FOO–ZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO–ZOO"
-
--}
+-#data
+-FOO—ZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO—ZOO"
-
--// ReplaceFloat32 uses the specified function to replace each float32s
--// by iterating each item. The data in the returned result will be a
--// []float32 containing the replaced items.
--func (v *Value) ReplaceFloat32(replacer func(int, float32) float32) *Value {
+-#data
+-FOO˜ZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO˜ZOO"
-
-- arr := v.MustFloat32Slice()
-- replaced := make([]float32, len(arr))
+-#data
+-FOO™ZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO™ZOO"
-
-- v.EachFloat32(func(index int, val float32) bool {
-- replaced[index] = replacer(index, val)
-- return true
-- })
+-#data
+-FOOšZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOOšZOO"
-
-- return &Value{data: replaced}
+-#data
+-FOO›ZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO›ZOO"
-
--}
+-#data
+-FOOœZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOOœZOO"
-
--// CollectFloat32 uses the specified collector function to collect a value
--// for each of the float32s in the slice. The data returned will be a
--// []interface{}.
--func (v *Value) CollectFloat32(collector func(int, float32) interface{}) *Value {
+-#data
+-FOOZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOOZOO"
-
-- arr := v.MustFloat32Slice()
-- collected := make([]interface{}, len(arr))
+-#data
+-FOOžZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOOžZOO"
-
-- v.EachFloat32(func(index int, val float32) bool {
-- collected[index] = collector(index, val)
-- return true
-- })
+-#data
+-FOOŸZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOOŸZOO"
-
-- return &Value{data: collected}
--}
+-#data
+-FOO ZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO ZOO"
-
--/*
-- Float64 (float64 and []float64)
-- --------------------------------------------------
--*/
+-#data
+-FOO퟿ZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOOZOO"
-
--// Float64 gets the value as a float64, returns the optionalDefault
--// value or a system default object if the value is the wrong type.
--func (v *Value) Float64(optionalDefault ...float64) float64 {
-- if s, ok := v.data.(float64); ok {
-- return s
-- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
-- }
-- return 0
--}
+-#data
+-FOO�ZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO�ZOO"
-
--// MustFloat64 gets the value as a float64.
--//
--// Panics if the object is not a float64.
--func (v *Value) MustFloat64() float64 {
-- return v.data.(float64)
--}
+-#data
+-FOO�ZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO�ZOO"
-
--// Float64Slice gets the value as a []float64, returns the optionalDefault
--// value or nil if the value is not a []float64.
--func (v *Value) Float64Slice(optionalDefault ...[]float64) []float64 {
-- if s, ok := v.data.([]float64); ok {
-- return s
-- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
-- }
-- return nil
--}
+-#data
+-FOO�ZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO�ZOO"
-
--// MustFloat64Slice gets the value as a []float64.
--//
--// Panics if the object is not a []float64.
--func (v *Value) MustFloat64Slice() []float64 {
-- return v.data.([]float64)
--}
+-#data
+-FOO�ZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO�ZOO"
-
--// IsFloat64 gets whether the object contained is a float64 or not.
--func (v *Value) IsFloat64() bool {
-- _, ok := v.data.(float64)
-- return ok
--}
+-#data
+-FOOZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOOZOO"
-
--// IsFloat64Slice gets whether the object contained is a []float64 or not.
--func (v *Value) IsFloat64Slice() bool {
-- _, ok := v.data.([]float64)
-- return ok
--}
+-#data
+-FOOZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOOZOO"
-
--// EachFloat64 calls the specified callback for each object
--// in the []float64.
--//
--// Panics if the object is the wrong type.
--func (v *Value) EachFloat64(callback func(int, float64) bool) *Value {
+-#data
+-FOO􈟔ZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOOZOO"
-
-- for index, val := range v.MustFloat64Slice() {
-- carryon := callback(index, val)
-- if carryon == false {
-- break
-- }
-- }
+-#data
+-FOOZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOOZOO"
-
-- return v
+-#data
+-FOO�ZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO�ZOO"
-
--}
+-#data
+-FOO�ZOO
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO�ZOO"
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/entities02.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/entities02.dat
+deleted file mode 100644
+index e2fb42a..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/entities02.dat
++++ /dev/null
+@@ -1,249 +0,0 @@
+-#data
+-<div bar="ZZ>YY"></div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| bar="ZZ>YY"
-
--// WhereFloat64 uses the specified decider function to select items
--// from the []float64. The object contained in the result will contain
--// only the selected items.
--func (v *Value) WhereFloat64(decider func(int, float64) bool) *Value {
+-#data
+-<div bar="ZZ&"></div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| bar="ZZ&"
-
-- var selected []float64
+-#data
+-<div bar='ZZ&'></div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| bar="ZZ&"
-
-- v.EachFloat64(func(index int, val float64) bool {
-- shouldSelect := decider(index, val)
-- if shouldSelect == false {
-- selected = append(selected, val)
-- }
-- return true
-- })
+-#data
+-<div bar=ZZ&></div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| bar="ZZ&"
-
-- return &Value{data: selected}
+-#data
+-<div bar="ZZ>=YY"></div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| bar="ZZ>=YY"
-
--}
+-#data
+-<div bar="ZZ>0YY"></div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| bar="ZZ>0YY"
-
--// GroupFloat64 uses the specified grouper function to group the items
--// keyed by the return of the grouper. The object contained in the
--// result will contain a map[string][]float64.
--func (v *Value) GroupFloat64(grouper func(int, float64) string) *Value {
+-#data
+-<div bar="ZZ>9YY"></div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| bar="ZZ>9YY"
-
-- groups := make(map[string][]float64)
+-#data
+-<div bar="ZZ>aYY"></div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| bar="ZZ>aYY"
+-
+-#data
+-<div bar="ZZ>ZYY"></div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| bar="ZZ>ZYY"
-
-- v.EachFloat64(func(index int, val float64) bool {
-- group := grouper(index, val)
-- if _, ok := groups[group]; !ok {
-- groups[group] = make([]float64, 0)
-- }
-- groups[group] = append(groups[group], val)
-- return true
-- })
+-#data
+-<div bar="ZZ> YY"></div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| bar="ZZ> YY"
-
-- return &Value{data: groups}
+-#data
+-<div bar="ZZ>"></div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| bar="ZZ>"
-
--}
+-#data
+-<div bar='ZZ>'></div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| bar="ZZ>"
-
--// ReplaceFloat64 uses the specified function to replace each float64s
--// by iterating each item. The data in the returned result will be a
--// []float64 containing the replaced items.
--func (v *Value) ReplaceFloat64(replacer func(int, float64) float64) *Value {
+-#data
+-<div bar=ZZ>></div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| bar="ZZ>"
-
-- arr := v.MustFloat64Slice()
-- replaced := make([]float64, len(arr))
+-#data
+-<div bar="ZZ£_id=23"></div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| bar="ZZ£_id=23"
-
-- v.EachFloat64(func(index int, val float64) bool {
-- replaced[index] = replacer(index, val)
-- return true
-- })
+-#data
+-<div bar="ZZ&prod_id=23"></div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| bar="ZZ&prod_id=23"
-
-- return &Value{data: replaced}
+-#data
+-<div bar="ZZ£_id=23"></div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| bar="ZZ£_id=23"
-
--}
+-#data
+-<div bar="ZZ∏_id=23"></div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| bar="ZZ∏_id=23"
-
--// CollectFloat64 uses the specified collector function to collect a value
--// for each of the float64s in the slice. The data returned will be a
--// []interface{}.
--func (v *Value) CollectFloat64(collector func(int, float64) interface{}) *Value {
+-#data
+-<div bar="ZZ£=23"></div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| bar="ZZ£=23"
-
-- arr := v.MustFloat64Slice()
-- collected := make([]interface{}, len(arr))
+-#data
+-<div bar="ZZ&prod=23"></div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| bar="ZZ&prod=23"
-
-- v.EachFloat64(func(index int, val float64) bool {
-- collected[index] = collector(index, val)
-- return true
-- })
+-#data
+-<div>ZZ£_id=23</div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| "ZZ£_id=23"
-
-- return &Value{data: collected}
--}
+-#data
+-<div>ZZ&prod_id=23</div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| "ZZ&prod_id=23"
-
--/*
-- Complex64 (complex64 and []complex64)
-- --------------------------------------------------
--*/
+-#data
+-<div>ZZ£_id=23</div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| "ZZ£_id=23"
-
--// Complex64 gets the value as a complex64, returns the optionalDefault
--// value or a system default object if the value is the wrong type.
--func (v *Value) Complex64(optionalDefault ...complex64) complex64 {
-- if s, ok := v.data.(complex64); ok {
-- return s
-- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
-- }
-- return 0
--}
+-#data
+-<div>ZZ∏_id=23</div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| "ZZ∏_id=23"
-
--// MustComplex64 gets the value as a complex64.
--//
--// Panics if the object is not a complex64.
--func (v *Value) MustComplex64() complex64 {
-- return v.data.(complex64)
--}
+-#data
+-<div>ZZ£=23</div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| "ZZ£=23"
-
--// Complex64Slice gets the value as a []complex64, returns the optionalDefault
--// value or nil if the value is not a []complex64.
--func (v *Value) Complex64Slice(optionalDefault ...[]complex64) []complex64 {
-- if s, ok := v.data.([]complex64); ok {
-- return s
-- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
-- }
-- return nil
--}
+-#data
+-<div>ZZ&prod=23</div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| "ZZ&prod=23"
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/html5test-com.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/html5test-com.dat
+deleted file mode 100644
+index d7cb71d..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/html5test-com.dat
++++ /dev/null
+@@ -1,246 +0,0 @@
+-#data
+-<div<div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div<div>
-
--// MustComplex64Slice gets the value as a []complex64.
--//
--// Panics if the object is not a []complex64.
--func (v *Value) MustComplex64Slice() []complex64 {
-- return v.data.([]complex64)
--}
+-#data
+-<div foo<bar=''>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| foo<bar=""
-
--// IsComplex64 gets whether the object contained is a complex64 or not.
--func (v *Value) IsComplex64() bool {
-- _, ok := v.data.(complex64)
-- return ok
--}
+-#data
+-<div foo=`bar`>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| foo="`bar`"
-
--// IsComplex64Slice gets whether the object contained is a []complex64 or not.
--func (v *Value) IsComplex64Slice() bool {
-- _, ok := v.data.([]complex64)
-- return ok
--}
+-#data
+-<div \"foo=''>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| \"foo=""
-
--// EachComplex64 calls the specified callback for each object
--// in the []complex64.
--//
--// Panics if the object is the wrong type.
--func (v *Value) EachComplex64(callback func(int, complex64) bool) *Value {
+-#data
+-<a href='\nbar'></a>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <a>
+-| href="\nbar"
-
-- for index, val := range v.MustComplex64Slice() {
-- carryon := callback(index, val)
-- if carryon == false {
-- break
-- }
-- }
+-#data
+-<!DOCTYPE html>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
-
-- return v
+-#data
+-⟨⟩
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "⟨⟩"
-
--}
+-#data
+-'
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "'"
-
--// WhereComplex64 uses the specified decider function to select items
--// from the []complex64. The object contained in the result will contain
--// only the selected items.
--func (v *Value) WhereComplex64(decider func(int, complex64) bool) *Value {
+-#data
+-ⅈ
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "ⅈ"
-
-- var selected []complex64
+-#data
+-𝕂
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "𝕂"
-
-- v.EachComplex64(func(index int, val complex64) bool {
-- shouldSelect := decider(index, val)
-- if shouldSelect == false {
-- selected = append(selected, val)
-- }
-- return true
-- })
+-#data
+-∉
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "∉"
-
-- return &Value{data: selected}
+-#data
+-<?import namespace="foo" implementation="#bar">
+-#errors
+-#document
+-| <!-- ?import namespace="foo" implementation="#bar" -->
+-| <html>
+-| <head>
+-| <body>
-
--}
+-#data
+-<!--foo--bar-->
+-#errors
+-#document
+-| <!-- foo--bar -->
+-| <html>
+-| <head>
+-| <body>
-
--// GroupComplex64 uses the specified grouper function to group the items
--// keyed by the return of the grouper. The object contained in the
--// result will contain a map[string][]complex64.
--func (v *Value) GroupComplex64(grouper func(int, complex64) string) *Value {
+-#data
+-<![CDATA[x]]>
+-#errors
+-#document
+-| <!-- [CDATA[x]] -->
+-| <html>
+-| <head>
+-| <body>
-
-- groups := make(map[string][]complex64)
+-#data
+-<textarea><!--</textarea>--></textarea>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <textarea>
+-| "<!--"
+-| "-->"
-
-- v.EachComplex64(func(index int, val complex64) bool {
-- group := grouper(index, val)
-- if _, ok := groups[group]; !ok {
-- groups[group] = make([]complex64, 0)
-- }
-- groups[group] = append(groups[group], val)
-- return true
-- })
+-#data
+-<textarea><!--</textarea>-->
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <textarea>
+-| "<!--"
+-| "-->"
-
-- return &Value{data: groups}
+-#data
+-<style><!--</style>--></style>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <style>
+-| "<!--"
+-| <body>
+-| "-->"
-
--}
+-#data
+-<style><!--</style>-->
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <style>
+-| "<!--"
+-| <body>
+-| "-->"
-
--// ReplaceComplex64 uses the specified function to replace each complex64s
--// by iterating each item. The data in the returned result will be a
--// []complex64 containing the replaced items.
--func (v *Value) ReplaceComplex64(replacer func(int, complex64) complex64) *Value {
+-#data
+-<ul><li>A </li> <li>B</li></ul>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <ul>
+-| <li>
+-| "A "
+-| " "
+-| <li>
+-| "B"
-
-- arr := v.MustComplex64Slice()
-- replaced := make([]complex64, len(arr))
+-#data
+-<table><form><input type=hidden><input></form><div></div></table>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <input>
+-| <div>
+-| <table>
+-| <form>
+-| <input>
+-| type="hidden"
-
-- v.EachComplex64(func(index int, val complex64) bool {
-- replaced[index] = replacer(index, val)
-- return true
-- })
+-#data
+-<i>A<b>B<p></i>C</b>D
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <i>
+-| "A"
+-| <b>
+-| "B"
+-| <b>
+-| <p>
+-| <b>
+-| <i>
+-| "C"
+-| "D"
-
-- return &Value{data: replaced}
+-#data
+-<div></div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
-
--}
+-#data
+-<svg></svg>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
-
--// CollectComplex64 uses the specified collector function to collect a value
--// for each of the complex64s in the slice. The data returned will be a
--// []interface{}.
--func (v *Value) CollectComplex64(collector func(int, complex64) interface{}) *Value {
+-#data
+-<math></math>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/inbody01.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/inbody01.dat
+deleted file mode 100644
+index 3f2bd37..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/inbody01.dat
++++ /dev/null
+@@ -1,43 +0,0 @@
+-#data
+-<button>1</foo>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <button>
+-| "1"
-
-- arr := v.MustComplex64Slice()
-- collected := make([]interface{}, len(arr))
+-#data
+-<foo>1<p>2</foo>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <foo>
+-| "1"
+-| <p>
+-| "2"
-
-- v.EachComplex64(func(index int, val complex64) bool {
-- collected[index] = collector(index, val)
-- return true
-- })
+-#data
+-<dd>1</foo>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <dd>
+-| "1"
-
-- return &Value{data: collected}
--}
+-#data
+-<foo>1<dd>2</foo>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <foo>
+-| "1"
+-| <dd>
+-| "2"
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/isindex.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/isindex.dat
+deleted file mode 100644
+index 88325ff..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/isindex.dat
++++ /dev/null
+@@ -1,40 +0,0 @@
+-#data
+-<isindex>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <form>
+-| <hr>
+-| <label>
+-| "This is a searchable index. Enter search keywords: "
+-| <input>
+-| name="isindex"
+-| <hr>
-
--/*
-- Complex128 (complex128 and []complex128)
-- --------------------------------------------------
--*/
+-#data
+-<isindex name="A" action="B" prompt="C" foo="D">
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <form>
+-| action="B"
+-| <hr>
+-| <label>
+-| "C"
+-| <input>
+-| foo="D"
+-| name="isindex"
+-| <hr>
-
--// Complex128 gets the value as a complex128, returns the optionalDefault
--// value or a system default object if the value is the wrong type.
--func (v *Value) Complex128(optionalDefault ...complex128) complex128 {
-- if s, ok := v.data.(complex128); ok {
-- return s
-- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
-- }
-- return 0
--}
+-#data
+-<form><isindex>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <form>
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/pending-spec-changes-plain-text-unsafe.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/pending-spec-changes-plain-text-unsafe.dat
+deleted file mode 100644
+index a5ebb1eb285116af391137bc94beac0c8a6834b4..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 115
+zcmXZUQ3`+{41i&ucZ#9c5brYEqF^T2f`Sg8m2W@)!xxy0Am++fibh!_xp`HU=1fj=
+l5Tv!*b_iUjqsV4(V_d9g>VZ9lc;ttC7t#O7YxuDS4-Zl&BR>ED
+
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/pending-spec-changes.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/pending-spec-changes.dat
+deleted file mode 100644
+index 5a92084..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/pending-spec-changes.dat
++++ /dev/null
+@@ -1,52 +0,0 @@
+-#data
+-<input type="hidden"><frameset>
+-#errors
+-21: Start tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
+-31: “frameset” start tag seen.
+-31: End of file seen and there were open elements.
+-#document
+-| <html>
+-| <head>
+-| <frameset>
-
--// MustComplex128 gets the value as a complex128.
--//
--// Panics if the object is not a complex128.
--func (v *Value) MustComplex128() complex128 {
-- return v.data.(complex128)
--}
+-#data
+-<!DOCTYPE html><table><caption><svg>foo</table>bar
+-#errors
+-47: End tag “table” did not match the name of the current open element (“svg”).
+-47: “table” closed but “caption” was still open.
+-47: End tag “table” seen, but there were open elements.
+-36: Unclosed element “svg”.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <caption>
+-| <svg svg>
+-| "foo"
+-| "bar"
-
--// Complex128Slice gets the value as a []complex128, returns the optionalDefault
--// value or nil if the value is not a []complex128.
--func (v *Value) Complex128Slice(optionalDefault ...[]complex128) []complex128 {
-- if s, ok := v.data.([]complex128); ok {
-- return s
-- }
-- if len(optionalDefault) == 1 {
-- return optionalDefault[0]
-- }
-- return nil
--}
+-#data
+-<table><tr><td><svg><desc><td></desc><circle>
+-#errors
+-7: Start tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
+-30: A table cell was implicitly closed, but there were open elements.
+-26: Unclosed element “desc”.
+-20: Unclosed element “svg”.
+-37: Stray end tag “desc”.
+-45: End of file seen and there were open elements.
+-45: Unclosed element “circle”.
+-7: Unclosed element “table”.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <svg svg>
+-| <svg desc>
+-| <td>
+-| <circle>
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/plain-text-unsafe.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/plain-text-unsafe.dat
+deleted file mode 100644
+index 04cc11fb9d458ea32dca02e2f3bf39221196ab8e..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 4166
+zcmds4&1%~~5Y}1XcNojiOL5|Zdr6iB6Q@@dnjYGa!^&DaD*8j(rYZE*N*}4O(Ai!6
+zt?Ym#%MQd~yz+X#nfd0M+40P0g4rKk_ucGyu~@9HzqzhG<5`wuxjplf&5wx3!u}29
+zQA8od1>ll1zgT*S|4T0c9E6$RdB?_+5>}tF$TnjU&$*!FvRd{rQXeva!GcpkGm9M!
+zZBWBlo0XH%V%aC7h2%Ws8$qo;*=zDp0+b3F08~mq!5(ow4OtKi{*2LVgD~WoB_9R=
+z%96mMsPR;h$nTtgfB$G~Tu5~MsAZ5p?I at Yv->g at 6t9!$ThX*>G;HMo(<c>}#7Rl5a
+zZg4uE1I7jOIW4nFO4J6iM;kDRJYY at HxlJ-2>|)pZu4LM<KOUh3ErDsMA{%qAZOUw$
+zscvR?JZJVK)-qamv2krWRmhr-vcp#rkm+dl=W)$LH~WnyKCXT2=DO^$@Rb}6$4 at S`
+zDy!WdH|zeTS5P`WCOgJYv%MecK8>qS(UCIoh@(L9F*ZXarNczOPxy50-rRltbPH<s
+zA!)|x#GcqI^c|On6=j}5m2?=K6mlgf$6nP%Y{F?5Ca>+lsqMcUzhGX-DG?dIeM%yw
+zq)6Z5tV+moc?F- at Px$g4N7 at AhG2|lSEV{6lAFkjw_958<_GvD+SlP=VmQ!lVHXJsI
+znhY+?3E0d<$JA<%tK<^VtQR#nU at +CT{-PMJ<%52yKtV-o{8a81dy0d-O}vj9)n^7k
+zT4d@%G%wJ%%qhlePD%yYMMpP?=tpcJ%YZV=t3+x1nKCnh=v}&mgl&nSNPf^%ki)ze
+l`$yqfayHMBo}R^L^DOS^S$;Op@}8cl(m$8f+I>c;?LSw^)ujLc
+
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/scriptdata01.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/scriptdata01.dat
+deleted file mode 100644
+index 76b67f4..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/scriptdata01.dat
++++ /dev/null
+@@ -1,308 +0,0 @@
+-#data
+-FOO<script>'Hello'</script>BAR
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO"
+-| <script>
+-| "'Hello'"
+-| "BAR"
-
--// MustComplex128Slice gets the value as a []complex128.
--//
--// Panics if the object is not a []complex128.
--func (v *Value) MustComplex128Slice() []complex128 {
-- return v.data.([]complex128)
--}
+-#data
+-FOO<script></script>BAR
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO"
+-| <script>
+-| "BAR"
-
--// IsComplex128 gets whether the object contained is a complex128 or not.
--func (v *Value) IsComplex128() bool {
-- _, ok := v.data.(complex128)
-- return ok
--}
+-#data
+-FOO<script></script >BAR
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO"
+-| <script>
+-| "BAR"
-
--// IsComplex128Slice gets whether the object contained is a []complex128 or not.
--func (v *Value) IsComplex128Slice() bool {
-- _, ok := v.data.([]complex128)
-- return ok
--}
+-#data
+-FOO<script></script/>BAR
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO"
+-| <script>
+-| "BAR"
-
--// EachComplex128 calls the specified callback for each object
--// in the []complex128.
--//
--// Panics if the object is the wrong type.
--func (v *Value) EachComplex128(callback func(int, complex128) bool) *Value {
+-#data
+-FOO<script></script/ >BAR
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO"
+-| <script>
+-| "BAR"
-
-- for index, val := range v.MustComplex128Slice() {
-- carryon := callback(index, val)
-- if carryon == false {
-- break
-- }
-- }
+-#data
+-FOO<script type="text/plain"></scriptx>BAR
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO"
+-| <script>
+-| type="text/plain"
+-| "</scriptx>BAR"
-
-- return v
+-#data
+-FOO<script></script foo=">" dd>BAR
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO"
+-| <script>
+-| "BAR"
-
--}
+-#data
+-FOO<script>'<'</script>BAR
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO"
+-| <script>
+-| "'<'"
+-| "BAR"
-
--// WhereComplex128 uses the specified decider function to select items
--// from the []complex128. The object contained in the result will contain
--// only the selected items.
--func (v *Value) WhereComplex128(decider func(int, complex128) bool) *Value {
+-#data
+-FOO<script>'<!'</script>BAR
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO"
+-| <script>
+-| "'<!'"
+-| "BAR"
-
-- var selected []complex128
+-#data
+-FOO<script>'<!-'</script>BAR
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO"
+-| <script>
+-| "'<!-'"
+-| "BAR"
-
-- v.EachComplex128(func(index int, val complex128) bool {
-- shouldSelect := decider(index, val)
-- if shouldSelect == false {
-- selected = append(selected, val)
-- }
-- return true
-- })
+-#data
+-FOO<script>'<!--'</script>BAR
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO"
+-| <script>
+-| "'<!--'"
+-| "BAR"
-
-- return &Value{data: selected}
+-#data
+-FOO<script>'<!---'</script>BAR
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO"
+-| <script>
+-| "'<!---'"
+-| "BAR"
-
--}
+-#data
+-FOO<script>'<!-->'</script>BAR
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO"
+-| <script>
+-| "'<!-->'"
+-| "BAR"
-
--// GroupComplex128 uses the specified grouper function to group the items
--// keyed by the return of the grouper. The object contained in the
--// result will contain a map[string][]complex128.
--func (v *Value) GroupComplex128(grouper func(int, complex128) string) *Value {
+-#data
+-FOO<script>'<!-->'</script>BAR
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO"
+-| <script>
+-| "'<!-->'"
+-| "BAR"
-
-- groups := make(map[string][]complex128)
+-#data
+-FOO<script>'<!-- potato'</script>BAR
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO"
+-| <script>
+-| "'<!-- potato'"
+-| "BAR"
-
-- v.EachComplex128(func(index int, val complex128) bool {
-- group := grouper(index, val)
-- if _, ok := groups[group]; !ok {
-- groups[group] = make([]complex128, 0)
-- }
-- groups[group] = append(groups[group], val)
-- return true
-- })
+-#data
+-FOO<script>'<!-- <sCrIpt'</script>BAR
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO"
+-| <script>
+-| "'<!-- <sCrIpt'"
+-| "BAR"
-
-- return &Value{data: groups}
+-#data
+-FOO<script type="text/plain">'<!-- <sCrIpt>'</script>BAR
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO"
+-| <script>
+-| type="text/plain"
+-| "'<!-- <sCrIpt>'</script>BAR"
-
--}
+-#data
+-FOO<script type="text/plain">'<!-- <sCrIpt> -'</script>BAR
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO"
+-| <script>
+-| type="text/plain"
+-| "'<!-- <sCrIpt> -'</script>BAR"
-
--// ReplaceComplex128 uses the specified function to replace each complex128s
--// by iterating each item. The data in the returned result will be a
--// []complex128 containing the replaced items.
--func (v *Value) ReplaceComplex128(replacer func(int, complex128) complex128) *Value {
+-#data
+-FOO<script type="text/plain">'<!-- <sCrIpt> --'</script>BAR
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO"
+-| <script>
+-| type="text/plain"
+-| "'<!-- <sCrIpt> --'</script>BAR"
-
-- arr := v.MustComplex128Slice()
-- replaced := make([]complex128, len(arr))
+-#data
+-FOO<script>'<!-- <sCrIpt> -->'</script>BAR
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO"
+-| <script>
+-| "'<!-- <sCrIpt> -->'"
+-| "BAR"
-
-- v.EachComplex128(func(index int, val complex128) bool {
-- replaced[index] = replacer(index, val)
-- return true
-- })
+-#data
+-FOO<script type="text/plain">'<!-- <sCrIpt> --!>'</script>BAR
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO"
+-| <script>
+-| type="text/plain"
+-| "'<!-- <sCrIpt> --!>'</script>BAR"
-
-- return &Value{data: replaced}
+-#data
+-FOO<script type="text/plain">'<!-- <sCrIpt> -- >'</script>BAR
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO"
+-| <script>
+-| type="text/plain"
+-| "'<!-- <sCrIpt> -- >'</script>BAR"
-
--}
+-#data
+-FOO<script type="text/plain">'<!-- <sCrIpt '</script>BAR
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO"
+-| <script>
+-| type="text/plain"
+-| "'<!-- <sCrIpt '</script>BAR"
-
--// CollectComplex128 uses the specified collector function to collect a value
--// for each of the complex128s in the slice. The data returned will be a
--// []interface{}.
--func (v *Value) CollectComplex128(collector func(int, complex128) interface{}) *Value {
+-#data
+-FOO<script type="text/plain">'<!-- <sCrIpt/'</script>BAR
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO"
+-| <script>
+-| type="text/plain"
+-| "'<!-- <sCrIpt/'</script>BAR"
-
-- arr := v.MustComplex128Slice()
-- collected := make([]interface{}, len(arr))
+-#data
+-FOO<script type="text/plain">'<!-- <sCrIpt\'</script>BAR
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO"
+-| <script>
+-| type="text/plain"
+-| "'<!-- <sCrIpt\'"
+-| "BAR"
-
-- v.EachComplex128(func(index int, val complex128) bool {
-- collected[index] = collector(index, val)
-- return true
-- })
+-#data
+-FOO<script type="text/plain">'<!-- <sCrIpt/'</script>BAR</script>QUX
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "FOO"
+-| <script>
+-| type="text/plain"
+-| "'<!-- <sCrIpt/'</script>BAR"
+-| "QUX"
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/scripted/adoption01.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/scripted/adoption01.dat
+deleted file mode 100644
+index 4e08d0e..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/scripted/adoption01.dat
++++ /dev/null
+@@ -1,15 +0,0 @@
+-#data
+-<p><b id="A"><script>document.getElementById("A").id = "B"</script></p>TEXT</b>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <b>
+-| id="B"
+-| <script>
+-| "document.getElementById("A").id = "B""
+-| <b>
+-| id="A"
+-| "TEXT"
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/scripted/webkit01.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/scripted/webkit01.dat
+deleted file mode 100644
+index ef4a41c..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/scripted/webkit01.dat
++++ /dev/null
+@@ -1,28 +0,0 @@
+-#data
+-1<script>document.write("2")</script>3
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "1"
+-| <script>
+-| "document.write("2")"
+-| "23"
-
-- return &Value{data: collected}
--}
-diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/type_specific_codegen_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/type_specific_codegen_test.go
+-#data
+-1<script>document.write("<script>document.write('2')</scr"+ "ipt><script>document.write('3')</scr" + "ipt>")</script>4
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "1"
+-| <script>
+-| "document.write("<script>document.write('2')</scr"+ "ipt><script>document.write('3')</scr" + "ipt>")"
+-| <script>
+-| "document.write('2')"
+-| "2"
+-| <script>
+-| "document.write('3')"
+-| "34"
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tables01.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tables01.dat
deleted file mode 100644
-index f7a4fce..0000000
---- a/Godeps/_workspace/src/github.com/stretchr/objx/type_specific_codegen_test.go
+index c4b47e4..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tables01.dat
+++ /dev/null
-@@ -1,2867 +0,0 @@
--package objx
+@@ -1,212 +0,0 @@
+-#data
+-<table><th>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <th>
-
--import (
-- "fmt"
-- "github.com/stretchr/testify/assert"
-- "testing"
--)
+-#data
+-<table><td>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
-
--// ************************************************************
--// TESTS
--// ************************************************************
+-#data
+-<table><col foo='bar'>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <colgroup>
+-| <col>
+-| foo="bar"
-
--func TestInter(t *testing.T) {
+-#data
+-<table><colgroup></html>foo
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "foo"
+-| <table>
+-| <colgroup>
-
-- val := interface{}("something")
-- m := map[string]interface{}{"value": val, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").Inter())
-- assert.Equal(t, val, New(m).Get("value").MustInter())
-- assert.Equal(t, interface{}(nil), New(m).Get("nothing").Inter())
-- assert.Equal(t, val, New(m).Get("nothing").Inter("something"))
+-#data
+-<table></table><p>foo
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <p>
+-| "foo"
-
-- assert.Panics(t, func() {
-- New(m).Get("age").MustInter()
-- })
+-#data
+-<table></body></caption></col></colgroup></html></tbody></td></tfoot></th></thead></tr><td>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
-
--}
+-#data
+-<table><select><option>3</select></table>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <select>
+-| <option>
+-| "3"
+-| <table>
-
--func TestInterSlice(t *testing.T) {
+-#data
+-<table><select><table></table></select></table>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <select>
+-| <table>
+-| <table>
-
-- val := interface{}("something")
-- m := map[string]interface{}{"value": []interface{}{val}, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").InterSlice()[0])
-- assert.Equal(t, val, New(m).Get("value").MustInterSlice()[0])
-- assert.Equal(t, []interface{}(nil), New(m).Get("nothing").InterSlice())
-- assert.Equal(t, val, New(m).Get("nothing").InterSlice([]interface{}{interface{}("something")})[0])
+-#data
+-<table><select></table>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <select>
+-| <table>
-
-- assert.Panics(t, func() {
-- New(m).Get("nothing").MustInterSlice()
-- })
+-#data
+-<table><select><option>A<tr><td>B</td></tr></table>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <select>
+-| <option>
+-| "A"
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| "B"
-
--}
+-#data
+-<table><td></body></caption></col></colgroup></html>foo
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| "foo"
-
--func TestIsInter(t *testing.T) {
+-#data
+-<table><td>A</table>B
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| "A"
+-| "B"
-
-- var v *Value
+-#data
+-<table><tr><caption>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <caption>
-
-- v = &Value{data: interface{}("something")}
-- assert.True(t, v.IsInter())
+-#data
+-<table><tr></body></caption></col></colgroup></html></td></th><td>foo
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| "foo"
-
-- v = &Value{data: []interface{}{interface{}("something")}}
-- assert.True(t, v.IsInterSlice())
+-#data
+-<table><td><tr>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <tr>
-
--}
+-#data
+-<table><td><button><td>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <button>
+-| <td>
-
--func TestEachInter(t *testing.T) {
+-#data
+-<table><tr><td><svg><desc><td>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <svg svg>
+-| <svg desc>
+-| <td>
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests1.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests1.dat
+deleted file mode 100644
+index cbf8bdd..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests1.dat
++++ /dev/null
+@@ -1,1952 +0,0 @@
+-#data
+-Test
+-#errors
+-Line: 1 Col: 4 Unexpected non-space characters. Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "Test"
-
-- v := &Value{data: []interface{}{interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something")}}
-- count := 0
-- replacedVals := make([]interface{}, 0)
-- assert.Equal(t, v, v.EachInter(func(i int, val interface{}) bool {
+-#data
+-<p>One<p>Two
+-#errors
+-Line: 1 Col: 3 Unexpected start tag (p). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| "One"
+-| <p>
+-| "Two"
-
-- count++
-- replacedVals = append(replacedVals, val)
+-#data
+-Line1<br>Line2<br>Line3<br>Line4
+-#errors
+-Line: 1 Col: 5 Unexpected non-space characters. Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "Line1"
+-| <br>
+-| "Line2"
+-| <br>
+-| "Line3"
+-| <br>
+-| "Line4"
-
-- // abort early
-- if i == 2 {
-- return false
-- }
+-#data
+-<html>
+-#errors
+-Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
-
-- return true
+-#data
+-<head>
+-#errors
+-Line: 1 Col: 6 Unexpected start tag (head). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
-
-- }))
+-#data
+-<body>
+-#errors
+-Line: 1 Col: 6 Unexpected start tag (body). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
-
-- assert.Equal(t, count, 3)
-- assert.Equal(t, replacedVals[0], v.MustInterSlice()[0])
-- assert.Equal(t, replacedVals[1], v.MustInterSlice()[1])
-- assert.Equal(t, replacedVals[2], v.MustInterSlice()[2])
+-#data
+-<html><head>
+-#errors
+-Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
-
--}
+-#data
+-<html><head></head>
+-#errors
+-Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
-
--func TestWhereInter(t *testing.T) {
+-#data
+-<html><head></head><body>
+-#errors
+-Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
-
-- v := &Value{data: []interface{}{interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something")}}
+-#data
+-<html><head></head><body></body>
+-#errors
+-Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
-
-- selected := v.WhereInter(func(i int, val interface{}) bool {
-- return i%2 == 0
-- }).MustInterSlice()
+-#data
+-<html><head><body></body></html>
+-#errors
+-Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
-
-- assert.Equal(t, 3, len(selected))
+-#data
+-<html><head></body></html>
+-#errors
+-Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
+-Line: 1 Col: 19 Unexpected end tag (body).
+-Line: 1 Col: 26 Unexpected end tag (html).
+-#document
+-| <html>
+-| <head>
+-| <body>
+-
+-#data
+-<html><head><body></html>
+-#errors
+-Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-
+-#data
+-<html><body></html>
+-#errors
+-Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
-
--}
+-#data
+-<body></html>
+-#errors
+-Line: 1 Col: 6 Unexpected start tag (body). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
-
--func TestGroupInter(t *testing.T) {
+-#data
+-<head></html>
+-#errors
+-Line: 1 Col: 6 Unexpected start tag (head). Expected DOCTYPE.
+-Line: 1 Col: 13 Unexpected end tag (html). Ignored.
+-#document
+-| <html>
+-| <head>
+-| <body>
-
-- v := &Value{data: []interface{}{interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something")}}
+-#data
+-</head>
+-#errors
+-Line: 1 Col: 7 Unexpected end tag (head). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
-
-- grouped := v.GroupInter(func(i int, val interface{}) string {
-- return fmt.Sprintf("%v", i%2 == 0)
-- }).data.(map[string][]interface{})
+-#data
+-</body>
+-#errors
+-Line: 1 Col: 7 Unexpected end tag (body). Expected DOCTYPE.
+-Line: 1 Col: 7 Unexpected end tag (body) after the (implied) root element.
+-#document
+-| <html>
+-| <head>
+-| <body>
-
-- assert.Equal(t, 2, len(grouped))
-- assert.Equal(t, 3, len(grouped["true"]))
-- assert.Equal(t, 3, len(grouped["false"]))
+-#data
+-</html>
+-#errors
+-Line: 1 Col: 7 Unexpected end tag (html). Expected DOCTYPE.
+-Line: 1 Col: 7 Unexpected end tag (html) after the (implied) root element.
+-#document
+-| <html>
+-| <head>
+-| <body>
-
--}
+-#data
+-<b><table><td><i></table>
+-#errors
+-Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
+-Line: 1 Col: 14 Unexpected table cell start tag (td) in the table body phase.
+-Line: 1 Col: 25 Got table cell end tag (td) while required end tags are missing.
+-Line: 1 Col: 25 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <b>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <i>
-
--func TestReplaceInter(t *testing.T) {
+-#data
+-<b><table><td></b><i></table>X
+-#errors
+-Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
+-Line: 1 Col: 14 Unexpected table cell start tag (td) in the table body phase.
+-Line: 1 Col: 18 End tag (b) violates step 1, paragraph 1 of the adoption agency algorithm.
+-Line: 1 Col: 29 Got table cell end tag (td) while required end tags are missing.
+-Line: 1 Col: 30 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <b>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <i>
+-| "X"
-
-- v := &Value{data: []interface{}{interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something")}}
+-#data
+-<h1>Hello<h2>World
+-#errors
+-4: Start tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
+-13: Heading cannot be a child of another heading.
+-18: End of file seen and there were open elements.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <h1>
+-| "Hello"
+-| <h2>
+-| "World"
-
-- rawArr := v.MustInterSlice()
+-#data
+-<a><p>X<a>Y</a>Z</p></a>
+-#errors
+-Line: 1 Col: 3 Unexpected start tag (a). Expected DOCTYPE.
+-Line: 1 Col: 10 Unexpected start tag (a) implies end tag (a).
+-Line: 1 Col: 10 End tag (a) violates step 1, paragraph 3 of the adoption agency algorithm.
+-Line: 1 Col: 24 End tag (a) violates step 1, paragraph 1 of the adoption agency algorithm.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <a>
+-| <p>
+-| <a>
+-| "X"
+-| <a>
+-| "Y"
+-| "Z"
-
-- replaced := v.ReplaceInter(func(index int, val interface{}) interface{} {
-- if index < len(rawArr)-1 {
-- return rawArr[index+1]
-- }
-- return rawArr[0]
-- })
+-#data
+-<b><button>foo</b>bar
+-#errors
+-Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
+-Line: 1 Col: 15 End tag (b) violates step 1, paragraph 1 of the adoption agency algorithm.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <b>
+-| <button>
+-| <b>
+-| "foo"
+-| "bar"
-
-- replacedArr := replaced.MustInterSlice()
-- if assert.Equal(t, 6, len(replacedArr)) {
-- assert.Equal(t, replacedArr[0], rawArr[1])
-- assert.Equal(t, replacedArr[1], rawArr[2])
-- assert.Equal(t, replacedArr[2], rawArr[3])
-- assert.Equal(t, replacedArr[3], rawArr[4])
-- assert.Equal(t, replacedArr[4], rawArr[5])
-- assert.Equal(t, replacedArr[5], rawArr[0])
-- }
+-#data
+-<!DOCTYPE html><span><button>foo</span>bar
+-#errors
+-39: End tag “span” seen but there were unclosed elements.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <span>
+-| <button>
+-| "foobar"
-
--}
+-#data
+-<p><b><div><marquee></p></b></div>X
+-#errors
+-Line: 1 Col: 3 Unexpected start tag (p). Expected DOCTYPE.
+-Line: 1 Col: 11 Unexpected end tag (p). Ignored.
+-Line: 1 Col: 24 Unexpected end tag (p). Ignored.
+-Line: 1 Col: 28 End tag (b) violates step 1, paragraph 1 of the adoption agency algorithm.
+-Line: 1 Col: 34 End tag (div) seen too early. Expected other end tag.
+-Line: 1 Col: 35 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <b>
+-| <div>
+-| <b>
+-| <marquee>
+-| <p>
+-| "X"
-
--func TestCollectInter(t *testing.T) {
+-#data
+-<script><div></script></div><title><p></title><p><p>
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 28 Unexpected end tag (div). Ignored.
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<div>"
+-| <title>
+-| "<p>"
+-| <body>
+-| <p>
+-| <p>
-
-- v := &Value{data: []interface{}{interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something")}}
+-#data
+-<!--><div>--<!-->
+-#errors
+-Line: 1 Col: 5 Incorrect comment.
+-Line: 1 Col: 10 Unexpected start tag (div). Expected DOCTYPE.
+-Line: 1 Col: 17 Incorrect comment.
+-Line: 1 Col: 17 Expected closing tag. Unexpected end of file.
+-#document
+-| <!-- -->
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| "--"
+-| <!-- -->
-
-- collected := v.CollectInter(func(index int, val interface{}) interface{} {
-- return index
-- })
+-#data
+-<p><hr></p>
+-#errors
+-Line: 1 Col: 3 Unexpected start tag (p). Expected DOCTYPE.
+-Line: 1 Col: 11 Unexpected end tag (p). Ignored.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <hr>
+-| <p>
-
-- collectedArr := collected.MustInterSlice()
-- if assert.Equal(t, 6, len(collectedArr)) {
-- assert.Equal(t, collectedArr[0], 0)
-- assert.Equal(t, collectedArr[1], 1)
-- assert.Equal(t, collectedArr[2], 2)
-- assert.Equal(t, collectedArr[3], 3)
-- assert.Equal(t, collectedArr[4], 4)
-- assert.Equal(t, collectedArr[5], 5)
-- }
+-#data
+-<select><b><option><select><option></b></select>X
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (select). Expected DOCTYPE.
+-Line: 1 Col: 11 Unexpected start tag token (b) in the select phase. Ignored.
+-Line: 1 Col: 27 Unexpected select start tag in the select phase treated as select end tag.
+-Line: 1 Col: 39 End tag (b) violates step 1, paragraph 1 of the adoption agency algorithm.
+-Line: 1 Col: 48 Unexpected end tag (select). Ignored.
+-Line: 1 Col: 49 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <select>
+-| <option>
+-| <option>
+-| "X"
-
--}
+-#data
+-<a><table><td><a><table></table><a></tr><a></table><b>X</b>C<a>Y
+-#errors
+-Line: 1 Col: 3 Unexpected start tag (a). Expected DOCTYPE.
+-Line: 1 Col: 14 Unexpected table cell start tag (td) in the table body phase.
+-Line: 1 Col: 35 Unexpected start tag (a) implies end tag (a).
+-Line: 1 Col: 40 Got table cell end tag (td) while required end tags are missing.
+-Line: 1 Col: 43 Unexpected start tag (a) in table context caused voodoo mode.
+-Line: 1 Col: 43 Unexpected start tag (a) implies end tag (a).
+-Line: 1 Col: 43 End tag (a) violates step 1, paragraph 1 of the adoption agency algorithm.
+-Line: 1 Col: 51 Unexpected implied end tag (a) in the table phase.
+-Line: 1 Col: 63 Unexpected start tag (a) implies end tag (a).
+-Line: 1 Col: 64 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <a>
+-| <a>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <a>
+-| <table>
+-| <a>
+-| <a>
+-| <b>
+-| "X"
+-| "C"
+-| <a>
+-| "Y"
-
--// ************************************************************
--// TESTS
--// ************************************************************
+-#data
+-<a X>0<b>1<a Y>2
+-#errors
+-Line: 1 Col: 5 Unexpected start tag (a). Expected DOCTYPE.
+-Line: 1 Col: 15 Unexpected start tag (a) implies end tag (a).
+-Line: 1 Col: 15 End tag (a) violates step 1, paragraph 3 of the adoption agency algorithm.
+-Line: 1 Col: 16 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <a>
+-| x=""
+-| "0"
+-| <b>
+-| "1"
+-| <b>
+-| <a>
+-| y=""
+-| "2"
-
--func TestMSI(t *testing.T) {
+-#data
+-<!-----><font><div>hello<table>excite!<b>me!<th><i>please!</tr><!--X-->
+-#errors
+-Line: 1 Col: 7 Unexpected '-' after '--' found in comment.
+-Line: 1 Col: 14 Unexpected start tag (font). Expected DOCTYPE.
+-Line: 1 Col: 38 Unexpected non-space characters in table context caused voodoo mode.
+-Line: 1 Col: 41 Unexpected start tag (b) in table context caused voodoo mode.
+-Line: 1 Col: 48 Unexpected implied end tag (b) in the table phase.
+-Line: 1 Col: 48 Unexpected table cell start tag (th) in the table body phase.
+-Line: 1 Col: 63 Got table cell end tag (th) while required end tags are missing.
+-Line: 1 Col: 71 Unexpected end of file. Expected table content.
+-#document
+-| <!-- - -->
+-| <html>
+-| <head>
+-| <body>
+-| <font>
+-| <div>
+-| "helloexcite!"
+-| <b>
+-| "me!"
+-| <table>
+-| <tbody>
+-| <tr>
+-| <th>
+-| <i>
+-| "please!"
+-| <!-- X -->
-
-- val := map[string]interface{}(map[string]interface{}{"name": "Tyler"})
-- m := map[string]interface{}{"value": val, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").MSI())
-- assert.Equal(t, val, New(m).Get("value").MustMSI())
-- assert.Equal(t, map[string]interface{}(nil), New(m).Get("nothing").MSI())
-- assert.Equal(t, val, New(m).Get("nothing").MSI(map[string]interface{}{"name": "Tyler"}))
+-#data
+-<!DOCTYPE html><li>hello<li>world<ul>how<li>do</ul>you</body><!--do-->
+-#errors
+-Line: 1 Col: 61 Unexpected end tag (li). Missing end tag (body).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <li>
+-| "hello"
+-| <li>
+-| "world"
+-| <ul>
+-| "how"
+-| <li>
+-| "do"
+-| "you"
+-| <!-- do -->
-
-- assert.Panics(t, func() {
-- New(m).Get("age").MustMSI()
-- })
+-#data
+-<!DOCTYPE html>A<option>B<optgroup>C<select>D</option>E
+-#errors
+-Line: 1 Col: 54 Unexpected end tag (option) in the select phase. Ignored.
+-Line: 1 Col: 55 Expected closing tag. Unexpected end of file.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| "A"
+-| <option>
+-| "B"
+-| <optgroup>
+-| "C"
+-| <select>
+-| "DE"
-
--}
+-#data
+-<
+-#errors
+-Line: 1 Col: 1 Expected tag name. Got something else instead
+-Line: 1 Col: 1 Unexpected non-space characters. Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "<"
-
--func TestMSISlice(t *testing.T) {
+-#data
+-<#
+-#errors
+-Line: 1 Col: 1 Expected tag name. Got something else instead
+-Line: 1 Col: 1 Unexpected non-space characters. Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "<#"
-
-- val := map[string]interface{}(map[string]interface{}{"name": "Tyler"})
-- m := map[string]interface{}{"value": []map[string]interface{}{val}, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").MSISlice()[0])
-- assert.Equal(t, val, New(m).Get("value").MustMSISlice()[0])
-- assert.Equal(t, []map[string]interface{}(nil), New(m).Get("nothing").MSISlice())
-- assert.Equal(t, val, New(m).Get("nothing").MSISlice([]map[string]interface{}{map[string]interface{}(map[string]interface{}{"name": "Tyler"})})[0])
+-#data
+-</
+-#errors
+-Line: 1 Col: 2 Expected closing tag. Unexpected end of file.
+-Line: 1 Col: 2 Unexpected non-space characters. Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "</"
-
-- assert.Panics(t, func() {
-- New(m).Get("nothing").MustMSISlice()
-- })
+-#data
+-</#
+-#errors
+-Line: 1 Col: 2 Expected closing tag. Unexpected character '#' found.
+-Line: 1 Col: 3 Unexpected End of file. Expected DOCTYPE.
+-#document
+-| <!-- # -->
+-| <html>
+-| <head>
+-| <body>
-
--}
+-#data
+-<?
+-#errors
+-Line: 1 Col: 1 Expected tag name. Got '?' instead. (HTML doesn't support processing instructions.)
+-Line: 1 Col: 2 Unexpected End of file. Expected DOCTYPE.
+-#document
+-| <!-- ? -->
+-| <html>
+-| <head>
+-| <body>
-
--func TestIsMSI(t *testing.T) {
+-#data
+-<?#
+-#errors
+-Line: 1 Col: 1 Expected tag name. Got '?' instead. (HTML doesn't support processing instructions.)
+-Line: 1 Col: 3 Unexpected End of file. Expected DOCTYPE.
+-#document
+-| <!-- ?# -->
+-| <html>
+-| <head>
+-| <body>
-
-- var v *Value
+-#data
+-<!
+-#errors
+-Line: 1 Col: 2 Expected '--' or 'DOCTYPE'. Not found.
+-Line: 1 Col: 2 Unexpected End of file. Expected DOCTYPE.
+-#document
+-| <!-- -->
+-| <html>
+-| <head>
+-| <body>
-
-- v = &Value{data: map[string]interface{}(map[string]interface{}{"name": "Tyler"})}
-- assert.True(t, v.IsMSI())
+-#data
+-<!#
+-#errors
+-Line: 1 Col: 3 Expected '--' or 'DOCTYPE'. Not found.
+-Line: 1 Col: 3 Unexpected End of file. Expected DOCTYPE.
+-#document
+-| <!-- # -->
+-| <html>
+-| <head>
+-| <body>
-
-- v = &Value{data: []map[string]interface{}{map[string]interface{}(map[string]interface{}{"name": "Tyler"})}}
-- assert.True(t, v.IsMSISlice())
+-#data
+-<?COMMENT?>
+-#errors
+-Line: 1 Col: 1 Expected tag name. Got '?' instead. (HTML doesn't support processing instructions.)
+-Line: 1 Col: 11 Unexpected End of file. Expected DOCTYPE.
+-#document
+-| <!-- ?COMMENT? -->
+-| <html>
+-| <head>
+-| <body>
-
--}
+-#data
+-<!COMMENT>
+-#errors
+-Line: 1 Col: 2 Expected '--' or 'DOCTYPE'. Not found.
+-Line: 1 Col: 10 Unexpected End of file. Expected DOCTYPE.
+-#document
+-| <!-- COMMENT -->
+-| <html>
+-| <head>
+-| <body>
-
--func TestEachMSI(t *testing.T) {
+-#data
+-</ COMMENT >
+-#errors
+-Line: 1 Col: 2 Expected closing tag. Unexpected character ' ' found.
+-Line: 1 Col: 12 Unexpected End of file. Expected DOCTYPE.
+-#document
+-| <!-- COMMENT -->
+-| <html>
+-| <head>
+-| <body>
-
-- v := &Value{data: []map[string]interface{}{map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"})}}
-- count := 0
-- replacedVals := make([]map[string]interface{}, 0)
-- assert.Equal(t, v, v.EachMSI(func(i int, val map[string]interface{}) bool {
+-#data
+-<?COM--MENT?>
+-#errors
+-Line: 1 Col: 1 Expected tag name. Got '?' instead. (HTML doesn't support processing instructions.)
+-Line: 1 Col: 13 Unexpected End of file. Expected DOCTYPE.
+-#document
+-| <!-- ?COM--MENT? -->
+-| <html>
+-| <head>
+-| <body>
-
-- count++
-- replacedVals = append(replacedVals, val)
+-#data
+-<!COM--MENT>
+-#errors
+-Line: 1 Col: 2 Expected '--' or 'DOCTYPE'. Not found.
+-Line: 1 Col: 12 Unexpected End of file. Expected DOCTYPE.
+-#document
+-| <!-- COM--MENT -->
+-| <html>
+-| <head>
+-| <body>
-
-- // abort early
-- if i == 2 {
-- return false
-- }
+-#data
+-</ COM--MENT >
+-#errors
+-Line: 1 Col: 2 Expected closing tag. Unexpected character ' ' found.
+-Line: 1 Col: 14 Unexpected End of file. Expected DOCTYPE.
+-#document
+-| <!-- COM--MENT -->
+-| <html>
+-| <head>
+-| <body>
-
-- return true
+-#data
+-<!DOCTYPE html><style> EOF
+-#errors
+-Line: 1 Col: 26 Unexpected end of file. Expected end tag (style).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <style>
+-| " EOF"
+-| <body>
-
-- }))
+-#data
+-<!DOCTYPE html><script> <!-- </script> --> </script> EOF
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| " <!-- "
+-| " "
+-| <body>
+-| "--> EOF"
-
-- assert.Equal(t, count, 3)
-- assert.Equal(t, replacedVals[0], v.MustMSISlice()[0])
-- assert.Equal(t, replacedVals[1], v.MustMSISlice()[1])
-- assert.Equal(t, replacedVals[2], v.MustMSISlice()[2])
+-#data
+-<b><p></b>TEST
+-#errors
+-Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
+-Line: 1 Col: 10 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <b>
+-| <p>
+-| <b>
+-| "TEST"
-
--}
+-#data
+-<p id=a><b><p id=b></b>TEST
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (p). Expected DOCTYPE.
+-Line: 1 Col: 19 Unexpected end tag (p). Ignored.
+-Line: 1 Col: 23 End tag (b) violates step 1, paragraph 2 of the adoption agency algorithm.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| id="a"
+-| <b>
+-| <p>
+-| id="b"
+-| "TEST"
-
--func TestWhereMSI(t *testing.T) {
+-#data
+-<b id=a><p><b id=b></p></b>TEST
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (b). Expected DOCTYPE.
+-Line: 1 Col: 23 Unexpected end tag (p). Ignored.
+-Line: 1 Col: 27 End tag (b) violates step 1, paragraph 2 of the adoption agency algorithm.
+-Line: 1 Col: 31 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <b>
+-| id="a"
+-| <p>
+-| <b>
+-| id="b"
+-| "TEST"
-
-- v := &Value{data: []map[string]interface{}{map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"})}}
+-#data
+-<!DOCTYPE html><title>U-test</title><body><div><p>Test<u></p></div></body>
+-#errors
+-Line: 1 Col: 61 Unexpected end tag (p). Ignored.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <title>
+-| "U-test"
+-| <body>
+-| <div>
+-| <p>
+-| "Test"
+-| <u>
-
-- selected := v.WhereMSI(func(i int, val map[string]interface{}) bool {
-- return i%2 == 0
-- }).MustMSISlice()
+-#data
+-<!DOCTYPE html><font><table></font></table></font>
+-#errors
+-Line: 1 Col: 35 Unexpected end tag (font) in table context caused voodoo mode.
+-Line: 1 Col: 35 End tag (font) violates step 1, paragraph 1 of the adoption agency algorithm.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <font>
+-| <table>
-
-- assert.Equal(t, 3, len(selected))
+-#data
+-<font><p>hello<b>cruel</font>world
+-#errors
+-Line: 1 Col: 6 Unexpected start tag (font). Expected DOCTYPE.
+-Line: 1 Col: 29 End tag (font) violates step 1, paragraph 3 of the adoption agency algorithm.
+-Line: 1 Col: 29 End tag (font) violates step 1, paragraph 3 of the adoption agency algorithm.
+-Line: 1 Col: 34 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <font>
+-| <p>
+-| <font>
+-| "hello"
+-| <b>
+-| "cruel"
+-| <b>
+-| "world"
-
--}
+-#data
+-<b>Test</i>Test
+-#errors
+-Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
+-Line: 1 Col: 11 End tag (i) violates step 1, paragraph 1 of the adoption agency algorithm.
+-Line: 1 Col: 15 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <b>
+-| "TestTest"
-
--func TestGroupMSI(t *testing.T) {
+-#data
+-<b>A<cite>B<div>C
+-#errors
+-Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
+-Line: 1 Col: 17 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <b>
+-| "A"
+-| <cite>
+-| "B"
+-| <div>
+-| "C"
-
-- v := &Value{data: []map[string]interface{}{map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"})}}
+-#data
+-<b>A<cite>B<div>C</cite>D
+-#errors
+-Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
+-Line: 1 Col: 24 Unexpected end tag (cite). Ignored.
+-Line: 1 Col: 25 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <b>
+-| "A"
+-| <cite>
+-| "B"
+-| <div>
+-| "CD"
-
-- grouped := v.GroupMSI(func(i int, val map[string]interface{}) string {
-- return fmt.Sprintf("%v", i%2 == 0)
-- }).data.(map[string][]map[string]interface{})
+-#data
+-<b>A<cite>B<div>C</b>D
+-#errors
+-Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
+-Line: 1 Col: 21 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
+-Line: 1 Col: 22 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <b>
+-| "A"
+-| <cite>
+-| "B"
+-| <div>
+-| <b>
+-| "C"
+-| "D"
-
-- assert.Equal(t, 2, len(grouped))
-- assert.Equal(t, 3, len(grouped["true"]))
-- assert.Equal(t, 3, len(grouped["false"]))
+-#data
-
--}
+-#errors
+-Line: 1 Col: 0 Unexpected End of file. Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
-
--func TestReplaceMSI(t *testing.T) {
+-#data
+-<DIV>
+-#errors
+-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+-Line: 1 Col: 5 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
-
-- v := &Value{data: []map[string]interface{}{map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"})}}
+-#data
+-<DIV> abc
+-#errors
+-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+-Line: 1 Col: 9 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| " abc"
-
-- rawArr := v.MustMSISlice()
+-#data
+-<DIV> abc <B>
+-#errors
+-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+-Line: 1 Col: 13 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| " abc "
+-| <b>
-
-- replaced := v.ReplaceMSI(func(index int, val map[string]interface{}) map[string]interface{} {
-- if index < len(rawArr)-1 {
-- return rawArr[index+1]
-- }
-- return rawArr[0]
-- })
+-#data
+-<DIV> abc <B> def
+-#errors
+-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+-Line: 1 Col: 17 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| " abc "
+-| <b>
+-| " def"
-
-- replacedArr := replaced.MustMSISlice()
-- if assert.Equal(t, 6, len(replacedArr)) {
-- assert.Equal(t, replacedArr[0], rawArr[1])
-- assert.Equal(t, replacedArr[1], rawArr[2])
-- assert.Equal(t, replacedArr[2], rawArr[3])
-- assert.Equal(t, replacedArr[3], rawArr[4])
-- assert.Equal(t, replacedArr[4], rawArr[5])
-- assert.Equal(t, replacedArr[5], rawArr[0])
-- }
+-#data
+-<DIV> abc <B> def <I>
+-#errors
+-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+-Line: 1 Col: 21 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| " abc "
+-| <b>
+-| " def "
+-| <i>
-
--}
+-#data
+-<DIV> abc <B> def <I> ghi
+-#errors
+-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+-Line: 1 Col: 25 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| " abc "
+-| <b>
+-| " def "
+-| <i>
+-| " ghi"
-
--func TestCollectMSI(t *testing.T) {
+-#data
+-<DIV> abc <B> def <I> ghi <P>
+-#errors
+-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+-Line: 1 Col: 29 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| " abc "
+-| <b>
+-| " def "
+-| <i>
+-| " ghi "
+-| <p>
-
-- v := &Value{data: []map[string]interface{}{map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"})}}
+-#data
+-<DIV> abc <B> def <I> ghi <P> jkl
+-#errors
+-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+-Line: 1 Col: 33 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| " abc "
+-| <b>
+-| " def "
+-| <i>
+-| " ghi "
+-| <p>
+-| " jkl"
-
-- collected := v.CollectMSI(func(index int, val map[string]interface{}) interface{} {
-- return index
-- })
+-#data
+-<DIV> abc <B> def <I> ghi <P> jkl </B>
+-#errors
+-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+-Line: 1 Col: 38 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
+-Line: 1 Col: 38 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| " abc "
+-| <b>
+-| " def "
+-| <i>
+-| " ghi "
+-| <i>
+-| <p>
+-| <b>
+-| " jkl "
-
-- collectedArr := collected.MustInterSlice()
-- if assert.Equal(t, 6, len(collectedArr)) {
-- assert.Equal(t, collectedArr[0], 0)
-- assert.Equal(t, collectedArr[1], 1)
-- assert.Equal(t, collectedArr[2], 2)
-- assert.Equal(t, collectedArr[3], 3)
-- assert.Equal(t, collectedArr[4], 4)
-- assert.Equal(t, collectedArr[5], 5)
-- }
+-#data
+-<DIV> abc <B> def <I> ghi <P> jkl </B> mno
+-#errors
+-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+-Line: 1 Col: 38 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
+-Line: 1 Col: 42 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| " abc "
+-| <b>
+-| " def "
+-| <i>
+-| " ghi "
+-| <i>
+-| <p>
+-| <b>
+-| " jkl "
+-| " mno"
-
--}
+-#data
+-<DIV> abc <B> def <I> ghi <P> jkl </B> mno </I>
+-#errors
+-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+-Line: 1 Col: 38 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
+-Line: 1 Col: 47 End tag (i) violates step 1, paragraph 3 of the adoption agency algorithm.
+-Line: 1 Col: 47 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| " abc "
+-| <b>
+-| " def "
+-| <i>
+-| " ghi "
+-| <i>
+-| <p>
+-| <i>
+-| <b>
+-| " jkl "
+-| " mno "
-
--// ************************************************************
--// TESTS
--// ************************************************************
+-#data
+-<DIV> abc <B> def <I> ghi <P> jkl </B> mno </I> pqr
+-#errors
+-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+-Line: 1 Col: 38 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
+-Line: 1 Col: 47 End tag (i) violates step 1, paragraph 3 of the adoption agency algorithm.
+-Line: 1 Col: 51 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| " abc "
+-| <b>
+-| " def "
+-| <i>
+-| " ghi "
+-| <i>
+-| <p>
+-| <i>
+-| <b>
+-| " jkl "
+-| " mno "
+-| " pqr"
-
--func TestObjxMap(t *testing.T) {
+-#data
+-<DIV> abc <B> def <I> ghi <P> jkl </B> mno </I> pqr </P>
+-#errors
+-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+-Line: 1 Col: 38 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
+-Line: 1 Col: 47 End tag (i) violates step 1, paragraph 3 of the adoption agency algorithm.
+-Line: 1 Col: 56 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| " abc "
+-| <b>
+-| " def "
+-| <i>
+-| " ghi "
+-| <i>
+-| <p>
+-| <i>
+-| <b>
+-| " jkl "
+-| " mno "
+-| " pqr "
-
-- val := (Map)(New(1))
-- m := map[string]interface{}{"value": val, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").ObjxMap())
-- assert.Equal(t, val, New(m).Get("value").MustObjxMap())
-- assert.Equal(t, (Map)(New(nil)), New(m).Get("nothing").ObjxMap())
-- assert.Equal(t, val, New(m).Get("nothing").ObjxMap(New(1)))
+-#data
+-<DIV> abc <B> def <I> ghi <P> jkl </B> mno </I> pqr </P> stu
+-#errors
+-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+-Line: 1 Col: 38 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
+-Line: 1 Col: 47 End tag (i) violates step 1, paragraph 3 of the adoption agency algorithm.
+-Line: 1 Col: 60 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| " abc "
+-| <b>
+-| " def "
+-| <i>
+-| " ghi "
+-| <i>
+-| <p>
+-| <i>
+-| <b>
+-| " jkl "
+-| " mno "
+-| " pqr "
+-| " stu"
-
-- assert.Panics(t, func() {
-- New(m).Get("age").MustObjxMap()
-- })
+-#data
+-<test attribute-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------->
+-#errors
+-Line: 1 Col: 1040 Unexpected start tag (test). Expected DOCTYPE.
+-Line: 1 Col: 1040 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <test>
+-| attribute-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-----------------------------------------------------=""
-
--}
+-#data
+-<a href="blah">aba<table><a href="foo">br<tr><td></td></tr>x</table>aoe
+-#errors
+-Line: 1 Col: 15 Unexpected start tag (a). Expected DOCTYPE.
+-Line: 1 Col: 39 Unexpected start tag (a) in table context caused voodoo mode.
+-Line: 1 Col: 39 Unexpected start tag (a) implies end tag (a).
+-Line: 1 Col: 39 End tag (a) violates step 1, paragraph 1 of the adoption agency algorithm.
+-Line: 1 Col: 45 Unexpected implied end tag (a) in the table phase.
+-Line: 1 Col: 68 Unexpected implied end tag (a) in the table phase.
+-Line: 1 Col: 71 Expected closing tag. Unexpected end of file.
-
--func TestObjxMapSlice(t *testing.T) {
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <a>
+-| href="blah"
+-| "aba"
+-| <a>
+-| href="foo"
+-| "br"
+-| <a>
+-| href="foo"
+-| "x"
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <a>
+-| href="foo"
+-| "aoe"
-
-- val := (Map)(New(1))
-- m := map[string]interface{}{"value": [](Map){val}, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").ObjxMapSlice()[0])
-- assert.Equal(t, val, New(m).Get("value").MustObjxMapSlice()[0])
-- assert.Equal(t, [](Map)(nil), New(m).Get("nothing").ObjxMapSlice())
-- assert.Equal(t, val, New(m).Get("nothing").ObjxMapSlice([](Map){(Map)(New(1))})[0])
+-#data
+-<a href="blah">aba<table><tr><td><a href="foo">br</td></tr>x</table>aoe
+-#errors
+-Line: 1 Col: 15 Unexpected start tag (a). Expected DOCTYPE.
+-Line: 1 Col: 54 Got table cell end tag (td) while required end tags are missing.
+-Line: 1 Col: 60 Unexpected non-space characters in table context caused voodoo mode.
+-Line: 1 Col: 71 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <a>
+-| href="blah"
+-| "abax"
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <a>
+-| href="foo"
+-| "br"
+-| "aoe"
-
-- assert.Panics(t, func() {
-- New(m).Get("nothing").MustObjxMapSlice()
-- })
+-#data
+-<table><a href="blah">aba<tr><td><a href="foo">br</td></tr>x</table>aoe
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+-Line: 1 Col: 22 Unexpected start tag (a) in table context caused voodoo mode.
+-Line: 1 Col: 29 Unexpected implied end tag (a) in the table phase.
+-Line: 1 Col: 54 Got table cell end tag (td) while required end tags are missing.
+-Line: 1 Col: 68 Unexpected implied end tag (a) in the table phase.
+-Line: 1 Col: 71 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <a>
+-| href="blah"
+-| "aba"
+-| <a>
+-| href="blah"
+-| "x"
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <a>
+-| href="foo"
+-| "br"
+-| <a>
+-| href="blah"
+-| "aoe"
-
--}
+-#data
+-<a href=a>aa<marquee>aa<a href=b>bb</marquee>aa
+-#errors
+-Line: 1 Col: 10 Unexpected start tag (a). Expected DOCTYPE.
+-Line: 1 Col: 45 End tag (marquee) seen too early. Expected other end tag.
+-Line: 1 Col: 47 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <a>
+-| href="a"
+-| "aa"
+-| <marquee>
+-| "aa"
+-| <a>
+-| href="b"
+-| "bb"
+-| "aa"
-
--func TestIsObjxMap(t *testing.T) {
+-#data
+-<wbr><strike><code></strike><code><strike></code>
+-#errors
+-Line: 1 Col: 5 Unexpected start tag (wbr). Expected DOCTYPE.
+-Line: 1 Col: 28 End tag (strike) violates step 1, paragraph 3 of the adoption agency algorithm.
+-Line: 1 Col: 49 Unexpected end tag (code). Ignored.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <wbr>
+-| <strike>
+-| <code>
+-| <code>
+-| <code>
+-| <strike>
-
-- var v *Value
+-#data
+-<!DOCTYPE html><spacer>foo
+-#errors
+-26: End of file seen and there were open elements.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <spacer>
+-| "foo"
-
-- v = &Value{data: (Map)(New(1))}
-- assert.True(t, v.IsObjxMap())
+-#data
+-<title><meta></title><link><title><meta></title>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (title). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <title>
+-| "<meta>"
+-| <link>
+-| <title>
+-| "<meta>"
+-| <body>
-
-- v = &Value{data: [](Map){(Map)(New(1))}}
-- assert.True(t, v.IsObjxMapSlice())
+-#data
+-<style><!--</style><meta><script>--><link></script>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
+-Line: 1 Col: 51 Unexpected end of file. Expected end tag (style).
+-#document
+-| <html>
+-| <head>
+-| <style>
+-| "<!--"
+-| <meta>
+-| <script>
+-| "--><link>"
+-| <body>
-
--}
+-#data
+-<head><meta></head><link>
+-#errors
+-Line: 1 Col: 6 Unexpected start tag (head). Expected DOCTYPE.
+-Line: 1 Col: 25 Unexpected start tag (link) that can be in head. Moved.
+-#document
+-| <html>
+-| <head>
+-| <meta>
+-| <link>
+-| <body>
-
--func TestEachObjxMap(t *testing.T) {
+-#data
+-<table><tr><tr><td><td><span><th><span>X</table>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+-Line: 1 Col: 33 Got table cell end tag (td) while required end tags are missing.
+-Line: 1 Col: 48 Got table cell end tag (th) while required end tags are missing.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <tr>
+-| <td>
+-| <td>
+-| <span>
+-| <th>
+-| <span>
+-| "X"
-
-- v := &Value{data: [](Map){(Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1))}}
-- count := 0
-- replacedVals := make([](Map), 0)
-- assert.Equal(t, v, v.EachObjxMap(func(i int, val Map) bool {
+-#data
+-<body><body><base><link><meta><title><p></title><body><p></body>
+-#errors
+-Line: 1 Col: 6 Unexpected start tag (body). Expected DOCTYPE.
+-Line: 1 Col: 12 Unexpected start tag (body).
+-Line: 1 Col: 54 Unexpected start tag (body).
+-Line: 1 Col: 64 Unexpected end tag (p). Missing end tag (body).
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <base>
+-| <link>
+-| <meta>
+-| <title>
+-| "<p>"
+-| <p>
-
-- count++
-- replacedVals = append(replacedVals, val)
+-#data
+-<textarea><p></textarea>
+-#errors
+-Line: 1 Col: 10 Unexpected start tag (textarea). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <textarea>
+-| "<p>"
-
-- // abort early
-- if i == 2 {
-- return false
-- }
+-#data
+-<p><image></p>
+-#errors
+-Line: 1 Col: 3 Unexpected start tag (p). Expected DOCTYPE.
+-Line: 1 Col: 10 Unexpected start tag (image). Treated as img.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <img>
-
-- return true
+-#data
+-<a><table><a></table><p><a><div><a>
+-#errors
+-Line: 1 Col: 3 Unexpected start tag (a). Expected DOCTYPE.
+-Line: 1 Col: 13 Unexpected start tag (a) in table context caused voodoo mode.
+-Line: 1 Col: 13 Unexpected start tag (a) implies end tag (a).
+-Line: 1 Col: 13 End tag (a) violates step 1, paragraph 1 of the adoption agency algorithm.
+-Line: 1 Col: 21 Unexpected end tag (table). Expected end tag (a).
+-Line: 1 Col: 27 Unexpected start tag (a) implies end tag (a).
+-Line: 1 Col: 27 End tag (a) violates step 1, paragraph 2 of the adoption agency algorithm.
+-Line: 1 Col: 32 Unexpected end tag (p). Ignored.
+-Line: 1 Col: 35 Unexpected start tag (a) implies end tag (a).
+-Line: 1 Col: 35 End tag (a) violates step 1, paragraph 2 of the adoption agency algorithm.
+-Line: 1 Col: 35 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <a>
+-| <a>
+-| <table>
+-| <p>
+-| <a>
+-| <div>
+-| <a>
-
-- }))
+-#data
+-<head></p><meta><p>
+-#errors
+-Line: 1 Col: 6 Unexpected start tag (head). Expected DOCTYPE.
+-Line: 1 Col: 10 Unexpected end tag (p). Ignored.
+-#document
+-| <html>
+-| <head>
+-| <meta>
+-| <body>
+-| <p>
-
-- assert.Equal(t, count, 3)
-- assert.Equal(t, replacedVals[0], v.MustObjxMapSlice()[0])
-- assert.Equal(t, replacedVals[1], v.MustObjxMapSlice()[1])
-- assert.Equal(t, replacedVals[2], v.MustObjxMapSlice()[2])
+-#data
+-<head></html><meta><p>
+-#errors
+-Line: 1 Col: 6 Unexpected start tag (head). Expected DOCTYPE.
+-Line: 1 Col: 19 Unexpected start tag (meta).
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <meta>
+-| <p>
-
--}
+-#data
+-<b><table><td><i></table>
+-#errors
+-Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
+-Line: 1 Col: 14 Unexpected table cell start tag (td) in the table body phase.
+-Line: 1 Col: 25 Got table cell end tag (td) while required end tags are missing.
+-Line: 1 Col: 25 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <b>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <i>
-
--func TestWhereObjxMap(t *testing.T) {
+-#data
+-<b><table><td></b><i></table>
+-#errors
+-Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
+-Line: 1 Col: 14 Unexpected table cell start tag (td) in the table body phase.
+-Line: 1 Col: 18 End tag (b) violates step 1, paragraph 1 of the adoption agency algorithm.
+-Line: 1 Col: 29 Got table cell end tag (td) while required end tags are missing.
+-Line: 1 Col: 29 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <b>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <i>
-
-- v := &Value{data: [](Map){(Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1))}}
+-#data
+-<h1><h2>
+-#errors
+-4: Start tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
+-8: Heading cannot be a child of another heading.
+-8: End of file seen and there were open elements.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <h1>
+-| <h2>
-
-- selected := v.WhereObjxMap(func(i int, val Map) bool {
-- return i%2 == 0
-- }).MustObjxMapSlice()
+-#data
+-<a><p><a></a></p></a>
+-#errors
+-Line: 1 Col: 3 Unexpected start tag (a). Expected DOCTYPE.
+-Line: 1 Col: 9 Unexpected start tag (a) implies end tag (a).
+-Line: 1 Col: 9 End tag (a) violates step 1, paragraph 3 of the adoption agency algorithm.
+-Line: 1 Col: 21 End tag (a) violates step 1, paragraph 1 of the adoption agency algorithm.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <a>
+-| <p>
+-| <a>
+-| <a>
-
-- assert.Equal(t, 3, len(selected))
+-#data
+-<b><button></b></button></b>
+-#errors
+-Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
+-Line: 1 Col: 15 End tag (b) violates step 1, paragraph 1 of the adoption agency algorithm.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <b>
+-| <button>
+-| <b>
-
--}
+-#data
+-<p><b><div><marquee></p></b></div>
+-#errors
+-Line: 1 Col: 3 Unexpected start tag (p). Expected DOCTYPE.
+-Line: 1 Col: 11 Unexpected end tag (p). Ignored.
+-Line: 1 Col: 24 Unexpected end tag (p). Ignored.
+-Line: 1 Col: 28 End tag (b) violates step 1, paragraph 1 of the adoption agency algorithm.
+-Line: 1 Col: 34 End tag (div) seen too early. Expected other end tag.
+-Line: 1 Col: 34 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <b>
+-| <div>
+-| <b>
+-| <marquee>
+-| <p>
-
--func TestGroupObjxMap(t *testing.T) {
+-#data
+-<script></script></div><title></title><p><p>
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 23 Unexpected end tag (div). Ignored.
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| <title>
+-| <body>
+-| <p>
+-| <p>
-
-- v := &Value{data: [](Map){(Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1))}}
+-#data
+-<p><hr></p>
+-#errors
+-Line: 1 Col: 3 Unexpected start tag (p). Expected DOCTYPE.
+-Line: 1 Col: 11 Unexpected end tag (p). Ignored.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <hr>
+-| <p>
-
-- grouped := v.GroupObjxMap(func(i int, val Map) string {
-- return fmt.Sprintf("%v", i%2 == 0)
-- }).data.(map[string][](Map))
+-#data
+-<select><b><option><select><option></b></select>
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (select). Expected DOCTYPE.
+-Line: 1 Col: 11 Unexpected start tag token (b) in the select phase. Ignored.
+-Line: 1 Col: 27 Unexpected select start tag in the select phase treated as select end tag.
+-Line: 1 Col: 39 End tag (b) violates step 1, paragraph 1 of the adoption agency algorithm.
+-Line: 1 Col: 48 Unexpected end tag (select). Ignored.
+-Line: 1 Col: 48 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <select>
+-| <option>
+-| <option>
-
-- assert.Equal(t, 2, len(grouped))
-- assert.Equal(t, 3, len(grouped["true"]))
-- assert.Equal(t, 3, len(grouped["false"]))
+-#data
+-<html><head><title></title><body></body></html>
+-#errors
+-Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <title>
+-| <body>
-
--}
+-#data
+-<a><table><td><a><table></table><a></tr><a></table><a>
+-#errors
+-Line: 1 Col: 3 Unexpected start tag (a). Expected DOCTYPE.
+-Line: 1 Col: 14 Unexpected table cell start tag (td) in the table body phase.
+-Line: 1 Col: 35 Unexpected start tag (a) implies end tag (a).
+-Line: 1 Col: 40 Got table cell end tag (td) while required end tags are missing.
+-Line: 1 Col: 43 Unexpected start tag (a) in table context caused voodoo mode.
+-Line: 1 Col: 43 Unexpected start tag (a) implies end tag (a).
+-Line: 1 Col: 43 End tag (a) violates step 1, paragraph 1 of the adoption agency algorithm.
+-Line: 1 Col: 51 Unexpected implied end tag (a) in the table phase.
+-Line: 1 Col: 54 Unexpected start tag (a) implies end tag (a).
+-Line: 1 Col: 54 End tag (a) violates step 1, paragraph 2 of the adoption agency algorithm.
+-Line: 1 Col: 54 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <a>
+-| <a>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <a>
+-| <table>
+-| <a>
+-| <a>
-
--func TestReplaceObjxMap(t *testing.T) {
+-#data
+-<ul><li></li><div><li></div><li><li><div><li><address><li><b><em></b><li></ul>
+-#errors
+-Line: 1 Col: 4 Unexpected start tag (ul). Expected DOCTYPE.
+-Line: 1 Col: 45 Missing end tag (div, li).
+-Line: 1 Col: 58 Missing end tag (address, li).
+-Line: 1 Col: 69 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <ul>
+-| <li>
+-| <div>
+-| <li>
+-| <li>
+-| <li>
+-| <div>
+-| <li>
+-| <address>
+-| <li>
+-| <b>
+-| <em>
+-| <li>
-
-- v := &Value{data: [](Map){(Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1))}}
+-#data
+-<ul><li><ul></li><li>a</li></ul></li></ul>
+-#errors
+-XXX: fix me
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <ul>
+-| <li>
+-| <ul>
+-| <li>
+-| "a"
-
-- rawArr := v.MustObjxMapSlice()
+-#data
+-<frameset><frame><frameset><frame></frameset><noframes></noframes></frameset>
+-#errors
+-Line: 1 Col: 10 Unexpected start tag (frameset). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <frameset>
+-| <frame>
+-| <frameset>
+-| <frame>
+-| <noframes>
-
-- replaced := v.ReplaceObjxMap(func(index int, val Map) Map {
-- if index < len(rawArr)-1 {
-- return rawArr[index+1]
-- }
-- return rawArr[0]
-- })
+-#data
+-<h1><table><td><h3></table><h3></h1>
+-#errors
+-4: Start tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
+-15: “td” start tag in table body.
+-27: Unclosed elements.
+-31: Heading cannot be a child of another heading.
+-36: End tag “h1” seen but there were unclosed elements.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <h1>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <h3>
+-| <h3>
-
-- replacedArr := replaced.MustObjxMapSlice()
-- if assert.Equal(t, 6, len(replacedArr)) {
-- assert.Equal(t, replacedArr[0], rawArr[1])
-- assert.Equal(t, replacedArr[1], rawArr[2])
-- assert.Equal(t, replacedArr[2], rawArr[3])
-- assert.Equal(t, replacedArr[3], rawArr[4])
-- assert.Equal(t, replacedArr[4], rawArr[5])
-- assert.Equal(t, replacedArr[5], rawArr[0])
-- }
+-#data
+-<table><colgroup><col><colgroup><col><col><col><colgroup><col><col><thead><tr><td></table>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <colgroup>
+-| <col>
+-| <colgroup>
+-| <col>
+-| <col>
+-| <col>
+-| <colgroup>
+-| <col>
+-| <col>
+-| <thead>
+-| <tr>
+-| <td>
-
--}
+-#data
+-<table><col><tbody><col><tr><col><td><col></table><col>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+-Line: 1 Col: 37 Unexpected table cell start tag (td) in the table body phase.
+-Line: 1 Col: 55 Unexpected start tag col. Ignored.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <colgroup>
+-| <col>
+-| <tbody>
+-| <colgroup>
+-| <col>
+-| <tbody>
+-| <tr>
+-| <colgroup>
+-| <col>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <colgroup>
+-| <col>
-
--func TestCollectObjxMap(t *testing.T) {
+-#data
+-<table><colgroup><tbody><colgroup><tr><colgroup><td><colgroup></table><colgroup>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+-Line: 1 Col: 52 Unexpected table cell start tag (td) in the table body phase.
+-Line: 1 Col: 80 Unexpected start tag colgroup. Ignored.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <colgroup>
+-| <tbody>
+-| <colgroup>
+-| <tbody>
+-| <tr>
+-| <colgroup>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <colgroup>
-
-- v := &Value{data: [](Map){(Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1))}}
+-#data
+-</strong></b></em></i></u></strike></s></blink></tt></pre></big></small></font></select></h1></h2></h3></h4></h5></h6></body></br></a></img></title></span></style></script></table></th></td></tr></frame></area></link></param></hr></input></col></base></meta></basefont></bgsound></embed></spacer></p></dd></dt></caption></colgroup></tbody></tfoot></thead></address></blockquote></center></dir></div></dl></fieldset></listing></menu></ol></ul></li></nobr></wbr></form></button></marquee></object></html></frameset></head></iframe></image></isindex></noembed></noframes></noscript></optgroup></option></plaintext></textarea>
+-#errors
+-Line: 1 Col: 9 Unexpected end tag (strong). Expected DOCTYPE.
+-Line: 1 Col: 9 Unexpected end tag (strong) after the (implied) root element.
+-Line: 1 Col: 13 Unexpected end tag (b) after the (implied) root element.
+-Line: 1 Col: 18 Unexpected end tag (em) after the (implied) root element.
+-Line: 1 Col: 22 Unexpected end tag (i) after the (implied) root element.
+-Line: 1 Col: 26 Unexpected end tag (u) after the (implied) root element.
+-Line: 1 Col: 35 Unexpected end tag (strike) after the (implied) root element.
+-Line: 1 Col: 39 Unexpected end tag (s) after the (implied) root element.
+-Line: 1 Col: 47 Unexpected end tag (blink) after the (implied) root element.
+-Line: 1 Col: 52 Unexpected end tag (tt) after the (implied) root element.
+-Line: 1 Col: 58 Unexpected end tag (pre) after the (implied) root element.
+-Line: 1 Col: 64 Unexpected end tag (big) after the (implied) root element.
+-Line: 1 Col: 72 Unexpected end tag (small) after the (implied) root element.
+-Line: 1 Col: 79 Unexpected end tag (font) after the (implied) root element.
+-Line: 1 Col: 88 Unexpected end tag (select) after the (implied) root element.
+-Line: 1 Col: 93 Unexpected end tag (h1) after the (implied) root element.
+-Line: 1 Col: 98 Unexpected end tag (h2) after the (implied) root element.
+-Line: 1 Col: 103 Unexpected end tag (h3) after the (implied) root element.
+-Line: 1 Col: 108 Unexpected end tag (h4) after the (implied) root element.
+-Line: 1 Col: 113 Unexpected end tag (h5) after the (implied) root element.
+-Line: 1 Col: 118 Unexpected end tag (h6) after the (implied) root element.
+-Line: 1 Col: 125 Unexpected end tag (body) after the (implied) root element.
+-Line: 1 Col: 130 Unexpected end tag (br). Treated as br element.
+-Line: 1 Col: 134 End tag (a) violates step 1, paragraph 1 of the adoption agency algorithm.
+-Line: 1 Col: 140 This element (img) has no end tag.
+-Line: 1 Col: 148 Unexpected end tag (title). Ignored.
+-Line: 1 Col: 155 Unexpected end tag (span). Ignored.
+-Line: 1 Col: 163 Unexpected end tag (style). Ignored.
+-Line: 1 Col: 172 Unexpected end tag (script). Ignored.
+-Line: 1 Col: 180 Unexpected end tag (table). Ignored.
+-Line: 1 Col: 185 Unexpected end tag (th). Ignored.
+-Line: 1 Col: 190 Unexpected end tag (td). Ignored.
+-Line: 1 Col: 195 Unexpected end tag (tr). Ignored.
+-Line: 1 Col: 203 This element (frame) has no end tag.
+-Line: 1 Col: 210 This element (area) has no end tag.
+-Line: 1 Col: 217 Unexpected end tag (link). Ignored.
+-Line: 1 Col: 225 This element (param) has no end tag.
+-Line: 1 Col: 230 This element (hr) has no end tag.
+-Line: 1 Col: 238 This element (input) has no end tag.
+-Line: 1 Col: 244 Unexpected end tag (col). Ignored.
+-Line: 1 Col: 251 Unexpected end tag (base). Ignored.
+-Line: 1 Col: 258 Unexpected end tag (meta). Ignored.
+-Line: 1 Col: 269 This element (basefont) has no end tag.
+-Line: 1 Col: 279 This element (bgsound) has no end tag.
+-Line: 1 Col: 287 This element (embed) has no end tag.
+-Line: 1 Col: 296 This element (spacer) has no end tag.
+-Line: 1 Col: 300 Unexpected end tag (p). Ignored.
+-Line: 1 Col: 305 End tag (dd) seen too early. Expected other end tag.
+-Line: 1 Col: 310 End tag (dt) seen too early. Expected other end tag.
+-Line: 1 Col: 320 Unexpected end tag (caption). Ignored.
+-Line: 1 Col: 331 Unexpected end tag (colgroup). Ignored.
+-Line: 1 Col: 339 Unexpected end tag (tbody). Ignored.
+-Line: 1 Col: 347 Unexpected end tag (tfoot). Ignored.
+-Line: 1 Col: 355 Unexpected end tag (thead). Ignored.
+-Line: 1 Col: 365 End tag (address) seen too early. Expected other end tag.
+-Line: 1 Col: 378 End tag (blockquote) seen too early. Expected other end tag.
+-Line: 1 Col: 387 End tag (center) seen too early. Expected other end tag.
+-Line: 1 Col: 393 Unexpected end tag (dir). Ignored.
+-Line: 1 Col: 399 End tag (div) seen too early. Expected other end tag.
+-Line: 1 Col: 404 End tag (dl) seen too early. Expected other end tag.
+-Line: 1 Col: 415 End tag (fieldset) seen too early. Expected other end tag.
+-Line: 1 Col: 425 End tag (listing) seen too early. Expected other end tag.
+-Line: 1 Col: 432 End tag (menu) seen too early. Expected other end tag.
+-Line: 1 Col: 437 End tag (ol) seen too early. Expected other end tag.
+-Line: 1 Col: 442 End tag (ul) seen too early. Expected other end tag.
+-Line: 1 Col: 447 End tag (li) seen too early. Expected other end tag.
+-Line: 1 Col: 454 End tag (nobr) violates step 1, paragraph 1 of the adoption agency algorithm.
+-Line: 1 Col: 460 This element (wbr) has no end tag.
+-Line: 1 Col: 476 End tag (button) seen too early. Expected other end tag.
+-Line: 1 Col: 486 End tag (marquee) seen too early. Expected other end tag.
+-Line: 1 Col: 495 End tag (object) seen too early. Expected other end tag.
+-Line: 1 Col: 513 Unexpected end tag (html). Ignored.
+-Line: 1 Col: 513 Unexpected end tag (frameset). Ignored.
+-Line: 1 Col: 520 Unexpected end tag (head). Ignored.
+-Line: 1 Col: 529 Unexpected end tag (iframe). Ignored.
+-Line: 1 Col: 537 This element (image) has no end tag.
+-Line: 1 Col: 547 This element (isindex) has no end tag.
+-Line: 1 Col: 557 Unexpected end tag (noembed). Ignored.
+-Line: 1 Col: 568 Unexpected end tag (noframes). Ignored.
+-Line: 1 Col: 579 Unexpected end tag (noscript). Ignored.
+-Line: 1 Col: 590 Unexpected end tag (optgroup). Ignored.
+-Line: 1 Col: 599 Unexpected end tag (option). Ignored.
+-Line: 1 Col: 611 Unexpected end tag (plaintext). Ignored.
+-Line: 1 Col: 622 Unexpected end tag (textarea). Ignored.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <br>
+-| <p>
-
-- collected := v.CollectObjxMap(func(index int, val Map) interface{} {
-- return index
-- })
+-#data
+-<table><tr></strong></b></em></i></u></strike></s></blink></tt></pre></big></small></font></select></h1></h2></h3></h4></h5></h6></body></br></a></img></title></span></style></script></table></th></td></tr></frame></area></link></param></hr></input></col></base></meta></basefont></bgsound></embed></spacer></p></dd></dt></caption></colgroup></tbody></tfoot></thead></address></blockquote></center></dir></div></dl></fieldset></listing></menu></ol></ul></li></nobr></wbr></form></button></marquee></object></html></frameset></head></iframe></image></isindex></noembed></noframes></noscript></optgroup></option></plaintext></textarea>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+-Line: 1 Col: 20 Unexpected end tag (strong) in table context caused voodoo mode.
+-Line: 1 Col: 20 End tag (strong) violates step 1, paragraph 1 of the adoption agency algorithm.
+-Line: 1 Col: 24 Unexpected end tag (b) in table context caused voodoo mode.
+-Line: 1 Col: 24 End tag (b) violates step 1, paragraph 1 of the adoption agency algorithm.
+-Line: 1 Col: 29 Unexpected end tag (em) in table context caused voodoo mode.
+-Line: 1 Col: 29 End tag (em) violates step 1, paragraph 1 of the adoption agency algorithm.
+-Line: 1 Col: 33 Unexpected end tag (i) in table context caused voodoo mode.
+-Line: 1 Col: 33 End tag (i) violates step 1, paragraph 1 of the adoption agency algorithm.
+-Line: 1 Col: 37 Unexpected end tag (u) in table context caused voodoo mode.
+-Line: 1 Col: 37 End tag (u) violates step 1, paragraph 1 of the adoption agency algorithm.
+-Line: 1 Col: 46 Unexpected end tag (strike) in table context caused voodoo mode.
+-Line: 1 Col: 46 End tag (strike) violates step 1, paragraph 1 of the adoption agency algorithm.
+-Line: 1 Col: 50 Unexpected end tag (s) in table context caused voodoo mode.
+-Line: 1 Col: 50 End tag (s) violates step 1, paragraph 1 of the adoption agency algorithm.
+-Line: 1 Col: 58 Unexpected end tag (blink) in table context caused voodoo mode.
+-Line: 1 Col: 58 Unexpected end tag (blink). Ignored.
+-Line: 1 Col: 63 Unexpected end tag (tt) in table context caused voodoo mode.
+-Line: 1 Col: 63 End tag (tt) violates step 1, paragraph 1 of the adoption agency algorithm.
+-Line: 1 Col: 69 Unexpected end tag (pre) in table context caused voodoo mode.
+-Line: 1 Col: 69 End tag (pre) seen too early. Expected other end tag.
+-Line: 1 Col: 75 Unexpected end tag (big) in table context caused voodoo mode.
+-Line: 1 Col: 75 End tag (big) violates step 1, paragraph 1 of the adoption agency algorithm.
+-Line: 1 Col: 83 Unexpected end tag (small) in table context caused voodoo mode.
+-Line: 1 Col: 83 End tag (small) violates step 1, paragraph 1 of the adoption agency algorithm.
+-Line: 1 Col: 90 Unexpected end tag (font) in table context caused voodoo mode.
+-Line: 1 Col: 90 End tag (font) violates step 1, paragraph 1 of the adoption agency algorithm.
+-Line: 1 Col: 99 Unexpected end tag (select) in table context caused voodoo mode.
+-Line: 1 Col: 99 Unexpected end tag (select). Ignored.
+-Line: 1 Col: 104 Unexpected end tag (h1) in table context caused voodoo mode.
+-Line: 1 Col: 104 End tag (h1) seen too early. Expected other end tag.
+-Line: 1 Col: 109 Unexpected end tag (h2) in table context caused voodoo mode.
+-Line: 1 Col: 109 End tag (h2) seen too early. Expected other end tag.
+-Line: 1 Col: 114 Unexpected end tag (h3) in table context caused voodoo mode.
+-Line: 1 Col: 114 End tag (h3) seen too early. Expected other end tag.
+-Line: 1 Col: 119 Unexpected end tag (h4) in table context caused voodoo mode.
+-Line: 1 Col: 119 End tag (h4) seen too early. Expected other end tag.
+-Line: 1 Col: 124 Unexpected end tag (h5) in table context caused voodoo mode.
+-Line: 1 Col: 124 End tag (h5) seen too early. Expected other end tag.
+-Line: 1 Col: 129 Unexpected end tag (h6) in table context caused voodoo mode.
+-Line: 1 Col: 129 End tag (h6) seen too early. Expected other end tag.
+-Line: 1 Col: 136 Unexpected end tag (body) in the table row phase. Ignored.
+-Line: 1 Col: 141 Unexpected end tag (br) in table context caused voodoo mode.
+-Line: 1 Col: 141 Unexpected end tag (br). Treated as br element.
+-Line: 1 Col: 145 Unexpected end tag (a) in table context caused voodoo mode.
+-Line: 1 Col: 145 End tag (a) violates step 1, paragraph 1 of the adoption agency algorithm.
+-Line: 1 Col: 151 Unexpected end tag (img) in table context caused voodoo mode.
+-Line: 1 Col: 151 This element (img) has no end tag.
+-Line: 1 Col: 159 Unexpected end tag (title) in table context caused voodoo mode.
+-Line: 1 Col: 159 Unexpected end tag (title). Ignored.
+-Line: 1 Col: 166 Unexpected end tag (span) in table context caused voodoo mode.
+-Line: 1 Col: 166 Unexpected end tag (span). Ignored.
+-Line: 1 Col: 174 Unexpected end tag (style) in table context caused voodoo mode.
+-Line: 1 Col: 174 Unexpected end tag (style). Ignored.
+-Line: 1 Col: 183 Unexpected end tag (script) in table context caused voodoo mode.
+-Line: 1 Col: 183 Unexpected end tag (script). Ignored.
+-Line: 1 Col: 196 Unexpected end tag (th). Ignored.
+-Line: 1 Col: 201 Unexpected end tag (td). Ignored.
+-Line: 1 Col: 206 Unexpected end tag (tr). Ignored.
+-Line: 1 Col: 214 This element (frame) has no end tag.
+-Line: 1 Col: 221 This element (area) has no end tag.
+-Line: 1 Col: 228 Unexpected end tag (link). Ignored.
+-Line: 1 Col: 236 This element (param) has no end tag.
+-Line: 1 Col: 241 This element (hr) has no end tag.
+-Line: 1 Col: 249 This element (input) has no end tag.
+-Line: 1 Col: 255 Unexpected end tag (col). Ignored.
+-Line: 1 Col: 262 Unexpected end tag (base). Ignored.
+-Line: 1 Col: 269 Unexpected end tag (meta). Ignored.
+-Line: 1 Col: 280 This element (basefont) has no end tag.
+-Line: 1 Col: 290 This element (bgsound) has no end tag.
+-Line: 1 Col: 298 This element (embed) has no end tag.
+-Line: 1 Col: 307 This element (spacer) has no end tag.
+-Line: 1 Col: 311 Unexpected end tag (p). Ignored.
+-Line: 1 Col: 316 End tag (dd) seen too early. Expected other end tag.
+-Line: 1 Col: 321 End tag (dt) seen too early. Expected other end tag.
+-Line: 1 Col: 331 Unexpected end tag (caption). Ignored.
+-Line: 1 Col: 342 Unexpected end tag (colgroup). Ignored.
+-Line: 1 Col: 350 Unexpected end tag (tbody). Ignored.
+-Line: 1 Col: 358 Unexpected end tag (tfoot). Ignored.
+-Line: 1 Col: 366 Unexpected end tag (thead). Ignored.
+-Line: 1 Col: 376 End tag (address) seen too early. Expected other end tag.
+-Line: 1 Col: 389 End tag (blockquote) seen too early. Expected other end tag.
+-Line: 1 Col: 398 End tag (center) seen too early. Expected other end tag.
+-Line: 1 Col: 404 Unexpected end tag (dir). Ignored.
+-Line: 1 Col: 410 End tag (div) seen too early. Expected other end tag.
+-Line: 1 Col: 415 End tag (dl) seen too early. Expected other end tag.
+-Line: 1 Col: 426 End tag (fieldset) seen too early. Expected other end tag.
+-Line: 1 Col: 436 End tag (listing) seen too early. Expected other end tag.
+-Line: 1 Col: 443 End tag (menu) seen too early. Expected other end tag.
+-Line: 1 Col: 448 End tag (ol) seen too early. Expected other end tag.
+-Line: 1 Col: 453 End tag (ul) seen too early. Expected other end tag.
+-Line: 1 Col: 458 End tag (li) seen too early. Expected other end tag.
+-Line: 1 Col: 465 End tag (nobr) violates step 1, paragraph 1 of the adoption agency algorithm.
+-Line: 1 Col: 471 This element (wbr) has no end tag.
+-Line: 1 Col: 487 End tag (button) seen too early. Expected other end tag.
+-Line: 1 Col: 497 End tag (marquee) seen too early. Expected other end tag.
+-Line: 1 Col: 506 End tag (object) seen too early. Expected other end tag.
+-Line: 1 Col: 524 Unexpected end tag (html). Ignored.
+-Line: 1 Col: 524 Unexpected end tag (frameset). Ignored.
+-Line: 1 Col: 531 Unexpected end tag (head). Ignored.
+-Line: 1 Col: 540 Unexpected end tag (iframe). Ignored.
+-Line: 1 Col: 548 This element (image) has no end tag.
+-Line: 1 Col: 558 This element (isindex) has no end tag.
+-Line: 1 Col: 568 Unexpected end tag (noembed). Ignored.
+-Line: 1 Col: 579 Unexpected end tag (noframes). Ignored.
+-Line: 1 Col: 590 Unexpected end tag (noscript). Ignored.
+-Line: 1 Col: 601 Unexpected end tag (optgroup). Ignored.
+-Line: 1 Col: 610 Unexpected end tag (option). Ignored.
+-Line: 1 Col: 622 Unexpected end tag (plaintext). Ignored.
+-Line: 1 Col: 633 Unexpected end tag (textarea). Ignored.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <br>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <p>
-
-- collectedArr := collected.MustInterSlice()
-- if assert.Equal(t, 6, len(collectedArr)) {
-- assert.Equal(t, collectedArr[0], 0)
-- assert.Equal(t, collectedArr[1], 1)
-- assert.Equal(t, collectedArr[2], 2)
-- assert.Equal(t, collectedArr[3], 3)
-- assert.Equal(t, collectedArr[4], 4)
-- assert.Equal(t, collectedArr[5], 5)
-- }
+-#data
+-<frameset>
+-#errors
+-Line: 1 Col: 10 Unexpected start tag (frameset). Expected DOCTYPE.
+-Line: 1 Col: 10 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <frameset>
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests10.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests10.dat
+deleted file mode 100644
+index 4f8df86..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests10.dat
++++ /dev/null
+@@ -1,799 +0,0 @@
+-#data
+-<!DOCTYPE html><svg></svg>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
-
--}
+-#data
+-<!DOCTYPE html><svg></svg><![CDATA[a]]>
+-#errors
+-29: Bogus comment
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| <!-- [CDATA[a]] -->
-
--// ************************************************************
--// TESTS
--// ************************************************************
+-#data
+-<!DOCTYPE html><body><svg></svg>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
-
--func TestBool(t *testing.T) {
+-#data
+-<!DOCTYPE html><body><select><svg></svg></select>
+-#errors
+-35: Stray “svg” start tag.
+-42: Stray end tag “svg”
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <select>
-
-- val := bool(true)
-- m := map[string]interface{}{"value": val, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").Bool())
-- assert.Equal(t, val, New(m).Get("value").MustBool())
-- assert.Equal(t, bool(false), New(m).Get("nothing").Bool())
-- assert.Equal(t, val, New(m).Get("nothing").Bool(true))
+-#data
+-<!DOCTYPE html><body><select><option><svg></svg></option></select>
+-#errors
+-43: Stray “svg” start tag.
+-50: Stray end tag “svg”
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <select>
+-| <option>
-
-- assert.Panics(t, func() {
-- New(m).Get("age").MustBool()
-- })
+-#data
+-<!DOCTYPE html><body><table><svg></svg></table>
+-#errors
+-34: Start tag “svg” seen in “table”.
+-41: Stray end tag “svg”.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| <table>
-
--}
+-#data
+-<!DOCTYPE html><body><table><svg><g>foo</g></svg></table>
+-#errors
+-34: Start tag “svg” seen in “table”.
+-46: Stray end tag “g”.
+-53: Stray end tag “svg”.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| <svg g>
+-| "foo"
+-| <table>
-
--func TestBoolSlice(t *testing.T) {
+-#data
+-<!DOCTYPE html><body><table><svg><g>foo</g><g>bar</g></svg></table>
+-#errors
+-34: Start tag “svg” seen in “table”.
+-46: Stray end tag “g”.
+-58: Stray end tag “g”.
+-65: Stray end tag “svg”.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| <svg g>
+-| "foo"
+-| <svg g>
+-| "bar"
+-| <table>
-
-- val := bool(true)
-- m := map[string]interface{}{"value": []bool{val}, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").BoolSlice()[0])
-- assert.Equal(t, val, New(m).Get("value").MustBoolSlice()[0])
-- assert.Equal(t, []bool(nil), New(m).Get("nothing").BoolSlice())
-- assert.Equal(t, val, New(m).Get("nothing").BoolSlice([]bool{bool(true)})[0])
+-#data
+-<!DOCTYPE html><body><table><tbody><svg><g>foo</g><g>bar</g></svg></tbody></table>
+-#errors
+-41: Start tag “svg” seen in “table”.
+-53: Stray end tag “g”.
+-65: Stray end tag “g”.
+-72: Stray end tag “svg”.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| <svg g>
+-| "foo"
+-| <svg g>
+-| "bar"
+-| <table>
+-| <tbody>
-
-- assert.Panics(t, func() {
-- New(m).Get("nothing").MustBoolSlice()
-- })
+-#data
+-<!DOCTYPE html><body><table><tbody><tr><svg><g>foo</g><g>bar</g></svg></tr></tbody></table>
+-#errors
+-45: Start tag “svg” seen in “table”.
+-57: Stray end tag “g”.
+-69: Stray end tag “g”.
+-76: Stray end tag “svg”.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| <svg g>
+-| "foo"
+-| <svg g>
+-| "bar"
+-| <table>
+-| <tbody>
+-| <tr>
-
--}
+-#data
+-<!DOCTYPE html><body><table><tbody><tr><td><svg><g>foo</g><g>bar</g></svg></td></tr></tbody></table>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <svg svg>
+-| <svg g>
+-| "foo"
+-| <svg g>
+-| "bar"
-
--func TestIsBool(t *testing.T) {
+-#data
+-<!DOCTYPE html><body><table><tbody><tr><td><svg><g>foo</g><g>bar</g></svg><p>baz</td></tr></tbody></table>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <svg svg>
+-| <svg g>
+-| "foo"
+-| <svg g>
+-| "bar"
+-| <p>
+-| "baz"
-
-- var v *Value
+-#data
+-<!DOCTYPE html><body><table><caption><svg><g>foo</g><g>bar</g></svg><p>baz</caption></table>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <caption>
+-| <svg svg>
+-| <svg g>
+-| "foo"
+-| <svg g>
+-| "bar"
+-| <p>
+-| "baz"
-
-- v = &Value{data: bool(true)}
-- assert.True(t, v.IsBool())
+-#data
+-<!DOCTYPE html><body><table><caption><svg><g>foo</g><g>bar</g><p>baz</table><p>quux
+-#errors
+-70: HTML start tag “p” in a foreign namespace context.
+-81: “table” closed but “caption” was still open.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <caption>
+-| <svg svg>
+-| <svg g>
+-| "foo"
+-| <svg g>
+-| "bar"
+-| <p>
+-| "baz"
+-| <p>
+-| "quux"
-
-- v = &Value{data: []bool{bool(true)}}
-- assert.True(t, v.IsBoolSlice())
+-#data
+-<!DOCTYPE html><body><table><caption><svg><g>foo</g><g>bar</g>baz</table><p>quux
+-#errors
+-78: “table” closed but “caption” was still open.
+-78: Unclosed elements on stack.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <caption>
+-| <svg svg>
+-| <svg g>
+-| "foo"
+-| <svg g>
+-| "bar"
+-| "baz"
+-| <p>
+-| "quux"
-
--}
+-#data
+-<!DOCTYPE html><body><table><colgroup><svg><g>foo</g><g>bar</g><p>baz</table><p>quux
+-#errors
+-44: Start tag “svg” seen in “table”.
+-56: Stray end tag “g”.
+-68: Stray end tag “g”.
+-71: HTML start tag “p” in a foreign namespace context.
+-71: Start tag “p” seen in “table”.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| <svg g>
+-| "foo"
+-| <svg g>
+-| "bar"
+-| <p>
+-| "baz"
+-| <table>
+-| <colgroup>
+-| <p>
+-| "quux"
-
--func TestEachBool(t *testing.T) {
+-#data
+-<!DOCTYPE html><body><table><tr><td><select><svg><g>foo</g><g>bar</g><p>baz</table><p>quux
+-#errors
+-50: Stray “svg” start tag.
+-54: Stray “g” start tag.
+-62: Stray end tag “g”
+-66: Stray “g” start tag.
+-74: Stray end tag “g”
+-77: Stray “p” start tag.
+-88: “table” end tag with “select” open.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <select>
+-| "foobarbaz"
+-| <p>
+-| "quux"
-
-- v := &Value{data: []bool{bool(true), bool(true), bool(true), bool(true), bool(true)}}
-- count := 0
-- replacedVals := make([]bool, 0)
-- assert.Equal(t, v, v.EachBool(func(i int, val bool) bool {
+-#data
+-<!DOCTYPE html><body><table><select><svg><g>foo</g><g>bar</g><p>baz</table><p>quux
+-#errors
+-36: Start tag “select” seen in “table”.
+-42: Stray “svg” start tag.
+-46: Stray “g” start tag.
+-54: Stray end tag “g”
+-58: Stray “g” start tag.
+-66: Stray end tag “g”
+-69: Stray “p” start tag.
+-80: “table” end tag with “select” open.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <select>
+-| "foobarbaz"
+-| <table>
+-| <p>
+-| "quux"
-
-- count++
-- replacedVals = append(replacedVals, val)
+-#data
+-<!DOCTYPE html><body></body></html><svg><g>foo</g><g>bar</g><p>baz
+-#errors
+-41: Stray “svg” start tag.
+-68: HTML start tag “p” in a foreign namespace context.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| <svg g>
+-| "foo"
+-| <svg g>
+-| "bar"
+-| <p>
+-| "baz"
-
-- // abort early
-- if i == 2 {
-- return false
-- }
+-#data
+-<!DOCTYPE html><body></body><svg><g>foo</g><g>bar</g><p>baz
+-#errors
+-34: Stray “svg” start tag.
+-61: HTML start tag “p” in a foreign namespace context.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| <svg g>
+-| "foo"
+-| <svg g>
+-| "bar"
+-| <p>
+-| "baz"
-
-- return true
+-#data
+-<!DOCTYPE html><frameset><svg><g></g><g></g><p><span>
+-#errors
+-31: Stray “svg” start tag.
+-35: Stray “g” start tag.
+-40: Stray end tag “g”
+-44: Stray “g” start tag.
+-49: Stray end tag “g”
+-52: Stray “p” start tag.
+-58: Stray “span” start tag.
+-58: End of file seen and there were open elements.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <frameset>
-
-- }))
+-#data
+-<!DOCTYPE html><frameset></frameset><svg><g></g><g></g><p><span>
+-#errors
+-42: Stray “svg” start tag.
+-46: Stray “g” start tag.
+-51: Stray end tag “g”
+-55: Stray “g” start tag.
+-60: Stray end tag “g”
+-63: Stray “p” start tag.
+-69: Stray “span” start tag.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <frameset>
-
-- assert.Equal(t, count, 3)
-- assert.Equal(t, replacedVals[0], v.MustBoolSlice()[0])
-- assert.Equal(t, replacedVals[1], v.MustBoolSlice()[1])
-- assert.Equal(t, replacedVals[2], v.MustBoolSlice()[2])
+-#data
+-<!DOCTYPE html><body xlink:href=foo><svg xlink:href=foo></svg>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| xlink:href="foo"
+-| <svg svg>
+-| xlink href="foo"
-
--}
+-#data
+-<!DOCTYPE html><body xlink:href=foo xml:lang=en><svg><g xml:lang=en xlink:href=foo></g></svg>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| xlink:href="foo"
+-| xml:lang="en"
+-| <svg svg>
+-| <svg g>
+-| xlink href="foo"
+-| xml lang="en"
-
--func TestWhereBool(t *testing.T) {
+-#data
+-<!DOCTYPE html><body xlink:href=foo xml:lang=en><svg><g xml:lang=en xlink:href=foo /></svg>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| xlink:href="foo"
+-| xml:lang="en"
+-| <svg svg>
+-| <svg g>
+-| xlink href="foo"
+-| xml lang="en"
-
-- v := &Value{data: []bool{bool(true), bool(true), bool(true), bool(true), bool(true), bool(true)}}
+-#data
+-<!DOCTYPE html><body xlink:href=foo xml:lang=en><svg><g xml:lang=en xlink:href=foo />bar</svg>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| xlink:href="foo"
+-| xml:lang="en"
+-| <svg svg>
+-| <svg g>
+-| xlink href="foo"
+-| xml lang="en"
+-| "bar"
-
-- selected := v.WhereBool(func(i int, val bool) bool {
-- return i%2 == 0
-- }).MustBoolSlice()
+-#data
+-<svg></path>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
-
-- assert.Equal(t, 3, len(selected))
+-#data
+-<div><svg></div>a
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| <svg svg>
+-| "a"
-
--}
+-#data
+-<div><svg><path></div>a
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| <svg svg>
+-| <svg path>
+-| "a"
-
--func TestGroupBool(t *testing.T) {
+-#data
+-<div><svg><path></svg><path>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| <svg svg>
+-| <svg path>
+-| <path>
-
-- v := &Value{data: []bool{bool(true), bool(true), bool(true), bool(true), bool(true), bool(true)}}
+-#data
+-<div><svg><path><foreignObject><math></div>a
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| <svg svg>
+-| <svg path>
+-| <svg foreignObject>
+-| <math math>
+-| "a"
-
-- grouped := v.GroupBool(func(i int, val bool) string {
-- return fmt.Sprintf("%v", i%2 == 0)
-- }).data.(map[string][]bool)
+-#data
+-<div><svg><path><foreignObject><p></div>a
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| <svg svg>
+-| <svg path>
+-| <svg foreignObject>
+-| <p>
+-| "a"
-
-- assert.Equal(t, 2, len(grouped))
-- assert.Equal(t, 3, len(grouped["true"]))
-- assert.Equal(t, 3, len(grouped["false"]))
+-#data
+-<!DOCTYPE html><svg><desc><div><svg><ul>a
+-#errors
+-40: HTML start tag “ul” in a foreign namespace context.
+-41: End of file in a foreign namespace context.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| <svg desc>
+-| <div>
+-| <svg svg>
+-| <ul>
+-| "a"
-
--}
+-#data
+-<!DOCTYPE html><svg><desc><svg><ul>a
+-#errors
+-35: HTML start tag “ul” in a foreign namespace context.
+-36: End of file in a foreign namespace context.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| <svg desc>
+-| <svg svg>
+-| <ul>
+-| "a"
-
--func TestReplaceBool(t *testing.T) {
+-#data
+-<!DOCTYPE html><p><svg><desc><p>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <svg svg>
+-| <svg desc>
+-| <p>
-
-- v := &Value{data: []bool{bool(true), bool(true), bool(true), bool(true), bool(true), bool(true)}}
+-#data
+-<!DOCTYPE html><p><svg><title><p>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <svg svg>
+-| <svg title>
+-| <p>
-
-- rawArr := v.MustBoolSlice()
+-#data
+-<div><svg><path><foreignObject><p></foreignObject><p>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| <svg svg>
+-| <svg path>
+-| <svg foreignObject>
+-| <p>
+-| <p>
-
-- replaced := v.ReplaceBool(func(index int, val bool) bool {
-- if index < len(rawArr)-1 {
-- return rawArr[index+1]
-- }
-- return rawArr[0]
-- })
+-#data
+-<math><mi><div><object><div><span></span></div></object></div></mi><mi>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| <math mi>
+-| <div>
+-| <object>
+-| <div>
+-| <span>
+-| <math mi>
-
-- replacedArr := replaced.MustBoolSlice()
-- if assert.Equal(t, 6, len(replacedArr)) {
-- assert.Equal(t, replacedArr[0], rawArr[1])
-- assert.Equal(t, replacedArr[1], rawArr[2])
-- assert.Equal(t, replacedArr[2], rawArr[3])
-- assert.Equal(t, replacedArr[3], rawArr[4])
-- assert.Equal(t, replacedArr[4], rawArr[5])
-- assert.Equal(t, replacedArr[5], rawArr[0])
-- }
+-#data
+-<math><mi><svg><foreignObject><div><div></div></div></foreignObject></svg></mi><mi>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| <math mi>
+-| <svg svg>
+-| <svg foreignObject>
+-| <div>
+-| <div>
+-| <math mi>
-
--}
+-#data
+-<svg><script></script><path>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| <svg script>
+-| <svg path>
-
--func TestCollectBool(t *testing.T) {
+-#data
+-<table><svg></svg><tr>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| <table>
+-| <tbody>
+-| <tr>
-
-- v := &Value{data: []bool{bool(true), bool(true), bool(true), bool(true), bool(true), bool(true)}}
+-#data
+-<math><mi><mglyph>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| <math mi>
+-| <math mglyph>
-
-- collected := v.CollectBool(func(index int, val bool) interface{} {
-- return index
-- })
+-#data
+-<math><mi><malignmark>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| <math mi>
+-| <math malignmark>
-
-- collectedArr := collected.MustInterSlice()
-- if assert.Equal(t, 6, len(collectedArr)) {
-- assert.Equal(t, collectedArr[0], 0)
-- assert.Equal(t, collectedArr[1], 1)
-- assert.Equal(t, collectedArr[2], 2)
-- assert.Equal(t, collectedArr[3], 3)
-- assert.Equal(t, collectedArr[4], 4)
-- assert.Equal(t, collectedArr[5], 5)
-- }
+-#data
+-<math><mo><mglyph>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| <math mo>
+-| <math mglyph>
-
--}
+-#data
+-<math><mo><malignmark>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| <math mo>
+-| <math malignmark>
-
--// ************************************************************
--// TESTS
--// ************************************************************
+-#data
+-<math><mn><mglyph>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| <math mn>
+-| <math mglyph>
-
--func TestStr(t *testing.T) {
+-#data
+-<math><mn><malignmark>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| <math mn>
+-| <math malignmark>
-
-- val := string("hello")
-- m := map[string]interface{}{"value": val, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").Str())
-- assert.Equal(t, val, New(m).Get("value").MustStr())
-- assert.Equal(t, string(""), New(m).Get("nothing").Str())
-- assert.Equal(t, val, New(m).Get("nothing").Str("hello"))
+-#data
+-<math><ms><mglyph>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| <math ms>
+-| <math mglyph>
-
-- assert.Panics(t, func() {
-- New(m).Get("age").MustStr()
-- })
+-#data
+-<math><ms><malignmark>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| <math ms>
+-| <math malignmark>
-
--}
+-#data
+-<math><mtext><mglyph>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| <math mtext>
+-| <math mglyph>
-
--func TestStrSlice(t *testing.T) {
+-#data
+-<math><mtext><malignmark>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| <math mtext>
+-| <math malignmark>
-
-- val := string("hello")
-- m := map[string]interface{}{"value": []string{val}, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").StrSlice()[0])
-- assert.Equal(t, val, New(m).Get("value").MustStrSlice()[0])
-- assert.Equal(t, []string(nil), New(m).Get("nothing").StrSlice())
-- assert.Equal(t, val, New(m).Get("nothing").StrSlice([]string{string("hello")})[0])
+-#data
+-<math><annotation-xml><svg></svg></annotation-xml><mi>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| <math annotation-xml>
+-| <svg svg>
+-| <math mi>
-
-- assert.Panics(t, func() {
-- New(m).Get("nothing").MustStrSlice()
-- })
+-#data
+-<math><annotation-xml><svg><foreignObject><div><math><mi></mi></math><span></span></div></foreignObject><path></path></svg></annotation-xml><mi>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| <math annotation-xml>
+-| <svg svg>
+-| <svg foreignObject>
+-| <div>
+-| <math math>
+-| <math mi>
+-| <span>
+-| <svg path>
+-| <math mi>
-
--}
+-#data
+-<math><annotation-xml><svg><foreignObject><math><mi><svg></svg></mi><mo></mo></math><span></span></foreignObject><path></path></svg></annotation-xml><mi>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| <math annotation-xml>
+-| <svg svg>
+-| <svg foreignObject>
+-| <math math>
+-| <math mi>
+-| <svg svg>
+-| <math mo>
+-| <span>
+-| <svg path>
+-| <math mi>
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests11.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests11.dat
+deleted file mode 100644
+index 638cde4..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests11.dat
++++ /dev/null
+@@ -1,482 +0,0 @@
+-#data
+-<!DOCTYPE html><body><svg attributeName='' attributeType='' baseFrequency='' baseProfile='' calcMode='' clipPathUnits='' contentScriptType='' contentStyleType='' diffuseConstant='' edgeMode='' externalResourcesRequired='' filterRes='' filterUnits='' glyphRef='' gradientTransform='' gradientUnits='' kernelMatrix='' kernelUnitLength='' keyPoints='' keySplines='' keyTimes='' lengthAdjust='' limitingConeAngle='' markerHeight='' markerUnits='' markerWidth='' maskContentUnits='' maskUnits='' numOctaves='' pathLength='' patternContentUnits='' patternTransform='' patternUnits='' pointsAtX='' pointsAtY='' pointsAtZ='' preserveAlpha='' preserveAspectRatio='' primitiveUnits='' refX='' refY='' repeatCount='' repeatDur='' requiredExtensions='' requiredFeatures='' specularConstant='' specularExponent='' spreadMethod='' startOffset='' stdDeviation='' stitchTiles='' surfaceScale='' systemLanguage='' tableValues='' targetX='' targetY='' textLength='' viewBox='' viewTarget='' xChannelSelecto
r='' yChannelSelector='' zoomAndPan=''></svg>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| attributeName=""
+-| attributeType=""
+-| baseFrequency=""
+-| baseProfile=""
+-| calcMode=""
+-| clipPathUnits=""
+-| contentScriptType=""
+-| contentStyleType=""
+-| diffuseConstant=""
+-| edgeMode=""
+-| externalResourcesRequired=""
+-| filterRes=""
+-| filterUnits=""
+-| glyphRef=""
+-| gradientTransform=""
+-| gradientUnits=""
+-| kernelMatrix=""
+-| kernelUnitLength=""
+-| keyPoints=""
+-| keySplines=""
+-| keyTimes=""
+-| lengthAdjust=""
+-| limitingConeAngle=""
+-| markerHeight=""
+-| markerUnits=""
+-| markerWidth=""
+-| maskContentUnits=""
+-| maskUnits=""
+-| numOctaves=""
+-| pathLength=""
+-| patternContentUnits=""
+-| patternTransform=""
+-| patternUnits=""
+-| pointsAtX=""
+-| pointsAtY=""
+-| pointsAtZ=""
+-| preserveAlpha=""
+-| preserveAspectRatio=""
+-| primitiveUnits=""
+-| refX=""
+-| refY=""
+-| repeatCount=""
+-| repeatDur=""
+-| requiredExtensions=""
+-| requiredFeatures=""
+-| specularConstant=""
+-| specularExponent=""
+-| spreadMethod=""
+-| startOffset=""
+-| stdDeviation=""
+-| stitchTiles=""
+-| surfaceScale=""
+-| systemLanguage=""
+-| tableValues=""
+-| targetX=""
+-| targetY=""
+-| textLength=""
+-| viewBox=""
+-| viewTarget=""
+-| xChannelSelector=""
+-| yChannelSelector=""
+-| zoomAndPan=""
-
--func TestIsStr(t *testing.T) {
+-#data
+-<!DOCTYPE html><BODY><SVG ATTRIBUTENAME='' ATTRIBUTETYPE='' BASEFREQUENCY='' BASEPROFILE='' CALCMODE='' CLIPPATHUNITS='' CONTENTSCRIPTTYPE='' CONTENTSTYLETYPE='' DIFFUSECONSTANT='' EDGEMODE='' EXTERNALRESOURCESREQUIRED='' FILTERRES='' FILTERUNITS='' GLYPHREF='' GRADIENTTRANSFORM='' GRADIENTUNITS='' KERNELMATRIX='' KERNELUNITLENGTH='' KEYPOINTS='' KEYSPLINES='' KEYTIMES='' LENGTHADJUST='' LIMITINGCONEANGLE='' MARKERHEIGHT='' MARKERUNITS='' MARKERWIDTH='' MASKCONTENTUNITS='' MASKUNITS='' NUMOCTAVES='' PATHLENGTH='' PATTERNCONTENTUNITS='' PATTERNTRANSFORM='' PATTERNUNITS='' POINTSATX='' POINTSATY='' POINTSATZ='' PRESERVEALPHA='' PRESERVEASPECTRATIO='' PRIMITIVEUNITS='' REFX='' REFY='' REPEATCOUNT='' REPEATDUR='' REQUIREDEXTENSIONS='' REQUIREDFEATURES='' SPECULARCONSTANT='' SPECULAREXPONENT='' SPREADMETHOD='' STARTOFFSET='' STDDEVIATION='' STITCHTILES='' SURFACESCALE='' SYSTEMLANGUAGE='' TABLEVALUES='' TARGETX='' TARGETY='' TEXTLENGTH='' VIEWBOX='' VIEWTARGET='' XCHANNELSELECTO
R='' YCHANNELSELECTOR='' ZOOMANDPAN=''></SVG>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| attributeName=""
+-| attributeType=""
+-| baseFrequency=""
+-| baseProfile=""
+-| calcMode=""
+-| clipPathUnits=""
+-| contentScriptType=""
+-| contentStyleType=""
+-| diffuseConstant=""
+-| edgeMode=""
+-| externalResourcesRequired=""
+-| filterRes=""
+-| filterUnits=""
+-| glyphRef=""
+-| gradientTransform=""
+-| gradientUnits=""
+-| kernelMatrix=""
+-| kernelUnitLength=""
+-| keyPoints=""
+-| keySplines=""
+-| keyTimes=""
+-| lengthAdjust=""
+-| limitingConeAngle=""
+-| markerHeight=""
+-| markerUnits=""
+-| markerWidth=""
+-| maskContentUnits=""
+-| maskUnits=""
+-| numOctaves=""
+-| pathLength=""
+-| patternContentUnits=""
+-| patternTransform=""
+-| patternUnits=""
+-| pointsAtX=""
+-| pointsAtY=""
+-| pointsAtZ=""
+-| preserveAlpha=""
+-| preserveAspectRatio=""
+-| primitiveUnits=""
+-| refX=""
+-| refY=""
+-| repeatCount=""
+-| repeatDur=""
+-| requiredExtensions=""
+-| requiredFeatures=""
+-| specularConstant=""
+-| specularExponent=""
+-| spreadMethod=""
+-| startOffset=""
+-| stdDeviation=""
+-| stitchTiles=""
+-| surfaceScale=""
+-| systemLanguage=""
+-| tableValues=""
+-| targetX=""
+-| targetY=""
+-| textLength=""
+-| viewBox=""
+-| viewTarget=""
+-| xChannelSelector=""
+-| yChannelSelector=""
+-| zoomAndPan=""
-
-- var v *Value
+-#data
+-<!DOCTYPE html><body><svg attributename='' attributetype='' basefrequency='' baseprofile='' calcmode='' clippathunits='' contentscripttype='' contentstyletype='' diffuseconstant='' edgemode='' externalresourcesrequired='' filterres='' filterunits='' glyphref='' gradienttransform='' gradientunits='' kernelmatrix='' kernelunitlength='' keypoints='' keysplines='' keytimes='' lengthadjust='' limitingconeangle='' markerheight='' markerunits='' markerwidth='' maskcontentunits='' maskunits='' numoctaves='' pathlength='' patterncontentunits='' patterntransform='' patternunits='' pointsatx='' pointsaty='' pointsatz='' preservealpha='' preserveaspectratio='' primitiveunits='' refx='' refy='' repeatcount='' repeatdur='' requiredextensions='' requiredfeatures='' specularconstant='' specularexponent='' spreadmethod='' startoffset='' stddeviation='' stitchtiles='' surfacescale='' systemlanguage='' tablevalues='' targetx='' targety='' textlength='' viewbox='' viewtarget='' xchannelselecto
r='' ychannelselector='' zoomandpan=''></svg>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| attributeName=""
+-| attributeType=""
+-| baseFrequency=""
+-| baseProfile=""
+-| calcMode=""
+-| clipPathUnits=""
+-| contentScriptType=""
+-| contentStyleType=""
+-| diffuseConstant=""
+-| edgeMode=""
+-| externalResourcesRequired=""
+-| filterRes=""
+-| filterUnits=""
+-| glyphRef=""
+-| gradientTransform=""
+-| gradientUnits=""
+-| kernelMatrix=""
+-| kernelUnitLength=""
+-| keyPoints=""
+-| keySplines=""
+-| keyTimes=""
+-| lengthAdjust=""
+-| limitingConeAngle=""
+-| markerHeight=""
+-| markerUnits=""
+-| markerWidth=""
+-| maskContentUnits=""
+-| maskUnits=""
+-| numOctaves=""
+-| pathLength=""
+-| patternContentUnits=""
+-| patternTransform=""
+-| patternUnits=""
+-| pointsAtX=""
+-| pointsAtY=""
+-| pointsAtZ=""
+-| preserveAlpha=""
+-| preserveAspectRatio=""
+-| primitiveUnits=""
+-| refX=""
+-| refY=""
+-| repeatCount=""
+-| repeatDur=""
+-| requiredExtensions=""
+-| requiredFeatures=""
+-| specularConstant=""
+-| specularExponent=""
+-| spreadMethod=""
+-| startOffset=""
+-| stdDeviation=""
+-| stitchTiles=""
+-| surfaceScale=""
+-| systemLanguage=""
+-| tableValues=""
+-| targetX=""
+-| targetY=""
+-| textLength=""
+-| viewBox=""
+-| viewTarget=""
+-| xChannelSelector=""
+-| yChannelSelector=""
+-| zoomAndPan=""
-
-- v = &Value{data: string("hello")}
-- assert.True(t, v.IsStr())
+-#data
+-<!DOCTYPE html><body><math attributeName='' attributeType='' baseFrequency='' baseProfile='' calcMode='' clipPathUnits='' contentScriptType='' contentStyleType='' diffuseConstant='' edgeMode='' externalResourcesRequired='' filterRes='' filterUnits='' glyphRef='' gradientTransform='' gradientUnits='' kernelMatrix='' kernelUnitLength='' keyPoints='' keySplines='' keyTimes='' lengthAdjust='' limitingConeAngle='' markerHeight='' markerUnits='' markerWidth='' maskContentUnits='' maskUnits='' numOctaves='' pathLength='' patternContentUnits='' patternTransform='' patternUnits='' pointsAtX='' pointsAtY='' pointsAtZ='' preserveAlpha='' preserveAspectRatio='' primitiveUnits='' refX='' refY='' repeatCount='' repeatDur='' requiredExtensions='' requiredFeatures='' specularConstant='' specularExponent='' spreadMethod='' startOffset='' stdDeviation='' stitchTiles='' surfaceScale='' systemLanguage='' tableValues='' targetX='' targetY='' textLength='' viewBox='' viewTarget='' xChannelSelect
or='' yChannelSelector='' zoomAndPan=''></math>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| attributename=""
+-| attributetype=""
+-| basefrequency=""
+-| baseprofile=""
+-| calcmode=""
+-| clippathunits=""
+-| contentscripttype=""
+-| contentstyletype=""
+-| diffuseconstant=""
+-| edgemode=""
+-| externalresourcesrequired=""
+-| filterres=""
+-| filterunits=""
+-| glyphref=""
+-| gradienttransform=""
+-| gradientunits=""
+-| kernelmatrix=""
+-| kernelunitlength=""
+-| keypoints=""
+-| keysplines=""
+-| keytimes=""
+-| lengthadjust=""
+-| limitingconeangle=""
+-| markerheight=""
+-| markerunits=""
+-| markerwidth=""
+-| maskcontentunits=""
+-| maskunits=""
+-| numoctaves=""
+-| pathlength=""
+-| patterncontentunits=""
+-| patterntransform=""
+-| patternunits=""
+-| pointsatx=""
+-| pointsaty=""
+-| pointsatz=""
+-| preservealpha=""
+-| preserveaspectratio=""
+-| primitiveunits=""
+-| refx=""
+-| refy=""
+-| repeatcount=""
+-| repeatdur=""
+-| requiredextensions=""
+-| requiredfeatures=""
+-| specularconstant=""
+-| specularexponent=""
+-| spreadmethod=""
+-| startoffset=""
+-| stddeviation=""
+-| stitchtiles=""
+-| surfacescale=""
+-| systemlanguage=""
+-| tablevalues=""
+-| targetx=""
+-| targety=""
+-| textlength=""
+-| viewbox=""
+-| viewtarget=""
+-| xchannelselector=""
+-| ychannelselector=""
+-| zoomandpan=""
-
-- v = &Value{data: []string{string("hello")}}
-- assert.True(t, v.IsStrSlice())
+-#data
+-<!DOCTYPE html><body><svg><altGlyph /><altGlyphDef /><altGlyphItem /><animateColor /><animateMotion /><animateTransform /><clipPath /><feBlend /><feColorMatrix /><feComponentTransfer /><feComposite /><feConvolveMatrix /><feDiffuseLighting /><feDisplacementMap /><feDistantLight /><feFlood /><feFuncA /><feFuncB /><feFuncG /><feFuncR /><feGaussianBlur /><feImage /><feMerge /><feMergeNode /><feMorphology /><feOffset /><fePointLight /><feSpecularLighting /><feSpotLight /><feTile /><feTurbulence /><foreignObject /><glyphRef /><linearGradient /><radialGradient /><textPath /></svg>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| <svg altGlyph>
+-| <svg altGlyphDef>
+-| <svg altGlyphItem>
+-| <svg animateColor>
+-| <svg animateMotion>
+-| <svg animateTransform>
+-| <svg clipPath>
+-| <svg feBlend>
+-| <svg feColorMatrix>
+-| <svg feComponentTransfer>
+-| <svg feComposite>
+-| <svg feConvolveMatrix>
+-| <svg feDiffuseLighting>
+-| <svg feDisplacementMap>
+-| <svg feDistantLight>
+-| <svg feFlood>
+-| <svg feFuncA>
+-| <svg feFuncB>
+-| <svg feFuncG>
+-| <svg feFuncR>
+-| <svg feGaussianBlur>
+-| <svg feImage>
+-| <svg feMerge>
+-| <svg feMergeNode>
+-| <svg feMorphology>
+-| <svg feOffset>
+-| <svg fePointLight>
+-| <svg feSpecularLighting>
+-| <svg feSpotLight>
+-| <svg feTile>
+-| <svg feTurbulence>
+-| <svg foreignObject>
+-| <svg glyphRef>
+-| <svg linearGradient>
+-| <svg radialGradient>
+-| <svg textPath>
-
--}
+-#data
+-<!DOCTYPE html><body><svg><altglyph /><altglyphdef /><altglyphitem /><animatecolor /><animatemotion /><animatetransform /><clippath /><feblend /><fecolormatrix /><fecomponenttransfer /><fecomposite /><feconvolvematrix /><fediffuselighting /><fedisplacementmap /><fedistantlight /><feflood /><fefunca /><fefuncb /><fefuncg /><fefuncr /><fegaussianblur /><feimage /><femerge /><femergenode /><femorphology /><feoffset /><fepointlight /><fespecularlighting /><fespotlight /><fetile /><feturbulence /><foreignobject /><glyphref /><lineargradient /><radialgradient /><textpath /></svg>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| <svg altGlyph>
+-| <svg altGlyphDef>
+-| <svg altGlyphItem>
+-| <svg animateColor>
+-| <svg animateMotion>
+-| <svg animateTransform>
+-| <svg clipPath>
+-| <svg feBlend>
+-| <svg feColorMatrix>
+-| <svg feComponentTransfer>
+-| <svg feComposite>
+-| <svg feConvolveMatrix>
+-| <svg feDiffuseLighting>
+-| <svg feDisplacementMap>
+-| <svg feDistantLight>
+-| <svg feFlood>
+-| <svg feFuncA>
+-| <svg feFuncB>
+-| <svg feFuncG>
+-| <svg feFuncR>
+-| <svg feGaussianBlur>
+-| <svg feImage>
+-| <svg feMerge>
+-| <svg feMergeNode>
+-| <svg feMorphology>
+-| <svg feOffset>
+-| <svg fePointLight>
+-| <svg feSpecularLighting>
+-| <svg feSpotLight>
+-| <svg feTile>
+-| <svg feTurbulence>
+-| <svg foreignObject>
+-| <svg glyphRef>
+-| <svg linearGradient>
+-| <svg radialGradient>
+-| <svg textPath>
-
--func TestEachStr(t *testing.T) {
+-#data
+-<!DOCTYPE html><BODY><SVG><ALTGLYPH /><ALTGLYPHDEF /><ALTGLYPHITEM /><ANIMATECOLOR /><ANIMATEMOTION /><ANIMATETRANSFORM /><CLIPPATH /><FEBLEND /><FECOLORMATRIX /><FECOMPONENTTRANSFER /><FECOMPOSITE /><FECONVOLVEMATRIX /><FEDIFFUSELIGHTING /><FEDISPLACEMENTMAP /><FEDISTANTLIGHT /><FEFLOOD /><FEFUNCA /><FEFUNCB /><FEFUNCG /><FEFUNCR /><FEGAUSSIANBLUR /><FEIMAGE /><FEMERGE /><FEMERGENODE /><FEMORPHOLOGY /><FEOFFSET /><FEPOINTLIGHT /><FESPECULARLIGHTING /><FESPOTLIGHT /><FETILE /><FETURBULENCE /><FOREIGNOBJECT /><GLYPHREF /><LINEARGRADIENT /><RADIALGRADIENT /><TEXTPATH /></SVG>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| <svg altGlyph>
+-| <svg altGlyphDef>
+-| <svg altGlyphItem>
+-| <svg animateColor>
+-| <svg animateMotion>
+-| <svg animateTransform>
+-| <svg clipPath>
+-| <svg feBlend>
+-| <svg feColorMatrix>
+-| <svg feComponentTransfer>
+-| <svg feComposite>
+-| <svg feConvolveMatrix>
+-| <svg feDiffuseLighting>
+-| <svg feDisplacementMap>
+-| <svg feDistantLight>
+-| <svg feFlood>
+-| <svg feFuncA>
+-| <svg feFuncB>
+-| <svg feFuncG>
+-| <svg feFuncR>
+-| <svg feGaussianBlur>
+-| <svg feImage>
+-| <svg feMerge>
+-| <svg feMergeNode>
+-| <svg feMorphology>
+-| <svg feOffset>
+-| <svg fePointLight>
+-| <svg feSpecularLighting>
+-| <svg feSpotLight>
+-| <svg feTile>
+-| <svg feTurbulence>
+-| <svg foreignObject>
+-| <svg glyphRef>
+-| <svg linearGradient>
+-| <svg radialGradient>
+-| <svg textPath>
-
-- v := &Value{data: []string{string("hello"), string("hello"), string("hello"), string("hello"), string("hello")}}
-- count := 0
-- replacedVals := make([]string, 0)
-- assert.Equal(t, v, v.EachStr(func(i int, val string) bool {
+-#data
+-<!DOCTYPE html><body><math><altGlyph /><altGlyphDef /><altGlyphItem /><animateColor /><animateMotion /><animateTransform /><clipPath /><feBlend /><feColorMatrix /><feComponentTransfer /><feComposite /><feConvolveMatrix /><feDiffuseLighting /><feDisplacementMap /><feDistantLight /><feFlood /><feFuncA /><feFuncB /><feFuncG /><feFuncR /><feGaussianBlur /><feImage /><feMerge /><feMergeNode /><feMorphology /><feOffset /><fePointLight /><feSpecularLighting /><feSpotLight /><feTile /><feTurbulence /><foreignObject /><glyphRef /><linearGradient /><radialGradient /><textPath /></math>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| <math altglyph>
+-| <math altglyphdef>
+-| <math altglyphitem>
+-| <math animatecolor>
+-| <math animatemotion>
+-| <math animatetransform>
+-| <math clippath>
+-| <math feblend>
+-| <math fecolormatrix>
+-| <math fecomponenttransfer>
+-| <math fecomposite>
+-| <math feconvolvematrix>
+-| <math fediffuselighting>
+-| <math fedisplacementmap>
+-| <math fedistantlight>
+-| <math feflood>
+-| <math fefunca>
+-| <math fefuncb>
+-| <math fefuncg>
+-| <math fefuncr>
+-| <math fegaussianblur>
+-| <math feimage>
+-| <math femerge>
+-| <math femergenode>
+-| <math femorphology>
+-| <math feoffset>
+-| <math fepointlight>
+-| <math fespecularlighting>
+-| <math fespotlight>
+-| <math fetile>
+-| <math feturbulence>
+-| <math foreignobject>
+-| <math glyphref>
+-| <math lineargradient>
+-| <math radialgradient>
+-| <math textpath>
-
-- count++
-- replacedVals = append(replacedVals, val)
+-#data
+-<!DOCTYPE html><body><svg><solidColor /></svg>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| <svg solidcolor>
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests12.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests12.dat
+deleted file mode 100644
+index 63107d2..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests12.dat
++++ /dev/null
+@@ -1,62 +0,0 @@
+-#data
+-<!DOCTYPE html><body><p>foo<math><mtext><i>baz</i></mtext><annotation-xml><svg><desc><b>eggs</b></desc><g><foreignObject><P>spam<TABLE><tr><td><img></td></table></foreignObject></g><g>quux</g></svg></annotation-xml></math>bar
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| "foo"
+-| <math math>
+-| <math mtext>
+-| <i>
+-| "baz"
+-| <math annotation-xml>
+-| <svg svg>
+-| <svg desc>
+-| <b>
+-| "eggs"
+-| <svg g>
+-| <svg foreignObject>
+-| <p>
+-| "spam"
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <img>
+-| <svg g>
+-| "quux"
+-| "bar"
-
-- // abort early
-- if i == 2 {
-- return false
-- }
+-#data
+-<!DOCTYPE html><body>foo<math><mtext><i>baz</i></mtext><annotation-xml><svg><desc><b>eggs</b></desc><g><foreignObject><P>spam<TABLE><tr><td><img></td></table></foreignObject></g><g>quux</g></svg></annotation-xml></math>bar
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| "foo"
+-| <math math>
+-| <math mtext>
+-| <i>
+-| "baz"
+-| <math annotation-xml>
+-| <svg svg>
+-| <svg desc>
+-| <b>
+-| "eggs"
+-| <svg g>
+-| <svg foreignObject>
+-| <p>
+-| "spam"
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <img>
+-| <svg g>
+-| "quux"
+-| "bar"
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests14.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests14.dat
+deleted file mode 100644
+index b8713f8..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests14.dat
++++ /dev/null
+@@ -1,74 +0,0 @@
+-#data
+-<!DOCTYPE html><html><body><xyz:abc></xyz:abc>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <xyz:abc>
-
-- return true
+-#data
+-<!DOCTYPE html><html><body><xyz:abc></xyz:abc><span></span>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <xyz:abc>
+-| <span>
-
-- }))
+-#data
+-<!DOCTYPE html><html><html abc:def=gh><xyz:abc></xyz:abc>
+-#errors
+-15: Unexpected start tag html
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| abc:def="gh"
+-| <head>
+-| <body>
+-| <xyz:abc>
-
-- assert.Equal(t, count, 3)
-- assert.Equal(t, replacedVals[0], v.MustStrSlice()[0])
-- assert.Equal(t, replacedVals[1], v.MustStrSlice()[1])
-- assert.Equal(t, replacedVals[2], v.MustStrSlice()[2])
+-#data
+-<!DOCTYPE html><html xml:lang=bar><html xml:lang=foo>
+-#errors
+-15: Unexpected start tag html
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| xml:lang="bar"
+-| <head>
+-| <body>
-
--}
+-#data
+-<!DOCTYPE html><html 123=456>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| 123="456"
+-| <head>
+-| <body>
-
--func TestWhereStr(t *testing.T) {
+-#data
+-<!DOCTYPE html><html 123=456><html 789=012>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| 123="456"
+-| 789="012"
+-| <head>
+-| <body>
-
-- v := &Value{data: []string{string("hello"), string("hello"), string("hello"), string("hello"), string("hello"), string("hello")}}
+-#data
+-<!DOCTYPE html><html><body 789=012>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| 789="012"
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests15.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests15.dat
+deleted file mode 100644
+index 6ce1c0d..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests15.dat
++++ /dev/null
+@@ -1,208 +0,0 @@
+-#data
+-<!DOCTYPE html><p><b><i><u></p> <p>X
+-#errors
+-Line: 1 Col: 31 Unexpected end tag (p). Ignored.
+-Line: 1 Col: 36 Expected closing tag. Unexpected end of file.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <b>
+-| <i>
+-| <u>
+-| <b>
+-| <i>
+-| <u>
+-| " "
+-| <p>
+-| "X"
-
-- selected := v.WhereStr(func(i int, val string) bool {
-- return i%2 == 0
-- }).MustStrSlice()
+-#data
+-<p><b><i><u></p>
+-<p>X
+-#errors
+-Line: 1 Col: 3 Unexpected start tag (p). Expected DOCTYPE.
+-Line: 1 Col: 16 Unexpected end tag (p). Ignored.
+-Line: 2 Col: 4 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <b>
+-| <i>
+-| <u>
+-| <b>
+-| <i>
+-| <u>
+-| "
+-"
+-| <p>
+-| "X"
-
-- assert.Equal(t, 3, len(selected))
+-#data
+-<!doctype html></html> <head>
+-#errors
+-Line: 1 Col: 22 Unexpected end tag (html) after the (implied) root element.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| " "
-
--}
+-#data
+-<!doctype html></body><meta>
+-#errors
+-Line: 1 Col: 22 Unexpected end tag (body) after the (implied) root element.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <meta>
-
--func TestGroupStr(t *testing.T) {
+-#data
+-<html></html><!-- foo -->
+-#errors
+-Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
+-Line: 1 Col: 13 Unexpected end tag (html) after the (implied) root element.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <!-- foo -->
-
-- v := &Value{data: []string{string("hello"), string("hello"), string("hello"), string("hello"), string("hello"), string("hello")}}
+-#data
+-<!doctype html></body><title>X</title>
+-#errors
+-Line: 1 Col: 22 Unexpected end tag (body) after the (implied) root element.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <title>
+-| "X"
-
-- grouped := v.GroupStr(func(i int, val string) string {
-- return fmt.Sprintf("%v", i%2 == 0)
-- }).data.(map[string][]string)
+-#data
+-<!doctype html><table> X<meta></table>
+-#errors
+-Line: 1 Col: 24 Unexpected non-space characters in table context caused voodoo mode.
+-Line: 1 Col: 30 Unexpected start tag (meta) in table context caused voodoo mode.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| " X"
+-| <meta>
+-| <table>
-
-- assert.Equal(t, 2, len(grouped))
-- assert.Equal(t, 3, len(grouped["true"]))
-- assert.Equal(t, 3, len(grouped["false"]))
+-#data
+-<!doctype html><table> x</table>
+-#errors
+-Line: 1 Col: 24 Unexpected non-space characters in table context caused voodoo mode.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| " x"
+-| <table>
-
--}
+-#data
+-<!doctype html><table> x </table>
+-#errors
+-Line: 1 Col: 25 Unexpected non-space characters in table context caused voodoo mode.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| " x "
+-| <table>
-
--func TestReplaceStr(t *testing.T) {
+-#data
+-<!doctype html><table><tr> x</table>
+-#errors
+-Line: 1 Col: 28 Unexpected non-space characters in table context caused voodoo mode.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| " x"
+-| <table>
+-| <tbody>
+-| <tr>
-
-- v := &Value{data: []string{string("hello"), string("hello"), string("hello"), string("hello"), string("hello"), string("hello")}}
+-#data
+-<!doctype html><table>X<style> <tr>x </style> </table>
+-#errors
+-Line: 1 Col: 23 Unexpected non-space characters in table context caused voodoo mode.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| "X"
+-| <table>
+-| <style>
+-| " <tr>x "
+-| " "
-
-- rawArr := v.MustStrSlice()
+-#data
+-<!doctype html><div><table><a>foo</a> <tr><td>bar</td> </tr></table></div>
+-#errors
+-Line: 1 Col: 30 Unexpected start tag (a) in table context caused voodoo mode.
+-Line: 1 Col: 37 Unexpected end tag (a) in table context caused voodoo mode.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| <a>
+-| "foo"
+-| <table>
+-| " "
+-| <tbody>
+-| <tr>
+-| <td>
+-| "bar"
+-| " "
-
-- replaced := v.ReplaceStr(func(index int, val string) string {
-- if index < len(rawArr)-1 {
-- return rawArr[index+1]
-- }
-- return rawArr[0]
-- })
+-#data
+-<frame></frame></frame><frameset><frame><frameset><frame></frameset><noframes></frameset><noframes>
+-#errors
+-6: Start tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
+-13: Stray start tag “frame”.
+-21: Stray end tag “frame”.
+-29: Stray end tag “frame”.
+-39: “frameset” start tag after “body” already open.
+-105: End of file seen inside an [R]CDATA element.
+-105: End of file seen and there were open elements.
+-XXX: These errors are wrong, please fix me!
+-#document
+-| <html>
+-| <head>
+-| <frameset>
+-| <frame>
+-| <frameset>
+-| <frame>
+-| <noframes>
+-| "</frameset><noframes>"
-
-- replacedArr := replaced.MustStrSlice()
-- if assert.Equal(t, 6, len(replacedArr)) {
-- assert.Equal(t, replacedArr[0], rawArr[1])
-- assert.Equal(t, replacedArr[1], rawArr[2])
-- assert.Equal(t, replacedArr[2], rawArr[3])
-- assert.Equal(t, replacedArr[3], rawArr[4])
-- assert.Equal(t, replacedArr[4], rawArr[5])
-- assert.Equal(t, replacedArr[5], rawArr[0])
-- }
+-#data
+-<!DOCTYPE html><object></html>
+-#errors
+-1: Expected closing tag. Unexpected end of file
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <object>
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests16.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests16.dat
+deleted file mode 100644
+index c8ef66f..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests16.dat
++++ /dev/null
+@@ -1,2299 +0,0 @@
+-#data
+-<!doctype html><script>
+-#errors
+-Line: 1 Col: 23 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| <body>
-
--}
+-#data
+-<!doctype html><script>a
+-#errors
+-Line: 1 Col: 24 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "a"
+-| <body>
-
--func TestCollectStr(t *testing.T) {
+-#data
+-<!doctype html><script><
+-#errors
+-Line: 1 Col: 24 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<"
+-| <body>
-
-- v := &Value{data: []string{string("hello"), string("hello"), string("hello"), string("hello"), string("hello"), string("hello")}}
+-#data
+-<!doctype html><script></
+-#errors
+-Line: 1 Col: 25 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "</"
+-| <body>
-
-- collected := v.CollectStr(func(index int, val string) interface{} {
-- return index
-- })
+-#data
+-<!doctype html><script></S
+-#errors
+-Line: 1 Col: 26 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "</S"
+-| <body>
-
-- collectedArr := collected.MustInterSlice()
-- if assert.Equal(t, 6, len(collectedArr)) {
-- assert.Equal(t, collectedArr[0], 0)
-- assert.Equal(t, collectedArr[1], 1)
-- assert.Equal(t, collectedArr[2], 2)
-- assert.Equal(t, collectedArr[3], 3)
-- assert.Equal(t, collectedArr[4], 4)
-- assert.Equal(t, collectedArr[5], 5)
-- }
+-#data
+-<!doctype html><script></SC
+-#errors
+-Line: 1 Col: 27 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "</SC"
+-| <body>
-
--}
+-#data
+-<!doctype html><script></SCR
+-#errors
+-Line: 1 Col: 28 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "</SCR"
+-| <body>
-
--// ************************************************************
--// TESTS
--// ************************************************************
+-#data
+-<!doctype html><script></SCRI
+-#errors
+-Line: 1 Col: 29 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "</SCRI"
+-| <body>
-
--func TestInt(t *testing.T) {
+-#data
+-<!doctype html><script></SCRIP
+-#errors
+-Line: 1 Col: 30 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "</SCRIP"
+-| <body>
-
-- val := int(1)
-- m := map[string]interface{}{"value": val, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").Int())
-- assert.Equal(t, val, New(m).Get("value").MustInt())
-- assert.Equal(t, int(0), New(m).Get("nothing").Int())
-- assert.Equal(t, val, New(m).Get("nothing").Int(1))
+-#data
+-<!doctype html><script></SCRIPT
+-#errors
+-Line: 1 Col: 31 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "</SCRIPT"
+-| <body>
-
-- assert.Panics(t, func() {
-- New(m).Get("age").MustInt()
-- })
+-#data
+-<!doctype html><script></SCRIPT
+-#errors
+-Line: 1 Col: 32 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| <body>
-
--}
+-#data
+-<!doctype html><script></s
+-#errors
+-Line: 1 Col: 26 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "</s"
+-| <body>
-
--func TestIntSlice(t *testing.T) {
+-#data
+-<!doctype html><script></sc
+-#errors
+-Line: 1 Col: 27 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "</sc"
+-| <body>
-
-- val := int(1)
-- m := map[string]interface{}{"value": []int{val}, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").IntSlice()[0])
-- assert.Equal(t, val, New(m).Get("value").MustIntSlice()[0])
-- assert.Equal(t, []int(nil), New(m).Get("nothing").IntSlice())
-- assert.Equal(t, val, New(m).Get("nothing").IntSlice([]int{int(1)})[0])
+-#data
+-<!doctype html><script></scr
+-#errors
+-Line: 1 Col: 28 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "</scr"
+-| <body>
-
-- assert.Panics(t, func() {
-- New(m).Get("nothing").MustIntSlice()
-- })
+-#data
+-<!doctype html><script></scri
+-#errors
+-Line: 1 Col: 29 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "</scri"
+-| <body>
-
--}
+-#data
+-<!doctype html><script></scrip
+-#errors
+-Line: 1 Col: 30 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "</scrip"
+-| <body>
-
--func TestIsInt(t *testing.T) {
+-#data
+-<!doctype html><script></script
+-#errors
+-Line: 1 Col: 31 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "</script"
+-| <body>
-
-- var v *Value
+-#data
+-<!doctype html><script></script
+-#errors
+-Line: 1 Col: 32 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| <body>
-
-- v = &Value{data: int(1)}
-- assert.True(t, v.IsInt())
+-#data
+-<!doctype html><script><!
+-#errors
+-Line: 1 Col: 25 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!"
+-| <body>
-
-- v = &Value{data: []int{int(1)}}
-- assert.True(t, v.IsIntSlice())
+-#data
+-<!doctype html><script><!a
+-#errors
+-Line: 1 Col: 26 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!a"
+-| <body>
-
--}
+-#data
+-<!doctype html><script><!-
+-#errors
+-Line: 1 Col: 26 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!-"
+-| <body>
-
--func TestEachInt(t *testing.T) {
+-#data
+-<!doctype html><script><!-a
+-#errors
+-Line: 1 Col: 27 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!-a"
+-| <body>
-
-- v := &Value{data: []int{int(1), int(1), int(1), int(1), int(1)}}
-- count := 0
-- replacedVals := make([]int, 0)
-- assert.Equal(t, v, v.EachInt(func(i int, val int) bool {
+-#data
+-<!doctype html><script><!--
+-#errors
+-Line: 1 Col: 27 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--"
+-| <body>
-
-- count++
-- replacedVals = append(replacedVals, val)
+-#data
+-<!doctype html><script><!--a
+-#errors
+-Line: 1 Col: 28 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--a"
+-| <body>
-
-- // abort early
-- if i == 2 {
-- return false
-- }
+-#data
+-<!doctype html><script><!--<
+-#errors
+-Line: 1 Col: 28 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<"
+-| <body>
-
-- return true
+-#data
+-<!doctype html><script><!--<a
+-#errors
+-Line: 1 Col: 29 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<a"
+-| <body>
-
-- }))
+-#data
+-<!doctype html><script><!--</
+-#errors
+-Line: 1 Col: 27 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--</"
+-| <body>
-
-- assert.Equal(t, count, 3)
-- assert.Equal(t, replacedVals[0], v.MustIntSlice()[0])
-- assert.Equal(t, replacedVals[1], v.MustIntSlice()[1])
-- assert.Equal(t, replacedVals[2], v.MustIntSlice()[2])
+-#data
+-<!doctype html><script><!--</script
+-#errors
+-Line: 1 Col: 35 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--</script"
+-| <body>
-
--}
+-#data
+-<!doctype html><script><!--</script
+-#errors
+-Line: 1 Col: 36 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--"
+-| <body>
-
--func TestWhereInt(t *testing.T) {
+-#data
+-<!doctype html><script><!--<s
+-#errors
+-Line: 1 Col: 29 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<s"
+-| <body>
-
-- v := &Value{data: []int{int(1), int(1), int(1), int(1), int(1), int(1)}}
+-#data
+-<!doctype html><script><!--<script
+-#errors
+-Line: 1 Col: 34 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script"
+-| <body>
-
-- selected := v.WhereInt(func(i int, val int) bool {
-- return i%2 == 0
-- }).MustIntSlice()
+-#data
+-<!doctype html><script><!--<script
+-#errors
+-Line: 1 Col: 35 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script "
+-| <body>
-
-- assert.Equal(t, 3, len(selected))
+-#data
+-<!doctype html><script><!--<script <
+-#errors
+-Line: 1 Col: 36 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script <"
+-| <body>
-
--}
+-#data
+-<!doctype html><script><!--<script <a
+-#errors
+-Line: 1 Col: 37 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script <a"
+-| <body>
-
--func TestGroupInt(t *testing.T) {
+-#data
+-<!doctype html><script><!--<script </
+-#errors
+-Line: 1 Col: 37 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script </"
+-| <body>
-
-- v := &Value{data: []int{int(1), int(1), int(1), int(1), int(1), int(1)}}
+-#data
+-<!doctype html><script><!--<script </s
+-#errors
+-Line: 1 Col: 38 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script </s"
+-| <body>
-
-- grouped := v.GroupInt(func(i int, val int) string {
-- return fmt.Sprintf("%v", i%2 == 0)
-- }).data.(map[string][]int)
+-#data
+-<!doctype html><script><!--<script </script
+-#errors
+-Line: 1 Col: 43 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script </script"
+-| <body>
-
-- assert.Equal(t, 2, len(grouped))
-- assert.Equal(t, 3, len(grouped["true"]))
-- assert.Equal(t, 3, len(grouped["false"]))
+-#data
+-<!doctype html><script><!--<script </scripta
+-#errors
+-Line: 1 Col: 44 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script </scripta"
+-| <body>
-
--}
+-#data
+-<!doctype html><script><!--<script </script
+-#errors
+-Line: 1 Col: 44 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script </script "
+-| <body>
-
--func TestReplaceInt(t *testing.T) {
+-#data
+-<!doctype html><script><!--<script </script>
+-#errors
+-Line: 1 Col: 44 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script </script>"
+-| <body>
-
-- v := &Value{data: []int{int(1), int(1), int(1), int(1), int(1), int(1)}}
+-#data
+-<!doctype html><script><!--<script </script/
+-#errors
+-Line: 1 Col: 44 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script </script/"
+-| <body>
-
-- rawArr := v.MustIntSlice()
+-#data
+-<!doctype html><script><!--<script </script <
+-#errors
+-Line: 1 Col: 45 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script </script <"
+-| <body>
-
-- replaced := v.ReplaceInt(func(index int, val int) int {
-- if index < len(rawArr)-1 {
-- return rawArr[index+1]
-- }
-- return rawArr[0]
-- })
+-#data
+-<!doctype html><script><!--<script </script <a
+-#errors
+-Line: 1 Col: 46 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script </script <a"
+-| <body>
-
-- replacedArr := replaced.MustIntSlice()
-- if assert.Equal(t, 6, len(replacedArr)) {
-- assert.Equal(t, replacedArr[0], rawArr[1])
-- assert.Equal(t, replacedArr[1], rawArr[2])
-- assert.Equal(t, replacedArr[2], rawArr[3])
-- assert.Equal(t, replacedArr[3], rawArr[4])
-- assert.Equal(t, replacedArr[4], rawArr[5])
-- assert.Equal(t, replacedArr[5], rawArr[0])
-- }
+-#data
+-<!doctype html><script><!--<script </script </
+-#errors
+-Line: 1 Col: 46 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script </script </"
+-| <body>
-
--}
+-#data
+-<!doctype html><script><!--<script </script </script
+-#errors
+-Line: 1 Col: 52 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script </script </script"
+-| <body>
-
--func TestCollectInt(t *testing.T) {
+-#data
+-<!doctype html><script><!--<script </script </script
+-#errors
+-Line: 1 Col: 53 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script </script "
+-| <body>
-
-- v := &Value{data: []int{int(1), int(1), int(1), int(1), int(1), int(1)}}
+-#data
+-<!doctype html><script><!--<script </script </script/
+-#errors
+-Line: 1 Col: 53 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script </script "
+-| <body>
-
-- collected := v.CollectInt(func(index int, val int) interface{} {
-- return index
-- })
+-#data
+-<!doctype html><script><!--<script </script </script>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script </script "
+-| <body>
-
-- collectedArr := collected.MustInterSlice()
-- if assert.Equal(t, 6, len(collectedArr)) {
-- assert.Equal(t, collectedArr[0], 0)
-- assert.Equal(t, collectedArr[1], 1)
-- assert.Equal(t, collectedArr[2], 2)
-- assert.Equal(t, collectedArr[3], 3)
-- assert.Equal(t, collectedArr[4], 4)
-- assert.Equal(t, collectedArr[5], 5)
-- }
+-#data
+-<!doctype html><script><!--<script -
+-#errors
+-Line: 1 Col: 36 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script -"
+-| <body>
-
--}
+-#data
+-<!doctype html><script><!--<script -a
+-#errors
+-Line: 1 Col: 37 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script -a"
+-| <body>
-
--// ************************************************************
--// TESTS
--// ************************************************************
+-#data
+-<!doctype html><script><!--<script -<
+-#errors
+-Line: 1 Col: 37 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script -<"
+-| <body>
-
--func TestInt8(t *testing.T) {
+-#data
+-<!doctype html><script><!--<script --
+-#errors
+-Line: 1 Col: 37 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script --"
+-| <body>
-
-- val := int8(1)
-- m := map[string]interface{}{"value": val, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").Int8())
-- assert.Equal(t, val, New(m).Get("value").MustInt8())
-- assert.Equal(t, int8(0), New(m).Get("nothing").Int8())
-- assert.Equal(t, val, New(m).Get("nothing").Int8(1))
+-#data
+-<!doctype html><script><!--<script --a
+-#errors
+-Line: 1 Col: 38 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script --a"
+-| <body>
-
-- assert.Panics(t, func() {
-- New(m).Get("age").MustInt8()
-- })
+-#data
+-<!doctype html><script><!--<script --<
+-#errors
+-Line: 1 Col: 38 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script --<"
+-| <body>
-
--}
+-#data
+-<!doctype html><script><!--<script -->
+-#errors
+-Line: 1 Col: 38 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script -->"
+-| <body>
-
--func TestInt8Slice(t *testing.T) {
+-#data
+-<!doctype html><script><!--<script --><
+-#errors
+-Line: 1 Col: 39 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script --><"
+-| <body>
-
-- val := int8(1)
-- m := map[string]interface{}{"value": []int8{val}, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").Int8Slice()[0])
-- assert.Equal(t, val, New(m).Get("value").MustInt8Slice()[0])
-- assert.Equal(t, []int8(nil), New(m).Get("nothing").Int8Slice())
-- assert.Equal(t, val, New(m).Get("nothing").Int8Slice([]int8{int8(1)})[0])
+-#data
+-<!doctype html><script><!--<script --></
+-#errors
+-Line: 1 Col: 40 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script --></"
+-| <body>
-
-- assert.Panics(t, func() {
-- New(m).Get("nothing").MustInt8Slice()
-- })
+-#data
+-<!doctype html><script><!--<script --></script
+-#errors
+-Line: 1 Col: 46 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script --></script"
+-| <body>
-
--}
+-#data
+-<!doctype html><script><!--<script --></script
+-#errors
+-Line: 1 Col: 47 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script -->"
+-| <body>
-
--func TestIsInt8(t *testing.T) {
+-#data
+-<!doctype html><script><!--<script --></script/
+-#errors
+-Line: 1 Col: 47 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script -->"
+-| <body>
-
-- var v *Value
+-#data
+-<!doctype html><script><!--<script --></script>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script -->"
+-| <body>
-
-- v = &Value{data: int8(1)}
-- assert.True(t, v.IsInt8())
+-#data
+-<!doctype html><script><!--<script><\/script>--></script>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script><\/script>-->"
+-| <body>
-
-- v = &Value{data: []int8{int8(1)}}
-- assert.True(t, v.IsInt8Slice())
+-#data
+-<!doctype html><script><!--<script></scr'+'ipt>--></script>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script></scr'+'ipt>-->"
+-| <body>
-
--}
+-#data
+-<!doctype html><script><!--<script></script><script></script></script>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script></script><script></script>"
+-| <body>
-
--func TestEachInt8(t *testing.T) {
+-#data
+-<!doctype html><script><!--<script></script><script></script>--><!--</script>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script></script><script></script>--><!--"
+-| <body>
-
-- v := &Value{data: []int8{int8(1), int8(1), int8(1), int8(1), int8(1)}}
-- count := 0
-- replacedVals := make([]int8, 0)
-- assert.Equal(t, v, v.EachInt8(func(i int, val int8) bool {
+-#data
+-<!doctype html><script><!--<script></script><script></script>-- ></script>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script></script><script></script>-- >"
+-| <body>
-
-- count++
-- replacedVals = append(replacedVals, val)
+-#data
+-<!doctype html><script><!--<script></script><script></script>- -></script>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script></script><script></script>- ->"
+-| <body>
-
-- // abort early
-- if i == 2 {
-- return false
-- }
+-#data
+-<!doctype html><script><!--<script></script><script></script>- - ></script>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script></script><script></script>- - >"
+-| <body>
-
-- return true
+-#data
+-<!doctype html><script><!--<script></script><script></script>-></script>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script></script><script></script>->"
+-| <body>
-
-- }))
+-#data
+-<!doctype html><script><!--<script>--!></script>X
+-#errors
+-Line: 1 Col: 49 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script>--!></script>X"
+-| <body>
-
-- assert.Equal(t, count, 3)
-- assert.Equal(t, replacedVals[0], v.MustInt8Slice()[0])
-- assert.Equal(t, replacedVals[1], v.MustInt8Slice()[1])
-- assert.Equal(t, replacedVals[2], v.MustInt8Slice()[2])
+-#data
+-<!doctype html><script><!--<scr'+'ipt></script>--></script>
+-#errors
+-Line: 1 Col: 59 Unexpected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<scr'+'ipt>"
+-| <body>
+-| "-->"
-
--}
+-#data
+-<!doctype html><script><!--<script></scr'+'ipt></script>X
+-#errors
+-Line: 1 Col: 57 Unexpected end of file. Expected end tag (script).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script></scr'+'ipt></script>X"
+-| <body>
-
--func TestWhereInt8(t *testing.T) {
+-#data
+-<!doctype html><style><!--<style></style>--></style>
+-#errors
+-Line: 1 Col: 52 Unexpected end tag (style).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <style>
+-| "<!--<style>"
+-| <body>
+-| "-->"
-
-- v := &Value{data: []int8{int8(1), int8(1), int8(1), int8(1), int8(1), int8(1)}}
+-#data
+-<!doctype html><style><!--</style>X
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <style>
+-| "<!--"
+-| <body>
+-| "X"
-
-- selected := v.WhereInt8(func(i int, val int8) bool {
-- return i%2 == 0
-- }).MustInt8Slice()
+-#data
+-<!doctype html><style><!--...</style>...--></style>
+-#errors
+-Line: 1 Col: 51 Unexpected end tag (style).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <style>
+-| "<!--..."
+-| <body>
+-| "...-->"
-
-- assert.Equal(t, 3, len(selected))
+-#data
+-<!doctype html><style><!--<br><html xmlns:v="urn:schemas-microsoft-com:vml"><!--[if !mso]><style></style>X
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <style>
+-| "<!--<br><html xmlns:v="urn:schemas-microsoft-com:vml"><!--[if !mso]><style>"
+-| <body>
+-| "X"
-
--}
+-#data
+-<!doctype html><style><!--...<style><!--...--!></style>--></style>
+-#errors
+-Line: 1 Col: 66 Unexpected end tag (style).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <style>
+-| "<!--...<style><!--...--!>"
+-| <body>
+-| "-->"
-
--func TestGroupInt8(t *testing.T) {
+-#data
+-<!doctype html><style><!--...</style><!-- --><style>@import ...</style>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <style>
+-| "<!--..."
+-| <!-- -->
+-| <style>
+-| "@import ..."
+-| <body>
-
-- v := &Value{data: []int8{int8(1), int8(1), int8(1), int8(1), int8(1), int8(1)}}
+-#data
+-<!doctype html><style>...<style><!--...</style><!-- --></style>
+-#errors
+-Line: 1 Col: 63 Unexpected end tag (style).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <style>
+-| "...<style><!--..."
+-| <!-- -->
+-| <body>
-
-- grouped := v.GroupInt8(func(i int, val int8) string {
-- return fmt.Sprintf("%v", i%2 == 0)
-- }).data.(map[string][]int8)
+-#data
+-<!doctype html><style>...<!--[if IE]><style>...</style>X
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <style>
+-| "...<!--[if IE]><style>..."
+-| <body>
+-| "X"
-
-- assert.Equal(t, 2, len(grouped))
-- assert.Equal(t, 3, len(grouped["true"]))
-- assert.Equal(t, 3, len(grouped["false"]))
+-#data
+-<!doctype html><title><!--<title></title>--></title>
+-#errors
+-Line: 1 Col: 52 Unexpected end tag (title).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <title>
+-| "<!--<title>"
+-| <body>
+-| "-->"
-
--}
+-#data
+-<!doctype html><title></title></title>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <title>
+-| "</title>"
+-| <body>
-
--func TestReplaceInt8(t *testing.T) {
+-#data
+-<!doctype html><title>foo/title><link></head><body>X
+-#errors
+-Line: 1 Col: 52 Unexpected end of file. Expected end tag (title).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <title>
+-| "foo/title><link></head><body>X"
+-| <body>
-
-- v := &Value{data: []int8{int8(1), int8(1), int8(1), int8(1), int8(1), int8(1)}}
+-#data
+-<!doctype html><noscript><!--<noscript></noscript>--></noscript>
+-#errors
+-Line: 1 Col: 64 Unexpected end tag (noscript).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <noscript>
+-| "<!--<noscript>"
+-| <body>
+-| "-->"
-
-- rawArr := v.MustInt8Slice()
+-#data
+-<!doctype html><noscript><!--</noscript>X<noscript>--></noscript>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <noscript>
+-| "<!--"
+-| <body>
+-| "X"
+-| <noscript>
+-| "-->"
-
-- replaced := v.ReplaceInt8(func(index int, val int8) int8 {
-- if index < len(rawArr)-1 {
-- return rawArr[index+1]
-- }
-- return rawArr[0]
-- })
+-#data
+-<!doctype html><noscript><iframe></noscript>X
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <noscript>
+-| "<iframe>"
+-| <body>
+-| "X"
-
-- replacedArr := replaced.MustInt8Slice()
-- if assert.Equal(t, 6, len(replacedArr)) {
-- assert.Equal(t, replacedArr[0], rawArr[1])
-- assert.Equal(t, replacedArr[1], rawArr[2])
-- assert.Equal(t, replacedArr[2], rawArr[3])
-- assert.Equal(t, replacedArr[3], rawArr[4])
-- assert.Equal(t, replacedArr[4], rawArr[5])
-- assert.Equal(t, replacedArr[5], rawArr[0])
-- }
+-#data
+-<!doctype html><noframes><!--<noframes></noframes>--></noframes>
+-#errors
+-Line: 1 Col: 64 Unexpected end tag (noframes).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <noframes>
+-| "<!--<noframes>"
+-| <body>
+-| "-->"
-
--}
+-#data
+-<!doctype html><noframes><body><script><!--...</script></body></noframes></html>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <noframes>
+-| "<body><script><!--...</script></body>"
+-| <body>
-
--func TestCollectInt8(t *testing.T) {
+-#data
+-<!doctype html><textarea><!--<textarea></textarea>--></textarea>
+-#errors
+-Line: 1 Col: 64 Unexpected end tag (textarea).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <textarea>
+-| "<!--<textarea>"
+-| "-->"
-
-- v := &Value{data: []int8{int8(1), int8(1), int8(1), int8(1), int8(1), int8(1)}}
+-#data
+-<!doctype html><textarea></textarea></textarea>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <textarea>
+-| "</textarea>"
-
-- collected := v.CollectInt8(func(index int, val int8) interface{} {
-- return index
-- })
+-#data
+-<!doctype html><textarea><</textarea>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <textarea>
+-| "<"
-
-- collectedArr := collected.MustInterSlice()
-- if assert.Equal(t, 6, len(collectedArr)) {
-- assert.Equal(t, collectedArr[0], 0)
-- assert.Equal(t, collectedArr[1], 1)
-- assert.Equal(t, collectedArr[2], 2)
-- assert.Equal(t, collectedArr[3], 3)
-- assert.Equal(t, collectedArr[4], 4)
-- assert.Equal(t, collectedArr[5], 5)
-- }
+-#data
+-<!doctype html><textarea>a<b</textarea>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <textarea>
+-| "a<b"
-
--}
+-#data
+-<!doctype html><iframe><!--<iframe></iframe>--></iframe>
+-#errors
+-Line: 1 Col: 56 Unexpected end tag (iframe).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <iframe>
+-| "<!--<iframe>"
+-| "-->"
-
--// ************************************************************
--// TESTS
--// ************************************************************
+-#data
+-<!doctype html><iframe>...<!--X->...<!--/X->...</iframe>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <iframe>
+-| "...<!--X->...<!--/X->..."
-
--func TestInt16(t *testing.T) {
+-#data
+-<!doctype html><xmp><!--<xmp></xmp>--></xmp>
+-#errors
+-Line: 1 Col: 44 Unexpected end tag (xmp).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <xmp>
+-| "<!--<xmp>"
+-| "-->"
-
-- val := int16(1)
-- m := map[string]interface{}{"value": val, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").Int16())
-- assert.Equal(t, val, New(m).Get("value").MustInt16())
-- assert.Equal(t, int16(0), New(m).Get("nothing").Int16())
-- assert.Equal(t, val, New(m).Get("nothing").Int16(1))
+-#data
+-<!doctype html><noembed><!--<noembed></noembed>--></noembed>
+-#errors
+-Line: 1 Col: 60 Unexpected end tag (noembed).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <noembed>
+-| "<!--<noembed>"
+-| "-->"
-
-- assert.Panics(t, func() {
-- New(m).Get("age").MustInt16()
-- })
+-#data
+-<script>
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 8 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| <body>
-
--}
+-#data
+-<script>a
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 9 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "a"
+-| <body>
-
--func TestInt16Slice(t *testing.T) {
+-#data
+-<script><
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 9 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<"
+-| <body>
-
-- val := int16(1)
-- m := map[string]interface{}{"value": []int16{val}, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").Int16Slice()[0])
-- assert.Equal(t, val, New(m).Get("value").MustInt16Slice()[0])
-- assert.Equal(t, []int16(nil), New(m).Get("nothing").Int16Slice())
-- assert.Equal(t, val, New(m).Get("nothing").Int16Slice([]int16{int16(1)})[0])
+-#data
+-<script></
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 10 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "</"
+-| <body>
-
-- assert.Panics(t, func() {
-- New(m).Get("nothing").MustInt16Slice()
-- })
+-#data
+-<script></S
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 11 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "</S"
+-| <body>
-
--}
+-#data
+-<script></SC
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 12 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "</SC"
+-| <body>
-
--func TestIsInt16(t *testing.T) {
+-#data
+-<script></SCR
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 13 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "</SCR"
+-| <body>
-
-- var v *Value
+-#data
+-<script></SCRI
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 14 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "</SCRI"
+-| <body>
-
-- v = &Value{data: int16(1)}
-- assert.True(t, v.IsInt16())
+-#data
+-<script></SCRIP
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 15 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "</SCRIP"
+-| <body>
-
-- v = &Value{data: []int16{int16(1)}}
-- assert.True(t, v.IsInt16Slice())
+-#data
+-<script></SCRIPT
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 16 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "</SCRIPT"
+-| <body>
-
--}
+-#data
+-<script></SCRIPT
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 17 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| <body>
-
--func TestEachInt16(t *testing.T) {
+-#data
+-<script></s
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 11 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "</s"
+-| <body>
-
-- v := &Value{data: []int16{int16(1), int16(1), int16(1), int16(1), int16(1)}}
-- count := 0
-- replacedVals := make([]int16, 0)
-- assert.Equal(t, v, v.EachInt16(func(i int, val int16) bool {
+-#data
+-<script></sc
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 12 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "</sc"
+-| <body>
-
-- count++
-- replacedVals = append(replacedVals, val)
+-#data
+-<script></scr
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 13 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "</scr"
+-| <body>
-
-- // abort early
-- if i == 2 {
-- return false
-- }
+-#data
+-<script></scri
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 14 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "</scri"
+-| <body>
-
-- return true
+-#data
+-<script></scrip
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 15 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "</scrip"
+-| <body>
-
-- }))
+-#data
+-<script></script
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 16 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "</script"
+-| <body>
-
-- assert.Equal(t, count, 3)
-- assert.Equal(t, replacedVals[0], v.MustInt16Slice()[0])
-- assert.Equal(t, replacedVals[1], v.MustInt16Slice()[1])
-- assert.Equal(t, replacedVals[2], v.MustInt16Slice()[2])
+-#data
+-<script></script
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 17 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| <body>
-
--}
+-#data
+-<script><!
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 10 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!"
+-| <body>
-
--func TestWhereInt16(t *testing.T) {
+-#data
+-<script><!a
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 11 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!a"
+-| <body>
-
-- v := &Value{data: []int16{int16(1), int16(1), int16(1), int16(1), int16(1), int16(1)}}
+-#data
+-<script><!-
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 11 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!-"
+-| <body>
-
-- selected := v.WhereInt16(func(i int, val int16) bool {
-- return i%2 == 0
-- }).MustInt16Slice()
+-#data
+-<script><!-a
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 12 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!-a"
+-| <body>
-
-- assert.Equal(t, 3, len(selected))
+-#data
+-<script><!--
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 12 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--"
+-| <body>
-
--}
+-#data
+-<script><!--a
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 13 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--a"
+-| <body>
-
--func TestGroupInt16(t *testing.T) {
+-#data
+-<script><!--<
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 13 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<"
+-| <body>
-
-- v := &Value{data: []int16{int16(1), int16(1), int16(1), int16(1), int16(1), int16(1)}}
+-#data
+-<script><!--<a
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 14 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<a"
+-| <body>
-
-- grouped := v.GroupInt16(func(i int, val int16) string {
-- return fmt.Sprintf("%v", i%2 == 0)
-- }).data.(map[string][]int16)
+-#data
+-<script><!--</
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 14 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--</"
+-| <body>
-
-- assert.Equal(t, 2, len(grouped))
-- assert.Equal(t, 3, len(grouped["true"]))
-- assert.Equal(t, 3, len(grouped["false"]))
+-#data
+-<script><!--</script
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 20 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--</script"
+-| <body>
-
--}
+-#data
+-<script><!--</script
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 21 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--"
+-| <body>
-
--func TestReplaceInt16(t *testing.T) {
+-#data
+-<script><!--<s
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 14 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<s"
+-| <body>
-
-- v := &Value{data: []int16{int16(1), int16(1), int16(1), int16(1), int16(1), int16(1)}}
+-#data
+-<script><!--<script
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 19 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script"
+-| <body>
-
-- rawArr := v.MustInt16Slice()
+-#data
+-<script><!--<script
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 20 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script "
+-| <body>
-
-- replaced := v.ReplaceInt16(func(index int, val int16) int16 {
-- if index < len(rawArr)-1 {
-- return rawArr[index+1]
-- }
-- return rawArr[0]
-- })
+-#data
+-<script><!--<script <
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 21 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script <"
+-| <body>
-
-- replacedArr := replaced.MustInt16Slice()
-- if assert.Equal(t, 6, len(replacedArr)) {
-- assert.Equal(t, replacedArr[0], rawArr[1])
-- assert.Equal(t, replacedArr[1], rawArr[2])
-- assert.Equal(t, replacedArr[2], rawArr[3])
-- assert.Equal(t, replacedArr[3], rawArr[4])
-- assert.Equal(t, replacedArr[4], rawArr[5])
-- assert.Equal(t, replacedArr[5], rawArr[0])
-- }
+-#data
+-<script><!--<script <a
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 22 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script <a"
+-| <body>
-
--}
+-#data
+-<script><!--<script </
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 22 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script </"
+-| <body>
-
--func TestCollectInt16(t *testing.T) {
+-#data
+-<script><!--<script </s
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 23 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script </s"
+-| <body>
-
-- v := &Value{data: []int16{int16(1), int16(1), int16(1), int16(1), int16(1), int16(1)}}
+-#data
+-<script><!--<script </script
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 28 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script </script"
+-| <body>
-
-- collected := v.CollectInt16(func(index int, val int16) interface{} {
-- return index
-- })
+-#data
+-<script><!--<script </scripta
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 29 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script </scripta"
+-| <body>
-
-- collectedArr := collected.MustInterSlice()
-- if assert.Equal(t, 6, len(collectedArr)) {
-- assert.Equal(t, collectedArr[0], 0)
-- assert.Equal(t, collectedArr[1], 1)
-- assert.Equal(t, collectedArr[2], 2)
-- assert.Equal(t, collectedArr[3], 3)
-- assert.Equal(t, collectedArr[4], 4)
-- assert.Equal(t, collectedArr[5], 5)
-- }
+-#data
+-<script><!--<script </script
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 29 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script </script "
+-| <body>
-
--}
+-#data
+-<script><!--<script </script>
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 29 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script </script>"
+-| <body>
-
--// ************************************************************
--// TESTS
--// ************************************************************
+-#data
+-<script><!--<script </script/
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 29 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script </script/"
+-| <body>
-
--func TestInt32(t *testing.T) {
+-#data
+-<script><!--<script </script <
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 30 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script </script <"
+-| <body>
-
-- val := int32(1)
-- m := map[string]interface{}{"value": val, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").Int32())
-- assert.Equal(t, val, New(m).Get("value").MustInt32())
-- assert.Equal(t, int32(0), New(m).Get("nothing").Int32())
-- assert.Equal(t, val, New(m).Get("nothing").Int32(1))
+-#data
+-<script><!--<script </script <a
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 31 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script </script <a"
+-| <body>
-
-- assert.Panics(t, func() {
-- New(m).Get("age").MustInt32()
-- })
+-#data
+-<script><!--<script </script </
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 31 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script </script </"
+-| <body>
-
--}
+-#data
+-<script><!--<script </script </script
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 38 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script </script </script"
+-| <body>
-
--func TestInt32Slice(t *testing.T) {
+-#data
+-<script><!--<script </script </script
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 38 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script </script "
+-| <body>
-
-- val := int32(1)
-- m := map[string]interface{}{"value": []int32{val}, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").Int32Slice()[0])
-- assert.Equal(t, val, New(m).Get("value").MustInt32Slice()[0])
-- assert.Equal(t, []int32(nil), New(m).Get("nothing").Int32Slice())
-- assert.Equal(t, val, New(m).Get("nothing").Int32Slice([]int32{int32(1)})[0])
+-#data
+-<script><!--<script </script </script/
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 38 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script </script "
+-| <body>
-
-- assert.Panics(t, func() {
-- New(m).Get("nothing").MustInt32Slice()
-- })
+-#data
+-<script><!--<script </script </script>
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script </script "
+-| <body>
-
--}
+-#data
+-<script><!--<script -
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 21 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script -"
+-| <body>
-
--func TestIsInt32(t *testing.T) {
+-#data
+-<script><!--<script -a
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 22 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script -a"
+-| <body>
-
-- var v *Value
+-#data
+-<script><!--<script --
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 22 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script --"
+-| <body>
-
-- v = &Value{data: int32(1)}
-- assert.True(t, v.IsInt32())
+-#data
+-<script><!--<script --a
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 23 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script --a"
+-| <body>
-
-- v = &Value{data: []int32{int32(1)}}
-- assert.True(t, v.IsInt32Slice())
+-#data
+-<script><!--<script -->
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 23 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script -->"
+-| <body>
-
--}
+-#data
+-<script><!--<script --><
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 24 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script --><"
+-| <body>
-
--func TestEachInt32(t *testing.T) {
+-#data
+-<script><!--<script --></
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 25 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script --></"
+-| <body>
-
-- v := &Value{data: []int32{int32(1), int32(1), int32(1), int32(1), int32(1)}}
-- count := 0
-- replacedVals := make([]int32, 0)
-- assert.Equal(t, v, v.EachInt32(func(i int, val int32) bool {
+-#data
+-<script><!--<script --></script
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 31 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script --></script"
+-| <body>
-
-- count++
-- replacedVals = append(replacedVals, val)
+-#data
+-<script><!--<script --></script
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 32 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script -->"
+-| <body>
-
-- // abort early
-- if i == 2 {
-- return false
-- }
+-#data
+-<script><!--<script --></script/
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 32 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script -->"
+-| <body>
-
-- return true
+-#data
+-<script><!--<script --></script>
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script -->"
+-| <body>
-
-- }))
+-#data
+-<script><!--<script><\/script>--></script>
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script><\/script>-->"
+-| <body>
-
-- assert.Equal(t, count, 3)
-- assert.Equal(t, replacedVals[0], v.MustInt32Slice()[0])
-- assert.Equal(t, replacedVals[1], v.MustInt32Slice()[1])
-- assert.Equal(t, replacedVals[2], v.MustInt32Slice()[2])
+-#data
+-<script><!--<script></scr'+'ipt>--></script>
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script></scr'+'ipt>-->"
+-| <body>
-
--}
+-#data
+-<script><!--<script></script><script></script></script>
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script></script><script></script>"
+-| <body>
-
--func TestWhereInt32(t *testing.T) {
+-#data
+-<script><!--<script></script><script></script>--><!--</script>
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script></script><script></script>--><!--"
+-| <body>
-
-- v := &Value{data: []int32{int32(1), int32(1), int32(1), int32(1), int32(1), int32(1)}}
+-#data
+-<script><!--<script></script><script></script>-- ></script>
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script></script><script></script>-- >"
+-| <body>
-
-- selected := v.WhereInt32(func(i int, val int32) bool {
-- return i%2 == 0
-- }).MustInt32Slice()
+-#data
+-<script><!--<script></script><script></script>- -></script>
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script></script><script></script>- ->"
+-| <body>
-
-- assert.Equal(t, 3, len(selected))
+-#data
+-<script><!--<script></script><script></script>- - ></script>
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script></script><script></script>- - >"
+-| <body>
-
--}
+-#data
+-<script><!--<script></script><script></script>-></script>
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script></script><script></script>->"
+-| <body>
-
--func TestGroupInt32(t *testing.T) {
+-#data
+-<script><!--<script>--!></script>X
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 34 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script>--!></script>X"
+-| <body>
-
-- v := &Value{data: []int32{int32(1), int32(1), int32(1), int32(1), int32(1), int32(1)}}
+-#data
+-<script><!--<scr'+'ipt></script>--></script>
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 44 Unexpected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<scr'+'ipt>"
+-| <body>
+-| "-->"
-
-- grouped := v.GroupInt32(func(i int, val int32) string {
-- return fmt.Sprintf("%v", i%2 == 0)
-- }).data.(map[string][]int32)
+-#data
+-<script><!--<script></scr'+'ipt></script>X
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 42 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "<!--<script></scr'+'ipt></script>X"
+-| <body>
-
-- assert.Equal(t, 2, len(grouped))
-- assert.Equal(t, 3, len(grouped["true"]))
-- assert.Equal(t, 3, len(grouped["false"]))
+-#data
+-<style><!--<style></style>--></style>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
+-Line: 1 Col: 37 Unexpected end tag (style).
+-#document
+-| <html>
+-| <head>
+-| <style>
+-| "<!--<style>"
+-| <body>
+-| "-->"
-
--}
+-#data
+-<style><!--</style>X
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <style>
+-| "<!--"
+-| <body>
+-| "X"
-
--func TestReplaceInt32(t *testing.T) {
+-#data
+-<style><!--...</style>...--></style>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
+-Line: 1 Col: 36 Unexpected end tag (style).
+-#document
+-| <html>
+-| <head>
+-| <style>
+-| "<!--..."
+-| <body>
+-| "...-->"
-
-- v := &Value{data: []int32{int32(1), int32(1), int32(1), int32(1), int32(1), int32(1)}}
+-#data
+-<style><!--<br><html xmlns:v="urn:schemas-microsoft-com:vml"><!--[if !mso]><style></style>X
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <style>
+-| "<!--<br><html xmlns:v="urn:schemas-microsoft-com:vml"><!--[if !mso]><style>"
+-| <body>
+-| "X"
-
-- rawArr := v.MustInt32Slice()
+-#data
+-<style><!--...<style><!--...--!></style>--></style>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
+-Line: 1 Col: 51 Unexpected end tag (style).
+-#document
+-| <html>
+-| <head>
+-| <style>
+-| "<!--...<style><!--...--!>"
+-| <body>
+-| "-->"
-
-- replaced := v.ReplaceInt32(func(index int, val int32) int32 {
-- if index < len(rawArr)-1 {
-- return rawArr[index+1]
-- }
-- return rawArr[0]
-- })
+-#data
+-<style><!--...</style><!-- --><style>@import ...</style>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <style>
+-| "<!--..."
+-| <!-- -->
+-| <style>
+-| "@import ..."
+-| <body>
-
-- replacedArr := replaced.MustInt32Slice()
-- if assert.Equal(t, 6, len(replacedArr)) {
-- assert.Equal(t, replacedArr[0], rawArr[1])
-- assert.Equal(t, replacedArr[1], rawArr[2])
-- assert.Equal(t, replacedArr[2], rawArr[3])
-- assert.Equal(t, replacedArr[3], rawArr[4])
-- assert.Equal(t, replacedArr[4], rawArr[5])
-- assert.Equal(t, replacedArr[5], rawArr[0])
-- }
+-#data
+-<style>...<style><!--...</style><!-- --></style>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
+-Line: 1 Col: 48 Unexpected end tag (style).
+-#document
+-| <html>
+-| <head>
+-| <style>
+-| "...<style><!--..."
+-| <!-- -->
+-| <body>
-
--}
+-#data
+-<style>...<!--[if IE]><style>...</style>X
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <style>
+-| "...<!--[if IE]><style>..."
+-| <body>
+-| "X"
-
--func TestCollectInt32(t *testing.T) {
+-#data
+-<title><!--<title></title>--></title>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (title). Expected DOCTYPE.
+-Line: 1 Col: 37 Unexpected end tag (title).
+-#document
+-| <html>
+-| <head>
+-| <title>
+-| "<!--<title>"
+-| <body>
+-| "-->"
-
-- v := &Value{data: []int32{int32(1), int32(1), int32(1), int32(1), int32(1), int32(1)}}
+-#data
+-<title></title></title>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (title). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <title>
+-| "</title>"
+-| <body>
-
-- collected := v.CollectInt32(func(index int, val int32) interface{} {
-- return index
-- })
+-#data
+-<title>foo/title><link></head><body>X
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (title). Expected DOCTYPE.
+-Line: 1 Col: 37 Unexpected end of file. Expected end tag (title).
+-#document
+-| <html>
+-| <head>
+-| <title>
+-| "foo/title><link></head><body>X"
+-| <body>
-
-- collectedArr := collected.MustInterSlice()
-- if assert.Equal(t, 6, len(collectedArr)) {
-- assert.Equal(t, collectedArr[0], 0)
-- assert.Equal(t, collectedArr[1], 1)
-- assert.Equal(t, collectedArr[2], 2)
-- assert.Equal(t, collectedArr[3], 3)
-- assert.Equal(t, collectedArr[4], 4)
-- assert.Equal(t, collectedArr[5], 5)
-- }
+-#data
+-<noscript><!--<noscript></noscript>--></noscript>
+-#errors
+-Line: 1 Col: 10 Unexpected start tag (noscript). Expected DOCTYPE.
+-Line: 1 Col: 49 Unexpected end tag (noscript).
+-#document
+-| <html>
+-| <head>
+-| <noscript>
+-| "<!--<noscript>"
+-| <body>
+-| "-->"
-
--}
+-#data
+-<noscript><!--</noscript>X<noscript>--></noscript>
+-#errors
+-Line: 1 Col: 10 Unexpected start tag (noscript). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <noscript>
+-| "<!--"
+-| <body>
+-| "X"
+-| <noscript>
+-| "-->"
-
--// ************************************************************
--// TESTS
--// ************************************************************
+-#data
+-<noscript><iframe></noscript>X
+-#errors
+-Line: 1 Col: 10 Unexpected start tag (noscript). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <noscript>
+-| "<iframe>"
+-| <body>
+-| "X"
-
--func TestInt64(t *testing.T) {
+-#data
+-<noframes><!--<noframes></noframes>--></noframes>
+-#errors
+-Line: 1 Col: 10 Unexpected start tag (noframes). Expected DOCTYPE.
+-Line: 1 Col: 49 Unexpected end tag (noframes).
+-#document
+-| <html>
+-| <head>
+-| <noframes>
+-| "<!--<noframes>"
+-| <body>
+-| "-->"
-
-- val := int64(1)
-- m := map[string]interface{}{"value": val, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").Int64())
-- assert.Equal(t, val, New(m).Get("value").MustInt64())
-- assert.Equal(t, int64(0), New(m).Get("nothing").Int64())
-- assert.Equal(t, val, New(m).Get("nothing").Int64(1))
+-#data
+-<noframes><body><script><!--...</script></body></noframes></html>
+-#errors
+-Line: 1 Col: 10 Unexpected start tag (noframes). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <noframes>
+-| "<body><script><!--...</script></body>"
+-| <body>
-
-- assert.Panics(t, func() {
-- New(m).Get("age").MustInt64()
-- })
+-#data
+-<textarea><!--<textarea></textarea>--></textarea>
+-#errors
+-Line: 1 Col: 10 Unexpected start tag (textarea). Expected DOCTYPE.
+-Line: 1 Col: 49 Unexpected end tag (textarea).
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <textarea>
+-| "<!--<textarea>"
+-| "-->"
-
--}
+-#data
+-<textarea></textarea></textarea>
+-#errors
+-Line: 1 Col: 10 Unexpected start tag (textarea). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <textarea>
+-| "</textarea>"
-
--func TestInt64Slice(t *testing.T) {
+-#data
+-<iframe><!--<iframe></iframe>--></iframe>
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (iframe). Expected DOCTYPE.
+-Line: 1 Col: 41 Unexpected end tag (iframe).
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <iframe>
+-| "<!--<iframe>"
+-| "-->"
-
-- val := int64(1)
-- m := map[string]interface{}{"value": []int64{val}, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").Int64Slice()[0])
-- assert.Equal(t, val, New(m).Get("value").MustInt64Slice()[0])
-- assert.Equal(t, []int64(nil), New(m).Get("nothing").Int64Slice())
-- assert.Equal(t, val, New(m).Get("nothing").Int64Slice([]int64{int64(1)})[0])
+-#data
+-<iframe>...<!--X->...<!--/X->...</iframe>
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (iframe). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <iframe>
+-| "...<!--X->...<!--/X->..."
-
-- assert.Panics(t, func() {
-- New(m).Get("nothing").MustInt64Slice()
-- })
+-#data
+-<xmp><!--<xmp></xmp>--></xmp>
+-#errors
+-Line: 1 Col: 5 Unexpected start tag (xmp). Expected DOCTYPE.
+-Line: 1 Col: 29 Unexpected end tag (xmp).
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <xmp>
+-| "<!--<xmp>"
+-| "-->"
-
--}
+-#data
+-<noembed><!--<noembed></noembed>--></noembed>
+-#errors
+-Line: 1 Col: 9 Unexpected start tag (noembed). Expected DOCTYPE.
+-Line: 1 Col: 45 Unexpected end tag (noembed).
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <noembed>
+-| "<!--<noembed>"
+-| "-->"
-
--func TestIsInt64(t *testing.T) {
+-#data
+-<!doctype html><table>
-
-- var v *Value
+-#errors
+-Line 2 Col 0 Unexpected end of file. Expected table content.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| "
+-"
-
-- v = &Value{data: int64(1)}
-- assert.True(t, v.IsInt64())
+-#data
+-<!doctype html><table><td><span><font></span><span>
+-#errors
+-Line 1 Col 26 Unexpected table cell start tag (td) in the table body phase.
+-Line 1 Col 45 Unexpected end tag (span).
+-Line 1 Col 51 Expected closing tag. Unexpected end of file.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <span>
+-| <font>
+-| <font>
+-| <span>
-
-- v = &Value{data: []int64{int64(1)}}
-- assert.True(t, v.IsInt64Slice())
+-#data
+-<!doctype html><form><table></form><form></table></form>
+-#errors
+-35: Stray end tag “form”.
+-41: Start tag “form” seen in “table”.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <form>
+-| <table>
+-| <form>
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests17.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests17.dat
+deleted file mode 100644
+index 7b555f8..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests17.dat
++++ /dev/null
+@@ -1,153 +0,0 @@
+-#data
+-<!doctype html><table><tbody><select><tr>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <select>
+-| <table>
+-| <tbody>
+-| <tr>
-
--}
+-#data
+-<!doctype html><table><tr><select><td>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <select>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
-
--func TestEachInt64(t *testing.T) {
+-#data
+-<!doctype html><table><tr><td><select><td>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <select>
+-| <td>
-
-- v := &Value{data: []int64{int64(1), int64(1), int64(1), int64(1), int64(1)}}
-- count := 0
-- replacedVals := make([]int64, 0)
-- assert.Equal(t, v, v.EachInt64(func(i int, val int64) bool {
+-#data
+-<!doctype html><table><tr><th><select><td>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <th>
+-| <select>
+-| <td>
-
-- count++
-- replacedVals = append(replacedVals, val)
+-#data
+-<!doctype html><table><caption><select><tr>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <caption>
+-| <select>
+-| <tbody>
+-| <tr>
-
-- // abort early
-- if i == 2 {
-- return false
-- }
+-#data
+-<!doctype html><select><tr>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <select>
-
-- return true
+-#data
+-<!doctype html><select><td>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <select>
-
-- }))
+-#data
+-<!doctype html><select><th>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <select>
-
-- assert.Equal(t, count, 3)
-- assert.Equal(t, replacedVals[0], v.MustInt64Slice()[0])
-- assert.Equal(t, replacedVals[1], v.MustInt64Slice()[1])
-- assert.Equal(t, replacedVals[2], v.MustInt64Slice()[2])
+-#data
+-<!doctype html><select><tbody>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <select>
-
--}
+-#data
+-<!doctype html><select><thead>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <select>
-
--func TestWhereInt64(t *testing.T) {
+-#data
+-<!doctype html><select><tfoot>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <select>
-
-- v := &Value{data: []int64{int64(1), int64(1), int64(1), int64(1), int64(1), int64(1)}}
+-#data
+-<!doctype html><select><caption>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <select>
-
-- selected := v.WhereInt64(func(i int, val int64) bool {
-- return i%2 == 0
-- }).MustInt64Slice()
+-#data
+-<!doctype html><table><tr></table>a
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| "a"
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests18.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests18.dat
+deleted file mode 100644
+index 680e1f0..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests18.dat
++++ /dev/null
+@@ -1,269 +0,0 @@
+-#data
+-<!doctype html><plaintext></plaintext>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <plaintext>
+-| "</plaintext>"
-
-- assert.Equal(t, 3, len(selected))
+-#data
+-<!doctype html><table><plaintext></plaintext>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <plaintext>
+-| "</plaintext>"
+-| <table>
-
--}
+-#data
+-<!doctype html><table><tbody><plaintext></plaintext>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <plaintext>
+-| "</plaintext>"
+-| <table>
+-| <tbody>
-
--func TestGroupInt64(t *testing.T) {
+-#data
+-<!doctype html><table><tbody><tr><plaintext></plaintext>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <plaintext>
+-| "</plaintext>"
+-| <table>
+-| <tbody>
+-| <tr>
-
-- v := &Value{data: []int64{int64(1), int64(1), int64(1), int64(1), int64(1), int64(1)}}
+-#data
+-<!doctype html><table><tbody><tr><plaintext></plaintext>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <plaintext>
+-| "</plaintext>"
+-| <table>
+-| <tbody>
+-| <tr>
-
-- grouped := v.GroupInt64(func(i int, val int64) string {
-- return fmt.Sprintf("%v", i%2 == 0)
-- }).data.(map[string][]int64)
+-#data
+-<!doctype html><table><td><plaintext></plaintext>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <plaintext>
+-| "</plaintext>"
-
-- assert.Equal(t, 2, len(grouped))
-- assert.Equal(t, 3, len(grouped["true"]))
-- assert.Equal(t, 3, len(grouped["false"]))
+-#data
+-<!doctype html><table><caption><plaintext></plaintext>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <caption>
+-| <plaintext>
+-| "</plaintext>"
-
--}
+-#data
+-<!doctype html><table><tr><style></script></style>abc
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| "abc"
+-| <table>
+-| <tbody>
+-| <tr>
+-| <style>
+-| "</script>"
-
--func TestReplaceInt64(t *testing.T) {
+-#data
+-<!doctype html><table><tr><script></style></script>abc
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| "abc"
+-| <table>
+-| <tbody>
+-| <tr>
+-| <script>
+-| "</style>"
-
-- v := &Value{data: []int64{int64(1), int64(1), int64(1), int64(1), int64(1), int64(1)}}
+-#data
+-<!doctype html><table><caption><style></script></style>abc
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <caption>
+-| <style>
+-| "</script>"
+-| "abc"
-
-- rawArr := v.MustInt64Slice()
+-#data
+-<!doctype html><table><td><style></script></style>abc
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <style>
+-| "</script>"
+-| "abc"
-
-- replaced := v.ReplaceInt64(func(index int, val int64) int64 {
-- if index < len(rawArr)-1 {
-- return rawArr[index+1]
-- }
-- return rawArr[0]
-- })
+-#data
+-<!doctype html><select><script></style></script>abc
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <select>
+-| <script>
+-| "</style>"
+-| "abc"
-
-- replacedArr := replaced.MustInt64Slice()
-- if assert.Equal(t, 6, len(replacedArr)) {
-- assert.Equal(t, replacedArr[0], rawArr[1])
-- assert.Equal(t, replacedArr[1], rawArr[2])
-- assert.Equal(t, replacedArr[2], rawArr[3])
-- assert.Equal(t, replacedArr[3], rawArr[4])
-- assert.Equal(t, replacedArr[4], rawArr[5])
-- assert.Equal(t, replacedArr[5], rawArr[0])
-- }
+-#data
+-<!doctype html><table><select><script></style></script>abc
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <select>
+-| <script>
+-| "</style>"
+-| "abc"
+-| <table>
-
--}
+-#data
+-<!doctype html><table><tr><select><script></style></script>abc
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <select>
+-| <script>
+-| "</style>"
+-| "abc"
+-| <table>
+-| <tbody>
+-| <tr>
-
--func TestCollectInt64(t *testing.T) {
+-#data
+-<!doctype html><frameset></frameset><noframes>abc
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <frameset>
+-| <noframes>
+-| "abc"
-
-- v := &Value{data: []int64{int64(1), int64(1), int64(1), int64(1), int64(1), int64(1)}}
+-#data
+-<!doctype html><frameset></frameset><noframes>abc</noframes><!--abc-->
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <frameset>
+-| <noframes>
+-| "abc"
+-| <!-- abc -->
-
-- collected := v.CollectInt64(func(index int, val int64) interface{} {
-- return index
-- })
+-#data
+-<!doctype html><frameset></frameset></html><noframes>abc
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <frameset>
+-| <noframes>
+-| "abc"
-
-- collectedArr := collected.MustInterSlice()
-- if assert.Equal(t, 6, len(collectedArr)) {
-- assert.Equal(t, collectedArr[0], 0)
-- assert.Equal(t, collectedArr[1], 1)
-- assert.Equal(t, collectedArr[2], 2)
-- assert.Equal(t, collectedArr[3], 3)
-- assert.Equal(t, collectedArr[4], 4)
-- assert.Equal(t, collectedArr[5], 5)
-- }
+-#data
+-<!doctype html><frameset></frameset></html><noframes>abc</noframes><!--abc-->
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <frameset>
+-| <noframes>
+-| "abc"
+-| <!-- abc -->
-
--}
+-#data
+-<!doctype html><table><tr></tbody><tfoot>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <tfoot>
-
--// ************************************************************
--// TESTS
--// ************************************************************
+-#data
+-<!doctype html><table><td><svg></svg>abc<td>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <svg svg>
+-| "abc"
+-| <td>
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests19.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests19.dat
+deleted file mode 100644
+index 0d62f5a..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests19.dat
++++ /dev/null
+@@ -1,1237 +0,0 @@
+-#data
+-<!doctype html><math><mn DefinitionUrl="foo">
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| <math mn>
+-| definitionURL="foo"
-
--func TestUint(t *testing.T) {
+-#data
+-<!doctype html><html></p><!--foo-->
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <!-- foo -->
+-| <head>
+-| <body>
-
-- val := uint(1)
-- m := map[string]interface{}{"value": val, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").Uint())
-- assert.Equal(t, val, New(m).Get("value").MustUint())
-- assert.Equal(t, uint(0), New(m).Get("nothing").Uint())
-- assert.Equal(t, val, New(m).Get("nothing").Uint(1))
+-#data
+-<!doctype html><head></head></p><!--foo-->
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <!-- foo -->
+-| <body>
-
-- assert.Panics(t, func() {
-- New(m).Get("age").MustUint()
-- })
+-#data
+-<!doctype html><body><p><pre>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <pre>
-
--}
+-#data
+-<!doctype html><body><p><listing>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <listing>
-
--func TestUintSlice(t *testing.T) {
+-#data
+-<!doctype html><p><plaintext>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <plaintext>
-
-- val := uint(1)
-- m := map[string]interface{}{"value": []uint{val}, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").UintSlice()[0])
-- assert.Equal(t, val, New(m).Get("value").MustUintSlice()[0])
-- assert.Equal(t, []uint(nil), New(m).Get("nothing").UintSlice())
-- assert.Equal(t, val, New(m).Get("nothing").UintSlice([]uint{uint(1)})[0])
+-#data
+-<!doctype html><p><h1>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <h1>
-
-- assert.Panics(t, func() {
-- New(m).Get("nothing").MustUintSlice()
-- })
+-#data
+-<!doctype html><form><isindex>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <form>
-
--}
+-#data
+-<!doctype html><isindex action="POST">
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <form>
+-| action="POST"
+-| <hr>
+-| <label>
+-| "This is a searchable index. Enter search keywords: "
+-| <input>
+-| name="isindex"
+-| <hr>
-
--func TestIsUint(t *testing.T) {
+-#data
+-<!doctype html><isindex prompt="this is isindex">
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <form>
+-| <hr>
+-| <label>
+-| "this is isindex"
+-| <input>
+-| name="isindex"
+-| <hr>
-
-- var v *Value
+-#data
+-<!doctype html><isindex type="hidden">
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <form>
+-| <hr>
+-| <label>
+-| "This is a searchable index. Enter search keywords: "
+-| <input>
+-| name="isindex"
+-| type="hidden"
+-| <hr>
-
-- v = &Value{data: uint(1)}
-- assert.True(t, v.IsUint())
+-#data
+-<!doctype html><isindex name="foo">
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <form>
+-| <hr>
+-| <label>
+-| "This is a searchable index. Enter search keywords: "
+-| <input>
+-| name="isindex"
+-| <hr>
-
-- v = &Value{data: []uint{uint(1)}}
-- assert.True(t, v.IsUintSlice())
+-#data
+-<!doctype html><ruby><p><rp>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <ruby>
+-| <p>
+-| <rp>
-
--}
+-#data
+-<!doctype html><ruby><div><span><rp>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <ruby>
+-| <div>
+-| <span>
+-| <rp>
-
--func TestEachUint(t *testing.T) {
+-#data
+-<!doctype html><ruby><div><p><rp>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <ruby>
+-| <div>
+-| <p>
+-| <rp>
-
-- v := &Value{data: []uint{uint(1), uint(1), uint(1), uint(1), uint(1)}}
-- count := 0
-- replacedVals := make([]uint, 0)
-- assert.Equal(t, v, v.EachUint(func(i int, val uint) bool {
+-#data
+-<!doctype html><ruby><p><rt>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <ruby>
+-| <p>
+-| <rt>
-
-- count++
-- replacedVals = append(replacedVals, val)
+-#data
+-<!doctype html><ruby><div><span><rt>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <ruby>
+-| <div>
+-| <span>
+-| <rt>
-
-- // abort early
-- if i == 2 {
-- return false
-- }
+-#data
+-<!doctype html><ruby><div><p><rt>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <ruby>
+-| <div>
+-| <p>
+-| <rt>
-
-- return true
+-#data
+-<!doctype html><math/><foo>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| <foo>
-
-- }))
+-#data
+-<!doctype html><svg/><foo>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| <foo>
-
-- assert.Equal(t, count, 3)
-- assert.Equal(t, replacedVals[0], v.MustUintSlice()[0])
-- assert.Equal(t, replacedVals[1], v.MustUintSlice()[1])
-- assert.Equal(t, replacedVals[2], v.MustUintSlice()[2])
+-#data
+-<!doctype html><div></body><!--foo-->
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| <!-- foo -->
-
--}
+-#data
+-<!doctype html><h1><div><h3><span></h1>foo
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <h1>
+-| <div>
+-| <h3>
+-| <span>
+-| "foo"
-
--func TestWhereUint(t *testing.T) {
+-#data
+-<!doctype html><p></h3>foo
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| "foo"
-
-- v := &Value{data: []uint{uint(1), uint(1), uint(1), uint(1), uint(1), uint(1)}}
+-#data
+-<!doctype html><h3><li>abc</h2>foo
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <h3>
+-| <li>
+-| "abc"
+-| "foo"
-
-- selected := v.WhereUint(func(i int, val uint) bool {
-- return i%2 == 0
-- }).MustUintSlice()
+-#data
+-<!doctype html><table>abc<!--foo-->
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| "abc"
+-| <table>
+-| <!-- foo -->
-
-- assert.Equal(t, 3, len(selected))
+-#data
+-<!doctype html><table> <!--foo-->
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| " "
+-| <!-- foo -->
-
--}
+-#data
+-<!doctype html><table> b <!--foo-->
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| " b "
+-| <table>
+-| <!-- foo -->
-
--func TestGroupUint(t *testing.T) {
+-#data
+-<!doctype html><select><option><option>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <select>
+-| <option>
+-| <option>
-
-- v := &Value{data: []uint{uint(1), uint(1), uint(1), uint(1), uint(1), uint(1)}}
+-#data
+-<!doctype html><select><option></optgroup>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <select>
+-| <option>
-
-- grouped := v.GroupUint(func(i int, val uint) string {
-- return fmt.Sprintf("%v", i%2 == 0)
-- }).data.(map[string][]uint)
+-#data
+-<!doctype html><select><option></optgroup>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <select>
+-| <option>
-
-- assert.Equal(t, 2, len(grouped))
-- assert.Equal(t, 3, len(grouped["true"]))
-- assert.Equal(t, 3, len(grouped["false"]))
+-#data
+-<!doctype html><p><math><mi><p><h1>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <math math>
+-| <math mi>
+-| <p>
+-| <h1>
-
--}
+-#data
+-<!doctype html><p><math><mo><p><h1>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <math math>
+-| <math mo>
+-| <p>
+-| <h1>
-
--func TestReplaceUint(t *testing.T) {
+-#data
+-<!doctype html><p><math><mn><p><h1>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <math math>
+-| <math mn>
+-| <p>
+-| <h1>
-
-- v := &Value{data: []uint{uint(1), uint(1), uint(1), uint(1), uint(1), uint(1)}}
+-#data
+-<!doctype html><p><math><ms><p><h1>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <math math>
+-| <math ms>
+-| <p>
+-| <h1>
-
-- rawArr := v.MustUintSlice()
+-#data
+-<!doctype html><p><math><mtext><p><h1>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <math math>
+-| <math mtext>
+-| <p>
+-| <h1>
-
-- replaced := v.ReplaceUint(func(index int, val uint) uint {
-- if index < len(rawArr)-1 {
-- return rawArr[index+1]
-- }
-- return rawArr[0]
-- })
+-#data
+-<!doctype html><frameset></noframes>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <frameset>
-
-- replacedArr := replaced.MustUintSlice()
-- if assert.Equal(t, 6, len(replacedArr)) {
-- assert.Equal(t, replacedArr[0], rawArr[1])
-- assert.Equal(t, replacedArr[1], rawArr[2])
-- assert.Equal(t, replacedArr[2], rawArr[3])
-- assert.Equal(t, replacedArr[3], rawArr[4])
-- assert.Equal(t, replacedArr[4], rawArr[5])
-- assert.Equal(t, replacedArr[5], rawArr[0])
-- }
+-#data
+-<!doctype html><html c=d><body></html><html a=b>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| a="b"
+-| c="d"
+-| <head>
+-| <body>
-
--}
+-#data
+-<!doctype html><html c=d><frameset></frameset></html><html a=b>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| a="b"
+-| c="d"
+-| <head>
+-| <frameset>
-
--func TestCollectUint(t *testing.T) {
+-#data
+-<!doctype html><html><frameset></frameset></html><!--foo-->
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <frameset>
+-| <!-- foo -->
-
-- v := &Value{data: []uint{uint(1), uint(1), uint(1), uint(1), uint(1), uint(1)}}
+-#data
+-<!doctype html><html><frameset></frameset></html>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <frameset>
+-| " "
-
-- collected := v.CollectUint(func(index int, val uint) interface{} {
-- return index
-- })
+-#data
+-<!doctype html><html><frameset></frameset></html>abc
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <frameset>
-
-- collectedArr := collected.MustInterSlice()
-- if assert.Equal(t, 6, len(collectedArr)) {
-- assert.Equal(t, collectedArr[0], 0)
-- assert.Equal(t, collectedArr[1], 1)
-- assert.Equal(t, collectedArr[2], 2)
-- assert.Equal(t, collectedArr[3], 3)
-- assert.Equal(t, collectedArr[4], 4)
-- assert.Equal(t, collectedArr[5], 5)
-- }
+-#data
+-<!doctype html><html><frameset></frameset></html><p>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <frameset>
-
--}
+-#data
+-<!doctype html><html><frameset></frameset></html></p>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <frameset>
-
--// ************************************************************
--// TESTS
--// ************************************************************
+-#data
+-<html><frameset></frameset></html><!doctype html>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <frameset>
-
--func TestUint8(t *testing.T) {
+-#data
+-<!doctype html><body><frameset>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
-
-- val := uint8(1)
-- m := map[string]interface{}{"value": val, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").Uint8())
-- assert.Equal(t, val, New(m).Get("value").MustUint8())
-- assert.Equal(t, uint8(0), New(m).Get("nothing").Uint8())
-- assert.Equal(t, val, New(m).Get("nothing").Uint8(1))
+-#data
+-<!doctype html><p><frameset><frame>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <frameset>
+-| <frame>
-
-- assert.Panics(t, func() {
-- New(m).Get("age").MustUint8()
-- })
+-#data
+-<!doctype html><p>a<frameset>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| "a"
-
--}
+-#data
+-<!doctype html><p> <frameset><frame>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <frameset>
+-| <frame>
-
--func TestUint8Slice(t *testing.T) {
+-#data
+-<!doctype html><pre><frameset>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <pre>
-
-- val := uint8(1)
-- m := map[string]interface{}{"value": []uint8{val}, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").Uint8Slice()[0])
-- assert.Equal(t, val, New(m).Get("value").MustUint8Slice()[0])
-- assert.Equal(t, []uint8(nil), New(m).Get("nothing").Uint8Slice())
-- assert.Equal(t, val, New(m).Get("nothing").Uint8Slice([]uint8{uint8(1)})[0])
+-#data
+-<!doctype html><listing><frameset>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <listing>
-
-- assert.Panics(t, func() {
-- New(m).Get("nothing").MustUint8Slice()
-- })
+-#data
+-<!doctype html><li><frameset>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <li>
-
--}
+-#data
+-<!doctype html><dd><frameset>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <dd>
-
--func TestIsUint8(t *testing.T) {
+-#data
+-<!doctype html><dt><frameset>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <dt>
-
-- var v *Value
+-#data
+-<!doctype html><button><frameset>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <button>
-
-- v = &Value{data: uint8(1)}
-- assert.True(t, v.IsUint8())
+-#data
+-<!doctype html><applet><frameset>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <applet>
-
-- v = &Value{data: []uint8{uint8(1)}}
-- assert.True(t, v.IsUint8Slice())
+-#data
+-<!doctype html><marquee><frameset>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <marquee>
-
--}
+-#data
+-<!doctype html><object><frameset>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <object>
-
--func TestEachUint8(t *testing.T) {
+-#data
+-<!doctype html><table><frameset>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
-
-- v := &Value{data: []uint8{uint8(1), uint8(1), uint8(1), uint8(1), uint8(1)}}
-- count := 0
-- replacedVals := make([]uint8, 0)
-- assert.Equal(t, v, v.EachUint8(func(i int, val uint8) bool {
+-#data
+-<!doctype html><area><frameset>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <area>
-
-- count++
-- replacedVals = append(replacedVals, val)
+-#data
+-<!doctype html><basefont><frameset>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <basefont>
+-| <frameset>
-
-- // abort early
-- if i == 2 {
-- return false
-- }
+-#data
+-<!doctype html><bgsound><frameset>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <bgsound>
+-| <frameset>
-
-- return true
+-#data
+-<!doctype html><br><frameset>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <br>
-
-- }))
+-#data
+-<!doctype html><embed><frameset>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <embed>
-
-- assert.Equal(t, count, 3)
-- assert.Equal(t, replacedVals[0], v.MustUint8Slice()[0])
-- assert.Equal(t, replacedVals[1], v.MustUint8Slice()[1])
-- assert.Equal(t, replacedVals[2], v.MustUint8Slice()[2])
+-#data
+-<!doctype html><img><frameset>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <img>
-
--}
+-#data
+-<!doctype html><input><frameset>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <input>
-
--func TestWhereUint8(t *testing.T) {
+-#data
+-<!doctype html><keygen><frameset>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <keygen>
-
-- v := &Value{data: []uint8{uint8(1), uint8(1), uint8(1), uint8(1), uint8(1), uint8(1)}}
+-#data
+-<!doctype html><wbr><frameset>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <wbr>
-
-- selected := v.WhereUint8(func(i int, val uint8) bool {
-- return i%2 == 0
-- }).MustUint8Slice()
+-#data
+-<!doctype html><hr><frameset>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <hr>
-
-- assert.Equal(t, 3, len(selected))
+-#data
+-<!doctype html><textarea></textarea><frameset>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <textarea>
-
--}
+-#data
+-<!doctype html><xmp></xmp><frameset>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <xmp>
-
--func TestGroupUint8(t *testing.T) {
+-#data
+-<!doctype html><iframe></iframe><frameset>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <iframe>
-
-- v := &Value{data: []uint8{uint8(1), uint8(1), uint8(1), uint8(1), uint8(1), uint8(1)}}
+-#data
+-<!doctype html><select></select><frameset>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <select>
-
-- grouped := v.GroupUint8(func(i int, val uint8) string {
-- return fmt.Sprintf("%v", i%2 == 0)
-- }).data.(map[string][]uint8)
+-#data
+-<!doctype html><svg></svg><frameset><frame>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <frameset>
+-| <frame>
-
-- assert.Equal(t, 2, len(grouped))
-- assert.Equal(t, 3, len(grouped["true"]))
-- assert.Equal(t, 3, len(grouped["false"]))
+-#data
+-<!doctype html><math></math><frameset><frame>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <frameset>
+-| <frame>
-
--}
+-#data
+-<!doctype html><svg><foreignObject><div> <frameset><frame>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <frameset>
+-| <frame>
-
--func TestReplaceUint8(t *testing.T) {
+-#data
+-<!doctype html><svg>a</svg><frameset><frame>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| "a"
-
-- v := &Value{data: []uint8{uint8(1), uint8(1), uint8(1), uint8(1), uint8(1), uint8(1)}}
+-#data
+-<!doctype html><svg> </svg><frameset><frame>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <frameset>
+-| <frame>
-
-- rawArr := v.MustUint8Slice()
+-#data
+-<html>aaa<frameset></frameset>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "aaa"
-
-- replaced := v.ReplaceUint8(func(index int, val uint8) uint8 {
-- if index < len(rawArr)-1 {
-- return rawArr[index+1]
-- }
-- return rawArr[0]
-- })
+-#data
+-<html> a <frameset></frameset>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "a "
-
-- replacedArr := replaced.MustUint8Slice()
-- if assert.Equal(t, 6, len(replacedArr)) {
-- assert.Equal(t, replacedArr[0], rawArr[1])
-- assert.Equal(t, replacedArr[1], rawArr[2])
-- assert.Equal(t, replacedArr[2], rawArr[3])
-- assert.Equal(t, replacedArr[3], rawArr[4])
-- assert.Equal(t, replacedArr[4], rawArr[5])
-- assert.Equal(t, replacedArr[5], rawArr[0])
-- }
+-#data
+-<!doctype html><div><frameset>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <frameset>
-
--}
+-#data
+-<!doctype html><div><body><frameset>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <div>
-
--func TestCollectUint8(t *testing.T) {
+-#data
+-<!doctype html><p><math></p>a
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <math math>
+-| "a"
-
-- v := &Value{data: []uint8{uint8(1), uint8(1), uint8(1), uint8(1), uint8(1), uint8(1)}}
+-#data
+-<!doctype html><p><math><mn><span></p>a
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <math math>
+-| <math mn>
+-| <span>
+-| <p>
+-| "a"
-
-- collected := v.CollectUint8(func(index int, val uint8) interface{} {
-- return index
-- })
+-#data
+-<!doctype html><math></html>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
-
-- collectedArr := collected.MustInterSlice()
-- if assert.Equal(t, 6, len(collectedArr)) {
-- assert.Equal(t, collectedArr[0], 0)
-- assert.Equal(t, collectedArr[1], 1)
-- assert.Equal(t, collectedArr[2], 2)
-- assert.Equal(t, collectedArr[3], 3)
-- assert.Equal(t, collectedArr[4], 4)
-- assert.Equal(t, collectedArr[5], 5)
-- }
+-#data
+-<!doctype html><meta charset="ascii">
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <meta>
+-| charset="ascii"
+-| <body>
-
--}
+-#data
+-<!doctype html><meta http-equiv="content-type" content="text/html;charset=ascii">
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <meta>
+-| content="text/html;charset=ascii"
+-| http-equiv="content-type"
+-| <body>
-
--// ************************************************************
--// TESTS
--// ************************************************************
+-#data
+-<!doctype html><head><!--aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa--><meta charset="utf8">
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <!-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -->
+-| <meta>
+-| charset="utf8"
+-| <body>
-
--func TestUint16(t *testing.T) {
+-#data
+-<!doctype html><html a=b><head></head><html c=d>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| a="b"
+-| c="d"
+-| <head>
+-| <body>
-
-- val := uint16(1)
-- m := map[string]interface{}{"value": val, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").Uint16())
-- assert.Equal(t, val, New(m).Get("value").MustUint16())
-- assert.Equal(t, uint16(0), New(m).Get("nothing").Uint16())
-- assert.Equal(t, val, New(m).Get("nothing").Uint16(1))
+-#data
+-<!doctype html><image/>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <img>
-
-- assert.Panics(t, func() {
-- New(m).Get("age").MustUint16()
-- })
+-#data
+-<!doctype html>a<i>b<table>c<b>d</i>e</b>f
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| "a"
+-| <i>
+-| "bc"
+-| <b>
+-| "de"
+-| "f"
+-| <table>
-
--}
+-#data
+-<!doctype html><table><i>a<b>b<div>c<a>d</i>e</b>f
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <i>
+-| "a"
+-| <b>
+-| "b"
+-| <b>
+-| <div>
+-| <b>
+-| <i>
+-| "c"
+-| <a>
+-| "d"
+-| <a>
+-| "e"
+-| <a>
+-| "f"
+-| <table>
-
--func TestUint16Slice(t *testing.T) {
+-#data
+-<!doctype html><i>a<b>b<div>c<a>d</i>e</b>f
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <i>
+-| "a"
+-| <b>
+-| "b"
+-| <b>
+-| <div>
+-| <b>
+-| <i>
+-| "c"
+-| <a>
+-| "d"
+-| <a>
+-| "e"
+-| <a>
+-| "f"
-
-- val := uint16(1)
-- m := map[string]interface{}{"value": []uint16{val}, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").Uint16Slice()[0])
-- assert.Equal(t, val, New(m).Get("value").MustUint16Slice()[0])
-- assert.Equal(t, []uint16(nil), New(m).Get("nothing").Uint16Slice())
-- assert.Equal(t, val, New(m).Get("nothing").Uint16Slice([]uint16{uint16(1)})[0])
+-#data
+-<!doctype html><table><i>a<b>b<div>c</i>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <i>
+-| "a"
+-| <b>
+-| "b"
+-| <b>
+-| <div>
+-| <i>
+-| "c"
+-| <table>
-
-- assert.Panics(t, func() {
-- New(m).Get("nothing").MustUint16Slice()
-- })
+-#data
+-<!doctype html><table><i>a<b>b<div>c<a>d</i>e</b>f
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <i>
+-| "a"
+-| <b>
+-| "b"
+-| <b>
+-| <div>
+-| <b>
+-| <i>
+-| "c"
+-| <a>
+-| "d"
+-| <a>
+-| "e"
+-| <a>
+-| "f"
+-| <table>
-
--}
+-#data
+-<!doctype html><table><i>a<div>b<tr>c<b>d</i>e
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <i>
+-| "a"
+-| <div>
+-| "b"
+-| <i>
+-| "c"
+-| <b>
+-| "d"
+-| <b>
+-| "e"
+-| <table>
+-| <tbody>
+-| <tr>
-
--func TestIsUint16(t *testing.T) {
+-#data
+-<!doctype html><table><td><table><i>a<div>b<b>c</i>d
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <i>
+-| "a"
+-| <div>
+-| <i>
+-| "b"
+-| <b>
+-| "c"
+-| <b>
+-| "d"
+-| <table>
-
-- var v *Value
+-#data
+-<!doctype html><body><bgsound>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <bgsound>
-
-- v = &Value{data: uint16(1)}
-- assert.True(t, v.IsUint16())
+-#data
+-<!doctype html><body><basefont>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <basefont>
-
-- v = &Value{data: []uint16{uint16(1)}}
-- assert.True(t, v.IsUint16Slice())
+-#data
+-<!doctype html><a><b></a><basefont>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <a>
+-| <b>
+-| <basefont>
-
--}
+-#data
+-<!doctype html><a><b></a><bgsound>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <a>
+-| <b>
+-| <bgsound>
-
--func TestEachUint16(t *testing.T) {
+-#data
+-<!doctype html><figcaption><article></figcaption>a
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <figcaption>
+-| <article>
+-| "a"
-
-- v := &Value{data: []uint16{uint16(1), uint16(1), uint16(1), uint16(1), uint16(1)}}
-- count := 0
-- replacedVals := make([]uint16, 0)
-- assert.Equal(t, v, v.EachUint16(func(i int, val uint16) bool {
+-#data
+-<!doctype html><summary><article></summary>a
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <summary>
+-| <article>
+-| "a"
-
-- count++
-- replacedVals = append(replacedVals, val)
+-#data
+-<!doctype html><p><a><plaintext>b
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <a>
+-| <plaintext>
+-| <a>
+-| "b"
-
-- // abort early
-- if i == 2 {
-- return false
-- }
+-#data
+-<!DOCTYPE html><div>a<a></div>b<p>c</p>d
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| "a"
+-| <a>
+-| <a>
+-| "b"
+-| <p>
+-| "c"
+-| "d"
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests2.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests2.dat
+deleted file mode 100644
+index 60d8592..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests2.dat
++++ /dev/null
+@@ -1,763 +0,0 @@
+-#data
+-<!DOCTYPE html>Test
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| "Test"
-
-- return true
+-#data
+-<textarea>test</div>test
+-#errors
+-Line: 1 Col: 10 Unexpected start tag (textarea). Expected DOCTYPE.
+-Line: 1 Col: 24 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <textarea>
+-| "test</div>test"
-
-- }))
+-#data
+-<table><td>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+-Line: 1 Col: 11 Unexpected table cell start tag (td) in the table body phase.
+-Line: 1 Col: 11 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
-
-- assert.Equal(t, count, 3)
-- assert.Equal(t, replacedVals[0], v.MustUint16Slice()[0])
-- assert.Equal(t, replacedVals[1], v.MustUint16Slice()[1])
-- assert.Equal(t, replacedVals[2], v.MustUint16Slice()[2])
+-#data
+-<table><td>test</tbody></table>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+-Line: 1 Col: 11 Unexpected table cell start tag (td) in the table body phase.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| "test"
-
--}
+-#data
+-<frame>test
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (frame). Expected DOCTYPE.
+-Line: 1 Col: 7 Unexpected start tag frame. Ignored.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "test"
-
--func TestWhereUint16(t *testing.T) {
+-#data
+-<!DOCTYPE html><frameset>test
+-#errors
+-Line: 1 Col: 29 Unepxected characters in the frameset phase. Characters ignored.
+-Line: 1 Col: 29 Expected closing tag. Unexpected end of file.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <frameset>
-
-- v := &Value{data: []uint16{uint16(1), uint16(1), uint16(1), uint16(1), uint16(1), uint16(1)}}
+-#data
+-<!DOCTYPE html><frameset><!DOCTYPE html>
+-#errors
+-Line: 1 Col: 40 Unexpected DOCTYPE. Ignored.
+-Line: 1 Col: 40 Expected closing tag. Unexpected end of file.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <frameset>
-
-- selected := v.WhereUint16(func(i int, val uint16) bool {
-- return i%2 == 0
-- }).MustUint16Slice()
+-#data
+-<!DOCTYPE html><font><p><b>test</font>
+-#errors
+-Line: 1 Col: 38 End tag (font) violates step 1, paragraph 3 of the adoption agency algorithm.
+-Line: 1 Col: 38 End tag (font) violates step 1, paragraph 3 of the adoption agency algorithm.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <font>
+-| <p>
+-| <font>
+-| <b>
+-| "test"
-
-- assert.Equal(t, 3, len(selected))
+-#data
+-<!DOCTYPE html><dt><div><dd>
+-#errors
+-Line: 1 Col: 28 Missing end tag (div, dt).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <dt>
+-| <div>
+-| <dd>
-
--}
+-#data
+-<script></x
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-Line: 1 Col: 11 Unexpected end of file. Expected end tag (script).
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| "</x"
+-| <body>
-
--func TestGroupUint16(t *testing.T) {
+-#data
+-<table><plaintext><td>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+-Line: 1 Col: 18 Unexpected start tag (plaintext) in table context caused voodoo mode.
+-Line: 1 Col: 22 Unexpected end of file. Expected table content.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <plaintext>
+-| "<td>"
+-| <table>
-
-- v := &Value{data: []uint16{uint16(1), uint16(1), uint16(1), uint16(1), uint16(1), uint16(1)}}
+-#data
+-<plaintext></plaintext>
+-#errors
+-Line: 1 Col: 11 Unexpected start tag (plaintext). Expected DOCTYPE.
+-Line: 1 Col: 23 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <plaintext>
+-| "</plaintext>"
-
-- grouped := v.GroupUint16(func(i int, val uint16) string {
-- return fmt.Sprintf("%v", i%2 == 0)
-- }).data.(map[string][]uint16)
+-#data
+-<!DOCTYPE html><table><tr>TEST
+-#errors
+-Line: 1 Col: 30 Unexpected non-space characters in table context caused voodoo mode.
+-Line: 1 Col: 30 Unexpected end of file. Expected table content.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| "TEST"
+-| <table>
+-| <tbody>
+-| <tr>
-
-- assert.Equal(t, 2, len(grouped))
-- assert.Equal(t, 3, len(grouped["true"]))
-- assert.Equal(t, 3, len(grouped["false"]))
+-#data
+-<!DOCTYPE html><body t1=1><body t2=2><body t3=3 t4=4>
+-#errors
+-Line: 1 Col: 37 Unexpected start tag (body).
+-Line: 1 Col: 53 Unexpected start tag (body).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| t1="1"
+-| t2="2"
+-| t3="3"
+-| t4="4"
-
--}
+-#data
+-</b test
+-#errors
+-Line: 1 Col: 8 Unexpected end of file in attribute name.
+-Line: 1 Col: 8 End tag contains unexpected attributes.
+-Line: 1 Col: 8 Unexpected end tag (b). Expected DOCTYPE.
+-Line: 1 Col: 8 Unexpected end tag (b) after the (implied) root element.
+-#document
+-| <html>
+-| <head>
+-| <body>
-
--func TestReplaceUint16(t *testing.T) {
+-#data
+-<!DOCTYPE html></b test<b &=&>X
+-#errors
+-Line: 1 Col: 32 Named entity didn't end with ';'.
+-Line: 1 Col: 33 End tag contains unexpected attributes.
+-Line: 1 Col: 33 Unexpected end tag (b) after the (implied) root element.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| "X"
-
-- v := &Value{data: []uint16{uint16(1), uint16(1), uint16(1), uint16(1), uint16(1), uint16(1)}}
+-#data
+-<!doctypehtml><scrIPt type=text/x-foobar;baz>X</SCRipt
+-#errors
+-Line: 1 Col: 9 No space after literal string 'DOCTYPE'.
+-Line: 1 Col: 54 Unexpected end of file in the tag name.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| type="text/x-foobar;baz"
+-| "X</SCRipt"
+-| <body>
-
-- rawArr := v.MustUint16Slice()
+-#data
+-&
+-#errors
+-Line: 1 Col: 1 Unexpected non-space characters. Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "&"
-
-- replaced := v.ReplaceUint16(func(index int, val uint16) uint16 {
-- if index < len(rawArr)-1 {
-- return rawArr[index+1]
-- }
-- return rawArr[0]
-- })
+-#data
+-&#
+-#errors
+-Line: 1 Col: 1 Numeric entity expected. Got end of file instead.
+-Line: 1 Col: 1 Unexpected non-space characters. Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "&#"
-
-- replacedArr := replaced.MustUint16Slice()
-- if assert.Equal(t, 6, len(replacedArr)) {
-- assert.Equal(t, replacedArr[0], rawArr[1])
-- assert.Equal(t, replacedArr[1], rawArr[2])
-- assert.Equal(t, replacedArr[2], rawArr[3])
-- assert.Equal(t, replacedArr[3], rawArr[4])
-- assert.Equal(t, replacedArr[4], rawArr[5])
-- assert.Equal(t, replacedArr[5], rawArr[0])
-- }
+-#data
+-&#X
+-#errors
+-Line: 1 Col: 3 Numeric entity expected but none found.
+-Line: 1 Col: 3 Unexpected non-space characters. Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "&#X"
-
--}
+-#data
+-&#x
+-#errors
+-Line: 1 Col: 3 Numeric entity expected but none found.
+-Line: 1 Col: 3 Unexpected non-space characters. Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "&#x"
-
--func TestCollectUint16(t *testing.T) {
+-#data
+--
+-#errors
+-Line: 1 Col: 4 Numeric entity didn't end with ';'.
+-Line: 1 Col: 4 Unexpected non-space characters. Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "-"
-
-- v := &Value{data: []uint16{uint16(1), uint16(1), uint16(1), uint16(1), uint16(1), uint16(1)}}
+-#data
+-&x-test
+-#errors
+-Line: 1 Col: 1 Named entity expected. Got none.
+-Line: 1 Col: 1 Unexpected non-space characters. Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "&x-test"
-
-- collected := v.CollectUint16(func(index int, val uint16) interface{} {
-- return index
-- })
+-#data
+-<!doctypehtml><p><li>
+-#errors
+-Line: 1 Col: 9 No space after literal string 'DOCTYPE'.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <li>
-
-- collectedArr := collected.MustInterSlice()
-- if assert.Equal(t, 6, len(collectedArr)) {
-- assert.Equal(t, collectedArr[0], 0)
-- assert.Equal(t, collectedArr[1], 1)
-- assert.Equal(t, collectedArr[2], 2)
-- assert.Equal(t, collectedArr[3], 3)
-- assert.Equal(t, collectedArr[4], 4)
-- assert.Equal(t, collectedArr[5], 5)
-- }
+-#data
+-<!doctypehtml><p><dt>
+-#errors
+-Line: 1 Col: 9 No space after literal string 'DOCTYPE'.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <dt>
-
--}
+-#data
+-<!doctypehtml><p><dd>
+-#errors
+-Line: 1 Col: 9 No space after literal string 'DOCTYPE'.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <dd>
-
--// ************************************************************
--// TESTS
--// ************************************************************
+-#data
+-<!doctypehtml><p><form>
+-#errors
+-Line: 1 Col: 9 No space after literal string 'DOCTYPE'.
+-Line: 1 Col: 23 Expected closing tag. Unexpected end of file.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <form>
-
--func TestUint32(t *testing.T) {
+-#data
+-<!DOCTYPE html><p></P>X
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| "X"
-
-- val := uint32(1)
-- m := map[string]interface{}{"value": val, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").Uint32())
-- assert.Equal(t, val, New(m).Get("value").MustUint32())
-- assert.Equal(t, uint32(0), New(m).Get("nothing").Uint32())
-- assert.Equal(t, val, New(m).Get("nothing").Uint32(1))
+-#data
+-&
+-#errors
+-Line: 1 Col: 4 Named entity didn't end with ';'.
+-Line: 1 Col: 4 Unexpected non-space characters. Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "&"
-
-- assert.Panics(t, func() {
-- New(m).Get("age").MustUint32()
-- })
+-#data
+-&AMp;
+-#errors
+-Line: 1 Col: 1 Named entity expected. Got none.
+-Line: 1 Col: 1 Unexpected non-space characters. Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "&AMp;"
-
--}
+-#data
+-<!DOCTYPE html><html><head></head><body><thisISasillyTESTelementNameToMakeSureCrazyTagNamesArePARSEDcorrectLY>
+-#errors
+-Line: 1 Col: 110 Expected closing tag. Unexpected end of file.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <thisisasillytestelementnametomakesurecrazytagnamesareparsedcorrectly>
-
--func TestUint32Slice(t *testing.T) {
+-#data
+-<!DOCTYPE html>X</body>X
+-#errors
+-Line: 1 Col: 24 Unexpected non-space characters in the after body phase.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| "XX"
-
-- val := uint32(1)
-- m := map[string]interface{}{"value": []uint32{val}, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").Uint32Slice()[0])
-- assert.Equal(t, val, New(m).Get("value").MustUint32Slice()[0])
-- assert.Equal(t, []uint32(nil), New(m).Get("nothing").Uint32Slice())
-- assert.Equal(t, val, New(m).Get("nothing").Uint32Slice([]uint32{uint32(1)})[0])
+-#data
+-<!DOCTYPE html><!-- X
+-#errors
+-Line: 1 Col: 21 Unexpected end of file in comment.
+-#document
+-| <!DOCTYPE html>
+-| <!-- X -->
+-| <html>
+-| <head>
+-| <body>
-
-- assert.Panics(t, func() {
-- New(m).Get("nothing").MustUint32Slice()
-- })
+-#data
+-<!DOCTYPE html><table><caption>test TEST</caption><td>test
+-#errors
+-Line: 1 Col: 54 Unexpected table cell start tag (td) in the table body phase.
+-Line: 1 Col: 58 Expected closing tag. Unexpected end of file.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <caption>
+-| "test TEST"
+-| <tbody>
+-| <tr>
+-| <td>
+-| "test"
-
--}
+-#data
+-<!DOCTYPE html><select><option><optgroup>
+-#errors
+-Line: 1 Col: 41 Expected closing tag. Unexpected end of file.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <select>
+-| <option>
+-| <optgroup>
-
--func TestIsUint32(t *testing.T) {
+-#data
+-<!DOCTYPE html><select><optgroup><option></optgroup><option><select><option>
+-#errors
+-Line: 1 Col: 68 Unexpected select start tag in the select phase treated as select end tag.
+-Line: 1 Col: 76 Expected closing tag. Unexpected end of file.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <select>
+-| <optgroup>
+-| <option>
+-| <option>
+-| <option>
-
-- var v *Value
+-#data
+-<!DOCTYPE html><select><optgroup><option><optgroup>
+-#errors
+-Line: 1 Col: 51 Expected closing tag. Unexpected end of file.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <select>
+-| <optgroup>
+-| <option>
+-| <optgroup>
-
-- v = &Value{data: uint32(1)}
-- assert.True(t, v.IsUint32())
+-#data
+-<!DOCTYPE html><datalist><option>foo</datalist>bar
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <datalist>
+-| <option>
+-| "foo"
+-| "bar"
-
-- v = &Value{data: []uint32{uint32(1)}}
-- assert.True(t, v.IsUint32Slice())
+-#data
+-<!DOCTYPE html><font><input><input></font>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <font>
+-| <input>
+-| <input>
-
--}
+-#data
+-<!DOCTYPE html><!-- XXX - XXX -->
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <!-- XXX - XXX -->
+-| <html>
+-| <head>
+-| <body>
-
--func TestEachUint32(t *testing.T) {
+-#data
+-<!DOCTYPE html><!-- XXX - XXX
+-#errors
+-Line: 1 Col: 29 Unexpected end of file in comment (-)
+-#document
+-| <!DOCTYPE html>
+-| <!-- XXX - XXX -->
+-| <html>
+-| <head>
+-| <body>
-
-- v := &Value{data: []uint32{uint32(1), uint32(1), uint32(1), uint32(1), uint32(1)}}
-- count := 0
-- replacedVals := make([]uint32, 0)
-- assert.Equal(t, v, v.EachUint32(func(i int, val uint32) bool {
+-#data
+-<!DOCTYPE html><!-- XXX - XXX - XXX -->
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <!-- XXX - XXX - XXX -->
+-| <html>
+-| <head>
+-| <body>
-
-- count++
-- replacedVals = append(replacedVals, val)
+-#data
+-<isindex test=x name=x>
+-#errors
+-Line: 1 Col: 23 Unexpected start tag (isindex). Expected DOCTYPE.
+-Line: 1 Col: 23 Unexpected start tag isindex. Don't use it!
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <form>
+-| <hr>
+-| <label>
+-| "This is a searchable index. Enter search keywords: "
+-| <input>
+-| name="isindex"
+-| test="x"
+-| <hr>
-
-- // abort early
-- if i == 2 {
-- return false
-- }
+-#data
+-test
+-test
+-#errors
+-Line: 2 Col: 4 Unexpected non-space characters. Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "test
+-test"
-
-- return true
+-#data
+-<!DOCTYPE html><body><title>test</body></title>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <title>
+-| "test</body>"
-
-- }))
+-#data
+-<!DOCTYPE html><body><title>X</title><meta name=z><link rel=foo><style>
+-x { content:"</style" } </style>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <title>
+-| "X"
+-| <meta>
+-| name="z"
+-| <link>
+-| rel="foo"
+-| <style>
+-| "
+-x { content:"</style" } "
-
-- assert.Equal(t, count, 3)
-- assert.Equal(t, replacedVals[0], v.MustUint32Slice()[0])
-- assert.Equal(t, replacedVals[1], v.MustUint32Slice()[1])
-- assert.Equal(t, replacedVals[2], v.MustUint32Slice()[2])
+-#data
+-<!DOCTYPE html><select><optgroup></optgroup></select>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <select>
+-| <optgroup>
-
--}
+-#data
+-
+-
+-#errors
+-Line: 2 Col: 1 Unexpected End of file. Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
-
--func TestWhereUint32(t *testing.T) {
+-#data
+-<!DOCTYPE html> <html>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
-
-- v := &Value{data: []uint32{uint32(1), uint32(1), uint32(1), uint32(1), uint32(1), uint32(1)}}
+-#data
+-<!DOCTYPE html><script>
+-</script> <title>x</title> </head>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <script>
+-| "
+-"
+-| " "
+-| <title>
+-| "x"
+-| " "
+-| <body>
-
-- selected := v.WhereUint32(func(i int, val uint32) bool {
-- return i%2 == 0
-- }).MustUint32Slice()
+-#data
+-<!DOCTYPE html><html><body><html id=x>
+-#errors
+-Line: 1 Col: 38 html needs to be the first start tag.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| id="x"
+-| <head>
+-| <body>
-
-- assert.Equal(t, 3, len(selected))
+-#data
+-<!DOCTYPE html>X</body><html id="x">
+-#errors
+-Line: 1 Col: 36 Unexpected start tag token (html) in the after body phase.
+-Line: 1 Col: 36 html needs to be the first start tag.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| id="x"
+-| <head>
+-| <body>
+-| "X"
-
--}
+-#data
+-<!DOCTYPE html><head><html id=x>
+-#errors
+-Line: 1 Col: 32 html needs to be the first start tag.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| id="x"
+-| <head>
+-| <body>
-
--func TestGroupUint32(t *testing.T) {
+-#data
+-<!DOCTYPE html>X</html>X
+-#errors
+-Line: 1 Col: 24 Unexpected non-space characters in the after body phase.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| "XX"
-
-- v := &Value{data: []uint32{uint32(1), uint32(1), uint32(1), uint32(1), uint32(1), uint32(1)}}
+-#data
+-<!DOCTYPE html>X</html>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| "X "
-
-- grouped := v.GroupUint32(func(i int, val uint32) string {
-- return fmt.Sprintf("%v", i%2 == 0)
-- }).data.(map[string][]uint32)
+-#data
+-<!DOCTYPE html>X</html><p>X
+-#errors
+-Line: 1 Col: 26 Unexpected start tag (p).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| "X"
+-| <p>
+-| "X"
-
-- assert.Equal(t, 2, len(grouped))
-- assert.Equal(t, 3, len(grouped["true"]))
-- assert.Equal(t, 3, len(grouped["false"]))
+-#data
+-<!DOCTYPE html>X<p/x/y/z>
+-#errors
+-Line: 1 Col: 19 Expected a > after the /.
+-Line: 1 Col: 21 Solidus (/) incorrectly placed in tag.
+-Line: 1 Col: 23 Solidus (/) incorrectly placed in tag.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| "X"
+-| <p>
+-| x=""
+-| y=""
+-| z=""
-
--}
+-#data
+-<!DOCTYPE html><!--x--
+-#errors
+-Line: 1 Col: 22 Unexpected end of file in comment (--).
+-#document
+-| <!DOCTYPE html>
+-| <!-- x -->
+-| <html>
+-| <head>
+-| <body>
-
--func TestReplaceUint32(t *testing.T) {
+-#data
+-<!DOCTYPE html><table><tr><td></p></table>
+-#errors
+-Line: 1 Col: 34 Unexpected end tag (p). Ignored.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <p>
-
-- v := &Value{data: []uint32{uint32(1), uint32(1), uint32(1), uint32(1), uint32(1), uint32(1)}}
+-#data
+-<!DOCTYPE <!DOCTYPE HTML>><!--<!--x-->-->
+-#errors
+-Line: 1 Col: 20 Expected space or '>'. Got ''
+-Line: 1 Col: 25 Erroneous DOCTYPE.
+-Line: 1 Col: 35 Unexpected character in comment found.
+-#document
+-| <!DOCTYPE <!doctype>
+-| <html>
+-| <head>
+-| <body>
+-| ">"
+-| <!-- <!--x -->
+-| "-->"
-
-- rawArr := v.MustUint32Slice()
+-#data
+-<!doctype html><div><form></form><div></div></div>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| <form>
+-| <div>
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests20.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests20.dat
+deleted file mode 100644
+index 6bd8256..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests20.dat
++++ /dev/null
+@@ -1,455 +0,0 @@
+-#data
+-<!doctype html><p><button><button>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <button>
+-| <button>
-
-- replaced := v.ReplaceUint32(func(index int, val uint32) uint32 {
-- if index < len(rawArr)-1 {
-- return rawArr[index+1]
-- }
-- return rawArr[0]
-- })
+-#data
+-<!doctype html><p><button><address>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <button>
+-| <address>
-
-- replacedArr := replaced.MustUint32Slice()
-- if assert.Equal(t, 6, len(replacedArr)) {
-- assert.Equal(t, replacedArr[0], rawArr[1])
-- assert.Equal(t, replacedArr[1], rawArr[2])
-- assert.Equal(t, replacedArr[2], rawArr[3])
-- assert.Equal(t, replacedArr[3], rawArr[4])
-- assert.Equal(t, replacedArr[4], rawArr[5])
-- assert.Equal(t, replacedArr[5], rawArr[0])
-- }
+-#data
+-<!doctype html><p><button><blockquote>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <button>
+-| <blockquote>
-
--}
+-#data
+-<!doctype html><p><button><menu>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <button>
+-| <menu>
-
--func TestCollectUint32(t *testing.T) {
+-#data
+-<!doctype html><p><button><p>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <button>
+-| <p>
-
-- v := &Value{data: []uint32{uint32(1), uint32(1), uint32(1), uint32(1), uint32(1), uint32(1)}}
+-#data
+-<!doctype html><p><button><ul>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <button>
+-| <ul>
-
-- collected := v.CollectUint32(func(index int, val uint32) interface{} {
-- return index
-- })
+-#data
+-<!doctype html><p><button><h1>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <button>
+-| <h1>
-
-- collectedArr := collected.MustInterSlice()
-- if assert.Equal(t, 6, len(collectedArr)) {
-- assert.Equal(t, collectedArr[0], 0)
-- assert.Equal(t, collectedArr[1], 1)
-- assert.Equal(t, collectedArr[2], 2)
-- assert.Equal(t, collectedArr[3], 3)
-- assert.Equal(t, collectedArr[4], 4)
-- assert.Equal(t, collectedArr[5], 5)
-- }
+-#data
+-<!doctype html><p><button><h6>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <button>
+-| <h6>
-
--}
+-#data
+-<!doctype html><p><button><listing>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <button>
+-| <listing>
-
--// ************************************************************
--// TESTS
--// ************************************************************
+-#data
+-<!doctype html><p><button><pre>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <button>
+-| <pre>
-
--func TestUint64(t *testing.T) {
+-#data
+-<!doctype html><p><button><form>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <button>
+-| <form>
-
-- val := uint64(1)
-- m := map[string]interface{}{"value": val, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").Uint64())
-- assert.Equal(t, val, New(m).Get("value").MustUint64())
-- assert.Equal(t, uint64(0), New(m).Get("nothing").Uint64())
-- assert.Equal(t, val, New(m).Get("nothing").Uint64(1))
+-#data
+-<!doctype html><p><button><li>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <button>
+-| <li>
-
-- assert.Panics(t, func() {
-- New(m).Get("age").MustUint64()
-- })
+-#data
+-<!doctype html><p><button><dd>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <button>
+-| <dd>
-
--}
+-#data
+-<!doctype html><p><button><dt>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <button>
+-| <dt>
-
--func TestUint64Slice(t *testing.T) {
+-#data
+-<!doctype html><p><button><plaintext>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <button>
+-| <plaintext>
-
-- val := uint64(1)
-- m := map[string]interface{}{"value": []uint64{val}, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").Uint64Slice()[0])
-- assert.Equal(t, val, New(m).Get("value").MustUint64Slice()[0])
-- assert.Equal(t, []uint64(nil), New(m).Get("nothing").Uint64Slice())
-- assert.Equal(t, val, New(m).Get("nothing").Uint64Slice([]uint64{uint64(1)})[0])
+-#data
+-<!doctype html><p><button><table>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <button>
+-| <table>
-
-- assert.Panics(t, func() {
-- New(m).Get("nothing").MustUint64Slice()
-- })
+-#data
+-<!doctype html><p><button><hr>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <button>
+-| <hr>
-
--}
+-#data
+-<!doctype html><p><button><xmp>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <button>
+-| <xmp>
-
--func TestIsUint64(t *testing.T) {
+-#data
+-<!doctype html><p><button></p>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <button>
+-| <p>
-
-- var v *Value
+-#data
+-<!doctype html><address><button></address>a
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <address>
+-| <button>
+-| "a"
-
-- v = &Value{data: uint64(1)}
-- assert.True(t, v.IsUint64())
+-#data
+-<!doctype html><address><button></address>a
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <address>
+-| <button>
+-| "a"
-
-- v = &Value{data: []uint64{uint64(1)}}
-- assert.True(t, v.IsUint64Slice())
+-#data
+-<p><table></p>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <p>
+-| <table>
-
--}
+-#data
+-<!doctype html><svg>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
-
--func TestEachUint64(t *testing.T) {
+-#data
+-<!doctype html><p><figcaption>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <figcaption>
-
-- v := &Value{data: []uint64{uint64(1), uint64(1), uint64(1), uint64(1), uint64(1)}}
-- count := 0
-- replacedVals := make([]uint64, 0)
-- assert.Equal(t, v, v.EachUint64(func(i int, val uint64) bool {
+-#data
+-<!doctype html><p><summary>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <summary>
-
-- count++
-- replacedVals = append(replacedVals, val)
+-#data
+-<!doctype html><form><table><form>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <form>
+-| <table>
-
-- // abort early
-- if i == 2 {
-- return false
-- }
+-#data
+-<!doctype html><table><form><form>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <form>
-
-- return true
+-#data
+-<!doctype html><table><form></table><form>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <form>
-
-- }))
+-#data
+-<!doctype html><svg><foreignObject><p>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| <svg foreignObject>
+-| <p>
-
-- assert.Equal(t, count, 3)
-- assert.Equal(t, replacedVals[0], v.MustUint64Slice()[0])
-- assert.Equal(t, replacedVals[1], v.MustUint64Slice()[1])
-- assert.Equal(t, replacedVals[2], v.MustUint64Slice()[2])
+-#data
+-<!doctype html><svg><title>abc
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| <svg title>
+-| "abc"
-
--}
+-#data
+-<option><span><option>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <option>
+-| <span>
+-| <option>
-
--func TestWhereUint64(t *testing.T) {
+-#data
+-<option><option>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <option>
+-| <option>
-
-- v := &Value{data: []uint64{uint64(1), uint64(1), uint64(1), uint64(1), uint64(1), uint64(1)}}
+-#data
+-<math><annotation-xml><div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| <math annotation-xml>
+-| <div>
-
-- selected := v.WhereUint64(func(i int, val uint64) bool {
-- return i%2 == 0
-- }).MustUint64Slice()
+-#data
+-<math><annotation-xml encoding="application/svg+xml"><div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| <math annotation-xml>
+-| encoding="application/svg+xml"
+-| <div>
-
-- assert.Equal(t, 3, len(selected))
+-#data
+-<math><annotation-xml encoding="application/xhtml+xml"><div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| <math annotation-xml>
+-| encoding="application/xhtml+xml"
+-| <div>
-
--}
+-#data
+-<math><annotation-xml encoding="aPPlication/xhtmL+xMl"><div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| <math annotation-xml>
+-| encoding="aPPlication/xhtmL+xMl"
+-| <div>
-
--func TestGroupUint64(t *testing.T) {
+-#data
+-<math><annotation-xml encoding="text/html"><div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| <math annotation-xml>
+-| encoding="text/html"
+-| <div>
-
-- v := &Value{data: []uint64{uint64(1), uint64(1), uint64(1), uint64(1), uint64(1), uint64(1)}}
+-#data
+-<math><annotation-xml encoding="Text/htmL"><div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| <math annotation-xml>
+-| encoding="Text/htmL"
+-| <div>
-
-- grouped := v.GroupUint64(func(i int, val uint64) string {
-- return fmt.Sprintf("%v", i%2 == 0)
-- }).data.(map[string][]uint64)
+-#data
+-<math><annotation-xml encoding=" text/html "><div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| <math annotation-xml>
+-| encoding=" text/html "
+-| <div>
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests21.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests21.dat
+deleted file mode 100644
+index 1260ec0..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests21.dat
++++ /dev/null
+@@ -1,221 +0,0 @@
+-#data
+-<svg><![CDATA[foo]]>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| "foo"
-
-- assert.Equal(t, 2, len(grouped))
-- assert.Equal(t, 3, len(grouped["true"]))
-- assert.Equal(t, 3, len(grouped["false"]))
+-#data
+-<math><![CDATA[foo]]>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| "foo"
-
--}
+-#data
+-<div><![CDATA[foo]]>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| <!-- [CDATA[foo]] -->
-
--func TestReplaceUint64(t *testing.T) {
+-#data
+-<svg><![CDATA[foo
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| "foo"
-
-- v := &Value{data: []uint64{uint64(1), uint64(1), uint64(1), uint64(1), uint64(1), uint64(1)}}
+-#data
+-<svg><![CDATA[foo
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| "foo"
-
-- rawArr := v.MustUint64Slice()
+-#data
+-<svg><![CDATA[
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
-
-- replaced := v.ReplaceUint64(func(index int, val uint64) uint64 {
-- if index < len(rawArr)-1 {
-- return rawArr[index+1]
-- }
-- return rawArr[0]
-- })
+-#data
+-<svg><![CDATA[]]>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
-
-- replacedArr := replaced.MustUint64Slice()
-- if assert.Equal(t, 6, len(replacedArr)) {
-- assert.Equal(t, replacedArr[0], rawArr[1])
-- assert.Equal(t, replacedArr[1], rawArr[2])
-- assert.Equal(t, replacedArr[2], rawArr[3])
-- assert.Equal(t, replacedArr[3], rawArr[4])
-- assert.Equal(t, replacedArr[4], rawArr[5])
-- assert.Equal(t, replacedArr[5], rawArr[0])
-- }
+-#data
+-<svg><![CDATA[]] >]]>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| "]] >"
-
--}
+-#data
+-<svg><![CDATA[]] >]]>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| "]] >"
-
--func TestCollectUint64(t *testing.T) {
+-#data
+-<svg><![CDATA[]]
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| "]]"
-
-- v := &Value{data: []uint64{uint64(1), uint64(1), uint64(1), uint64(1), uint64(1), uint64(1)}}
+-#data
+-<svg><![CDATA[]
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| "]"
-
-- collected := v.CollectUint64(func(index int, val uint64) interface{} {
-- return index
-- })
+-#data
+-<svg><![CDATA[]>a
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| "]>a"
-
-- collectedArr := collected.MustInterSlice()
-- if assert.Equal(t, 6, len(collectedArr)) {
-- assert.Equal(t, collectedArr[0], 0)
-- assert.Equal(t, collectedArr[1], 1)
-- assert.Equal(t, collectedArr[2], 2)
-- assert.Equal(t, collectedArr[3], 3)
-- assert.Equal(t, collectedArr[4], 4)
-- assert.Equal(t, collectedArr[5], 5)
-- }
+-#data
+-<svg><foreignObject><div><![CDATA[foo]]>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| <svg foreignObject>
+-| <div>
+-| <!-- [CDATA[foo]] -->
-
--}
+-#data
+-<svg><![CDATA[<svg>]]>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| "<svg>"
-
--// ************************************************************
--// TESTS
--// ************************************************************
+-#data
+-<svg><![CDATA[</svg>a]]>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| "</svg>a"
-
--func TestUintptr(t *testing.T) {
+-#data
+-<svg><![CDATA[<svg>a
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| "<svg>a"
-
-- val := uintptr(1)
-- m := map[string]interface{}{"value": val, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").Uintptr())
-- assert.Equal(t, val, New(m).Get("value").MustUintptr())
-- assert.Equal(t, uintptr(0), New(m).Get("nothing").Uintptr())
-- assert.Equal(t, val, New(m).Get("nothing").Uintptr(1))
+-#data
+-<svg><![CDATA[</svg>a
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| "</svg>a"
-
-- assert.Panics(t, func() {
-- New(m).Get("age").MustUintptr()
-- })
+-#data
+-<svg><![CDATA[<svg>]]><path>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| "<svg>"
+-| <svg path>
-
--}
+-#data
+-<svg><![CDATA[<svg>]]></path>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| "<svg>"
-
--func TestUintptrSlice(t *testing.T) {
+-#data
+-<svg><![CDATA[<svg>]]><!--path-->
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| "<svg>"
+-| <!-- path -->
-
-- val := uintptr(1)
-- m := map[string]interface{}{"value": []uintptr{val}, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").UintptrSlice()[0])
-- assert.Equal(t, val, New(m).Get("value").MustUintptrSlice()[0])
-- assert.Equal(t, []uintptr(nil), New(m).Get("nothing").UintptrSlice())
-- assert.Equal(t, val, New(m).Get("nothing").UintptrSlice([]uintptr{uintptr(1)})[0])
+-#data
+-<svg><![CDATA[<svg>]]>path
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| "<svg>path"
-
-- assert.Panics(t, func() {
-- New(m).Get("nothing").MustUintptrSlice()
-- })
+-#data
+-<svg><![CDATA[<!--svg-->]]>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| "<!--svg-->"
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests22.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests22.dat
+deleted file mode 100644
+index aab27b2..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests22.dat
++++ /dev/null
+@@ -1,157 +0,0 @@
+-#data
+-<a><b><big><em><strong><div>X</a>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <a>
+-| <b>
+-| <big>
+-| <em>
+-| <strong>
+-| <big>
+-| <em>
+-| <strong>
+-| <div>
+-| <a>
+-| "X"
-
--}
+-#data
+-<a><b><div id=1><div id=2><div id=3><div id=4><div id=5><div id=6><div id=7><div id=8>A</a>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <a>
+-| <b>
+-| <b>
+-| <div>
+-| id="1"
+-| <a>
+-| <div>
+-| id="2"
+-| <a>
+-| <div>
+-| id="3"
+-| <a>
+-| <div>
+-| id="4"
+-| <a>
+-| <div>
+-| id="5"
+-| <a>
+-| <div>
+-| id="6"
+-| <a>
+-| <div>
+-| id="7"
+-| <a>
+-| <div>
+-| id="8"
+-| <a>
+-| "A"
-
--func TestIsUintptr(t *testing.T) {
+-#data
+-<a><b><div id=1><div id=2><div id=3><div id=4><div id=5><div id=6><div id=7><div id=8><div id=9>A</a>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <a>
+-| <b>
+-| <b>
+-| <div>
+-| id="1"
+-| <a>
+-| <div>
+-| id="2"
+-| <a>
+-| <div>
+-| id="3"
+-| <a>
+-| <div>
+-| id="4"
+-| <a>
+-| <div>
+-| id="5"
+-| <a>
+-| <div>
+-| id="6"
+-| <a>
+-| <div>
+-| id="7"
+-| <a>
+-| <div>
+-| id="8"
+-| <a>
+-| <div>
+-| id="9"
+-| "A"
-
-- var v *Value
+-#data
+-<a><b><div id=1><div id=2><div id=3><div id=4><div id=5><div id=6><div id=7><div id=8><div id=9><div id=10>A</a>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <a>
+-| <b>
+-| <b>
+-| <div>
+-| id="1"
+-| <a>
+-| <div>
+-| id="2"
+-| <a>
+-| <div>
+-| id="3"
+-| <a>
+-| <div>
+-| id="4"
+-| <a>
+-| <div>
+-| id="5"
+-| <a>
+-| <div>
+-| id="6"
+-| <a>
+-| <div>
+-| id="7"
+-| <a>
+-| <div>
+-| id="8"
+-| <a>
+-| <div>
+-| id="9"
+-| <div>
+-| id="10"
+-| "A"
-
-- v = &Value{data: uintptr(1)}
-- assert.True(t, v.IsUintptr())
+-#data
+-<cite><b><cite><i><cite><i><cite><i><div>X</b>TEST
+-#errors
+-Line: 1 Col: 6 Unexpected start tag (cite). Expected DOCTYPE.
+-Line: 1 Col: 46 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
+-Line: 1 Col: 50 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <cite>
+-| <b>
+-| <cite>
+-| <i>
+-| <cite>
+-| <i>
+-| <cite>
+-| <i>
+-| <i>
+-| <i>
+-| <div>
+-| <b>
+-| "X"
+-| "TEST"
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests23.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests23.dat
+deleted file mode 100644
+index 34d2a73..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests23.dat
++++ /dev/null
+@@ -1,155 +0,0 @@
+-#data
+-<p><font size=4><font color=red><font size=4><font size=4><font size=4><font size=4><font size=4><font color=red><p>X
+-#errors
+-3: Start tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
+-116: Unclosed elements.
+-117: End of file seen and there were open elements.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <font>
+-| size="4"
+-| <font>
+-| color="red"
+-| <font>
+-| size="4"
+-| <font>
+-| size="4"
+-| <font>
+-| size="4"
+-| <font>
+-| size="4"
+-| <font>
+-| size="4"
+-| <font>
+-| color="red"
+-| <p>
+-| <font>
+-| color="red"
+-| <font>
+-| size="4"
+-| <font>
+-| size="4"
+-| <font>
+-| size="4"
+-| <font>
+-| color="red"
+-| "X"
-
-- v = &Value{data: []uintptr{uintptr(1)}}
-- assert.True(t, v.IsUintptrSlice())
+-#data
+-<p><font size=4><font size=4><font size=4><font size=4><p>X
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <font>
+-| size="4"
+-| <font>
+-| size="4"
+-| <font>
+-| size="4"
+-| <font>
+-| size="4"
+-| <p>
+-| <font>
+-| size="4"
+-| <font>
+-| size="4"
+-| <font>
+-| size="4"
+-| "X"
-
--}
+-#data
+-<p><font size=4><font size=4><font size=4><font size="5"><font size=4><p>X
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <font>
+-| size="4"
+-| <font>
+-| size="4"
+-| <font>
+-| size="4"
+-| <font>
+-| size="5"
+-| <font>
+-| size="4"
+-| <p>
+-| <font>
+-| size="4"
+-| <font>
+-| size="4"
+-| <font>
+-| size="5"
+-| <font>
+-| size="4"
+-| "X"
-
--func TestEachUintptr(t *testing.T) {
+-#data
+-<p><font size=4 id=a><font size=4 id=b><font size=4><font size=4><p>X
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <font>
+-| id="a"
+-| size="4"
+-| <font>
+-| id="b"
+-| size="4"
+-| <font>
+-| size="4"
+-| <font>
+-| size="4"
+-| <p>
+-| <font>
+-| id="a"
+-| size="4"
+-| <font>
+-| id="b"
+-| size="4"
+-| <font>
+-| size="4"
+-| <font>
+-| size="4"
+-| "X"
-
-- v := &Value{data: []uintptr{uintptr(1), uintptr(1), uintptr(1), uintptr(1), uintptr(1)}}
-- count := 0
-- replacedVals := make([]uintptr, 0)
-- assert.Equal(t, v, v.EachUintptr(func(i int, val uintptr) bool {
+-#data
+-<p><b id=a><b id=a><b id=a><b><object><b id=a><b id=a>X</object><p>Y
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <b>
+-| id="a"
+-| <b>
+-| id="a"
+-| <b>
+-| id="a"
+-| <b>
+-| <object>
+-| <b>
+-| id="a"
+-| <b>
+-| id="a"
+-| "X"
+-| <p>
+-| <b>
+-| id="a"
+-| <b>
+-| id="a"
+-| <b>
+-| id="a"
+-| <b>
+-| "Y"
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests24.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests24.dat
+deleted file mode 100644
+index f6dc7eb..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests24.dat
++++ /dev/null
+@@ -1,79 +0,0 @@
+-#data
+-<!DOCTYPE html>≂̸
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| "≂̸"
-
-- count++
-- replacedVals = append(replacedVals, val)
+-#data
+-<!DOCTYPE html>≂̸A
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| "≂̸A"
-
-- // abort early
-- if i == 2 {
-- return false
-- }
+-#data
+-<!DOCTYPE html>  
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| " "
-
-- return true
+-#data
+-<!DOCTYPE html>  A
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| " A"
-
-- }))
+-#data
+-<!DOCTYPE html>⊂⃒
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| "⊂⃒"
-
-- assert.Equal(t, count, 3)
-- assert.Equal(t, replacedVals[0], v.MustUintptrSlice()[0])
-- assert.Equal(t, replacedVals[1], v.MustUintptrSlice()[1])
-- assert.Equal(t, replacedVals[2], v.MustUintptrSlice()[2])
+-#data
+-<!DOCTYPE html>⊂⃒A
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| "⊂⃒A"
-
--}
+-#data
+-<!DOCTYPE html>𝔾
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| "𝔾"
-
--func TestWhereUintptr(t *testing.T) {
+-#data
+-<!DOCTYPE html>𝔾A
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| "𝔾A"
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests25.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests25.dat
+deleted file mode 100644
+index 00de729..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests25.dat
++++ /dev/null
+@@ -1,219 +0,0 @@
+-#data
+-<!DOCTYPE html><body><foo>A
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <foo>
+-| "A"
-
-- v := &Value{data: []uintptr{uintptr(1), uintptr(1), uintptr(1), uintptr(1), uintptr(1), uintptr(1)}}
+-#data
+-<!DOCTYPE html><body><area>A
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <area>
+-| "A"
-
-- selected := v.WhereUintptr(func(i int, val uintptr) bool {
-- return i%2 == 0
-- }).MustUintptrSlice()
+-#data
+-<!DOCTYPE html><body><base>A
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <base>
+-| "A"
-
-- assert.Equal(t, 3, len(selected))
+-#data
+-<!DOCTYPE html><body><basefont>A
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <basefont>
+-| "A"
-
--}
+-#data
+-<!DOCTYPE html><body><bgsound>A
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <bgsound>
+-| "A"
-
--func TestGroupUintptr(t *testing.T) {
+-#data
+-<!DOCTYPE html><body><br>A
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <br>
+-| "A"
-
-- v := &Value{data: []uintptr{uintptr(1), uintptr(1), uintptr(1), uintptr(1), uintptr(1), uintptr(1)}}
+-#data
+-<!DOCTYPE html><body><col>A
+-#errors
+-26: Stray start tag “col”.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| "A"
-
-- grouped := v.GroupUintptr(func(i int, val uintptr) string {
-- return fmt.Sprintf("%v", i%2 == 0)
-- }).data.(map[string][]uintptr)
+-#data
+-<!DOCTYPE html><body><command>A
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <command>
+-| "A"
-
-- assert.Equal(t, 2, len(grouped))
-- assert.Equal(t, 3, len(grouped["true"]))
-- assert.Equal(t, 3, len(grouped["false"]))
+-#data
+-<!DOCTYPE html><body><embed>A
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <embed>
+-| "A"
-
--}
+-#data
+-<!DOCTYPE html><body><frame>A
+-#errors
+-26: Stray start tag “frame”.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| "A"
-
--func TestReplaceUintptr(t *testing.T) {
+-#data
+-<!DOCTYPE html><body><hr>A
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <hr>
+-| "A"
-
-- v := &Value{data: []uintptr{uintptr(1), uintptr(1), uintptr(1), uintptr(1), uintptr(1), uintptr(1)}}
+-#data
+-<!DOCTYPE html><body><img>A
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <img>
+-| "A"
-
-- rawArr := v.MustUintptrSlice()
+-#data
+-<!DOCTYPE html><body><input>A
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <input>
+-| "A"
-
-- replaced := v.ReplaceUintptr(func(index int, val uintptr) uintptr {
-- if index < len(rawArr)-1 {
-- return rawArr[index+1]
-- }
-- return rawArr[0]
-- })
+-#data
+-<!DOCTYPE html><body><keygen>A
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <keygen>
+-| "A"
-
-- replacedArr := replaced.MustUintptrSlice()
-- if assert.Equal(t, 6, len(replacedArr)) {
-- assert.Equal(t, replacedArr[0], rawArr[1])
-- assert.Equal(t, replacedArr[1], rawArr[2])
-- assert.Equal(t, replacedArr[2], rawArr[3])
-- assert.Equal(t, replacedArr[3], rawArr[4])
-- assert.Equal(t, replacedArr[4], rawArr[5])
-- assert.Equal(t, replacedArr[5], rawArr[0])
-- }
+-#data
+-<!DOCTYPE html><body><link>A
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <link>
+-| "A"
-
--}
+-#data
+-<!DOCTYPE html><body><meta>A
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <meta>
+-| "A"
-
--func TestCollectUintptr(t *testing.T) {
+-#data
+-<!DOCTYPE html><body><param>A
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <param>
+-| "A"
-
-- v := &Value{data: []uintptr{uintptr(1), uintptr(1), uintptr(1), uintptr(1), uintptr(1), uintptr(1)}}
+-#data
+-<!DOCTYPE html><body><source>A
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <source>
+-| "A"
-
-- collected := v.CollectUintptr(func(index int, val uintptr) interface{} {
-- return index
-- })
+-#data
+-<!DOCTYPE html><body><track>A
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <track>
+-| "A"
-
-- collectedArr := collected.MustInterSlice()
-- if assert.Equal(t, 6, len(collectedArr)) {
-- assert.Equal(t, collectedArr[0], 0)
-- assert.Equal(t, collectedArr[1], 1)
-- assert.Equal(t, collectedArr[2], 2)
-- assert.Equal(t, collectedArr[3], 3)
-- assert.Equal(t, collectedArr[4], 4)
-- assert.Equal(t, collectedArr[5], 5)
-- }
+-#data
+-<!DOCTYPE html><body><wbr>A
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <wbr>
+-| "A"
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests26.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests26.dat
+deleted file mode 100644
+index fae11ff..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests26.dat
++++ /dev/null
+@@ -1,313 +0,0 @@
+-#data
+-<!DOCTYPE html><body><a href='#1'><nobr>1<nobr></a><br><a href='#2'><nobr>2<nobr></a><br><a href='#3'><nobr>3<nobr></a>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <a>
+-| href="#1"
+-| <nobr>
+-| "1"
+-| <nobr>
+-| <nobr>
+-| <br>
+-| <a>
+-| href="#2"
+-| <a>
+-| href="#2"
+-| <nobr>
+-| "2"
+-| <nobr>
+-| <nobr>
+-| <br>
+-| <a>
+-| href="#3"
+-| <a>
+-| href="#3"
+-| <nobr>
+-| "3"
+-| <nobr>
-
--}
+-#data
+-<!DOCTYPE html><body><b><nobr>1<nobr></b><i><nobr>2<nobr></i>3
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <b>
+-| <nobr>
+-| "1"
+-| <nobr>
+-| <nobr>
+-| <i>
+-| <i>
+-| <nobr>
+-| "2"
+-| <nobr>
+-| <nobr>
+-| "3"
-
--// ************************************************************
--// TESTS
--// ************************************************************
+-#data
+-<!DOCTYPE html><body><b><nobr>1<table><nobr></b><i><nobr>2<nobr></i>3
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <b>
+-| <nobr>
+-| "1"
+-| <nobr>
+-| <i>
+-| <i>
+-| <nobr>
+-| "2"
+-| <nobr>
+-| <nobr>
+-| "3"
+-| <table>
-
--func TestFloat32(t *testing.T) {
+-#data
+-<!DOCTYPE html><body><b><nobr>1<table><tr><td><nobr></b><i><nobr>2<nobr></i>3
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <b>
+-| <nobr>
+-| "1"
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <nobr>
+-| <i>
+-| <i>
+-| <nobr>
+-| "2"
+-| <nobr>
+-| <nobr>
+-| "3"
-
-- val := float32(1)
-- m := map[string]interface{}{"value": val, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").Float32())
-- assert.Equal(t, val, New(m).Get("value").MustFloat32())
-- assert.Equal(t, float32(0), New(m).Get("nothing").Float32())
-- assert.Equal(t, val, New(m).Get("nothing").Float32(1))
+-#data
+-<!DOCTYPE html><body><b><nobr>1<div><nobr></b><i><nobr>2<nobr></i>3
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <b>
+-| <nobr>
+-| "1"
+-| <div>
+-| <b>
+-| <nobr>
+-| <nobr>
+-| <nobr>
+-| <i>
+-| <i>
+-| <nobr>
+-| "2"
+-| <nobr>
+-| <nobr>
+-| "3"
-
-- assert.Panics(t, func() {
-- New(m).Get("age").MustFloat32()
-- })
+-#data
+-<!DOCTYPE html><body><b><nobr>1<nobr></b><div><i><nobr>2<nobr></i>3
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <b>
+-| <nobr>
+-| "1"
+-| <nobr>
+-| <div>
+-| <nobr>
+-| <i>
+-| <i>
+-| <nobr>
+-| "2"
+-| <nobr>
+-| <nobr>
+-| "3"
-
--}
+-#data
+-<!DOCTYPE html><body><b><nobr>1<nobr><ins></b><i><nobr>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <b>
+-| <nobr>
+-| "1"
+-| <nobr>
+-| <ins>
+-| <nobr>
+-| <i>
+-| <i>
+-| <nobr>
-
--func TestFloat32Slice(t *testing.T) {
+-#data
+-<!DOCTYPE html><body><b><nobr>1<ins><nobr></b><i>2
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <b>
+-| <nobr>
+-| "1"
+-| <ins>
+-| <nobr>
+-| <nobr>
+-| <i>
+-| "2"
-
-- val := float32(1)
-- m := map[string]interface{}{"value": []float32{val}, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").Float32Slice()[0])
-- assert.Equal(t, val, New(m).Get("value").MustFloat32Slice()[0])
-- assert.Equal(t, []float32(nil), New(m).Get("nothing").Float32Slice())
-- assert.Equal(t, val, New(m).Get("nothing").Float32Slice([]float32{float32(1)})[0])
+-#data
+-<!DOCTYPE html><body><b>1<nobr></b><i><nobr>2</i>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <b>
+-| "1"
+-| <nobr>
+-| <nobr>
+-| <i>
+-| <i>
+-| <nobr>
+-| "2"
-
-- assert.Panics(t, func() {
-- New(m).Get("nothing").MustFloat32Slice()
-- })
+-#data
+-<p><code x</code></p>
-
--}
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <code>
+-| code=""
+-| x<=""
+-| <code>
+-| code=""
+-| x<=""
+-| "
+-"
-
--func TestIsFloat32(t *testing.T) {
+-#data
+-<!DOCTYPE html><svg><foreignObject><p><i></p>a
+-#errors
+-45: End tag “p” seen, but there were open elements.
+-41: Unclosed element “i”.
+-46: End of file seen and there were open elements.
+-35: Unclosed element “foreignObject”.
+-20: Unclosed element “svg”.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| <svg foreignObject>
+-| <p>
+-| <i>
+-| <i>
+-| "a"
-
-- var v *Value
+-#data
+-<!DOCTYPE html><table><tr><td><svg><foreignObject><p><i></p>a
+-#errors
+-56: End tag “p” seen, but there were open elements.
+-52: Unclosed element “i”.
+-57: End of file seen and there were open elements.
+-46: Unclosed element “foreignObject”.
+-31: Unclosed element “svg”.
+-22: Unclosed element “table”.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <svg svg>
+-| <svg foreignObject>
+-| <p>
+-| <i>
+-| <i>
+-| "a"
-
-- v = &Value{data: float32(1)}
-- assert.True(t, v.IsFloat32())
+-#data
+-<!DOCTYPE html><math><mtext><p><i></p>a
+-#errors
+-38: End tag “p” seen, but there were open elements.
+-34: Unclosed element “i”.
+-39: End of file in a foreign namespace context.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| <math mtext>
+-| <p>
+-| <i>
+-| <i>
+-| "a"
-
-- v = &Value{data: []float32{float32(1)}}
-- assert.True(t, v.IsFloat32Slice())
+-#data
+-<!DOCTYPE html><table><tr><td><math><mtext><p><i></p>a
+-#errors
+-53: End tag “p” seen, but there were open elements.
+-49: Unclosed element “i”.
+-54: End of file in a foreign namespace context.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <math math>
+-| <math mtext>
+-| <p>
+-| <i>
+-| <i>
+-| "a"
-
--}
+-#data
+-<!DOCTYPE html><body><div><!/div>a
+-#errors
+-29: Bogus comment.
+-34: End of file seen and there were open elements.
+-26: Unclosed element “div”.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| <!-- /div -->
+-| "a"
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests3.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests3.dat
+deleted file mode 100644
+index 38dc501..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests3.dat
++++ /dev/null
+@@ -1,305 +0,0 @@
+-#data
+-<head></head><style></style>
+-#errors
+-Line: 1 Col: 6 Unexpected start tag (head). Expected DOCTYPE.
+-Line: 1 Col: 20 Unexpected start tag (style) that can be in head. Moved.
+-#document
+-| <html>
+-| <head>
+-| <style>
+-| <body>
-
--func TestEachFloat32(t *testing.T) {
+-#data
+-<head></head><script></script>
+-#errors
+-Line: 1 Col: 6 Unexpected start tag (head). Expected DOCTYPE.
+-Line: 1 Col: 21 Unexpected start tag (script) that can be in head. Moved.
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| <body>
-
-- v := &Value{data: []float32{float32(1), float32(1), float32(1), float32(1), float32(1)}}
-- count := 0
-- replacedVals := make([]float32, 0)
-- assert.Equal(t, v, v.EachFloat32(func(i int, val float32) bool {
+-#data
+-<head></head><!-- --><style></style><!-- --><script></script>
+-#errors
+-Line: 1 Col: 6 Unexpected start tag (head). Expected DOCTYPE.
+-Line: 1 Col: 28 Unexpected start tag (style) that can be in head. Moved.
+-#document
+-| <html>
+-| <head>
+-| <style>
+-| <script>
+-| <!-- -->
+-| <!-- -->
+-| <body>
-
-- count++
-- replacedVals = append(replacedVals, val)
+-#data
+-<head></head><!-- -->x<style></style><!-- --><script></script>
+-#errors
+-Line: 1 Col: 6 Unexpected start tag (head). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <!-- -->
+-| <body>
+-| "x"
+-| <style>
+-| <!-- -->
+-| <script>
-
-- // abort early
-- if i == 2 {
-- return false
-- }
+-#data
+-<!DOCTYPE html><html><head></head><body><pre>
+-</pre></body></html>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <pre>
-
-- return true
+-#data
+-<!DOCTYPE html><html><head></head><body><pre>
+-foo</pre></body></html>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <pre>
+-| "foo"
-
-- }))
+-#data
+-<!DOCTYPE html><html><head></head><body><pre>
-
-- assert.Equal(t, count, 3)
-- assert.Equal(t, replacedVals[0], v.MustFloat32Slice()[0])
-- assert.Equal(t, replacedVals[1], v.MustFloat32Slice()[1])
-- assert.Equal(t, replacedVals[2], v.MustFloat32Slice()[2])
+-foo</pre></body></html>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <pre>
+-| "
+-foo"
-
--}
+-#data
+-<!DOCTYPE html><html><head></head><body><pre>
+-foo
+-</pre></body></html>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <pre>
+-| "foo
+-"
-
--func TestWhereFloat32(t *testing.T) {
+-#data
+-<!DOCTYPE html><html><head></head><body><pre>x</pre><span>
+-</span></body></html>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <pre>
+-| "x"
+-| <span>
+-| "
+-"
-
-- v := &Value{data: []float32{float32(1), float32(1), float32(1), float32(1), float32(1), float32(1)}}
+-#data
+-<!DOCTYPE html><html><head></head><body><pre>x
+-y</pre></body></html>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <pre>
+-| "x
+-y"
-
-- selected := v.WhereFloat32(func(i int, val float32) bool {
-- return i%2 == 0
-- }).MustFloat32Slice()
+-#data
+-<!DOCTYPE html><html><head></head><body><pre>x<div>
+-y</pre></body></html>
+-#errors
+-Line: 2 Col: 7 End tag (pre) seen too early. Expected other end tag.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <pre>
+-| "x"
+-| <div>
+-| "
+-y"
-
-- assert.Equal(t, 3, len(selected))
+-#data
+-<!DOCTYPE html><pre>

A</pre>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <pre>
+-| "
+-A"
-
--}
+-#data
+-<!DOCTYPE html><HTML><META><HEAD></HEAD></HTML>
+-#errors
+-Line: 1 Col: 33 Unexpected start tag head in existing head. Ignored.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <meta>
+-| <body>
-
--func TestGroupFloat32(t *testing.T) {
+-#data
+-<!DOCTYPE html><HTML><HEAD><head></HEAD></HTML>
+-#errors
+-Line: 1 Col: 33 Unexpected start tag head in existing head. Ignored.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
-
-- v := &Value{data: []float32{float32(1), float32(1), float32(1), float32(1), float32(1), float32(1)}}
+-#data
+-<textarea>foo<span>bar</span><i>baz
+-#errors
+-Line: 1 Col: 10 Unexpected start tag (textarea). Expected DOCTYPE.
+-Line: 1 Col: 35 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <textarea>
+-| "foo<span>bar</span><i>baz"
-
-- grouped := v.GroupFloat32(func(i int, val float32) string {
-- return fmt.Sprintf("%v", i%2 == 0)
-- }).data.(map[string][]float32)
+-#data
+-<title>foo<span>bar</em><i>baz
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (title). Expected DOCTYPE.
+-Line: 1 Col: 30 Unexpected end of file. Expected end tag (title).
+-#document
+-| <html>
+-| <head>
+-| <title>
+-| "foo<span>bar</em><i>baz"
+-| <body>
-
-- assert.Equal(t, 2, len(grouped))
-- assert.Equal(t, 3, len(grouped["true"]))
-- assert.Equal(t, 3, len(grouped["false"]))
+-#data
+-<!DOCTYPE html><textarea>
+-</textarea>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <textarea>
-
--}
+-#data
+-<!DOCTYPE html><textarea>
+-foo</textarea>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <textarea>
+-| "foo"
-
--func TestReplaceFloat32(t *testing.T) {
+-#data
+-<!DOCTYPE html><textarea>
-
-- v := &Value{data: []float32{float32(1), float32(1), float32(1), float32(1), float32(1), float32(1)}}
+-foo</textarea>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <textarea>
+-| "
+-foo"
-
-- rawArr := v.MustFloat32Slice()
+-#data
+-<!DOCTYPE html><html><head></head><body><ul><li><div><p><li></ul></body></html>
+-#errors
+-Line: 1 Col: 60 Missing end tag (div, li).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <ul>
+-| <li>
+-| <div>
+-| <p>
+-| <li>
-
-- replaced := v.ReplaceFloat32(func(index int, val float32) float32 {
-- if index < len(rawArr)-1 {
-- return rawArr[index+1]
-- }
-- return rawArr[0]
-- })
+-#data
+-<!doctype html><nobr><nobr><nobr>
+-#errors
+-Line: 1 Col: 27 Unexpected start tag (nobr) implies end tag (nobr).
+-Line: 1 Col: 33 Unexpected start tag (nobr) implies end tag (nobr).
+-Line: 1 Col: 33 Expected closing tag. Unexpected end of file.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <nobr>
+-| <nobr>
+-| <nobr>
-
-- replacedArr := replaced.MustFloat32Slice()
-- if assert.Equal(t, 6, len(replacedArr)) {
-- assert.Equal(t, replacedArr[0], rawArr[1])
-- assert.Equal(t, replacedArr[1], rawArr[2])
-- assert.Equal(t, replacedArr[2], rawArr[3])
-- assert.Equal(t, replacedArr[3], rawArr[4])
-- assert.Equal(t, replacedArr[4], rawArr[5])
-- assert.Equal(t, replacedArr[5], rawArr[0])
-- }
+-#data
+-<!doctype html><nobr><nobr></nobr><nobr>
+-#errors
+-Line: 1 Col: 27 Unexpected start tag (nobr) implies end tag (nobr).
+-Line: 1 Col: 40 Expected closing tag. Unexpected end of file.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <nobr>
+-| <nobr>
+-| <nobr>
-
--}
+-#data
+-<!doctype html><html><body><p><table></table></body></html>
+-#errors
+-Not known
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <table>
-
--func TestCollectFloat32(t *testing.T) {
+-#data
+-<p><table></table>
+-#errors
+-Not known
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <table>
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests4.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests4.dat
+deleted file mode 100644
+index 3c50632..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests4.dat
++++ /dev/null
+@@ -1,59 +0,0 @@
+-#data
+-direct div content
+-#errors
+-#document-fragment
+-div
+-#document
+-| "direct div content"
-
-- v := &Value{data: []float32{float32(1), float32(1), float32(1), float32(1), float32(1), float32(1)}}
+-#data
+-direct textarea content
+-#errors
+-#document-fragment
+-textarea
+-#document
+-| "direct textarea content"
-
-- collected := v.CollectFloat32(func(index int, val float32) interface{} {
-- return index
-- })
+-#data
+-textarea content with <em>pseudo</em> <foo>markup
+-#errors
+-#document-fragment
+-textarea
+-#document
+-| "textarea content with <em>pseudo</em> <foo>markup"
-
-- collectedArr := collected.MustInterSlice()
-- if assert.Equal(t, 6, len(collectedArr)) {
-- assert.Equal(t, collectedArr[0], 0)
-- assert.Equal(t, collectedArr[1], 1)
-- assert.Equal(t, collectedArr[2], 2)
-- assert.Equal(t, collectedArr[3], 3)
-- assert.Equal(t, collectedArr[4], 4)
-- assert.Equal(t, collectedArr[5], 5)
-- }
+-#data
+-this is CDATA inside a <style> element
+-#errors
+-#document-fragment
+-style
+-#document
+-| "this is CDATA inside a <style> element"
-
--}
+-#data
+-</plaintext>
+-#errors
+-#document-fragment
+-plaintext
+-#document
+-| "</plaintext>"
-
--// ************************************************************
--// TESTS
--// ************************************************************
+-#data
+-setting html's innerHTML
+-#errors
+-Line: 1 Col: 24 Unexpected EOF in inner html mode.
+-#document-fragment
+-html
+-#document
+-| <head>
+-| <body>
+-| "setting html's innerHTML"
-
--func TestFloat64(t *testing.T) {
+-#data
+-<title>setting head's innerHTML</title>
+-#errors
+-#document-fragment
+-head
+-#document
+-| <title>
+-| "setting head's innerHTML"
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests5.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests5.dat
+deleted file mode 100644
+index d7b5128..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests5.dat
++++ /dev/null
+@@ -1,191 +0,0 @@
+-#data
+-<style> <!-- </style>x
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
+-Line: 1 Col: 22 Unexpected end of file. Expected end tag (style).
+-#document
+-| <html>
+-| <head>
+-| <style>
+-| " <!-- "
+-| <body>
+-| "x"
-
-- val := float64(1)
-- m := map[string]interface{}{"value": val, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").Float64())
-- assert.Equal(t, val, New(m).Get("value").MustFloat64())
-- assert.Equal(t, float64(0), New(m).Get("nothing").Float64())
-- assert.Equal(t, val, New(m).Get("nothing").Float64(1))
+-#data
+-<style> <!-- </style> --> </style>x
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <style>
+-| " <!-- "
+-| " "
+-| <body>
+-| "--> x"
-
-- assert.Panics(t, func() {
-- New(m).Get("age").MustFloat64()
-- })
+-#data
+-<style> <!--> </style>x
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <style>
+-| " <!--> "
+-| <body>
+-| "x"
-
--}
+-#data
+-<style> <!---> </style>x
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <style>
+-| " <!---> "
+-| <body>
+-| "x"
-
--func TestFloat64Slice(t *testing.T) {
+-#data
+-<iframe> <!---> </iframe>x
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (iframe). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <iframe>
+-| " <!---> "
+-| "x"
-
-- val := float64(1)
-- m := map[string]interface{}{"value": []float64{val}, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").Float64Slice()[0])
-- assert.Equal(t, val, New(m).Get("value").MustFloat64Slice()[0])
-- assert.Equal(t, []float64(nil), New(m).Get("nothing").Float64Slice())
-- assert.Equal(t, val, New(m).Get("nothing").Float64Slice([]float64{float64(1)})[0])
+-#data
+-<iframe> <!--- </iframe>->x</iframe> --> </iframe>x
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (iframe). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <iframe>
+-| " <!--- "
+-| "->x --> x"
-
-- assert.Panics(t, func() {
-- New(m).Get("nothing").MustFloat64Slice()
-- })
+-#data
+-<script> <!-- </script> --> </script>x
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <script>
+-| " <!-- "
+-| " "
+-| <body>
+-| "--> x"
-
--}
+-#data
+-<title> <!-- </title> --> </title>x
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (title). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <title>
+-| " <!-- "
+-| " "
+-| <body>
+-| "--> x"
-
--func TestIsFloat64(t *testing.T) {
+-#data
+-<textarea> <!--- </textarea>->x</textarea> --> </textarea>x
+-#errors
+-Line: 1 Col: 10 Unexpected start tag (textarea). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <textarea>
+-| " <!--- "
+-| "->x --> x"
-
-- var v *Value
+-#data
+-<style> <!</-- </style>x
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <style>
+-| " <!</-- "
+-| <body>
+-| "x"
-
-- v = &Value{data: float64(1)}
-- assert.True(t, v.IsFloat64())
+-#data
+-<p><xmp></xmp>
+-#errors
+-XXX: Unknown
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <xmp>
-
-- v = &Value{data: []float64{float64(1)}}
-- assert.True(t, v.IsFloat64Slice())
+-#data
+-<xmp> <!-- > --> </xmp>
+-#errors
+-Line: 1 Col: 5 Unexpected start tag (xmp). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <xmp>
+-| " <!-- > --> "
-
--}
+-#data
+-<title>&</title>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (title). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <title>
+-| "&"
+-| <body>
-
--func TestEachFloat64(t *testing.T) {
+-#data
+-<title><!--&--></title>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (title). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <title>
+-| "<!--&-->"
+-| <body>
-
-- v := &Value{data: []float64{float64(1), float64(1), float64(1), float64(1), float64(1)}}
-- count := 0
-- replacedVals := make([]float64, 0)
-- assert.Equal(t, v, v.EachFloat64(func(i int, val float64) bool {
+-#data
+-<title><!--</title>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (title). Expected DOCTYPE.
+-Line: 1 Col: 19 Unexpected end of file. Expected end tag (title).
+-#document
+-| <html>
+-| <head>
+-| <title>
+-| "<!--"
+-| <body>
-
-- count++
-- replacedVals = append(replacedVals, val)
+-#data
+-<noscript><!--</noscript>--></noscript>
+-#errors
+-Line: 1 Col: 10 Unexpected start tag (noscript). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <noscript>
+-| "<!--"
+-| <body>
+-| "-->"
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests6.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests6.dat
+deleted file mode 100644
+index f28ece4..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests6.dat
++++ /dev/null
+@@ -1,663 +0,0 @@
+-#data
+-<!doctype html></head> <head>
+-#errors
+-Line: 1 Col: 29 Unexpected start tag head. Ignored.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| " "
+-| <body>
-
-- // abort early
-- if i == 2 {
-- return false
-- }
+-#data
+-<!doctype html><form><div></form><div>
+-#errors
+-33: End tag "form" seen but there were unclosed elements.
+-38: End of file seen and there were open elements.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <form>
+-| <div>
+-| <div>
-
-- return true
+-#data
+-<!doctype html><title>&</title>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <title>
+-| "&"
+-| <body>
-
-- }))
+-#data
+-<!doctype html><title><!--&--></title>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <title>
+-| "<!--&-->"
+-| <body>
-
-- assert.Equal(t, count, 3)
-- assert.Equal(t, replacedVals[0], v.MustFloat64Slice()[0])
-- assert.Equal(t, replacedVals[1], v.MustFloat64Slice()[1])
-- assert.Equal(t, replacedVals[2], v.MustFloat64Slice()[2])
+-#data
+-<!doctype>
+-#errors
+-Line: 1 Col: 9 No space after literal string 'DOCTYPE'.
+-Line: 1 Col: 10 Unexpected > character. Expected DOCTYPE name.
+-Line: 1 Col: 10 Erroneous DOCTYPE.
+-#document
+-| <!DOCTYPE >
+-| <html>
+-| <head>
+-| <body>
-
--}
+-#data
+-<!---x
+-#errors
+-Line: 1 Col: 6 Unexpected end of file in comment.
+-Line: 1 Col: 6 Unexpected End of file. Expected DOCTYPE.
+-#document
+-| <!-- -x -->
+-| <html>
+-| <head>
+-| <body>
-
--func TestWhereFloat64(t *testing.T) {
+-#data
+-<body>
+-<div>
+-#errors
+-Line: 1 Col: 6 Unexpected start tag (body).
+-Line: 2 Col: 5 Expected closing tag. Unexpected end of file.
+-#document-fragment
+-div
+-#document
+-| "
+-"
+-| <div>
-
-- v := &Value{data: []float64{float64(1), float64(1), float64(1), float64(1), float64(1), float64(1)}}
+-#data
+-<frameset></frameset>
+-foo
+-#errors
+-Line: 1 Col: 10 Unexpected start tag (frameset). Expected DOCTYPE.
+-Line: 2 Col: 3 Unexpected non-space characters in the after frameset phase. Ignored.
+-#document
+-| <html>
+-| <head>
+-| <frameset>
+-| "
+-"
-
-- selected := v.WhereFloat64(func(i int, val float64) bool {
-- return i%2 == 0
-- }).MustFloat64Slice()
+-#data
+-<frameset></frameset>
+-<noframes>
+-#errors
+-Line: 1 Col: 10 Unexpected start tag (frameset). Expected DOCTYPE.
+-Line: 2 Col: 10 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <frameset>
+-| "
+-"
+-| <noframes>
-
-- assert.Equal(t, 3, len(selected))
+-#data
+-<frameset></frameset>
+-<div>
+-#errors
+-Line: 1 Col: 10 Unexpected start tag (frameset). Expected DOCTYPE.
+-Line: 2 Col: 5 Unexpected start tag (div) in the after frameset phase. Ignored.
+-#document
+-| <html>
+-| <head>
+-| <frameset>
+-| "
+-"
-
--}
+-#data
+-<frameset></frameset>
+-</html>
+-#errors
+-Line: 1 Col: 10 Unexpected start tag (frameset). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <frameset>
+-| "
+-"
-
--func TestGroupFloat64(t *testing.T) {
+-#data
+-<frameset></frameset>
+-</div>
+-#errors
+-Line: 1 Col: 10 Unexpected start tag (frameset). Expected DOCTYPE.
+-Line: 2 Col: 6 Unexpected end tag (div) in the after frameset phase. Ignored.
+-#document
+-| <html>
+-| <head>
+-| <frameset>
+-| "
+-"
-
-- v := &Value{data: []float64{float64(1), float64(1), float64(1), float64(1), float64(1), float64(1)}}
+-#data
+-<form><form>
+-#errors
+-Line: 1 Col: 6 Unexpected start tag (form). Expected DOCTYPE.
+-Line: 1 Col: 12 Unexpected start tag (form).
+-Line: 1 Col: 12 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <form>
-
-- grouped := v.GroupFloat64(func(i int, val float64) string {
-- return fmt.Sprintf("%v", i%2 == 0)
-- }).data.(map[string][]float64)
+-#data
+-<button><button>
+-#errors
+-Line: 1 Col: 8 Unexpected start tag (button). Expected DOCTYPE.
+-Line: 1 Col: 16 Unexpected start tag (button) implies end tag (button).
+-Line: 1 Col: 16 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <button>
+-| <button>
-
-- assert.Equal(t, 2, len(grouped))
-- assert.Equal(t, 3, len(grouped["true"]))
-- assert.Equal(t, 3, len(grouped["false"]))
+-#data
+-<table><tr><td></th>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+-Line: 1 Col: 20 Unexpected end tag (th). Ignored.
+-Line: 1 Col: 20 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
-
--}
+-#data
+-<table><caption><td>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+-Line: 1 Col: 20 Unexpected end tag (td). Ignored.
+-Line: 1 Col: 20 Unexpected table cell start tag (td) in the table body phase.
+-Line: 1 Col: 20 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <caption>
+-| <tbody>
+-| <tr>
+-| <td>
-
--func TestReplaceFloat64(t *testing.T) {
+-#data
+-<table><caption><div>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+-Line: 1 Col: 21 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <caption>
+-| <div>
-
-- v := &Value{data: []float64{float64(1), float64(1), float64(1), float64(1), float64(1), float64(1)}}
+-#data
+-</caption><div>
+-#errors
+-Line: 1 Col: 10 Unexpected end tag (caption). Ignored.
+-Line: 1 Col: 15 Expected closing tag. Unexpected end of file.
+-#document-fragment
+-caption
+-#document
+-| <div>
-
-- rawArr := v.MustFloat64Slice()
+-#data
+-<table><caption><div></caption>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+-Line: 1 Col: 31 Unexpected end tag (caption). Missing end tag (div).
+-Line: 1 Col: 31 Unexpected end of file. Expected table content.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <caption>
+-| <div>
-
-- replaced := v.ReplaceFloat64(func(index int, val float64) float64 {
-- if index < len(rawArr)-1 {
-- return rawArr[index+1]
-- }
-- return rawArr[0]
-- })
+-#data
+-<table><caption></table>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+-Line: 1 Col: 24 Unexpected end table tag in caption. Generates implied end caption.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <caption>
-
-- replacedArr := replaced.MustFloat64Slice()
-- if assert.Equal(t, 6, len(replacedArr)) {
-- assert.Equal(t, replacedArr[0], rawArr[1])
-- assert.Equal(t, replacedArr[1], rawArr[2])
-- assert.Equal(t, replacedArr[2], rawArr[3])
-- assert.Equal(t, replacedArr[3], rawArr[4])
-- assert.Equal(t, replacedArr[4], rawArr[5])
-- assert.Equal(t, replacedArr[5], rawArr[0])
-- }
+-#data
+-</table><div>
+-#errors
+-Line: 1 Col: 8 Unexpected end table tag in caption. Generates implied end caption.
+-Line: 1 Col: 8 Unexpected end tag (caption). Ignored.
+-Line: 1 Col: 13 Expected closing tag. Unexpected end of file.
+-#document-fragment
+-caption
+-#document
+-| <div>
-
--}
+-#data
+-<table><caption></body></col></colgroup></html></tbody></td></tfoot></th></thead></tr>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+-Line: 1 Col: 23 Unexpected end tag (body). Ignored.
+-Line: 1 Col: 29 Unexpected end tag (col). Ignored.
+-Line: 1 Col: 40 Unexpected end tag (colgroup). Ignored.
+-Line: 1 Col: 47 Unexpected end tag (html). Ignored.
+-Line: 1 Col: 55 Unexpected end tag (tbody). Ignored.
+-Line: 1 Col: 60 Unexpected end tag (td). Ignored.
+-Line: 1 Col: 68 Unexpected end tag (tfoot). Ignored.
+-Line: 1 Col: 73 Unexpected end tag (th). Ignored.
+-Line: 1 Col: 81 Unexpected end tag (thead). Ignored.
+-Line: 1 Col: 86 Unexpected end tag (tr). Ignored.
+-Line: 1 Col: 86 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <caption>
-
--func TestCollectFloat64(t *testing.T) {
+-#data
+-<table><caption><div></div>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+-Line: 1 Col: 27 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <caption>
+-| <div>
-
-- v := &Value{data: []float64{float64(1), float64(1), float64(1), float64(1), float64(1), float64(1)}}
+-#data
+-<table><tr><td></body></caption></col></colgroup></html>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+-Line: 1 Col: 22 Unexpected end tag (body). Ignored.
+-Line: 1 Col: 32 Unexpected end tag (caption). Ignored.
+-Line: 1 Col: 38 Unexpected end tag (col). Ignored.
+-Line: 1 Col: 49 Unexpected end tag (colgroup). Ignored.
+-Line: 1 Col: 56 Unexpected end tag (html). Ignored.
+-Line: 1 Col: 56 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
-
-- collected := v.CollectFloat64(func(index int, val float64) interface{} {
-- return index
-- })
+-#data
+-</table></tbody></tfoot></thead></tr><div>
+-#errors
+-Line: 1 Col: 8 Unexpected end tag (table). Ignored.
+-Line: 1 Col: 16 Unexpected end tag (tbody). Ignored.
+-Line: 1 Col: 24 Unexpected end tag (tfoot). Ignored.
+-Line: 1 Col: 32 Unexpected end tag (thead). Ignored.
+-Line: 1 Col: 37 Unexpected end tag (tr). Ignored.
+-Line: 1 Col: 42 Expected closing tag. Unexpected end of file.
+-#document-fragment
+-td
+-#document
+-| <div>
-
-- collectedArr := collected.MustInterSlice()
-- if assert.Equal(t, 6, len(collectedArr)) {
-- assert.Equal(t, collectedArr[0], 0)
-- assert.Equal(t, collectedArr[1], 1)
-- assert.Equal(t, collectedArr[2], 2)
-- assert.Equal(t, collectedArr[3], 3)
-- assert.Equal(t, collectedArr[4], 4)
-- assert.Equal(t, collectedArr[5], 5)
-- }
+-#data
+-<table><colgroup>foo
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+-Line: 1 Col: 20 Unexpected non-space characters in table context caused voodoo mode.
+-Line: 1 Col: 20 Unexpected end of file. Expected table content.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "foo"
+-| <table>
+-| <colgroup>
-
--}
+-#data
+-foo<col>
+-#errors
+-Line: 1 Col: 3 Unexpected end tag (colgroup). Ignored.
+-#document-fragment
+-colgroup
+-#document
+-| <col>
-
--// ************************************************************
--// TESTS
--// ************************************************************
+-#data
+-<table><colgroup></col>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+-Line: 1 Col: 23 This element (col) has no end tag.
+-Line: 1 Col: 23 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <colgroup>
-
--func TestComplex64(t *testing.T) {
+-#data
+-<frameset><div>
+-#errors
+-Line: 1 Col: 10 Unexpected start tag (frameset). Expected DOCTYPE.
+-Line: 1 Col: 15 Unexpected start tag token (div) in the frameset phase. Ignored.
+-Line: 1 Col: 15 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <frameset>
-
-- val := complex64(1)
-- m := map[string]interface{}{"value": val, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").Complex64())
-- assert.Equal(t, val, New(m).Get("value").MustComplex64())
-- assert.Equal(t, complex64(0), New(m).Get("nothing").Complex64())
-- assert.Equal(t, val, New(m).Get("nothing").Complex64(1))
+-#data
+-</frameset><frame>
+-#errors
+-Line: 1 Col: 11 Unexpected end tag token (frameset) in the frameset phase (innerHTML).
+-#document-fragment
+-frameset
+-#document
+-| <frame>
-
-- assert.Panics(t, func() {
-- New(m).Get("age").MustComplex64()
-- })
+-#data
+-<frameset></div>
+-#errors
+-Line: 1 Col: 10 Unexpected start tag (frameset). Expected DOCTYPE.
+-Line: 1 Col: 16 Unexpected end tag token (div) in the frameset phase. Ignored.
+-Line: 1 Col: 16 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <frameset>
-
--}
+-#data
+-</body><div>
+-#errors
+-Line: 1 Col: 7 Unexpected end tag (body). Ignored.
+-Line: 1 Col: 12 Expected closing tag. Unexpected end of file.
+-#document-fragment
+-body
+-#document
+-| <div>
-
--func TestComplex64Slice(t *testing.T) {
+-#data
+-<table><tr><div>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+-Line: 1 Col: 16 Unexpected start tag (div) in table context caused voodoo mode.
+-Line: 1 Col: 16 Unexpected end of file. Expected table content.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| <table>
+-| <tbody>
+-| <tr>
-
-- val := complex64(1)
-- m := map[string]interface{}{"value": []complex64{val}, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").Complex64Slice()[0])
-- assert.Equal(t, val, New(m).Get("value").MustComplex64Slice()[0])
-- assert.Equal(t, []complex64(nil), New(m).Get("nothing").Complex64Slice())
-- assert.Equal(t, val, New(m).Get("nothing").Complex64Slice([]complex64{complex64(1)})[0])
+-#data
+-</tr><td>
+-#errors
+-Line: 1 Col: 5 Unexpected end tag (tr). Ignored.
+-#document-fragment
+-tr
+-#document
+-| <td>
-
-- assert.Panics(t, func() {
-- New(m).Get("nothing").MustComplex64Slice()
-- })
+-#data
+-</tbody></tfoot></thead><td>
+-#errors
+-Line: 1 Col: 8 Unexpected end tag (tbody). Ignored.
+-Line: 1 Col: 16 Unexpected end tag (tfoot). Ignored.
+-Line: 1 Col: 24 Unexpected end tag (thead). Ignored.
+-#document-fragment
+-tr
+-#document
+-| <td>
-
--}
+-#data
+-<table><tr><div><td>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+-Line: 1 Col: 16 Unexpected start tag (div) in table context caused voodoo mode.
+-Line: 1 Col: 20 Unexpected implied end tag (div) in the table row phase.
+-Line: 1 Col: 20 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
-
--func TestIsComplex64(t *testing.T) {
+-#data
+-<caption><col><colgroup><tbody><tfoot><thead><tr>
+-#errors
+-Line: 1 Col: 9 Unexpected start tag (caption).
+-Line: 1 Col: 14 Unexpected start tag (col).
+-Line: 1 Col: 24 Unexpected start tag (colgroup).
+-Line: 1 Col: 31 Unexpected start tag (tbody).
+-Line: 1 Col: 38 Unexpected start tag (tfoot).
+-Line: 1 Col: 45 Unexpected start tag (thead).
+-Line: 1 Col: 49 Unexpected end of file. Expected table content.
+-#document-fragment
+-tbody
+-#document
+-| <tr>
-
-- var v *Value
+-#data
+-<table><tbody></thead>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+-Line: 1 Col: 22 Unexpected end tag (thead) in the table body phase. Ignored.
+-Line: 1 Col: 22 Unexpected end of file. Expected table content.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
-
-- v = &Value{data: complex64(1)}
-- assert.True(t, v.IsComplex64())
+-#data
+-</table><tr>
+-#errors
+-Line: 1 Col: 8 Unexpected end tag (table). Ignored.
+-Line: 1 Col: 12 Unexpected end of file. Expected table content.
+-#document-fragment
+-tbody
+-#document
+-| <tr>
-
-- v = &Value{data: []complex64{complex64(1)}}
-- assert.True(t, v.IsComplex64Slice())
+-#data
+-<table><tbody></body></caption></col></colgroup></html></td></th></tr>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+-Line: 1 Col: 21 Unexpected end tag (body) in the table body phase. Ignored.
+-Line: 1 Col: 31 Unexpected end tag (caption) in the table body phase. Ignored.
+-Line: 1 Col: 37 Unexpected end tag (col) in the table body phase. Ignored.
+-Line: 1 Col: 48 Unexpected end tag (colgroup) in the table body phase. Ignored.
+-Line: 1 Col: 55 Unexpected end tag (html) in the table body phase. Ignored.
+-Line: 1 Col: 60 Unexpected end tag (td) in the table body phase. Ignored.
+-Line: 1 Col: 65 Unexpected end tag (th) in the table body phase. Ignored.
+-Line: 1 Col: 70 Unexpected end tag (tr) in the table body phase. Ignored.
+-Line: 1 Col: 70 Unexpected end of file. Expected table content.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
-
--}
+-#data
+-<table><tbody></div>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+-Line: 1 Col: 20 Unexpected end tag (div) in table context caused voodoo mode.
+-Line: 1 Col: 20 End tag (div) seen too early. Expected other end tag.
+-Line: 1 Col: 20 Unexpected end of file. Expected table content.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
-
--func TestEachComplex64(t *testing.T) {
+-#data
+-<table><table>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+-Line: 1 Col: 14 Unexpected start tag (table) implies end tag (table).
+-Line: 1 Col: 14 Unexpected end of file. Expected table content.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <table>
-
-- v := &Value{data: []complex64{complex64(1), complex64(1), complex64(1), complex64(1), complex64(1)}}
-- count := 0
-- replacedVals := make([]complex64, 0)
-- assert.Equal(t, v, v.EachComplex64(func(i int, val complex64) bool {
+-#data
+-<table></body></caption></col></colgroup></html></tbody></td></tfoot></th></thead></tr>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+-Line: 1 Col: 14 Unexpected end tag (body). Ignored.
+-Line: 1 Col: 24 Unexpected end tag (caption). Ignored.
+-Line: 1 Col: 30 Unexpected end tag (col). Ignored.
+-Line: 1 Col: 41 Unexpected end tag (colgroup). Ignored.
+-Line: 1 Col: 48 Unexpected end tag (html). Ignored.
+-Line: 1 Col: 56 Unexpected end tag (tbody). Ignored.
+-Line: 1 Col: 61 Unexpected end tag (td). Ignored.
+-Line: 1 Col: 69 Unexpected end tag (tfoot). Ignored.
+-Line: 1 Col: 74 Unexpected end tag (th). Ignored.
+-Line: 1 Col: 82 Unexpected end tag (thead). Ignored.
+-Line: 1 Col: 87 Unexpected end tag (tr). Ignored.
+-Line: 1 Col: 87 Unexpected end of file. Expected table content.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
-
-- count++
-- replacedVals = append(replacedVals, val)
+-#data
+-</table><tr>
+-#errors
+-Line: 1 Col: 8 Unexpected end tag (table). Ignored.
+-Line: 1 Col: 12 Unexpected end of file. Expected table content.
+-#document-fragment
+-table
+-#document
+-| <tbody>
+-| <tr>
-
-- // abort early
-- if i == 2 {
-- return false
-- }
+-#data
+-<body></body></html>
+-#errors
+-Line: 1 Col: 20 Unexpected html end tag in inner html mode.
+-Line: 1 Col: 20 Unexpected EOF in inner html mode.
+-#document-fragment
+-html
+-#document
+-| <head>
+-| <body>
-
-- return true
+-#data
+-<html><frameset></frameset></html>
+-#errors
+-Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <frameset>
+-| " "
-
-- }))
+-#data
+-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"><html></html>
+-#errors
+-Line: 1 Col: 50 Erroneous DOCTYPE.
+-Line: 1 Col: 63 Unexpected end tag (html) after the (implied) root element.
+-#document
+-| <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "">
+-| <html>
+-| <head>
+-| <body>
-
-- assert.Equal(t, count, 3)
-- assert.Equal(t, replacedVals[0], v.MustComplex64Slice()[0])
-- assert.Equal(t, replacedVals[1], v.MustComplex64Slice()[1])
-- assert.Equal(t, replacedVals[2], v.MustComplex64Slice()[2])
+-#data
+-<param><frameset></frameset>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (param). Expected DOCTYPE.
+-Line: 1 Col: 17 Unexpected start tag (frameset).
+-#document
+-| <html>
+-| <head>
+-| <frameset>
-
--}
+-#data
+-<source><frameset></frameset>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (source). Expected DOCTYPE.
+-Line: 1 Col: 17 Unexpected start tag (frameset).
+-#document
+-| <html>
+-| <head>
+-| <frameset>
-
--func TestWhereComplex64(t *testing.T) {
+-#data
+-<track><frameset></frameset>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (track). Expected DOCTYPE.
+-Line: 1 Col: 17 Unexpected start tag (frameset).
+-#document
+-| <html>
+-| <head>
+-| <frameset>
-
-- v := &Value{data: []complex64{complex64(1), complex64(1), complex64(1), complex64(1), complex64(1), complex64(1)}}
+-#data
+-</html><frameset></frameset>
+-#errors
+-7: End tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
+-17: Stray “frameset” start tag.
+-17: “frameset” start tag seen.
+-#document
+-| <html>
+-| <head>
+-| <frameset>
-
-- selected := v.WhereComplex64(func(i int, val complex64) bool {
-- return i%2 == 0
-- }).MustComplex64Slice()
+-#data
+-</body><frameset></frameset>
+-#errors
+-7: End tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
+-17: Stray “frameset” start tag.
+-17: “frameset” start tag seen.
+-#document
+-| <html>
+-| <head>
+-| <frameset>
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests7.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests7.dat
+deleted file mode 100644
+index f5193c6..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests7.dat
++++ /dev/null
+@@ -1,390 +0,0 @@
+-#data
+-<!doctype html><body><title>X</title>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <title>
+-| "X"
-
-- assert.Equal(t, 3, len(selected))
+-#data
+-<!doctype html><table><title>X</title></table>
+-#errors
+-Line: 1 Col: 29 Unexpected start tag (title) in table context caused voodoo mode.
+-Line: 1 Col: 38 Unexpected end tag (title) in table context caused voodoo mode.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <title>
+-| "X"
+-| <table>
-
--}
+-#data
+-<!doctype html><head></head><title>X</title>
+-#errors
+-Line: 1 Col: 35 Unexpected start tag (title) that can be in head. Moved.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <title>
+-| "X"
+-| <body>
-
--func TestGroupComplex64(t *testing.T) {
+-#data
+-<!doctype html></head><title>X</title>
+-#errors
+-Line: 1 Col: 29 Unexpected start tag (title) that can be in head. Moved.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <title>
+-| "X"
+-| <body>
-
-- v := &Value{data: []complex64{complex64(1), complex64(1), complex64(1), complex64(1), complex64(1), complex64(1)}}
+-#data
+-<!doctype html><table><meta></table>
+-#errors
+-Line: 1 Col: 28 Unexpected start tag (meta) in table context caused voodoo mode.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <meta>
+-| <table>
-
-- grouped := v.GroupComplex64(func(i int, val complex64) string {
-- return fmt.Sprintf("%v", i%2 == 0)
-- }).data.(map[string][]complex64)
+-#data
+-<!doctype html><table>X<tr><td><table> <meta></table></table>
+-#errors
+-Line: 1 Col: 23 Unexpected non-space characters in table context caused voodoo mode.
+-Line: 1 Col: 45 Unexpected start tag (meta) in table context caused voodoo mode.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| "X"
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <meta>
+-| <table>
+-| " "
-
-- assert.Equal(t, 2, len(grouped))
-- assert.Equal(t, 3, len(grouped["true"]))
-- assert.Equal(t, 3, len(grouped["false"]))
+-#data
+-<!doctype html><html> <head>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
-
--}
+-#data
+-<!doctype html> <head>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
-
--func TestReplaceComplex64(t *testing.T) {
+-#data
+-<!doctype html><table><style> <tr>x </style> </table>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <style>
+-| " <tr>x "
+-| " "
-
-- v := &Value{data: []complex64{complex64(1), complex64(1), complex64(1), complex64(1), complex64(1), complex64(1)}}
+-#data
+-<!doctype html><table><TBODY><script> <tr>x </script> </table>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <script>
+-| " <tr>x "
+-| " "
-
-- rawArr := v.MustComplex64Slice()
+-#data
+-<!doctype html><p><applet><p>X</p></applet>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <applet>
+-| <p>
+-| "X"
-
-- replaced := v.ReplaceComplex64(func(index int, val complex64) complex64 {
-- if index < len(rawArr)-1 {
-- return rawArr[index+1]
-- }
-- return rawArr[0]
-- })
+-#data
+-<!doctype html><listing>
+-X</listing>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <listing>
+-| "X"
-
-- replacedArr := replaced.MustComplex64Slice()
-- if assert.Equal(t, 6, len(replacedArr)) {
-- assert.Equal(t, replacedArr[0], rawArr[1])
-- assert.Equal(t, replacedArr[1], rawArr[2])
-- assert.Equal(t, replacedArr[2], rawArr[3])
-- assert.Equal(t, replacedArr[3], rawArr[4])
-- assert.Equal(t, replacedArr[4], rawArr[5])
-- assert.Equal(t, replacedArr[5], rawArr[0])
-- }
+-#data
+-<!doctype html><select><input>X
+-#errors
+-Line: 1 Col: 30 Unexpected input start tag in the select phase.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <select>
+-| <input>
+-| "X"
-
--}
+-#data
+-<!doctype html><select><select>X
+-#errors
+-Line: 1 Col: 31 Unexpected select start tag in the select phase treated as select end tag.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <select>
+-| "X"
-
--func TestCollectComplex64(t *testing.T) {
+-#data
+-<!doctype html><table><input type=hidDEN></table>
+-#errors
+-Line: 1 Col: 41 Unexpected input with type hidden in table context.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <input>
+-| type="hidDEN"
-
-- v := &Value{data: []complex64{complex64(1), complex64(1), complex64(1), complex64(1), complex64(1), complex64(1)}}
+-#data
+-<!doctype html><table>X<input type=hidDEN></table>
+-#errors
+-Line: 1 Col: 23 Unexpected non-space characters in table context caused voodoo mode.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| "X"
+-| <table>
+-| <input>
+-| type="hidDEN"
-
-- collected := v.CollectComplex64(func(index int, val complex64) interface{} {
-- return index
-- })
+-#data
+-<!doctype html><table> <input type=hidDEN></table>
+-#errors
+-Line: 1 Col: 43 Unexpected input with type hidden in table context.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| " "
+-| <input>
+-| type="hidDEN"
-
-- collectedArr := collected.MustInterSlice()
-- if assert.Equal(t, 6, len(collectedArr)) {
-- assert.Equal(t, collectedArr[0], 0)
-- assert.Equal(t, collectedArr[1], 1)
-- assert.Equal(t, collectedArr[2], 2)
-- assert.Equal(t, collectedArr[3], 3)
-- assert.Equal(t, collectedArr[4], 4)
-- assert.Equal(t, collectedArr[5], 5)
-- }
+-#data
+-<!doctype html><table> <input type='hidDEN'></table>
+-#errors
+-Line: 1 Col: 45 Unexpected input with type hidden in table context.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| " "
+-| <input>
+-| type="hidDEN"
-
--}
+-#data
+-<!doctype html><table><input type=" hidden"><input type=hidDEN></table>
+-#errors
+-Line: 1 Col: 44 Unexpected start tag (input) in table context caused voodoo mode.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <input>
+-| type=" hidden"
+-| <table>
+-| <input>
+-| type="hidDEN"
-
--// ************************************************************
--// TESTS
--// ************************************************************
+-#data
+-<!doctype html><table><select>X<tr>
+-#errors
+-Line: 1 Col: 30 Unexpected start tag (select) in table context caused voodoo mode.
+-Line: 1 Col: 35 Unexpected table element start tag (trs) in the select in table phase.
+-Line: 1 Col: 35 Unexpected end of file. Expected table content.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <select>
+-| "X"
+-| <table>
+-| <tbody>
+-| <tr>
-
--func TestComplex128(t *testing.T) {
+-#data
+-<!doctype html><select>X</select>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <select>
+-| "X"
-
-- val := complex128(1)
-- m := map[string]interface{}{"value": val, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").Complex128())
-- assert.Equal(t, val, New(m).Get("value").MustComplex128())
-- assert.Equal(t, complex128(0), New(m).Get("nothing").Complex128())
-- assert.Equal(t, val, New(m).Get("nothing").Complex128(1))
+-#data
+-<!DOCTYPE hTmL><html></html>
+-#errors
+-Line: 1 Col: 28 Unexpected end tag (html) after the (implied) root element.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
-
-- assert.Panics(t, func() {
-- New(m).Get("age").MustComplex128()
-- })
+-#data
+-<!DOCTYPE HTML><html></html>
+-#errors
+-Line: 1 Col: 28 Unexpected end tag (html) after the (implied) root element.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
-
--}
+-#data
+-<body>X</body></body>
+-#errors
+-Line: 1 Col: 21 Unexpected end tag token (body) in the after body phase.
+-Line: 1 Col: 21 Unexpected EOF in inner html mode.
+-#document-fragment
+-html
+-#document
+-| <head>
+-| <body>
+-| "X"
-
--func TestComplex128Slice(t *testing.T) {
+-#data
+-<div><p>a</x> b
+-#errors
+-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+-Line: 1 Col: 13 Unexpected end tag (x). Ignored.
+-Line: 1 Col: 15 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| <p>
+-| "a b"
-
-- val := complex128(1)
-- m := map[string]interface{}{"value": []complex128{val}, "nothing": nil}
-- assert.Equal(t, val, New(m).Get("value").Complex128Slice()[0])
-- assert.Equal(t, val, New(m).Get("value").MustComplex128Slice()[0])
-- assert.Equal(t, []complex128(nil), New(m).Get("nothing").Complex128Slice())
-- assert.Equal(t, val, New(m).Get("nothing").Complex128Slice([]complex128{complex128(1)})[0])
+-#data
+-<table><tr><td><code></code> </table>
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <code>
+-| " "
-
-- assert.Panics(t, func() {
-- New(m).Get("nothing").MustComplex128Slice()
-- })
+-#data
+-<table><b><tr><td>aaa</td></tr>bbb</table>ccc
+-#errors
+-XXX: Fix me
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <b>
+-| <b>
+-| "bbb"
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| "aaa"
+-| <b>
+-| "ccc"
-
--}
+-#data
+-A<table><tr> B</tr> B</table>
+-#errors
+-XXX: Fix me
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "A B B"
+-| <table>
+-| <tbody>
+-| <tr>
-
--func TestIsComplex128(t *testing.T) {
+-#data
+-A<table><tr> B</tr> </em>C</table>
+-#errors
+-XXX: Fix me
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "A BC"
+-| <table>
+-| <tbody>
+-| <tr>
+-| " "
-
-- var v *Value
+-#data
+-<select><keygen>
+-#errors
+-Not known
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <select>
+-| <keygen>
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests8.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests8.dat
+deleted file mode 100644
+index 90e6c91..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests8.dat
++++ /dev/null
+@@ -1,148 +0,0 @@
+-#data
+-<div>
+-<div></div>
+-</span>x
+-#errors
+-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+-Line: 3 Col: 7 Unexpected end tag (span). Ignored.
+-Line: 3 Col: 8 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| "
+-"
+-| <div>
+-| "
+-x"
-
-- v = &Value{data: complex128(1)}
-- assert.True(t, v.IsComplex128())
+-#data
+-<div>x<div></div>
+-</span>x
+-#errors
+-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+-Line: 2 Col: 7 Unexpected end tag (span). Ignored.
+-Line: 2 Col: 8 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| "x"
+-| <div>
+-| "
+-x"
-
-- v = &Value{data: []complex128{complex128(1)}}
-- assert.True(t, v.IsComplex128Slice())
+-#data
+-<div>x<div></div>x</span>x
+-#errors
+-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+-Line: 1 Col: 25 Unexpected end tag (span). Ignored.
+-Line: 1 Col: 26 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| "x"
+-| <div>
+-| "xx"
-
--}
+-#data
+-<div>x<div></div>y</span>z
+-#errors
+-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+-Line: 1 Col: 25 Unexpected end tag (span). Ignored.
+-Line: 1 Col: 26 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| "x"
+-| <div>
+-| "yz"
-
--func TestEachComplex128(t *testing.T) {
+-#data
+-<table><div>x<div></div>x</span>x
+-#errors
+-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+-Line: 1 Col: 12 Unexpected start tag (div) in table context caused voodoo mode.
+-Line: 1 Col: 18 Unexpected start tag (div) in table context caused voodoo mode.
+-Line: 1 Col: 24 Unexpected end tag (div) in table context caused voodoo mode.
+-Line: 1 Col: 32 Unexpected end tag (span) in table context caused voodoo mode.
+-Line: 1 Col: 32 Unexpected end tag (span). Ignored.
+-Line: 1 Col: 33 Unexpected end of file. Expected table content.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| "x"
+-| <div>
+-| "xx"
+-| <table>
-
-- v := &Value{data: []complex128{complex128(1), complex128(1), complex128(1), complex128(1), complex128(1)}}
-- count := 0
-- replacedVals := make([]complex128, 0)
-- assert.Equal(t, v, v.EachComplex128(func(i int, val complex128) bool {
+-#data
+-x<table>x
+-#errors
+-Line: 1 Col: 1 Unexpected non-space characters. Expected DOCTYPE.
+-Line: 1 Col: 9 Unexpected non-space characters in table context caused voodoo mode.
+-Line: 1 Col: 9 Unexpected end of file. Expected table content.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "xx"
+-| <table>
-
-- count++
-- replacedVals = append(replacedVals, val)
+-#data
+-x<table><table>x
+-#errors
+-Line: 1 Col: 1 Unexpected non-space characters. Expected DOCTYPE.
+-Line: 1 Col: 15 Unexpected start tag (table) implies end tag (table).
+-Line: 1 Col: 16 Unexpected non-space characters in table context caused voodoo mode.
+-Line: 1 Col: 16 Unexpected end of file. Expected table content.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "x"
+-| <table>
+-| "x"
+-| <table>
-
-- // abort early
-- if i == 2 {
-- return false
-- }
+-#data
+-<b>a<div></div><div></b>y
+-#errors
+-Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
+-Line: 1 Col: 24 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
+-Line: 1 Col: 25 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <b>
+-| "a"
+-| <div>
+-| <div>
+-| <b>
+-| "y"
-
-- return true
+-#data
+-<a><div><p></a>
+-#errors
+-Line: 1 Col: 3 Unexpected start tag (a). Expected DOCTYPE.
+-Line: 1 Col: 15 End tag (a) violates step 1, paragraph 3 of the adoption agency algorithm.
+-Line: 1 Col: 15 End tag (a) violates step 1, paragraph 3 of the adoption agency algorithm.
+-Line: 1 Col: 15 Expected closing tag. Unexpected end of file.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <a>
+-| <div>
+-| <a>
+-| <p>
+-| <a>
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests9.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests9.dat
+deleted file mode 100644
+index 554e27a..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests9.dat
++++ /dev/null
+@@ -1,457 +0,0 @@
+-#data
+-<!DOCTYPE html><math></math>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
-
-- }))
+-#data
+-<!DOCTYPE html><body><math></math>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
-
-- assert.Equal(t, count, 3)
-- assert.Equal(t, replacedVals[0], v.MustComplex128Slice()[0])
-- assert.Equal(t, replacedVals[1], v.MustComplex128Slice()[1])
-- assert.Equal(t, replacedVals[2], v.MustComplex128Slice()[2])
+-#data
+-<!DOCTYPE html><math><mi>
+-#errors
+-25: End of file in a foreign namespace context.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| <math mi>
-
--}
+-#data
+-<!DOCTYPE html><math><annotation-xml><svg><u>
+-#errors
+-45: HTML start tag “u” in a foreign namespace context.
+-45: End of file seen and there were open elements.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| <math annotation-xml>
+-| <svg svg>
+-| <u>
-
--func TestWhereComplex128(t *testing.T) {
+-#data
+-<!DOCTYPE html><body><select><math></math></select>
+-#errors
+-Line: 1 Col: 35 Unexpected start tag token (math) in the select phase. Ignored.
+-Line: 1 Col: 42 Unexpected end tag (math) in the select phase. Ignored.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <select>
-
-- v := &Value{data: []complex128{complex128(1), complex128(1), complex128(1), complex128(1), complex128(1), complex128(1)}}
+-#data
+-<!DOCTYPE html><body><select><option><math></math></option></select>
+-#errors
+-Line: 1 Col: 43 Unexpected start tag token (math) in the select phase. Ignored.
+-Line: 1 Col: 50 Unexpected end tag (math) in the select phase. Ignored.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <select>
+-| <option>
-
-- selected := v.WhereComplex128(func(i int, val complex128) bool {
-- return i%2 == 0
-- }).MustComplex128Slice()
+-#data
+-<!DOCTYPE html><body><table><math></math></table>
+-#errors
+-Line: 1 Col: 34 Unexpected start tag (math) in table context caused voodoo mode.
+-Line: 1 Col: 41 Unexpected end tag (math) in table context caused voodoo mode.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| <table>
-
-- assert.Equal(t, 3, len(selected))
+-#data
+-<!DOCTYPE html><body><table><math><mi>foo</mi></math></table>
+-#errors
+-Line: 1 Col: 34 Unexpected start tag (math) in table context caused voodoo mode.
+-Line: 1 Col: 46 Unexpected end tag (mi) in table context caused voodoo mode.
+-Line: 1 Col: 53 Unexpected end tag (math) in table context caused voodoo mode.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| <math mi>
+-| "foo"
+-| <table>
-
--}
+-#data
+-<!DOCTYPE html><body><table><math><mi>foo</mi><mi>bar</mi></math></table>
+-#errors
+-Line: 1 Col: 34 Unexpected start tag (math) in table context caused voodoo mode.
+-Line: 1 Col: 46 Unexpected end tag (mi) in table context caused voodoo mode.
+-Line: 1 Col: 58 Unexpected end tag (mi) in table context caused voodoo mode.
+-Line: 1 Col: 65 Unexpected end tag (math) in table context caused voodoo mode.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| <math mi>
+-| "foo"
+-| <math mi>
+-| "bar"
+-| <table>
-
--func TestGroupComplex128(t *testing.T) {
+-#data
+-<!DOCTYPE html><body><table><tbody><math><mi>foo</mi><mi>bar</mi></math></tbody></table>
+-#errors
+-Line: 1 Col: 41 Unexpected start tag (math) in table context caused voodoo mode.
+-Line: 1 Col: 53 Unexpected end tag (mi) in table context caused voodoo mode.
+-Line: 1 Col: 65 Unexpected end tag (mi) in table context caused voodoo mode.
+-Line: 1 Col: 72 Unexpected end tag (math) in table context caused voodoo mode.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| <math mi>
+-| "foo"
+-| <math mi>
+-| "bar"
+-| <table>
+-| <tbody>
-
-- v := &Value{data: []complex128{complex128(1), complex128(1), complex128(1), complex128(1), complex128(1), complex128(1)}}
+-#data
+-<!DOCTYPE html><body><table><tbody><tr><math><mi>foo</mi><mi>bar</mi></math></tr></tbody></table>
+-#errors
+-Line: 1 Col: 45 Unexpected start tag (math) in table context caused voodoo mode.
+-Line: 1 Col: 57 Unexpected end tag (mi) in table context caused voodoo mode.
+-Line: 1 Col: 69 Unexpected end tag (mi) in table context caused voodoo mode.
+-Line: 1 Col: 76 Unexpected end tag (math) in table context caused voodoo mode.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| <math mi>
+-| "foo"
+-| <math mi>
+-| "bar"
+-| <table>
+-| <tbody>
+-| <tr>
-
-- grouped := v.GroupComplex128(func(i int, val complex128) string {
-- return fmt.Sprintf("%v", i%2 == 0)
-- }).data.(map[string][]complex128)
+-#data
+-<!DOCTYPE html><body><table><tbody><tr><td><math><mi>foo</mi><mi>bar</mi></math></td></tr></tbody></table>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <math math>
+-| <math mi>
+-| "foo"
+-| <math mi>
+-| "bar"
-
-- assert.Equal(t, 2, len(grouped))
-- assert.Equal(t, 3, len(grouped["true"]))
-- assert.Equal(t, 3, len(grouped["false"]))
+-#data
+-<!DOCTYPE html><body><table><tbody><tr><td><math><mi>foo</mi><mi>bar</mi></math><p>baz</td></tr></tbody></table>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <math math>
+-| <math mi>
+-| "foo"
+-| <math mi>
+-| "bar"
+-| <p>
+-| "baz"
-
--}
+-#data
+-<!DOCTYPE html><body><table><caption><math><mi>foo</mi><mi>bar</mi></math><p>baz</caption></table>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <caption>
+-| <math math>
+-| <math mi>
+-| "foo"
+-| <math mi>
+-| "bar"
+-| <p>
+-| "baz"
-
--func TestReplaceComplex128(t *testing.T) {
+-#data
+-<!DOCTYPE html><body><table><caption><math><mi>foo</mi><mi>bar</mi><p>baz</table><p>quux
+-#errors
+-Line: 1 Col: 70 HTML start tag "p" in a foreign namespace context.
+-Line: 1 Col: 81 Unexpected end table tag in caption. Generates implied end caption.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <caption>
+-| <math math>
+-| <math mi>
+-| "foo"
+-| <math mi>
+-| "bar"
+-| <p>
+-| "baz"
+-| <p>
+-| "quux"
-
-- v := &Value{data: []complex128{complex128(1), complex128(1), complex128(1), complex128(1), complex128(1), complex128(1)}}
+-#data
+-<!DOCTYPE html><body><table><caption><math><mi>foo</mi><mi>bar</mi>baz</table><p>quux
+-#errors
+-Line: 1 Col: 78 Unexpected end table tag in caption. Generates implied end caption.
+-Line: 1 Col: 78 Unexpected end tag (caption). Missing end tag (math).
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <caption>
+-| <math math>
+-| <math mi>
+-| "foo"
+-| <math mi>
+-| "bar"
+-| "baz"
+-| <p>
+-| "quux"
-
-- rawArr := v.MustComplex128Slice()
+-#data
+-<!DOCTYPE html><body><table><colgroup><math><mi>foo</mi><mi>bar</mi><p>baz</table><p>quux
+-#errors
+-Line: 1 Col: 44 Unexpected start tag (math) in table context caused voodoo mode.
+-Line: 1 Col: 56 Unexpected end tag (mi) in table context caused voodoo mode.
+-Line: 1 Col: 68 Unexpected end tag (mi) in table context caused voodoo mode.
+-Line: 1 Col: 71 HTML start tag "p" in a foreign namespace context.
+-Line: 1 Col: 71 Unexpected start tag (p) in table context caused voodoo mode.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| <math mi>
+-| "foo"
+-| <math mi>
+-| "bar"
+-| <p>
+-| "baz"
+-| <table>
+-| <colgroup>
+-| <p>
+-| "quux"
-
-- replaced := v.ReplaceComplex128(func(index int, val complex128) complex128 {
-- if index < len(rawArr)-1 {
-- return rawArr[index+1]
-- }
-- return rawArr[0]
-- })
+-#data
+-<!DOCTYPE html><body><table><tr><td><select><math><mi>foo</mi><mi>bar</mi><p>baz</table><p>quux
+-#errors
+-Line: 1 Col: 50 Unexpected start tag token (math) in the select phase. Ignored.
+-Line: 1 Col: 54 Unexpected start tag token (mi) in the select phase. Ignored.
+-Line: 1 Col: 62 Unexpected end tag (mi) in the select phase. Ignored.
+-Line: 1 Col: 66 Unexpected start tag token (mi) in the select phase. Ignored.
+-Line: 1 Col: 74 Unexpected end tag (mi) in the select phase. Ignored.
+-Line: 1 Col: 77 Unexpected start tag token (p) in the select phase. Ignored.
+-Line: 1 Col: 88 Unexpected table element end tag (tables) in the select in table phase.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <select>
+-| "foobarbaz"
+-| <p>
+-| "quux"
-
-- replacedArr := replaced.MustComplex128Slice()
-- if assert.Equal(t, 6, len(replacedArr)) {
-- assert.Equal(t, replacedArr[0], rawArr[1])
-- assert.Equal(t, replacedArr[1], rawArr[2])
-- assert.Equal(t, replacedArr[2], rawArr[3])
-- assert.Equal(t, replacedArr[3], rawArr[4])
-- assert.Equal(t, replacedArr[4], rawArr[5])
-- assert.Equal(t, replacedArr[5], rawArr[0])
-- }
+-#data
+-<!DOCTYPE html><body><table><select><math><mi>foo</mi><mi>bar</mi><p>baz</table><p>quux
+-#errors
+-Line: 1 Col: 36 Unexpected start tag (select) in table context caused voodoo mode.
+-Line: 1 Col: 42 Unexpected start tag token (math) in the select phase. Ignored.
+-Line: 1 Col: 46 Unexpected start tag token (mi) in the select phase. Ignored.
+-Line: 1 Col: 54 Unexpected end tag (mi) in the select phase. Ignored.
+-Line: 1 Col: 58 Unexpected start tag token (mi) in the select phase. Ignored.
+-Line: 1 Col: 66 Unexpected end tag (mi) in the select phase. Ignored.
+-Line: 1 Col: 69 Unexpected start tag token (p) in the select phase. Ignored.
+-Line: 1 Col: 80 Unexpected table element end tag (tables) in the select in table phase.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <select>
+-| "foobarbaz"
+-| <table>
+-| <p>
+-| "quux"
-
--}
+-#data
+-<!DOCTYPE html><body></body></html><math><mi>foo</mi><mi>bar</mi><p>baz
+-#errors
+-Line: 1 Col: 41 Unexpected start tag (math).
+-Line: 1 Col: 68 HTML start tag "p" in a foreign namespace context.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| <math mi>
+-| "foo"
+-| <math mi>
+-| "bar"
+-| <p>
+-| "baz"
-
--func TestCollectComplex128(t *testing.T) {
+-#data
+-<!DOCTYPE html><body></body><math><mi>foo</mi><mi>bar</mi><p>baz
+-#errors
+-Line: 1 Col: 34 Unexpected start tag token (math) in the after body phase.
+-Line: 1 Col: 61 HTML start tag "p" in a foreign namespace context.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| <math mi>
+-| "foo"
+-| <math mi>
+-| "bar"
+-| <p>
+-| "baz"
-
-- v := &Value{data: []complex128{complex128(1), complex128(1), complex128(1), complex128(1), complex128(1), complex128(1)}}
+-#data
+-<!DOCTYPE html><frameset><math><mi></mi><mi></mi><p><span>
+-#errors
+-Line: 1 Col: 31 Unexpected start tag token (math) in the frameset phase. Ignored.
+-Line: 1 Col: 35 Unexpected start tag token (mi) in the frameset phase. Ignored.
+-Line: 1 Col: 40 Unexpected end tag token (mi) in the frameset phase. Ignored.
+-Line: 1 Col: 44 Unexpected start tag token (mi) in the frameset phase. Ignored.
+-Line: 1 Col: 49 Unexpected end tag token (mi) in the frameset phase. Ignored.
+-Line: 1 Col: 52 Unexpected start tag token (p) in the frameset phase. Ignored.
+-Line: 1 Col: 58 Unexpected start tag token (span) in the frameset phase. Ignored.
+-Line: 1 Col: 58 Expected closing tag. Unexpected end of file.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <frameset>
-
-- collected := v.CollectComplex128(func(index int, val complex128) interface{} {
-- return index
-- })
+-#data
+-<!DOCTYPE html><frameset></frameset><math><mi></mi><mi></mi><p><span>
+-#errors
+-Line: 1 Col: 42 Unexpected start tag (math) in the after frameset phase. Ignored.
+-Line: 1 Col: 46 Unexpected start tag (mi) in the after frameset phase. Ignored.
+-Line: 1 Col: 51 Unexpected end tag (mi) in the after frameset phase. Ignored.
+-Line: 1 Col: 55 Unexpected start tag (mi) in the after frameset phase. Ignored.
+-Line: 1 Col: 60 Unexpected end tag (mi) in the after frameset phase. Ignored.
+-Line: 1 Col: 63 Unexpected start tag (p) in the after frameset phase. Ignored.
+-Line: 1 Col: 69 Unexpected start tag (span) in the after frameset phase. Ignored.
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <frameset>
-
-- collectedArr := collected.MustInterSlice()
-- if assert.Equal(t, 6, len(collectedArr)) {
-- assert.Equal(t, collectedArr[0], 0)
-- assert.Equal(t, collectedArr[1], 1)
-- assert.Equal(t, collectedArr[2], 2)
-- assert.Equal(t, collectedArr[3], 3)
-- assert.Equal(t, collectedArr[4], 4)
-- assert.Equal(t, collectedArr[5], 5)
-- }
+-#data
+-<!DOCTYPE html><body xlink:href=foo><math xlink:href=foo></math>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| xlink:href="foo"
+-| <math math>
+-| xlink href="foo"
-
--}
-diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/value.go b/Godeps/_workspace/src/github.com/stretchr/objx/value.go
-deleted file mode 100644
-index 7aaef06..0000000
---- a/Godeps/_workspace/src/github.com/stretchr/objx/value.go
-+++ /dev/null
-@@ -1,13 +0,0 @@
--package objx
+-#data
+-<!DOCTYPE html><body xlink:href=foo xml:lang=en><math><mi xml:lang=en xlink:href=foo></mi></math>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| xlink:href="foo"
+-| xml:lang="en"
+-| <math math>
+-| <math mi>
+-| xlink href="foo"
+-| xml lang="en"
-
--// Value provides methods for extracting interface{} data in various
--// types.
--type Value struct {
-- // data contains the raw data being managed by this Value
-- data interface{}
--}
+-#data
+-<!DOCTYPE html><body xlink:href=foo xml:lang=en><math><mi xml:lang=en xlink:href=foo /></math>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| xlink:href="foo"
+-| xml:lang="en"
+-| <math math>
+-| <math mi>
+-| xlink href="foo"
+-| xml lang="en"
-
--// Data returns the raw data contained by this Value
--func (v *Value) Data() interface{} {
-- return v.data
--}
-diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/value_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/value_test.go
-deleted file mode 100644
-index 0bc65d9..0000000
---- a/Godeps/_workspace/src/github.com/stretchr/objx/value_test.go
-+++ /dev/null
-@@ -1 +0,0 @@
--package objx
-diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/assert/assertions.go b/Godeps/_workspace/src/github.com/stretchr/testify/assert/assertions.go
+-#data
+-<!DOCTYPE html><body xlink:href=foo xml:lang=en><math><mi xml:lang=en xlink:href=foo />bar</math>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| xlink:href="foo"
+-| xml:lang="en"
+-| <math math>
+-| <math mi>
+-| xlink href="foo"
+-| xml lang="en"
+-| "bar"
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests_innerHTML_1.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests_innerHTML_1.dat
deleted file mode 100644
-index c784e1b..0000000
---- a/Godeps/_workspace/src/github.com/stretchr/testify/assert/assertions.go
+index 6c78661..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests_innerHTML_1.dat
+++ /dev/null
-@@ -1,490 +0,0 @@
--package assert
--
--import (
-- "fmt"
-- "reflect"
-- "runtime"
-- "strings"
-- "time"
--)
--
--// TestingT is an interface wrapper around *testing.T
--type TestingT interface {
-- Errorf(format string, args ...interface{})
--}
--
--// Comparison a custom function that returns true on success and false on failure
--type Comparison func() (success bool)
--
--/*
-- Helper functions
--*/
--
--// ObjectsAreEqual determines if two objects are considered equal.
--//
--// This function does no assertion of any kind.
--func ObjectsAreEqual(expected, actual interface{}) bool {
--
-- if reflect.DeepEqual(expected, actual) {
-- return true
-- }
+@@ -1,741 +0,0 @@
+-#data
+-<body><span>
+-#errors
+-#document-fragment
+-body
+-#document
+-| <span>
-
-- if reflect.ValueOf(expected) == reflect.ValueOf(actual) {
-- return true
-- }
+-#data
+-<span><body>
+-#errors
+-#document-fragment
+-body
+-#document
+-| <span>
-
-- // Last ditch effort
-- if fmt.Sprintf("%#v", expected) == fmt.Sprintf("%#v", actual) {
-- return true
-- }
+-#data
+-<span><body>
+-#errors
+-#document-fragment
+-div
+-#document
+-| <span>
-
-- return false
+-#data
+-<body><span>
+-#errors
+-#document-fragment
+-html
+-#document
+-| <head>
+-| <body>
+-| <span>
-
--}
+-#data
+-<frameset><span>
+-#errors
+-#document-fragment
+-body
+-#document
+-| <span>
-
--/* CallerInfo is necessary because the assert functions use the testing object
--internally, causing it to print the file:line of the assert method, rather than where
--the problem actually occured in calling code.*/
+-#data
+-<span><frameset>
+-#errors
+-#document-fragment
+-body
+-#document
+-| <span>
-
--// CallerInfo returns a string containing the file and line number of the assert call
--// that failed.
--func CallerInfo() string {
+-#data
+-<span><frameset>
+-#errors
+-#document-fragment
+-div
+-#document
+-| <span>
-
-- file := ""
-- line := 0
-- ok := false
+-#data
+-<frameset><span>
+-#errors
+-#document-fragment
+-html
+-#document
+-| <head>
+-| <frameset>
-
-- for i := 0; ; i++ {
-- _, file, line, ok = runtime.Caller(i)
-- if !ok {
-- return ""
-- }
-- parts := strings.Split(file, "/")
-- dir := parts[len(parts)-2]
-- file = parts[len(parts)-1]
-- if (dir != "assert" && dir != "mock") || file == "mock_test.go" {
-- break
-- }
-- }
+-#data
+-<table><tr>
+-#errors
+-#document-fragment
+-table
+-#document
+-| <tbody>
+-| <tr>
-
-- return fmt.Sprintf("%s:%d", file, line)
--}
+-#data
+-</table><tr>
+-#errors
+-#document-fragment
+-table
+-#document
+-| <tbody>
+-| <tr>
-
--// getWhitespaceString returns a string that is long enough to overwrite the default
--// output from the go testing framework.
--func getWhitespaceString() string {
+-#data
+-<a>
+-#errors
+-#document-fragment
+-table
+-#document
+-| <a>
-
-- _, file, line, ok := runtime.Caller(1)
-- if !ok {
-- return ""
-- }
-- parts := strings.Split(file, "/")
-- file = parts[len(parts)-1]
+-#data
+-<a>
+-#errors
+-#document-fragment
+-table
+-#document
+-| <a>
-
-- return strings.Repeat(" ", len(fmt.Sprintf("%s:%d: ", file, line)))
+-#data
+-<a><caption>a
+-#errors
+-#document-fragment
+-table
+-#document
+-| <a>
+-| <caption>
+-| "a"
-
--}
+-#data
+-<a><colgroup><col>
+-#errors
+-#document-fragment
+-table
+-#document
+-| <a>
+-| <colgroup>
+-| <col>
-
--func messageFromMsgAndArgs(msgAndArgs ...interface{}) string {
-- if len(msgAndArgs) == 0 || msgAndArgs == nil {
-- return ""
-- }
-- if len(msgAndArgs) == 1 {
-- return msgAndArgs[0].(string)
-- }
-- if len(msgAndArgs) > 1 {
-- return fmt.Sprintf(msgAndArgs[0].(string), msgAndArgs[1:]...)
-- }
-- return ""
--}
+-#data
+-<a><tbody><tr>
+-#errors
+-#document-fragment
+-table
+-#document
+-| <a>
+-| <tbody>
+-| <tr>
-
--// Fail reports a failure through
--func Fail(t TestingT, failureMessage string, msgAndArgs ...interface{}) bool {
+-#data
+-<a><tfoot><tr>
+-#errors
+-#document-fragment
+-table
+-#document
+-| <a>
+-| <tfoot>
+-| <tr>
-
-- message := messageFromMsgAndArgs(msgAndArgs...)
+-#data
+-<a><thead><tr>
+-#errors
+-#document-fragment
+-table
+-#document
+-| <a>
+-| <thead>
+-| <tr>
-
-- if len(message) > 0 {
-- t.Errorf("\r%s\r\tLocation:\t%s\n\r\tError:\t\t%s\n\r\tMessages:\t%s\n\r", getWhitespaceString(), CallerInfo(), failureMessage, message)
-- } else {
-- t.Errorf("\r%s\r\tLocation:\t%s\n\r\tError:\t\t%s\n\r", getWhitespaceString(), CallerInfo(), failureMessage)
-- }
+-#data
+-<a><tr>
+-#errors
+-#document-fragment
+-table
+-#document
+-| <a>
+-| <tbody>
+-| <tr>
-
-- return false
--}
+-#data
+-<a><th>
+-#errors
+-#document-fragment
+-table
+-#document
+-| <a>
+-| <tbody>
+-| <tr>
+-| <th>
-
--// Implements asserts that an object is implemented by the specified interface.
--//
--// assert.Implements(t, (*MyInterface)(nil), new(MyObject), "MyObject")
--func Implements(t TestingT, interfaceObject interface{}, object interface{}, msgAndArgs ...interface{}) bool {
+-#data
+-<a><td>
+-#errors
+-#document-fragment
+-table
+-#document
+-| <a>
+-| <tbody>
+-| <tr>
+-| <td>
-
-- interfaceType := reflect.TypeOf(interfaceObject).Elem()
+-#data
+-<table></table><tbody>
+-#errors
+-#document-fragment
+-caption
+-#document
+-| <table>
-
-- if !reflect.TypeOf(object).Implements(interfaceType) {
-- return Fail(t, fmt.Sprintf("Object must implement %v", interfaceType), msgAndArgs...)
-- }
+-#data
+-</table><span>
+-#errors
+-#document-fragment
+-caption
+-#document
+-| <span>
-
-- return true
+-#data
+-<span></table>
+-#errors
+-#document-fragment
+-caption
+-#document
+-| <span>
-
--}
+-#data
+-</caption><span>
+-#errors
+-#document-fragment
+-caption
+-#document
+-| <span>
-
--// IsType asserts that the specified objects are of the same type.
--func IsType(t TestingT, expectedType interface{}, object interface{}, msgAndArgs ...interface{}) bool {
+-#data
+-<span></caption><span>
+-#errors
+-#document-fragment
+-caption
+-#document
+-| <span>
+-| <span>
-
-- if !ObjectsAreEqual(reflect.TypeOf(object), reflect.TypeOf(expectedType)) {
-- return Fail(t, fmt.Sprintf("Object expected to be of type %v, but was %v", reflect.TypeOf(expectedType), reflect.TypeOf(object)), msgAndArgs...)
-- }
+-#data
+-<span><caption><span>
+-#errors
+-#document-fragment
+-caption
+-#document
+-| <span>
+-| <span>
-
-- return true
--}
+-#data
+-<span><col><span>
+-#errors
+-#document-fragment
+-caption
+-#document
+-| <span>
+-| <span>
-
--// Equal asserts that two objects are equal.
--//
--// assert.Equal(t, 123, 123, "123 and 123 should be equal")
--//
--// Returns whether the assertion was successful (true) or not (false).
--func Equal(t TestingT, expected, actual interface{}, msgAndArgs ...interface{}) bool {
+-#data
+-<span><colgroup><span>
+-#errors
+-#document-fragment
+-caption
+-#document
+-| <span>
+-| <span>
-
-- if !ObjectsAreEqual(expected, actual) {
-- return Fail(t, fmt.Sprintf("Not equal: %#v != %#v", expected, actual), msgAndArgs...)
-- }
+-#data
+-<span><html><span>
+-#errors
+-#document-fragment
+-caption
+-#document
+-| <span>
+-| <span>
-
-- return true
+-#data
+-<span><tbody><span>
+-#errors
+-#document-fragment
+-caption
+-#document
+-| <span>
+-| <span>
-
--}
+-#data
+-<span><td><span>
+-#errors
+-#document-fragment
+-caption
+-#document
+-| <span>
+-| <span>
-
--// Exactly asserts that two objects are equal is value and type.
--//
--// assert.Exactly(t, int32(123), int64(123), "123 and 123 should NOT be equal")
--//
--// Returns whether the assertion was successful (true) or not (false).
--func Exactly(t TestingT, expected, actual interface{}, msgAndArgs ...interface{}) bool {
+-#data
+-<span><tfoot><span>
+-#errors
+-#document-fragment
+-caption
+-#document
+-| <span>
+-| <span>
-
-- aType := reflect.TypeOf(expected)
-- bType := reflect.TypeOf(actual)
+-#data
+-<span><thead><span>
+-#errors
+-#document-fragment
+-caption
+-#document
+-| <span>
+-| <span>
-
-- if aType != bType {
-- return Fail(t, "Types expected to match exactly", "%v != %v", aType, bType)
-- }
+-#data
+-<span><th><span>
+-#errors
+-#document-fragment
+-caption
+-#document
+-| <span>
+-| <span>
-
-- return Equal(t, expected, actual, msgAndArgs...)
+-#data
+-<span><tr><span>
+-#errors
+-#document-fragment
+-caption
+-#document
+-| <span>
+-| <span>
-
--}
+-#data
+-<span></table><span>
+-#errors
+-#document-fragment
+-caption
+-#document
+-| <span>
+-| <span>
-
--// NotNil asserts that the specified object is not nil.
--//
--// assert.NotNil(t, err, "err should be something")
--//
--// Returns whether the assertion was successful (true) or not (false).
--func NotNil(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
+-#data
+-</colgroup><col>
+-#errors
+-#document-fragment
+-colgroup
+-#document
+-| <col>
-
-- var success bool = true
+-#data
+-<a><col>
+-#errors
+-#document-fragment
+-colgroup
+-#document
+-| <col>
-
-- if object == nil {
-- success = false
-- } else {
-- value := reflect.ValueOf(object)
-- kind := value.Kind()
-- if kind >= reflect.Chan && kind <= reflect.Slice && value.IsNil() {
-- success = false
-- }
-- }
+-#data
+-<caption><a>
+-#errors
+-#document-fragment
+-tbody
+-#document
+-| <a>
-
-- if !success {
-- Fail(t, "Expected not to be nil.", msgAndArgs...)
-- }
+-#data
+-<col><a>
+-#errors
+-#document-fragment
+-tbody
+-#document
+-| <a>
-
-- return success
--}
+-#data
+-<colgroup><a>
+-#errors
+-#document-fragment
+-tbody
+-#document
+-| <a>
-
--// Nil asserts that the specified object is nil.
--//
--// assert.Nil(t, err, "err should be nothing")
--//
--// Returns whether the assertion was successful (true) or not (false).
--func Nil(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
+-#data
+-<tbody><a>
+-#errors
+-#document-fragment
+-tbody
+-#document
+-| <a>
-
-- if object == nil {
-- return true
-- } else {
-- value := reflect.ValueOf(object)
-- kind := value.Kind()
-- if kind >= reflect.Chan && kind <= reflect.Slice && value.IsNil() {
-- return true
-- }
-- }
+-#data
+-<tfoot><a>
+-#errors
+-#document-fragment
+-tbody
+-#document
+-| <a>
-
-- return Fail(t, fmt.Sprintf("Expected nil, but got: %#v", object), msgAndArgs...)
--}
+-#data
+-<thead><a>
+-#errors
+-#document-fragment
+-tbody
+-#document
+-| <a>
-
--// isEmpty gets whether the specified object is considered empty or not.
--func isEmpty(object interface{}) bool {
+-#data
+-</table><a>
+-#errors
+-#document-fragment
+-tbody
+-#document
+-| <a>
-
-- if object == nil {
-- return true
-- } else if object == "" {
-- return true
-- } else if object == 0 {
-- return true
-- } else if object == false {
-- return true
-- }
+-#data
+-<a><tr>
+-#errors
+-#document-fragment
+-tbody
+-#document
+-| <a>
+-| <tr>
-
-- objValue := reflect.ValueOf(object)
-- switch objValue.Kind() {
-- case reflect.Map:
-- fallthrough
-- case reflect.Slice:
-- {
-- return (objValue.Len() == 0)
-- }
-- }
+-#data
+-<a><td>
+-#errors
+-#document-fragment
+-tbody
+-#document
+-| <a>
+-| <tr>
+-| <td>
-
-- return false
+-#data
+-<a><td>
+-#errors
+-#document-fragment
+-tbody
+-#document
+-| <a>
+-| <tr>
+-| <td>
-
--}
+-#data
+-<a><td>
+-#errors
+-#document-fragment
+-tbody
+-#document
+-| <a>
+-| <tr>
+-| <td>
-
--// Empty asserts that the specified object is empty. I.e. nil, "", false, 0 or a
--// slice with len == 0.
--//
--// assert.Empty(t, obj)
--//
--// Returns whether the assertion was successful (true) or not (false).
--func Empty(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
+-#data
+-<td><table><tbody><a><tr>
+-#errors
+-#document-fragment
+-tbody
+-#document
+-| <tr>
+-| <td>
+-| <a>
+-| <table>
+-| <tbody>
+-| <tr>
-
-- pass := isEmpty(object)
-- if !pass {
-- Fail(t, fmt.Sprintf("Should be empty, but was %v", object), msgAndArgs...)
-- }
+-#data
+-</tr><td>
+-#errors
+-#document-fragment
+-tr
+-#document
+-| <td>
-
-- return pass
+-#data
+-<td><table><a><tr></tr><tr>
+-#errors
+-#document-fragment
+-tr
+-#document
+-| <td>
+-| <a>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <tr>
-
--}
+-#data
+-<caption><td>
+-#errors
+-#document-fragment
+-tr
+-#document
+-| <td>
-
--// Empty asserts that the specified object is NOT empty. I.e. not nil, "", false, 0 or a
--// slice with len == 0.
--//
--// if assert.NotEmpty(t, obj) {
--// assert.Equal(t, "two", obj[1])
--// }
--//
--// Returns whether the assertion was successful (true) or not (false).
--func NotEmpty(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
+-#data
+-<col><td>
+-#errors
+-#document-fragment
+-tr
+-#document
+-| <td>
-
-- pass := !isEmpty(object)
-- if !pass {
-- Fail(t, fmt.Sprintf("Should NOT be empty, but was %v", object), msgAndArgs...)
-- }
+-#data
+-<colgroup><td>
+-#errors
+-#document-fragment
+-tr
+-#document
+-| <td>
-
-- return pass
+-#data
+-<tbody><td>
+-#errors
+-#document-fragment
+-tr
+-#document
+-| <td>
-
--}
+-#data
+-<tfoot><td>
+-#errors
+-#document-fragment
+-tr
+-#document
+-| <td>
-
--// True asserts that the specified value is true.
--//
--// assert.True(t, myBool, "myBool should be true")
--//
--// Returns whether the assertion was successful (true) or not (false).
--func True(t TestingT, value bool, msgAndArgs ...interface{}) bool {
+-#data
+-<thead><td>
+-#errors
+-#document-fragment
+-tr
+-#document
+-| <td>
-
-- if value != true {
-- return Fail(t, "Should be true", msgAndArgs...)
-- }
+-#data
+-<tr><td>
+-#errors
+-#document-fragment
+-tr
+-#document
+-| <td>
-
-- return true
+-#data
+-</table><td>
+-#errors
+-#document-fragment
+-tr
+-#document
+-| <td>
-
--}
+-#data
+-<td><table></table><td>
+-#errors
+-#document-fragment
+-tr
+-#document
+-| <td>
+-| <table>
+-| <td>
-
--// False asserts that the specified value is true.
--//
--// assert.False(t, myBool, "myBool should be false")
--//
--// Returns whether the assertion was successful (true) or not (false).
--func False(t TestingT, value bool, msgAndArgs ...interface{}) bool {
+-#data
+-<td><table></table><td>
+-#errors
+-#document-fragment
+-tr
+-#document
+-| <td>
+-| <table>
+-| <td>
-
-- if value != false {
-- return Fail(t, "Should be false", msgAndArgs...)
-- }
+-#data
+-<caption><a>
+-#errors
+-#document-fragment
+-td
+-#document
+-| <a>
-
-- return true
+-#data
+-<col><a>
+-#errors
+-#document-fragment
+-td
+-#document
+-| <a>
-
--}
+-#data
+-<colgroup><a>
+-#errors
+-#document-fragment
+-td
+-#document
+-| <a>
-
--// NotEqual asserts that the specified values are NOT equal.
--//
--// assert.NotEqual(t, obj1, obj2, "two objects shouldn't be equal")
--//
--// Returns whether the assertion was successful (true) or not (false).
--func NotEqual(t TestingT, expected, actual interface{}, msgAndArgs ...interface{}) bool {
+-#data
+-<tbody><a>
+-#errors
+-#document-fragment
+-td
+-#document
+-| <a>
-
-- if ObjectsAreEqual(expected, actual) {
-- return Fail(t, "Should not be equal", msgAndArgs...)
-- }
+-#data
+-<tfoot><a>
+-#errors
+-#document-fragment
+-td
+-#document
+-| <a>
-
-- return true
+-#data
+-<th><a>
+-#errors
+-#document-fragment
+-td
+-#document
+-| <a>
-
--}
+-#data
+-<thead><a>
+-#errors
+-#document-fragment
+-td
+-#document
+-| <a>
-
--// Contains asserts that the specified string contains the specified substring.
--//
--// assert.Contains(t, "Hello World", "World", "But 'Hello World' does contain 'World'")
--//
--// Returns whether the assertion was successful (true) or not (false).
--func Contains(t TestingT, s, contains string, msgAndArgs ...interface{}) bool {
+-#data
+-<tr><a>
+-#errors
+-#document-fragment
+-td
+-#document
+-| <a>
-
-- if !strings.Contains(s, contains) {
-- return Fail(t, fmt.Sprintf("\"%s\" does not contain \"%s\"", s, contains), msgAndArgs...)
-- }
+-#data
+-</table><a>
+-#errors
+-#document-fragment
+-td
+-#document
+-| <a>
-
-- return true
+-#data
+-</tbody><a>
+-#errors
+-#document-fragment
+-td
+-#document
+-| <a>
-
--}
+-#data
+-</td><a>
+-#errors
+-#document-fragment
+-td
+-#document
+-| <a>
-
--// NotContains asserts that the specified string does NOT contain the specified substring.
--//
--// assert.NotContains(t, "Hello World", "Earth", "But 'Hello World' does NOT contain 'Earth'")
--//
--// Returns whether the assertion was successful (true) or not (false).
--func NotContains(t TestingT, s, contains string, msgAndArgs ...interface{}) bool {
+-#data
+-</tfoot><a>
+-#errors
+-#document-fragment
+-td
+-#document
+-| <a>
-
-- if strings.Contains(s, contains) {
-- return Fail(t, fmt.Sprintf("\"%s\" should not contain \"%s\"", s, contains), msgAndArgs...)
-- }
+-#data
+-</thead><a>
+-#errors
+-#document-fragment
+-td
+-#document
+-| <a>
-
-- return true
+-#data
+-</th><a>
+-#errors
+-#document-fragment
+-td
+-#document
+-| <a>
-
--}
+-#data
+-</tr><a>
+-#errors
+-#document-fragment
+-td
+-#document
+-| <a>
-
--// Uses a Comparison to assert a complex condition.
--func Condition(t TestingT, comp Comparison, msgAndArgs ...interface{}) bool {
-- result := comp()
-- if !result {
-- Fail(t, "Condition failed!", msgAndArgs...)
-- }
-- return result
--}
+-#data
+-<table><td><td>
+-#errors
+-#document-fragment
+-td
+-#document
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <td>
-
--// PanicTestFunc defines a func that should be passed to the assert.Panics and assert.NotPanics
--// methods, and represents a simple func that takes no arguments, and returns nothing.
--type PanicTestFunc func()
+-#data
+-</select><option>
+-#errors
+-#document-fragment
+-select
+-#document
+-| <option>
-
--// didPanic returns true if the function passed to it panics. Otherwise, it returns false.
--func didPanic(f PanicTestFunc) (bool, interface{}) {
+-#data
+-<input><option>
+-#errors
+-#document-fragment
+-select
+-#document
+-| <option>
-
-- var didPanic bool = false
-- var message interface{}
-- func() {
+-#data
+-<keygen><option>
+-#errors
+-#document-fragment
+-select
+-#document
+-| <option>
-
-- defer func() {
-- if message = recover(); message != nil {
-- didPanic = true
-- }
-- }()
+-#data
+-<textarea><option>
+-#errors
+-#document-fragment
+-select
+-#document
+-| <option>
-
-- // call the target function
-- f()
+-#data
+-</html><!--abc-->
+-#errors
+-#document-fragment
+-html
+-#document
+-| <head>
+-| <body>
+-| <!-- abc -->
-
-- }()
+-#data
+-</frameset><frame>
+-#errors
+-#document-fragment
+-frameset
+-#document
+-| <frame>
-
-- return didPanic, message
+-#data
+-#errors
+-#document-fragment
+-html
+-#document
+-| <head>
+-| <body>
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tricky01.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tricky01.dat
+deleted file mode 100644
+index 0841992..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tricky01.dat
++++ /dev/null
+@@ -1,261 +0,0 @@
+-#data
+-<b><p>Bold </b> Not bold</p>
+-Also not bold.
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <b>
+-| <p>
+-| <b>
+-| "Bold "
+-| " Not bold"
+-| "
+-Also not bold."
-
--}
+-#data
+-<html>
+-<font color=red><i>Italic and Red<p>Italic and Red </font> Just italic.</p> Italic only.</i> Plain
+-<p>I should not be red. <font color=red>Red. <i>Italic and red.</p>
+-<p>Italic and red. </i> Red.</font> I should not be red.</p>
+-<b>Bold <i>Bold and italic</b> Only Italic </i> Plain
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <font>
+-| color="red"
+-| <i>
+-| "Italic and Red"
+-| <i>
+-| <p>
+-| <font>
+-| color="red"
+-| "Italic and Red "
+-| " Just italic."
+-| " Italic only."
+-| " Plain
+-"
+-| <p>
+-| "I should not be red. "
+-| <font>
+-| color="red"
+-| "Red. "
+-| <i>
+-| "Italic and red."
+-| <font>
+-| color="red"
+-| <i>
+-| "
+-"
+-| <p>
+-| <font>
+-| color="red"
+-| <i>
+-| "Italic and red. "
+-| " Red."
+-| " I should not be red."
+-| "
+-"
+-| <b>
+-| "Bold "
+-| <i>
+-| "Bold and italic"
+-| <i>
+-| " Only Italic "
+-| " Plain"
-
--// Panics asserts that the code inside the specified PanicTestFunc panics.
--//
--// assert.Panics(t, func(){
--// GoCrazy()
--// }, "Calling GoCrazy() should panic")
--//
--// Returns whether the assertion was successful (true) or not (false).
--func Panics(t TestingT, f PanicTestFunc, msgAndArgs ...interface{}) bool {
+-#data
+-<html><body>
+-<p><font size="7">First paragraph.</p>
+-<p>Second paragraph.</p></font>
+-<b><p><i>Bold and Italic</b> Italic</p>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "
+-"
+-| <p>
+-| <font>
+-| size="7"
+-| "First paragraph."
+-| <font>
+-| size="7"
+-| "
+-"
+-| <p>
+-| "Second paragraph."
+-| "
+-"
+-| <b>
+-| <p>
+-| <b>
+-| <i>
+-| "Bold and Italic"
+-| <i>
+-| " Italic"
-
-- if funcDidPanic, panicValue := didPanic(f); !funcDidPanic {
-- return Fail(t, fmt.Sprintf("func %#v should panic\n\r\tPanic value:\t%v", f, panicValue), msgAndArgs...)
-- }
+-#data
+-<html>
+-<dl>
+-<dt><b>Boo
+-<dd>Goo?
+-</dl>
+-</html>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <dl>
+-| "
+-"
+-| <dt>
+-| <b>
+-| "Boo
+-"
+-| <dd>
+-| <b>
+-| "Goo?
+-"
+-| <b>
+-| "
+-"
-
-- return true
--}
+-#data
+-<html><body>
+-<label><a><div>Hello<div>World</div></a></label>
+-</body></html>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "
+-"
+-| <label>
+-| <a>
+-| <div>
+-| <a>
+-| "Hello"
+-| <div>
+-| "World"
+-| "
+-"
-
--// NotPanics asserts that the code inside the specified PanicTestFunc does NOT panic.
--//
--// assert.NotPanics(t, func(){
--// RemainCalm()
--// }, "Calling RemainCalm() should NOT panic")
--//
--// Returns whether the assertion was successful (true) or not (false).
--func NotPanics(t TestingT, f PanicTestFunc, msgAndArgs ...interface{}) bool {
+-#data
+-<table><center> <font>a</center> <img> <tr><td> </td> </tr> </table>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <center>
+-| " "
+-| <font>
+-| "a"
+-| <font>
+-| <img>
+-| " "
+-| <table>
+-| " "
+-| <tbody>
+-| <tr>
+-| <td>
+-| " "
+-| " "
+-| " "
-
-- if funcDidPanic, panicValue := didPanic(f); funcDidPanic {
-- return Fail(t, fmt.Sprintf("func %#v should not panic\n\r\tPanic value:\t%v", f, panicValue), msgAndArgs...)
-- }
+-#data
+-<table><tr><p><a><p>You should see this text.
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| <a>
+-| <p>
+-| <a>
+-| "You should see this text."
+-| <table>
+-| <tbody>
+-| <tr>
-
-- return true
--}
+-#data
+-<TABLE>
+-<TR>
+-<CENTER><CENTER><TD></TD></TR><TR>
+-<FONT>
+-<TABLE><tr></tr></TABLE>
+-</P>
+-<a></font><font></a>
+-This page contains an insanely badly-nested tag sequence.
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <center>
+-| <center>
+-| <font>
+-| "
+-"
+-| <table>
+-| "
+-"
+-| <tbody>
+-| <tr>
+-| "
+-"
+-| <td>
+-| <tr>
+-| "
+-"
+-| <table>
+-| <tbody>
+-| <tr>
+-| <font>
+-| "
+-"
+-| <p>
+-| "
+-"
+-| <a>
+-| <a>
+-| <font>
+-| <font>
+-| "
+-This page contains an insanely badly-nested tag sequence."
-
--// WithinDuration asserts that the two times are within duration delta of each other.
--//
--// assert.WithinDuration(t, time.Now(), time.Now(), 10*time.Second, "The difference should not be more than 10s")
--//
--// Returns whether the assertion was successful (true) or not (false).
--func WithinDuration(t TestingT, expected, actual time.Time, delta time.Duration, msgAndArgs ...interface{}) bool {
+-#data
+-<html>
+-<body>
+-<b><nobr><div>This text is in a div inside a nobr</nobr>More text that should not be in the nobr, i.e., the
+-nobr should have closed the div inside it implicitly. </b><pre>A pre tag outside everything else.</pre>
+-</body>
+-</html>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "
+-"
+-| <b>
+-| <nobr>
+-| <div>
+-| <b>
+-| <nobr>
+-| "This text is in a div inside a nobr"
+-| "More text that should not be in the nobr, i.e., the
+-nobr should have closed the div inside it implicitly. "
+-| <pre>
+-| "A pre tag outside everything else."
+-| "
-
-- dt := expected.Sub(actual)
-- if dt < -delta || dt > delta {
-- return Fail(t, fmt.Sprintf("Max difference between %v and %v allowed is %v, but difference was %v", expected, actual, dt, delta), msgAndArgs...)
-- }
+-"
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/webkit01.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/webkit01.dat
+deleted file mode 100644
+index 9d425e9..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/webkit01.dat
++++ /dev/null
+@@ -1,610 +0,0 @@
+-#data
+-Test
+-#errors
+-Line: 1 Col: 4 Unexpected non-space characters. Expected DOCTYPE.
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "Test"
-
-- return true
--}
+-#data
+-<div></div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
-
--/*
-- Errors
--*/
+-#data
+-<div>Test</div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| "Test"
-
--// NoError asserts that a function returned no error (i.e. `nil`).
--//
--// actualObj, err := SomeFunction()
--// if assert.NoError(t, err) {
--// assert.Equal(t, actualObj, expectedObj)
--// }
--//
--// Returns whether the assertion was successful (true) or not (false).
--func NoError(t TestingT, err error, msgAndArgs ...interface{}) bool {
+-#data
+-<di
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
-
-- message := messageFromMsgAndArgs(msgAndArgs...)
-- return Nil(t, err, "No error is expected but got %v %s", err, message)
+-#data
+-<div>Hello</div>
+-<script>
+-console.log("PASS");
+-</script>
+-<div>Bye</div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| "Hello"
+-| "
+-"
+-| <script>
+-| "
+-console.log("PASS");
+-"
+-| "
+-"
+-| <div>
+-| "Bye"
-
--}
+-#data
+-<div foo="bar">Hello</div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| foo="bar"
+-| "Hello"
-
--// Error asserts that a function returned an error (i.e. not `nil`).
--//
--// actualObj, err := SomeFunction()
--// if assert.Error(t, err, "An error was expected") {
--// assert.Equal(t, err, expectedError)
--// }
--//
--// Returns whether the assertion was successful (true) or not (false).
--func Error(t TestingT, err error, msgAndArgs ...interface{}) bool {
+-#data
+-<div>Hello</div>
+-<script>
+-console.log("FOO<span>BAR</span>BAZ");
+-</script>
+-<div>Bye</div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| "Hello"
+-| "
+-"
+-| <script>
+-| "
+-console.log("FOO<span>BAR</span>BAZ");
+-"
+-| "
+-"
+-| <div>
+-| "Bye"
-
-- message := messageFromMsgAndArgs(msgAndArgs...)
-- return NotNil(t, err, "An error is expected but got nil. %s", message)
+-#data
+-<foo bar="baz"></foo><potato quack="duck"></potato>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <foo>
+-| bar="baz"
+-| <potato>
+-| quack="duck"
-
--}
+-#data
+-<foo bar="baz"><potato quack="duck"></potato></foo>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <foo>
+-| bar="baz"
+-| <potato>
+-| quack="duck"
-
--// Error asserts that a function returned an error (i.e. not `nil`).
--//
--// actualObj, err := SomeFunction()
--// if assert.Error(t, err, "An error was expected") {
--// assert.Equal(t, err, expectedError)
--// }
--//
--// Returns whether the assertion was successful (true) or not (false).
--func EqualError(t TestingT, theError error, errString string, msgAndArgs ...interface{}) bool {
+-#data
+-<foo></foo bar="baz"><potato></potato quack="duck">
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <foo>
+-| <potato>
-
-- message := messageFromMsgAndArgs(msgAndArgs...)
-- if !NotNil(t, theError, "An error is expected but got nil. %s", message) {
-- return false
-- }
-- s := "An error with value \"%s\" is expected but got \"%s\". %s"
-- return Equal(t, theError.Error(), errString,
-- s, errString, theError.Error(), message)
--}
-diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/assert/assertions_test.go b/Godeps/_workspace/src/github.com/stretchr/testify/assert/assertions_test.go
-deleted file mode 100644
-index bf1d727..0000000
---- a/Godeps/_workspace/src/github.com/stretchr/testify/assert/assertions_test.go
-+++ /dev/null
-@@ -1,401 +0,0 @@
--package assert
+-#data
+-</ tttt>
+-#errors
+-#document
+-| <!-- tttt -->
+-| <html>
+-| <head>
+-| <body>
-
--import (
-- "errors"
-- "testing"
-- "time"
--)
+-#data
+-<div FOO ><img><img></div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| foo=""
+-| <img>
+-| <img>
-
--// AssertionTesterInterface defines an interface to be used for testing assertion methods
--type AssertionTesterInterface interface {
-- TestMethod()
--}
+-#data
+-<p>Test</p<p>Test2</p>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| "TestTest2"
-
--// AssertionTesterConformingObject is an object that conforms to the AssertionTesterInterface interface
--type AssertionTesterConformingObject struct {
--}
+-#data
+-<rdar://problem/6869687>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <rdar:>
+-| 6869687=""
+-| problem=""
-
--func (a *AssertionTesterConformingObject) TestMethod() {
--}
+-#data
+-<A>test< /A>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <a>
+-| "test< /A>"
-
--// AssertionTesterNonConformingObject is an object that does not conform to the AssertionTesterInterface interface
--type AssertionTesterNonConformingObject struct {
--}
+-#data
+-<
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "<"
-
--func TestObjectsAreEqual(t *testing.T) {
+-#data
+-<body foo='bar'><body foo='baz' yo='mama'>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| foo="bar"
+-| yo="mama"
-
-- if !ObjectsAreEqual("Hello World", "Hello World") {
-- t.Error("objectsAreEqual should return true")
-- }
-- if !ObjectsAreEqual(123, 123) {
-- t.Error("objectsAreEqual should return true")
-- }
-- if !ObjectsAreEqual(123.5, 123.5) {
-- t.Error("objectsAreEqual should return true")
-- }
-- if !ObjectsAreEqual([]byte("Hello World"), []byte("Hello World")) {
-- t.Error("objectsAreEqual should return true")
-- }
-- if !ObjectsAreEqual(nil, nil) {
-- t.Error("objectsAreEqual should return true")
-- }
+-#data
+-<body></br foo="bar"></body>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <br>
-
--}
+-#data
+-<bdy><br foo="bar"></body>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <bdy>
+-| <br>
+-| foo="bar"
-
--func TestImplements(t *testing.T) {
+-#data
+-<body></body></br foo="bar">
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <br>
-
-- mockT := new(testing.T)
+-#data
+-<bdy></body><br foo="bar">
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <bdy>
+-| <br>
+-| foo="bar"
-
-- if !Implements(mockT, (*AssertionTesterInterface)(nil), new(AssertionTesterConformingObject)) {
-- t.Error("Implements method should return true: AssertionTesterConformingObject implements AssertionTesterInterface")
-- }
-- if Implements(mockT, (*AssertionTesterInterface)(nil), new(AssertionTesterNonConformingObject)) {
-- t.Error("Implements method should return false: AssertionTesterNonConformingObject does not implements AssertionTesterInterface")
-- }
+-#data
+-<html><body></body></html><!-- Hi there -->
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <!-- Hi there -->
-
--}
+-#data
+-<html><body></body></html>x<!-- Hi there -->
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "x"
+-| <!-- Hi there -->
-
--func TestIsType(t *testing.T) {
+-#data
+-<html><body></body></html>x<!-- Hi there --></html><!-- Again -->
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "x"
+-| <!-- Hi there -->
+-| <!-- Again -->
-
-- mockT := new(testing.T)
+-#data
+-<html><body></body></html>x<!-- Hi there --></body></html><!-- Again -->
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "x"
+-| <!-- Hi there -->
+-| <!-- Again -->
-
-- if !IsType(mockT, new(AssertionTesterConformingObject), new(AssertionTesterConformingObject)) {
-- t.Error("IsType should return true: AssertionTesterConformingObject is the same type as AssertionTesterConformingObject")
-- }
-- if IsType(mockT, new(AssertionTesterConformingObject), new(AssertionTesterNonConformingObject)) {
-- t.Error("IsType should return false: AssertionTesterConformingObject is not the same type as AssertionTesterNonConformingObject")
-- }
+-#data
+-<html><body><ruby><div><rp>xx</rp></div></ruby></body></html>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <ruby>
+-| <div>
+-| <rp>
+-| "xx"
+-
+-#data
+-<html><body><ruby><div><rt>xx</rt></div></ruby></body></html>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <ruby>
+-| <div>
+-| <rt>
+-| "xx"
-
--}
+-#data
+-<html><frameset><!--1--><noframes>A</noframes><!--2--></frameset><!--3--><noframes>B</noframes><!--4--></html><!--5--><noframes>C</noframes><!--6-->
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <frameset>
+-| <!-- 1 -->
+-| <noframes>
+-| "A"
+-| <!-- 2 -->
+-| <!-- 3 -->
+-| <noframes>
+-| "B"
+-| <!-- 4 -->
+-| <noframes>
+-| "C"
+-| <!-- 5 -->
+-| <!-- 6 -->
-
--func TestEqual(t *testing.T) {
+-#data
+-<select><option>A<select><option>B<select><option>C<select><option>D<select><option>E<select><option>F<select><option>G<select>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <select>
+-| <option>
+-| "A"
+-| <option>
+-| "B"
+-| <select>
+-| <option>
+-| "C"
+-| <option>
+-| "D"
+-| <select>
+-| <option>
+-| "E"
+-| <option>
+-| "F"
+-| <select>
+-| <option>
+-| "G"
-
-- mockT := new(testing.T)
+-#data
+-<dd><dd><dt><dt><dd><li><li>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <dd>
+-| <dd>
+-| <dt>
+-| <dt>
+-| <dd>
+-| <li>
+-| <li>
-
-- if !Equal(mockT, "Hello World", "Hello World") {
-- t.Error("Equal should return true")
-- }
-- if !Equal(mockT, 123, 123) {
-- t.Error("Equal should return true")
-- }
-- if !Equal(mockT, 123.5, 123.5) {
-- t.Error("Equal should return true")
-- }
-- if !Equal(mockT, []byte("Hello World"), []byte("Hello World")) {
-- t.Error("Equal should return true")
-- }
-- if !Equal(mockT, nil, nil) {
-- t.Error("Equal should return true")
-- }
+-#data
+-<div><b></div><div><nobr>a<nobr>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| <b>
+-| <div>
+-| <b>
+-| <nobr>
+-| "a"
+-| <nobr>
-
--}
+-#data
+-<head></head>
+-<body></body>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| "
+-"
+-| <body>
-
--func TestNotNil(t *testing.T) {
+-#data
+-<head></head> <style></style>ddd
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <style>
+-| " "
+-| <body>
+-| "ddd"
-
-- mockT := new(testing.T)
+-#data
+-<kbd><table></kbd><col><select><tr>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <kbd>
+-| <select>
+-| <table>
+-| <colgroup>
+-| <col>
+-| <tbody>
+-| <tr>
-
-- if !NotNil(mockT, new(AssertionTesterConformingObject)) {
-- t.Error("NotNil should return true: object is not nil")
-- }
-- if NotNil(mockT, nil) {
-- t.Error("NotNil should return false: object is nil")
-- }
+-#data
+-<kbd><table></kbd><col><select><tr></table><div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <kbd>
+-| <select>
+-| <table>
+-| <colgroup>
+-| <col>
+-| <tbody>
+-| <tr>
+-| <div>
-
--}
+-#data
+-<a><li><style></style><title></title></a>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <a>
+-| <li>
+-| <a>
+-| <style>
+-| <title>
-
--func TestNil(t *testing.T) {
+-#data
+-<font></p><p><meta><title></title></font>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <font>
+-| <p>
+-| <p>
+-| <font>
+-| <meta>
+-| <title>
-
-- mockT := new(testing.T)
+-#data
+-<a><center><title></title><a>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <a>
+-| <center>
+-| <a>
+-| <title>
+-| <a>
-
-- if !Nil(mockT, nil) {
-- t.Error("Nil should return true: object is nil")
-- }
-- if Nil(mockT, new(AssertionTesterConformingObject)) {
-- t.Error("Nil should return false: object is not nil")
-- }
+-#data
+-<svg><title><div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| <svg title>
+-| <div>
-
--}
+-#data
+-<svg><title><rect><div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| <svg title>
+-| <rect>
+-| <div>
-
--func TestTrue(t *testing.T) {
+-#data
+-<svg><title><svg><div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| <svg title>
+-| <svg svg>
+-| <div>
-
-- mockT := new(testing.T)
+-#data
+-<img <="" FAIL>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <img>
+-| <=""
+-| fail=""
-
-- if !True(mockT, true) {
-- t.Error("True should return true")
-- }
-- if True(mockT, false) {
-- t.Error("True should return false")
-- }
+-#data
+-<ul><li><div id='foo'/>A</li><li>B<div>C</div></li></ul>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <ul>
+-| <li>
+-| <div>
+-| id="foo"
+-| "A"
+-| <li>
+-| "B"
+-| <div>
+-| "C"
-
--}
+-#data
+-<svg><em><desc></em>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| <em>
+-| <desc>
-
--func TestFalse(t *testing.T) {
+-#data
+-<table><tr><td><svg><desc><td></desc><circle>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| <svg svg>
+-| <svg desc>
+-| <td>
+-| <circle>
-
-- mockT := new(testing.T)
+-#data
+-<svg><tfoot></mi><td>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <svg svg>
+-| <svg tfoot>
+-| <svg td>
-
-- if !False(mockT, false) {
-- t.Error("False should return true")
-- }
-- if False(mockT, true) {
-- t.Error("False should return false")
-- }
+-#data
+-<math><mrow><mrow><mn>1</mn></mrow><mi>a</mi></mrow></math>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <math math>
+-| <math mrow>
+-| <math mrow>
+-| <math mn>
+-| "1"
+-| <math mi>
+-| "a"
-
--}
+-#data
+-<!doctype html><input type="hidden"><frameset>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <frameset>
-
--func TestExactly(t *testing.T) {
+-#data
+-<!doctype html><input type="button"><frameset>
+-#errors
+-#document
+-| <!DOCTYPE html>
+-| <html>
+-| <head>
+-| <body>
+-| <input>
+-| type="button"
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/webkit02.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/webkit02.dat
+deleted file mode 100644
+index 905783d..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/webkit02.dat
++++ /dev/null
+@@ -1,159 +0,0 @@
+-#data
+-<foo bar=qux/>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <foo>
+-| bar="qux/"
-
-- mockT := new(testing.T)
+-#data
+-<p id="status"><noscript><strong>A</strong></noscript><span>B</span></p>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <p>
+-| id="status"
+-| <noscript>
+-| "<strong>A</strong>"
+-| <span>
+-| "B"
-
-- a := float32(1)
-- b := float64(1)
-- c := float32(1)
-- d := float32(2)
+-#data
+-<div><sarcasm><div></div></sarcasm></div>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <div>
+-| <sarcasm>
+-| <div>
-
-- if Exactly(mockT, a, b) {
-- t.Error("Exactly should return false")
-- }
-- if Exactly(mockT, a, d) {
-- t.Error("Exactly should return false")
-- }
-- if !Exactly(mockT, a, c) {
-- t.Error("Exactly should return true")
-- }
+-#data
+-<html><body><img src="" border="0" alt="><div>A</div></body></html>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
-
-- if Exactly(mockT, nil, a) {
-- t.Error("Exactly should return false")
-- }
-- if Exactly(mockT, a, nil) {
-- t.Error("Exactly should return false")
-- }
+-#data
+-<table><td></tbody>A
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| "A"
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
-
--}
+-#data
+-<table><td></thead>A
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| "A"
-
--func TestNotEqual(t *testing.T) {
+-#data
+-<table><td></tfoot>A
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <tbody>
+-| <tr>
+-| <td>
+-| "A"
-
-- mockT := new(testing.T)
+-#data
+-<table><thead><td></tbody>A
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <table>
+-| <thead>
+-| <tr>
+-| <td>
+-| "A"
-
-- if !NotEqual(mockT, "Hello World", "Hello World!") {
-- t.Error("NotEqual should return true")
-- }
-- if !NotEqual(mockT, 123, 1234) {
-- t.Error("NotEqual should return true")
-- }
-- if !NotEqual(mockT, 123.5, 123.55) {
-- t.Error("NotEqual should return true")
-- }
-- if !NotEqual(mockT, []byte("Hello World"), []byte("Hello World!")) {
-- t.Error("NotEqual should return true")
-- }
-- if !NotEqual(mockT, nil, new(AssertionTesterConformingObject)) {
-- t.Error("NotEqual should return true")
-- }
--}
+-#data
+-<legend>test</legend>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <legend>
+-| "test"
-
--func TestContains(t *testing.T) {
+-#data
+-<table><input>
+-#errors
+-#document
+-| <html>
+-| <head>
+-| <body>
+-| <input>
+-| <table>
-
-- mockT := new(testing.T)
+-#data
+-<b><em><dcell><postfield><postfield><postfield><postfield><missing_glyph><missing_glyph><missing_glyph><missing_glyph><hkern><aside></b></em>
+-#errors
+-#document-fragment
+-div
+-#document
+-| <b>
+-| <em>
+-| <dcell>
+-| <postfield>
+-| <postfield>
+-| <postfield>
+-| <postfield>
+-| <missing_glyph>
+-| <missing_glyph>
+-| <missing_glyph>
+-| <missing_glyph>
+-| <hkern>
+-| <aside>
+-| <em>
+-| <b>
-
-- if !Contains(mockT, "Hello World", "Hello") {
-- t.Error("Contains should return true: \"Hello World\" contains \"Hello\"")
-- }
-- if Contains(mockT, "Hello World", "Salut") {
-- t.Error("Contains should return false: \"Hello World\" does not contain \"Salut\"")
-- }
+-#data
+-<isindex action="x">
+-#errors
+-#document-fragment
+-table
+-#document
+-| <form>
+-| action="x"
+-| <hr>
+-| <label>
+-| "This is a searchable index. Enter search keywords: "
+-| <input>
+-| name="isindex"
+-| <hr>
-
--}
+-#data
+-<option><XH<optgroup></optgroup>
+-#errors
+-#document-fragment
+-select
+-#document
+-| <option>
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/token.go b/Godeps/_workspace/src/golang.org/x/net/html/token.go
+deleted file mode 100644
+index 893e272..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/token.go
++++ /dev/null
+@@ -1,1219 +0,0 @@
+-// Copyright 2010 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
--func TestNotContains(t *testing.T) {
+-package html
-
-- mockT := new(testing.T)
+-import (
+- "bytes"
+- "errors"
+- "io"
+- "strconv"
+- "strings"
-
-- if !NotContains(mockT, "Hello World", "Hello!") {
-- t.Error("NotContains should return true: \"Hello World\" does not contain \"Hello!\"")
-- }
-- if NotContains(mockT, "Hello World", "Hello") {
-- t.Error("NotContains should return false: \"Hello World\" contains \"Hello\"")
-- }
+- "golang.org/x/net/html/atom"
+-)
-
--}
+-// A TokenType is the type of a Token.
+-type TokenType uint32
-
--func TestDidPanic(t *testing.T) {
+-const (
+- // ErrorToken means that an error occurred during tokenization.
+- ErrorToken TokenType = iota
+- // TextToken means a text node.
+- TextToken
+- // A StartTagToken looks like <a>.
+- StartTagToken
+- // An EndTagToken looks like </a>.
+- EndTagToken
+- // A SelfClosingTagToken tag looks like <br/>.
+- SelfClosingTagToken
+- // A CommentToken looks like <!--x-->.
+- CommentToken
+- // A DoctypeToken looks like <!DOCTYPE x>
+- DoctypeToken
+-)
-
-- if funcDidPanic, _ := didPanic(func() {
-- panic("Panic!")
-- }); !funcDidPanic {
-- t.Error("didPanic should return true")
-- }
+-// ErrBufferExceeded means that the buffering limit was exceeded.
+-var ErrBufferExceeded = errors.New("max buffer exceeded")
-
-- if funcDidPanic, _ := didPanic(func() {
-- }); funcDidPanic {
-- t.Error("didPanic should return false")
+-// String returns a string representation of the TokenType.
+-func (t TokenType) String() string {
+- switch t {
+- case ErrorToken:
+- return "Error"
+- case TextToken:
+- return "Text"
+- case StartTagToken:
+- return "StartTag"
+- case EndTagToken:
+- return "EndTag"
+- case SelfClosingTagToken:
+- return "SelfClosingTag"
+- case CommentToken:
+- return "Comment"
+- case DoctypeToken:
+- return "Doctype"
- }
--
+- return "Invalid(" + strconv.Itoa(int(t)) + ")"
-}
-
--func TestPanics(t *testing.T) {
--
-- mockT := new(testing.T)
--
-- if !Panics(mockT, func() {
-- panic("Panic!")
-- }) {
-- t.Error("Panics should return true")
-- }
--
-- if Panics(mockT, func() {
-- }) {
-- t.Error("Panics should return false")
-- }
--
+-// An Attribute is an attribute namespace-key-value triple. Namespace is
+-// non-empty for foreign attributes like xlink, Key is alphabetic (and hence
+-// does not contain escapable characters like '&', '<' or '>'), and Val is
+-// unescaped (it looks like "a<b" rather than "a<b").
+-//
+-// Namespace is only used by the parser, not the tokenizer.
+-type Attribute struct {
+- Namespace, Key, Val string
-}
-
--func TestNotPanics(t *testing.T) {
--
-- mockT := new(testing.T)
+-// A Token consists of a TokenType and some Data (tag name for start and end
+-// tags, content for text, comments and doctypes). A tag Token may also contain
+-// a slice of Attributes. Data is unescaped for all Tokens (it looks like "a<b"
+-// rather than "a<b"). For tag Tokens, DataAtom is the atom for Data, or
+-// zero if Data is not a known tag name.
+-type Token struct {
+- Type TokenType
+- DataAtom atom.Atom
+- Data string
+- Attr []Attribute
+-}
-
-- if !NotPanics(mockT, func() {
-- }) {
-- t.Error("NotPanics should return true")
+-// tagString returns a string representation of a tag Token's Data and Attr.
+-func (t Token) tagString() string {
+- if len(t.Attr) == 0 {
+- return t.Data
- }
--
-- if NotPanics(mockT, func() {
-- panic("Panic!")
-- }) {
-- t.Error("NotPanics should return false")
+- buf := bytes.NewBufferString(t.Data)
+- for _, a := range t.Attr {
+- buf.WriteByte(' ')
+- buf.WriteString(a.Key)
+- buf.WriteString(`="`)
+- escape(buf, a.Val)
+- buf.WriteByte('"')
- }
--
--}
--
--func TestEqual_Funcs(t *testing.T) {
--
-- type f func() int
-- var f1 f = func() int { return 1 }
-- var f2 f = func() int { return 2 }
--
-- var f1_copy f = f1
--
-- Equal(t, f1_copy, f1, "Funcs are the same and should be considered equal")
-- NotEqual(t, f1, f2, "f1 and f2 are different")
--
+- return buf.String()
-}
-
--func TestNoError(t *testing.T) {
--
-- mockT := new(testing.T)
--
-- // start with a nil error
-- var err error = nil
--
-- True(t, NoError(mockT, err), "NoError should return True for nil arg")
--
-- // now set an error
-- err = errors.New("Some error")
--
-- False(t, NoError(mockT, err), "NoError with error should return False")
--
+-// String returns a string representation of the Token.
+-func (t Token) String() string {
+- switch t.Type {
+- case ErrorToken:
+- return ""
+- case TextToken:
+- return EscapeString(t.Data)
+- case StartTagToken:
+- return "<" + t.tagString() + ">"
+- case EndTagToken:
+- return "</" + t.tagString() + ">"
+- case SelfClosingTagToken:
+- return "<" + t.tagString() + "/>"
+- case CommentToken:
+- return "<!--" + t.Data + "-->"
+- case DoctypeToken:
+- return "<!DOCTYPE " + t.Data + ">"
+- }
+- return "Invalid(" + strconv.Itoa(int(t.Type)) + ")"
-}
-
--func TestError(t *testing.T) {
--
-- mockT := new(testing.T)
--
-- // start with a nil error
-- var err error = nil
--
-- False(t, Error(mockT, err), "Error should return False for nil arg")
--
-- // now set an error
-- err = errors.New("Some error")
--
-- True(t, Error(mockT, err), "Error with error should return True")
--
+-// span is a range of bytes in a Tokenizer's buffer. The start is inclusive,
+-// the end is exclusive.
+-type span struct {
+- start, end int
-}
-
--func TestEqualError(t *testing.T) {
-- mockT := new(testing.T)
--
-- // start with a nil error
-- var err error = nil
-- False(t, EqualError(mockT, err, ""),
-- "EqualError should return false for nil arg")
--
-- // now set an error
-- err = errors.New("Some error")
-- False(t, EqualError(mockT, err, "Not some error"),
-- "EqualError should return false for different error string")
-- True(t, EqualError(mockT, err, "Some error"),
-- "EqualError should return true")
+-// A Tokenizer returns a stream of HTML Tokens.
+-type Tokenizer struct {
+- // r is the source of the HTML text.
+- r io.Reader
+- // tt is the TokenType of the current token.
+- tt TokenType
+- // err is the first error encountered during tokenization. It is possible
+- // for tt != Error && err != nil to hold: this means that Next returned a
+- // valid token but the subsequent Next call will return an error token.
+- // For example, if the HTML text input was just "plain", then the first
+- // Next call would set z.err to io.EOF but return a TextToken, and all
+- // subsequent Next calls would return an ErrorToken.
+- // err is never reset. Once it becomes non-nil, it stays non-nil.
+- err error
+- // readErr is the error returned by the io.Reader r. It is separate from
+- // err because it is valid for an io.Reader to return (n int, err1 error)
+- // such that n > 0 && err1 != nil, and callers should always process the
+- // n > 0 bytes before considering the error err1.
+- readErr error
+- // buf[raw.start:raw.end] holds the raw bytes of the current token.
+- // buf[raw.end:] is buffered input that will yield future tokens.
+- raw span
+- buf []byte
+- // maxBuf limits the data buffered in buf. A value of 0 means unlimited.
+- maxBuf int
+- // buf[data.start:data.end] holds the raw bytes of the current token's data:
+- // a text token's text, a tag token's tag name, etc.
+- data span
+- // pendingAttr is the attribute key and value currently being tokenized.
+- // When complete, pendingAttr is pushed onto attr. nAttrReturned is
+- // incremented on each call to TagAttr.
+- pendingAttr [2]span
+- attr [][2]span
+- nAttrReturned int
+- // rawTag is the "script" in "</script>" that closes the next token. If
+- // non-empty, the subsequent call to Next will return a raw or RCDATA text
+- // token: one that treats "<p>" as text instead of an element.
+- // rawTag's contents are lower-cased.
+- rawTag string
+- // textIsRaw is whether the current text token's data is not escaped.
+- textIsRaw bool
+- // convertNUL is whether NUL bytes in the current token's data should
+- // be converted into \ufffd replacement characters.
+- convertNUL bool
+- // allowCDATA is whether CDATA sections are allowed in the current context.
+- allowCDATA bool
-}
-
--func Test_isEmpty(t *testing.T) {
--
-- True(t, isEmpty(""))
-- True(t, isEmpty(nil))
-- True(t, isEmpty([]string{}))
-- True(t, isEmpty(0))
-- True(t, isEmpty(false))
-- True(t, isEmpty(map[string]string{}))
--
-- False(t, isEmpty("something"))
-- False(t, isEmpty(errors.New("something")))
-- False(t, isEmpty([]string{"something"}))
-- False(t, isEmpty(1))
-- False(t, isEmpty(true))
-- False(t, isEmpty(map[string]string{"Hello": "World"}))
--
+-// AllowCDATA sets whether or not the tokenizer recognizes <![CDATA[foo]]> as
+-// the text "foo". The default value is false, which means to recognize it as
+-// a bogus comment "<!-- [CDATA[foo]] -->" instead.
+-//
+-// Strictly speaking, an HTML5 compliant tokenizer should allow CDATA if and
+-// only if tokenizing foreign content, such as MathML and SVG. However,
+-// tracking foreign-contentness is difficult to do purely in the tokenizer,
+-// as opposed to the parser, due to HTML integration points: an <svg> element
+-// can contain a <foreignObject> that is foreign-to-SVG but not foreign-to-
+-// HTML. For strict compliance with the HTML5 tokenization algorithm, it is the
+-// responsibility of the user of a tokenizer to call AllowCDATA as appropriate.
+-// In practice, if using the tokenizer without caring whether MathML or SVG
+-// CDATA is text or comments, such as tokenizing HTML to find all the anchor
+-// text, it is acceptable to ignore this responsibility.
+-func (z *Tokenizer) AllowCDATA(allowCDATA bool) {
+- z.allowCDATA = allowCDATA
-}
-
--func TestEmpty(t *testing.T) {
--
-- mockT := new(testing.T)
--
-- True(t, Empty(mockT, ""), "Empty string is empty")
-- True(t, Empty(mockT, nil), "Nil is empty")
-- True(t, Empty(mockT, []string{}), "Empty string array is empty")
-- True(t, Empty(mockT, 0), "Zero int value is empty")
-- True(t, Empty(mockT, false), "False value is empty")
--
-- False(t, Empty(mockT, "something"), "Non Empty string is not empty")
-- False(t, Empty(mockT, errors.New("something")), "Non nil object is not empty")
-- False(t, Empty(mockT, []string{"something"}), "Non empty string array is not empty")
-- False(t, Empty(mockT, 1), "Non-zero int value is not empty")
-- False(t, Empty(mockT, true), "True value is not empty")
--
+-// NextIsNotRawText instructs the tokenizer that the next token should not be
+-// considered as 'raw text'. Some elements, such as script and title elements,
+-// normally require the next token after the opening tag to be 'raw text' that
+-// has no child elements. For example, tokenizing "<title>a<b>c</b>d</title>"
+-// yields a start tag token for "<title>", a text token for "a<b>c</b>d", and
+-// an end tag token for "</title>". There are no distinct start tag or end tag
+-// tokens for the "<b>" and "</b>".
+-//
+-// This tokenizer implementation will generally look for raw text at the right
+-// times. Strictly speaking, an HTML5 compliant tokenizer should not look for
+-// raw text if in foreign content: <title> generally needs raw text, but a
+-// <title> inside an <svg> does not. Another example is that a <textarea>
+-// generally needs raw text, but a <textarea> is not allowed as an immediate
+-// child of a <select>; in normal parsing, a <textarea> implies </select>, but
+-// one cannot close the implicit element when parsing a <select>'s InnerHTML.
+-// Similarly to AllowCDATA, tracking the correct moment to override raw-text-
+-// ness is difficult to do purely in the tokenizer, as opposed to the parser.
+-// For strict compliance with the HTML5 tokenization algorithm, it is the
+-// responsibility of the user of a tokenizer to call NextIsNotRawText as
+-// appropriate. In practice, like AllowCDATA, it is acceptable to ignore this
+-// responsibility for basic usage.
+-//
+-// Note that this 'raw text' concept is different from the one offered by the
+-// Tokenizer.Raw method.
+-func (z *Tokenizer) NextIsNotRawText() {
+- z.rawTag = ""
-}
-
--func TestNotEmpty(t *testing.T) {
--
-- mockT := new(testing.T)
--
-- False(t, NotEmpty(mockT, ""), "Empty string is empty")
-- False(t, NotEmpty(mockT, nil), "Nil is empty")
-- False(t, NotEmpty(mockT, []string{}), "Empty string array is empty")
-- False(t, NotEmpty(mockT, 0), "Zero int value is empty")
-- False(t, NotEmpty(mockT, false), "False value is empty")
--
-- True(t, NotEmpty(mockT, "something"), "Non Empty string is not empty")
-- True(t, NotEmpty(mockT, errors.New("something")), "Non nil object is not empty")
-- True(t, NotEmpty(mockT, []string{"something"}), "Non empty string array is not empty")
-- True(t, NotEmpty(mockT, 1), "Non-zero int value is not empty")
-- True(t, NotEmpty(mockT, true), "True value is not empty")
--
+-// Err returns the error associated with the most recent ErrorToken token.
+-// This is typically io.EOF, meaning the end of tokenization.
+-func (z *Tokenizer) Err() error {
+- if z.tt != ErrorToken {
+- return nil
+- }
+- return z.err
-}
-
--func TestWithinDuration(t *testing.T) {
--
-- mockT := new(testing.T)
-- a := time.Now()
-- b := a.Add(10 * time.Second)
--
-- True(t, WithinDuration(mockT, a, b, 10*time.Second), "A 10s difference is within a 10s time difference")
-- True(t, WithinDuration(mockT, b, a, 10*time.Second), "A 10s difference is within a 10s time difference")
--
-- False(t, WithinDuration(mockT, a, b, 9*time.Second), "A 10s difference is not within a 9s time difference")
-- False(t, WithinDuration(mockT, b, a, 9*time.Second), "A 10s difference is not within a 9s time difference")
--
-- False(t, WithinDuration(mockT, a, b, -9*time.Second), "A 10s difference is not within a 9s time difference")
-- False(t, WithinDuration(mockT, b, a, -9*time.Second), "A 10s difference is not within a 9s time difference")
--
-- False(t, WithinDuration(mockT, a, b, -11*time.Second), "A 10s difference is not within a 9s time difference")
-- False(t, WithinDuration(mockT, b, a, -11*time.Second), "A 10s difference is not within a 9s time difference")
--}
-diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/assert/doc.go b/Godeps/_workspace/src/github.com/stretchr/testify/assert/doc.go
-deleted file mode 100644
-index 25f699b..0000000
---- a/Godeps/_workspace/src/github.com/stretchr/testify/assert/doc.go
-+++ /dev/null
-@@ -1,74 +0,0 @@
--// A set of comprehensive testing tools for use with the normal Go testing system.
--//
--// Example Usage
--//
--// The following is a complete example using assert in a standard test function:
--// import (
--// "testing"
--// "github.com/stretchr/testify/assert"
--// )
--//
--// func TestSomething(t *testing.T) {
--//
--// var a string = "Hello"
--// var b string = "Hello"
--//
--// assert.Equal(t, a, b, "The two words should be the same.")
--//
--// }
--//
--// Assertions
--//
--// Assertions allow you to easily write test code, and are global funcs in the `assert` package.
--// All assertion functions take, as the first argument, the `*testing.T` object provided by the
--// testing framework. This allows the assertion funcs to write the failings and other details to
--// the correct place.
--//
--// Every assertion function also takes an optional string message as the final argument,
--// allowing custom error messages to be appended to the message the assertion method outputs.
--//
--// Here is an overview of the assert functions:
--//
--// assert.Equal(t, expected, actual [, message [, format-args])
--//
--// assert.NotEqual(t, notExpected, actual [, message [, format-args]])
--//
--// assert.True(t, actualBool [, message [, format-args]])
--//
--// assert.False(t, actualBool [, message [, format-args]])
--//
--// assert.Nil(t, actualObject [, message [, format-args]])
--//
--// assert.NotNil(t, actualObject [, message [, format-args]])
--//
--// assert.Empty(t, actualObject [, message [, format-args]])
--//
--// assert.NotEmpty(t, actualObject [, message [, format-args]])
--//
--// assert.Error(t, errorObject [, message [, format-args]])
--//
--// assert.NoError(t, errorObject [, message [, format-args]])
--//
--// assert.Implements(t, (*MyInterface)(nil), new(MyObject) [,message [, format-args]])
--//
--// assert.IsType(t, expectedObject, actualObject [, message [, format-args]])
--//
--// assert.Contains(t, string, substring [, message [, format-args]])
--//
--// assert.NotContains(t, string, substring [, message [, format-args]])
--//
--// assert.Panics(t, func(){
--//
--// // call code that should panic
--//
--// } [, message [, format-args]])
--//
--// assert.NotPanics(t, func(){
--//
--// // call code that should not panic
--//
--// } [, message [, format-args]])
--//
--// assert.WithinDuration(t, timeA, timeB, deltaTime, [, message [, format-args]])
+-// readByte returns the next byte from the input stream, doing a buffered read
+-// from z.r into z.buf if necessary. z.buf[z.raw.start:z.raw.end] remains a contiguous byte
+-// slice that holds all the bytes read so far for the current token.
+-// It sets z.err if the underlying reader returns an error.
+-// Pre-condition: z.err == nil.
+-func (z *Tokenizer) readByte() byte {
+- if z.raw.end >= len(z.buf) {
+- // Our buffer is exhausted and we have to read from z.r. Check if the
+- // previous read resulted in an error.
+- if z.readErr != nil {
+- z.err = z.readErr
+- return 0
+- }
+- // We copy z.buf[z.raw.start:z.raw.end] to the beginning of z.buf. If the length
+- // z.raw.end - z.raw.start is more than half the capacity of z.buf, then we
+- // allocate a new buffer before the copy.
+- c := cap(z.buf)
+- d := z.raw.end - z.raw.start
+- var buf1 []byte
+- if 2*d > c {
+- buf1 = make([]byte, d, 2*c)
+- } else {
+- buf1 = z.buf[:d]
+- }
+- copy(buf1, z.buf[z.raw.start:z.raw.end])
+- if x := z.raw.start; x != 0 {
+- // Adjust the data/attr spans to refer to the same contents after the copy.
+- z.data.start -= x
+- z.data.end -= x
+- z.pendingAttr[0].start -= x
+- z.pendingAttr[0].end -= x
+- z.pendingAttr[1].start -= x
+- z.pendingAttr[1].end -= x
+- for i := range z.attr {
+- z.attr[i][0].start -= x
+- z.attr[i][0].end -= x
+- z.attr[i][1].start -= x
+- z.attr[i][1].end -= x
+- }
+- }
+- z.raw.start, z.raw.end, z.buf = 0, d, buf1[:d]
+- // Now that we have copied the live bytes to the start of the buffer,
+- // we read from z.r into the remainder.
+- var n int
+- n, z.readErr = readAtLeastOneByte(z.r, buf1[d:cap(buf1)])
+- if n == 0 {
+- z.err = z.readErr
+- return 0
+- }
+- z.buf = buf1[:d+n]
+- }
+- x := z.buf[z.raw.end]
+- z.raw.end++
+- if z.maxBuf > 0 && z.raw.end-z.raw.start >= z.maxBuf {
+- z.err = ErrBufferExceeded
+- return 0
+- }
+- return x
+-}
-
--package assert
-diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/assert/errors.go b/Godeps/_workspace/src/github.com/stretchr/testify/assert/errors.go
-deleted file mode 100644
-index da004d1..0000000
---- a/Godeps/_workspace/src/github.com/stretchr/testify/assert/errors.go
-+++ /dev/null
-@@ -1,10 +0,0 @@
--package assert
+-// Buffered returns a slice containing data buffered but not yet tokenized.
+-func (z *Tokenizer) Buffered() []byte {
+- return z.buf[z.raw.end:]
+-}
-
--import (
-- "errors"
--)
+-// readAtLeastOneByte wraps an io.Reader so that reading cannot return (0, nil).
+-// It returns io.ErrNoProgress if the underlying r.Read method returns (0, nil)
+-// too many times in succession.
+-func readAtLeastOneByte(r io.Reader, b []byte) (int, error) {
+- for i := 0; i < 100; i++ {
+- n, err := r.Read(b)
+- if n != 0 || err != nil {
+- return n, err
+- }
+- }
+- return 0, io.ErrNoProgress
+-}
-
--// AnError is an error instance useful for testing. If the code does not care
--// about error specifics, and only needs to return the error for example, this
--// error should be used to make the test code more readable.
--var AnError error = errors.New("assert.AnError general error for testing.")
-diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/mock/doc.go b/Godeps/_workspace/src/github.com/stretchr/testify/mock/doc.go
-deleted file mode 100644
-index 7d4e7b8..0000000
---- a/Godeps/_workspace/src/github.com/stretchr/testify/mock/doc.go
-+++ /dev/null
-@@ -1,43 +0,0 @@
--// Provides a system by which it is possible to mock your objects and verify calls are happening as expected.
--//
--// Example Usage
--//
--// The mock package provides an object, Mock, that tracks activity on another object. It is usually
--// embedded into a test object as shown below:
--//
--// type MyTestObject struct {
--// // add a Mock object instance
--// mock.Mock
--//
--// // other fields go here as normal
--// }
--//
--// When implementing the methods of an interface, you wire your functions up
--// to call the Mock.Called(args...) method, and return the appropriate values.
--//
--// For example, to mock a method that saves the name and age of a person and returns
--// the year of their birth or an error, you might write this:
--//
--// func (o *MyTestObject) SavePersonDetails(firstname, lastname string, age int) (int, error) {
--// args := o.Mock.Called(firstname, lastname, age)
--// return args.Int(0), args.Error(1)
--// }
--//
--// The Int, Error and Bool methods are examples of strongly typed getters that take the argument
--// index position. Given this argument list:
--//
--// (12, true, "Something")
--//
--// You could read them out strongly typed like this:
--//
--// args.Int(0)
--// args.Bool(1)
--// args.String(2)
--//
--// For objects of your own type, use the generic Arguments.Get(index) method and make a type assertion:
--//
--// return args.Get(0).(*MyObject), args.Get(1).(*AnotherObjectOfMine)
--//
--// This may cause a panic if the object you are getting is nil (the type assertion will fail), in those
--// cases you should check for nil first.
--package mock
-diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/mock/mock.go b/Godeps/_workspace/src/github.com/stretchr/testify/mock/mock.go
-deleted file mode 100644
-index 4320e6f..0000000
---- a/Godeps/_workspace/src/github.com/stretchr/testify/mock/mock.go
-+++ /dev/null
-@@ -1,505 +0,0 @@
--package mock
+-// skipWhiteSpace skips past any white space.
+-func (z *Tokenizer) skipWhiteSpace() {
+- if z.err != nil {
+- return
+- }
+- for {
+- c := z.readByte()
+- if z.err != nil {
+- return
+- }
+- switch c {
+- case ' ', '\n', '\r', '\t', '\f':
+- // No-op.
+- default:
+- z.raw.end--
+- return
+- }
+- }
+-}
-
--import (
-- "fmt"
-- "github.com/stretchr/objx"
-- "github.com/stretchr/testify/assert"
-- "reflect"
-- "runtime"
-- "strings"
--)
+-// readRawOrRCDATA reads until the next "</foo>", where "foo" is z.rawTag and
+-// is typically something like "script" or "textarea".
+-func (z *Tokenizer) readRawOrRCDATA() {
+- if z.rawTag == "script" {
+- z.readScript()
+- z.textIsRaw = true
+- z.rawTag = ""
+- return
+- }
+-loop:
+- for {
+- c := z.readByte()
+- if z.err != nil {
+- break loop
+- }
+- if c != '<' {
+- continue loop
+- }
+- c = z.readByte()
+- if z.err != nil {
+- break loop
+- }
+- if c != '/' {
+- continue loop
+- }
+- if z.readRawEndTag() || z.err != nil {
+- break loop
+- }
+- }
+- z.data.end = z.raw.end
+- // A textarea's or title's RCDATA can contain escaped entities.
+- z.textIsRaw = z.rawTag != "textarea" && z.rawTag != "title"
+- z.rawTag = ""
+-}
-
--// TestingT is an interface wrapper around *testing.T
--type TestingT interface {
-- Logf(format string, args ...interface{})
-- Errorf(format string, args ...interface{})
+-// readRawEndTag attempts to read a tag like "</foo>", where "foo" is z.rawTag.
+-// If it succeeds, it backs up the input position to reconsume the tag and
+-// returns true. Otherwise it returns false. The opening "</" has already been
+-// consumed.
+-func (z *Tokenizer) readRawEndTag() bool {
+- for i := 0; i < len(z.rawTag); i++ {
+- c := z.readByte()
+- if z.err != nil {
+- return false
+- }
+- if c != z.rawTag[i] && c != z.rawTag[i]-('a'-'A') {
+- z.raw.end--
+- return false
+- }
+- }
+- c := z.readByte()
+- if z.err != nil {
+- return false
+- }
+- switch c {
+- case ' ', '\n', '\r', '\t', '\f', '/', '>':
+- // The 3 is 2 for the leading "</" plus 1 for the trailing character c.
+- z.raw.end -= 3 + len(z.rawTag)
+- return true
+- }
+- z.raw.end--
+- return false
-}
-
--/*
-- Call
--*/
+-// readScript reads until the next </script> tag, following the byzantine
+-// rules for escaping/hiding the closing tag.
+-func (z *Tokenizer) readScript() {
+- defer func() {
+- z.data.end = z.raw.end
+- }()
+- var c byte
-
--// Call represents a method call and is used for setting expectations,
--// as well as recording activity.
--type Call struct {
+-scriptData:
+- c = z.readByte()
+- if z.err != nil {
+- return
+- }
+- if c == '<' {
+- goto scriptDataLessThanSign
+- }
+- goto scriptData
-
-- // The name of the method that was or will be called.
-- Method string
+-scriptDataLessThanSign:
+- c = z.readByte()
+- if z.err != nil {
+- return
+- }
+- switch c {
+- case '/':
+- goto scriptDataEndTagOpen
+- case '!':
+- goto scriptDataEscapeStart
+- }
+- z.raw.end--
+- goto scriptData
-
-- // Holds the arguments of the method.
-- Arguments Arguments
+-scriptDataEndTagOpen:
+- if z.readRawEndTag() || z.err != nil {
+- return
+- }
+- goto scriptData
-
-- // Holds the arguments that should be returned when
-- // this method is called.
-- ReturnArguments Arguments
+-scriptDataEscapeStart:
+- c = z.readByte()
+- if z.err != nil {
+- return
+- }
+- if c == '-' {
+- goto scriptDataEscapeStartDash
+- }
+- z.raw.end--
+- goto scriptData
-
-- // The number of times to return the return arguments when setting
-- // expectations. 0 means to always return the value.
-- Repeatability int
--}
+-scriptDataEscapeStartDash:
+- c = z.readByte()
+- if z.err != nil {
+- return
+- }
+- if c == '-' {
+- goto scriptDataEscapedDashDash
+- }
+- z.raw.end--
+- goto scriptData
-
--// Mock is the workhorse used to track activity on another object.
--// For an example of its usage, refer to the "Example Usage" section at the top of this document.
--type Mock struct {
+-scriptDataEscaped:
+- c = z.readByte()
+- if z.err != nil {
+- return
+- }
+- switch c {
+- case '-':
+- goto scriptDataEscapedDash
+- case '<':
+- goto scriptDataEscapedLessThanSign
+- }
+- goto scriptDataEscaped
-
-- // The method name that is currently
-- // being referred to by the On method.
-- onMethodName string
+-scriptDataEscapedDash:
+- c = z.readByte()
+- if z.err != nil {
+- return
+- }
+- switch c {
+- case '-':
+- goto scriptDataEscapedDashDash
+- case '<':
+- goto scriptDataEscapedLessThanSign
+- }
+- goto scriptDataEscaped
-
-- // An array of the arguments that are
-- // currently being referred to by the On method.
-- onMethodArguments Arguments
+-scriptDataEscapedDashDash:
+- c = z.readByte()
+- if z.err != nil {
+- return
+- }
+- switch c {
+- case '-':
+- goto scriptDataEscapedDashDash
+- case '<':
+- goto scriptDataEscapedLessThanSign
+- case '>':
+- goto scriptData
+- }
+- goto scriptDataEscaped
-
-- // Represents the calls that are expected of
-- // an object.
-- ExpectedCalls []Call
+-scriptDataEscapedLessThanSign:
+- c = z.readByte()
+- if z.err != nil {
+- return
+- }
+- if c == '/' {
+- goto scriptDataEscapedEndTagOpen
+- }
+- if 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' {
+- goto scriptDataDoubleEscapeStart
+- }
+- z.raw.end--
+- goto scriptData
-
-- // Holds the calls that were made to this mocked object.
-- Calls []Call
+-scriptDataEscapedEndTagOpen:
+- if z.readRawEndTag() || z.err != nil {
+- return
+- }
+- goto scriptDataEscaped
-
-- // TestData holds any data that might be useful for testing. Testify ignores
-- // this data completely allowing you to do whatever you like with it.
-- testData objx.Map
--}
+-scriptDataDoubleEscapeStart:
+- z.raw.end--
+- for i := 0; i < len("script"); i++ {
+- c = z.readByte()
+- if z.err != nil {
+- return
+- }
+- if c != "script"[i] && c != "SCRIPT"[i] {
+- z.raw.end--
+- goto scriptDataEscaped
+- }
+- }
+- c = z.readByte()
+- if z.err != nil {
+- return
+- }
+- switch c {
+- case ' ', '\n', '\r', '\t', '\f', '/', '>':
+- goto scriptDataDoubleEscaped
+- }
+- z.raw.end--
+- goto scriptDataEscaped
-
--// TestData holds any data that might be useful for testing. Testify ignores
--// this data completely allowing you to do whatever you like with it.
--func (m *Mock) TestData() objx.Map {
+-scriptDataDoubleEscaped:
+- c = z.readByte()
+- if z.err != nil {
+- return
+- }
+- switch c {
+- case '-':
+- goto scriptDataDoubleEscapedDash
+- case '<':
+- goto scriptDataDoubleEscapedLessThanSign
+- }
+- goto scriptDataDoubleEscaped
-
-- if m.testData == nil {
-- m.testData = make(objx.Map)
+-scriptDataDoubleEscapedDash:
+- c = z.readByte()
+- if z.err != nil {
+- return
+- }
+- switch c {
+- case '-':
+- goto scriptDataDoubleEscapedDashDash
+- case '<':
+- goto scriptDataDoubleEscapedLessThanSign
- }
+- goto scriptDataDoubleEscaped
-
-- return m.testData
--}
+-scriptDataDoubleEscapedDashDash:
+- c = z.readByte()
+- if z.err != nil {
+- return
+- }
+- switch c {
+- case '-':
+- goto scriptDataDoubleEscapedDashDash
+- case '<':
+- goto scriptDataDoubleEscapedLessThanSign
+- case '>':
+- goto scriptData
+- }
+- goto scriptDataDoubleEscaped
-
--/*
-- Setting expectations
--*/
+-scriptDataDoubleEscapedLessThanSign:
+- c = z.readByte()
+- if z.err != nil {
+- return
+- }
+- if c == '/' {
+- goto scriptDataDoubleEscapeEnd
+- }
+- z.raw.end--
+- goto scriptDataDoubleEscaped
-
--// On starts a description of an expectation of the specified method
--// being called.
--//
--// Mock.On("MyMethod", arg1, arg2)
--func (m *Mock) On(methodName string, arguments ...interface{}) *Mock {
-- m.onMethodName = methodName
-- m.onMethodArguments = arguments
-- return m
+-scriptDataDoubleEscapeEnd:
+- if z.readRawEndTag() {
+- z.raw.end += len("</script>")
+- goto scriptDataEscaped
+- }
+- if z.err != nil {
+- return
+- }
+- goto scriptDataDoubleEscaped
-}
-
--// Return finishes a description of an expectation of the method (and arguments)
--// specified in the most recent On method call.
--//
--// Mock.On("MyMethod", arg1, arg2).Return(returnArg1, returnArg2)
--func (m *Mock) Return(returnArguments ...interface{}) *Mock {
-- m.ExpectedCalls = append(m.ExpectedCalls, Call{m.onMethodName, m.onMethodArguments, returnArguments, 0})
-- return m
+-// readComment reads the next comment token starting with "<!--". The opening
+-// "<!--" has already been consumed.
+-func (z *Tokenizer) readComment() {
+- z.data.start = z.raw.end
+- defer func() {
+- if z.data.end < z.data.start {
+- // It's a comment with no data, like <!-->.
+- z.data.end = z.data.start
+- }
+- }()
+- for dashCount := 2; ; {
+- c := z.readByte()
+- if z.err != nil {
+- // Ignore up to two dashes at EOF.
+- if dashCount > 2 {
+- dashCount = 2
+- }
+- z.data.end = z.raw.end - dashCount
+- return
+- }
+- switch c {
+- case '-':
+- dashCount++
+- continue
+- case '>':
+- if dashCount >= 2 {
+- z.data.end = z.raw.end - len("-->")
+- return
+- }
+- case '!':
+- if dashCount >= 2 {
+- c = z.readByte()
+- if z.err != nil {
+- z.data.end = z.raw.end
+- return
+- }
+- if c == '>' {
+- z.data.end = z.raw.end - len("--!>")
+- return
+- }
+- }
+- }
+- dashCount = 0
+- }
-}
-
--// Once indicates that that the mock should only return the value once.
--//
--// Mock.On("MyMethod", arg1, arg2).Return(returnArg1, returnArg2).Once()
--func (m *Mock) Once() {
-- m.ExpectedCalls[len(m.ExpectedCalls)-1].Repeatability = 1
+-// readUntilCloseAngle reads until the next ">".
+-func (z *Tokenizer) readUntilCloseAngle() {
+- z.data.start = z.raw.end
+- for {
+- c := z.readByte()
+- if z.err != nil {
+- z.data.end = z.raw.end
+- return
+- }
+- if c == '>' {
+- z.data.end = z.raw.end - len(">")
+- return
+- }
+- }
-}
-
--// Twice indicates that that the mock should only return the value twice.
--//
--// Mock.On("MyMethod", arg1, arg2).Return(returnArg1, returnArg2).Twice()
--func (m *Mock) Twice() {
-- m.ExpectedCalls[len(m.ExpectedCalls)-1].Repeatability = 2
+-// readMarkupDeclaration reads the next token starting with "<!". It might be
+-// a "<!--comment-->", a "<!DOCTYPE foo>", a "<![CDATA[section]]>" or
+-// "<!a bogus comment". The opening "<!" has already been consumed.
+-func (z *Tokenizer) readMarkupDeclaration() TokenType {
+- z.data.start = z.raw.end
+- var c [2]byte
+- for i := 0; i < 2; i++ {
+- c[i] = z.readByte()
+- if z.err != nil {
+- z.data.end = z.raw.end
+- return CommentToken
+- }
+- }
+- if c[0] == '-' && c[1] == '-' {
+- z.readComment()
+- return CommentToken
+- }
+- z.raw.end -= 2
+- if z.readDoctype() {
+- return DoctypeToken
+- }
+- if z.allowCDATA && z.readCDATA() {
+- z.convertNUL = true
+- return TextToken
+- }
+- // It's a bogus comment.
+- z.readUntilCloseAngle()
+- return CommentToken
-}
-
--// Times indicates that that the mock should only return the indicated number
--// of times.
--//
--// Mock.On("MyMethod", arg1, arg2).Return(returnArg1, returnArg2).Times(5)
--func (m *Mock) Times(i int) {
-- m.ExpectedCalls[len(m.ExpectedCalls)-1].Repeatability = i
+-// readDoctype attempts to read a doctype declaration and returns true if
+-// successful. The opening "<!" has already been consumed.
+-func (z *Tokenizer) readDoctype() bool {
+- const s = "DOCTYPE"
+- for i := 0; i < len(s); i++ {
+- c := z.readByte()
+- if z.err != nil {
+- z.data.end = z.raw.end
+- return false
+- }
+- if c != s[i] && c != s[i]+('a'-'A') {
+- // Back up to read the fragment of "DOCTYPE" again.
+- z.raw.end = z.data.start
+- return false
+- }
+- }
+- if z.skipWhiteSpace(); z.err != nil {
+- z.data.start = z.raw.end
+- z.data.end = z.raw.end
+- return true
+- }
+- z.readUntilCloseAngle()
+- return true
-}
-
--/*
-- Recording and responding to activity
--*/
--
--func (m *Mock) findExpectedCall(method string, arguments ...interface{}) (int, *Call) {
-- for i, call := range m.ExpectedCalls {
-- if call.Method == method && call.Repeatability > -1 {
--
-- _, diffCount := call.Arguments.Diff(arguments)
-- if diffCount == 0 {
-- return i, &call
+-// readCDATA attempts to read a CDATA section and returns true if
+-// successful. The opening "<!" has already been consumed.
+-func (z *Tokenizer) readCDATA() bool {
+- const s = "[CDATA["
+- for i := 0; i < len(s); i++ {
+- c := z.readByte()
+- if z.err != nil {
+- z.data.end = z.raw.end
+- return false
+- }
+- if c != s[i] {
+- // Back up to read the fragment of "[CDATA[" again.
+- z.raw.end = z.data.start
+- return false
+- }
+- }
+- z.data.start = z.raw.end
+- brackets := 0
+- for {
+- c := z.readByte()
+- if z.err != nil {
+- z.data.end = z.raw.end
+- return true
+- }
+- switch c {
+- case ']':
+- brackets++
+- case '>':
+- if brackets >= 2 {
+- z.data.end = z.raw.end - len("]]>")
+- return true
- }
--
+- brackets = 0
+- default:
+- brackets = 0
- }
- }
-- return -1, nil
-}
-
--func (m *Mock) findClosestCall(method string, arguments ...interface{}) (bool, *Call) {
--
-- diffCount := 0
-- var closestCall *Call = nil
--
-- for _, call := range m.ExpectedCalls {
-- if call.Method == method {
--
-- _, tempDiffCount := call.Arguments.Diff(arguments)
-- if tempDiffCount < diffCount || diffCount == 0 {
-- diffCount = tempDiffCount
-- closestCall = &call
+-// startTagIn returns whether the start tag in z.buf[z.data.start:z.data.end]
+-// case-insensitively matches any element of ss.
+-func (z *Tokenizer) startTagIn(ss ...string) bool {
+-loop:
+- for _, s := range ss {
+- if z.data.end-z.data.start != len(s) {
+- continue loop
+- }
+- for i := 0; i < len(s); i++ {
+- c := z.buf[z.data.start+i]
+- if 'A' <= c && c <= 'Z' {
+- c += 'a' - 'A'
+- }
+- if c != s[i] {
+- continue loop
- }
--
- }
+- return true
- }
+- return false
+-}
-
-- if closestCall == nil {
-- return false, nil
+-// readStartTag reads the next start tag token. The opening "<a" has already
+-// been consumed, where 'a' means anything in [A-Za-z].
+-func (z *Tokenizer) readStartTag() TokenType {
+- z.readTag(true)
+- if z.err != nil {
+- return ErrorToken
- }
--
-- return true, closestCall
+- // Several tags flag the tokenizer's next token as raw.
+- c, raw := z.buf[z.data.start], false
+- if 'A' <= c && c <= 'Z' {
+- c += 'a' - 'A'
+- }
+- switch c {
+- case 'i':
+- raw = z.startTagIn("iframe")
+- case 'n':
+- raw = z.startTagIn("noembed", "noframes", "noscript")
+- case 'p':
+- raw = z.startTagIn("plaintext")
+- case 's':
+- raw = z.startTagIn("script", "style")
+- case 't':
+- raw = z.startTagIn("textarea", "title")
+- case 'x':
+- raw = z.startTagIn("xmp")
+- }
+- if raw {
+- z.rawTag = strings.ToLower(string(z.buf[z.data.start:z.data.end]))
+- }
+- // Look for a self-closing token like "<br/>".
+- if z.err == nil && z.buf[z.raw.end-2] == '/' {
+- return SelfClosingTagToken
+- }
+- return StartTagToken
-}
-
--func callString(method string, arguments Arguments, includeArgumentValues bool) string {
--
-- var argValsString string = ""
-- if includeArgumentValues {
-- var argVals []string
-- for argIndex, arg := range arguments {
-- argVals = append(argVals, fmt.Sprintf("%d: %v", argIndex, arg))
+-// readTag reads the next tag token and its attributes. If saveAttr, those
+-// attributes are saved in z.attr, otherwise z.attr is set to an empty slice.
+-// The opening "<a" or "</a" has already been consumed, where 'a' means anything
+-// in [A-Za-z].
+-func (z *Tokenizer) readTag(saveAttr bool) {
+- z.attr = z.attr[:0]
+- z.nAttrReturned = 0
+- // Read the tag name and attribute key/value pairs.
+- z.readTagName()
+- if z.skipWhiteSpace(); z.err != nil {
+- return
+- }
+- for {
+- c := z.readByte()
+- if z.err != nil || c == '>' {
+- break
+- }
+- z.raw.end--
+- z.readTagAttrKey()
+- z.readTagAttrVal()
+- // Save pendingAttr if saveAttr and that attribute has a non-empty key.
+- if saveAttr && z.pendingAttr[0].start != z.pendingAttr[0].end {
+- z.attr = append(z.attr, z.pendingAttr)
+- }
+- if z.skipWhiteSpace(); z.err != nil {
+- break
- }
-- argValsString = fmt.Sprintf("\n\t\t%s", strings.Join(argVals, "\n\t\t"))
- }
--
-- return fmt.Sprintf("%s(%s)%s", method, arguments.String(), argValsString)
-}
-
--// Called tells the mock object that a method has been called, and gets an array
--// of arguments to return. Panics if the call is unexpected (i.e. not preceeded by
--// appropriate .On .Return() calls)
--func (m *Mock) Called(arguments ...interface{}) Arguments {
+-// readTagName sets z.data to the "div" in "<div k=v>". The reader (z.raw.end)
+-// is positioned such that the first byte of the tag name (the "d" in "<div")
+-// has already been consumed.
+-func (z *Tokenizer) readTagName() {
+- z.data.start = z.raw.end - 1
+- for {
+- c := z.readByte()
+- if z.err != nil {
+- z.data.end = z.raw.end
+- return
+- }
+- switch c {
+- case ' ', '\n', '\r', '\t', '\f':
+- z.data.end = z.raw.end - 1
+- return
+- case '/', '>':
+- z.raw.end--
+- z.data.end = z.raw.end
+- return
+- }
+- }
+-}
-
-- // get the calling function's name
-- pc, _, _, ok := runtime.Caller(1)
-- if !ok {
-- panic("Couldn't get the caller information")
+-// readTagAttrKey sets z.pendingAttr[0] to the "k" in "<div k=v>".
+-// Precondition: z.err == nil.
+-func (z *Tokenizer) readTagAttrKey() {
+- z.pendingAttr[0].start = z.raw.end
+- for {
+- c := z.readByte()
+- if z.err != nil {
+- z.pendingAttr[0].end = z.raw.end
+- return
+- }
+- switch c {
+- case ' ', '\n', '\r', '\t', '\f', '/':
+- z.pendingAttr[0].end = z.raw.end - 1
+- return
+- case '=', '>':
+- z.raw.end--
+- z.pendingAttr[0].end = z.raw.end
+- return
+- }
- }
-- functionPath := runtime.FuncForPC(pc).Name()
-- parts := strings.Split(functionPath, ".")
-- functionName := parts[len(parts)-1]
+-}
-
-- found, call := m.findExpectedCall(functionName, arguments...)
+-// readTagAttrVal sets z.pendingAttr[1] to the "v" in "<div k=v>".
+-func (z *Tokenizer) readTagAttrVal() {
+- z.pendingAttr[1].start = z.raw.end
+- z.pendingAttr[1].end = z.raw.end
+- if z.skipWhiteSpace(); z.err != nil {
+- return
+- }
+- c := z.readByte()
+- if z.err != nil {
+- return
+- }
+- if c != '=' {
+- z.raw.end--
+- return
+- }
+- if z.skipWhiteSpace(); z.err != nil {
+- return
+- }
+- quote := z.readByte()
+- if z.err != nil {
+- return
+- }
+- switch quote {
+- case '>':
+- z.raw.end--
+- return
-
-- switch {
-- case found < 0:
-- // we have to fail here - because we don't know what to do
-- // as the return arguments. This is because:
-- //
-- // a) this is a totally unexpected call to this method,
-- // b) the arguments are not what was expected, or
-- // c) the developer has forgotten to add an accompanying On...Return pair.
+- case '\'', '"':
+- z.pendingAttr[1].start = z.raw.end
+- for {
+- c := z.readByte()
+- if z.err != nil {
+- z.pendingAttr[1].end = z.raw.end
+- return
+- }
+- if c == quote {
+- z.pendingAttr[1].end = z.raw.end - 1
+- return
+- }
+- }
-
-- closestFound, closestCall := m.findClosestCall(functionName, arguments...)
+- default:
+- z.pendingAttr[1].start = z.raw.end - 1
+- for {
+- c := z.readByte()
+- if z.err != nil {
+- z.pendingAttr[1].end = z.raw.end
+- return
+- }
+- switch c {
+- case ' ', '\n', '\r', '\t', '\f':
+- z.pendingAttr[1].end = z.raw.end - 1
+- return
+- case '>':
+- z.raw.end--
+- z.pendingAttr[1].end = z.raw.end
+- return
+- }
+- }
+- }
+-}
-
-- if closestFound {
-- panic(fmt.Sprintf("\n\nmock: Unexpected Method Call\n-----------------------------\n\n%s\n\nThe closest call I have is: \n\n%s\n", callString(functionName, arguments, true), callString(functionName, closestCall.Arguments, true)))
+-// Next scans the next token and returns its type.
+-func (z *Tokenizer) Next() TokenType {
+- z.raw.start = z.raw.end
+- z.data.start = z.raw.end
+- z.data.end = z.raw.end
+- if z.err != nil {
+- z.tt = ErrorToken
+- return z.tt
+- }
+- if z.rawTag != "" {
+- if z.rawTag == "plaintext" {
+- // Read everything up to EOF.
+- for z.err == nil {
+- z.readByte()
+- }
+- z.data.end = z.raw.end
+- z.textIsRaw = true
- } else {
-- panic(fmt.Sprintf("\nassert: mock: I don't know what to return because the method call was unexpected.\n\tEither do Mock.On(\"%s\").Return(...) first, or remove the %s() call.\n\tThis method was unexpected:\n\t\t%s\n\tat: %s", functionName, functionName, callString(functionName, arguments, true), assert.CallerInfo()))
+- z.readRawOrRCDATA()
+- }
+- if z.data.end > z.data.start {
+- z.tt = TextToken
+- z.convertNUL = true
+- return z.tt
- }
-- case call.Repeatability == 1:
-- call.Repeatability = -1
-- m.ExpectedCalls[found] = *call
-- case call.Repeatability > 1:
-- call.Repeatability -= 1
-- m.ExpectedCalls[found] = *call
- }
+- z.textIsRaw = false
+- z.convertNUL = false
-
-- // add the call
-- m.Calls = append(m.Calls, Call{functionName, arguments, make([]interface{}, 0), 0})
+-loop:
+- for {
+- c := z.readByte()
+- if z.err != nil {
+- break loop
+- }
+- if c != '<' {
+- continue loop
+- }
-
-- return call.ReturnArguments
+- // Check if the '<' we have just read is part of a tag, comment
+- // or doctype. If not, it's part of the accumulated text token.
+- c = z.readByte()
+- if z.err != nil {
+- break loop
+- }
+- var tokenType TokenType
+- switch {
+- case 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z':
+- tokenType = StartTagToken
+- case c == '/':
+- tokenType = EndTagToken
+- case c == '!' || c == '?':
+- // We use CommentToken to mean any of "<!--actual comments-->",
+- // "<!DOCTYPE declarations>" and "<?xml processing instructions?>".
+- tokenType = CommentToken
+- default:
+- // Reconsume the current character.
+- z.raw.end--
+- continue
+- }
-
+- // We have a non-text token, but we might have accumulated some text
+- // before that. If so, we return the text first, and return the non-
+- // text token on the subsequent call to Next.
+- if x := z.raw.end - len("<a"); z.raw.start < x {
+- z.raw.end = x
+- z.data.end = x
+- z.tt = TextToken
+- return z.tt
+- }
+- switch tokenType {
+- case StartTagToken:
+- z.tt = z.readStartTag()
+- return z.tt
+- case EndTagToken:
+- c = z.readByte()
+- if z.err != nil {
+- break loop
+- }
+- if c == '>' {
+- // "</>" does not generate a token at all. Generate an empty comment
+- // to allow passthrough clients to pick up the data using Raw.
+- // Reset the tokenizer state and start again.
+- z.tt = CommentToken
+- return z.tt
+- }
+- if 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' {
+- z.readTag(false)
+- if z.err != nil {
+- z.tt = ErrorToken
+- } else {
+- z.tt = EndTagToken
+- }
+- return z.tt
+- }
+- z.raw.end--
+- z.readUntilCloseAngle()
+- z.tt = CommentToken
+- return z.tt
+- case CommentToken:
+- if c == '!' {
+- z.tt = z.readMarkupDeclaration()
+- return z.tt
+- }
+- z.raw.end--
+- z.readUntilCloseAngle()
+- z.tt = CommentToken
+- return z.tt
+- }
+- }
+- if z.raw.start < z.raw.end {
+- z.data.end = z.raw.end
+- z.tt = TextToken
+- return z.tt
+- }
+- z.tt = ErrorToken
+- return z.tt
-}
-
--/*
-- Assertions
--*/
--
--// AssertExpectationsForObjects asserts that everything specified with On and Return
--// of the specified objects was in fact called as expected.
--//
--// Calls may have occurred in any order.
--func AssertExpectationsForObjects(t TestingT, testObjects ...interface{}) bool {
-- var success bool = true
-- for _, obj := range testObjects {
-- mockObj := obj.(Mock)
-- success = success && mockObj.AssertExpectations(t)
-- }
-- return success
+-// Raw returns the unmodified text of the current token. Calling Next, Token,
+-// Text, TagName or TagAttr may change the contents of the returned slice.
+-func (z *Tokenizer) Raw() []byte {
+- return z.buf[z.raw.start:z.raw.end]
-}
-
--// AssertExpectations asserts that everything specified with On and Return was
--// in fact called as expected. Calls may have occurred in any order.
--func (m *Mock) AssertExpectations(t TestingT) bool {
+-// convertNewlines converts "\r" and "\r\n" in s to "\n".
+-// The conversion happens in place, but the resulting slice may be shorter.
+-func convertNewlines(s []byte) []byte {
+- for i, c := range s {
+- if c != '\r' {
+- continue
+- }
-
-- var somethingMissing bool = false
-- var failedExpectations int = 0
+- src := i + 1
+- if src >= len(s) || s[src] != '\n' {
+- s[i] = '\n'
+- continue
+- }
-
-- // iterate through each expectation
-- for _, expectedCall := range m.ExpectedCalls {
-- switch {
-- case !m.methodWasCalled(expectedCall.Method, expectedCall.Arguments):
-- somethingMissing = true
-- failedExpectations++
-- t.Logf("\u274C\t%s(%s)", expectedCall.Method, expectedCall.Arguments.String())
-- case expectedCall.Repeatability > 0:
-- somethingMissing = true
-- failedExpectations++
-- default:
-- t.Logf("\u2705\t%s(%s)", expectedCall.Method, expectedCall.Arguments.String())
+- dst := i
+- for src < len(s) {
+- if s[src] == '\r' {
+- if src+1 < len(s) && s[src+1] == '\n' {
+- src++
+- }
+- s[dst] = '\n'
+- } else {
+- s[dst] = s[src]
+- }
+- src++
+- dst++
- }
+- return s[:dst]
- }
+- return s
+-}
-
-- if somethingMissing {
-- t.Errorf("FAIL: %d out of %d expectation(s) were met.\n\tThe code you are testing needs to make %d more call(s).\n\tat: %s", len(m.ExpectedCalls)-failedExpectations, len(m.ExpectedCalls), failedExpectations, assert.CallerInfo())
-- }
+-var (
+- nul = []byte("\x00")
+- replacement = []byte("\ufffd")
+-)
-
-- return !somethingMissing
+-// Text returns the unescaped text of a text, comment or doctype token. The
+-// contents of the returned slice may change on the next call to Next.
+-func (z *Tokenizer) Text() []byte {
+- switch z.tt {
+- case TextToken, CommentToken, DoctypeToken:
+- s := z.buf[z.data.start:z.data.end]
+- z.data.start = z.raw.end
+- z.data.end = z.raw.end
+- s = convertNewlines(s)
+- if (z.convertNUL || z.tt == CommentToken) && bytes.Contains(s, nul) {
+- s = bytes.Replace(s, nul, replacement, -1)
+- }
+- if !z.textIsRaw {
+- s = unescape(s, false)
+- }
+- return s
+- }
+- return nil
-}
-
--// AssertNumberOfCalls asserts that the method was called expectedCalls times.
--func (m *Mock) AssertNumberOfCalls(t TestingT, methodName string, expectedCalls int) bool {
-- var actualCalls int = 0
-- for _, call := range m.Calls {
-- if call.Method == methodName {
-- actualCalls++
+-// TagName returns the lower-cased name of a tag token (the `img` out of
+-// `<IMG SRC="foo">`) and whether the tag has attributes.
+-// The contents of the returned slice may change on the next call to Next.
+-func (z *Tokenizer) TagName() (name []byte, hasAttr bool) {
+- if z.data.start < z.data.end {
+- switch z.tt {
+- case StartTagToken, EndTagToken, SelfClosingTagToken:
+- s := z.buf[z.data.start:z.data.end]
+- z.data.start = z.raw.end
+- z.data.end = z.raw.end
+- return lower(s), z.nAttrReturned < len(z.attr)
- }
- }
-- return assert.Equal(t, actualCalls, expectedCalls, fmt.Sprintf("Expected number of calls (%d) does not match the actual number of calls (%d).", expectedCalls, actualCalls))
+- return nil, false
-}
-
--// AssertCalled asserts that the method was called.
--func (m *Mock) AssertCalled(t TestingT, methodName string, arguments ...interface{}) bool {
-- if !assert.True(t, m.methodWasCalled(methodName, arguments), fmt.Sprintf("The \"%s\" method should have been called with %d argument(s), but was not.", methodName, len(arguments))) {
-- t.Logf("%s", m.ExpectedCalls)
-- return false
+-// TagAttr returns the lower-cased key and unescaped value of the next unparsed
+-// attribute for the current tag token and whether there are more attributes.
+-// The contents of the returned slices may change on the next call to Next.
+-func (z *Tokenizer) TagAttr() (key, val []byte, moreAttr bool) {
+- if z.nAttrReturned < len(z.attr) {
+- switch z.tt {
+- case StartTagToken, SelfClosingTagToken:
+- x := z.attr[z.nAttrReturned]
+- z.nAttrReturned++
+- key = z.buf[x[0].start:x[0].end]
+- val = z.buf[x[1].start:x[1].end]
+- return lower(key), unescape(convertNewlines(val), true), z.nAttrReturned < len(z.attr)
+- }
- }
-- return true
+- return nil, nil, false
-}
-
--// AssertNotCalled asserts that the method was not called.
--func (m *Mock) AssertNotCalled(t TestingT, methodName string, arguments ...interface{}) bool {
-- if !assert.False(t, m.methodWasCalled(methodName, arguments), fmt.Sprintf("The \"%s\" method was called with %d argument(s), but should NOT have been.", methodName, len(arguments))) {
-- t.Logf("%s", m.ExpectedCalls)
-- return false
+-// Token returns the next Token. The result's Data and Attr values remain valid
+-// after subsequent Next calls.
+-func (z *Tokenizer) Token() Token {
+- t := Token{Type: z.tt}
+- switch z.tt {
+- case TextToken, CommentToken, DoctypeToken:
+- t.Data = string(z.Text())
+- case StartTagToken, SelfClosingTagToken, EndTagToken:
+- name, moreAttr := z.TagName()
+- for moreAttr {
+- var key, val []byte
+- key, val, moreAttr = z.TagAttr()
+- t.Attr = append(t.Attr, Attribute{"", atom.String(key), string(val)})
+- }
+- if a := atom.Lookup(name); a != 0 {
+- t.DataAtom, t.Data = a, a.String()
+- } else {
+- t.DataAtom, t.Data = 0, string(name)
+- }
- }
-- return true
+- return t
-}
-
--func (m *Mock) methodWasCalled(methodName string, arguments []interface{}) bool {
-- for _, call := range m.Calls {
-- if call.Method == methodName {
--
-- _, differences := call.Arguments.Diff(arguments)
+-// SetMaxBuf sets a limit on the amount of data buffered during tokenization.
+-// A value of 0 means unlimited.
+-func (z *Tokenizer) SetMaxBuf(n int) {
+- z.maxBuf = n
+-}
-
-- if differences == 0 {
-- // found the expected call
-- return true
-- }
+-// NewTokenizer returns a new HTML Tokenizer for the given Reader.
+-// The input is assumed to be UTF-8 encoded.
+-func NewTokenizer(r io.Reader) *Tokenizer {
+- return NewTokenizerFragment(r, "")
+-}
-
+-// NewTokenizerFragment returns a new HTML Tokenizer for the given Reader, for
+-// tokenizing an existing element's InnerHTML fragment. contextTag is that
+-// element's tag, such as "div" or "iframe".
+-//
+-// For example, how the InnerHTML "a<b" is tokenized depends on whether it is
+-// for a <p> tag or a <script> tag.
+-//
+-// The input is assumed to be UTF-8 encoded.
+-func NewTokenizerFragment(r io.Reader, contextTag string) *Tokenizer {
+- z := &Tokenizer{
+- r: r,
+- buf: make([]byte, 0, 4096),
+- }
+- if contextTag != "" {
+- switch s := strings.ToLower(contextTag); s {
+- case "iframe", "noembed", "noframes", "noscript", "plaintext", "script", "style", "title", "textarea", "xmp":
+- z.rawTag = s
- }
- }
-- // we didn't find the expected call
-- return false
+- return z
-}
+diff --git a/Godeps/_workspace/src/golang.org/x/net/html/token_test.go b/Godeps/_workspace/src/golang.org/x/net/html/token_test.go
+deleted file mode 100644
+index f6988a8..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/html/token_test.go
++++ /dev/null
+@@ -1,748 +0,0 @@
+-// Copyright 2010 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
--/*
-- Arguments
--*/
--
--// Arguments holds an array of method arguments or return values.
--type Arguments []interface{}
+-package html
-
--const (
-- // The "any" argument. Used in Diff and Assert when
-- // the argument being tested shouldn't be taken into consideration.
-- Anything string = "mock.Anything"
+-import (
+- "bytes"
+- "io"
+- "io/ioutil"
+- "reflect"
+- "runtime"
+- "strings"
+- "testing"
-)
-
--// AnythingOfTypeArgument is a string that contains the type of an argument
--// for use when type checking. Used in Diff and Assert.
--type AnythingOfTypeArgument string
--
--// AnythingOfType returns an AnythingOfTypeArgument object containing the
--// name of the type to check for. Used in Diff and Assert.
--//
--// For example:
--// Assert(t, AnythingOfType("string"), AnythingOfType("int"))
--func AnythingOfType(t string) AnythingOfTypeArgument {
-- return AnythingOfTypeArgument(t)
--}
--
--// Get Returns the argument at the specified index.
--func (args Arguments) Get(index int) interface{} {
-- if index+1 > len(args) {
-- panic(fmt.Sprintf("assert: arguments: Cannot call Get(%d) because there are %d argument(s).", index, len(args)))
-- }
-- return args[index]
+-type tokenTest struct {
+- // A short description of the test case.
+- desc string
+- // The HTML to parse.
+- html string
+- // The string representations of the expected tokens, joined by '$'.
+- golden string
-}
-
--// Is gets whether the objects match the arguments specified.
--func (args Arguments) Is(objects ...interface{}) bool {
-- for i, obj := range args {
-- if obj != objects[i] {
-- return false
-- }
-- }
-- return true
+-var tokenTests = []tokenTest{
+- {
+- "empty",
+- "",
+- "",
+- },
+- // A single text node. The tokenizer should not break text nodes on whitespace,
+- // nor should it normalize whitespace within a text node.
+- {
+- "text",
+- "foo bar",
+- "foo bar",
+- },
+- // An entity.
+- {
+- "entity",
+- "one < two",
+- "one < two",
+- },
+- // A start, self-closing and end tag. The tokenizer does not care if the start
+- // and end tokens don't match; that is the job of the parser.
+- {
+- "tags",
+- "<a>b<c/>d</e>",
+- "<a>$b$<c/>$d$</e>",
+- },
+- // Angle brackets that aren't a tag.
+- {
+- "not a tag #0",
+- "<",
+- "<",
+- },
+- {
+- "not a tag #1",
+- "</",
+- "</",
+- },
+- {
+- "not a tag #2",
+- "</>",
+- "<!---->",
+- },
+- {
+- "not a tag #3",
+- "a</>b",
+- "a$<!---->$b",
+- },
+- {
+- "not a tag #4",
+- "</ >",
+- "<!-- -->",
+- },
+- {
+- "not a tag #5",
+- "</.",
+- "<!--.-->",
+- },
+- {
+- "not a tag #6",
+- "</.>",
+- "<!--.-->",
+- },
+- {
+- "not a tag #7",
+- "a < b",
+- "a < b",
+- },
+- {
+- "not a tag #8",
+- "<.>",
+- "<.>",
+- },
+- {
+- "not a tag #9",
+- "a<<<b>>>c",
+- "a<<$<b>$>>c",
+- },
+- {
+- "not a tag #10",
+- "if x<0 and y < 0 then x*y>0",
+- "if x<0 and y < 0 then x*y>0",
+- },
+- {
+- "not a tag #11",
+- "<<p>",
+- "<$<p>",
+- },
+- // EOF in a tag name.
+- {
+- "tag name eof #0",
+- "<a",
+- "",
+- },
+- {
+- "tag name eof #1",
+- "<a ",
+- "",
+- },
+- {
+- "tag name eof #2",
+- "a<b",
+- "a",
+- },
+- {
+- "tag name eof #3",
+- "<a><b",
+- "<a>",
+- },
+- {
+- "tag name eof #4",
+- `<a x`,
+- ``,
+- },
+- // Some malformed tags that are missing a '>'.
+- {
+- "malformed tag #0",
+- `<p</p>`,
+- `<p< p="">`,
+- },
+- {
+- "malformed tag #1",
+- `<p </p>`,
+- `<p <="" p="">`,
+- },
+- {
+- "malformed tag #2",
+- `<p id`,
+- ``,
+- },
+- {
+- "malformed tag #3",
+- `<p id=`,
+- ``,
+- },
+- {
+- "malformed tag #4",
+- `<p id=>`,
+- `<p id="">`,
+- },
+- {
+- "malformed tag #5",
+- `<p id=0`,
+- ``,
+- },
+- {
+- "malformed tag #6",
+- `<p id=0</p>`,
+- `<p id="0</p">`,
+- },
+- {
+- "malformed tag #7",
+- `<p id="0</p>`,
+- ``,
+- },
+- {
+- "malformed tag #8",
+- `<p id="0"</p>`,
+- `<p id="0" <="" p="">`,
+- },
+- {
+- "malformed tag #9",
+- `<p></p id`,
+- `<p>`,
+- },
+- // Raw text and RCDATA.
+- {
+- "basic raw text",
+- "<script><a></b></script>",
+- "<script>$<a></b>$</script>",
+- },
+- {
+- "unfinished script end tag",
+- "<SCRIPT>a</SCR",
+- "<script>$a</SCR",
+- },
+- {
+- "broken script end tag",
+- "<SCRIPT>a</SCR ipt>",
+- "<script>$a</SCR ipt>",
+- },
+- {
+- "EOF in script end tag",
+- "<SCRIPT>a</SCRipt",
+- "<script>$a</SCRipt",
+- },
+- {
+- "scriptx end tag",
+- "<SCRIPT>a</SCRiptx",
+- "<script>$a</SCRiptx",
+- },
+- {
+- "' ' completes script end tag",
+- "<SCRIPT>a</SCRipt ",
+- "<script>$a",
+- },
+- {
+- "'>' completes script end tag",
+- "<SCRIPT>a</SCRipt>",
+- "<script>$a$</script>",
+- },
+- {
+- "self-closing script end tag",
+- "<SCRIPT>a</SCRipt/>",
+- "<script>$a$</script>",
+- },
+- {
+- "nested script tag",
+- "<SCRIPT>a</SCRipt<script>",
+- "<script>$a</SCRipt<script>",
+- },
+- {
+- "script end tag after unfinished",
+- "<SCRIPT>a</SCRipt</script>",
+- "<script>$a</SCRipt$</script>",
+- },
+- {
+- "script/style mismatched tags",
+- "<script>a</style>",
+- "<script>$a</style>",
+- },
+- {
+- "style element with entity",
+- "<style>'",
+- "<style>$&apos;",
+- },
+- {
+- "textarea with tag",
+- "<textarea><div></textarea>",
+- "<textarea>$<div>$</textarea>",
+- },
+- {
+- "title with tag and entity",
+- "<title><b>K&R C</b></title>",
+- "<title>$<b>K&R C</b>$</title>",
+- },
+- // DOCTYPE tests.
+- {
+- "Proper DOCTYPE",
+- "<!DOCTYPE html>",
+- "<!DOCTYPE html>",
+- },
+- {
+- "DOCTYPE with no space",
+- "<!doctypehtml>",
+- "<!DOCTYPE html>",
+- },
+- {
+- "DOCTYPE with two spaces",
+- "<!doctype html>",
+- "<!DOCTYPE html>",
+- },
+- {
+- "looks like DOCTYPE but isn't",
+- "<!DOCUMENT html>",
+- "<!--DOCUMENT html-->",
+- },
+- {
+- "DOCTYPE at EOF",
+- "<!DOCtype",
+- "<!DOCTYPE >",
+- },
+- // XML processing instructions.
+- {
+- "XML processing instruction",
+- "<?xml?>",
+- "<!--?xml?-->",
+- },
+- // Comments.
+- {
+- "comment0",
+- "abc<b><!-- skipme --></b>def",
+- "abc$<b>$<!-- skipme -->$</b>$def",
+- },
+- {
+- "comment1",
+- "a<!-->z",
+- "a$<!---->$z",
+- },
+- {
+- "comment2",
+- "a<!--->z",
+- "a$<!---->$z",
+- },
+- {
+- "comment3",
+- "a<!--x>-->z",
+- "a$<!--x>-->$z",
+- },
+- {
+- "comment4",
+- "a<!--x->-->z",
+- "a$<!--x->-->$z",
+- },
+- {
+- "comment5",
+- "a<!>z",
+- "a$<!---->$z",
+- },
+- {
+- "comment6",
+- "a<!->z",
+- "a$<!----->$z",
+- },
+- {
+- "comment7",
+- "a<!---<>z",
+- "a$<!---<>z-->",
+- },
+- {
+- "comment8",
+- "a<!--z",
+- "a$<!--z-->",
+- },
+- {
+- "comment9",
+- "a<!--z-",
+- "a$<!--z-->",
+- },
+- {
+- "comment10",
+- "a<!--z--",
+- "a$<!--z-->",
+- },
+- {
+- "comment11",
+- "a<!--z---",
+- "a$<!--z--->",
+- },
+- {
+- "comment12",
+- "a<!--z----",
+- "a$<!--z---->",
+- },
+- {
+- "comment13",
+- "a<!--x--!>z",
+- "a$<!--x-->$z",
+- },
+- // An attribute with a backslash.
+- {
+- "backslash",
+- `<p id="a\"b">`,
+- `<p id="a\" b"="">`,
+- },
+- // Entities, tag name and attribute key lower-casing, and whitespace
+- // normalization within a tag.
+- {
+- "tricky",
+- "<p \t\n iD=\"a"B\" foo=\"bar\"><EM>te<&;xt</em></p>",
+- `<p id="a"B" foo="bar">$<em>$te<&;xt$</em>$</p>`,
+- },
+- // A nonexistent entity. Tokenizing and converting back to a string should
+- // escape the "&" to become "&".
+- {
+- "noSuchEntity",
+- `<a b="c&noSuchEntity;d"><&alsoDoesntExist;&`,
+- `<a b="c&noSuchEntity;d">$<&alsoDoesntExist;&`,
+- },
+- {
+- "entity without semicolon",
+- `¬it;∉<a b="q=z&=5¬ice=hello¬=world">`,
+- `¬it;∉$<a b="q=z&amp=5&notice=hello¬=world">`,
+- },
+- {
+- "entity with digits",
+- "½",
+- "½",
+- },
+- // Attribute tests:
+- // http://dev.w3.org/html5/spec/Overview.html#attributes-0
+- {
+- "Empty attribute",
+- `<input disabled FOO>`,
+- `<input disabled="" foo="">`,
+- },
+- {
+- "Empty attribute, whitespace",
+- `<input disabled FOO >`,
+- `<input disabled="" foo="">`,
+- },
+- {
+- "Unquoted attribute value",
+- `<input value=yes FOO=BAR>`,
+- `<input value="yes" foo="BAR">`,
+- },
+- {
+- "Unquoted attribute value, spaces",
+- `<input value = yes FOO = BAR>`,
+- `<input value="yes" foo="BAR">`,
+- },
+- {
+- "Unquoted attribute value, trailing space",
+- `<input value=yes FOO=BAR >`,
+- `<input value="yes" foo="BAR">`,
+- },
+- {
+- "Single-quoted attribute value",
+- `<input value='yes' FOO='BAR'>`,
+- `<input value="yes" foo="BAR">`,
+- },
+- {
+- "Single-quoted attribute value, trailing space",
+- `<input value='yes' FOO='BAR' >`,
+- `<input value="yes" foo="BAR">`,
+- },
+- {
+- "Double-quoted attribute value",
+- `<input value="I'm an attribute" FOO="BAR">`,
+- `<input value="I'm an attribute" foo="BAR">`,
+- },
+- {
+- "Attribute name characters",
+- `<meta http-equiv="content-type">`,
+- `<meta http-equiv="content-type">`,
+- },
+- {
+- "Mixed attributes",
+- `a<P V="0 1" w='2' X=3 y>z`,
+- `a$<p v="0 1" w="2" x="3" y="">$z`,
+- },
+- {
+- "Attributes with a solitary single quote",
+- `<p id=can't><p id=won't>`,
+- `<p id="can't">$<p id="won't">`,
+- },
-}
-
--// Diff gets a string describing the differences between the arguments
--// and the specified objects.
--//
--// Returns the diff string and number of differences found.
--func (args Arguments) Diff(objects []interface{}) (string, int) {
--
-- var output string = "\n"
-- var differences int
--
-- var maxArgCount int = len(args)
-- if len(objects) > maxArgCount {
-- maxArgCount = len(objects)
-- }
--
-- for i := 0; i < maxArgCount; i++ {
-- var actual, expected interface{}
--
-- if len(objects) <= i {
-- actual = "(Missing)"
-- } else {
-- actual = objects[i]
-- }
--
-- if len(args) <= i {
-- expected = "(Missing)"
-- } else {
-- expected = args[i]
-- }
--
-- if reflect.TypeOf(expected) == reflect.TypeOf((*AnythingOfTypeArgument)(nil)).Elem() {
--
-- // type checking
-- if reflect.TypeOf(actual).Name() != string(expected.(AnythingOfTypeArgument)) && reflect.TypeOf(actual).String() != string(expected.(AnythingOfTypeArgument)) {
-- // not match
-- differences++
-- output = fmt.Sprintf("%s\t%d: \u274C type %s != type %s - %s\n", output, i, expected, reflect.TypeOf(actual).Name(), actual)
-- }
--
-- } else {
--
-- // normal checking
--
-- if assert.ObjectsAreEqual(expected, Anything) || assert.ObjectsAreEqual(actual, Anything) || assert.ObjectsAreEqual(actual, expected) {
-- // match
-- output = fmt.Sprintf("%s\t%d: \u2705 %s == %s\n", output, i, actual, expected)
-- } else {
-- // not match
-- differences++
-- output = fmt.Sprintf("%s\t%d: \u274C %s != %s\n", output, i, actual, expected)
+-func TestTokenizer(t *testing.T) {
+-loop:
+- for _, tt := range tokenTests {
+- z := NewTokenizer(strings.NewReader(tt.html))
+- if tt.golden != "" {
+- for i, s := range strings.Split(tt.golden, "$") {
+- if z.Next() == ErrorToken {
+- t.Errorf("%s token %d: want %q got error %v", tt.desc, i, s, z.Err())
+- continue loop
+- }
+- actual := z.Token().String()
+- if s != actual {
+- t.Errorf("%s token %d: want %q got %q", tt.desc, i, s, actual)
+- continue loop
+- }
- }
- }
--
-- }
--
-- if differences == 0 {
-- return "No differences.", differences
-- }
--
-- return output, differences
--
--}
--
--// Assert compares the arguments with the specified objects and fails if
--// they do not exactly match.
--func (args Arguments) Assert(t TestingT, objects ...interface{}) bool {
--
-- // get the differences
-- diff, diffCount := args.Diff(objects)
--
-- if diffCount == 0 {
-- return true
-- }
--
-- // there are differences... report them...
-- t.Logf(diff)
-- t.Errorf("%sArguments do not match.", assert.CallerInfo())
--
-- return false
--
--}
--
--// String gets the argument at the specified index. Panics if there is no argument, or
--// if the argument is of the wrong type.
--//
--// If no index is provided, String() returns a complete string representation
--// of the arguments.
--func (args Arguments) String(indexOrNil ...int) string {
--
-- if len(indexOrNil) == 0 {
-- // normal String() method - return a string representation of the args
-- var argsStr []string
-- for _, arg := range args {
-- argsStr = append(argsStr, fmt.Sprintf("%s", reflect.TypeOf(arg)))
-- }
-- return strings.Join(argsStr, ",")
-- } else if len(indexOrNil) == 1 {
-- // Index has been specified - get the argument at that index
-- var index int = indexOrNil[0]
-- var s string
-- var ok bool
-- if s, ok = args.Get(index).(string); !ok {
-- panic(fmt.Sprintf("assert: arguments: String(%d) failed because object wasn't correct type: %s", index, args.Get(index)))
+- z.Next()
+- if z.Err() != io.EOF {
+- t.Errorf("%s: want EOF got %q", tt.desc, z.Err())
- }
-- return s
-- }
--
-- panic(fmt.Sprintf("assert: arguments: Wrong number of arguments passed to String. Must be 0 or 1, not %d", len(indexOrNil)))
--
--}
--
--// Int gets the argument at the specified index. Panics if there is no argument, or
--// if the argument is of the wrong type.
--func (args Arguments) Int(index int) int {
-- var s int
-- var ok bool
-- if s, ok = args.Get(index).(int); !ok {
-- panic(fmt.Sprintf("assert: arguments: Int(%d) failed because object wasn't correct type: %s", index, args.Get(index)))
-- }
-- return s
--}
--
--// Error gets the argument at the specified index. Panics if there is no argument, or
--// if the argument is of the wrong type.
--func (args Arguments) Error(index int) error {
-- obj := args.Get(index)
-- var s error
-- var ok bool
-- if obj == nil {
-- return nil
-- }
-- if s, ok = obj.(error); !ok {
-- panic(fmt.Sprintf("assert: arguments: Error(%d) failed because object wasn't correct type: %s", index, args.Get(index)))
-- }
-- return s
--}
--
--// Bool gets the argument at the specified index. Panics if there is no argument, or
--// if the argument is of the wrong type.
--func (args Arguments) Bool(index int) bool {
-- var s bool
-- var ok bool
-- if s, ok = args.Get(index).(bool); !ok {
-- panic(fmt.Sprintf("assert: arguments: Bool(%d) failed because object wasn't correct type: %s", index, args.Get(index)))
-- }
-- return s
--}
-diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/mock/mock_test.go b/Godeps/_workspace/src/github.com/stretchr/testify/mock/mock_test.go
-deleted file mode 100644
-index cd06451..0000000
---- a/Godeps/_workspace/src/github.com/stretchr/testify/mock/mock_test.go
-+++ /dev/null
-@@ -1,657 +0,0 @@
--package mock
--
--import (
-- "errors"
-- "github.com/stretchr/testify/assert"
-- "testing"
--)
--
--/*
-- Test objects
--*/
--
--// ExampleInterface represents an example interface.
--type ExampleInterface interface {
-- TheExampleMethod(a, b, c int) (int, error)
--}
--
--// TestExampleImplementation is a test implementation of ExampleInterface
--type TestExampleImplementation struct {
-- Mock
--}
--
--func (i *TestExampleImplementation) TheExampleMethod(a, b, c int) (int, error) {
-- args := i.Mock.Called(a, b, c)
-- return args.Int(0), errors.New("Whoops")
--}
--
--func (i *TestExampleImplementation) TheExampleMethod2(yesorno bool) {
-- i.Mock.Called(yesorno)
--}
--
--type ExampleType struct{}
--
--func (i *TestExampleImplementation) TheExampleMethod3(et *ExampleType) error {
-- args := i.Mock.Called(et)
-- return args.Error(0)
--}
--
--/*
-- Mock
--*/
--
--func Test_Mock_TestData(t *testing.T) {
--
-- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
--
-- if assert.NotNil(t, mockedService.TestData()) {
--
-- mockedService.TestData().Set("something", 123)
-- assert.Equal(t, 123, mockedService.TestData().Get("something").Data())
--
-- }
--
--}
--
--func Test_Mock_On(t *testing.T) {
--
-- // make a test impl object
-- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
--
-- assert.Equal(t, mockedService.Mock.On("TheExampleMethod"), &mockedService.Mock)
-- assert.Equal(t, "TheExampleMethod", mockedService.Mock.onMethodName)
--
--}
--
--func Test_Mock_On_WithArgs(t *testing.T) {
--
-- // make a test impl object
-- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
--
-- assert.Equal(t, mockedService.Mock.On("TheExampleMethod", 1, 2, 3), &mockedService.Mock)
-- assert.Equal(t, "TheExampleMethod", mockedService.Mock.onMethodName)
-- assert.Equal(t, 1, mockedService.Mock.onMethodArguments[0])
-- assert.Equal(t, 2, mockedService.Mock.onMethodArguments[1])
-- assert.Equal(t, 3, mockedService.Mock.onMethodArguments[2])
--
--}
--
--func Test_Mock_Return(t *testing.T) {
--
-- // make a test impl object
-- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
--
-- assert.Equal(t, mockedService.Mock.On("TheExampleMethod", "A", "B", true).Return(1, "two", true), &mockedService.Mock)
--
-- // ensure the call was created
-- if assert.Equal(t, 1, len(mockedService.Mock.ExpectedCalls)) {
-- call := mockedService.Mock.ExpectedCalls[0]
--
-- assert.Equal(t, "TheExampleMethod", call.Method)
-- assert.Equal(t, "A", call.Arguments[0])
-- assert.Equal(t, "B", call.Arguments[1])
-- assert.Equal(t, true, call.Arguments[2])
-- assert.Equal(t, 1, call.ReturnArguments[0])
-- assert.Equal(t, "two", call.ReturnArguments[1])
-- assert.Equal(t, true, call.ReturnArguments[2])
-- assert.Equal(t, 0, call.Repeatability)
--
- }
--
-}
-
--func Test_Mock_Return_Once(t *testing.T) {
--
-- // make a test impl object
-- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
--
-- mockedService.Mock.On("TheExampleMethod", "A", "B", true).Return(1, "two", true).Once()
--
-- // ensure the call was created
-- if assert.Equal(t, 1, len(mockedService.Mock.ExpectedCalls)) {
-- call := mockedService.Mock.ExpectedCalls[0]
--
-- assert.Equal(t, "TheExampleMethod", call.Method)
-- assert.Equal(t, "A", call.Arguments[0])
-- assert.Equal(t, "B", call.Arguments[1])
-- assert.Equal(t, true, call.Arguments[2])
-- assert.Equal(t, 1, call.ReturnArguments[0])
-- assert.Equal(t, "two", call.ReturnArguments[1])
-- assert.Equal(t, true, call.ReturnArguments[2])
-- assert.Equal(t, 1, call.Repeatability)
--
+-func TestMaxBuffer(t *testing.T) {
+- // Exceeding the maximum buffer size generates ErrBufferExceeded.
+- z := NewTokenizer(strings.NewReader("<" + strings.Repeat("t", 10)))
+- z.SetMaxBuf(5)
+- tt := z.Next()
+- if got, want := tt, ErrorToken; got != want {
+- t.Fatalf("token type: got: %v want: %v", got, want)
- }
--
--}
--
--func Test_Mock_Return_Twice(t *testing.T) {
--
-- // make a test impl object
-- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
--
-- mockedService.Mock.On("TheExampleMethod", "A", "B", true).Return(1, "two", true).Twice()
--
-- // ensure the call was created
-- if assert.Equal(t, 1, len(mockedService.Mock.ExpectedCalls)) {
-- call := mockedService.Mock.ExpectedCalls[0]
--
-- assert.Equal(t, "TheExampleMethod", call.Method)
-- assert.Equal(t, "A", call.Arguments[0])
-- assert.Equal(t, "B", call.Arguments[1])
-- assert.Equal(t, true, call.Arguments[2])
-- assert.Equal(t, 1, call.ReturnArguments[0])
-- assert.Equal(t, "two", call.ReturnArguments[1])
-- assert.Equal(t, true, call.ReturnArguments[2])
-- assert.Equal(t, 2, call.Repeatability)
--
+- if got, want := z.Err(), ErrBufferExceeded; got != want {
+- t.Errorf("error type: got: %v want: %v", got, want)
- }
--
--}
--
--func Test_Mock_Return_Times(t *testing.T) {
--
-- // make a test impl object
-- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
--
-- mockedService.Mock.On("TheExampleMethod", "A", "B", true).Return(1, "two", true).Times(5)
--
-- // ensure the call was created
-- if assert.Equal(t, 1, len(mockedService.Mock.ExpectedCalls)) {
-- call := mockedService.Mock.ExpectedCalls[0]
--
-- assert.Equal(t, "TheExampleMethod", call.Method)
-- assert.Equal(t, "A", call.Arguments[0])
-- assert.Equal(t, "B", call.Arguments[1])
-- assert.Equal(t, true, call.Arguments[2])
-- assert.Equal(t, 1, call.ReturnArguments[0])
-- assert.Equal(t, "two", call.ReturnArguments[1])
-- assert.Equal(t, true, call.ReturnArguments[2])
-- assert.Equal(t, 5, call.Repeatability)
--
+- if got, want := string(z.Raw()), "<tttt"; got != want {
+- t.Fatalf("buffered before overflow: got: %q want: %q", got, want)
- }
--
-}
-
--func Test_Mock_Return_Nothing(t *testing.T) {
--
-- // make a test impl object
-- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
--
-- assert.Equal(t, mockedService.Mock.On("TheExampleMethod", "A", "B", true).Return(), &mockedService.Mock)
--
-- // ensure the call was created
-- if assert.Equal(t, 1, len(mockedService.Mock.ExpectedCalls)) {
-- call := mockedService.Mock.ExpectedCalls[0]
--
-- assert.Equal(t, "TheExampleMethod", call.Method)
-- assert.Equal(t, "A", call.Arguments[0])
-- assert.Equal(t, "B", call.Arguments[1])
-- assert.Equal(t, true, call.Arguments[2])
-- assert.Equal(t, 0, len(call.ReturnArguments))
--
-- }
--
+-func TestMaxBufferReconstruction(t *testing.T) {
+- // Exceeding the maximum buffer size at any point while tokenizing permits
+- // reconstructing the original input.
+-tests:
+- for _, test := range tokenTests {
+- for maxBuf := 1; ; maxBuf++ {
+- r := strings.NewReader(test.html)
+- z := NewTokenizer(r)
+- z.SetMaxBuf(maxBuf)
+- var tokenized bytes.Buffer
+- for {
+- tt := z.Next()
+- tokenized.Write(z.Raw())
+- if tt == ErrorToken {
+- if err := z.Err(); err != io.EOF && err != ErrBufferExceeded {
+- t.Errorf("%s: unexpected error: %v", test.desc, err)
+- }
+- break
+- }
+- }
+- // Anything tokenized along with untokenized input or data left in the reader.
+- assembled, err := ioutil.ReadAll(io.MultiReader(&tokenized, bytes.NewReader(z.Buffered()), r))
+- if err != nil {
+- t.Errorf("%s: ReadAll: %v", test.desc, err)
+- continue tests
+- }
+- if got, want := string(assembled), test.html; got != want {
+- t.Errorf("%s: reassembled html:\n got: %q\nwant: %q", test.desc, got, want)
+- continue tests
+- }
+- // EOF indicates that we completed tokenization and hence found the max
+- // maxBuf that generates ErrBufferExceeded, so continue to the next test.
+- if z.Err() == io.EOF {
+- break
+- }
+- } // buffer sizes
+- } // tests
-}
-
--func Test_Mock_findExpectedCall(t *testing.T) {
--
-- m := new(Mock)
-- m.On("One", 1).Return("one")
-- m.On("Two", 2).Return("two")
-- m.On("Two", 3).Return("three")
--
-- f, c := m.findExpectedCall("Two", 3)
--
-- if assert.Equal(t, 2, f) {
-- if assert.NotNil(t, c) {
-- assert.Equal(t, "Two", c.Method)
-- assert.Equal(t, 3, c.Arguments[0])
-- assert.Equal(t, "three", c.ReturnArguments[0])
+-func TestPassthrough(t *testing.T) {
+- // Accumulating the raw output for each parse event should reconstruct the
+- // original input.
+- for _, test := range tokenTests {
+- z := NewTokenizer(strings.NewReader(test.html))
+- var parsed bytes.Buffer
+- for {
+- tt := z.Next()
+- parsed.Write(z.Raw())
+- if tt == ErrorToken {
+- break
+- }
+- }
+- if got, want := parsed.String(), test.html; got != want {
+- t.Errorf("%s: parsed output:\n got: %q\nwant: %q", test.desc, got, want)
- }
- }
--
--}
--
--func Test_Mock_findExpectedCall_For_Unknown_Method(t *testing.T) {
--
-- m := new(Mock)
-- m.On("One", 1).Return("one")
-- m.On("Two", 2).Return("two")
-- m.On("Two", 3).Return("three")
--
-- f, _ := m.findExpectedCall("Two")
--
-- assert.Equal(t, -1, f)
--
-}
-
--func Test_Mock_findExpectedCall_Respects_Repeatability(t *testing.T) {
--
-- m := new(Mock)
-- m.On("One", 1).Return("one")
-- m.On("Two", 2).Return("two").Once()
-- m.On("Two", 3).Return("three").Twice()
-- m.On("Two", 3).Return("three").Times(8)
--
-- f, c := m.findExpectedCall("Two", 3)
--
-- if assert.Equal(t, 2, f) {
-- if assert.NotNil(t, c) {
-- assert.Equal(t, "Two", c.Method)
-- assert.Equal(t, 3, c.Arguments[0])
-- assert.Equal(t, "three", c.ReturnArguments[0])
+-func TestBufAPI(t *testing.T) {
+- s := "0<a>1</a>2<b>3<a>4<a>5</a>6</b>7</a>8<a/>9"
+- z := NewTokenizer(bytes.NewBufferString(s))
+- var result bytes.Buffer
+- depth := 0
+-loop:
+- for {
+- tt := z.Next()
+- switch tt {
+- case ErrorToken:
+- if z.Err() != io.EOF {
+- t.Error(z.Err())
+- }
+- break loop
+- case TextToken:
+- if depth > 0 {
+- result.Write(z.Text())
+- }
+- case StartTagToken, EndTagToken:
+- tn, _ := z.TagName()
+- if len(tn) == 1 && tn[0] == 'a' {
+- if tt == StartTagToken {
+- depth++
+- } else {
+- depth--
+- }
+- }
- }
- }
--
+- u := "14567"
+- v := string(result.Bytes())
+- if u != v {
+- t.Errorf("TestBufAPI: want %q got %q", u, v)
+- }
-}
-
--func Test_callString(t *testing.T) {
--
-- assert.Equal(t, `Method(int,bool,string)`, callString("Method", []interface{}{1, true, "something"}, false))
--
+-func TestConvertNewlines(t *testing.T) {
+- testCases := map[string]string{
+- "Mac\rDOS\r\nUnix\n": "Mac\nDOS\nUnix\n",
+- "Unix\nMac\rDOS\r\n": "Unix\nMac\nDOS\n",
+- "DOS\r\nDOS\r\nDOS\r\n": "DOS\nDOS\nDOS\n",
+- "": "",
+- "\n": "\n",
+- "\n\r": "\n\n",
+- "\r": "\n",
+- "\r\n": "\n",
+- "\r\n\n": "\n\n",
+- "\r\n\r": "\n\n",
+- "\r\n\r\n": "\n\n",
+- "\r\r": "\n\n",
+- "\r\r\n": "\n\n",
+- "\r\r\n\n": "\n\n\n",
+- "\r\r\r\n": "\n\n\n",
+- "\r \n": "\n \n",
+- "xyz": "xyz",
+- }
+- for in, want := range testCases {
+- if got := string(convertNewlines([]byte(in))); got != want {
+- t.Errorf("input %q: got %q, want %q", in, got, want)
+- }
+- }
-}
-
--func Test_Mock_Called(t *testing.T) {
--
-- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
--
-- mockedService.Mock.On("Test_Mock_Called", 1, 2, 3).Return(5, "6", true)
--
-- returnArguments := mockedService.Mock.Called(1, 2, 3)
--
-- if assert.Equal(t, 1, len(mockedService.Mock.Calls)) {
-- assert.Equal(t, "Test_Mock_Called", mockedService.Mock.Calls[0].Method)
-- assert.Equal(t, 1, mockedService.Mock.Calls[0].Arguments[0])
-- assert.Equal(t, 2, mockedService.Mock.Calls[0].Arguments[1])
-- assert.Equal(t, 3, mockedService.Mock.Calls[0].Arguments[2])
+-func TestReaderEdgeCases(t *testing.T) {
+- const s = "<p>An io.Reader can return (0, nil) or (n, io.EOF).</p>"
+- testCases := []io.Reader{
+- &zeroOneByteReader{s: s},
+- &eofStringsReader{s: s},
+- &stuckReader{},
- }
--
-- if assert.Equal(t, 3, len(returnArguments)) {
-- assert.Equal(t, 5, returnArguments[0])
-- assert.Equal(t, "6", returnArguments[1])
-- assert.Equal(t, true, returnArguments[2])
+- for i, tc := range testCases {
+- got := []TokenType{}
+- z := NewTokenizer(tc)
+- for {
+- tt := z.Next()
+- if tt == ErrorToken {
+- break
+- }
+- got = append(got, tt)
+- }
+- if err := z.Err(); err != nil && err != io.EOF {
+- if err != io.ErrNoProgress {
+- t.Errorf("i=%d: %v", i, err)
+- }
+- continue
+- }
+- want := []TokenType{
+- StartTagToken,
+- TextToken,
+- EndTagToken,
+- }
+- if !reflect.DeepEqual(got, want) {
+- t.Errorf("i=%d: got %v, want %v", i, got, want)
+- continue
+- }
- }
--
-}
-
--func Test_Mock_Called_For_Bounded_Repeatability(t *testing.T) {
--
-- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
--
-- mockedService.Mock.On("Test_Mock_Called_For_Bounded_Repeatability", 1, 2, 3).Return(5, "6", true).Once()
-- mockedService.Mock.On("Test_Mock_Called_For_Bounded_Repeatability", 1, 2, 3).Return(-1, "hi", false)
--
-- returnArguments1 := mockedService.Mock.Called(1, 2, 3)
-- returnArguments2 := mockedService.Mock.Called(1, 2, 3)
--
-- if assert.Equal(t, 2, len(mockedService.Mock.Calls)) {
-- assert.Equal(t, "Test_Mock_Called_For_Bounded_Repeatability", mockedService.Mock.Calls[0].Method)
-- assert.Equal(t, 1, mockedService.Mock.Calls[0].Arguments[0])
-- assert.Equal(t, 2, mockedService.Mock.Calls[0].Arguments[1])
-- assert.Equal(t, 3, mockedService.Mock.Calls[0].Arguments[2])
+-// zeroOneByteReader is like a strings.Reader that alternates between
+-// returning 0 bytes and 1 byte at a time.
+-type zeroOneByteReader struct {
+- s string
+- n int
+-}
-
-- assert.Equal(t, "Test_Mock_Called_For_Bounded_Repeatability", mockedService.Mock.Calls[1].Method)
-- assert.Equal(t, 1, mockedService.Mock.Calls[1].Arguments[0])
-- assert.Equal(t, 2, mockedService.Mock.Calls[1].Arguments[1])
-- assert.Equal(t, 3, mockedService.Mock.Calls[1].Arguments[2])
+-func (r *zeroOneByteReader) Read(p []byte) (int, error) {
+- if len(p) == 0 {
+- return 0, nil
- }
--
-- if assert.Equal(t, 3, len(returnArguments1)) {
-- assert.Equal(t, 5, returnArguments1[0])
-- assert.Equal(t, "6", returnArguments1[1])
-- assert.Equal(t, true, returnArguments1[2])
+- if len(r.s) == 0 {
+- return 0, io.EOF
- }
--
-- if assert.Equal(t, 3, len(returnArguments2)) {
-- assert.Equal(t, -1, returnArguments2[0])
-- assert.Equal(t, "hi", returnArguments2[1])
-- assert.Equal(t, false, returnArguments2[2])
+- r.n++
+- if r.n%2 != 0 {
+- return 0, nil
- }
--
+- p[0], r.s = r.s[0], r.s[1:]
+- return 1, nil
-}
-
--func Test_Mock_Called_For_SetTime_Expectation(t *testing.T) {
--
-- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
--
-- mockedService.Mock.On("TheExampleMethod", 1, 2, 3).Return(5, "6", true).Times(4)
--
-- mockedService.TheExampleMethod(1, 2, 3)
-- mockedService.TheExampleMethod(1, 2, 3)
-- mockedService.TheExampleMethod(1, 2, 3)
-- mockedService.TheExampleMethod(1, 2, 3)
-- assert.Panics(t, func() {
-- mockedService.TheExampleMethod(1, 2, 3)
-- })
--
+-// eofStringsReader is like a strings.Reader but can return an (n, err) where
+-// n > 0 && err != nil.
+-type eofStringsReader struct {
+- s string
-}
-
--func Test_Mock_Called_Unexpected(t *testing.T) {
--
-- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
--
-- // make sure it panics if no expectation was made
-- assert.Panics(t, func() {
-- mockedService.Mock.Called(1, 2, 3)
-- }, "Calling unexpected method should panic")
--
+-func (r *eofStringsReader) Read(p []byte) (int, error) {
+- n := copy(p, r.s)
+- r.s = r.s[n:]
+- if r.s != "" {
+- return n, nil
+- }
+- return n, io.EOF
-}
-
--func Test_AssertExpectationsForObjects_Helper(t *testing.T) {
--
-- var mockedService1 *TestExampleImplementation = new(TestExampleImplementation)
-- var mockedService2 *TestExampleImplementation = new(TestExampleImplementation)
-- var mockedService3 *TestExampleImplementation = new(TestExampleImplementation)
--
-- mockedService1.Mock.On("Test_AssertExpectationsForObjects_Helper", 1).Return()
-- mockedService2.Mock.On("Test_AssertExpectationsForObjects_Helper", 2).Return()
-- mockedService3.Mock.On("Test_AssertExpectationsForObjects_Helper", 3).Return()
--
-- mockedService1.Called(1)
-- mockedService2.Called(2)
-- mockedService3.Called(3)
--
-- assert.True(t, AssertExpectationsForObjects(t, mockedService1.Mock, mockedService2.Mock, mockedService3.Mock))
+-// stuckReader is an io.Reader that always returns no data and no error.
+-type stuckReader struct{}
-
+-func (*stuckReader) Read(p []byte) (int, error) {
+- return 0, nil
-}
-
--func Test_AssertExpectationsForObjects_Helper_Failed(t *testing.T) {
--
-- var mockedService1 *TestExampleImplementation = new(TestExampleImplementation)
-- var mockedService2 *TestExampleImplementation = new(TestExampleImplementation)
-- var mockedService3 *TestExampleImplementation = new(TestExampleImplementation)
--
-- mockedService1.Mock.On("Test_AssertExpectationsForObjects_Helper_Failed", 1).Return()
-- mockedService2.Mock.On("Test_AssertExpectationsForObjects_Helper_Failed", 2).Return()
-- mockedService3.Mock.On("Test_AssertExpectationsForObjects_Helper_Failed", 3).Return()
--
-- mockedService1.Called(1)
-- mockedService3.Called(3)
--
-- tt := new(testing.T)
-- assert.False(t, AssertExpectationsForObjects(tt, mockedService1.Mock, mockedService2.Mock, mockedService3.Mock))
+-const (
+- rawLevel = iota
+- lowLevel
+- highLevel
+-)
-
+-func benchmarkTokenizer(b *testing.B, level int) {
+- buf, err := ioutil.ReadFile("testdata/go1.html")
+- if err != nil {
+- b.Fatalf("could not read testdata/go1.html: %v", err)
+- }
+- b.SetBytes(int64(len(buf)))
+- runtime.GC()
+- b.ReportAllocs()
+- b.ResetTimer()
+- for i := 0; i < b.N; i++ {
+- z := NewTokenizer(bytes.NewBuffer(buf))
+- for {
+- tt := z.Next()
+- if tt == ErrorToken {
+- if err := z.Err(); err != nil && err != io.EOF {
+- b.Fatalf("tokenizer error: %v", err)
+- }
+- break
+- }
+- switch level {
+- case rawLevel:
+- // Calling z.Raw just returns the raw bytes of the token. It does
+- // not unescape < to <, or lower-case tag names and attribute keys.
+- z.Raw()
+- case lowLevel:
+- // Caling z.Text, z.TagName and z.TagAttr returns []byte values
+- // whose contents may change on the next call to z.Next.
+- switch tt {
+- case TextToken, CommentToken, DoctypeToken:
+- z.Text()
+- case StartTagToken, SelfClosingTagToken:
+- _, more := z.TagName()
+- for more {
+- _, _, more = z.TagAttr()
+- }
+- case EndTagToken:
+- z.TagName()
+- }
+- case highLevel:
+- // Calling z.Token converts []byte values to strings whose validity
+- // extend beyond the next call to z.Next.
+- z.Token()
+- }
+- }
+- }
-}
-
--func Test_Mock_AssertExpectations(t *testing.T) {
--
-- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
--
-- mockedService.Mock.On("Test_Mock_AssertExpectations", 1, 2, 3).Return(5, 6, 7)
--
-- tt := new(testing.T)
-- assert.False(t, mockedService.AssertExpectations(tt))
+-func BenchmarkRawLevelTokenizer(b *testing.B) { benchmarkTokenizer(b, rawLevel) }
+-func BenchmarkLowLevelTokenizer(b *testing.B) { benchmarkTokenizer(b, lowLevel) }
+-func BenchmarkHighLevelTokenizer(b *testing.B) { benchmarkTokenizer(b, highLevel) }
+diff --git a/Godeps/_workspace/src/golang.org/x/net/websocket/client.go b/Godeps/_workspace/src/golang.org/x/net/websocket/client.go
+deleted file mode 100644
+index a861bb9..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/websocket/client.go
++++ /dev/null
+@@ -1,98 +0,0 @@
+-// Copyright 2009 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
-- // make the call now
-- mockedService.Mock.Called(1, 2, 3)
+-package websocket
-
-- // now assert expectations
-- assert.True(t, mockedService.AssertExpectations(tt))
+-import (
+- "bufio"
+- "crypto/tls"
+- "io"
+- "net"
+- "net/http"
+- "net/url"
+-)
-
+-// DialError is an error that occurs while dialling a websocket server.
+-type DialError struct {
+- *Config
+- Err error
-}
-
--func Test_Mock_AssertExpectationsCustomType(t *testing.T) {
--
-- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
--
-- mockedService.Mock.On("TheExampleMethod3", AnythingOfType("*mock.ExampleType")).Return(nil).Once()
--
-- tt := new(testing.T)
-- assert.False(t, mockedService.AssertExpectations(tt))
--
-- // make the call now
-- mockedService.TheExampleMethod3(&ExampleType{})
--
-- // now assert expectations
-- assert.True(t, mockedService.AssertExpectations(tt))
--
+-func (e *DialError) Error() string {
+- return "websocket.Dial " + e.Config.Location.String() + ": " + e.Err.Error()
-}
-
--func Test_Mock_AssertExpectations_With_Repeatability(t *testing.T) {
--
-- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
--
-- mockedService.Mock.On("Test_Mock_AssertExpectations_With_Repeatability", 1, 2, 3).Return(5, 6, 7).Twice()
--
-- tt := new(testing.T)
-- assert.False(t, mockedService.AssertExpectations(tt))
--
-- // make the call now
-- mockedService.Mock.Called(1, 2, 3)
--
-- assert.False(t, mockedService.AssertExpectations(tt))
--
-- mockedService.Mock.Called(1, 2, 3)
--
-- // now assert expectations
-- assert.True(t, mockedService.AssertExpectations(tt))
+-// NewConfig creates a new WebSocket config for client connection.
+-func NewConfig(server, origin string) (config *Config, err error) {
+- config = new(Config)
+- config.Version = ProtocolVersionHybi13
+- config.Location, err = url.ParseRequestURI(server)
+- if err != nil {
+- return
+- }
+- config.Origin, err = url.ParseRequestURI(origin)
+- if err != nil {
+- return
+- }
+- config.Header = http.Header(make(map[string][]string))
+- return
+-}
-
+-// NewClient creates a new WebSocket client connection over rwc.
+-func NewClient(config *Config, rwc io.ReadWriteCloser) (ws *Conn, err error) {
+- br := bufio.NewReader(rwc)
+- bw := bufio.NewWriter(rwc)
+- err = hybiClientHandshake(config, br, bw)
+- if err != nil {
+- return
+- }
+- buf := bufio.NewReadWriter(br, bw)
+- ws = newHybiClientConn(config, buf, rwc)
+- return
-}
-
--func Test_Mock_TwoCallsWithDifferentArguments(t *testing.T) {
+-// Dial opens a new client connection to a WebSocket.
+-func Dial(url_, protocol, origin string) (ws *Conn, err error) {
+- config, err := NewConfig(url_, origin)
+- if err != nil {
+- return nil, err
+- }
+- if protocol != "" {
+- config.Protocol = []string{protocol}
+- }
+- return DialConfig(config)
+-}
-
-- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
+-// DialConfig opens a new client connection to a WebSocket with a config.
+-func DialConfig(config *Config) (ws *Conn, err error) {
+- var client net.Conn
+- if config.Location == nil {
+- return nil, &DialError{config, ErrBadWebSocketLocation}
+- }
+- if config.Origin == nil {
+- return nil, &DialError{config, ErrBadWebSocketOrigin}
+- }
+- switch config.Location.Scheme {
+- case "ws":
+- client, err = net.Dial("tcp", config.Location.Host)
-
-- mockedService.Mock.On("Test_Mock_TwoCallsWithDifferentArguments", 1, 2, 3).Return(5, 6, 7)
-- mockedService.Mock.On("Test_Mock_TwoCallsWithDifferentArguments", 4, 5, 6).Return(5, 6, 7)
+- case "wss":
+- client, err = tls.Dial("tcp", config.Location.Host, config.TlsConfig)
-
-- args1 := mockedService.Mock.Called(1, 2, 3)
-- assert.Equal(t, 5, args1.Int(0))
-- assert.Equal(t, 6, args1.Int(1))
-- assert.Equal(t, 7, args1.Int(2))
+- default:
+- err = ErrBadScheme
+- }
+- if err != nil {
+- goto Error
+- }
-
-- args2 := mockedService.Mock.Called(4, 5, 6)
-- assert.Equal(t, 5, args2.Int(0))
-- assert.Equal(t, 6, args2.Int(1))
-- assert.Equal(t, 7, args2.Int(2))
+- ws, err = NewClient(config, client)
+- if err != nil {
+- goto Error
+- }
+- return
-
+-Error:
+- return nil, &DialError{config, err}
-}
+diff --git a/Godeps/_workspace/src/golang.org/x/net/websocket/exampledial_test.go b/Godeps/_workspace/src/golang.org/x/net/websocket/exampledial_test.go
+deleted file mode 100644
+index 72bb9d4..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/websocket/exampledial_test.go
++++ /dev/null
+@@ -1,31 +0,0 @@
+-// Copyright 2012 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
--func Test_Mock_AssertNumberOfCalls(t *testing.T) {
--
-- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
--
-- mockedService.Mock.On("Test_Mock_AssertNumberOfCalls", 1, 2, 3).Return(5, 6, 7)
+-package websocket_test
-
-- mockedService.Mock.Called(1, 2, 3)
-- assert.True(t, mockedService.AssertNumberOfCalls(t, "Test_Mock_AssertNumberOfCalls", 1))
+-import (
+- "fmt"
+- "log"
-
-- mockedService.Mock.Called(1, 2, 3)
-- assert.True(t, mockedService.AssertNumberOfCalls(t, "Test_Mock_AssertNumberOfCalls", 2))
+- "golang.org/x/net/websocket"
+-)
-
+-// This example demonstrates a trivial client.
+-func ExampleDial() {
+- origin := "http://localhost/"
+- url := "ws://localhost:12345/ws"
+- ws, err := websocket.Dial(url, "", origin)
+- if err != nil {
+- log.Fatal(err)
+- }
+- if _, err := ws.Write([]byte("hello, world!\n")); err != nil {
+- log.Fatal(err)
+- }
+- var msg = make([]byte, 512)
+- var n int
+- if n, err = ws.Read(msg); err != nil {
+- log.Fatal(err)
+- }
+- fmt.Printf("Received: %s.\n", msg[:n])
-}
+diff --git a/Godeps/_workspace/src/golang.org/x/net/websocket/examplehandler_test.go b/Godeps/_workspace/src/golang.org/x/net/websocket/examplehandler_test.go
+deleted file mode 100644
+index f22a98f..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/websocket/examplehandler_test.go
++++ /dev/null
+@@ -1,26 +0,0 @@
+-// Copyright 2012 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
--func Test_Mock_AssertCalled(t *testing.T) {
--
-- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
+-package websocket_test
-
-- mockedService.Mock.On("Test_Mock_AssertCalled", 1, 2, 3).Return(5, 6, 7)
+-import (
+- "io"
+- "net/http"
-
-- mockedService.Mock.Called(1, 2, 3)
+- "golang.org/x/net/websocket"
+-)
-
-- assert.True(t, mockedService.AssertCalled(t, "Test_Mock_AssertCalled", 1, 2, 3))
+-// Echo the data received on the WebSocket.
+-func EchoServer(ws *websocket.Conn) {
+- io.Copy(ws, ws)
+-}
-
+-// This example demonstrates a trivial echo server.
+-func ExampleHandler() {
+- http.Handle("/echo", websocket.Handler(EchoServer))
+- err := http.ListenAndServe(":12345", nil)
+- if err != nil {
+- panic("ListenAndServe: " + err.Error())
+- }
-}
+diff --git a/Godeps/_workspace/src/golang.org/x/net/websocket/hybi.go b/Godeps/_workspace/src/golang.org/x/net/websocket/hybi.go
+deleted file mode 100644
+index f8c0b2e..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/websocket/hybi.go
++++ /dev/null
+@@ -1,564 +0,0 @@
+-// Copyright 2011 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
--func Test_Mock_AssertCalled_WithArguments(t *testing.T) {
+-package websocket
-
-- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
+-// This file implements a protocol of hybi draft.
+-// http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-17
-
-- mockedService.Mock.On("Test_Mock_AssertCalled_WithArguments", 1, 2, 3).Return(5, 6, 7)
+-import (
+- "bufio"
+- "bytes"
+- "crypto/rand"
+- "crypto/sha1"
+- "encoding/base64"
+- "encoding/binary"
+- "fmt"
+- "io"
+- "io/ioutil"
+- "net/http"
+- "net/url"
+- "strings"
+-)
-
-- mockedService.Mock.Called(1, 2, 3)
+-const (
+- websocketGUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"
-
-- tt := new(testing.T)
-- assert.True(t, mockedService.AssertCalled(tt, "Test_Mock_AssertCalled_WithArguments", 1, 2, 3))
-- assert.False(t, mockedService.AssertCalled(tt, "Test_Mock_AssertCalled_WithArguments", 2, 3, 4))
+- closeStatusNormal = 1000
+- closeStatusGoingAway = 1001
+- closeStatusProtocolError = 1002
+- closeStatusUnsupportedData = 1003
+- closeStatusFrameTooLarge = 1004
+- closeStatusNoStatusRcvd = 1005
+- closeStatusAbnormalClosure = 1006
+- closeStatusBadMessageData = 1007
+- closeStatusPolicyViolation = 1008
+- closeStatusTooBigData = 1009
+- closeStatusExtensionMismatch = 1010
-
--}
+- maxControlFramePayloadLength = 125
+-)
-
--func Test_Mock_AssertCalled_WithArguments_With_Repeatability(t *testing.T) {
+-var (
+- ErrBadMaskingKey = &ProtocolError{"bad masking key"}
+- ErrBadPongMessage = &ProtocolError{"bad pong message"}
+- ErrBadClosingStatus = &ProtocolError{"bad closing status"}
+- ErrUnsupportedExtensions = &ProtocolError{"unsupported extensions"}
+- ErrNotImplemented = &ProtocolError{"not implemented"}
-
-- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
+- handshakeHeader = map[string]bool{
+- "Host": true,
+- "Upgrade": true,
+- "Connection": true,
+- "Sec-Websocket-Key": true,
+- "Sec-Websocket-Origin": true,
+- "Sec-Websocket-Version": true,
+- "Sec-Websocket-Protocol": true,
+- "Sec-Websocket-Accept": true,
+- }
+-)
-
-- mockedService.Mock.On("Test_Mock_AssertCalled_WithArguments_With_Repeatability", 1, 2, 3).Return(5, 6, 7).Once()
-- mockedService.Mock.On("Test_Mock_AssertCalled_WithArguments_With_Repeatability", 2, 3, 4).Return(5, 6, 7).Once()
+-// A hybiFrameHeader is a frame header as defined in hybi draft.
+-type hybiFrameHeader struct {
+- Fin bool
+- Rsv [3]bool
+- OpCode byte
+- Length int64
+- MaskingKey []byte
-
-- mockedService.Mock.Called(1, 2, 3)
-- mockedService.Mock.Called(2, 3, 4)
+- data *bytes.Buffer
+-}
-
-- tt := new(testing.T)
-- assert.True(t, mockedService.AssertCalled(tt, "Test_Mock_AssertCalled_WithArguments_With_Repeatability", 1, 2, 3))
-- assert.True(t, mockedService.AssertCalled(tt, "Test_Mock_AssertCalled_WithArguments_With_Repeatability", 2, 3, 4))
-- assert.False(t, mockedService.AssertCalled(tt, "Test_Mock_AssertCalled_WithArguments_With_Repeatability", 3, 4, 5))
+-// A hybiFrameReader is a reader for hybi frame.
+-type hybiFrameReader struct {
+- reader io.Reader
-
+- header hybiFrameHeader
+- pos int64
+- length int
-}
-
--func Test_Mock_AssertNotCalled(t *testing.T) {
+-func (frame *hybiFrameReader) Read(msg []byte) (n int, err error) {
+- n, err = frame.reader.Read(msg)
+- if err != nil {
+- return 0, err
+- }
+- if frame.header.MaskingKey != nil {
+- for i := 0; i < n; i++ {
+- msg[i] = msg[i] ^ frame.header.MaskingKey[frame.pos%4]
+- frame.pos++
+- }
+- }
+- return n, err
+-}
-
-- var mockedService *TestExampleImplementation = new(TestExampleImplementation)
+-func (frame *hybiFrameReader) PayloadType() byte { return frame.header.OpCode }
-
-- mockedService.Mock.On("Test_Mock_AssertNotCalled", 1, 2, 3).Return(5, 6, 7)
+-func (frame *hybiFrameReader) HeaderReader() io.Reader {
+- if frame.header.data == nil {
+- return nil
+- }
+- if frame.header.data.Len() == 0 {
+- return nil
+- }
+- return frame.header.data
+-}
-
-- mockedService.Mock.Called(1, 2, 3)
+-func (frame *hybiFrameReader) TrailerReader() io.Reader { return nil }
-
-- assert.True(t, mockedService.AssertNotCalled(t, "Test_Mock_NotCalled"))
+-func (frame *hybiFrameReader) Len() (n int) { return frame.length }
-
+-// A hybiFrameReaderFactory creates new frame reader based on its frame type.
+-type hybiFrameReaderFactory struct {
+- *bufio.Reader
-}
-
--/*
-- Arguments helper methods
--*/
--func Test_Arguments_Get(t *testing.T) {
+-// NewFrameReader reads a frame header from the connection, and creates new reader for the frame.
+-// See Section 5.2 Base Framing protocol for detail.
+-// http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-17#section-5.2
+-func (buf hybiFrameReaderFactory) NewFrameReader() (frame frameReader, err error) {
+- hybiFrame := new(hybiFrameReader)
+- frame = hybiFrame
+- var header []byte
+- var b byte
+- // First byte. FIN/RSV1/RSV2/RSV3/OpCode(4bits)
+- b, err = buf.ReadByte()
+- if err != nil {
+- return
+- }
+- header = append(header, b)
+- hybiFrame.header.Fin = ((header[0] >> 7) & 1) != 0
+- for i := 0; i < 3; i++ {
+- j := uint(6 - i)
+- hybiFrame.header.Rsv[i] = ((header[0] >> j) & 1) != 0
+- }
+- hybiFrame.header.OpCode = header[0] & 0x0f
-
-- var args Arguments = []interface{}{"string", 123, true}
+- // Second byte. Mask/Payload len(7bits)
+- b, err = buf.ReadByte()
+- if err != nil {
+- return
+- }
+- header = append(header, b)
+- mask := (b & 0x80) != 0
+- b &= 0x7f
+- lengthFields := 0
+- switch {
+- case b <= 125: // Payload length 7bits.
+- hybiFrame.header.Length = int64(b)
+- case b == 126: // Payload length 7+16bits
+- lengthFields = 2
+- case b == 127: // Payload length 7+64bits
+- lengthFields = 8
+- }
+- for i := 0; i < lengthFields; i++ {
+- b, err = buf.ReadByte()
+- if err != nil {
+- return
+- }
+- header = append(header, b)
+- hybiFrame.header.Length = hybiFrame.header.Length*256 + int64(b)
+- }
+- if mask {
+- // Masking key. 4 bytes.
+- for i := 0; i < 4; i++ {
+- b, err = buf.ReadByte()
+- if err != nil {
+- return
+- }
+- header = append(header, b)
+- hybiFrame.header.MaskingKey = append(hybiFrame.header.MaskingKey, b)
+- }
+- }
+- hybiFrame.reader = io.LimitReader(buf.Reader, hybiFrame.header.Length)
+- hybiFrame.header.data = bytes.NewBuffer(header)
+- hybiFrame.length = len(header) + int(hybiFrame.header.Length)
+- return
+-}
-
-- assert.Equal(t, "string", args.Get(0).(string))
-- assert.Equal(t, 123, args.Get(1).(int))
-- assert.Equal(t, true, args.Get(2).(bool))
+-// A HybiFrameWriter is a writer for hybi frame.
+-type hybiFrameWriter struct {
+- writer *bufio.Writer
-
+- header *hybiFrameHeader
-}
-
--func Test_Arguments_Is(t *testing.T) {
--
-- var args Arguments = []interface{}{"string", 123, true}
+-func (frame *hybiFrameWriter) Write(msg []byte) (n int, err error) {
+- var header []byte
+- var b byte
+- if frame.header.Fin {
+- b |= 0x80
+- }
+- for i := 0; i < 3; i++ {
+- if frame.header.Rsv[i] {
+- j := uint(6 - i)
+- b |= 1 << j
+- }
+- }
+- b |= frame.header.OpCode
+- header = append(header, b)
+- if frame.header.MaskingKey != nil {
+- b = 0x80
+- } else {
+- b = 0
+- }
+- lengthFields := 0
+- length := len(msg)
+- switch {
+- case length <= 125:
+- b |= byte(length)
+- case length < 65536:
+- b |= 126
+- lengthFields = 2
+- default:
+- b |= 127
+- lengthFields = 8
+- }
+- header = append(header, b)
+- for i := 0; i < lengthFields; i++ {
+- j := uint((lengthFields - i - 1) * 8)
+- b = byte((length >> j) & 0xff)
+- header = append(header, b)
+- }
+- if frame.header.MaskingKey != nil {
+- if len(frame.header.MaskingKey) != 4 {
+- return 0, ErrBadMaskingKey
+- }
+- header = append(header, frame.header.MaskingKey...)
+- frame.writer.Write(header)
+- data := make([]byte, length)
+- for i := range data {
+- data[i] = msg[i] ^ frame.header.MaskingKey[i%4]
+- }
+- frame.writer.Write(data)
+- err = frame.writer.Flush()
+- return length, err
+- }
+- frame.writer.Write(header)
+- frame.writer.Write(msg)
+- err = frame.writer.Flush()
+- return length, err
+-}
-
-- assert.True(t, args.Is("string", 123, true))
-- assert.False(t, args.Is("wrong", 456, false))
+-func (frame *hybiFrameWriter) Close() error { return nil }
-
+-type hybiFrameWriterFactory struct {
+- *bufio.Writer
+- needMaskingKey bool
-}
-
--func Test_Arguments_Diff(t *testing.T) {
+-func (buf hybiFrameWriterFactory) NewFrameWriter(payloadType byte) (frame frameWriter, err error) {
+- frameHeader := &hybiFrameHeader{Fin: true, OpCode: payloadType}
+- if buf.needMaskingKey {
+- frameHeader.MaskingKey, err = generateMaskingKey()
+- if err != nil {
+- return nil, err
+- }
+- }
+- return &hybiFrameWriter{writer: buf.Writer, header: frameHeader}, nil
+-}
-
-- var args Arguments = []interface{}{"Hello World", 123, true}
-- var diff string
-- var count int
-- diff, count = args.Diff([]interface{}{"Hello World", 456, "false"})
+-type hybiFrameHandler struct {
+- conn *Conn
+- payloadType byte
+-}
-
-- assert.Equal(t, 2, count)
-- assert.Contains(t, diff, `%!s(int=456) != %!s(int=123)`)
-- assert.Contains(t, diff, `false != %!s(bool=true)`)
+-func (handler *hybiFrameHandler) HandleFrame(frame frameReader) (r frameReader, err error) {
+- if handler.conn.IsServerConn() {
+- // The client MUST mask all frames sent to the server.
+- if frame.(*hybiFrameReader).header.MaskingKey == nil {
+- handler.WriteClose(closeStatusProtocolError)
+- return nil, io.EOF
+- }
+- } else {
+- // The server MUST NOT mask all frames.
+- if frame.(*hybiFrameReader).header.MaskingKey != nil {
+- handler.WriteClose(closeStatusProtocolError)
+- return nil, io.EOF
+- }
+- }
+- if header := frame.HeaderReader(); header != nil {
+- io.Copy(ioutil.Discard, header)
+- }
+- switch frame.PayloadType() {
+- case ContinuationFrame:
+- frame.(*hybiFrameReader).header.OpCode = handler.payloadType
+- case TextFrame, BinaryFrame:
+- handler.payloadType = frame.PayloadType()
+- case CloseFrame:
+- return nil, io.EOF
+- case PingFrame:
+- pingMsg := make([]byte, maxControlFramePayloadLength)
+- n, err := io.ReadFull(frame, pingMsg)
+- if err != nil && err != io.ErrUnexpectedEOF {
+- return nil, err
+- }
+- io.Copy(ioutil.Discard, frame)
+- n, err = handler.WritePong(pingMsg[:n])
+- if err != nil {
+- return nil, err
+- }
+- return nil, nil
+- case PongFrame:
+- return nil, ErrNotImplemented
+- }
+- return frame, nil
+-}
-
+-func (handler *hybiFrameHandler) WriteClose(status int) (err error) {
+- handler.conn.wio.Lock()
+- defer handler.conn.wio.Unlock()
+- w, err := handler.conn.frameWriterFactory.NewFrameWriter(CloseFrame)
+- if err != nil {
+- return err
+- }
+- msg := make([]byte, 2)
+- binary.BigEndian.PutUint16(msg, uint16(status))
+- _, err = w.Write(msg)
+- w.Close()
+- return err
-}
-
--func Test_Arguments_Diff_DifferentNumberOfArgs(t *testing.T) {
+-func (handler *hybiFrameHandler) WritePong(msg []byte) (n int, err error) {
+- handler.conn.wio.Lock()
+- defer handler.conn.wio.Unlock()
+- w, err := handler.conn.frameWriterFactory.NewFrameWriter(PongFrame)
+- if err != nil {
+- return 0, err
+- }
+- n, err = w.Write(msg)
+- w.Close()
+- return n, err
+-}
-
-- var args Arguments = []interface{}{"string", 123, true}
-- var diff string
-- var count int
-- diff, count = args.Diff([]interface{}{"string", 456, "false", "extra"})
+-// newHybiConn creates a new WebSocket connection speaking hybi draft protocol.
+-func newHybiConn(config *Config, buf *bufio.ReadWriter, rwc io.ReadWriteCloser, request *http.Request) *Conn {
+- if buf == nil {
+- br := bufio.NewReader(rwc)
+- bw := bufio.NewWriter(rwc)
+- buf = bufio.NewReadWriter(br, bw)
+- }
+- ws := &Conn{config: config, request: request, buf: buf, rwc: rwc,
+- frameReaderFactory: hybiFrameReaderFactory{buf.Reader},
+- frameWriterFactory: hybiFrameWriterFactory{
+- buf.Writer, request == nil},
+- PayloadType: TextFrame,
+- defaultCloseStatus: closeStatusNormal}
+- ws.frameHandler = &hybiFrameHandler{conn: ws}
+- return ws
+-}
-
-- assert.Equal(t, 3, count)
-- assert.Contains(t, diff, `extra != (Missing)`)
+-// generateMaskingKey generates a masking key for a frame.
+-func generateMaskingKey() (maskingKey []byte, err error) {
+- maskingKey = make([]byte, 4)
+- if _, err = io.ReadFull(rand.Reader, maskingKey); err != nil {
+- return
+- }
+- return
+-}
-
+-// generateNonce generates a nonce consisting of a randomly selected 16-byte
+-// value that has been base64-encoded.
+-func generateNonce() (nonce []byte) {
+- key := make([]byte, 16)
+- if _, err := io.ReadFull(rand.Reader, key); err != nil {
+- panic(err)
+- }
+- nonce = make([]byte, 24)
+- base64.StdEncoding.Encode(nonce, key)
+- return
-}
-
--func Test_Arguments_Diff_WithAnythingArgument(t *testing.T) {
+-// getNonceAccept computes the base64-encoded SHA-1 of the concatenation of
+-// the nonce ("Sec-WebSocket-Key" value) with the websocket GUID string.
+-func getNonceAccept(nonce []byte) (expected []byte, err error) {
+- h := sha1.New()
+- if _, err = h.Write(nonce); err != nil {
+- return
+- }
+- if _, err = h.Write([]byte(websocketGUID)); err != nil {
+- return
+- }
+- expected = make([]byte, 28)
+- base64.StdEncoding.Encode(expected, h.Sum(nil))
+- return
+-}
-
-- var args Arguments = []interface{}{"string", 123, true}
-- var count int
-- _, count = args.Diff([]interface{}{"string", Anything, true})
+-// Client handshake described in draft-ietf-hybi-thewebsocket-protocol-17
+-func hybiClientHandshake(config *Config, br *bufio.Reader, bw *bufio.Writer) (err error) {
+- bw.WriteString("GET " + config.Location.RequestURI() + " HTTP/1.1\r\n")
-
-- assert.Equal(t, 0, count)
+- bw.WriteString("Host: " + config.Location.Host + "\r\n")
+- bw.WriteString("Upgrade: websocket\r\n")
+- bw.WriteString("Connection: Upgrade\r\n")
+- nonce := generateNonce()
+- if config.handshakeData != nil {
+- nonce = []byte(config.handshakeData["key"])
+- }
+- bw.WriteString("Sec-WebSocket-Key: " + string(nonce) + "\r\n")
+- bw.WriteString("Origin: " + strings.ToLower(config.Origin.String()) + "\r\n")
-
--}
+- if config.Version != ProtocolVersionHybi13 {
+- return ErrBadProtocolVersion
+- }
-
--func Test_Arguments_Diff_WithAnythingArgument_InActualToo(t *testing.T) {
+- bw.WriteString("Sec-WebSocket-Version: " + fmt.Sprintf("%d", config.Version) + "\r\n")
+- if len(config.Protocol) > 0 {
+- bw.WriteString("Sec-WebSocket-Protocol: " + strings.Join(config.Protocol, ", ") + "\r\n")
+- }
+- // TODO(ukai): send Sec-WebSocket-Extensions.
+- err = config.Header.WriteSubset(bw, handshakeHeader)
+- if err != nil {
+- return err
+- }
-
-- var args Arguments = []interface{}{"string", Anything, true}
-- var count int
-- _, count = args.Diff([]interface{}{"string", 123, true})
+- bw.WriteString("\r\n")
+- if err = bw.Flush(); err != nil {
+- return err
+- }
-
-- assert.Equal(t, 0, count)
+- resp, err := http.ReadResponse(br, &http.Request{Method: "GET"})
+- if err != nil {
+- return err
+- }
+- if resp.StatusCode != 101 {
+- return ErrBadStatus
+- }
+- if strings.ToLower(resp.Header.Get("Upgrade")) != "websocket" ||
+- strings.ToLower(resp.Header.Get("Connection")) != "upgrade" {
+- return ErrBadUpgrade
+- }
+- expectedAccept, err := getNonceAccept(nonce)
+- if err != nil {
+- return err
+- }
+- if resp.Header.Get("Sec-WebSocket-Accept") != string(expectedAccept) {
+- return ErrChallengeResponse
+- }
+- if resp.Header.Get("Sec-WebSocket-Extensions") != "" {
+- return ErrUnsupportedExtensions
+- }
+- offeredProtocol := resp.Header.Get("Sec-WebSocket-Protocol")
+- if offeredProtocol != "" {
+- protocolMatched := false
+- for i := 0; i < len(config.Protocol); i++ {
+- if config.Protocol[i] == offeredProtocol {
+- protocolMatched = true
+- break
+- }
+- }
+- if !protocolMatched {
+- return ErrBadWebSocketProtocol
+- }
+- config.Protocol = []string{offeredProtocol}
+- }
-
+- return nil
-}
-
--func Test_Arguments_Diff_WithAnythingOfTypeArgument(t *testing.T) {
--
-- var args Arguments = []interface{}{"string", AnythingOfType("int"), true}
-- var count int
-- _, count = args.Diff([]interface{}{"string", 123, true})
--
-- assert.Equal(t, 0, count)
--
+-// newHybiClientConn creates a client WebSocket connection after handshake.
+-func newHybiClientConn(config *Config, buf *bufio.ReadWriter, rwc io.ReadWriteCloser) *Conn {
+- return newHybiConn(config, buf, rwc, nil)
-}
-
--func Test_Arguments_Diff_WithAnythingOfTypeArgument_Failing(t *testing.T) {
--
-- var args Arguments = []interface{}{"string", AnythingOfType("string"), true}
-- var count int
-- var diff string
-- diff, count = args.Diff([]interface{}{"string", 123, true})
--
-- assert.Equal(t, 1, count)
-- assert.Contains(t, diff, `string != type int - %!s(int=123)`)
--
+-// A HybiServerHandshaker performs a server handshake using hybi draft protocol.
+-type hybiServerHandshaker struct {
+- *Config
+- accept []byte
-}
-
--func Test_Arguments_Assert(t *testing.T) {
--
-- var args Arguments = []interface{}{"string", 123, true}
+-func (c *hybiServerHandshaker) ReadHandshake(buf *bufio.Reader, req *http.Request) (code int, err error) {
+- c.Version = ProtocolVersionHybi13
+- if req.Method != "GET" {
+- return http.StatusMethodNotAllowed, ErrBadRequestMethod
+- }
+- // HTTP version can be safely ignored.
-
-- assert.True(t, args.Assert(t, "string", 123, true))
+- if strings.ToLower(req.Header.Get("Upgrade")) != "websocket" ||
+- !strings.Contains(strings.ToLower(req.Header.Get("Connection")), "upgrade") {
+- return http.StatusBadRequest, ErrNotWebSocket
+- }
-
+- key := req.Header.Get("Sec-Websocket-Key")
+- if key == "" {
+- return http.StatusBadRequest, ErrChallengeResponse
+- }
+- version := req.Header.Get("Sec-Websocket-Version")
+- switch version {
+- case "13":
+- c.Version = ProtocolVersionHybi13
+- default:
+- return http.StatusBadRequest, ErrBadWebSocketVersion
+- }
+- var scheme string
+- if req.TLS != nil {
+- scheme = "wss"
+- } else {
+- scheme = "ws"
+- }
+- c.Location, err = url.ParseRequestURI(scheme + "://" + req.Host + req.URL.RequestURI())
+- if err != nil {
+- return http.StatusBadRequest, err
+- }
+- protocol := strings.TrimSpace(req.Header.Get("Sec-Websocket-Protocol"))
+- if protocol != "" {
+- protocols := strings.Split(protocol, ",")
+- for i := 0; i < len(protocols); i++ {
+- c.Protocol = append(c.Protocol, strings.TrimSpace(protocols[i]))
+- }
+- }
+- c.accept, err = getNonceAccept([]byte(key))
+- if err != nil {
+- return http.StatusInternalServerError, err
+- }
+- return http.StatusSwitchingProtocols, nil
-}
-
--func Test_Arguments_String_Representation(t *testing.T) {
--
-- var args Arguments = []interface{}{"string", 123, true}
-- assert.Equal(t, `string,int,bool`, args.String())
--
+-// Origin parses Origin header in "req".
+-// If origin is "null", returns (nil, nil).
+-func Origin(config *Config, req *http.Request) (*url.URL, error) {
+- var origin string
+- switch config.Version {
+- case ProtocolVersionHybi13:
+- origin = req.Header.Get("Origin")
+- }
+- if origin == "null" {
+- return nil, nil
+- }
+- return url.ParseRequestURI(origin)
-}
-
--func Test_Arguments_String(t *testing.T) {
+-func (c *hybiServerHandshaker) AcceptHandshake(buf *bufio.Writer) (err error) {
+- if len(c.Protocol) > 0 {
+- if len(c.Protocol) != 1 {
+- // You need choose a Protocol in Handshake func in Server.
+- return ErrBadWebSocketProtocol
+- }
+- }
+- buf.WriteString("HTTP/1.1 101 Switching Protocols\r\n")
+- buf.WriteString("Upgrade: websocket\r\n")
+- buf.WriteString("Connection: Upgrade\r\n")
+- buf.WriteString("Sec-WebSocket-Accept: " + string(c.accept) + "\r\n")
+- if len(c.Protocol) > 0 {
+- buf.WriteString("Sec-WebSocket-Protocol: " + c.Protocol[0] + "\r\n")
+- }
+- // TODO(ukai): send Sec-WebSocket-Extensions.
+- if c.Header != nil {
+- err := c.Header.WriteSubset(buf, handshakeHeader)
+- if err != nil {
+- return err
+- }
+- }
+- buf.WriteString("\r\n")
+- return buf.Flush()
+-}
-
-- var args Arguments = []interface{}{"string", 123, true}
-- assert.Equal(t, "string", args.String(0))
+-func (c *hybiServerHandshaker) NewServerConn(buf *bufio.ReadWriter, rwc io.ReadWriteCloser, request *http.Request) *Conn {
+- return newHybiServerConn(c.Config, buf, rwc, request)
+-}
-
+-// newHybiServerConn returns a new WebSocket connection speaking hybi draft protocol.
+-func newHybiServerConn(config *Config, buf *bufio.ReadWriter, rwc io.ReadWriteCloser, request *http.Request) *Conn {
+- return newHybiConn(config, buf, rwc, request)
-}
+diff --git a/Godeps/_workspace/src/golang.org/x/net/websocket/hybi_test.go b/Godeps/_workspace/src/golang.org/x/net/websocket/hybi_test.go
+deleted file mode 100644
+index d6a1910..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/websocket/hybi_test.go
++++ /dev/null
+@@ -1,590 +0,0 @@
+-// Copyright 2011 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
--func Test_Arguments_Error(t *testing.T) {
+-package websocket
-
-- var err error = errors.New("An Error")
-- var args Arguments = []interface{}{"string", 123, true, err}
-- assert.Equal(t, err, args.Error(3))
+-import (
+- "bufio"
+- "bytes"
+- "fmt"
+- "io"
+- "net/http"
+- "net/url"
+- "strings"
+- "testing"
+-)
-
+-// Test the getNonceAccept function with values in
+-// http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-17
+-func TestSecWebSocketAccept(t *testing.T) {
+- nonce := []byte("dGhlIHNhbXBsZSBub25jZQ==")
+- expected := []byte("s3pPLMBiTxaQ9kYGzzhZRbK+xOo=")
+- accept, err := getNonceAccept(nonce)
+- if err != nil {
+- t.Errorf("getNonceAccept: returned error %v", err)
+- return
+- }
+- if !bytes.Equal(expected, accept) {
+- t.Errorf("getNonceAccept: expected %q got %q", expected, accept)
+- }
-}
-
--func Test_Arguments_Error_Nil(t *testing.T) {
+-func TestHybiClientHandshake(t *testing.T) {
+- b := bytes.NewBuffer([]byte{})
+- bw := bufio.NewWriter(b)
+- br := bufio.NewReader(strings.NewReader(`HTTP/1.1 101 Switching Protocols
+-Upgrade: websocket
+-Connection: Upgrade
+-Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=
+-Sec-WebSocket-Protocol: chat
-
-- var args Arguments = []interface{}{"string", 123, true, nil}
-- assert.Equal(t, nil, args.Error(3))
+-`))
+- var err error
+- config := new(Config)
+- config.Location, err = url.ParseRequestURI("ws://server.example.com/chat")
+- if err != nil {
+- t.Fatal("location url", err)
+- }
+- config.Origin, err = url.ParseRequestURI("http://example.com")
+- if err != nil {
+- t.Fatal("origin url", err)
+- }
+- config.Protocol = append(config.Protocol, "chat")
+- config.Protocol = append(config.Protocol, "superchat")
+- config.Version = ProtocolVersionHybi13
-
+- config.handshakeData = map[string]string{
+- "key": "dGhlIHNhbXBsZSBub25jZQ==",
+- }
+- err = hybiClientHandshake(config, br, bw)
+- if err != nil {
+- t.Errorf("handshake failed: %v", err)
+- }
+- req, err := http.ReadRequest(bufio.NewReader(b))
+- if err != nil {
+- t.Fatalf("read request: %v", err)
+- }
+- if req.Method != "GET" {
+- t.Errorf("request method expected GET, but got %q", req.Method)
+- }
+- if req.URL.Path != "/chat" {
+- t.Errorf("request path expected /chat, but got %q", req.URL.Path)
+- }
+- if req.Proto != "HTTP/1.1" {
+- t.Errorf("request proto expected HTTP/1.1, but got %q", req.Proto)
+- }
+- if req.Host != "server.example.com" {
+- t.Errorf("request Host expected server.example.com, but got %v", req.Host)
+- }
+- var expectedHeader = map[string]string{
+- "Connection": "Upgrade",
+- "Upgrade": "websocket",
+- "Sec-Websocket-Key": config.handshakeData["key"],
+- "Origin": config.Origin.String(),
+- "Sec-Websocket-Protocol": "chat, superchat",
+- "Sec-Websocket-Version": fmt.Sprintf("%d", ProtocolVersionHybi13),
+- }
+- for k, v := range expectedHeader {
+- if req.Header.Get(k) != v {
+- t.Errorf(fmt.Sprintf("%s expected %q but got %q", k, v, req.Header.Get(k)))
+- }
+- }
-}
-
--func Test_Arguments_Int(t *testing.T) {
+-func TestHybiClientHandshakeWithHeader(t *testing.T) {
+- b := bytes.NewBuffer([]byte{})
+- bw := bufio.NewWriter(b)
+- br := bufio.NewReader(strings.NewReader(`HTTP/1.1 101 Switching Protocols
+-Upgrade: websocket
+-Connection: Upgrade
+-Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=
+-Sec-WebSocket-Protocol: chat
-
-- var args Arguments = []interface{}{"string", 123, true}
-- assert.Equal(t, 123, args.Int(1))
+-`))
+- var err error
+- config := new(Config)
+- config.Location, err = url.ParseRequestURI("ws://server.example.com/chat")
+- if err != nil {
+- t.Fatal("location url", err)
+- }
+- config.Origin, err = url.ParseRequestURI("http://example.com")
+- if err != nil {
+- t.Fatal("origin url", err)
+- }
+- config.Protocol = append(config.Protocol, "chat")
+- config.Protocol = append(config.Protocol, "superchat")
+- config.Version = ProtocolVersionHybi13
+- config.Header = http.Header(make(map[string][]string))
+- config.Header.Add("User-Agent", "test")
-
+- config.handshakeData = map[string]string{
+- "key": "dGhlIHNhbXBsZSBub25jZQ==",
+- }
+- err = hybiClientHandshake(config, br, bw)
+- if err != nil {
+- t.Errorf("handshake failed: %v", err)
+- }
+- req, err := http.ReadRequest(bufio.NewReader(b))
+- if err != nil {
+- t.Fatalf("read request: %v", err)
+- }
+- if req.Method != "GET" {
+- t.Errorf("request method expected GET, but got %q", req.Method)
+- }
+- if req.URL.Path != "/chat" {
+- t.Errorf("request path expected /chat, but got %q", req.URL.Path)
+- }
+- if req.Proto != "HTTP/1.1" {
+- t.Errorf("request proto expected HTTP/1.1, but got %q", req.Proto)
+- }
+- if req.Host != "server.example.com" {
+- t.Errorf("request Host expected server.example.com, but got %v", req.Host)
+- }
+- var expectedHeader = map[string]string{
+- "Connection": "Upgrade",
+- "Upgrade": "websocket",
+- "Sec-Websocket-Key": config.handshakeData["key"],
+- "Origin": config.Origin.String(),
+- "Sec-Websocket-Protocol": "chat, superchat",
+- "Sec-Websocket-Version": fmt.Sprintf("%d", ProtocolVersionHybi13),
+- "User-Agent": "test",
+- }
+- for k, v := range expectedHeader {
+- if req.Header.Get(k) != v {
+- t.Errorf(fmt.Sprintf("%s expected %q but got %q", k, v, req.Header.Get(k)))
+- }
+- }
-}
-
--func Test_Arguments_Bool(t *testing.T) {
+-func TestHybiServerHandshake(t *testing.T) {
+- config := new(Config)
+- handshaker := &hybiServerHandshaker{Config: config}
+- br := bufio.NewReader(strings.NewReader(`GET /chat HTTP/1.1
+-Host: server.example.com
+-Upgrade: websocket
+-Connection: Upgrade
+-Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==
+-Origin: http://example.com
+-Sec-WebSocket-Protocol: chat, superchat
+-Sec-WebSocket-Version: 13
-
-- var args Arguments = []interface{}{"string", 123, true}
-- assert.Equal(t, true, args.Bool(2))
+-`))
+- req, err := http.ReadRequest(br)
+- if err != nil {
+- t.Fatal("request", err)
+- }
+- code, err := handshaker.ReadHandshake(br, req)
+- if err != nil {
+- t.Errorf("handshake failed: %v", err)
+- }
+- if code != http.StatusSwitchingProtocols {
+- t.Errorf("status expected %q but got %q", http.StatusSwitchingProtocols, code)
+- }
+- expectedProtocols := []string{"chat", "superchat"}
+- if fmt.Sprintf("%v", config.Protocol) != fmt.Sprintf("%v", expectedProtocols) {
+- t.Errorf("protocol expected %q but got %q", expectedProtocols, config.Protocol)
+- }
+- b := bytes.NewBuffer([]byte{})
+- bw := bufio.NewWriter(b)
-
--}
-diff --git a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/.gitignore b/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/.gitignore
-deleted file mode 100644
-index 1f0a99f..0000000
---- a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/.gitignore
-+++ /dev/null
-@@ -1,4 +0,0 @@
--[568].out
--_go*
--_test*
--_obj
-diff --git a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/License b/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/License
-deleted file mode 100644
-index 480a328..0000000
---- a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/License
-+++ /dev/null
-@@ -1,19 +0,0 @@
--Copyright 2012 Keith Rarick
+- config.Protocol = config.Protocol[:1]
-
--Permission is hereby granted, free of charge, to any person obtaining a copy
--of this software and associated documentation files (the "Software"), to deal
--in the Software without restriction, including without limitation the rights
--to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
--copies of the Software, and to permit persons to whom the Software is
--furnished to do so, subject to the following conditions:
+- err = handshaker.AcceptHandshake(bw)
+- if err != nil {
+- t.Errorf("handshake response failed: %v", err)
+- }
+- expectedResponse := strings.Join([]string{
+- "HTTP/1.1 101 Switching Protocols",
+- "Upgrade: websocket",
+- "Connection: Upgrade",
+- "Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=",
+- "Sec-WebSocket-Protocol: chat",
+- "", ""}, "\r\n")
-
--The above copyright notice and this permission notice shall be included in
--all copies or substantial portions of the Software.
+- if b.String() != expectedResponse {
+- t.Errorf("handshake expected %q but got %q", expectedResponse, b.String())
+- }
+-}
-
--THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
--IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
--AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
--LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
--OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
--THE SOFTWARE.
-diff --git a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/Readme b/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/Readme
-deleted file mode 100644
-index c589fc6..0000000
---- a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/Readme
-+++ /dev/null
-@@ -1,9 +0,0 @@
--package pretty
+-func TestHybiServerHandshakeNoSubProtocol(t *testing.T) {
+- config := new(Config)
+- handshaker := &hybiServerHandshaker{Config: config}
+- br := bufio.NewReader(strings.NewReader(`GET /chat HTTP/1.1
+-Host: server.example.com
+-Upgrade: websocket
+-Connection: Upgrade
+-Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==
+-Origin: http://example.com
+-Sec-WebSocket-Version: 13
-
-- import "github.com/kr/pretty"
+-`))
+- req, err := http.ReadRequest(br)
+- if err != nil {
+- t.Fatal("request", err)
+- }
+- code, err := handshaker.ReadHandshake(br, req)
+- if err != nil {
+- t.Errorf("handshake failed: %v", err)
+- }
+- if code != http.StatusSwitchingProtocols {
+- t.Errorf("status expected %q but got %q", http.StatusSwitchingProtocols, code)
+- }
+- if len(config.Protocol) != 0 {
+- t.Errorf("len(config.Protocol) expected 0, but got %q", len(config.Protocol))
+- }
+- b := bytes.NewBuffer([]byte{})
+- bw := bufio.NewWriter(b)
-
-- Package pretty provides pretty-printing for Go values.
+- err = handshaker.AcceptHandshake(bw)
+- if err != nil {
+- t.Errorf("handshake response failed: %v", err)
+- }
+- expectedResponse := strings.Join([]string{
+- "HTTP/1.1 101 Switching Protocols",
+- "Upgrade: websocket",
+- "Connection: Upgrade",
+- "Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=",
+- "", ""}, "\r\n")
-
--Documentation
+- if b.String() != expectedResponse {
+- t.Errorf("handshake expected %q but got %q", expectedResponse, b.String())
+- }
+-}
-
-- http://godoc.org/github.com/kr/pretty
-diff --git a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/changelog b/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/changelog
-deleted file mode 100644
-index 9350c05..0000000
---- a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/changelog
-+++ /dev/null
-@@ -1,5 +0,0 @@
--golang-pretty (0.0~git20130613-1) unstable; urgency=low
+-func TestHybiServerHandshakeHybiBadVersion(t *testing.T) {
+- config := new(Config)
+- handshaker := &hybiServerHandshaker{Config: config}
+- br := bufio.NewReader(strings.NewReader(`GET /chat HTTP/1.1
+-Host: server.example.com
+-Upgrade: websocket
+-Connection: Upgrade
+-Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==
+-Sec-WebSocket-Origin: http://example.com
+-Sec-WebSocket-Protocol: chat, superchat
+-Sec-WebSocket-Version: 9
-
-- * Initial release. Closes: #722983
+-`))
+- req, err := http.ReadRequest(br)
+- if err != nil {
+- t.Fatal("request", err)
+- }
+- code, err := handshaker.ReadHandshake(br, req)
+- if err != ErrBadWebSocketVersion {
+- t.Errorf("handshake expected err %q but got %q", ErrBadWebSocketVersion, err)
+- }
+- if code != http.StatusBadRequest {
+- t.Errorf("status expected %q but got %q", http.StatusBadRequest, code)
+- }
+-}
-
-- -- Tonnerre Lombard <tonnerre at ancient-solutions.com> Wed, 11 Sep 2013 02:36:12 +0200
-diff --git a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/compat b/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/compat
-deleted file mode 100644
-index ec63514..0000000
---- a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/compat
-+++ /dev/null
-@@ -1 +0,0 @@
--9
-diff --git a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/control b/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/control
-deleted file mode 100644
-index a852fe7..0000000
---- a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/control
-+++ /dev/null
-@@ -1,22 +0,0 @@
--Source: golang-pretty
--Section: devel
--Priority: extra
--Maintainer: Tonnerre Lombard <tonnerre at ancient-solutions.com>
--Build-Depends: debhelper (>= 9), golang-go, dh-golang,
-- golang-text-dev
--Standards-Version: 3.9.4
--Homepage: https://github.com/kr/pretty/
--Vcs-Git: git://anonscm.debian.org/pkg-go/packages/golang-pretty.git
--Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-go/packages/golang-pretty.git;a=summary
+-func testHybiFrame(t *testing.T, testHeader, testPayload, testMaskedPayload []byte, frameHeader *hybiFrameHeader) {
+- b := bytes.NewBuffer([]byte{})
+- frameWriterFactory := &hybiFrameWriterFactory{bufio.NewWriter(b), false}
+- w, _ := frameWriterFactory.NewFrameWriter(TextFrame)
+- w.(*hybiFrameWriter).header = frameHeader
+- _, err := w.Write(testPayload)
+- w.Close()
+- if err != nil {
+- t.Errorf("Write error %q", err)
+- }
+- var expectedFrame []byte
+- expectedFrame = append(expectedFrame, testHeader...)
+- expectedFrame = append(expectedFrame, testMaskedPayload...)
+- if !bytes.Equal(expectedFrame, b.Bytes()) {
+- t.Errorf("frame expected %q got %q", expectedFrame, b.Bytes())
+- }
+- frameReaderFactory := &hybiFrameReaderFactory{bufio.NewReader(b)}
+- r, err := frameReaderFactory.NewFrameReader()
+- if err != nil {
+- t.Errorf("Read error %q", err)
+- }
+- if header := r.HeaderReader(); header == nil {
+- t.Errorf("no header")
+- } else {
+- actualHeader := make([]byte, r.Len())
+- n, err := header.Read(actualHeader)
+- if err != nil {
+- t.Errorf("Read header error %q", err)
+- } else {
+- if n < len(testHeader) {
+- t.Errorf("header too short %q got %q", testHeader, actualHeader[:n])
+- }
+- if !bytes.Equal(testHeader, actualHeader[:n]) {
+- t.Errorf("header expected %q got %q", testHeader, actualHeader[:n])
+- }
+- }
+- }
+- if trailer := r.TrailerReader(); trailer != nil {
+- t.Errorf("unexpected trailer %q", trailer)
+- }
+- frame := r.(*hybiFrameReader)
+- if frameHeader.Fin != frame.header.Fin ||
+- frameHeader.OpCode != frame.header.OpCode ||
+- len(testPayload) != int(frame.header.Length) {
+- t.Errorf("mismatch %v (%d) vs %v", frameHeader, len(testPayload), frame)
+- }
+- payload := make([]byte, len(testPayload))
+- _, err = r.Read(payload)
+- if err != nil {
+- t.Errorf("read %v", err)
+- }
+- if !bytes.Equal(testPayload, payload) {
+- t.Errorf("payload %q vs %q", testPayload, payload)
+- }
+-}
-
--Package: golang-pretty-dev
--Architecture: all
--Depends: ${shlibs:Depends}, ${misc:Depends}, golang-text-dev
--Description: Pretty printing for go values
-- Package pretty provides pretty-printing for Go values. This is useful
-- during debugging, to avoid wrapping long output lines in the
-- terminal.
-- .
-- It provides a function, Formatter, that can be used with any function
-- that accepts a format string. It also provides convenience wrappers
-- for functions in packages fmt and log.
-diff --git a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/copyright b/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/copyright
-deleted file mode 100644
-index 80b0807..0000000
---- a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/copyright
-+++ /dev/null
-@@ -1,30 +0,0 @@
--Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
--Upstream-Name: golang-pretty
--Source: https://github.com/kr/pretty/
+-func TestHybiShortTextFrame(t *testing.T) {
+- frameHeader := &hybiFrameHeader{Fin: true, OpCode: TextFrame}
+- payload := []byte("hello")
+- testHybiFrame(t, []byte{0x81, 0x05}, payload, payload, frameHeader)
-
--Files: *
--Copyright: 2011, 2012, 2013 Keith Rarick <kr at xph.us>
--License: Expat
+- payload = make([]byte, 125)
+- testHybiFrame(t, []byte{0x81, 125}, payload, payload, frameHeader)
+-}
-
--Files: debian/*
--Copyright: 2013 Tonnerre Lombard <tonnerre at ancient-solutions.com>
--License: Expat
+-func TestHybiShortMaskedTextFrame(t *testing.T) {
+- frameHeader := &hybiFrameHeader{Fin: true, OpCode: TextFrame,
+- MaskingKey: []byte{0xcc, 0x55, 0x80, 0x20}}
+- payload := []byte("hello")
+- maskedPayload := []byte{0xa4, 0x30, 0xec, 0x4c, 0xa3}
+- header := []byte{0x81, 0x85}
+- header = append(header, frameHeader.MaskingKey...)
+- testHybiFrame(t, header, payload, maskedPayload, frameHeader)
+-}
-
--License: Expat
-- Permission is hereby granted, free of charge, to any person obtaining a copy
-- of this software and associated documentation files (the "Software"), to deal
-- in the Software without restriction, including without limitation the rights
-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-- copies of the Software, and to permit persons to whom the Software is
-- furnished to do so, subject to the following conditions:
-- .
-- The above copyright notice and this permission notice shall be included in
-- all copies or substantial portions of the Software.
-- .
-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-- THE SOFTWARE.
-diff --git a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/docs b/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/docs
-deleted file mode 100644
-index 304360c..0000000
---- a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/docs
-+++ /dev/null
-@@ -1 +0,0 @@
--Readme
-diff --git a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/rules b/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/rules
-deleted file mode 100644
-index c48a3ad..0000000
---- a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/rules
-+++ /dev/null
-@@ -1,11 +0,0 @@
--#!/usr/bin/make -f
+-func TestHybiShortBinaryFrame(t *testing.T) {
+- frameHeader := &hybiFrameHeader{Fin: true, OpCode: BinaryFrame}
+- payload := []byte("hello")
+- testHybiFrame(t, []byte{0x82, 0x05}, payload, payload, frameHeader)
-
--# Uncomment this to turn on verbose mode.
--export DH_VERBOSE=1
+- payload = make([]byte, 125)
+- testHybiFrame(t, []byte{0x82, 125}, payload, payload, frameHeader)
+-}
-
--# DH_GOPKG is the upstream path which you would normally “go get”.
--# Using it allows us to build applications without patching locations.
--export DH_GOPKG := github.com/kr/pretty
+-func TestHybiControlFrame(t *testing.T) {
+- frameHeader := &hybiFrameHeader{Fin: true, OpCode: PingFrame}
+- payload := []byte("hello")
+- testHybiFrame(t, []byte{0x89, 0x05}, payload, payload, frameHeader)
-
--%:
-- dh $@ --buildsystem=golang --with=golang
-diff --git a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/source/format b/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/source/format
-deleted file mode 100644
-index 163aaf8..0000000
---- a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/debian/source/format
-+++ /dev/null
-@@ -1 +0,0 @@
--3.0 (quilt)
-diff --git a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/diff.go b/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/diff.go
-deleted file mode 100644
-index 64fac64..0000000
---- a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/diff.go
-+++ /dev/null
-@@ -1,148 +0,0 @@
--package pretty
+- frameHeader = &hybiFrameHeader{Fin: true, OpCode: PongFrame}
+- testHybiFrame(t, []byte{0x8A, 0x05}, payload, payload, frameHeader)
-
--import (
-- "fmt"
-- "io"
-- "reflect"
--)
+- frameHeader = &hybiFrameHeader{Fin: true, OpCode: CloseFrame}
+- payload = []byte{0x03, 0xe8} // 1000
+- testHybiFrame(t, []byte{0x88, 0x02}, payload, payload, frameHeader)
+-}
-
--type sbuf []string
+-func TestHybiLongFrame(t *testing.T) {
+- frameHeader := &hybiFrameHeader{Fin: true, OpCode: TextFrame}
+- payload := make([]byte, 126)
+- testHybiFrame(t, []byte{0x81, 126, 0x00, 126}, payload, payload, frameHeader)
-
--func (s *sbuf) Write(b []byte) (int, error) {
-- *s = append(*s, string(b))
-- return len(b), nil
--}
+- payload = make([]byte, 65535)
+- testHybiFrame(t, []byte{0x81, 126, 0xff, 0xff}, payload, payload, frameHeader)
-
--// Diff returns a slice where each element describes
--// a difference between a and b.
--func Diff(a, b interface{}) (desc []string) {
-- Fdiff((*sbuf)(&desc), a, b)
-- return desc
+- payload = make([]byte, 65536)
+- testHybiFrame(t, []byte{0x81, 127, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00}, payload, payload, frameHeader)
-}
-
--// Fdiff writes to w a description of the differences between a and b.
--func Fdiff(w io.Writer, a, b interface{}) {
-- diffWriter{w: w}.diff(reflect.ValueOf(a), reflect.ValueOf(b))
--}
+-func TestHybiClientRead(t *testing.T) {
+- wireData := []byte{0x81, 0x05, 'h', 'e', 'l', 'l', 'o',
+- 0x89, 0x05, 'h', 'e', 'l', 'l', 'o', // ping
+- 0x81, 0x05, 'w', 'o', 'r', 'l', 'd'}
+- br := bufio.NewReader(bytes.NewBuffer(wireData))
+- bw := bufio.NewWriter(bytes.NewBuffer([]byte{}))
+- conn := newHybiConn(newConfig(t, "/"), bufio.NewReadWriter(br, bw), nil, nil)
-
--type diffWriter struct {
-- w io.Writer
-- l string // label
+- msg := make([]byte, 512)
+- n, err := conn.Read(msg)
+- if err != nil {
+- t.Errorf("read 1st frame, error %q", err)
+- }
+- if n != 5 {
+- t.Errorf("read 1st frame, expect 5, got %d", n)
+- }
+- if !bytes.Equal(wireData[2:7], msg[:n]) {
+- t.Errorf("read 1st frame %v, got %v", wireData[2:7], msg[:n])
+- }
+- n, err = conn.Read(msg)
+- if err != nil {
+- t.Errorf("read 2nd frame, error %q", err)
+- }
+- if n != 5 {
+- t.Errorf("read 2nd frame, expect 5, got %d", n)
+- }
+- if !bytes.Equal(wireData[16:21], msg[:n]) {
+- t.Errorf("read 2nd frame %v, got %v", wireData[16:21], msg[:n])
+- }
+- n, err = conn.Read(msg)
+- if err == nil {
+- t.Errorf("read not EOF")
+- }
+- if n != 0 {
+- t.Errorf("expect read 0, got %d", n)
+- }
-}
-
--func (w diffWriter) printf(f string, a ...interface{}) {
-- var l string
-- if w.l != "" {
-- l = w.l + ": "
+-func TestHybiShortRead(t *testing.T) {
+- wireData := []byte{0x81, 0x05, 'h', 'e', 'l', 'l', 'o',
+- 0x89, 0x05, 'h', 'e', 'l', 'l', 'o', // ping
+- 0x81, 0x05, 'w', 'o', 'r', 'l', 'd'}
+- br := bufio.NewReader(bytes.NewBuffer(wireData))
+- bw := bufio.NewWriter(bytes.NewBuffer([]byte{}))
+- conn := newHybiConn(newConfig(t, "/"), bufio.NewReadWriter(br, bw), nil, nil)
+-
+- step := 0
+- pos := 0
+- expectedPos := []int{2, 5, 16, 19}
+- expectedLen := []int{3, 2, 3, 2}
+- for {
+- msg := make([]byte, 3)
+- n, err := conn.Read(msg)
+- if step >= len(expectedPos) {
+- if err == nil {
+- t.Errorf("read not EOF")
+- }
+- if n != 0 {
+- t.Errorf("expect read 0, got %d", n)
+- }
+- return
+- }
+- pos = expectedPos[step]
+- endPos := pos + expectedLen[step]
+- if err != nil {
+- t.Errorf("read from %d, got error %q", pos, err)
+- return
+- }
+- if n != endPos-pos {
+- t.Errorf("read from %d, expect %d, got %d", pos, endPos-pos, n)
+- }
+- if !bytes.Equal(wireData[pos:endPos], msg[:n]) {
+- t.Errorf("read from %d, frame %v, got %v", pos, wireData[pos:endPos], msg[:n])
+- }
+- step++
- }
-- fmt.Fprintf(w.w, l+f, a...)
-}
-
--func (w diffWriter) diff(av, bv reflect.Value) {
-- if !av.IsValid() && bv.IsValid() {
-- w.printf("nil != %#v", bv.Interface())
-- return
+-func TestHybiServerRead(t *testing.T) {
+- wireData := []byte{0x81, 0x85, 0xcc, 0x55, 0x80, 0x20,
+- 0xa4, 0x30, 0xec, 0x4c, 0xa3, // hello
+- 0x89, 0x85, 0xcc, 0x55, 0x80, 0x20,
+- 0xa4, 0x30, 0xec, 0x4c, 0xa3, // ping: hello
+- 0x81, 0x85, 0xed, 0x83, 0xb4, 0x24,
+- 0x9a, 0xec, 0xc6, 0x48, 0x89, // world
- }
-- if av.IsValid() && !bv.IsValid() {
-- w.printf("%#v != nil", av.Interface())
-- return
+- br := bufio.NewReader(bytes.NewBuffer(wireData))
+- bw := bufio.NewWriter(bytes.NewBuffer([]byte{}))
+- conn := newHybiConn(newConfig(t, "/"), bufio.NewReadWriter(br, bw), nil, new(http.Request))
+-
+- expected := [][]byte{[]byte("hello"), []byte("world")}
+-
+- msg := make([]byte, 512)
+- n, err := conn.Read(msg)
+- if err != nil {
+- t.Errorf("read 1st frame, error %q", err)
- }
-- if !av.IsValid() && !bv.IsValid() {
-- return
+- if n != 5 {
+- t.Errorf("read 1st frame, expect 5, got %d", n)
- }
--
-- at := av.Type()
-- bt := bv.Type()
-- if at != bt {
-- w.printf("%v != %v", at, bt)
-- return
+- if !bytes.Equal(expected[0], msg[:n]) {
+- t.Errorf("read 1st frame %q, got %q", expected[0], msg[:n])
- }
-
-- // numeric types, including bool
-- if at.Kind() < reflect.Array {
-- a, b := av.Interface(), bv.Interface()
-- if a != b {
-- w.printf("%#v != %#v", a, b)
-- }
-- return
+- n, err = conn.Read(msg)
+- if err != nil {
+- t.Errorf("read 2nd frame, error %q", err)
+- }
+- if n != 5 {
+- t.Errorf("read 2nd frame, expect 5, got %d", n)
+- }
+- if !bytes.Equal(expected[1], msg[:n]) {
+- t.Errorf("read 2nd frame %q, got %q", expected[1], msg[:n])
- }
-
-- switch at.Kind() {
-- case reflect.String:
-- a, b := av.Interface(), bv.Interface()
-- if a != b {
-- w.printf("%q != %q", a, b)
-- }
-- case reflect.Ptr:
-- switch {
-- case av.IsNil() && !bv.IsNil():
-- w.printf("nil != %v", bv.Interface())
-- case !av.IsNil() && bv.IsNil():
-- w.printf("%v != nil", av.Interface())
-- case !av.IsNil() && !bv.IsNil():
-- w.diff(av.Elem(), bv.Elem())
-- }
-- case reflect.Struct:
-- for i := 0; i < av.NumField(); i++ {
-- w.relabel(at.Field(i).Name).diff(av.Field(i), bv.Field(i))
-- }
-- case reflect.Map:
-- ak, both, bk := keyDiff(av.MapKeys(), bv.MapKeys())
-- for _, k := range ak {
-- w := w.relabel(fmt.Sprintf("[%#v]", k.Interface()))
-- w.printf("%q != (missing)", av.MapIndex(k))
-- }
-- for _, k := range both {
-- w := w.relabel(fmt.Sprintf("[%#v]", k.Interface()))
-- w.diff(av.MapIndex(k), bv.MapIndex(k))
-- }
-- for _, k := range bk {
-- w := w.relabel(fmt.Sprintf("[%#v]", k.Interface()))
-- w.printf("(missing) != %q", bv.MapIndex(k))
-- }
-- case reflect.Interface:
-- w.diff(reflect.ValueOf(av.Interface()), reflect.ValueOf(bv.Interface()))
-- default:
-- if !reflect.DeepEqual(av.Interface(), bv.Interface()) {
-- w.printf("%# v != %# v", Formatter(av.Interface()), Formatter(bv.Interface()))
-- }
+- n, err = conn.Read(msg)
+- if err == nil {
+- t.Errorf("read not EOF")
+- }
+- if n != 0 {
+- t.Errorf("expect read 0, got %d", n)
- }
-}
-
--func (d diffWriter) relabel(name string) (d1 diffWriter) {
-- d1 = d
-- if d.l != "" && name[0] != '[' {
-- d1.l += "."
+-func TestHybiServerReadWithoutMasking(t *testing.T) {
+- wireData := []byte{0x81, 0x05, 'h', 'e', 'l', 'l', 'o'}
+- br := bufio.NewReader(bytes.NewBuffer(wireData))
+- bw := bufio.NewWriter(bytes.NewBuffer([]byte{}))
+- conn := newHybiConn(newConfig(t, "/"), bufio.NewReadWriter(br, bw), nil, new(http.Request))
+- // server MUST close the connection upon receiving a non-masked frame.
+- msg := make([]byte, 512)
+- _, err := conn.Read(msg)
+- if err != io.EOF {
+- t.Errorf("read 1st frame, expect %q, but got %q", io.EOF, err)
- }
-- d1.l += name
-- return d1
-}
-
--func keyDiff(a, b []reflect.Value) (ak, both, bk []reflect.Value) {
-- for _, av := range a {
-- inBoth := false
-- for _, bv := range b {
-- if reflect.DeepEqual(av.Interface(), bv.Interface()) {
-- inBoth = true
-- both = append(both, av)
-- break
-- }
-- }
-- if !inBoth {
-- ak = append(ak, av)
-- }
+-func TestHybiClientReadWithMasking(t *testing.T) {
+- wireData := []byte{0x81, 0x85, 0xcc, 0x55, 0x80, 0x20,
+- 0xa4, 0x30, 0xec, 0x4c, 0xa3, // hello
- }
-- for _, bv := range b {
-- inBoth := false
-- for _, av := range a {
-- if reflect.DeepEqual(av.Interface(), bv.Interface()) {
-- inBoth = true
-- break
-- }
-- }
-- if !inBoth {
-- bk = append(bk, bv)
-- }
+- br := bufio.NewReader(bytes.NewBuffer(wireData))
+- bw := bufio.NewWriter(bytes.NewBuffer([]byte{}))
+- conn := newHybiConn(newConfig(t, "/"), bufio.NewReadWriter(br, bw), nil, nil)
+-
+- // client MUST close the connection upon receiving a masked frame.
+- msg := make([]byte, 512)
+- _, err := conn.Read(msg)
+- if err != io.EOF {
+- t.Errorf("read 1st frame, expect %q, but got %q", io.EOF, err)
- }
-- return
-}
-diff --git a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/diff_test.go b/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/diff_test.go
-deleted file mode 100644
-index 02d1953..0000000
---- a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/diff_test.go
-+++ /dev/null
-@@ -1,73 +0,0 @@
--package pretty
-
--import (
-- "testing"
--)
+-// Test the hybiServerHandshaker supports firefox implementation and
+-// checks Connection request header include (but it's not necessary
+-// equal to) "upgrade"
+-func TestHybiServerFirefoxHandshake(t *testing.T) {
+- config := new(Config)
+- handshaker := &hybiServerHandshaker{Config: config}
+- br := bufio.NewReader(strings.NewReader(`GET /chat HTTP/1.1
+-Host: server.example.com
+-Upgrade: websocket
+-Connection: keep-alive, upgrade
+-Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==
+-Origin: http://example.com
+-Sec-WebSocket-Protocol: chat, superchat
+-Sec-WebSocket-Version: 13
-
--type difftest struct {
-- a interface{}
-- b interface{}
-- exp []string
--}
+-`))
+- req, err := http.ReadRequest(br)
+- if err != nil {
+- t.Fatal("request", err)
+- }
+- code, err := handshaker.ReadHandshake(br, req)
+- if err != nil {
+- t.Errorf("handshake failed: %v", err)
+- }
+- if code != http.StatusSwitchingProtocols {
+- t.Errorf("status expected %q but got %q", http.StatusSwitchingProtocols, code)
+- }
+- b := bytes.NewBuffer([]byte{})
+- bw := bufio.NewWriter(b)
-
--type S struct {
-- A int
-- S *S
-- I interface{}
-- C []int
--}
+- config.Protocol = []string{"chat"}
-
--var diffs = []difftest{
-- {a: nil, b: nil},
-- {a: S{A: 1}, b: S{A: 1}},
+- err = handshaker.AcceptHandshake(bw)
+- if err != nil {
+- t.Errorf("handshake response failed: %v", err)
+- }
+- expectedResponse := strings.Join([]string{
+- "HTTP/1.1 101 Switching Protocols",
+- "Upgrade: websocket",
+- "Connection: Upgrade",
+- "Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=",
+- "Sec-WebSocket-Protocol: chat",
+- "", ""}, "\r\n")
-
-- {0, "", []string{`int != string`}},
-- {0, 1, []string{`0 != 1`}},
-- {S{}, new(S), []string{`pretty.S != *pretty.S`}},
-- {"a", "b", []string{`"a" != "b"`}},
-- {S{}, S{A: 1}, []string{`A: 0 != 1`}},
-- {new(S), &S{A: 1}, []string{`A: 0 != 1`}},
-- {S{S: new(S)}, S{S: &S{A: 1}}, []string{`S.A: 0 != 1`}},
-- {S{}, S{I: 0}, []string{`I: nil != 0`}},
-- {S{I: 1}, S{I: "x"}, []string{`I: int != string`}},
-- {S{}, S{C: []int{1}}, []string{`C: []int(nil) != []int{1}`}},
-- {S{C: []int{}}, S{C: []int{1}}, []string{`C: []int{} != []int{1}`}},
-- {S{}, S{A: 1, S: new(S)}, []string{`A: 0 != 1`, `S: nil != &{0 <nil> <nil> []}`}},
+- if b.String() != expectedResponse {
+- t.Errorf("handshake expected %q but got %q", expectedResponse, b.String())
+- }
-}
+diff --git a/Godeps/_workspace/src/golang.org/x/net/websocket/server.go b/Godeps/_workspace/src/golang.org/x/net/websocket/server.go
+deleted file mode 100644
+index 7032213..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/websocket/server.go
++++ /dev/null
+@@ -1,114 +0,0 @@
+-// Copyright 2009 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
-
--func TestDiff(t *testing.T) {
-- for _, tt := range diffs {
-- got := Diff(tt.a, tt.b)
-- eq := len(got) == len(tt.exp)
-- if eq {
-- for i := range got {
-- eq = eq && got[i] == tt.exp[i]
-- }
-- }
-- if !eq {
-- t.Errorf("diffing % #v", tt.a)
-- t.Errorf("with % #v", tt.b)
-- diffdiff(t, got, tt.exp)
-- continue
+-package websocket
+-
+-import (
+- "bufio"
+- "fmt"
+- "io"
+- "net/http"
+-)
+-
+-func newServerConn(rwc io.ReadWriteCloser, buf *bufio.ReadWriter, req *http.Request, config *Config, handshake func(*Config, *http.Request) error) (conn *Conn, err error) {
+- var hs serverHandshaker = &hybiServerHandshaker{Config: config}
+- code, err := hs.ReadHandshake(buf.Reader, req)
+- if err == ErrBadWebSocketVersion {
+- fmt.Fprintf(buf, "HTTP/1.1 %03d %s\r\n", code, http.StatusText(code))
+- fmt.Fprintf(buf, "Sec-WebSocket-Version: %s\r\n", SupportedProtocolVersion)
+- buf.WriteString("\r\n")
+- buf.WriteString(err.Error())
+- buf.Flush()
+- return
+- }
+- if err != nil {
+- fmt.Fprintf(buf, "HTTP/1.1 %03d %s\r\n", code, http.StatusText(code))
+- buf.WriteString("\r\n")
+- buf.WriteString(err.Error())
+- buf.Flush()
+- return
+- }
+- if handshake != nil {
+- err = handshake(config, req)
+- if err != nil {
+- code = http.StatusForbidden
+- fmt.Fprintf(buf, "HTTP/1.1 %03d %s\r\n", code, http.StatusText(code))
+- buf.WriteString("\r\n")
+- buf.Flush()
+- return
- }
- }
+- err = hs.AcceptHandshake(buf.Writer)
+- if err != nil {
+- code = http.StatusBadRequest
+- fmt.Fprintf(buf, "HTTP/1.1 %03d %s\r\n", code, http.StatusText(code))
+- buf.WriteString("\r\n")
+- buf.Flush()
+- return
+- }
+- conn = hs.NewServerConn(buf, rwc, req)
+- return
-}
-
--func diffdiff(t *testing.T, got, exp []string) {
-- minus(t, "unexpected:", got, exp)
-- minus(t, "missing:", exp, got)
+-// Server represents a server of a WebSocket.
+-type Server struct {
+- // Config is a WebSocket configuration for new WebSocket connection.
+- Config
+-
+- // Handshake is an optional function in WebSocket handshake.
+- // For example, you can check, or don't check Origin header.
+- // Another example, you can select config.Protocol.
+- Handshake func(*Config, *http.Request) error
+-
+- // Handler handles a WebSocket connection.
+- Handler
-}
-
--func minus(t *testing.T, s string, a, b []string) {
-- var i, j int
-- for i = 0; i < len(a); i++ {
-- for j = 0; j < len(b); j++ {
-- if a[i] == b[j] {
-- break
-- }
-- }
-- if j == len(b) {
-- t.Error(s, a[i])
-- }
+-// ServeHTTP implements the http.Handler interface for a WebSocket
+-func (s Server) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+- s.serveWebSocket(w, req)
+-}
+-
+-func (s Server) serveWebSocket(w http.ResponseWriter, req *http.Request) {
+- rwc, buf, err := w.(http.Hijacker).Hijack()
+- if err != nil {
+- panic("Hijack failed: " + err.Error())
+- return
+- }
+- // The server should abort the WebSocket connection if it finds
+- // the client did not send a handshake that matches with protocol
+- // specification.
+- defer rwc.Close()
+- conn, err := newServerConn(rwc, buf, req, &s.Config, s.Handshake)
+- if err != nil {
+- return
+- }
+- if conn == nil {
+- panic("unexpected nil conn")
- }
+- s.Handler(conn)
-}
-diff --git a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/example_test.go b/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/example_test.go
-deleted file mode 100644
-index ecf40f3..0000000
---- a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/example_test.go
-+++ /dev/null
-@@ -1,20 +0,0 @@
--package pretty_test
-
--import (
-- "fmt"
-- "github.com/kr/pretty"
--)
+-// Handler is a simple interface to a WebSocket browser client.
+-// It checks if Origin header is valid URL by default.
+-// You might want to verify websocket.Conn.Config().Origin in the func.
+-// If you use Server instead of Handler, you could call websocket.Origin and
+-// check the origin in your Handshake func. So, if you want to accept
+-// non-browser client, which doesn't send Origin header, you could use Server
+-//. that doesn't check origin in its Handshake.
+-type Handler func(*Conn)
-
--func Example() {
-- type myType struct {
-- a, b int
+-func checkOrigin(config *Config, req *http.Request) (err error) {
+- config.Origin, err = Origin(config, req)
+- if err == nil && config.Origin == nil {
+- return fmt.Errorf("null origin")
- }
-- var x = []myType{{1, 2}, {3, 4}, {5, 6}}
-- fmt.Printf("%# v", pretty.Formatter(x))
-- // output:
-- // []pretty_test.myType{
-- // {a:1, b:2},
-- // {a:3, b:4},
-- // {a:5, b:6},
-- // }
+- return err
-}
-diff --git a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/formatter.go b/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/formatter.go
+-
+-// ServeHTTP implements the http.Handler interface for a WebSocket
+-func (h Handler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+- s := Server{Handler: h, Handshake: checkOrigin}
+- s.serveWebSocket(w, req)
+-}
+diff --git a/Godeps/_workspace/src/golang.org/x/net/websocket/websocket.go b/Godeps/_workspace/src/golang.org/x/net/websocket/websocket.go
deleted file mode 100644
-index 1161de7..0000000
---- a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/formatter.go
+index 0f4917b..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/websocket/websocket.go
+++ /dev/null
-@@ -1,300 +0,0 @@
--package pretty
+@@ -1,411 +0,0 @@
+-// Copyright 2009 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-// Package websocket implements a client and server for the WebSocket protocol
+-// as specified in RFC 6455.
+-package websocket
-
-import (
-- "fmt"
-- "github.com/kr/text"
+- "bufio"
+- "crypto/tls"
+- "encoding/json"
+- "errors"
- "io"
-- "reflect"
-- "strconv"
-- "text/tabwriter"
+- "io/ioutil"
+- "net"
+- "net/http"
+- "net/url"
+- "sync"
+- "time"
-)
-
-const (
-- limit = 50
+- ProtocolVersionHybi13 = 13
+- ProtocolVersionHybi = ProtocolVersionHybi13
+- SupportedProtocolVersion = "13"
+-
+- ContinuationFrame = 0
+- TextFrame = 1
+- BinaryFrame = 2
+- CloseFrame = 8
+- PingFrame = 9
+- PongFrame = 10
+- UnknownFrame = 255
-)
-
--type formatter struct {
-- x interface{}
-- force bool
-- quote bool
+-// ProtocolError represents WebSocket protocol errors.
+-type ProtocolError struct {
+- ErrorString string
-}
-
--// Formatter makes a wrapper, f, that will format x as go source with line
--// breaks and tabs. Object f responds to the "%v" formatting verb when both the
--// "#" and " " (space) flags are set, for example:
--//
--// fmt.Sprintf("%# v", Formatter(x))
--//
--// If one of these two flags is not set, or any other verb is used, f will
--// format x according to the usual rules of package fmt.
--// In particular, if x satisfies fmt.Formatter, then x.Format will be called.
--func Formatter(x interface{}) (f fmt.Formatter) {
-- return formatter{x: x, quote: true}
--}
+-func (err *ProtocolError) Error() string { return err.ErrorString }
-
--func (fo formatter) String() string {
-- return fmt.Sprint(fo.x) // unwrap it
--}
+-var (
+- ErrBadProtocolVersion = &ProtocolError{"bad protocol version"}
+- ErrBadScheme = &ProtocolError{"bad scheme"}
+- ErrBadStatus = &ProtocolError{"bad status"}
+- ErrBadUpgrade = &ProtocolError{"missing or bad upgrade"}
+- ErrBadWebSocketOrigin = &ProtocolError{"missing or bad WebSocket-Origin"}
+- ErrBadWebSocketLocation = &ProtocolError{"missing or bad WebSocket-Location"}
+- ErrBadWebSocketProtocol = &ProtocolError{"missing or bad WebSocket-Protocol"}
+- ErrBadWebSocketVersion = &ProtocolError{"missing or bad WebSocket Version"}
+- ErrChallengeResponse = &ProtocolError{"mismatch challenge/response"}
+- ErrBadFrame = &ProtocolError{"bad frame"}
+- ErrBadFrameBoundary = &ProtocolError{"not on frame boundary"}
+- ErrNotWebSocket = &ProtocolError{"not websocket protocol"}
+- ErrBadRequestMethod = &ProtocolError{"bad method"}
+- ErrNotSupported = &ProtocolError{"not supported"}
+-)
-
--func (fo formatter) passThrough(f fmt.State, c rune) {
-- s := "%"
-- for i := 0; i < 128; i++ {
-- if f.Flag(i) {
-- s += string(i)
-- }
-- }
-- if w, ok := f.Width(); ok {
-- s += fmt.Sprintf("%d", w)
-- }
-- if p, ok := f.Precision(); ok {
-- s += fmt.Sprintf(".%d", p)
-- }
-- s += string(c)
-- fmt.Fprintf(f, s, fo.x)
+-// Addr is an implementation of net.Addr for WebSocket.
+-type Addr struct {
+- *url.URL
-}
-
--func (fo formatter) Format(f fmt.State, c rune) {
-- if fo.force || c == 'v' && f.Flag('#') && f.Flag(' ') {
-- w := tabwriter.NewWriter(f, 4, 4, 1, ' ', 0)
-- p := &printer{tw: w, Writer: w}
-- p.printValue(reflect.ValueOf(fo.x), true, fo.quote)
-- w.Flush()
-- return
-- }
-- fo.passThrough(f, c)
--}
+-// Network returns the network type for a WebSocket, "websocket".
+-func (addr *Addr) Network() string { return "websocket" }
-
--type printer struct {
-- io.Writer
-- tw *tabwriter.Writer
--}
+-// Config is a WebSocket configuration
+-type Config struct {
+- // A WebSocket server address.
+- Location *url.URL
-
--func (p *printer) indent() *printer {
-- q := *p
-- q.tw = tabwriter.NewWriter(p.Writer, 4, 4, 1, ' ', 0)
-- q.Writer = text.NewIndentWriter(q.tw, []byte{'\t'})
-- return &q
--}
+- // A Websocket client origin.
+- Origin *url.URL
-
--func (p *printer) printInline(v reflect.Value, x interface{}, showType bool) {
-- if showType {
-- io.WriteString(p, v.Type().String())
-- fmt.Fprintf(p, "(%#v)", x)
-- } else {
-- fmt.Fprintf(p, "%#v", x)
-- }
--}
+- // WebSocket subprotocols.
+- Protocol []string
-
--func (p *printer) printValue(v reflect.Value, showType, quote bool) {
-- switch v.Kind() {
-- case reflect.Bool:
-- p.printInline(v, v.Bool(), showType)
-- case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-- p.printInline(v, v.Int(), showType)
-- case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-- p.printInline(v, v.Uint(), showType)
-- case reflect.Float32, reflect.Float64:
-- p.printInline(v, v.Float(), showType)
-- case reflect.Complex64, reflect.Complex128:
-- fmt.Fprintf(p, "%#v", v.Complex())
-- case reflect.String:
-- p.fmtString(v.String(), quote)
-- case reflect.Map:
-- t := v.Type()
-- if showType {
-- io.WriteString(p, t.String())
-- }
-- writeByte(p, '{')
-- if nonzero(v) {
-- expand := !canInline(v.Type())
-- pp := p
-- if expand {
-- writeByte(p, '\n')
-- pp = p.indent()
-- }
-- keys := v.MapKeys()
-- for i := 0; i < v.Len(); i++ {
-- showTypeInStruct := true
-- k := keys[i]
-- mv := v.MapIndex(k)
-- pp.printValue(k, false, true)
-- writeByte(pp, ':')
-- if expand {
-- writeByte(pp, '\t')
-- }
-- showTypeInStruct = t.Elem().Kind() == reflect.Interface
-- pp.printValue(mv, showTypeInStruct, true)
-- if expand {
-- io.WriteString(pp, ",\n")
-- } else if i < v.Len()-1 {
-- io.WriteString(pp, ", ")
-- }
-- }
-- if expand {
-- pp.tw.Flush()
-- }
-- }
-- writeByte(p, '}')
-- case reflect.Struct:
-- t := v.Type()
-- if showType {
-- io.WriteString(p, t.String())
-- }
-- writeByte(p, '{')
-- if nonzero(v) {
-- expand := !canInline(v.Type())
-- pp := p
-- if expand {
-- writeByte(p, '\n')
-- pp = p.indent()
-- }
-- for i := 0; i < v.NumField(); i++ {
-- showTypeInStruct := true
-- if f := t.Field(i); f.Name != "" {
-- io.WriteString(pp, f.Name)
-- writeByte(pp, ':')
-- if expand {
-- writeByte(pp, '\t')
-- }
-- showTypeInStruct = f.Type.Kind() == reflect.Interface
-- }
-- pp.printValue(getField(v, i), showTypeInStruct, true)
-- if expand {
-- io.WriteString(pp, ",\n")
-- } else if i < v.NumField()-1 {
-- io.WriteString(pp, ", ")
-- }
-- }
-- if expand {
-- pp.tw.Flush()
-- }
-- }
-- writeByte(p, '}')
-- case reflect.Interface:
-- switch e := v.Elem(); {
-- case e.Kind() == reflect.Invalid:
-- io.WriteString(p, "nil")
-- case e.IsValid():
-- p.printValue(e, showType, true)
-- default:
-- io.WriteString(p, v.Type().String())
-- io.WriteString(p, "(nil)")
-- }
-- case reflect.Array, reflect.Slice:
-- t := v.Type()
-- if showType {
-- io.WriteString(p, t.String())
-- }
-- if v.Kind() == reflect.Slice && v.IsNil() && showType {
-- io.WriteString(p, "(nil)")
-- break
-- }
-- if v.Kind() == reflect.Slice && v.IsNil() {
-- io.WriteString(p, "nil")
-- break
-- }
-- writeByte(p, '{')
-- expand := !canInline(v.Type())
-- pp := p
-- if expand {
-- writeByte(p, '\n')
-- pp = p.indent()
-- }
-- for i := 0; i < v.Len(); i++ {
-- showTypeInSlice := t.Elem().Kind() == reflect.Interface
-- pp.printValue(v.Index(i), showTypeInSlice, true)
-- if expand {
-- io.WriteString(pp, ",\n")
-- } else if i < v.Len()-1 {
-- io.WriteString(pp, ", ")
-- }
-- }
-- if expand {
-- pp.tw.Flush()
-- }
-- writeByte(p, '}')
-- case reflect.Ptr:
-- e := v.Elem()
-- if !e.IsValid() {
-- writeByte(p, '(')
-- io.WriteString(p, v.Type().String())
-- io.WriteString(p, ")(nil)")
-- } else {
-- writeByte(p, '&')
-- p.printValue(e, true, true)
-- }
-- case reflect.Chan:
-- x := v.Pointer()
-- if showType {
-- writeByte(p, '(')
-- io.WriteString(p, v.Type().String())
-- fmt.Fprintf(p, ")(%#v)", x)
-- } else {
-- fmt.Fprintf(p, "%#v", x)
-- }
-- case reflect.Func:
-- io.WriteString(p, v.Type().String())
-- io.WriteString(p, " {...}")
-- case reflect.UnsafePointer:
-- p.printInline(v, v.Pointer(), showType)
-- case reflect.Invalid:
-- io.WriteString(p, "nil")
-- }
--}
+- // WebSocket protocol version.
+- Version int
-
--func canInline(t reflect.Type) bool {
-- switch t.Kind() {
-- case reflect.Map:
-- return !canExpand(t.Elem())
-- case reflect.Struct:
-- for i := 0; i < t.NumField(); i++ {
-- if canExpand(t.Field(i).Type) {
-- return false
-- }
-- }
-- return true
-- case reflect.Interface:
-- return false
-- case reflect.Array, reflect.Slice:
-- return !canExpand(t.Elem())
-- case reflect.Ptr:
-- return false
-- case reflect.Chan, reflect.Func, reflect.UnsafePointer:
-- return false
-- }
-- return true
--}
+- // TLS config for secure WebSocket (wss).
+- TlsConfig *tls.Config
-
--func canExpand(t reflect.Type) bool {
-- switch t.Kind() {
-- case reflect.Map, reflect.Struct,
-- reflect.Interface, reflect.Array, reflect.Slice,
-- reflect.Ptr:
-- return true
-- }
-- return false
--}
+- // Additional header fields to be sent in WebSocket opening handshake.
+- Header http.Header
-
--func (p *printer) fmtString(s string, quote bool) {
-- if quote {
-- s = strconv.Quote(s)
-- }
-- io.WriteString(p, s)
+- handshakeData map[string]string
-}
-
--func tryDeepEqual(a, b interface{}) bool {
-- defer func() { recover() }()
-- return reflect.DeepEqual(a, b)
--}
+-// serverHandshaker is an interface to handle WebSocket server side handshake.
+-type serverHandshaker interface {
+- // ReadHandshake reads handshake request message from client.
+- // Returns http response code and error if any.
+- ReadHandshake(buf *bufio.Reader, req *http.Request) (code int, err error)
-
--func writeByte(w io.Writer, b byte) {
-- w.Write([]byte{b})
--}
+- // AcceptHandshake accepts the client handshake request and sends
+- // handshake response back to client.
+- AcceptHandshake(buf *bufio.Writer) (err error)
-
--func getField(v reflect.Value, i int) reflect.Value {
-- val := v.Field(i)
-- if val.Kind() == reflect.Interface && !val.IsNil() {
-- val = val.Elem()
-- }
-- return val
+- // NewServerConn creates a new WebSocket connection.
+- NewServerConn(buf *bufio.ReadWriter, rwc io.ReadWriteCloser, request *http.Request) (conn *Conn)
-}
-diff --git a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/formatter_test.go b/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/formatter_test.go
-deleted file mode 100644
-index 303f033..0000000
---- a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/formatter_test.go
-+++ /dev/null
-@@ -1,146 +0,0 @@
--package pretty
-
--import (
-- "fmt"
-- "io"
-- "testing"
-- "unsafe"
--)
+-// frameReader is an interface to read a WebSocket frame.
+-type frameReader interface {
+- // Reader is to read payload of the frame.
+- io.Reader
-
--type test struct {
-- v interface{}
-- s string
+- // PayloadType returns payload type.
+- PayloadType() byte
+-
+- // HeaderReader returns a reader to read header of the frame.
+- HeaderReader() io.Reader
+-
+- // TrailerReader returns a reader to read trailer of the frame.
+- // If it returns nil, there is no trailer in the frame.
+- TrailerReader() io.Reader
+-
+- // Len returns total length of the frame, including header and trailer.
+- Len() int
-}
-
--type LongStructTypeName struct {
-- longFieldName interface{}
-- otherLongFieldName interface{}
+-// frameReaderFactory is an interface to creates new frame reader.
+-type frameReaderFactory interface {
+- NewFrameReader() (r frameReader, err error)
-}
-
--type SA struct {
-- t *T
+-// frameWriter is an interface to write a WebSocket frame.
+-type frameWriter interface {
+- // Writer is to write payload of the frame.
+- io.WriteCloser
+-}
+-
+-// frameWriterFactory is an interface to create new frame writer.
+-type frameWriterFactory interface {
+- NewFrameWriter(payloadType byte) (w frameWriter, err error)
-}
-
--type T struct {
-- x, y int
+-type frameHandler interface {
+- HandleFrame(frame frameReader) (r frameReader, err error)
+- WriteClose(status int) (err error)
-}
-
--type F int
+-// Conn represents a WebSocket connection.
+-type Conn struct {
+- config *Config
+- request *http.Request
-
--func (f F) Format(s fmt.State, c rune) {
-- fmt.Fprintf(s, "F(%d)", int(f))
--}
+- buf *bufio.ReadWriter
+- rwc io.ReadWriteCloser
-
--var long = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+- rio sync.Mutex
+- frameReaderFactory
+- frameReader
-
--var gosyntax = []test{
-- {nil, `nil`},
-- {"", `""`},
-- {"a", `"a"`},
-- {1, "int(1)"},
-- {1.0, "float64(1)"},
-- {[]int(nil), "[]int(nil)"},
-- {[0]int{}, "[0]int{}"},
-- {complex(1, 0), "(1+0i)"},
-- //{make(chan int), "(chan int)(0x1234)"},
-- {unsafe.Pointer(uintptr(1)), "unsafe.Pointer(0x1)"},
-- {func(int) {}, "func(int) {...}"},
-- {map[int]int{1: 1}, "map[int]int{1:1}"},
-- {int32(1), "int32(1)"},
-- {io.EOF, `&errors.errorString{s:"EOF"}`},
-- {[]string{"a"}, `[]string{"a"}`},
-- {
-- []string{long},
-- `[]string{"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"}`,
-- },
-- {F(5), "pretty.F(5)"},
-- {
-- SA{&T{1, 2}},
-- `pretty.SA{
-- t: &pretty.T{x:1, y:2},
--}`,
-- },
-- {
-- map[int][]byte{1: []byte{}},
-- `map[int][]uint8{
-- 1: {},
--}`,
-- },
-- {
-- map[int]T{1: T{}},
-- `map[int]pretty.T{
-- 1: {},
--}`,
-- },
-- {
-- long,
-- `"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"`,
-- },
-- {
-- LongStructTypeName{
-- longFieldName: LongStructTypeName{},
-- otherLongFieldName: long,
-- },
-- `pretty.LongStructTypeName{
-- longFieldName: pretty.LongStructTypeName{},
-- otherLongFieldName: "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789",
--}`,
-- },
-- {
-- &LongStructTypeName{
-- longFieldName: &LongStructTypeName{},
-- otherLongFieldName: (*LongStructTypeName)(nil),
-- },
-- `&pretty.LongStructTypeName{
-- longFieldName: &pretty.LongStructTypeName{},
-- otherLongFieldName: (*pretty.LongStructTypeName)(nil),
--}`,
-- },
-- {
-- []LongStructTypeName{
-- {nil, nil},
-- {3, 3},
-- {long, nil},
-- },
-- `[]pretty.LongStructTypeName{
-- {},
-- {
-- longFieldName: int(3),
-- otherLongFieldName: int(3),
-- },
-- {
-- longFieldName: "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789",
-- otherLongFieldName: nil,
-- },
--}`,
-- },
-- {
-- []interface{}{
-- LongStructTypeName{nil, nil},
-- []byte{1, 2, 3},
-- T{3, 4},
-- LongStructTypeName{long, nil},
-- },
-- `[]interface {}{
-- pretty.LongStructTypeName{},
-- []uint8{0x1, 0x2, 0x3},
-- pretty.T{x:3, y:4},
-- pretty.LongStructTypeName{
-- longFieldName: "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789",
-- otherLongFieldName: nil,
-- },
--}`,
-- },
+- wio sync.Mutex
+- frameWriterFactory
+-
+- frameHandler
+- PayloadType byte
+- defaultCloseStatus int
-}
-
--func TestGoSyntax(t *testing.T) {
-- for _, tt := range gosyntax {
-- s := fmt.Sprintf("%# v", Formatter(tt.v))
-- if tt.s != s {
-- t.Errorf("expected %q", tt.s)
-- t.Errorf("got %q", s)
-- t.Errorf("expraw\n%s", tt.s)
-- t.Errorf("gotraw\n%s", s)
+-// Read implements the io.Reader interface:
+-// it reads data of a frame from the WebSocket connection.
+-// if msg is not large enough for the frame data, it fills the msg and next Read
+-// will read the rest of the frame data.
+-// it reads Text frame or Binary frame.
+-func (ws *Conn) Read(msg []byte) (n int, err error) {
+- ws.rio.Lock()
+- defer ws.rio.Unlock()
+-again:
+- if ws.frameReader == nil {
+- frame, err := ws.frameReaderFactory.NewFrameReader()
+- if err != nil {
+- return 0, err
+- }
+- ws.frameReader, err = ws.frameHandler.HandleFrame(frame)
+- if err != nil {
+- return 0, err
+- }
+- if ws.frameReader == nil {
+- goto again
- }
- }
+- n, err = ws.frameReader.Read(msg)
+- if err == io.EOF {
+- if trailer := ws.frameReader.TrailerReader(); trailer != nil {
+- io.Copy(ioutil.Discard, trailer)
+- }
+- ws.frameReader = nil
+- goto again
+- }
+- return n, err
-}
-diff --git a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/pretty.go b/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/pretty.go
-deleted file mode 100644
-index d3df868..0000000
---- a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/pretty.go
-+++ /dev/null
-@@ -1,98 +0,0 @@
--// Package pretty provides pretty-printing for Go values. This is
--// useful during debugging, to avoid wrapping long output lines in
--// the terminal.
--//
--// It provides a function, Formatter, that can be used with any
--// function that accepts a format string. It also provides
--// convenience wrappers for functions in packages fmt and log.
--package pretty
--
--import (
-- "fmt"
-- "io"
-- "log"
--)
-
--// Errorf is a convenience wrapper for fmt.Errorf.
--//
--// Calling Errorf(f, x, y) is equivalent to
--// fmt.Errorf(f, Formatter(x), Formatter(y)).
--func Errorf(format string, a ...interface{}) error {
-- return fmt.Errorf(format, wrap(a, false)...)
+-// Write implements the io.Writer interface:
+-// it writes data as a frame to the WebSocket connection.
+-func (ws *Conn) Write(msg []byte) (n int, err error) {
+- ws.wio.Lock()
+- defer ws.wio.Unlock()
+- w, err := ws.frameWriterFactory.NewFrameWriter(ws.PayloadType)
+- if err != nil {
+- return 0, err
+- }
+- n, err = w.Write(msg)
+- w.Close()
+- if err != nil {
+- return n, err
+- }
+- return n, err
-}
-
--// Fprintf is a convenience wrapper for fmt.Fprintf.
--//
--// Calling Fprintf(w, f, x, y) is equivalent to
--// fmt.Fprintf(w, f, Formatter(x), Formatter(y)).
--func Fprintf(w io.Writer, format string, a ...interface{}) (n int, error error) {
-- return fmt.Fprintf(w, format, wrap(a, false)...)
+-// Close implements the io.Closer interface.
+-func (ws *Conn) Close() error {
+- err := ws.frameHandler.WriteClose(ws.defaultCloseStatus)
+- if err != nil {
+- return err
+- }
+- return ws.rwc.Close()
-}
-
--// Log is a convenience wrapper for log.Printf.
--//
--// Calling Log(x, y) is equivalent to
--// log.Print(Formatter(x), Formatter(y)), but each operand is
--// formatted with "%# v".
--func Log(a ...interface{}) {
-- log.Print(wrap(a, true)...)
--}
+-func (ws *Conn) IsClientConn() bool { return ws.request == nil }
+-func (ws *Conn) IsServerConn() bool { return ws.request != nil }
-
--// Logf is a convenience wrapper for log.Printf.
--//
--// Calling Logf(f, x, y) is equivalent to
--// log.Printf(f, Formatter(x), Formatter(y)).
--func Logf(format string, a ...interface{}) {
-- log.Printf(format, wrap(a, false)...)
+-// LocalAddr returns the WebSocket Origin for the connection for client, or
+-// the WebSocket location for server.
+-func (ws *Conn) LocalAddr() net.Addr {
+- if ws.IsClientConn() {
+- return &Addr{ws.config.Origin}
+- }
+- return &Addr{ws.config.Location}
-}
-
--// Logln is a convenience wrapper for log.Printf.
--//
--// Calling Logln(x, y) is equivalent to
--// log.Println(Formatter(x), Formatter(y)), but each operand is
--// formatted with "%# v".
--func Logln(a ...interface{}) {
-- log.Println(wrap(a, true)...)
+-// RemoteAddr returns the WebSocket location for the connection for client, or
+-// the Websocket Origin for server.
+-func (ws *Conn) RemoteAddr() net.Addr {
+- if ws.IsClientConn() {
+- return &Addr{ws.config.Location}
+- }
+- return &Addr{ws.config.Origin}
-}
-
--// Print pretty-prints its operands and writes to standard output.
--//
--// Calling Print(x, y) is equivalent to
--// fmt.Print(Formatter(x), Formatter(y)), but each operand is
--// formatted with "%# v".
--func Print(a ...interface{}) (n int, errno error) {
-- return fmt.Print(wrap(a, true)...)
+-var errSetDeadline = errors.New("websocket: cannot set deadline: not using a net.Conn")
+-
+-// SetDeadline sets the connection's network read & write deadlines.
+-func (ws *Conn) SetDeadline(t time.Time) error {
+- if conn, ok := ws.rwc.(net.Conn); ok {
+- return conn.SetDeadline(t)
+- }
+- return errSetDeadline
-}
-
--// Printf is a convenience wrapper for fmt.Printf.
--//
--// Calling Printf(f, x, y) is equivalent to
--// fmt.Printf(f, Formatter(x), Formatter(y)).
--func Printf(format string, a ...interface{}) (n int, errno error) {
-- return fmt.Printf(format, wrap(a, false)...)
+-// SetReadDeadline sets the connection's network read deadline.
+-func (ws *Conn) SetReadDeadline(t time.Time) error {
+- if conn, ok := ws.rwc.(net.Conn); ok {
+- return conn.SetReadDeadline(t)
+- }
+- return errSetDeadline
-}
-
--// Println pretty-prints its operands and writes to standard output.
--//
--// Calling Print(x, y) is equivalent to
--// fmt.Println(Formatter(x), Formatter(y)), but each operand is
--// formatted with "%# v".
--func Println(a ...interface{}) (n int, errno error) {
-- return fmt.Println(wrap(a, true)...)
+-// SetWriteDeadline sets the connection's network write deadline.
+-func (ws *Conn) SetWriteDeadline(t time.Time) error {
+- if conn, ok := ws.rwc.(net.Conn); ok {
+- return conn.SetWriteDeadline(t)
+- }
+- return errSetDeadline
-}
-
--// Sprintf is a convenience wrapper for fmt.Sprintf.
--//
--// Calling Sprintf(f, x, y) is equivalent to
--// fmt.Sprintf(f, Formatter(x), Formatter(y)).
--func Sprintf(format string, a ...interface{}) string {
-- return fmt.Sprintf(format, wrap(a, false)...)
+-// Config returns the WebSocket config.
+-func (ws *Conn) Config() *Config { return ws.config }
+-
+-// Request returns the http request upgraded to the WebSocket.
+-// It is nil for client side.
+-func (ws *Conn) Request() *http.Request { return ws.request }
+-
+-// Codec represents a symmetric pair of functions that implement a codec.
+-type Codec struct {
+- Marshal func(v interface{}) (data []byte, payloadType byte, err error)
+- Unmarshal func(data []byte, payloadType byte, v interface{}) (err error)
-}
-
--func wrap(a []interface{}, force bool) []interface{} {
-- w := make([]interface{}, len(a))
-- for i, x := range a {
-- w[i] = formatter{x: x, force: force}
+-// Send sends v marshaled by cd.Marshal as single frame to ws.
+-func (cd Codec) Send(ws *Conn, v interface{}) (err error) {
+- data, payloadType, err := cd.Marshal(v)
+- if err != nil {
+- return err
- }
-- return w
+- ws.wio.Lock()
+- defer ws.wio.Unlock()
+- w, err := ws.frameWriterFactory.NewFrameWriter(payloadType)
+- if err != nil {
+- return err
+- }
+- _, err = w.Write(data)
+- w.Close()
+- return err
-}
-diff --git a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/zero.go b/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/zero.go
-deleted file mode 100644
-index abb5b6f..0000000
---- a/Godeps/_workspace/src/github.com/tonnerre/golang-pretty/zero.go
-+++ /dev/null
-@@ -1,41 +0,0 @@
--package pretty
--
--import (
-- "reflect"
--)
-
--func nonzero(v reflect.Value) bool {
-- switch v.Kind() {
-- case reflect.Bool:
-- return v.Bool()
-- case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-- return v.Int() != 0
-- case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-- return v.Uint() != 0
-- case reflect.Float32, reflect.Float64:
-- return v.Float() != 0
-- case reflect.Complex64, reflect.Complex128:
-- return v.Complex() != complex(0, 0)
-- case reflect.String:
-- return v.String() != ""
-- case reflect.Struct:
-- for i := 0; i < v.NumField(); i++ {
-- if nonzero(getField(v, i)) {
-- return true
-- }
-- }
-- return false
-- case reflect.Array:
-- for i := 0; i < v.Len(); i++ {
-- if nonzero(v.Index(i)) {
-- return true
-- }
+-// Receive receives single frame from ws, unmarshaled by cd.Unmarshal and stores in v.
+-func (cd Codec) Receive(ws *Conn, v interface{}) (err error) {
+- ws.rio.Lock()
+- defer ws.rio.Unlock()
+- if ws.frameReader != nil {
+- _, err = io.Copy(ioutil.Discard, ws.frameReader)
+- if err != nil {
+- return err
- }
-- return false
-- case reflect.Map, reflect.Interface, reflect.Slice, reflect.Ptr, reflect.Chan, reflect.Func:
-- return !v.IsNil()
-- case reflect.UnsafePointer:
-- return v.Pointer() != 0
+- ws.frameReader = nil
- }
-- return true
+-again:
+- frame, err := ws.frameReaderFactory.NewFrameReader()
+- if err != nil {
+- return err
+- }
+- frame, err = ws.frameHandler.HandleFrame(frame)
+- if err != nil {
+- return err
+- }
+- if frame == nil {
+- goto again
+- }
+- payloadType := frame.PayloadType()
+- data, err := ioutil.ReadAll(frame)
+- if err != nil {
+- return err
+- }
+- return cd.Unmarshal(data, payloadType, v)
-}
-diff --git a/Godeps/_workspace/src/github.com/vaughan0/go-ini/LICENSE b/Godeps/_workspace/src/github.com/vaughan0/go-ini/LICENSE
-deleted file mode 100644
-index 968b453..0000000
---- a/Godeps/_workspace/src/github.com/vaughan0/go-ini/LICENSE
-+++ /dev/null
-@@ -1,14 +0,0 @@
--Copyright (c) 2013 Vaughan Newton
--
--Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
--documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
--rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
--persons to whom the Software is furnished to do so, subject to the following conditions:
--
--The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
--Software.
-
--THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
--WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
--COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
--OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-diff --git a/Godeps/_workspace/src/github.com/vaughan0/go-ini/README.md b/Godeps/_workspace/src/github.com/vaughan0/go-ini/README.md
-deleted file mode 100644
-index d5cd4e7..0000000
---- a/Godeps/_workspace/src/github.com/vaughan0/go-ini/README.md
-+++ /dev/null
-@@ -1,70 +0,0 @@
--go-ini
--======
+-func marshal(v interface{}) (msg []byte, payloadType byte, err error) {
+- switch data := v.(type) {
+- case string:
+- return []byte(data), TextFrame, nil
+- case []byte:
+- return data, BinaryFrame, nil
+- }
+- return nil, UnknownFrame, ErrNotSupported
+-}
-
--INI parsing library for Go (golang).
+-func unmarshal(msg []byte, payloadType byte, v interface{}) (err error) {
+- switch data := v.(type) {
+- case *string:
+- *data = string(msg)
+- return nil
+- case *[]byte:
+- *data = msg
+- return nil
+- }
+- return ErrNotSupported
+-}
-
--View the API documentation [here](http://godoc.org/github.com/vaughan0/go-ini).
+-/*
+-Message is a codec to send/receive text/binary data in a frame on WebSocket connection.
+-To send/receive text frame, use string type.
+-To send/receive binary frame, use []byte type.
-
--Usage
-------
+-Trivial usage:
-
--Parse an INI file:
+- import "websocket"
-
--```go
--import "github.com/vaughan0/go-ini"
+- // receive text frame
+- var message string
+- websocket.Message.Receive(ws, &message)
-
--file, err := ini.LoadFile("myfile.ini")
--```
+- // send text frame
+- message = "hello"
+- websocket.Message.Send(ws, message)
-
--Get data from the parsed file:
+- // receive binary frame
+- var data []byte
+- websocket.Message.Receive(ws, &data)
-
--```go
--name, ok := file.Get("person", "name")
--if !ok {
-- panic("'name' variable missing from 'person' section")
--}
--```
+- // send binary frame
+- data = []byte{0, 1, 2}
+- websocket.Message.Send(ws, data)
-
--Iterate through values in a section:
+-*/
+-var Message = Codec{marshal, unmarshal}
-
--```go
--for key, value := range file["mysection"] {
-- fmt.Printf("%s => %s\n", key, value)
+-func jsonMarshal(v interface{}) (msg []byte, payloadType byte, err error) {
+- msg, err = json.Marshal(v)
+- return msg, TextFrame, err
-}
--```
--
--Iterate through sections in a file:
-
--```go
--for name, section := range file {
-- fmt.Printf("Section name: %s\n", name)
+-func jsonUnmarshal(msg []byte, payloadType byte, v interface{}) (err error) {
+- return json.Unmarshal(msg, v)
-}
--```
--
--File Format
-------------
-
--INI files are parsed by go-ini line-by-line. Each line may be one of the following:
--
-- * A section definition: [section-name]
-- * A property: key = value
-- * A comment: #blahblah _or_ ;blahblah
-- * Blank. The line will be ignored.
+-/*
+-JSON is a codec to send/receive JSON data in a frame from a WebSocket connection.
-
--Properties defined before any section headers are placed in the default section, which has
--the empty string as it's key.
+-Trivial usage:
-
--Example:
+- import "websocket"
-
--```ini
--# I am a comment
--; So am I!
+- type T struct {
+- Msg string
+- Count int
+- }
-
--[apples]
--colour = red or green
--shape = applish
+- // receive JSON type T
+- var data T
+- websocket.JSON.Receive(ws, &data)
-
--[oranges]
--shape = square
--colour = blue
--```
-diff --git a/Godeps/_workspace/src/github.com/vaughan0/go-ini/ini.go b/Godeps/_workspace/src/github.com/vaughan0/go-ini/ini.go
+- // send JSON type T
+- websocket.JSON.Send(ws, data)
+-*/
+-var JSON = Codec{jsonMarshal, jsonUnmarshal}
+diff --git a/Godeps/_workspace/src/golang.org/x/net/websocket/websocket_test.go b/Godeps/_workspace/src/golang.org/x/net/websocket/websocket_test.go
deleted file mode 100644
-index 81aeb32..0000000
---- a/Godeps/_workspace/src/github.com/vaughan0/go-ini/ini.go
+index 48f14b6..0000000
+--- a/Godeps/_workspace/src/golang.org/x/net/websocket/websocket_test.go
+++ /dev/null
-@@ -1,123 +0,0 @@
--// Package ini provides functions for parsing INI configuration files.
--package ini
+@@ -1,341 +0,0 @@
+-// Copyright 2009 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-package websocket
-
-import (
-- "bufio"
+- "bytes"
- "fmt"
- "io"
-- "os"
-- "regexp"
+- "log"
+- "net"
+- "net/http"
+- "net/http/httptest"
+- "net/url"
- "strings"
+- "sync"
+- "testing"
-)
-
--var (
-- sectionRegex = regexp.MustCompile(`^\[(.*)\]$`)
-- assignRegex = regexp.MustCompile(`^([^=]+)=(.*)$`)
--)
+-var serverAddr string
+-var once sync.Once
-
--// ErrSyntax is returned when there is a syntax error in an INI file.
--type ErrSyntax struct {
-- Line int
-- Source string // The contents of the erroneous line, without leading or trailing whitespace
--}
+-func echoServer(ws *Conn) { io.Copy(ws, ws) }
-
--func (e ErrSyntax) Error() string {
-- return fmt.Sprintf("invalid INI syntax on line %d: %s", e.Line, e.Source)
+-type Count struct {
+- S string
+- N int
-}
-
--// A File represents a parsed INI file.
--type File map[string]Section
--
--// A Section represents a single section of an INI file.
--type Section map[string]string
--
--// Returns a named Section. A Section will be created if one does not already exist for the given name.
--func (f File) Section(name string) Section {
-- section := f[name]
-- if section == nil {
-- section = make(Section)
-- f[name] = section
+-func countServer(ws *Conn) {
+- for {
+- var count Count
+- err := JSON.Receive(ws, &count)
+- if err != nil {
+- return
+- }
+- count.N++
+- count.S = strings.Repeat(count.S, count.N)
+- err = JSON.Send(ws, count)
+- if err != nil {
+- return
+- }
- }
-- return section
-}
-
--// Looks up a value for a key in a section and returns that value, along with a boolean result similar to a map lookup.
--func (f File) Get(section, key string) (value string, ok bool) {
-- if s := f[section]; s != nil {
-- value, ok = s[key]
+-func subProtocolHandshake(config *Config, req *http.Request) error {
+- for _, proto := range config.Protocol {
+- if proto == "chat" {
+- config.Protocol = []string{proto}
+- return nil
+- }
- }
-- return
+- return ErrBadWebSocketProtocol
-}
-
--// Loads INI data from a reader and stores the data in the File.
--func (f File) Load(in io.Reader) (err error) {
-- bufin, ok := in.(*bufio.Reader)
-- if !ok {
-- bufin = bufio.NewReader(in)
+-func subProtoServer(ws *Conn) {
+- for _, proto := range ws.Config().Protocol {
+- io.WriteString(ws, proto)
- }
-- return parseFile(bufin, f)
-}
-
--// Loads INI data from a named file and stores the data in the File.
--func (f File) LoadFile(file string) (err error) {
-- in, err := os.Open(file)
-- if err != nil {
-- return
+-func startServer() {
+- http.Handle("/echo", Handler(echoServer))
+- http.Handle("/count", Handler(countServer))
+- subproto := Server{
+- Handshake: subProtocolHandshake,
+- Handler: Handler(subProtoServer),
- }
-- defer in.Close()
-- return f.Load(in)
+- http.Handle("/subproto", subproto)
+- server := httptest.NewServer(nil)
+- serverAddr = server.Listener.Addr().String()
+- log.Print("Test WebSocket server listening on ", serverAddr)
-}
-
--func parseFile(in *bufio.Reader, file File) (err error) {
-- section := ""
-- lineNum := 0
-- for done := false; !done; {
-- var line string
-- if line, err = in.ReadString('\n'); err != nil {
-- if err == io.EOF {
-- done = true
-- } else {
-- return
-- }
-- }
-- lineNum++
-- line = strings.TrimSpace(line)
-- if len(line) == 0 {
-- // Skip blank lines
-- continue
-- }
-- if line[0] == ';' || line[0] == '#' {
-- // Skip comments
-- continue
-- }
+-func newConfig(t *testing.T, path string) *Config {
+- config, _ := NewConfig(fmt.Sprintf("ws://%s%s", serverAddr, path), "http://localhost")
+- return config
+-}
-
-- if groups := assignRegex.FindStringSubmatch(line); groups != nil {
-- key, val := groups[1], groups[2]
-- key, val = strings.TrimSpace(key), strings.TrimSpace(val)
-- file.Section(section)[key] = val
-- } else if groups := sectionRegex.FindStringSubmatch(line); groups != nil {
-- name := strings.TrimSpace(groups[1])
-- section = name
-- // Create the section if it does not exist
-- file.Section(section)
-- } else {
-- return ErrSyntax{lineNum, line}
-- }
+-func TestEcho(t *testing.T) {
+- once.Do(startServer)
-
+- // websocket.Dial()
+- client, err := net.Dial("tcp", serverAddr)
+- if err != nil {
+- t.Fatal("dialing", err)
+- }
+- conn, err := NewClient(newConfig(t, "/echo"), client)
+- if err != nil {
+- t.Errorf("WebSocket handshake error: %v", err)
+- return
- }
-- return nil
--}
-
--// Loads and returns a File from a reader.
--func Load(in io.Reader) (File, error) {
-- file := make(File)
-- err := file.Load(in)
-- return file, err
+- msg := []byte("hello, world\n")
+- if _, err := conn.Write(msg); err != nil {
+- t.Errorf("Write: %v", err)
+- }
+- var actual_msg = make([]byte, 512)
+- n, err := conn.Read(actual_msg)
+- if err != nil {
+- t.Errorf("Read: %v", err)
+- }
+- actual_msg = actual_msg[0:n]
+- if !bytes.Equal(msg, actual_msg) {
+- t.Errorf("Echo: expected %q got %q", msg, actual_msg)
+- }
+- conn.Close()
-}
-
--// Loads and returns an INI File from a file on disk.
--func LoadFile(filename string) (File, error) {
-- file := make(File)
-- err := file.LoadFile(filename)
-- return file, err
--}
-diff --git a/Godeps/_workspace/src/github.com/vaughan0/go-ini/ini_linux_test.go b/Godeps/_workspace/src/github.com/vaughan0/go-ini/ini_linux_test.go
-deleted file mode 100644
-index 38a6f00..0000000
---- a/Godeps/_workspace/src/github.com/vaughan0/go-ini/ini_linux_test.go
-+++ /dev/null
-@@ -1,43 +0,0 @@
--package ini
+-func TestAddr(t *testing.T) {
+- once.Do(startServer)
-
--import (
-- "reflect"
-- "syscall"
-- "testing"
--)
+- // websocket.Dial()
+- client, err := net.Dial("tcp", serverAddr)
+- if err != nil {
+- t.Fatal("dialing", err)
+- }
+- conn, err := NewClient(newConfig(t, "/echo"), client)
+- if err != nil {
+- t.Errorf("WebSocket handshake error: %v", err)
+- return
+- }
-
--func TestLoadFile(t *testing.T) {
-- originalOpenFiles := numFilesOpen(t)
+- ra := conn.RemoteAddr().String()
+- if !strings.HasPrefix(ra, "ws://") || !strings.HasSuffix(ra, "/echo") {
+- t.Errorf("Bad remote addr: %v", ra)
+- }
+- la := conn.LocalAddr().String()
+- if !strings.HasPrefix(la, "http://") {
+- t.Errorf("Bad local addr: %v", la)
+- }
+- conn.Close()
+-}
-
-- file, err := LoadFile("test.ini")
+-func TestCount(t *testing.T) {
+- once.Do(startServer)
+-
+- // websocket.Dial()
+- client, err := net.Dial("tcp", serverAddr)
- if err != nil {
-- t.Fatal(err)
+- t.Fatal("dialing", err)
- }
--
-- if originalOpenFiles != numFilesOpen(t) {
-- t.Error("test.ini not closed")
+- conn, err := NewClient(newConfig(t, "/count"), client)
+- if err != nil {
+- t.Errorf("WebSocket handshake error: %v", err)
+- return
- }
-
-- if !reflect.DeepEqual(file, File{"default": {"stuff": "things"}}) {
-- t.Error("file not read correctly")
+- var count Count
+- count.S = "hello"
+- if err := JSON.Send(conn, count); err != nil {
+- t.Errorf("Write: %v", err)
+- }
+- if err := JSON.Receive(conn, &count); err != nil {
+- t.Errorf("Read: %v", err)
+- }
+- if count.N != 1 {
+- t.Errorf("count: expected %d got %d", 1, count.N)
+- }
+- if count.S != "hello" {
+- t.Errorf("count: expected %q got %q", "hello", count.S)
+- }
+- if err := JSON.Send(conn, count); err != nil {
+- t.Errorf("Write: %v", err)
- }
+- if err := JSON.Receive(conn, &count); err != nil {
+- t.Errorf("Read: %v", err)
+- }
+- if count.N != 2 {
+- t.Errorf("count: expected %d got %d", 2, count.N)
+- }
+- if count.S != "hellohello" {
+- t.Errorf("count: expected %q got %q", "hellohello", count.S)
+- }
+- conn.Close()
-}
-
--func numFilesOpen(t *testing.T) (num uint64) {
-- var rlimit syscall.Rlimit
-- err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rlimit)
+-func TestWithQuery(t *testing.T) {
+- once.Do(startServer)
+-
+- client, err := net.Dial("tcp", serverAddr)
- if err != nil {
-- t.Fatal(err)
+- t.Fatal("dialing", err)
- }
-- maxFds := int(rlimit.Cur)
-
-- var stat syscall.Stat_t
-- for i := 0; i < maxFds; i++ {
-- if syscall.Fstat(i, &stat) == nil {
-- num++
-- } else {
-- return
-- }
+- config := newConfig(t, "/echo")
+- config.Location, err = url.ParseRequestURI(fmt.Sprintf("ws://%s/echo?q=v", serverAddr))
+- if err != nil {
+- t.Fatal("location url", err)
- }
-- return
--}
-diff --git a/Godeps/_workspace/src/github.com/vaughan0/go-ini/ini_test.go b/Godeps/_workspace/src/github.com/vaughan0/go-ini/ini_test.go
-deleted file mode 100644
-index 06a4d05..0000000
---- a/Godeps/_workspace/src/github.com/vaughan0/go-ini/ini_test.go
-+++ /dev/null
-@@ -1,89 +0,0 @@
--package ini
-
--import (
-- "reflect"
-- "strings"
-- "testing"
--)
+- ws, err := NewClient(config, client)
+- if err != nil {
+- t.Errorf("WebSocket handshake: %v", err)
+- return
+- }
+- ws.Close()
+-}
-
--func TestLoad(t *testing.T) {
-- src := `
-- # Comments are ignored
+-func testWithProtocol(t *testing.T, subproto []string) (string, error) {
+- once.Do(startServer)
-
-- herp = derp
+- client, err := net.Dial("tcp", serverAddr)
+- if err != nil {
+- t.Fatal("dialing", err)
+- }
-
-- [foo]
-- hello=world
-- whitespace should = not matter
-- ; sneaky semicolon-style comment
-- multiple = equals = signs
+- config := newConfig(t, "/subproto")
+- config.Protocol = subproto
-
-- [bar]
-- this = that`
+- ws, err := NewClient(config, client)
+- if err != nil {
+- return "", err
+- }
+- msg := make([]byte, 16)
+- n, err := ws.Read(msg)
+- if err != nil {
+- return "", err
+- }
+- ws.Close()
+- return string(msg[:n]), nil
+-}
-
-- file, err := Load(strings.NewReader(src))
+-func TestWithProtocol(t *testing.T) {
+- proto, err := testWithProtocol(t, []string{"chat"})
- if err != nil {
-- t.Fatal(err)
+- t.Errorf("SubProto: unexpected error: %v", err)
- }
-- check := func(section, key, expect string) {
-- if value, _ := file.Get(section, key); value != expect {
-- t.Errorf("Get(%q, %q): expected %q, got %q", section, key, expect, value)
-- }
+- if proto != "chat" {
+- t.Errorf("SubProto: expected %q, got %q", "chat", proto)
- }
+-}
-
-- check("", "herp", "derp")
-- check("foo", "hello", "world")
-- check("foo", "whitespace should", "not matter")
-- check("foo", "multiple", "equals = signs")
-- check("bar", "this", "that")
+-func TestWithTwoProtocol(t *testing.T) {
+- proto, err := testWithProtocol(t, []string{"test", "chat"})
+- if err != nil {
+- t.Errorf("SubProto: unexpected error: %v", err)
+- }
+- if proto != "chat" {
+- t.Errorf("SubProto: expected %q, got %q", "chat", proto)
+- }
-}
-
--func TestSyntaxError(t *testing.T) {
-- src := `
-- # Line 2
-- [foo]
-- bar = baz
-- # Here's an error on line 6:
-- wut?
-- herp = derp`
-- _, err := Load(strings.NewReader(src))
-- t.Logf("%T: %v", err, err)
-- if err == nil {
-- t.Fatal("expected an error, got nil")
+-func TestWithBadProtocol(t *testing.T) {
+- _, err := testWithProtocol(t, []string{"test"})
+- if err != ErrBadStatus {
+- t.Errorf("SubProto: expected %v, got %v", ErrBadStatus, err)
- }
-- syntaxErr, ok := err.(ErrSyntax)
-- if !ok {
-- t.Fatal("expected an error of type ErrSyntax")
+-}
+-
+-func TestHTTP(t *testing.T) {
+- once.Do(startServer)
+-
+- // If the client did not send a handshake that matches the protocol
+- // specification, the server MUST return an HTTP response with an
+- // appropriate error code (such as 400 Bad Request)
+- resp, err := http.Get(fmt.Sprintf("http://%s/echo", serverAddr))
+- if err != nil {
+- t.Errorf("Get: error %#v", err)
+- return
- }
-- if syntaxErr.Line != 6 {
-- t.Fatal("incorrect line number")
+- if resp == nil {
+- t.Error("Get: resp is null")
+- return
- }
-- if syntaxErr.Source != "wut?" {
-- t.Fatal("incorrect source")
+- if resp.StatusCode != http.StatusBadRequest {
+- t.Errorf("Get: expected %q got %q", http.StatusBadRequest, resp.StatusCode)
- }
-}
-
--func TestDefinedSectionBehaviour(t *testing.T) {
-- check := func(src string, expect File) {
-- file, err := Load(strings.NewReader(src))
+-func TestTrailingSpaces(t *testing.T) {
+- // http://code.google.com/p/go/issues/detail?id=955
+- // The last runs of this create keys with trailing spaces that should not be
+- // generated by the client.
+- once.Do(startServer)
+- config := newConfig(t, "/echo")
+- for i := 0; i < 30; i++ {
+- // body
+- ws, err := DialConfig(config)
- if err != nil {
-- t.Fatal(err)
+- t.Errorf("Dial #%d failed: %v", i, err)
+- break
- }
-- if !reflect.DeepEqual(file, expect) {
-- t.Errorf("expected %v, got %v", expect, file)
+- ws.Close()
+- }
+-}
+-
+-func TestDialConfigBadVersion(t *testing.T) {
+- once.Do(startServer)
+- config := newConfig(t, "/echo")
+- config.Version = 1234
+-
+- _, err := DialConfig(config)
+-
+- if dialerr, ok := err.(*DialError); ok {
+- if dialerr.Err != ErrBadProtocolVersion {
+- t.Errorf("dial expected err %q but got %q", ErrBadProtocolVersion, dialerr.Err)
- }
- }
-- // No sections for an empty file
-- check("", File{})
-- // Default section only if there are actually values for it
-- check("foo=bar", File{"": {"foo": "bar"}})
-- // User-defined sections should always be present, even if empty
-- check("[a]\n[b]\nfoo=bar", File{
-- "a": {},
-- "b": {"foo": "bar"},
-- })
-- check("foo=bar\n[a]\nthis=that", File{
-- "": {"foo": "bar"},
-- "a": {"this": "that"},
-- })
-}
-diff --git a/Godeps/_workspace/src/github.com/vaughan0/go-ini/test.ini b/Godeps/_workspace/src/github.com/vaughan0/go-ini/test.ini
-deleted file mode 100644
-index d13c999..0000000
---- a/Godeps/_workspace/src/github.com/vaughan0/go-ini/test.ini
-+++ /dev/null
-@@ -1,2 +0,0 @@
--[default]
--stuff = things
+-
+-func TestSmallBuffer(t *testing.T) {
+- // http://code.google.com/p/go/issues/detail?id=1145
+- // Read should be able to handle reading a fragment of a frame.
+- once.Do(startServer)
+-
+- // websocket.Dial()
+- client, err := net.Dial("tcp", serverAddr)
+- if err != nil {
+- t.Fatal("dialing", err)
+- }
+- conn, err := NewClient(newConfig(t, "/echo"), client)
+- if err != nil {
+- t.Errorf("WebSocket handshake error: %v", err)
+- return
+- }
+-
+- msg := []byte("hello, world\n")
+- if _, err := conn.Write(msg); err != nil {
+- t.Errorf("Write: %v", err)
+- }
+- var small_msg = make([]byte, 8)
+- n, err := conn.Read(small_msg)
+- if err != nil {
+- t.Errorf("Read: %v", err)
+- }
+- if !bytes.Equal(msg[:len(small_msg)], small_msg) {
+- t.Errorf("Echo: expected %q got %q", msg[:len(small_msg)], small_msg)
+- }
+- var second_msg = make([]byte, len(msg))
+- n, err = conn.Read(second_msg)
+- if err != nil {
+- t.Errorf("Read: %v", err)
+- }
+- second_msg = second_msg[0:n]
+- if !bytes.Equal(msg[len(small_msg):], second_msg) {
+- t.Errorf("Echo: expected %q got %q", msg[len(small_msg):], second_msg)
+- }
+- conn.Close()
+-}
diff --git a/Godeps/_workspace/src/gopkg.in/v1/yaml/LICENSE b/Godeps/_workspace/src/gopkg.in/v1/yaml/LICENSE
deleted file mode 100644
index 53320c3..0000000
diff --git a/0002-revert-to-code.google.com-p-go.net-until-fedora-pack.patch b/0002-revert-to-code.google.com-p-go.net-until-fedora-pack.patch
new file mode 100644
index 0000000..9350f92
--- /dev/null
+++ b/0002-revert-to-code.google.com-p-go.net-until-fedora-pack.patch
@@ -0,0 +1,82 @@
+From 96d0b1f3b99a7d1b334eff8b34c4ff57b9bda295 Mon Sep 17 00:00:00 2001
+From: Eric Paris <eparis at redhat.com>
+Date: Thu, 20 Nov 2014 09:15:14 -0500
+Subject: [PATCH 2/2] revert to code.google.com/p/go.net/ until fedora packages
+ fixed
+
+---
+ pkg/api/context.go | 2 +-
+ pkg/apiserver/proxy.go | 2 +-
+ pkg/apiserver/proxy_test.go | 2 +-
+ pkg/apiserver/watch.go | 2 +-
+ pkg/apiserver/watch_test.go | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/pkg/api/context.go b/pkg/api/context.go
+index 84a946d..a1f2ffc 100644
+--- a/pkg/api/context.go
++++ b/pkg/api/context.go
+@@ -19,7 +19,7 @@ package api
+ import (
+ stderrs "errors"
+
+- "golang.org/x/net/context"
++ "code.google.com/p/go.net/context"
+ )
+
+ // Context carries values across API boundaries.
+diff --git a/pkg/apiserver/proxy.go b/pkg/apiserver/proxy.go
+index 89be5a9..635ad13 100644
+--- a/pkg/apiserver/proxy.go
++++ b/pkg/apiserver/proxy.go
+@@ -33,7 +33,7 @@ import (
+ "github.com/GoogleCloudPlatform/kubernetes/pkg/util"
+
+ "github.com/golang/glog"
+- "golang.org/x/net/html"
++ "code.google.com/p/go.net/html"
+ )
+
+ // tagsToAttrs states which attributes of which tags require URL substitution.
+diff --git a/pkg/apiserver/proxy_test.go b/pkg/apiserver/proxy_test.go
+index 73e4dba..4213ddb 100644
+--- a/pkg/apiserver/proxy_test.go
++++ b/pkg/apiserver/proxy_test.go
+@@ -26,7 +26,7 @@ import (
+ "strings"
+ "testing"
+
+- "golang.org/x/net/html"
++ "code.google.com/p/go.net/html"
+ )
+
+ func parseURLOrDie(inURL string) *url.URL {
+diff --git a/pkg/apiserver/watch.go b/pkg/apiserver/watch.go
+index f892119..d890193 100644
+--- a/pkg/apiserver/watch.go
++++ b/pkg/apiserver/watch.go
+@@ -31,7 +31,7 @@ import (
+ watchjson "github.com/GoogleCloudPlatform/kubernetes/pkg/watch/json"
+
+ "github.com/golang/glog"
+- "golang.org/x/net/websocket"
++ "code.google.com/p/go.net/websocket"
+ )
+
+ type WatchHandler struct {
+diff --git a/pkg/apiserver/watch_test.go b/pkg/apiserver/watch_test.go
+index 6b83efa..aa1c981 100644
+--- a/pkg/apiserver/watch_test.go
++++ b/pkg/apiserver/watch_test.go
+@@ -27,7 +27,7 @@ import (
+ "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+ "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
+ "github.com/GoogleCloudPlatform/kubernetes/pkg/watch"
+- "golang.org/x/net/websocket"
++ "code.google.com/p/go.net/websocket"
+ )
+
+ // watchJSON defines the expected JSON wire equivalent of watch.Event
+--
+1.9.3
+
diff --git a/kubernetes.spec b/kubernetes.spec
index 2d6e3db..249a928 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -1,7 +1,7 @@
#debuginfo not supported with Go
%global debug_package %{nil}
%global import_path github.com/GoogleCloudPlatform/kubernetes
-%global commit df0981bc01c5782ad30fc45cb6f510f365737fc1
+%global commit c6158b8aa9c40fbf1732650a8611429536466b21
%global shortcommit %(c=%{commit}; echo ${c:0:7})
#I really need this, otherwise "version_ldflags=$(kube::version_ldflags)"
@@ -11,7 +11,7 @@
Name: kubernetes
Version: 0.5
-Release: 14.0.git%{shortcommit}%{?dist}
+Release: 65.0.git%{shortcommit}%{?dist}
Summary: Container cluster management
License: ASL 2.0
URL: https://github.com/GoogleCloudPlatform/kubernetes
@@ -20,6 +20,7 @@ Source0: https://github.com/GoogleCloudPlatform/kubernetes/archive/%{commit}/kub
%if 0%{?fedora}
Patch1: 0001-remove-all-third-party-software.patch
+Patch2: 0002-revert-to-code.google.com-p-go.net-until-fedora-pack.patch
%endif
%if 0%{?fedora} >= 21 || 0%{?rhel}
@@ -80,7 +81,7 @@ BuildRequires: golang(gopkg.in/v1/yaml)
%build
export KUBE_GIT_COMMIT=%{commit}
-export KUBE_GIT_VERSION=v0.5-14-gdf0981bc01c578
+export KUBE_GIT_VERSION=v0.5-65-gc6158b8aa9c40f
%if 0%{?fedora}
export KUBE_GIT_TREE_STATE="dirty"
@@ -179,6 +180,9 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
%systemd_postun
%changelog
+* Thu Nov 20 2014 Eric Paris <eparis at redhat.com> - 0.5-65.0.gitc6158b8
+- Bump to upstream c6158b8aa9c40fbf1732650a8611429536466b21
+
* Tue Nov 18 2014 Eric Paris <eparis at redhat.com> - 0.5-14.0.gitdf0981b
- Bump to upstream df0981bc01c5782ad30fc45cb6f510f365737fc1
diff --git a/sources b/sources
index a8c9072..a1f22e5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-697f941606cb89c0170f2218e8ecbbfe kubernetes-df0981b.tar.gz
+71310ce49ac53743c6114e4af10c4a32 kubernetes-c6158b8.tar.gz
More information about the scm-commits
mailing list