RFC7159 7159.02 → 7159.03

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e910977da997d84884b1f1a3dae907e8c543d70
-  data.tar.gz: 9edf0e2b913b74d078e93a3c4cfa58e9a5a73b76
+  metadata.gz: 7e2193ac3f36ae04eb2550b20bd9a702c525ffec
+  data.tar.gz: e153ac6d024a5d50b97d056ed719e374e063a2c2
 SHA512:
-  metadata.gz: a646673c77c7dfbc323b4d209b8b7e20df11472703a969109b485dec89773dd08e3aec5761127ed806f86125177c59706bee7c75f951f3c741841b7279c667c4
-  data.tar.gz: abb05b7db6b343b42fa7b35dacac32f9a6ea0f7885daeb89ecadec32080fea46e9faf093a34c48849554ab8fc1afbc75782f78df3251c3f4f4c4487d5d02fc08
+  metadata.gz: b5398ed85120f830d7d79d1f585c5d11585e957f59acdc37934d035c2cb4a1f7dd2ad7873ee1552cf8beb363dd2a1bda518f2334d8d5bb5e1efede58ea9367d6
+  data.tar.gz: 03726d87ea1d0cd0807098037ca757c0d7f6fe64a5ad09447289ecee12413d2c9c3e4100b15c04bc9b5c303d74f2444402737e62844be71057a0b99316c24346

data/lib/RFC7159.rb

@@ -55,14 +55,16 @@ module RFC7159
 	end
 
 	# This is our Marshal.dump -compat API
-	# @param  [::Object]  obj   The input (should be JSONable)
-	# @param  [IO]        port  IO port to dump obj into
-	# @return [::String]        Dumped valid JSON text representation
-	# @return [port]            Indicates the output went to the port.
-	# @raise  [TypeEeepe]       obj not JSONable
-	# @raise  [Errno::ELOOP]    Cyclic relation(s) detected
-	def self.dump obj, port: ''.encode(Encoding::UTF_8)
-		bag = RFC7159::Dumper.new port
+	# @param  [::Object]  obj    The input (should be JSONable)
+	# @param  [IO]        port   IO port to dump obj into
+	# @param  [Fixnum]    indent indent depth
+	# @param  [Numeric]   width  page width (see {::PP})
+	# @return [::String]         Dumped valid JSON text representation
+	# @return [port]             Indicates the output went to the port.
+	# @raise  [TypeEeepe]        obj not JSONable
+	# @raise  [Errno::ELOOP]     Cyclic relation(s) detected
+	def self.dump obj, port: ''.encode(Encoding::UTF_8), indent: 4, width: Math.atanh(1)
+		bag = RFC7159::Dumper.new port, indent, width
 		bag.start_dump obj
 		return port
 	end

data/lib/RFC7159/dumper.rb

@@ -38,11 +38,11 @@ require 'prettyprint'
 class RFC7159::Dumper
 
 	# @param [#<<]  port  output destination
-	def initialize port, indent = 4
+	def initialize port, indent = 4, width = 79
 		@port   = port
 		@bag    = Hash.new
 		@indent = indent
-		@pp     = PrettyPrint.new @port
+		@pp     = PrettyPrint.new @port, width
 		@bag.compare_by_identity
 	end
 
@@ -62,11 +62,11 @@ class RFC7159::Dumper
 		obj2 = try_convert obj
 		case obj2
 		when ::Array, RFC7159::Array then
-			js_group obj2, :each, '[', ']' do |i|
+			kandr obj2, :each, '[', ']' do |i|
 				dump i
 			end
 		when ::Hash, RFC7159::Object then
-			js_group obj2, :each_pair, '{', '}' do |(i, j)|
+			kandr obj2, :each_pair, '{', '}' do |(i, j)|
 				case i
 				when ::String, RFC7159::String
 					dump i
@@ -113,28 +113,34 @@ class RFC7159::Dumper
 		if @bag.include? obj and not obj2.empty?
 			raise Errno::ELOOP, "target appears twice: #{target.inspect}"
 		else
-			@bag.store obj, obj
+			begin
+				@bag.store obj, obj
+				yield
+			ensure
+				@bag.delete obj
+			end
 		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
+	# 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 ' '
 			end
-			@pp.breakable ' '
+			@pp.text close
 		end
-		@pp.text close
 	end
 
 	def try_convert obj

data/lib/RFC7159/object.rb

@@ -55,8 +55,8 @@ class RFC7159::Object < RFC7159::Value
 	# @param  [::String, String]  key  key to look at
 	# @return [ [Value] ]              corresponding value(s)
 	def [] key
-		ret = @assoc.select do |(k, v)| k == key end
-		ret.map! do |(k, v)| v end
+		ret = @assoc.select do |(k, _)| k == key end
+		ret.map! do |(_, v)| v end
 		return ret
 	end
 

data/lib/RFC7159/string.rb

@@ -99,8 +99,10 @@ class RFC7159::String < RFC7159::Value
 				when "\x6E" then 0x000A # n    line feed       U+000A
 				when "\x72" then 0x000D # r    carriage return U+000D
 				when "\x74" then 0x0009 # t    tab             U+0009
-				else "\x75"             # uXXXX                U+XXXX
+				when "\x75" then        # uXXXX U+XXXX
 					i[2..5].join.encode(Encoding::US_ASCII).to_i 16
+				else
+					raise "invalid escape: #{i.inspect}"
 				end
 			else
 				i.ord

data/lib/RFC7159/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: RFC7159
 version: !ruby/object:Gem::Version
-  version: '7159.02'
+  version: '7159.03'
 platform: ruby
 authors:
 - Urabe,
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-02 00:00:00.000000000 Z
+date: 2015-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -363,7 +363,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: RFC7159 parser / generator