torture 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9cf9f68d7ab433e6ec3258976fd9899997381c94790c167177f4119cce22ca2
-  data.tar.gz: 20d17c8428bd51abcfa11fb36f42d10d47ac46eb94b10af2521e89b4eb126711
+  metadata.gz: aff3c08d8cd95104a55ad3dc537155ede021cdb199409b8c29a5559016cf0e2a
+  data.tar.gz: fb60c30209e3952b38c7913887050f9f4aaae1103483e03810cb1985b1d25733
 SHA512:
-  metadata.gz: 36e0d29daccfe432fe4567b214c52cc11681d9add9e25f50445acd460b2af6e9ef58507907191f0fd8fcea3096ca8047395c409105f7811899fc7237497dc59c
-  data.tar.gz: 653cb314e328aec90a7d62119a66b70d40f80ed90a2ea080d4b15c28ad72a251cc41e413145c8254ecc85bbe68281b4bbf1bbc4dd00cde52777c6814b0896316
+  metadata.gz: 00323374d686a6be90492708332cb232a605cab2a946b14cb67ce44f6e06afac5019c5dcf7901ad05019e0ed2e2fe2de670b4ada0edeaea8597df991998d77ce
+  data.tar.gz: 6af6813f27bb19e0e1edc442abb30cd4373a3ad2cc7f4726e5d46b9008ba377fce759a03ca1f566a4df6caa994395fde06d4af2972bc86b5067e7217f50d4469

data/CHANGES.md

@@ -1,3 +1,9 @@
+# 0.0.3
+
+* Introduce the `:zoom` option that can show a class header/end plus a "zoomed"
+  section.
+* Fix a bug with `:collapse`, when the collapse marker had index `0`.
+
 # 0.0.2
 
 * Introduce the `:sub` option for `#snippet` to erase unwanted code parts.

data/lib/torture/snippet.rb

@@ -6,40 +6,31 @@ module Torture
     end
 
     # @param :collapse name of the #~collapse marker that will be displayed as `# ...`.
-    def self.extract(input, marker:, collapse:nil, unindent:false, sub: nil)
-      code = nil     # also acts as a flag if we're within our section.
-      ignore = false
-      indent = 0
+    def self.extract(input, marker:, collapse:nil, unindent:false, sub: nil, zoom: nil)
+      input_lines = input.each_line.to_a
 
-      input.each_line do |ln|
-        # end of our section?
-        break if ln =~ /\#:#{marker} end/
+      content_lines, first_line = extract_marker_section(input_lines, marker: marker)
+      raise "Couldn't find #{marker}" unless first_line
 
-        # beginning of our section?
-        if ln =~ /\#:#{marker}$/
-          code   = ""
-          indent = ln.match(/(^\s+)/) { |m| m[0].size } || 0
-        end
+      indent = first_line.match(/(^\s+)/) { |m| m[0].size } || 0 # FIXME: what if there's no first line?
 
-        next if code.nil? # not in our section.
+      if zoom
+        content_lines = zoom(content_lines, zoom: zoom)
+      end
 
-        if ln =~ /#~#{collapse}$/
-          ignore = true
-          code << ln.sub("#~#{collapse}", "# ...")
-        end
+      if collapse
+        count = content_lines.find_all { |ln| ln =~ /\#~#{collapse}$/ }.size # FIXME: hm, this is private.
 
-        if ln =~ /#~#{collapse} end/
-          ignore = false
-          next
+        count.times do
+          content_lines = collapse(content_lines, collapse: collapse)
         end
-
-        next if ignore
-        next if ln =~ /#~/
-        next if ln =~ /#:/
-        code << ln and next
       end
 
-      raise "Couldn't find #{marker}" unless code
+      # remove foreign delimiters
+      content_lines = content_lines.reject { |ln| ln =~ /#~/ }
+      content_lines = content_lines.reject { |ln| ln =~ /#:/ }
+
+      code = content_lines.join("")
 
       code = unindent(code, indent) if unindent == true
       code = sub(code, sub) if sub
@@ -47,6 +38,71 @@ module Torture
       code
     end
 
+    def self.detect_marker_section(input, delimiter:)
+      start_i, stop_i = nil, nil
+
+      input.each.with_index do |ln, i|
+        # end of our section?
+        if ln =~ /\##{delimiter} end/
+          stop_i = i
+          break
+        end
+
+        # beginning of our section?
+        if ln =~ /\##{delimiter}$/
+          start_i = i
+        end
+      end
+
+      [start_i, stop_i]
+    end
+
+    def self.extract_marker_section(input, marker:, delimiter: ":#{marker}")
+      start_i, stop_i = detect_marker_section(input, delimiter: delimiter)
+      return if start_i.nil?
+
+      marker_section = input[start_i + 1..stop_i - 1]
+
+      return marker_section, input[start_i]
+    end
+
+    def self.marker_to_dotdotdot(line, delimiter:)
+      line.sub("##{delimiter}", "# ...")
+    end
+
+    def self.zoom(input, zoom:, zoom_frame: [0..0, -1..-1])
+      delimiter = "~#{zoom}"
+      zoomed_section, first_line = extract_marker_section(input, marker: nil, delimiter: delimiter)
+
+      before_range, after_range = zoom_frame # DISCUSS: do we need that?
+
+      content = []
+      content += input[before_range]
+      content << dotdotdot = marker_to_dotdotdot(first_line, delimiter: delimiter)
+      content += zoomed_section
+      content << dotdotdot
+      content += input[after_range]
+
+      content
+    end
+
+    def self.collapse(input, collapse:)
+      delimiter = "~#{collapse}"
+
+      start_i, stop_i = detect_marker_section(input, delimiter: delimiter)
+
+
+      content = if start_i == 0
+          [] # if the #~skip start is index == 0, don't collect anything "before" (because there isn't anything).
+          # TODO: is there a Ruby idiom for this?
+        else
+          input[0..start_i - 1]
+        end
+
+      content << marker_to_dotdotdot(input[start_i], delimiter: delimiter)
+      content += input[stop_i + 1..-1]
+    end
+
     # Strip {indent} characters of whitespace from each line beginning.
     def self.unindent(code, indent)
       code.gsub(/^ {#{indent}}/, "")

data/lib/torture/version.rb

@@ -1,3 +1,3 @@
 module Torture
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torture
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-15 00:00:00.000000000 Z
+date: 2025-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake