trenni 1.4.4 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 216efe70504b121ea181eb3de5e24978db147f7e
-  data.tar.gz: fe495f4698096e743427e8b1860cf214ba8d5ce8
+  metadata.gz: 35f057654b1e83a57d1fe72969c9ee72eaf376de
+  data.tar.gz: a96c7a44b65be07ed3dc69e20ddbb25d92ee300a
 SHA512:
-  metadata.gz: f18a0a7bc9a13a81289d6f14188812759e645a5cdea3f9d4a8ecaa6dcfad2da6f71679f032482b176b8ff494396e0914b8b84326f470daa1aebefe91160de918
-  data.tar.gz: dc5079d20186b3800de81560c6932a6a0ff23b5f084e0ea0d2f3e958742859390fa040be47560521e3cbbf0f0d3648833914929a4c61b0b5323cdb86c9bdf0bb
+  metadata.gz: cef23ac0aa45af2f913cdd6b864a5beeacb78e0b3bc1c621db0565de40a34f030df816f048341a8c582f79628b75c334e33de3580c869956c7b0884856a48e21
+  data.tar.gz: e6a318ab7acaa6a04c5857b51caecb019936b07dcdcdd50581d0cb7879a2260ac8b1c399fdd28660cfd4cd87fa247649d89a3da54205b7bee15ede9a7e890bd4

data/.travis.yml

@@ -1,5 +1,13 @@
 language: ruby
+sudo: false
 rvm:
-  - "2.0"
-  - "2.1"
+  - 2.0.0
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
+  - ruby-head
+  - rbx-2
 env: COVERAGE=true
+matrix:
+  allow_failures:
+    - rvm: "rbx-2"

data/lib/trenni/parser.rb

@@ -26,49 +26,81 @@ module Trenni
 		OPENED_TAG = :opened
 		CLOSED_TAG = :closed
 		
-		def self.line_at_offset(input, input_offset)
-			line_number = 1
-			line_offset = offset = 0
-
-			input.each_line do |line|
-				line_offset = offset
-				offset += line.size
-
-				if offset >= input_offset
-					return {
-						# The line that contains the input_offset:
-						:line_number => line_number,
-						# The offset to the start of that line:
-						:line_offset => line_offset,
-						# The number of characters from the start of the line to the input_offset:
-						:character_offset => input_offset - line_offset,
-						# The line of text itself:
-						:text => line.chomp
-					}
+		class Location
+			def initialize(input, offset)
+				raise ArgumentError.new("Offset #{index} is past end of input #{input.bytesize}") if offset > input.bytesize
+				
+				@offset = offset
+				@line_index = 0
+				line_offset = next_line_offset = 0
+				
+				input.each_line do |line|
+					line_offset = next_line_offset
+					next_line_offset += line.bytesize
+					
+					# Is our input offset within this line?
+					if next_line_offset >= offset
+						@line_text = line.chomp
+						@line_range = line_offset...next_line_offset
+						break
+					else
+						@line_index += 1
+					end
 				end
-
-				line_number += 1
 			end
 			
-			return nil
+			def to_i
+				@offset
+			end
+			
+			def to_s
+				"[#{self.line_number}:#{self.line_range}]"
+			end
+			
+			# The line that contains the @offset (base 0 indexing).
+			attr :line_index
+			
+			# The line index, but base-1.
+			def line_number
+				@line_index + 1
+			end
+			
+			# The byte offset to the start of that line.
+			attr :line_range
+			
+			# The number of bytes from the start of the line to the given offset in the input.
+			def line_offset
+				@offset - @line_range.min
+			end
+			
+			attr :line_text
+			
+			def to_hash
+				{
+					:line_number => self.line_number,
+					:line_offset => self.line_range.min,
+					:character_offset => self.line_offset,
+					:text => self.line_text.chomp
+				}
+			end
+		end
+		
+		def self.line_at_offset(input, input_offset)
+			warn "#{self.class}::line_at_offset is deprecated, use Location.new(input, input_offset) directly!"
+			
+			Location.new(input, input_offset).to_hash rescue nil
 		end
 		
 		class ParseError < StandardError
 			def initialize(message, scanner)
 				@message = message
-
-				@position = scanner.pos
-				@line = Parser.line_at_offset(scanner.string, @position)
+				@location = Location.new(scanner.string, scanner.pos)
 			end
-
-			attr :offset
+			
+			attr :location
 
 			def to_s
-				if @offset
-					"Parse Error: #{@message} @ [#{@line[0]}:#{@line[2]}]: #{@line[4]}"
-				else
-					"Parse Error [#{@position}]: #{@message}"
-				end
+				"#{@message} at #{@location}"
 			end
 		end
 		

data/lib/trenni/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Trenni
-	VERSION = "1.4.4"
+	VERSION = "1.4.5"
 end

data/spec/trenni/parser_spec.rb

@@ -90,13 +90,24 @@ module Trenni::ParserSpec
 		it "should know about line numbers" do
 			data = %Q{Hello\nWorld\nFoo\nBar!}
 		
-			line = Trenni::Parser.line_at_offset(data, 7)
+			location = Trenni::Parser::Location.new(data, 7)
 		
-			expect(line[:text]).to be == "World"
+			expect(location.line_text).to be == "World"
 			
-			expect(line[:line_number]).to be == 2
-			expect(line[:line_offset]).to be == 6
-			expect(line[:character_offset]).to be == 1
+			expect(location.line_number).to be == 2
+			expect(location.line_range.min).to be == 6
+			expect(location.line_offset).to be == 1
+		end
+		
+		it "should know about line numbers when input contains multi-byte characters" do
+			delegate = ParserDelegate.new
+			scanner = Trenni::Parser.new(delegate)
+			
+			data = %Q{<p>\nこんにちは\nWorld\n<p}
+			error = scanner.parse(data) rescue $!
+			
+			expect(error).to be_kind_of Trenni::Parser::ParseError
+			expect(error.location.line_number).to be == 4
 		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trenni
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.5
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-10 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler