table_print 1.4.0 → 1.4.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTFmNjhlMDhlOTlmNTI4NmRkOTAyODg3YTI5MDg0YWNkMDlmYzI3NA==
+    MWE4N2E1NDljNGIwMDVkMjBkZWM2ZmRmNDlhZjBiYWQzOTQ4ZTZiOQ==
   data.tar.gz: !binary |-
-    OGZhMjE2NDgwOGQ1MzU2NTcwMGVhYTBhNjg1Zjg3YzkwM2ViNzcxZg==
+    YzI3NTg0NGNmNjg2Y2Q4NGE4MWIzNzZjNmVkY2Y1YWI1YjBhOTJkZg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDliMWVkYjZhMmFkMWYzYTliOWEzMDBkZGVhODEzMjJhYWIwMzY5Y2E2YmIx
-    OTc2MDE0ZDNjOWIzODM5MTlhZmJhMzY5M2U5M2FmNmI0OTVjY2FmNTVjNWJh
-    ODY2ZjRhMDg4MjYyZTllN2ZiODZmNDY2YTUyY2QxMTZlZmJiN2Y=
+    Y2I2NDQyM2NjZDVkZDkzNzNkNmE1NTM5ODM5NDE1NDYzYzU0OGEwMjM0NmUy
+    N2EzM2M5YWFmYTE2ZDM2Njc1ZGU1OWQxYjJhNGI1NWE2MmNlYWVkYWY1NmMz
+    OTA2NjY2Mzk0MTZkNmM3M2M1ZDQwZGFhYzY1ZTJlZDEzNTUyNjA=
   data.tar.gz: !binary |-
-    NzMyMTk5Yzc0NWM1Y2U1MmM3YzAyMjRiYjE2ZGRiNWY3ZTQ5NDk1OGRiNGFh
-    YmYwNTRkOTEwMDY5Y2ZiNTcwOWU3YmFkYjhiZjE4NzFmZmVlNmRlZGJhODE0
-    MGFkYjMwMTQzZjE1MzEwOTg1YzQwMGQ1ZDRhOTEwOThkYWU1M2Q=
+    ZmYzZWNmNjEwMGZkYTI2NGQ1MzY0ZDFlODBlNGQwMjk5YTEyYzgyMmQ4YzM5
+    ZWNlYmE1Y2EyYTRhNzg2ZGU2MzY4ZDM0NWU4ZGJlZWQ3Yjg0ODM3MzU4ODJm
+    NGVhYmYxY2M5YmE5NzAxMzNkODc1MjlkN2ZlZjE4Zjc4OWE1Yzg=

data/features/multibyte.feature

@@ -7,6 +7,7 @@ Feature: Fix the column width for multibyte character
       |title             | author   |
       |これは日本語です。| 山田太郎 |
       |English           | Bob      |
+    When I configure multibyte with true
     When I table_print data
     Then the output should contain
     """

data/features/printing_struct.feature

@@ -1,4 +1,4 @@
-Feature: Printing hash
+Feature: Printing structs
 
   Scenario: A simple array of structs
     Given an array of structs named data with

data/features/support/step_definitions/steps.rb

@@ -58,6 +58,10 @@ When /^I instantiate a (.*) with (\{.*\}) and (add it|assign it) to (.*)$/ do |k
   end
 end
 
+When /^I configure multibyte with (.*)$/ do |value|
+  TablePrint::Config.set(:multibyte, [value == "true"])
+end
+
 When /^configure (.*) with (.*)$/ do |klass, config|
   klass = Sandbox.const_get_from_string(klass)
   TablePrint::Config.set(klass, eval(config))
@@ -70,16 +74,12 @@ end
 When /table_print ([\w\.:]*)$/ do |klass|
   obj = @objs.send(klass.split(".").first.downcase)
   obj = obj.send(klass.split(".").last) if klass.include? "."  # hack - we're assuming only two levels. use inject to find the target.
-  
+
   tp(obj)
 end
 
 Then /^the output should contain$/ do |string|
-  output = []
-  while line = @r.gets
-    output << line
-  end
-  @r.close
+  output = @r.lines.to_a
 
   output.zip(string.split("\n")).each do |actual, expected|
     actual.gsub(/\s/m, "").split(//).sort.join.should == expected.gsub(" ", "").split(//).sort.join

data/lib/table_print/column.rb

@@ -34,10 +34,17 @@ module TablePrint
     end
 
     def data_width
-      [
-        name.each_char.collect{|c| c.bytesize == 1 ? 1 : 2}.inject(0, &:+),
-        Array(data).compact.collect(&:to_s).collect{|m| m.each_char.collect{|n| n.bytesize == 1 ? 1 : 2}.inject(0, &:+)}.max
-      ].compact.max || 0
+      if multibyte_count
+        [
+          name.each_char.collect{|c| c.bytesize == 1 ? 1 : 2}.inject(0, &:+),
+          Array(data).compact.collect(&:to_s).collect{|m| m.each_char.collect{|n| n.bytesize == 1 ? 1 : 2}.inject(0, &:+)}.max
+        ].compact.max || 0
+      else
+        [
+          name.length,
+          Array(data).compact.collect(&:to_s).collect(&:length).max
+        ].compact.max || 0
+      end
     end
 
     def width
@@ -48,5 +55,9 @@ module TablePrint
     def max_width
       TablePrint::Config.max_width
     end
+
+    def multibyte_count
+      TablePrint::Config.multibyte
+    end
   end
 end

data/lib/table_print/config.rb

@@ -6,6 +6,7 @@ module TablePrint
 
     @@max_width = DEFAULT_MAX_WIDTH
     @@time_format = DEFAULT_TIME_FORMAT
+    @@multibyte = false
 
     @@klasses = {}
 
@@ -38,6 +39,14 @@ module TablePrint
       @@max_width = width
     end
 
+    def self.multibyte
+      @@multibyte
+    end
+
+    def self.multibyte=(width)
+      @@multibyte = width
+    end
+
     def self.time_format
       @@time_format
     end

data/lib/table_print/formatter.rb

@@ -25,7 +25,7 @@ module TablePrint
     end
 
     def format(value)
-      padding = width - value.to_s.each_char.collect{|c| c.bytesize == 1 ? 1 : 2}.inject(0, &:+)
+      padding = width - length(value.to_s)
       truncate(value) + (padding < 0 ? '' : " " * padding)
     end
 
@@ -38,5 +38,13 @@ module TablePrint
 
       "#{value[0..width-4]}..."
     end
+
+    def length(str)
+      if TablePrint::Config.multibyte
+        str.each_char.collect{|c| c.bytesize == 1 ? 1 : 2}.inject(0, &:+)
+      else
+        str.length
+      end
+    end
   end
 end

data/lib/table_print/version.rb

@@ -1,4 +1,4 @@
 module TablePrint
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: table_print
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Chris Doyle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2013-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cat