mll 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7eaa6d43148b9cdf889647a63e9e8661629d776c
-  data.tar.gz: 53ad8127bbbc75b201bf98c316042281fdb97390
+  metadata.gz: 4e828b7ba71a30c704eb325f81a144113ced5243
+  data.tar.gz: 3365c0fb3f69975205447c5b962599e825300c78
 SHA512:
-  metadata.gz: 622ac74b5373d2ef998ac01d1f834aeba929ae7a368a5f49b5ca1143ec07ce9dfaf8143486539859d7f79e4931c94e930828d6c3eeea518f36d2b26b9c6f77c4
-  data.tar.gz: c84783d82d35568dc977fe689483c173afaa9d3159053454796f1a9b06cc80cdb3d89259fd875af4677755e9de43961d7ba87ae1cf4b0f4e7ff0b0f5f590c084
+  metadata.gz: 1a2c95ffc31aac88097f2d383a5113cbfff4a4a5be337981f4c52f41a3f43d75854892044488b4ce6edd26a61b02a695dc7b228c9d1f6ff4ac61d4e616236e5a
+  data.tar.gz: 7abc5d63a3438924c5fe7423e9a86a3aa74618d8739383b72560a2063c27b4dd9f8d51306fa0798399a8b48a6cdd524ab26e53c0d55f6a281e0cce0952502cd1

data/README.md

@@ -2,7 +2,7 @@
 
 [![Join the chat at https://gitter.im/Nakilon/mll](https://badges.gitter.im/Nakilon/mll.svg)](https://gitter.im/Nakilon/mll?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)  
 [![Gem Version](https://badge.fury.io/rb/mll.svg)](http://badge.fury.io/rb/mll)  
-[![Build Status](https://travis-ci.org/Nakilon/mll.svg)](https://travis-ci.org/Nakilon/mll)
+[![Build Status](https://travis-ci.org/Nakilon/mll.svg)](https://travis-ci.org/Nakilon/mll?branch=master)
 
 ### What
 

data/lib/mll.rb

@@ -1,6 +1,6 @@
 module MLL
 
-  VERSION = "2.5.0"
+  VERSION = "2.5.1"
 
   class << self
 
@@ -96,8 +96,11 @@ module MLL
       lambda do |f, *args|
         [].tap do |result|
           [[result, args.map{ |r| # add lazy?
-            r.respond_to?(:map) && r.first.respond_to?(:map) ?
-              r.first : range[*r]
+            if r.respond_to? :map
+              next r if r.is_a? Range
+              next r.first if r.first.respond_to? :map # TODO check r.size?
+            end
+            range[*r]
           }]].tap do |stack|
             stack.each do |ai, ri|
               # TODO try to make #table lazy (Enumerator instead of Array)
@@ -119,47 +122,70 @@ module MLL
     # http://www.unicode.org/charts/PDF/U2500.pdf
     # https://en.wikipedia.org/wiki/Box_Drawing
     def grid
-      lambda do |table, **options|
+      lambda do |table, spacings: [1, 1], **options|
         # TODO negative spacings?
-        options[:spacings] ||= [1, 1]
-        spacings_horizontal, spacings_vertical = [*options[:spacings]]
-        spacings_vertical ||= 1
-        raise ArgumentError.new("unknown value of :alignment option '#{options[:alignment]}'") unless \
+        spacing_horizontal, spacing_vertical = spacings
+        spacing_vertical ||= 1
+        raise ArgumentError.new("unsupported value of :alignment option '#{options[:alignment]}'") unless \
           alignment = {
             nil => :center,
             :center => :center,
             :left => :ljust,
             :right => :rjust,
           }[options[:alignment]]
-        frames = {
-          nil  => "              ",
-          true => "┃ ┏┓ ┗┛━ ┃━━┃ ",
-          :all => "┃┃┏┓╋┗┛━━┣┳┻┫ ",
-        }[options[:frame]]
-        raise ArgumentError.new("unknown value of :frame option '#{options[:frame]}'") if options[:frame] && !frames
-        # TODO smth with this #.all?
+        raise ArgumentError.new("unsupported value of :frame option '#{options[:frame]}'") unless \
+          frames = {
+            nil  => "              ",
+            true => "┃ ┏┓ ┗┛━ ┃━━┃ ",
+            :all => "┃┃┏┓╋┗┛━━┣┳┻┫ ",
+          }[options[:frame]]
+        # TODO smth with this; maybe check out how Mathematica handles `Table[{1,{2,3},4}]`
+
         table = [table] unless table.all?{ |e| e.respond_to? :each }
-        width = table.map(&:size).max - 1
-        strings = table.map{ |row| row.dup.tap{ |a| a[width] = a[width] }.map(&:to_s) }
-        sizes = strings.transpose.map{ |col| col.map(&:size).max + [spacings_horizontal * 2 - 2, 0].max }
-        # TODO https://reference.wolfram.com/language/ref/Alignment.html
-        border_vertical  = [frames[9], sizes.map{ |size|  frames[8] * size }.join((frames[4] unless spacings_horizontal.zero?)), frames[12]]
-        spacing_vertical = [frames[0], sizes.map{ |size| frames[13] * size }.join((frames[0] unless spacings_horizontal.zero?)), frames[0]]
-        gap_vertical = lambda do |i|
-          j = i - 1
-          [*-j..j].map{ |k| [border_vertical][k] || spacings_vertical }
-        end.call spacings_vertical
-        [
-          [frames[2], sizes.map{ |size| frames[7] * size }.join((frames[10] unless spacings_horizontal.zero?)), frames[3]].join,
-          *([spacing_vertical.join] * [spacings_vertical - 1, 0].max),
-          strings.map{ |row| [frames[0], row.zip(sizes).map{ |str, size|
-            str.method(alignment).call(size)
-          }.join((frames[1] unless spacings_horizontal.zero?)), frames[0]].join }.join(
-            ?\n + gap_vertical.map{ |gap| gap.join + ?\n }.join
-          ),
-          *([spacing_vertical.join] * [spacings_vertical - 1, 0].max),
-          [frames[5], sizes.map{ |size| frames[7] * size }.join((frames[11] unless spacings_horizontal.zero?)), frames[6]].join,
-        ].join(?\n) + ?\n
+        width = table.map(&:size).max
+        table = table.map do |row|
+          row.dup.tap do |row|
+            row[width - 1] = row[width - 1]
+          end.map &:to_s
+        end
+        rows = table.map{ |row| row.map{ |s| s.count ?\n }.max + 1 }
+        cols = table.transpose.map{ |col| col.flat_map{ |s| s.scan(/.+/).map(&:size) }.max }
+
+        chars = table.flat_map.with_index do |row, i|
+          row.map.with_index do |s, j|
+            lines = s.scan(/.+/)
+            max = lines.map(&:size).max || 0
+            lines.map!{ |line| line.ljust(max).method(alignment).call(cols[j]) }
+            self.table[ lambda do |k, l|
+              m = k - spacing_vertical
+              n = l - spacing_horizontal
+              0<=m && m<lines.size && 0<=n && n<cols[j] ? lines[m][n] : frames[(
+                h = spacing_horizontal.zero?
+                v = spacing_vertical.zero?
+                k == 0 ? l == 0 ?
+                  h ? v ? ?O : 7 : v ? 0 :
+                    i.zero? ? j.zero? ? 2 : 10 : j.zero? ? 9 : 4 :
+                  v ? 13 : i.zero? ? 7 : 8 : l == 0 ? j.zero? ? 0 : 1 : 13
+              )]
+            end, 0...[rows[i] + spacing_vertical   * 2 - 1, 1].max,
+                 0...[cols[j] + spacing_horizontal * 2 - 1, 1].max ]
+          end.transpose.map{ |row| row.inject :+ }
+        end
+
+        borders_horizontal = fold_list[0, rows, ->i,j{ i + j + spacing_vertical * 2 - 1 }].to_a
+        chars.each_with_index do |line, i|
+          line.push frames[borders_horizontal.include?(i) && !spacing_vertical.zero? ? 12 : 0]
+          line.unshift frames[i.zero? ? 2 : borders_horizontal.include?(i) && !spacing_vertical.zero? ? 9 : 0] if spacing_horizontal.zero?
+        end
+        borders_vertical = fold_list[0, cols, ->i,j{ i + j + spacing_horizontal * 2 - 1 }].to_a
+        chars = chars.transpose.each_with_index do |line, i|
+          line.push frames[i.zero? ? 5 : borders_vertical.include?(i) && !spacing_horizontal.zero? ? 11 : 7]
+          line.unshift frames[i.zero? ? 2 : borders_vertical.include?(i) && !spacing_horizontal.zero? ? 10 : 7] if spacing_vertical.zero?
+        end.transpose
+        chars[-1][-1] = frames[6]
+        chars[0][-1] = frames[3]
+
+        chars.map{ |row| row.push ?\n }.join
       end
     end
 

data/spec/_spec.rb

@@ -1,3 +1,5 @@
+require "pp"
+
 require_relative "../lib/mll"
 
 # PERMATODO test all implemented exceptions
@@ -277,12 +279,12 @@ describe MLL do
         end
 
         example "table[lambda, n1, min..max, [max, min, -step]]" do
-          expect(table[->(i,j,k){ [i,j,k] }, 3, 2..3, [5, 1, -2]]).to be_a Array
-          expect(table[->(i,j,k){ [i,j,k] }, 3, 2..3, [5, 1, -2]]).to eq \
+          expect(table[->(i,j,k){ [i,j,k] }, 3, 1..3, [5, 1, -2]]).to be_a Array
+          expect(table[->(i,j,k){ [i,j,k] }, 3, 1..3, [5, 1, -2]]).to eq \
           [
-           [[[1, 2, 5], [1, 2, 3], [1, 2, 1]], [[1, 3, 5], [1, 3, 3], [1, 3, 1]]],
-           [[[2, 2, 5], [2, 2, 3], [2, 2, 1]], [[2, 3, 5], [2, 3, 3], [2, 3, 1]]],
-           [[[3, 2, 5], [3, 2, 3], [3, 2, 1]], [[3, 3, 5], [3, 3, 3], [3, 3, 1]]]
+           [[[1, 1, 5], [1, 1, 3], [1, 1, 1]], [[1, 2, 5], [1, 2, 3], [1, 2, 1]], [[1, 3, 5], [1, 3, 3], [1, 3, 1]]],
+           [[[2, 1, 5], [2, 1, 3], [2, 1, 1]], [[2, 2, 5], [2, 2, 3], [2, 2, 1]], [[2, 3, 5], [2, 3, 3], [2, 3, 1]]],
+           [[[3, 1, 5], [3, 1, 3], [3, 1, 1]], [[3, 2, 5], [3, 2, 3], [3, 2, 1]], [[3, 3, 5], [3, 3, 3], [3, 3, 1]]]
           ]
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mll
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Victor Maslov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-30 00:00:00.000000000 Z
+date: 2016-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler