@@ -24,7 +24,7 @@ PROJ.name = 'slither' PROJ.authors = 'Ryan Wood' PROJ.email = 'ryan.wood@gmail.com' PROJ.url = 'http://github.com/ryanwood/slither' -PROJ.version = '0.99.2' +PROJ.version = '0.99.3' PROJ.exclude = %w(\.git .gitignore ^tasks \.eprj ^pkg) PROJ.readme_file = 'README.rdoc' Rakefile @@ -1,6 +1,8 @@ require 'date' class Slither + class ParserError < RuntimeError; end + class Column attr_reader :name, :length, :alignment, :type, :padding, :precision, :options @@ -12,6 +14,7 @@ class Slither @alignment = options[:align] || :right @type = options[:type] || :string @padding = options[:padding] || :space + @truncate = options[:truncate] || false # Only used with floats, this determines the decimal places @precision = options[:precision] end @@ -34,6 +37,8 @@ class Slither end else value.strip end + rescue + raise ParserError, "The value '#{value}' could not be converted to type #{@type}: #{$!}" end def format(value) @@ -90,11 +95,7 @@ class Slither else value.to_s end - raise( - Slither::FormattedStringExceedsLengthError, - "The formatted value '#{result}' in column '#{@name}' exceeds the allowed length of #{@length} chararacters." - ) if result.length > @length - result + validate_size result end def assert_valid_options(options) @@ -104,6 +105,20 @@ class Slither unless options[:padding].nil? || [:space, :zero].include?(options[:padding]) raise ArgumentError, "Option :padding only accepts :space (default) or :zero" end - end + end + + def validate_size(result) + # Handle when length is out of range + if result.length > @length + if @truncate + start = @alignment == :left ? 0 : -@length + result = result[start, @length] + else + raise Slither::FormattedStringExceedsLengthError, + "The formatted value '#{result}' in column '#{@name}' exceeds the allowed length of #{@length} chararacters." + end + end + result + end end end \ No newline at end of file lib/slither/column.rb @@ -153,12 +153,24 @@ describe Slither::Column do @column.format('Bill').should == ' Bill' end - it "should raise an error if the value is longer than the length" do - @value = "XX" * @length - lambda { @column.format(@value) }.should raise_error( - Slither::FormattedStringExceedsLengthError, - "The formatted value '#{@value}' in column '#{@name}' exceeds the allowed length of #{@length} chararacters." - ) + describe "whose size is too long" do + it "should raise an error if truncate is false" do + @value = "XX" * @length + lambda { @column.format(@value) }.should raise_error( + Slither::FormattedStringExceedsLengthError, + "The formatted value '#{@value}' in column '#{@name}' exceeds the allowed length of #{@length} chararacters." + ) + end + + it "should truncate from the left if truncate is true and aligned left" do + @column = Slither::Column.new(@name, @length, :truncate => true, :align => :left) + @column.format("This is too long").should == "This " + end + + it "should truncate from the right if truncate is true and aligned right" do + @column = Slither::Column.new(@name, @length, :truncate => true, :align => :right) + @column.format("This is too long").should == " long" + end end it "should support the integer type" do @@ -208,4 +220,5 @@ describe Slither::Column do @column.format(dt).should == '08222009' end end + end \ No newline at end of file spec/column_spec.rb a0ae028c745ad39e3bd3ffdaeca64c3d97967cee Ryan Wood ryan.wood@gmail.com http://github.com/ryanwood/slither/commit/4dfbe5efc0c146682b1fd7568c6665bc23390f58 4dfbe5efc0c146682b1fd7568c6665bc23390f58 2009-06-22T11:25:31-07:00 2009-06-22T11:25:31-07:00 Added truncate option 7f2dccc04d1789cc1763e55f8f76d8f62812f431 Ryan Wood ryan.wood@gmail.com