better_html 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16bc95c4f55d720a177e9849dea00e7d83c66455
-  data.tar.gz: 376b80e51f2379ce6c5640e834de1c62aa990ae5
+  metadata.gz: 24abf8276750c88363603b5b3900aa6c5ca253aa
+  data.tar.gz: bc8e69fb9ff82006af0b94f50f150200ec904ece
 SHA512:
-  metadata.gz: bf07d75143cfde43414bb3e8a5c2520b527f047d0c796c7ff97e60aa2d23d0bc03ea1f06c72eab5db5f4c10cdb01eccf0c6abe585b0ae394dc662731599e296b
-  data.tar.gz: b7dd6bfc56b0a36d773dabbe13a7ad922bc9c5cd322f4a240ba8d9064c8753ec4efca3fb5b1a7c63d36291b60dd48ec142521b3af98811f3a017d5d62f90ab97
+  metadata.gz: 1d990f65159106d1d1794c6dd9d810ced2ab3e5c79c518a9b8165235c1d5ea1919334f8bc7d9787d460ecaab7059af2d8a63fbb7721909610b43920efe2d1943
+  data.tar.gz: ed23dc14085fd3fa583a9309339f73af41bc85e8f3a6dd1a61c7febf2d03ca575136c87544b545d5fdb0864505a262fd1eb838920d69e4f26a1e309d3feac339

data/lib/better_html/tokenizer/base_erb.rb

@@ -66,10 +66,10 @@ module BetterHtml
         token = add_token(:erb_end, pos, pos + 2)
       end
 
-      def add_token(type, start, stop, line = nil, column = nil)
+      def add_token(type, start, stop)
         token = Token.new(
           type: type,
-          loc: Location.new(@document, start, stop - 1, line, column)
+          loc: Location.new(@document, start, stop - 1)
         )
         @tokens << token
         token

data/lib/better_html/tokenizer/html_erb.rb

@@ -22,8 +22,8 @@ module BetterHtml
       end
 
       def add_text(text)
-        @parser.parse(text) do |type, start, stop, line, column|
-          add_token(type, start, stop, line, column)
+        @parser.parse(text) do |type, start, stop, _line, _column|
+          add_token(type, start, stop)
         end
       end
     end

data/lib/better_html/tokenizer/html_lodash.rb

@@ -62,8 +62,8 @@ module BetterHtml
       end
 
       def add_text(text)
-        @parser.parse(text) do |type, start, stop, line, column|
-          add_token(type, start: start, stop: stop, line: line, column: column)
+        @parser.parse(text) do |type, start, stop, _line, _column|
+          add_token(type, start: start, stop: stop)
         end
       end
 
@@ -84,10 +84,10 @@ module BetterHtml
         add_token(:lodash_end, start: pos, stop: pos + 2)
       end
 
-      def add_token(type, start: nil, stop: nil, line: nil, column: nil)
+      def add_token(type, start: nil, stop: nil)
         token = Token.new(
           type: type,
-          loc: Location.new(@document, start, stop-1, line, column)
+          loc: Location.new(@document, start, stop-1)
         )
         @tokens << token
         token

data/lib/better_html/tokenizer/location.rb

@@ -3,7 +3,7 @@ module BetterHtml
     class Location
       attr_accessor :start, :stop
 
-      def initialize(document, start, stop, line = nil, column = nil)
+      def initialize(document, start, stop)
         raise ArgumentError, "start location #{start} is out of range for document of size #{document.size}" if start > document.size
         raise ArgumentError, "stop location #{stop} is out of range for document of size #{document.size}" if stop > document.size
         raise ArgumentError, "end of range must be greater than start of range (#{stop} < #{start})" if stop < start
@@ -11,28 +11,46 @@ module BetterHtml
         @document = document
         @start = start
         @stop = stop
-        @line = line
-        @column = column
       end
 
       def range
         Range.new(start, stop)
       end
 
+      def line_range
+        Range.new(start_line, stop_line)
+      end
+
       def source
         @document[range]
       end
 
+      def start_line
+        @start_line ||= calculate_line(start)
+      end
+
       def line
-        @line ||= calculate_line
+        start_line
+      end
+
+      def stop_line
+        @stop_line ||= calculate_line(stop)
+      end
+
+      def start_column
+        @start_column ||= calculate_column(start)
       end
 
       def column
-        @column ||= calculate_column
+        start_column
+      end
+
+      def stop_column
+        @stop_column ||= calculate_column(stop)
       end
 
       def line_source_with_underline
-        line_content = extract_line(line: line)
+        line_content = extract_line(line: start_line)
         spaces = line_content.scan(/\A\s*/).first
         column_without_spaces = [column - spaces.length, 0].max
         underscore_length = [[stop - start + 1, line_content.length - column_without_spaces].min, 1].max
@@ -41,14 +59,14 @@ module BetterHtml
 
       private
 
-      def calculate_line
-        return 1 if start == 0
-        @document[0..start-1].scan("\n").count + 1
+      def calculate_line(pos)
+        return 1 if pos == 0
+        @document[0..pos-1].scan("\n").count + 1
       end
 
-      def calculate_column
-        return 0 if start == 0
-        @document[0..start-1]&.split("\n", -1)&.last&.length || 0
+      def calculate_column(pos)
+        return 0 if pos == 0
+        @document[0..pos-1]&.split("\n", -1)&.last&.length || 0
       end
 
       def extract_line(line:)

data/lib/better_html/version.rb

@@ -1,3 +1,3 @@
 module BetterHtml
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/test/better_html/tokenizer/html_erb_test.rb

@@ -95,7 +95,7 @@ module BetterHtml
 
         assert_attributes ({ type: :text, loc: { line: 1, source: 'before ' } }), scanner.tokens[0]
         assert_attributes ({ type: :erb_begin, loc: { line: 1, source: '<%' } }), scanner.tokens[1]
-        assert_attributes ({ type: :code, loc: { line: 1, source: " multi\nline " } }), scanner.tokens[2]
+        assert_attributes ({ type: :code, loc: { line: 1, start_line: 1, stop_line: 2, source: " multi\nline " } }), scanner.tokens[2]
         assert_attributes ({ type: :erb_end, loc: { line: 2, source: "%>" } }), scanner.tokens[3]
         assert_attributes ({ type: :text, loc: { line: 2, source: " after" } }), scanner.tokens[4]
       end

data/test/better_html/tokenizer/location_test.rb

@@ -25,12 +25,14 @@ module BetterHtml
         assert_equal "end of range must be greater than start of range (2 < 5)", e.message
       end
 
-      test "location without line and column" do
-        loc = Location.new("foo\nbar\nbaz", 9, 9)
-
-        assert_equal "a", loc.source
-        assert_equal 3, loc.line
-        assert_equal 1, loc.column
+      test "location calulates start and stop line and column" do
+        loc = Location.new("foo\nbar\nbaz", 5, 9)
+
+        assert_equal "ar\nba", loc.source
+        assert_equal 2, loc.start_line
+        assert_equal 1, loc.start_column
+        assert_equal 3, loc.stop_line
+        assert_equal 1, loc.stop_column
       end
 
       test "line_source_with_underline" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: better_html
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Francois Chagnon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-07 00:00:00.000000000 Z
+date: 2018-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -228,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Better HTML for Rails.