string-text 0.6.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc708ad8db9f529e578b50865ace1ac3fdeb1f8ec756039e9db10dcbefb45801
-  data.tar.gz: eedbc4c94d154a5dd6c8bed18f954409a2c89165356625aec07f68883b6ac56e
+  metadata.gz: 5595a21634c9c54723c5e357e923e9c87c312a98005bb959dc98d8b69ad58480
+  data.tar.gz: 8da08b627f45ab3f25dbac74915c3a844b45270c5cfd3b742eb95b0287de0a50
 SHA512:
-  metadata.gz: c91f32af2d66cbb39793bf7c05209bee216dbcc5836e8e76ca734a0e9d44c76aa9e14b03df60fdcb23f17f6246b0fd5f05718177a902a94c7ef2f6be3f206f38
-  data.tar.gz: 48f6a28ebb4cd562874d7890adad0d0df28f419085fe1a1b2ba90844ddea977cfe25e3d7be2f6d8a3c627cf8cd8207379d69c43fbe1316877e4bbd00457cf46a
+  metadata.gz: ee0fdb300976264a9dd98dc25f1a73d9cd5f5258e1d272c327fd1bb51fe66d9c79d913192f3ac18a541972d5ba8469f2db62b6cea486babef8400a62b831800c
+  data.tar.gz: 64092e8dd171c15f40b202fd6849aed0b85ef1fa973f4257410a374bb0339ff29d546f54eb3b5021bd2aa223f0caa8f813e2f1d0926c1035d7d5afed3adf042b

data/lib/string-text/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module String::Text
-  VERSION = "0.6.0"
+  VERSION = "0.6.2"
 end

data/lib/string-text.rb

@@ -5,13 +5,17 @@ require_relative "string-text/version"
 module String::Text
   class Error < StandardError; end
 
+  def self.indentation(s) s =~ /^(\s*)/; $1.size end
+
   refine String do
     # Indent or outdent a block of text to the given column (default 1). It
     # uses the indent of the least indented non-empty line as the indent of the
-    # block that is then aligned as a whole to the given column. Lines starting
+    # block that is then aligned as a whole to the given column; lines starting
     # at column one are realigned to the indent of the previous line. Initial
     # and final empty lines are ignored.
     #
+    # FIXME: make the special rule for lines starting at column one an option
+    #
     # #align is often handy when you call methods with a %(...) argument
     # and don't want weird indentation in your output
     #
@@ -20,15 +24,28 @@ module String::Text
     #       This line will start at column 3
     #   ).align
     #
+    #   This line will start at column 1
+    #     This line will start at column 3
+    #
     # Because unindented lines are realigned to the previous line's indent,
     # lists can be indented like this
     #
     #   words = %w(hello world)
     #   puts %(
-    #     Array elements on separate lines and starting at column 3
+    #     Array elements on separate lines and starting at column 3:
     #       #{words.join("\n")}
     #   ).align
     #
+    #   Array elements on separate lines and starting at column 3:
+    #     hello
+    #     world
+    #
+    # The trick is that the words expression makes the string expand to
+    #
+    #   Array elements on separate lines and starting at column 3:
+    #     hello
+    #   world
+    #
     # If :bol is false then the first line won't be indented or outdented
     #
     def align(column = 1, bol: true)
@@ -41,8 +58,15 @@ module String::Text
       lines.shift while !lines.empty? && !(lines.first =~ /^\s*\S/)
       return "" if lines.empty?
 
-      # Find minimal indent. Ignores lines with indent 0
-      indents = lines.map { _1 =~ /^(\s*)/; $1.size }
+      # Only align to given column if first line is not indented
+      if String::Text.indentation(lines.first) == 0
+        return lines.map { |line| ' ' * (column-1) + line }.join("\n")
+      end
+
+      # Identation level of each line
+      indents = lines.map { String::Text.indentation(_1) }
+
+      # Find minimal indent, ignoring unindented lines
       indent = indents.select { _1 > 0 }.min || 0
 
       first = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: string-text
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.2
 platform: ruby
 authors:
 - Claus Rasmussen