rholidays 0.3.0 → 0.3.1

data/History.txt

@@ -1,3 +1,8 @@
+== 0.3.1 / 2011-10-30
+
+* 1 enhancement
+  * new method to_s
+
 == 0.3.0 / 2011-10-28
 
 * 2 enhancements

data/lib/holidays.rb

@@ -234,8 +234,17 @@ class Holidays
     end
   end
 
+  def to_s
+    if days.size > 1
+      "#{days.first} - #{days.last}"
+    else
+      "#{days.first}"
+    end
+  end
+
   private
 
+  # Returns an array of Date objects with all days in holidays.
   def build_result
     result = (@first..@last).each.collect {|d| d} 
     @extra_days.each do |d|
@@ -244,6 +253,7 @@ class Holidays
     result.sort
   end
 
+  # internal helper method
   def t(year, country, region, holiday_type)
     return [year,country,region,holiday_type] == [@year,@country,@region,@holiday_type]
   end

data/test/test_rholidays.rb

@@ -164,19 +164,27 @@ class TestRholidays < Test::Unit::TestCase
   end
 
   def test_pfingsten_niedersachsen_2012_nur_ein_tag_und_extra_tag
-	  assert_equal([Date.new(2012,5,18),Date.new(2012,5,29)],
-		       Holidays.new(2012,:de,:niedersachsen,:pfingsten).result)
+    assert_equal([Date.new(2012,5,18),Date.new(2012,5,29)],
+      Holidays.new(2012,:de,:niedersachsen,:pfingsten).result)
   end
 
   def test_pfingsten_berlin_2012_nur_ein_tag
-	  assert_equal([Date.new(2012,5,18)],
-		       Holidays.new(2012,:de,:berlin,:pfingsten).result)
+    assert_equal([Date.new(2012,5,18)],
+      Holidays.new(2012,:de,:berlin,:pfingsten).result)
   end
 
   def test_from_hash_hessen_herbst
-	  assert_equal Date.new(2011,10,10),
-		  Holidays.new(2011,:de,:hessen,:herbst).days.first
-	  assert_equal Date.new(2011,10,22),
-		  Holidays.new(2011,:de,:hessen,:herbst).days.last
+    assert_equal Date.new(2011,10,10),
+      Holidays.new(2011,:de,:hessen,:herbst).days.first
+    assert_equal Date.new(2011,10,22),
+      Holidays.new(2011,:de,:hessen,:herbst).days.last
+  end
+
+  def test_to_s
+    assert_equal '2012-04-02 - 2012-04-30', Holidays.new(2012,:de,:berlin,:ostern).to_s
+  end
+
+  def test_to_s_ein_tag
+    assert_equal '2012-05-18', Holidays.new(2012,:de,:berlin,:pfingsten).to_s
   end
 end

data/version.txt

@@ -1 +1 @@
-0.3.0
+0.3.1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rholidays
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-28 00:00:00.000000000Z
+date: 2011-10-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roo
-  requirement: &21729600 !ruby/object:Gem::Requirement
+  requirement: &21437052 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *21729600
+  version_requirements: *21437052
 - !ruby/object:Gem::Dependency
   name: bones
-  requirement: &21729216 !ruby/object:Gem::Requirement
+  requirement: &21436752 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 3.7.1
   type: :development
   prerelease: false
-  version_requirements: *21729216
+  version_requirements: *21436752
 description: Rholidays ermittelt Ferientermine (zum Beispiel Sommerferien in Bayern
   im Jahr 2011)
 email: thopre@gmail.com