Merge pull request #16 from campoy/embedmd

Use embedmd for all code snippets

events/step0/events.go

@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2017 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

events/step0/static/index.html

@@ -1,5 +1,5 @@
 <!--
-Copyright 2016 Google Inc. All rights reserved.
+Copyright 2017 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

events/step0/static/script.js

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All rights reserved.
+ * Copyright 2017 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

events/step0/static/style.css

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All rights reserved.
+ * Copyright 2017 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

events/step1/events.go

@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2017 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

events/step1/static/index.html

@@ -1,5 +1,5 @@
 <!--
-Copyright 2016 Google Inc. All rights reserved.
+Copyright 2017 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

events/step1/static/script.js

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All rights reserved.
+ * Copyright 2017 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

events/step1/static/style.css

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All rights reserved.
+ * Copyright 2017 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

events/step2/events.go

@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2017 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

events/step2/static/index.html

@@ -1,5 +1,5 @@
 <!--
-Copyright 2016 Google Inc. All rights reserved.
+Copyright 2017 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

events/step2/static/script.js

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All rights reserved.
+ * Copyright 2017 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

events/step2/static/style.css

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All rights reserved.
+ * Copyright 2017 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

events/step3/events.go

@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2017 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

events/step3/static/index.html

@@ -1,5 +1,5 @@
 <!--
-Copyright 2016 Google Inc. All rights reserved.
+Copyright 2017 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

events/step3/static/script.js

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All rights reserved.
+ * Copyright 2017 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

events/step3/static/style.css

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All rights reserved.
+ * Copyright 2017 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

events/step3/weather.go

@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2017 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

events/step4/events.go

@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2017 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

events/step4/static/index.html

@@ -1,5 +1,5 @@
 <!--
-Copyright 2016 Google Inc. All rights reserved.
+Copyright 2017 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

events/step4/static/script.js

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All rights reserved.
+ * Copyright 2017 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

events/step4/static/style.css

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All rights reserved.
+ * Copyright 2017 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

events/step4/weather.go

@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2017 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

events/step5/events.go

@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2017 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

events/step5/static/index.html

@@ -1,5 +1,5 @@
 <!--
-Copyright 2016 Google Inc. All rights reserved.
+Copyright 2017 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

events/step5/static/script.js

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All rights reserved.
+ * Copyright 2017 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

events/step5/static/style.css

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All rights reserved.
+ * Copyright 2017 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

events/step5/weather.go

@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2017 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

section00/README.md

@@ -2,14 +2,14 @@
 
 Before we start writing web servers let's analyze a simple Go program.
 
+[embedmd]:# (hello/main.go /package main/ $)
 ```go
 package main
 
-import "fmt"
+import    "fmt"
 
-func   main() {
-    fmt.Println(  "hello, world!"  );
-    }
+func         main() {
+	fmt.Println("hello, world!")        }
 ```
 
 You should be able to understand every line of this program.
@@ -42,18 +42,18 @@ But this doesn't mean you need to write them yourself!
 
 Try deleting the line `import "fmt"` from `main.go` and run it, you should see an error:
 
-```
-    $ go run main.go
-    # command-line-arguments
-    ./main.go:5: undefined: fmt in fmt.Println
+```bash
+$ go run main.go
+# command-line-arguments
+./main.go:5: undefined: fmt in fmt.Println
 ```
 
 You can fix this error by manually adding the missing import statements or using `goimports`.
 
 If you don't have `goimports` installed in your machine you can easily install it by running:
 
-```
-    $ go get golang.org/x/tools/cmd/goimports
+```bash
+$ go get golang.org/x/tools/cmd/goimports
 ```
 
 This will install the `goimports` binary in `$GOAPTH/bin`.

section00/hello/main.go

@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2017 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
@@ -13,8 +13,7 @@
 
 package main
 
-import "fmt"
+import    "fmt"
 
-func main() {
-	fmt.Println("hello, world!")
-}
+func         main() {
+	fmt.Println("hello, world!")        }

section01/README.md

@@ -16,21 +16,23 @@ But before that it is important to realize that there's helper functions that wi
 
 One of those helper functions is [`Get`](https://golang.org/pkg/net/http#Get).
 
+[embedmd]:# (examples/get.go /package main/ $)
 ```go
 package main
 
 import (
-        "fmt"
-        "log"
-        "net/http"
+	"fmt"
+	"log"
+	"net/http"
 )
 
 func main() {
-        res, err := http.Get("https://golang.org")
-        if err != nil {
-                log.Fatal(err)
-        }
-        fmt.Println(res.Status)
+	// try changing the value of this url
+	res, err := http.Get("https://golang.org")
+	if err != nil {
+		log.Fatal(err)
+	}
+	fmt.Println(res.Status)
 }
 ```
 [source code](examples/get.go)
@@ -84,6 +86,7 @@ For instance, we can create the equivalent request to the original `get.go` prog
 
 The `Client` type exposes the `Do` method that send the given `Request` and returns a `Response` and an `error`.
 
+[embedmd]:# (examples/do-get.go /package main/ $)
 ```go
 package main
 
@@ -121,7 +124,7 @@ Replace `YourName` with your name, or something unique that no one else might be
 This will save whatever string you send in the Body of the request so you can retrieve it later with:
 
 ```
-    $ curl https://http-methods.appspot.com/YourName/Message
+$ curl https://http-methods.appspot.com/YourName/Message
 ```
 
 ## Parameters: queries and forms

section01/examples/do-get.go

@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2017 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

section01/examples/get.go

@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2017 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

section02/README.md

@@ -20,6 +20,7 @@ method which makes it satisfy the `io.Writer` interface.
 
 Let's see a very simple HTTP handler that simply writes `"Hello, web"` to the output:
 
+[embedmd]:# (examples/step1.go /package main/ $)
 ```go
 package main
 
@@ -57,6 +58,7 @@ for any other paths in the `"/images/"` subtree.
 
 Let's see how to register our `helloHandler` defined above:
 
+[embedmd]:# (examples/step2.go /package main/ $)
 ```go
 package main
 
@@ -73,11 +75,14 @@ func main() {
 	http.HandleFunc("/hello", helloHandler)
 }
 ```
+
 Note that we're registering our handler as part of the `main` function.
 
 Try to run the code above:
 
-	$ go run main.go
+```bash
+$ go run examples/step2.go
+```
 
 What happens? Well, we're missing the last piece of the puzzle: starting the
 web server!
@@ -145,6 +150,7 @@ when no error has occurred the returned value equals to `nil`.
 So if we want to check that our server started successfully and log an error
 otherwise we would modify our code to add a call to `ListenAndServe`.
 
+[embedmd]:# (examples/step3.go /package main/ $)
 ```go
 package main
 
@@ -167,8 +173,6 @@ func main() {
 }
 ```
 
-_Note_: you can find the complete code on [main.go](main.go).
-
 Running this code should now start a web server listening on `127.0.0.1:8080`.
 
 Try it:
@@ -200,12 +204,13 @@ These cases can be handled either by hand or using a toolkit that will plug
 correctly into the existing `net/http` package, such as the
 [Gorilla toolkit](http://www.gorillatoolkit.org/) and its `mux` package.
 
-
+[embedmd]:# (examples/gorilla.go /package main/ $)
 ```go
 package main
 
 import (
-	...
+	"log"
+	"net/http"
 
 	"github.com/gorilla/mux"
 )
@@ -236,7 +241,9 @@ func main() {
 
 	// handle all requests with the Gorilla router.
 	http.Handle("/", r)
-	http.ListenAndServe("127.0.0.1:8080", nil)
+	if err := http.ListenAndServe("127.0.0.1:8080", nil); err != nil {
+		log.Fatal(err)
+	}
 }
 ```