mll 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66cecae3ebfe3b1589979a8146bb036f5f8a7203
-  data.tar.gz: dd4fd79c9a5684e9cdefa25845a0530c1c897b5a
+  metadata.gz: d58bb50822e2731bcbf03713335a1445f697a8a9
+  data.tar.gz: 8c42d69f1444b610b797b2263854b67909e66e9b
 SHA512:
-  metadata.gz: 1b0b5f12be754586a9e65a437924d5ac6153596c9fc5225da5820948b8f1fb10b49b42db02ac89a089f3872b26aba8d8896b5ae5d6bc4479d41398f3dc4ec18c
-  data.tar.gz: 5fe76c75a56556b8e77e7855e28d006828fb963e1f943b14a7ec7ab4051c691280f365d25a9bbdb3640b82859bf1816b3f6ef44b033c149fcf89504a5af9ec75
+  metadata.gz: d6aa2a6b3fa89f8a0dd28327c280458db1e4570716f1bc63d2efaed23df23ae4d305359374988e148ada03a9c3b5f6072900fae0ce5f4a1677946b81733ac2f4
+  data.tar.gz: 632e9c4422e12b7e6b5b860b2d56400fc5137cf02cfb325a61dd60c3ecbbf229322d91ad913f304700f9e4c5344cb316a0f264fc3222ca2b56724e41dcd560c2

data/.travis.yml

@@ -40,4 +40,5 @@ env:
   - rvm_max_time_flag=60
 before_install:
   - gem install bundler
+  - rm Gemfile.lock
 script: rake spec

data/README.md

@@ -118,6 +118,7 @@ module MLL
               # TODO try to make #table lazy (Enumerator instead of Array)
     def grid
       lambda do |table, **options|
+        # TODO negative spacings?
         # TODO smth with this #.all?
         # TODO https://reference.wolfram.com/language/ref/Alignment.html
   # TODO not sure if we need any other kind of Listability except of #range[[Array]]
@@ -210,8 +211,6 @@ describe MLL do
         # TODO Alternating pink and yellow at successive horizontal positions
         # TODO Alternating pink and yellow at successive vertical positions
         # TODO Make the grid contents red
-        # TODO "set the horizontal spacing between items" do
-        # TODO "set the horizontal and vertical spacings" do
         # TODO "grids can be nested" do
       describe "Options:" do
         # TODO "align elements around the center of the grid" do

data/lib/mll.rb

@@ -118,6 +118,10 @@ module MLL
     # https://en.wikipedia.org/wiki/Box_Drawing
     def grid
       lambda do |table, **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 \
           alignment = {
             nil => :center,
@@ -135,14 +139,24 @@ module MLL
         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 }
+        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]), frames[3]].join,
-          strings.map{ |row| [frames[0], row.zip(sizes).map{ |str, size| str.method(alignment).call size }.join(frames[1]), frames[0]].join }.join(
-            [?\n, frames[9], sizes.map{ |size| frames[8] * size }.join(frames[4]), frames[12], ?\n].join
+          [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
           ),
-          [frames[5], sizes.map{ |size| frames[7] * size }.join(frames[11]), frames[6]].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
       end
     end

data/mll.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "mll"
-  spec.version       = "2.2.0"
+  spec.version       = "2.2.1"
   spec.authors       = ["Victor Maslov"]
   spec.email         = ["nakilon@gmail.com"]
   spec.summary       = "Mathematica Language Library in Ruby"

data/spec/_spec.rb

@@ -955,7 +955,12 @@ describe MLL do
           skip "#normal is yet to be implemented"
         end
         example "the lists do not all need to be the same length" do
-          expect(grid[[[1],[2,3]]].to_s).to eq "     \n 1   \n     \n 2 3 \n     \n"
+          expect(grid[[[1],[2,3]]].to_s).to eq \
+            "     \n" \
+            " 1   \n" \
+            "     \n" \
+            " 2 3 \n" \
+            "     \n"
         end
         # TODO SpanFromLeft SpanFromAbove SpanFromBoth
         # TODO The following options can be given
@@ -1053,10 +1058,77 @@ describe MLL do
             "┃ccc┃   d┃\n" \
             "┗━━━┻━━━━┛\n"
         end
-        # TODO "set the horizontal spacing between items" do
-        # TODO "set the horizontal and vertical spacings" do
+
         # TODO "grids can be nested" do
 
+        # https://reference.wolfram.com/language/ref/Spacings.html
+        describe "option :spacing" do
+
+          example "set the horizontal spacing between items" do
+            expect(grid[table[?x, [3], [3]], spacings: 2, frame: :all]).to eq \
+              "┏━━━┳━━━┳━━━┓\n" \
+              "┃ x ┃ x ┃ x ┃\n" \
+              "┣━━━╋━━━╋━━━┫\n" \
+              "┃ x ┃ x ┃ x ┃\n" \
+              "┣━━━╋━━━╋━━━┫\n" \
+              "┃ x ┃ x ┃ x ┃\n" \
+              "┗━━━┻━━━┻━━━┛\n"
+          end
+          example "set the horizontal and vertical spacings" do
+            expect(grid[table[?x, [3], [3]], spacings: [2, 0], frame: :all]).to eq \
+              "┏━━━┳━━━┳━━━┓\n" \
+              "┃ x ┃ x ┃ x ┃\n" \
+              "┃ x ┃ x ┃ x ┃\n" \
+              "┃ x ┃ x ┃ x ┃\n" \
+              "┗━━━┻━━━┻━━━┛\n"
+          end
+          example "insert no additional space between columns" do
+            expect(grid[table[?x, [4], [7]], spacings: 0]).to eq \
+              "         \n" \
+              " xxxxxxx \n" \
+              "         \n" \
+              " xxxxxxx \n" \
+              "         \n" \
+              " xxxxxxx \n" \
+              "         \n" \
+              " xxxxxxx \n" \
+              "         \n"
+            expect(grid[table[?x, [4], [7]], spacings: 0, frame: :all]).to eq \
+              "┏━━━━━━━┓\n" \
+              "┃xxxxxxx┃\n" \
+              "┣━━━━━━━┫\n" \
+              "┃xxxxxxx┃\n" \
+              "┣━━━━━━━┫\n" \
+              "┃xxxxxxx┃\n" \
+              "┣━━━━━━━┫\n" \
+              "┃xxxxxxx┃\n" \
+              "┗━━━━━━━┛\n"
+          end
+          example "insert additional space at the second horizontal divider" do
+            skip "automatic"
+            expect(grid[table[?x, [4], [7]], spacings: {2 => 3}, frame: :all]).to eq \
+              "    -    \n" \
+              " xxxxxxx \n" \
+              " xxxxxxx \n" \
+              " xxxxxxx \n" \
+              " xxxxxxx \n" \
+              "         \n"
+          end
+          example "set the size of the grid's margins" do
+            skip "cycling"
+            expect(grid[table[?x, [3], [7]], spacings: [[5, [], 5], [5, [], 5]], frame: :all]).to eq \
+              "    -    \n" \
+              "    -    \n" \
+              " xxxxxxx \n" \
+              " xxxxxxx \n" \
+              " xxxxxxx \n" \
+              " xxxxxxx \n" \
+              "         \n" \
+              "         \n"
+          end
+
+        end
+        
       end
 
       describe "Options:" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mll
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Victor Maslov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2015-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler