RFC7159 7159.04 → 7159.05

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cde0201e044e37ab14b2426a4211058753632042
-  data.tar.gz: 19b26b85d1f3f455b8dee3b591c403c729f88ed9
+  metadata.gz: b662d283a8723554682d016119ce8459a88a1acc
+  data.tar.gz: eda2d8e84dd1824e1eb698f1a428ebc00924af1d
 SHA512:
-  metadata.gz: 54d23d27b59f817e73fe5da58b35f59ca86f1f4cee5527221c9831efbaf6a606427f8783a63df4d268a1793c14734661420442132cd11acb075111f4cef73687
-  data.tar.gz: 6ef984c3d3b5569fb5c2c9dbc708b714c2d9678f77be69b3023c31be5a82a0bfb5036c9fe4aa2cfff483e4782b6a3f6eee3054b5953f06691154b51aa6108043
+  metadata.gz: cfb49eb59408e63948ad0c574de89b0339dbcb26ccf983a01c67f23f6feb7b5c7aad238d27a18df1058ca0bfb41164c7063ad60e6b639989dafd0c5933fcc5b3
+  data.tar.gz: 3e0df175d36f92735ed1d1dd70b38ad385888121fbc01742e54ec7eb3270328852afcaca39d58535c984a2c6d5e6fe4c25d0d8c2c2334899bc1152cad4a715ab

data/lib/RFC7159.rb

@@ -68,6 +68,18 @@ module RFC7159
 		bag.start_dump obj
 		return port
 	end
+
+	# (Experimental)  Sometimes   JSON  is   required  somewhere  inside   of  a
+	# pretty-print,  and  you  might  want  to  inherit  the  indentation(s)  of
+	# surrounding  PP structure.   In order  to  do so  here we  propose a  dump
+	# variant that takes a PP object rather than destination IO.
+	# @param  [::Object]  obj    The input (should be JSONable)
+	# @param  [PP]        pp     The PP.
+	def self.pp_object pp, obj, indent=4
+		bag = RFC7159::Dumper.new nil, indent, nil, pp
+		bag.start_dump obj
+		return nil
+	end
 end
 
 # 

data/lib/RFC7159/array.rb

@@ -108,8 +108,10 @@ class RFC7159::Array < RFC7159::Value
 	def pretty_print pp
 		hdr = sprintf '#<%p:%#016x', self.class, self.object_id << 1
 		pp.group 1, hdr, '>' do
-			pp.breakable
-			@array.pretty_print pp
+			pp.text ' '
+			RFC7159::Dumper.kandr pp, 1, @array.each, '[', ']' do |i|
+				i.pretty_print pp
+			end
 		end
 	end
 

data/lib/RFC7159/dumper.rb

@@ -37,12 +37,30 @@ require 'prettyprint'
 # Dumps ruby object into JSON string
 class RFC7159::Dumper
 
+	# much like PP#object_group, except that it indents like K&R.
+	def self.kandr pp, indent, enum, open, close
+		pp.text open
+		pp.group_sub do
+			pp.nest indent do
+				enum.with_index do |a, i|
+					if i > 0
+						pp.text ','
+					end
+					pp.breakable ' '
+					yield a
+				end
+			end
+			pp.breakable ' '
+		end
+		pp.text close
+	end
+
 	# @param [#<<]  port  output destination
-	def initialize port, indent = 4, width = 79
+	def initialize port, indent = 4, width = 79, pp = PrettyPrint.new(port, width)
 		@port   = port
 		@bag    = Hash.new
 		@indent = indent
-		@pp     = PrettyPrint.new @port, width
+		@pp     = pp
 		@bag.compare_by_identity
 	end
 
@@ -125,21 +143,10 @@ class RFC7159::Dumper
 	# much like PP#object_group, except that it indents like K&R.
 	def kandr obj, method, open, close
 		ensure_unique obj do
-			enum = obj.send method
-			@pp.text open
-			@pp.group_sub do
-				@pp.nest @indent do
-					enum.with_index do |a, i|
-						if i > 0
-							@pp.text ','
-						end
-						@pp.breakable ' '
-						yield a
-					end
-				end
-				@pp.breakable ' '
+			enum = obj.enum_for method
+			RFC7159::Dumper.kandr @pp, @indent, enum, open, close do |obj|
+				yield obj
 			end
-			@pp.text close
 		end
 	end
 

data/lib/RFC7159/object.rb

@@ -62,7 +62,7 @@ class RFC7159::Object < RFC7159::Value
 
 	# iterates over the pairs.
 	# @yield [key, value] the pair.
-	def each_pair
+	def each_pair &b
 		e = Enumerator.new do |y|
 			@assoc.each do |a|
 				y << a
@@ -106,14 +106,11 @@ class RFC7159::Object < RFC7159::Value
 	def pretty_print pp
 		hdr = sprintf '#<%p:%#016x', self.class, self.object_id << 1
 		pp.group 1, hdr, '>' do
-			pp.breakable
-			pp.group 1, '{', '}' do
-				@assoc.each_with_index do |(k, v), i|
-					pp.breakable ',' if i.nonzero?
-					k.to_s.pretty_print pp
-					pp.text ': '
-					v.pretty_print pp
-				end
+			pp.text ' '
+			RFC7159::Dumper.kandr pp, 1, @assoc.each, '{', '}' do |(i, j)|
+				i.pretty_print pp
+				pp.text ': '
+				j.pretty_print pp
 			end
 		end
 	end

data/lib/RFC7159/string.rb

@@ -61,7 +61,7 @@ class RFC7159::String < RFC7159::Value
 	def pretty_print pp
 		hdr = sprintf '#<%p:%#016x', self.class, self.object_id << 1
 		pp.group 1, hdr, '>' do
-			pp.breakable
+			pp.text ' '
 			@str.pretty_print pp
 		end
 	end

data/lib/RFC7159/version.rb

@@ -32,7 +32,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 # The version
-RFC7159::VERSION = 7159.04
+RFC7159::VERSION = 7159.05
 
 # 
 # Local Variables:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: RFC7159
 version: !ruby/object:Gem::Version
-  version: '7159.04'
+  version: '7159.05'
 platform: ruby
 authors:
 - Urabe,
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-22 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler