multiline 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41422946606c5f4d1aa35d8495b150be9ff55c126cda6066397162cf2496e113
-  data.tar.gz: 19433995427155593ea5a5ee044ff452373c16b8365006d18b8e12acc716ae13
+  metadata.gz: 120e9b321bc8ee21dd0baef7c9795c76b18efaef94c5873f043b30b4769515c4
+  data.tar.gz: d8363e7df7ecbac0ae47017261dd27245562126d1c5005a9b55d4dc4e0dbe12e
 SHA512:
-  metadata.gz: 3cdd9b623cf7b6c983efa0188ebbbd827fd0fbaeab16961c09aa40dda0f1d468c0d5a3fc184abc69f7ae02e86fabbf5a5037c435a68f8ebac37243db7b6094c9
-  data.tar.gz: 4c8038cc860e4a2587cf773886638e0d4052e8efe1cc08cb3517720cf099ac2b6687c44c3e5f576154497ac4ccdd04d487af0c2449f3079d7e5a8a090a73fe67
+  metadata.gz: fedf659662908421d78f321fd4a81093dab8e1e907da6bca566dcf48391976ff285698291f47d07f35de6e3d9d79db3dd3fe003e15a43b114369ed71438693b4
+  data.tar.gz: 77afa7ad629335f4b502cff4157799b31af504260727371c027e8d59a77f1665242bc9fc9111d48863f2b8b53d321732a7f6c23dd32289f893d8125c5d657a1f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    multiline (0.1.0)
+    multiline (0.2.0)
       unicode-display_width
       unicode-emoji
 

data/lib/multiline.rb

@@ -2,53 +2,9 @@ require "unicode/display_width"
 require "unicode/emoji"
 require "multiline/version"
 
+require "multiline/string"
+require "multiline/array"
+
 module Multiline
   class Error < StandardError; end
-
-  class String
-    attr_reader :row, :col, :buf
-    def initialize(str = "")
-      @buf = str.split(/\n/)
-      @row = @buf.count
-      @col = @buf.map{|line| Unicode::DisplayWidth.of(line) }.max
-      @buf = @buf.map{|line| line + " " * (@col - Unicode::DisplayWidth.of(line)) }
-    end
-
-    def concat(*arguments, align: :center)
-      arguments.each do |arg|
-        @col += arg.col
-        @row = [@row, arg.row].max
-        case arg
-        when ::String
-        when ::Multiline::String
-          case align
-          when :top
-            start_row = 0
-            end_row = arg.row
-          when :center
-            start_row = (@row - arg.row) / 2
-            end_row = (@row + arg.row) / 2
-          when :bottom
-            start_row = @row - arg.row
-            end_row = @row
-          end
-
-          @buf.each_with_index do |line, index|
-            if index >= start_row && index < end_row
-              line.concat(arg.buf[index - start_row])
-            else
-              line.concat(' ' * arg.col)
-            end
-          end
-        else
-          raise ArgumentError, "Invalid string"
-        end
-      end
-      self.to_s
-    end
-
-    def to_s
-      @buf.join("\n") + "\n"
-    end
-  end
 end

data/lib/multiline/array.rb

@@ -0,0 +1,24 @@
+module Multiline
+  class Array < ::Array
+    def join(sep = $,, align: :center)
+      buf = Multiline::String.new
+      self.each_with_index do |str, index|
+        case str
+        when ::String
+          buf.concat(Multiline::String.new(str), align: align)
+        when Multiline::String
+          buf.concat(str, align: align)
+        end
+        break if index == (self.length - 1)
+
+        case sep
+        when ::String
+          buf.concat(Multiline::String.new(sep), align: align)
+        when Multiline::String
+          buf.concat(sep, align: align)
+        end
+      end
+      buf
+    end
+  end
+end

data/lib/multiline/string.rb

@@ -0,0 +1,57 @@
+module Multiline
+  class String
+    attr_reader :row, :col, :buf
+    def initialize(str = "")
+      @buf = str.split(/\n/)
+      @row = @buf.count || 0
+      @col = @buf.map{|line| Unicode::DisplayWidth.of(line) }.max || 0
+      @buf = @buf.map{|line| line + " " * (@col - Unicode::DisplayWidth.of(line)) }
+    end
+
+    def +(other)
+      buf = Multiline::String.new
+      buf.concat(self, other)
+      buf
+    end
+
+    def concat(*arguments, align: :center)
+      arguments.each do |arg|
+        @col += arg.col
+        @row = [@row, arg.row].max
+
+        case arg
+        when ::String
+        when ::Multiline::String
+          case align
+          when :top
+            start_row = 0
+            end_row = arg.row
+          when :center
+            start_row = (@row - arg.row) / 2
+            end_row = (@row + arg.row) / 2
+          when :bottom
+            start_row = @row - arg.row
+            end_row = @row
+          end
+
+          for index in 0...row do
+            buf[index] ||= ""
+            line = buf[index]
+            if index >= start_row && index < end_row
+              line.concat(arg.buf[index - start_row])
+            else
+              line.concat(' ' * arg.col)
+            end
+          end
+        else
+          raise ArgumentError, "Invalid string"
+        end
+      end
+      self.to_s
+    end
+
+    def to_s
+      @buf.join("\n") + "\n"
+    end
+  end
+end

data/lib/multiline/version.rb

@@ -1,3 +1,3 @@
 module Multiline
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multiline
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Toshio Maki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-06 00:00:00.000000000 Z
+date: 2021-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unicode-display_width
@@ -57,6 +57,8 @@ files:
 - bin/console
 - bin/setup
 - lib/multiline.rb
+- lib/multiline/array.rb
+- lib/multiline/string.rb
 - lib/multiline/version.rb
 - multiline.gemspec
 homepage: https://github.com/kirikak2/multiline