fix holiday_names

melborne · Dec 16, 2010 · 23f858b · 23f858b
1 parent cf37a71
commit 23f858b
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 53 deletions.
diff --git a/lib/month.rb b/lib/month.rb
@@ -162,13 +162,13 @@ def week_label(from, style)
 
     def holiday_names(months)
       months.inject([]) { |mem, mon| 
-        holidays = @@holidays[mon.year][@code].select { |d, _| d.mon == mon.month }
+        holidays = @@holidays[mon.year][@code]
-        if holidays.empty?
+        if holidays && !(selected = holidays.select { |d, _| d.mon == mon.month }).empty?
-          mem
+          mem << selected.sort_by { |d, _| d }
+                         .map { |date, name| date.strftime('%_m/%_d').yellow + ": " + name.green }
+                         .join
         else
-          mem << holidays.sort_by { |d, _| d }
+          mem
-                  .map { |date, name| date.strftime('%_m/%_d').yellow + ": " + name.green }
-                  .join
         end
       }
     end

diff --git a/test/tc_month.rb b/test/tc_month.rb
@@ -41,56 +41,56 @@ def test_dates_by_block
     assert_equal(f2010_12_from1, @m.dates_by_block(1).map{ |w| w.map(&:day) })
   end
 
-  #def test_format
+  def test_format
-    #puts
+    puts
-    #puts @m.format
+    puts @m.format
-    #puts
+    puts
-    #puts @m.format(:block, 1)
+    puts @m.format(:block, 1)
-    #puts
+    puts
-    #puts @m.format(:line)
+    puts @m.format(:line)
-  #end
+  end
 
-  #def test_color_format
+  def test_color_format
-    #puts @m.color_format(:block, 0)
+    puts @m.color_format(:block, 0)
-    #puts @m.color_format(:block, 1)
+    puts @m.color_format(:block, 1)
-    #puts @m.color_format(:line, 1)
+    puts @m.color_format(:line, 1)
-    #puts @m.color_format(:block3)
+    puts @m.color_format(:block3)
-  #end
+  end
 
-  #def test_colors
+  def test_colors
-    #m = Caline::Month.new(2011, 2, sunday: :yellow, saturday: :green)
+    m = Caline::Month.new(2011, 2, sunday: :yellow, saturday: :green)
-    #puts
+    puts
-    #puts m.color_format(:block, 0)
+    puts m.color_format(:block, 0)
-    #m.colors = {sunday: :red, saturday: :blue}
+    m.colors = {sunday: :red, saturday: :blue}
-    #puts m.color_format(:line, 1)
+    puts m.color_format(:line, 1)
-  #end
+  end
 
-  #def test_holidays
+  def test_holidays
-    #months = (1..12).map { |m| Caline::Month.new(2011, m) }
+    months = (1..12).map { |m| Caline::Month.new(2011, m) }
-    #months.each do |mon|
+    months.each do |mon|
-      #mon.holidays = :ja_ja
+      mon.holidays = :ja_ja
-      #puts
+      puts
-      #puts mon.color_format
+      puts mon.color_format
-    #end
+    end
-    #months.each do |mon|
+    months.each do |mon|
-      #mon.holidays = :us
+      mon.holidays = :us
-      #puts
+      puts
-      #puts mon.color_format
+      puts mon.color_format
-    #end
+    end
-  #end
+  end
-  #
+
-  #def test_holiday_label_with_different_country
+  def test_holiday_label_with_different_country
-    #m = Caline::Month.new(2010, 4)
+    m = Caline::Month.new(2010, 4)
-    #puts m.color_format(:block, 0)
+    puts m.color_format(:block, 0)
-    #m.holidays = :ja_ja
+    m.holidays = :ja_ja
-    #puts m.color_format(:block, 0)
+    puts m.color_format(:block, 0)
-    #m.holidays = :us
+    m.holidays = :us
-    #puts m.color_format(:block, 0)
+    puts m.color_format(:block, 0)
-    #m.holidays = :au
+    m.holidays = :au
-    #puts m.color_format(:block, 0)
+    puts m.color_format(:block, 0)
-    #puts 'no label'
+    puts 'no label'
-    #puts m.color_format(:block, 0, false)
+    puts m.color_format(:block, 0, false)
-  #end
+  end
 
   def test_holiday_label_with_different_style
     m = Caline::Month.new(2010, 12)