vdf 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d59421040845ace586a5c85a1bd21f04197956ecf167864ce816e76fb2f1313
-  data.tar.gz: c11b0824a64d2d5c83fedffe3cfefdf75739528d42844b899e8e820d600dbc48
+  metadata.gz: 671fed7feb60fe6633dbf7f0e59be7871b6ebcdce21526f4a48a2995f74bab30
+  data.tar.gz: 27d447b2bdaa23854f08b8d39765baec1119e80362e565eceb3c07761144faa8
 SHA512:
-  metadata.gz: acbbf17141f9d37ceb9afa01a6ce343f3769e18c56b411afd70a4b23d04cdc4c83db9d6907476da71115a0514d3f1a9e0319e333d1e1f9a6334027bd56fcf407
-  data.tar.gz: 29a20503e1a355834385e07f303ade165a52b1f6479a6b16e55b4e1af188a088bdf5e9c6b63985104c77646455d89174a783aeb4838d4918d81b0d68b2475fcb
+  metadata.gz: 52725af93ca37ad09273f16ffc1cad5c1ea90c89703187e915a8c8855806795a33f2378c07a76b7ef81e59de6344338ae8f5ac81104c3621d777283a24e2abca
+  data.tar.gz: 335f96798e24298f69aeda8a8df290bf5245126951c69e556312b53d5b98fe998653d324620c76fbce6ce717de9e96db31b5ddbc9c79ae39a09506ffa1e6e2e5

data/lib/vdf/parse.rb

@@ -10,27 +10,26 @@ module VDF
 				Regexp::MULTILINE
 			)
 
-			def parse(text)
-				lines = text.lines
-				object = {}
-				stack = [object]
-				expect = false
-				skip_lines = 0
+			def parse(input)
+				raise ArgumentError, "Input has to respond to :each_line or :to_str" unless input.respond_to?(:each_line) || input.respond_to?(:to_str)
+				input = StringIO.new(input) unless input.respond_to? :pos
 
-				lines.each_with_index do |line, i|
-					if skip_lines > 0
-						skip_lines -= 1
-						next
-					end
+				result = {}
+				stack = [result]
+				expect = false
+				i = 0
 
-					line.strip!
-					next if line == -'' || line[0] == -'/'
+				enum = input.each_line.lazy
+				enum.with_index do |line, _|
+					i += 1
+					line.encode!("UTF-8").strip!
+					next if line.empty? || line[0] == -'/'
 
 					if line.start_with?(-'{')
 						expect = false
 						next
 					elsif expect
-						raise ParserError, "Invalid syntax on line #{i+1}"
+						raise ParserError, "Invalid syntax on line #{i+1} (Expected identifier)"
 					end
 
 					if line.start_with?(-'}')
@@ -39,9 +38,8 @@ module VDF
 					end
 
 					loop do
-						m = REGEX.match(line)
-						if m.nil?
-							raise ParserError, "Invalid syntax on line #{i+1}"
+						if (m = REGEX.match(line)).nil?
+							raise ParserError, "Invalid syntax on line #{i+1} (Line didn't match regex)"
 						end
 
 						key = m[2] || m[3]
@@ -51,16 +49,20 @@ module VDF
 							if stack[-1][key].nil?
 								stack[-1][key] = {}
 							end
-							stack.push(stack[-1][key])
+							stack << stack[-1][key]
 							expect = true
 						else
 							if m[7].nil? && m[8].nil?
-								line << -"\n" << lines[i+skip_lines+1].chomp
-								skip_lines += 1
+								if (next_line = enum.next).nil?
+									raise ParserError, "Invalid syntax on line #{i+1} (Unexpected EOF)"
+								end
+
+								i += 1
+								line << -"\n" << next_line.to_s.encode("UTF-8").strip
 								next
 							end
 
-							stack[stack.length - 1][key] = begin
+							stack[-1][key] = begin
 								begin
 									Integer(val)
 								rescue ArgumentError
@@ -84,7 +86,7 @@ module VDF
 					end
 				end
 
-				return object
+				return result
 			end
 		end
 	end

data/lib/vdf/version.rb

@@ -1,3 +1,3 @@
 module VDF
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vdf
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - sapphyrus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-22 00:00:00.000000000 Z
+date: 2019-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler