org_tp 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24a89757969e7d697fd02316826d970741ca7e86
-  data.tar.gz: b3defd4248ab8857dee375c8bbe9292ba0710962
+  metadata.gz: 1e234454b6b0fd9d56f42dd6a0d768790334ab34
+  data.tar.gz: 49d4c34b17d000c9011890f46bf45f7f3af0d651
 SHA512:
-  metadata.gz: 8bd700c2a93cf23059da0a34cead03da4d94635e397ae395e81e167f32e48be163c0f750a2fd274843ea47b952d2513df8d2dab9bff6242dec42c6ad59d707f4
-  data.tar.gz: 1d3ca465fd0aa29815399d37295ecda1ac23063b030d144c80e6aa87f07a636bc93858888cd24519d36c46d57ffe9b75f16ffb50378a3a2ffde76c9220ec2998
+  metadata.gz: 819710ed0d778e6523ee7941bb020967002141a5a84fe6f7430cd17e1cc7bc98e1f8a2746e897e74d68683df592471cf404bde37cfc672f3ec29fcd69e3fd295
+  data.tar.gz: 42d9afde6a537e26f126a5dd0754a1953f95c77e3bb61d28927b392510bf0daa6ffee095fcace6ed95134971a859685df85896441081b283aade58f880452161

data/examples/0100_basic.rb

@@ -1,6 +1,7 @@
 $LOAD_PATH << '../lib'
 require 'org_tp'
 
+pt 1
 tp 1
 tp 'foo'
 tp :foo
@@ -13,6 +14,9 @@ puts [{'a': {'a': 1}}].to_t
 # >> |---|
 # >> | 1 |
 # >> |---|
+# >> |---|
+# >> | 1 |
+# >> |---|
 # >> |-----|
 # >> | foo |
 # >> |-----|
@@ -24,7 +28,7 @@ puts [{'a': {'a': 1}}].to_t
 # >> | bob   |
 # >> |-------|
 # >> |------+-------|
-# >> | id   |     1 |
+# >> |   id | 1     |
 # >> | name | alice |
 # >> |------+-------|
 # >> |----+-------|

data/examples/0110_active_record.rb

@@ -20,7 +20,7 @@ tp User.first
 tp User.limit(1)
 tp ActiveRecord::Base.connection.select_all('SELECT * FROM users')
 tp ActiveRecord::Base.connection.select_one('SELECT * FROM users')
-tp ActiveRecord::Base.connection.select_value('SELECT 1 + 2')
+tp ActiveRecord::Base.connection.select_value('SELECT 1 + 2') # !> `*' interpreted as argument prefix
 # >> |----+-------|
 # >> | id | name  |
 # >> |----+-------|
@@ -29,7 +29,7 @@ tp ActiveRecord::Base.connection.select_value('SELECT 1 + 2')
 # >> |  3 | carol |
 # >> |----+-------|
 # >> |------+-------|
-# >> | id   |     1 |
+# >> |   id | 1     |
 # >> | name | alice |
 # >> |------+-------|
 # >> |----+-------|
@@ -45,7 +45,7 @@ tp ActiveRecord::Base.connection.select_value('SELECT 1 + 2')
 # >> |  3 | carol |
 # >> |----+-------|
 # >> |------+-------|
-# >> | id   |     1 |
+# >> |   id | 1     |
 # >> | name | alice |
 # >> |------+-------|
 # >> |---|

data/lib/org_tp/core_ext.rb

@@ -32,6 +32,9 @@ Kernel.class_eval do
       end
     end
   end
+
+  alias pt tp
+  alias tt tp
 end
 
 Array.class_eval do

data/lib/org_tp/generator.rb

@@ -51,6 +51,7 @@ module OrgTp
           if @options[:header].nil?
             @options[:header] = e[:header]
           end
+          @options[:align] ||= e[:align]
         end
       end
 
@@ -74,11 +75,14 @@ module OrgTp
     private
 
     def table_rows_build
-      columns = @rows.inject([]) { |a, e| a | e.keys }
       if @options[:header]
-        @column_names = columns
+        @column_names = all_columns
       end
-      @table_rows = @rows.collect { |e| e.values_at(*columns) }
+      @table_rows = @rows.collect { |e| e.values_at(*all_columns) }
+    end
+
+    def all_columns
+      @all_columns ||= @rows.inject([]) { |a, e| a | e.keys }
     end
 
     def column_widths
@@ -109,7 +113,7 @@ module OrgTp
 
     def line_str(row)
       s = row.collect.with_index {|e, i|
-        padding + just(e, column_widths[i]) + padding
+        padding + just(e, i) + padding
       }
       s = s.join(@options[:vertical])
       [@options[:vertical], s, @options[:vertical]].join
@@ -119,9 +123,11 @@ module OrgTp
       @options[:padding]
     end
 
-    def just(value, max_width)
-      align = Float(value) && :right rescue :left
-      space = ' ' * (max_width - str_width(value))
+    def just(value, i)
+      align = (@options[:align] || {}).fetch(all_columns[i]) do
+        Float(value) && :right rescue :left
+      end
+      space = ' ' * (column_widths[i] - str_width(value))
       lspace = ''
       rspace = ''
       if align == :right
@@ -150,6 +156,7 @@ module OrgTp
               {'(key)' => k.to_s, '(value)' => v.to_s}
             end
           },
+          align: {'(key)' => :right, '(value)' => :left},
         },
 
         # Array of Hash
@@ -201,6 +208,7 @@ if $0 == __FILE__
   print OrgTp.generate({a: 1, b: 2}, header: false)
   print OrgTp.generate([["a", "b"], ["c", "d"]])
   print OrgTp.generate([["a", "b"], {"c" => "d"}])
+  print OrgTp.generate({id: 1, created_at: "2000-01-01"})
 end
 # >> |---+----|
 # >> | a | [] |

data/lib/org_tp/version.rb

@@ -1,3 +1,3 @@
 module OrgTp
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 end

data/lib/org_tp.rb

@@ -25,6 +25,8 @@ if defined?(Tapp)
     end
 
     register :tp, Tp
+    register :pt, Tp
+    register :tt, Tp
   end
 
   # # When tapp defaults to tp

data/spec/active_record_spec.rb

@@ -30,7 +30,7 @@ describe OrgTp::ActiveRecord do
 EOT
     User.first.to_t.should == <<~EOT
 |------+---|
-| id   | 1 |
+|   id | 1 |
 | name | 0 |
 |------+---|
 EOT

data/spec/core_ext_spec.rb

@@ -15,6 +15,6 @@ describe OrgTp do
 
   it 'result is like p method' do
     v = Object.new
-    quietly { tp v }.should == v
+    quietly { pt v }.should == v
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: org_tp
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - akicho8
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-16 00:00:00.000000000 Z
+date: 2017-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport