table_print 1.1.3 → 1.1.4

data/features/configuring_output.feature

@@ -5,13 +5,13 @@ Feature: Configuring output
 
     Given Blog has attributes title, author
 
-    When I instantiate a Blog with {:title => "post!", :author => 'Ryan'}
-    And table_print Blog, {:include => {:author => {:width => 10}}}
+    When I instantiate a Blog with {:title => "post!", :author => 'Ryan Ryan Ryan Ryan Ryan Ryan Ryan Ryan Ryan Ryan Ryan Ryan Ryan'}
+    And table_print Blog, {:include => {:author => {:width => 40}}}
     Then the output should contain
     """
-    TITLE | AUTHOR    
-    ------------------
-    post! | Ryan
+    TITLE | AUTHOR                                  
+    ------------------------------------------------
+    post! | Ryan Ryan Ryan Ryan Ryan Ryan Ryan Ry... 
     """
   Scenario: Specifying configuration on a per-object basis
     Given a class named Blog

data/lib/table_print/column.rb

@@ -1,8 +1,7 @@
 module TablePrint
   class Column
     attr_reader :formatters
-    attr_writer :width
-    attr_accessor :name, :data, :time_format
+    attr_accessor :name, :data, :time_format, :default_width
 
     def initialize(attr_hash={})
       @formatters = []
@@ -35,11 +34,16 @@ module TablePrint
     end
 
     def data_width
-      [name.length].concat(data.compact.collect(&:to_s).collect(&:length)).max
+      [name.length].concat(Array(data).compact.collect(&:to_s).collect(&:length)).max
     end
 
     def width
-      @width ||= data_width
+      [(default_width || max_width), data_width].min
+    end
+
+    private
+    def max_width
+      TablePrint::Config.max_width
     end
   end
 end

data/lib/table_print/config_resolver.rb

@@ -68,11 +68,16 @@ module TablePrint
       else
         option = {:name => option}
       end
+
+      if option.has_key? :width
+        option[:default_width] = option.delete(:width)
+      end
+
       c = Column.new(option)
       @column_hash[c.name] = c
       c
     end
-    
+
     def usable_column_names
       base = @default_columns
       base = @only_columns unless @only_columns.empty?

data/lib/table_print/formatter.rb

@@ -18,18 +18,16 @@ module TablePrint
   end
 
   class FixedWidthFormatter
+    attr_accessor :width
+
     def initialize(width)
-      @width = width
+      self.width = width
     end
 
     def format(value)
       "%-#{width}s" % truncate(value)
     end
 
-    def width
-      [@width, TablePrint::Config.max_width].min
-    end
-
     private
     def truncate(value)
       return "" unless value

data/lib/table_print/version.rb

@@ -1,4 +1,4 @@
 module TablePrint
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end
 

data/spec/column_spec.rb

@@ -58,13 +58,36 @@ describe Column do
   end
 
   describe "#width" do
-    it "returns the specified width" do
-      c.width = 14
-      c.width.should == 14
+    context "when default width is specified" do
+      it "uses the default width" do
+        c.default_width = 10
+        c.stub(:data_width => 15)
+        c.stub(:max_width => 20)
+        c.width.should == 10
+      end
+
+      it "isn't limited by the config width" do
+        c.default_width = 40
+        c.stub(:data_width => 50)
+        c.stub(:max_width => 20)
+        c.width.should == 40
+      end
     end
 
-    it "uses the data_width if no width has been set" do
-      c.width.should == 33
+    context "When default width is not specified" do
+      it "uses the data width" do
+        c.default_width = nil
+        c.stub(:data_width => 10)
+        c.stub(:max_width => 20)
+        c.width.should == 10
+      end
+
+      it "is limited by the config width" do
+        c.default_width = nil
+        c.stub(:data_width => 30)
+        c.stub(:max_width => 20)
+        c.width.should == 20
+      end
     end
   end
 end

data/spec/config_resolver_spec.rb

@@ -100,7 +100,7 @@ describe TablePrint::ConfigResolver do
         c.columns.first.name.should == 'title'
 
         c.columns.last.name.should == 'foo'
-        c.columns.last.width.should == 10
+        c.columns.last.default_width.should == 10
       end
     end
   end
@@ -189,11 +189,11 @@ describe TablePrint::ConfigResolver do
       end
     end
     context "width" do
-      it "sets the width" do
+      it "sets the default width" do
         c = TablePrint::ConfigResolver.new(Object, [:title], :title => {:width => 100})
         c.columns.length.should == 1
         c.columns.first.name.should == 'title'
-        c.columns.first.width.should == 100
+        c.columns.first.default_width.should == 100
       end
     end
     context "formatters" do
@@ -226,9 +226,9 @@ describe TablePrint::ConfigResolver do
     context "with a hash" do
       it "returns a column named foo and the specified options" do
         c = TablePrint::ConfigResolver.new(Object, [])
-        column = c.option_to_column({:foo => {:width => 10}})
+        column = c.option_to_column({:foo => {:default_width => 10}})
         column.name.should == 'foo'
-        column.width.should == 10
+        column.default_width.should == 10
       end
     end
   end

data/spec/formatter_spec.rb

@@ -61,17 +61,4 @@ describe TablePrint::FixedWidthFormatter do
       @f.format(123).should == "123       "
     end
   end
-
-  describe "#width" do
-    it "returns the width" do
-      @f.width.should == 10
-    end
-
-    it "respects the config'd max_width" do
-      max = TablePrint::Config.max_width
-      TablePrint::Config.max_width = 5
-      @f.width.should == 5
-      TablePrint::Config.max_width = max
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: table_print
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2013-03-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cat