New formatter option: remove_empty_lines

lib/biggs/formatter.rb

@@ -6,6 +6,7 @@ class Formatter
 
     def initialize(options={})
       @blank_country_on = [options[:blank_country_on]].compact.flatten.map{|s| s.to_s.downcase}
+      @remove_empty_lines = !!options[:remove_empty_lines]
     end
 
     def format(iso_code, values={})
@@ -19,6 +20,7 @@ def format(iso_code, values={})
         format_string.gsub!(/\{\{#{key}\}\}/, (values[key] || "").to_s)
       end
       format_string.gsub!(/\{\{country\}\}/, country_name)
+      format_string.gsub!(/\n(\s+)?\n/, "\n") if @remove_empty_lines
       format_string.strip
     end
 

spec/unit/biggs_spec.rb

@@ -4,77 +4,90 @@
 FAKE_ATTR_WO_STATE = {:city => "CITY", :zip => 12345, :street => "STREET", :recipient => "MR. X"}
 
 describe Biggs::Formatter, "with defaults" do
-  
+
   before { @biggs = Biggs::Formatter.new }
-  
+
   it "should format to us format" do
     @biggs.format('us', FAKE_ATTR_WITH_STATE).should eql("MR. X\nSTREET\nCITY STATE 12345\nUnited States of America")
   end
-  
+
   it "should format to de format" do
     @biggs.format('de', FAKE_ATTR_WITH_STATE).should eql("MR. X\nSTREET\n12345 CITY\nGermany")
   end
-  
+
   it "should format to british format" do
     @biggs.format('gb', FAKE_ATTR_WITH_STATE).should eql("MR. X\nSTREET\nCITY\nSTATE\n12345\nUnited Kingdom")
   end
-  
+
   it "should format to fr format" do
     @biggs.format('fr', FAKE_ATTR_WO_STATE).should eql("MR. X\nSTREET\n12345 CITY\nFrance")
   end
-  
+
   it "should format to fr format if country_code unknown and there is no STATE given" do
     @biggs.format('unknown', FAKE_ATTR_WO_STATE).should eql("MR. X\nSTREET\n12345 CITY\nunknown")
   end
-  
+
   it "should format to us format if country_code unknown and there is no STATE given" do
     @biggs.format('unknown', FAKE_ATTR_WITH_STATE).should eql("MR. X\nSTREET\nCITY STATE 12345\nunknown")
   end
-  
+
   it "should format to no(rwegian) format" do
     @biggs.format('no', FAKE_ATTR_WITH_STATE).should eql("MR. X\nSTREET\n12345 CITY\nNorway")
   end
 
   it "should format to NC format" do
     @biggs.format('nc', FAKE_ATTR_WITH_STATE).should eql("MR. X\nSTREET\n12345 CITY\nNew Caledonia")
   end
-  
+
   it "should use country name if Country is known but format not" do
     @biggs.format('af', FAKE_ATTR_WO_STATE).should eql("MR. X\nSTREET\n12345 CITY\nAfghanistan")
   end
-  
+
   it "should use ISO Code if Country is unknown" do
     @biggs.format('xx', FAKE_ATTR_WO_STATE).should eql("MR. X\nSTREET\n12345 CITY\nxx")
   end
-  
+
 end
 
 describe Biggs, "with options" do
-  
+
   describe "blank_country_on de" do
     before { @biggs = Biggs::Formatter.new(:blank_country_on => 'de') }
-    
+
     it "should have blank country in 'de' address" do
       @biggs.format('de', FAKE_ATTR_WO_STATE).should eql("MR. X\nSTREET\n12345 CITY")
     end
-    
+
     it "should have country in 'fr' address" do
       @biggs.format('fr', FAKE_ATTR_WO_STATE).should eql("MR. X\nSTREET\n12345 CITY\nFrance")
     end
-    
+
   end
-  
+
   describe "blank_country_on multiple (US,de)" do
     before { @biggs = Biggs::Formatter.new(:blank_country_on => ['US', "de"]) }
-    
+
     it "should have blank country in 'us' address" do
       @biggs.format('us', FAKE_ATTR_WITH_STATE).should eql("MR. X\nSTREET\nCITY STATE 12345")
     end
-    
+
     it "should have country in 'fr' address" do
       @biggs.format('fr', FAKE_ATTR_WITH_STATE).should eql("MR. X\nSTREET\n12345 CITY\nFrance")
     end
-
+
+  end
+
+  describe "remove_empty_lines" do
+    before { @biggs = Biggs::Formatter.new(:remove_empty_lines => true) }
+
+
+    it "should remove empty lines" do
+      @biggs.format('gb', FAKE_ATTR_WO_STATE).should eql("MR. X\nSTREET\nCITY\n12345\nUnited Kingdom")
+    end
+
+    it "should format normally without empty lines" do
+      @biggs.format('gb', FAKE_ATTR_WITH_STATE).should eql("MR. X\nSTREET\nCITY\nSTATE\n12345\nUnited Kingdom")
+    end
+
   end
-
-end
+end