muflax 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3c658af855414bea8ca9b03391eef441f7a3706
-  data.tar.gz: 7c45ee303680f6c7bffe588ff345ddecd04dc1cc
+  metadata.gz: 4e70421f893de0859ccaa17fa1a9c1494d5886d9
+  data.tar.gz: 802a0fed3386db1e8a9b1129cbf136c4da9348a1
 SHA512:
-  metadata.gz: 0bfa5c9b931ddd083e37e42c7908cdda757c8bf62b8e4c202d374dffb38ec1de66e58cde98520f2d3f43add24461fbca60a020ffc4ae0f67e98b99580911ef4c
-  data.tar.gz: 5d4af076c5f8c31569c1a0c9392cf9a37365b0e8b660e484ade2901b4ce0afd258926388ffa7afacdbbb4a43851cbdc7a0adfc471169e20f3b2dacafabac5ca9
+  metadata.gz: 7e7457a9c3c6462c4eac1e2137693cede786c9340c4448556c2931abdf864658f4f0296507b464d76c4cd15b53319c1249117edd127ab4ae73c3e0b7351923e6
+  data.tar.gz: 2a87180a6af908e7a4f397e0065776bb7382864c5e122200d99e50621a25a2d9de239c910188135f243ca44fd71b7f75bf34fb50eea7051d64bd67212813b393

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    muflax (0.2.5)
+    muflax (0.2.6)
       activesupport (~> 5)
       awesome_print
       debug_inspector

data/lib/muflax/panes.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # -*- encoding: utf-8 -*-
-# Copyright Stefan Dorn <mail@muflax.com>, 2017
+# Copyright Steffi Dorn <mail@muflax.com>, 2017
 # License: GNU GPLv3 (or later) <http://www.gnu.org/copyleft/gpl.html>
 
 module Kernel
@@ -55,12 +55,12 @@ class Panes
     @sections.last
   end
 
-  def total_lines              	; @height * @columns            	; end
-  def remaining_lines          	; total_lines - @used_lines     	; end
-  def remaining_lines_on_column	; remaining_lines % @height     	; end
-  def used_columns             	; @used_lines / @height         	; end
-  def remaining_columns        	; @columns - used_columns       	; end
-  def column_full?             	; remaining_lines_on_column <= 1	; end
+  def total_lines              	; @height * @columns                                          	; end
+  def remaining_lines          	; [total_lines - @used_lines, 0].max                          	; end
+  def remaining_lines_on_column	; remaining_lines <= 0 ? 0 : (remaining_lines % @column_height)	; end
+  def used_columns             	; @used_lines / @height                                       	; end
+  def remaining_columns        	; @columns - used_columns                                     	; end
+  def column_full?             	; remaining_lines_on_column <= 0                              	; end
 
   def new_column
     unless column_full?
@@ -74,8 +74,7 @@ class Panes
     lines  	= [*lines].flatten
     section	= new_section
     left   	= remaining_lines_on_column
-
-    # ap h: @height, t: total_lines, r: remaining_lines, rc: remaining_lines_on_column, l: lines
+    rem    	= remaining_lines
 
     num = case max
           when :all            	; lines.size
@@ -87,22 +86,34 @@ class Panes
     num = [num, remaining_lines].min
     @used_lines += num
 
-    if @need_divider
-      if header
-        h              	= lines.first
-        lines          	= lines[1..-1]
-        div            	= h.sub(/^\s+/){|s| @divider*s.size}.sub(/\s+$/){|s| @divider*s.size}
-        section.divider	= div + @divider * (@column_width - div.str_length)
-      else
-        @used_lines += 1
-        num -= 1 unless max == :all # compensate for the divider
-        section.divider = @divider * @column_width
-      end
+    case
+    when header
+      h              	= lines.first
+      lines          	= lines[1..-1]
+      div            	= h.sub(/^\s+/){|s| @divider*s.size}.sub(/\s+$/){|s| @divider*s.size}
+      section.divider	= div + @divider * (@column_width - div.str_length)
+
+    when @need_divider
+      @used_lines    	+= 1
+      num            	-= 1 if max != :all or num >= rem # compensate for the divider
+      section.divider	= @divider * @column_width
     end
 
+    num          	= [num, rem].min
     to_print     	= tail ? lines.last(num) : lines.first(num)
     @need_divider	= ! column_full?
 
+    # ap(
+    #   height:    	@height,
+    #   total:     	total_lines,
+    #   rem:       	rem,
+    #   left:      	left,
+    #   rem_lines: 	remaining_lines,
+    #   rem_column:	remaining_lines_on_column,
+    #   lines:     	lines,
+    #   num:       	num
+    #   )
+
     to_print.each do |line|
       section << line.truncate(@column_width, omission: "⇏")
     end

data/lib/muflax/table.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # -*- encoding: utf-8 -*-
-# Copyright Stefan Dorn <mail@muflax.com>, 2017
+# Copyright Steffi Dorn <mail@muflax.com>, 2017
 # License: GNU GPLv3 (or later) <http://www.gnu.org/copyleft/gpl.html>
 
 class Table

data/lib/muflax/value.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # -*- encoding: utf-8 -*-
-# Copyright Stefan Dorn <mail@muflax.com>, 2016
+# Copyright Steffi Dorn <mail@muflax.com>, 2016
 # License: GNU GPLv3 (or later) <http://www.gnu.org/copyleft/gpl.html>
 
 class Value

data/muflax.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "muflax"
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.authors = ["muflax"]
   s.summary = "muflax standard library"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: muflax
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - muflax
@@ -28,7 +28,7 @@ cert_chain:
   9xjevPGDZ+8y8wc8/mXBPK1pTaBh2oi8947HaTq8EadxezFs2Je+oSnMbygfo/a7
   0rbAHpJPtzql3a4+gjK54qkJUWSUjWuLMHFIHhMt1laowNJUio6ASGx8tfzgLLnZ
   -----END CERTIFICATE-----
-date: 2017-07-19 00:00:00.000000000 Z
+date: 2017-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport