org_tp 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 703ec54e13e94b547bfb120fbd9a5876fee1269e
-  data.tar.gz: 2b7498e7f7a6d9a2dbbd9c58d86bd5c1fa75250d
+  metadata.gz: 5739280d770002d46e6eaf8ce1926db5b2cce7dc
+  data.tar.gz: 56097cb749aff8e5661932544774829abc1c328b
 SHA512:
-  metadata.gz: ac82e9d5fd8f682012dde62fad80ba29a0d4e5ffa95756176fe6a8bc08cbff1c472c11333d6ff22e08abb7df4e4abf760ac1249e618ff63404d8a9aac7b35898
-  data.tar.gz: 3fd8f1268341e40bc8a1aaa9bf10bf2c4416fdf55ad6ea1408d29a87d4a0b6f2362052c77b5188a3858499f75a4c8500071a8aa9c2275e3974f4c7d42a073539
+  metadata.gz: a56e75a5c191b9d6a8221999dc9a90c2d891cd8a381c2a8e9f8ef2d2762e7031ab4b93c22e8e1b72d1a3f6f3d736af2c9a6ebc9068465d6e04c96ed916258c6d
+  data.tar.gz: 9d27789a067b83ca23da8676fd9b283da5757981adb8e35fe4f8c18aa690f2527b7e72fe2edae26247b44f3a31d330cb87da065cad3771ea95792267225a9ed0

data/lib/org_tp/generator.rb

@@ -128,6 +128,7 @@ module OrgTp
 
     def pre_processes
       [
+        # Hash
         {
           _case: -> e { e.kind_of?(Hash) },
           header: false,
@@ -137,24 +138,40 @@ module OrgTp
             end
           },
         },
+
+        # Array of Hash
         {
-          _case: -> e { e.kind_of?(Array) && e.any? { |e| !e.kind_of?(Hash) } },
+          _case: -> e { e.kind_of?(Array) && e.all? { |e| e.kind_of?(Hash) } }, # !> shadowing outer local variable - e
+          header: true,
+          process: -> e { e },
+        },
+
+        # Array excluding Hash
+        {
+          _case: -> e { e.kind_of?(Array) && e.none? { |e| e.kind_of?(Hash) } }, # !> shadowing outer local variable - e
           header: false,
           process: -> e {
-            e.collect do |e|
+            e.collect do |e| # !> shadowing outer local variable - e
+              {'(array_element)' => e}
+            end
+          },
+        },
+
+        # Array containing Hash and others
+        {
+          _case: -> e { e.kind_of?(Array) && e.any? { |e| !e.kind_of?(Hash) } }, # !> shadowing outer local variable - e
+          header: true,
+          process: -> e {
+            e.collect do |e| # !> shadowing outer local variable - e
               if e.kind_of? Hash
                 e
               else
-                {'(array_value)' => e}
+                {'(array_element)' => e}
               end
             end
           },
         },
-        {
-          _case: -> e { e.kind_of?(Array) && e.all? { |e| e.kind_of?(Hash) } },
-          header: true,
-          process: -> e { e },
-        },
+
       ]
     end
   end
@@ -170,19 +187,30 @@ if $0 == __FILE__
   print OrgTp.generate([])
   print OrgTp.generate(rows)
   print OrgTp.generate({a: 1, b: 2}, header: false)
+  print OrgTp.generate([["a", "b"], ["c", "d"]])
+  print OrgTp.generate([["a", "b"], {"c" => "d"}])
 end
-# >> +---+----+
+# >> |---+----|
 # >> | a | [] |
-# >> +---+----+
-# >>
-# >> +----+-------+-------------+
+# >> |---+----|
+# >> |----+-------+-------------|
 # >> | id | name  | description |
-# >> +----+-------+-------------+
+# >> |----+-------+-------------|
 # >> |  1 | alice |  0123456789 |
 # >> |  2 | bob   | あいうえお  |
 # >> |  3 | carol |             |
-# >> +----+-------+-------------+
-# >> +---+---+
+# >> |----+-------+-------------|
+# >> |---+---|
 # >> | a | 1 |
 # >> | b | 2 |
-# >> +---+---+
+# >> |---+---|
+# >> |------------|
+# >> | ["a", "b"] |
+# >> | ["c", "d"] |
+# >> |------------|
+# >> |-----------------+---|
+# >> | (array_element) | c |
+# >> |-----------------+---|
+# >> | ["a", "b"]      |   |
+# >> |                 | d |
+# >> |-----------------+---|

data/lib/org_tp/version.rb

@@ -1,3 +1,3 @@
 module OrgTp
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/spec/org_tp_spec.rb

@@ -103,6 +103,17 @@ EOT
 |-------|
 | ["a"] |
 |-------|
+EOT
+    end
+
+    it 'Array containing Hash and others' do
+      OrgTp.generate([["a", "b"], {"c" => "d"}]).should == <<~EOT
+|-----------------+---|
+| (array_element) | c |
+|-----------------+---|
+| ["a", "b"]      |   |
+|                 | d |
+|-----------------+---|
 EOT
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: org_tp
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - akicho8
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-20 00:00:00.000000000 Z
+date: 2017-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport