NR feedback

Author: rachel-mack

source/data-formats.txt

@@ -24,6 +24,7 @@ Data Formats
 
    Time Series Data </data-formats/time-series>
    BSON </data-formats/bson>
+   Extended JSON </data-formats/extended-json>
 
 Overview
 --------

source/data-formats/extended-json.txt

@@ -31,29 +31,13 @@ The following example shows how you can read an Extended JSON string into a
 array of hashes by using the ``parse()`` method:
 
 .. io-code-block::
+    :copyable:
 
-   .. input::
-      :language: ruby 
-
-      require 'bson'
-
-      ex_json = '''[
-         {"foo": [1, 2]},
-         {"bar": {"hello": "world"}},
-         {"code": {
-            "$scope": {},
-            "$code": "function x() { return 1; }"
-         }},
-         {"bin": {
-            "$type": "80",
-            "$binary": "AQIDBA=="
-         }}
-         ]'''
-
-        doc = BSON::ExtJSON.parse(ex_json)
-        
-        puts doc.class
-        puts doc
+    .. input:: /includes/data-formats/extended-json.rb
+       :start-after: start-ex-json-read
+       :end-before: end-ex-json-read
+       :language: ruby
+       :dedent:
 
    .. output::
       :language: none
@@ -68,47 +52,31 @@ Write Extended JSON
 -------------------
 
 You can write an Extended JSON string from a hash by using the
-``as_extended_json()`` method. Using the Ruby ``map{}`` method, you can create
-an Extended JSON string from an array of hashes. By default, this method returns
+``as_extended_json()`` method. By default, this method returns
 the Extended JSON string in canonical format, but you can specify relaxed or
-legacy formats by passing a ``mode:`` argument. 
+legacy formats by passing a ``mode`` argument. 
 
 .. note:: Legacy Version
 
    The legacy format option tells the {+driver-short+} to serialize BSON types
-   using MongoDB Extended JSON v1 format, which predates the current
+   with the MongoDB Extended JSON v1 format, which predates the current
    relaxed and canonical formats. 
 
-   For more information see the :manual:`MongoDB Extended JSON v1 (legacy
-   format) </reference/mongodb-extended-json-v1/>` page in the Server manual.
+   For more information see the :manual:`MongoDB Extended JSON v1
+   </reference/mongodb-extended-json-v1/>` page in the Server manual. 
 
 The following example outputs an Extended JSON string in the canonical, relaxed
-and legacy formats:
+and legacy formats. It calls the ``as_extended_json()`` method from inside a
+Ruby ``map{}`` block to create the Extended JSON string from an array of hashes:
 
 .. io-code-block::
+    :copyable:
 
-   .. input::
-      :language: ruby
-
-      require 'bson'
-
-      hash_array = [
-         { "foo" => [1, 2] },
-         { "bin" => BSON::Binary.new("\x01\x02\x03\x04", :user) },
-         { "number" => BSON::Int64.new(42) }
-      ]
-
-      json_array_canonical = hash_array.map(&:as_extended_json)
-      json_array_relaxed = hash_array.map{ |hash| hash.as_extended_json(mode: :relaxed) }
-      json_array_legacy = hash_array.map{ |hash| hash.as_extended_json(mode: :legacy) }
-
-      json_string_canonical = JSON.generate(json_array_canonical)
-      json_string_relaxed = JSON.generate(json_array_relaxed)
-      json_string_legacy = JSON.generate(json_array_legacy)
-
-      puts "canonical:\t #{json_string_canonical}"
-      puts "relaxed:\t #{json_string_relaxed}"
-      puts "legacy:\t\t #{json_string_legacy}"
+    .. input:: /includes/data-formats/extended-json.rb
+       :start-after: start-ex-json-write
+       :end-before: end-ex-json-write
+       :language: ruby
+       :dedent:
 
    .. output::
       :language: none
@@ -118,8 +86,8 @@ and legacy formats:
       relaxed:   [{"foo":[1,2]},{"bin":{"$binary":{"base64":"AQIDBA==","subType":"80"}}},{"number":42}]
       legacy:    [{"foo":[1,2]},{"bin":{"$binary":"AQIDBA==","$type":"80"}},{"number":42}]
 
-More Information
-----------------
+Additional Information
+----------------------
 
 For more information, see the following resources:
 
@@ -130,5 +98,6 @@ API Documentation
 - `#as_extended_json() <https://www.rubydoc.info/gems/bson/{+bson-version+}/BSON/Hash#as_extended_json-instance_method>`__
 
 Server Manual Pages
+~~~~~~~~~~~~~~~~~~~
 
 - :manual:`MongoDB Extended JSON (v2)</reference/mongodb-extended-json/>`

source/includes/data-formats/extended-json.rb

@@ -0,0 +1,43 @@
+# start-ex-json-read
+require 'bson'
+
+ex_json = '''[
+    {"foo": [1, 2]},
+    {"bar": {"hello": "world"}},
+    {"code": {
+    "$scope": {},
+    "$code": "function x() { return 1; }"
+    }},
+    {"bin": {
+    "$type": "80",
+    "$binary": "AQIDBA=="
+    }}
+    ]'''
+
+doc = BSON::ExtJSON.parse(ex_json)
+
+puts doc.class
+puts doc
+# end-ex-json-read
+
+# start-ex-json-write
+require 'bson'
+
+hash_array = [
+    { "foo" => [1, 2] },
+    { "bin" => BSON::Binary.new("\x01\x02\x03\x04", :user) },
+    { "number" => BSON::Int64.new(42) }
+]
+
+json_array_canonical = hash_array.map(&:as_extended_json)
+json_array_relaxed = hash_array.map{ |hash| hash.as_extended_json(mode: :relaxed) }
+json_array_legacy = hash_array.map{ |hash| hash.as_extended_json(mode: :legacy) }
+
+json_string_canonical = JSON.generate(json_array_canonical)
+json_string_relaxed = JSON.generate(json_array_relaxed)
+json_string_legacy = JSON.generate(json_array_legacy)
+
+puts "canonical:\t #{json_string_canonical}"
+puts "relaxed:\t #{json_string_relaxed}"
+puts "legacy:\t\t #{json_string_legacy}"
+# end-ex-json-write