Fix issues with bash quoting

Author: mthurman

content/reference/authentication/flows/password.md

@@ -49,9 +49,9 @@ Once you have been approved, using the password flow is pretty straightforward:
         &password=[user's password]
         &scope=[scopes separated by spaces]
 
-    > The use of `password_grant_secret` diverges from the OAuth 2.0 specificaion. `password_grant_secret` is a special token that we'll send you when your use of the password flow is approved.
+    > The use of `password_grant_secret` diverges from the OAuth 2.0 specification. `password_grant_secret` is a special token that we'll send you when your use of the password flow is approved.
 
-    > **You can require app-specific passwords** by providing a `require_app_specific_password=1` URL parameter. **[Two-Factor Auth users](http://blog.app.net/2013/03/13/added-security-for-your-app-net-account/) must use app-specific passwords** irrespective of this parameter. We strongly encourage the use of app-specific passwords by all users as they significantly increase account security.
+    > **You can require app-specific passwords** by providing a `require_app_specific_password=1` URL parameter. **[Two-Factor Auth users](http://blog.app.net/2013/03/13/added-security-for-your-app-net-account/) must use app-specific passwords** regardless of this parameter. We strongly encourage the use of app-specific passwords by all users as they significantly increase account security.
 
 1. If the authorization was successful, App.net will respond with a JSON-encoded token:
 

content/reference/authentication/index.md

@@ -133,7 +133,7 @@ When making a call to one of our API resources, there are three ways to include
 
 * Add `access_token` to query string
 
-    <%= curl_example(:get, "posts/1?access_token=<YOUR ACCESS TOKEN>", :none, {:data => "text=Test post", :content_type => nil, :token => nil}) %>
+    <%= curl_example(:get, "posts/1?access_token=<YOUR ACCESS TOKEN>", :none, {:data => {"text" => "Test post"}, :content_type => nil, :token => nil}) %>
 
 * Add `access_token` to HTTP body. 
 

content/reference/resources/post/lifecycle.md

@@ -29,7 +29,7 @@ If you want to test how your text will be processed you can use the [text proces
 #### Example
 
 <% text = get_hash(:post)["text"] %>
-<%= curl_example(:post, "posts", :post, {:data => "text=#{text}", :content_type => nil}) %>
+<%= curl_example(:post, "posts", :post, {:data => {"text" => text}, :content_type => nil}) %>
 
 #### Example (JSON Data)
 

lib/helpers.rb

@@ -90,6 +90,10 @@ def access_token_banner()
     "<div class=\"alert alert-success alert-block authorize-prompt hide\"><p>#{login_url} to see more complete examples.</p></div>"
 end
 
+def bash_quote(v)
+    v.gsub('"', '\"')
+end
+
 def curl_example(method, path, response_key, options = {}, &block)
     # things left to figure out
     # - some quoting/escaping stuff
@@ -167,24 +171,23 @@ def curl_example(method, path, response_key, options = {}, &block)
     if [:post, :put, :patch].include? method
         if not options[:data].empty?
             if options[:content_type] == "application/json"
-                options[:data] = JSON.pretty_generate(options[:data])
-                # todo: escape any single quotes in json data since we're about to wrap in single quotes for bash
-                curl_parts << %{-d '#{options[:data]}'}
+                data = bash_quote(JSON.pretty_generate(options[:data]))
+                curl_parts << %{-d "#{data}"}
             elsif options[:data].instance_of? Hash
                 options[:data].each do |k, v|
-                    curl_parts << %{-d '#{k}=#{v}'}
+                    val = bash_quote(v)
+                    curl_parts << %{-d "#{k}=#{val}"}
                 end
-            else
-                # get rid of this case
-                curl_parts << %{-d '#{options[:data]}'}
             end
         elsif options[:data_binary]
-            curl_parts << %{--data-binary '#{options[:data_binary]}'}
+            val = bash_quote(options[:data_binary])
+            curl_parts << %{--data-binary "#{val}"}
         end
     end
 
     options[:files].each do |k, v|
-        curl_parts << %{-F "#{k}=#{v}"}
+        val = bash_quote(v)
+        curl_parts << %{-F "#{k}=#{val}"}
     end
 
     if options[:stdin]