RFC7159 7159.01 → 7159.02

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ee68a25f2005231c7cba17030c5539069884a3e
-  data.tar.gz: 5d1b3e304935a20d83a968df182b601781bb532f
+  metadata.gz: 2e910977da997d84884b1f1a3dae907e8c543d70
+  data.tar.gz: 9edf0e2b913b74d078e93a3c4cfa58e9a5a73b76
 SHA512:
-  metadata.gz: 671c63df9569a92d6a61b6abaae27727bd4c329c67d92fbf8e834b3cd15e1693bf2736244efabb1e79f02b09d62109b4dda0d51d2710eb3e9652d555f0a5c49a
-  data.tar.gz: 4c743e0d39b6fbc7f21af08390445a07caf81d5ccb62675a84467653e54d6dfa130e3d1de715040e652a21a1c6c317e1fb175d532fe5daf2967931dc2c689d0e
+  metadata.gz: a646673c77c7dfbc323b4d209b8b7e20df11472703a969109b485dec89773dd08e3aec5761127ed806f86125177c59706bee7c75f951f3c741841b7279c667c4
+  data.tar.gz: abb05b7db6b343b42fa7b35dacac32f9a6ea0f7885daeb89ecadec32080fea46e9faf093a34c48849554ab8fc1afbc75782f78df3251c3f4f4c4487d5d02fc08

data/Gemfile

@@ -33,7 +33,7 @@
 
 begin
 	source 'https://rubygems.org'
-	gemspec
+	gemspec require: false
 
 rescue Bundler::GemspecError
 	# HACK: in order to use bundler we need a valid gemspec, and a valid gemspec

data/lib/RFC7159/dumper.rb

@@ -38,10 +38,11 @@ require 'prettyprint'
 class RFC7159::Dumper
 
 	# @param [#<<]  port  output destination
-	def initialize port
-		@port = port
-		@bag  = Hash.new
-		@pp   = PrettyPrint.new @port
+	def initialize port, indent = 4
+		@port   = port
+		@bag    = Hash.new
+		@indent = indent
+		@pp     = PrettyPrint.new @port
 		@bag.compare_by_identity
 	end
 
@@ -61,29 +62,19 @@ class RFC7159::Dumper
 		obj2 = try_convert obj
 		case obj2
 		when ::Array, RFC7159::Array then
-			ensure_unique obj2
-			@pp.group 1, '[', ']' do
-				obj2.each.with_index do |i, j|
-					@pp.text ',' if j > 0
-					@pp.breakable ''
-					dump i
-				end
+			js_group obj2, :each, '[', ']' do |i|
+				dump i
 			end
 		when ::Hash, RFC7159::Object then
-			ensure_unique obj2
-			@pp.group 1, '{', '}' do
-				obj2.each_pair.with_index do |(i, j), k|
-					@pp.text ',' if k > 0
-					@pp.breakable ''
-					case i
-					when ::String, RFC7159::String
-						dump i
-					else
-						dump i.to_str # should raise for non-string-ish
-					end
-					@pp.text ':'
-					dump j
+			js_group obj2, :each_pair, '{', '}' do |(i, j)|
+				case i
+				when ::String, RFC7159::String
+					dump i
+				else
+					dump i.to_str # should raise for non-string-ish
 				end
+				@pp.text ': '
+				dump j
 			end
 		when RFC7159::Value then
 			obj3 = obj2.to_json
@@ -126,6 +117,26 @@ class RFC7159::Dumper
 		end
 	end
 
+	# much like PP#object_group, except that it indents like JSON.
+	def js_group obj, method, open, close
+		ensure_unique obj
+		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 ' '
+		end
+		@pp.text close
+	end
+
 	def try_convert obj
 		case obj
 		when RFC7159::Value, Hash, Array, String, Integer, Float, BigDecimal, TrueClass, FalseClass, NilClass

data/lib/RFC7159/version.rb

@@ -34,7 +34,7 @@
 require_relative '../RFC7159'
 
 # The version
-RFC7159::VERSION = 7159.01
+RFC7159::VERSION = 7159.02
 
 # 
 # Local Variables:

data/spec/RFC7159_spec.rb

@@ -107,11 +107,12 @@ describe RFC7159 do
 				"\u{dead}"        => '"\\uDEAD"', # invalid UTF8 to be valid escaped UTF8
 				'foo'.encode('utf-32le')              => '"foo"',
 				"\xDE\xAD".force_encoding('utf-16be') => '"\\uDEAD"',
-				[]                => '[]',
-				[0]               => '[0]',
-				{}                => '{}',
-				{'1'=>1}          => '{"1":1}',
-				{''=>''}          => '{"":""}',
+				[]                => '[ ]',
+				[0]               => '[ 0 ]',
+				[0,1]             => '[ 0, 1 ]',
+				{}                => '{ }',
+				{'1'=>1}          => '{ "1": 1 }',
+				{''=>''}          => '{ "": "" }',
 				(0.0/0.0)         => false,
 				(1.0/0.0)         => false,
 				BigDecimal("NaN") => false,

data/spec/spec_helper.rb

@@ -33,6 +33,7 @@
 
 ENV['RACK_ENV'] = 'test'
 require 'bundler/setup'
+require 'rspec'
 require 'simplecov'
 
 RSpec.configure do |c|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: RFC7159
 version: !ruby/object:Gem::Version
-  version: '7159.01'
+  version: '7159.02'
 platform: ruby
 authors:
 - Urabe,
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-16 00:00:00.000000000 Z
+date: 2015-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler