monospace_text_formatter 0.0.2 → 0.0.3

data/Changelog

@@ -1,3 +1,7 @@
+0.0.3 (February 18, 2012)
+  Fixed handling of non display length for horizontal alignment.
+  Minor refactorings.
+
 0.0.2 (February 18, 2012)
   Implemented Line and Box #inspect methods.
   Refactored Box class to make inheritance simpler.

data/lib/monospace_text_formatter/box.rb

@@ -99,8 +99,8 @@ module MonospaceTextFormatter
       Chunk.new(string)
     end
 
-    def new_line(string, attrs={})
-      Line.new(string, attrs)
+    def new_line(string_or_chunk, attrs={})
+      Line.new(string_or_chunk, attrs)
     end
 
     def aligned_all_lines

data/lib/monospace_text_formatter/chunk.rb

@@ -33,6 +33,11 @@ module MonospaceTextFormatter
       @display_length
     end
 
+    def non_display_length
+      slice_whole_remaining_string unless remaining_string.empty?
+      to_s.length - display_length
+    end
+
     def concat(string_or_chunk)
 
       if string_or_chunk.kind_of?(Chunk)
@@ -117,9 +122,9 @@ module MonospaceTextFormatter
     end
 
     def pop_atomic_chunk
-      chunk = atomic_chunks.pop
-      @display_length -= chunk.display_length
-      chunk
+      atomic_chunk = atomic_chunks.pop
+      @display_length -= atomic_chunk.display_length
+      atomic_chunk
     end
 
     def unshift_atomic_chunk(atomic_chunk)
@@ -128,15 +133,15 @@ module MonospaceTextFormatter
     end
 
     def shift_atomic_chunk
-      chunk = atomic_chunks.shift
-      @display_length -= chunk.display_length
-      chunk
+      atomic_chunk = atomic_chunks.shift
+      @display_length -= atomic_chunk.display_length
+      atomic_chunk
     end
 
     def delete_atomic_chunk_at(index)
-      chunk = atomic_chunks.delete_at(index)
-      @display_length -= chunk.display_length
-      chunk
+      atomic_chunk = atomic_chunks.delete_at(index)
+      @display_length -= atomic_chunk.display_length
+      atomic_chunk
     end
 
     def retrieve_first_atomic_chunk

data/lib/monospace_text_formatter/line.rb

@@ -82,11 +82,11 @@ module MonospaceTextFormatter
                                 else
                                   case align
                                   when :left
-                                    visible_chunk.to_s.ljust(@fixed_width, fill)
+                                    visible_chunk.to_s.ljust( @fixed_width + visible_chunk.non_display_length, fill)
                                   when :center
-                                    visible_chunk.to_s.center(@fixed_width, fill)
+                                    visible_chunk.to_s.center(@fixed_width + visible_chunk.non_display_length, fill)
                                   when :right
-                                    visible_chunk.to_s.rjust(@fixed_width, fill)
+                                    visible_chunk.to_s.rjust( @fixed_width + visible_chunk.non_display_length, fill)
                                   end
                                 end
     end

data/lib/monospace_text_formatter/version.rb

@@ -1,3 +1,3 @@
 module MonospaceTextFormatter
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: monospace_text_formatter
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &75602160 !ruby/object:Gem::Requirement
+  requirement: &83233040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *75602160
+  version_requirements: *83233040
 description: Formats monospaced text into a line or visual box of defined 'width'
   and 'height' boundaries (expressed in number of characters).
 email: jacekmikrut.software@gmail.com