rholidays 0.2.0 → 0.3.0

data/History.txt

@@ -1,3 +1,9 @@
+== 0.3.0 / 2011-10-28
+
+* 2 enhancements
+  * removed method Holidays.source
+  * more elegant code
+
 == 0.2.0 / 2011-10-25
 
 * 1 enhancement

data/lib/{hash.rb → hash_ferien.rb}

@@ -1,4 +1,9 @@
-  HASH = {
+  HASH_FERIEN = {
+[2011,:de,:bremen,:pfingsten] => [Date.new(2011,3,6),Date.new(2011,3,6),false,[]],
+[2011,:de,:brandenburg,:pfingsten] => [Date.new(2011,3,6),Date.new(2011,3,6),false,[]],
+[2011,:de,:berlin,:pfingsten] => [Date.new(2011,3,6),Date.new(2011,3,6),false,[]],
+[2011,:de,:bayern,:pfingsten] => [Date.new(2011,6,14),Date.new(2011,6,25),false,[]],
+[2011,:de,:baden_wuerttemberg,:pfingsten] => [Date.new(2011,6,14),Date.new(2011,6,25),false,[]],
 [2011,:de,:baden_wuerttemberg,:herbst] => [Date.new(2011,11,1),Date.new(2011,11,4),false,[]],
 [2011,:de,:bayern,:herbst] => [Date.new(2011,10,31),Date.new(2011,11,5),false,[]],
 [2011,:de,:berlin,:herbst] => [Date.new(2011,10,4),Date.new(2011,10,14),false,[]],

data/lib/holidays.rb

@@ -1,7 +1,4 @@
-require 'rubygems'
 require 'date'
-require 'yaml'
-
 
 class Holidays
   COUNTRY_CODES = [:de, :at]
@@ -17,7 +14,9 @@ class Holidays
      :salzburg,:steiermark, :tirol, :vorarlberg, :wien]
   HOLIDAY_CODES_AT =
     [:weihnachten, :semester, :ostern, :pfingsten, :sommer]
-  TYPES={
+  HOLIDAY_CODES_CH =
+	  [:sport, :fruehling, :sommer, :herbst, :weihnachten]
+  REGION_HOLIDAY_TYPES={
     [:de,:baden_wuerttemberg] => [:ostern,:pfingsten,:sommer,:herbst,:weihnachten],
     [:de,:bayern] => [:winter,:ostern,:pfingsten,:sommer,:herbst,:weihnachten],
     [:de,:berlin] => [:winter,:ostern,:pfingsten,:sommer,:herbst,:weihnachten],
@@ -45,7 +44,7 @@ class Holidays
     [:at,:vorarlberg] => [:semester,:ostern,:pfingsten,:sommer,:weihnachten],
     [:at,:wien] => [:semester,:ostern,:pfingsten,:sommer,:weihnachten],
   }  
-  require 'hash'
+  require 'hash_ferien'
 
   # Creates a new Holiday object
   def initialize(year,country,region,holiday_type)
@@ -55,62 +54,13 @@ class Holidays
     @holiday_type = holiday_type
     @fortlaufend = true
     @extra_days = []
-    #ENV['HOLIDAYS_SOURCE'] = File.join('test','ferien.ods') # TODO:
-    if Holidays.source == :from_hash
-      found = false
-      if HASH[[year,country,region,holiday_type]]
-        @first,@last,@fortlaufend,@extra_days = HASH[[year,country,region,holiday_type]]
-        found = true
-      end
-    end # :from_hash
-    #if Holidays.source == :from_spreadsheet
-    #  oo = Openoffice.new(ENV['HOLIDAYS_SOURCE'])
-    #  oo.default_sheet = oo.sheets.first
-    #  found = false
-    #  oo.cell('A',1).to_i.upto(oo.last_row) do |row|
-    #    jahr = oo.cell(row,1)
-    #    land = oo.cell(row,2).to_sym
-    #    lregion = oo.cell(row,3).to_sym
-    #    ferientyp = oo.cell(row,4).to_sym
-    #    first = oo.cell(row,5)
-    #    last = oo.cell(row,6)
-    #    if jahr == year and
-    #        land == country and
-    #        lregion == region and
-    #        ferientyp == holiday_type
-    #      found = true
-    #      @first = first
-    #      @last = last
-#	  if oo.celltype(row,7) == :date
-#	    @extra_days << oo.cell(row,7)
-#	  end
-#          found = true
-#        end
-#      end
-#    end # Lesen aus Spreadsheet
+    found = false
+    if HASH_FERIEN[[year,country,region,holiday_type]]
+      @first,@last,@fortlaufend,@extra_days = HASH_FERIEN[[year,country,region,holiday_type]]
+      found = true
+    end
     unless found
       if false
-      elsif t 2011,:de,:bremen,:pfingsten
-        @first = Date.new(2011,6,3)
-        @last  = Date.new(2011,6,3)
-        @fortlaufend = false
-        found = true
-      elsif t 2011,:de,:brandenburg,:pfingsten
-        @first = Date.new(2011,6,3)
-        @last  = Date.new(2011,6,3)
-        found = true
-      elsif t 2011,:de,:berlin,:pfingsten
-        @first = Date.new(2011,6,3)
-        @last  = Date.new(2011,6,3)
-        found = true
-      elsif t 2011,:de,:bayern,:pfingsten
-        @first = Date.new(2011,6,14)
-        @last  = Date.new(2011,6,25)
-        found = true
-      elsif t 2011,:de,:baden_wuerttemberg,:pfingsten
-        @first = Date.new(2011,6,14)
-        @last  = Date.new(2011,6,25)
-        found = true
       elsif t 2011,:de,:baden_wuerttemberg,:ostern
         #to do
         #	'Gruendonnerstag ist auch frei'
@@ -266,13 +216,13 @@ class Holidays
     case country
     when :de
       if region
-        TYPES[[country,region]]
+        REGION_HOLIDAY_TYPES[[country,region]]
       else
         HOLIDAY_CODES_DE
       end
     when :at
       if region
-        TYPES[[country,region]]
+        REGION_HOLIDAY_TYPES[[country,region]]
       else
         HOLIDAY_CODES_AT
       end
@@ -284,30 +234,10 @@ class Holidays
     end
   end
 
-  # Obsolete - always returns :from_hash
-  def self.source #:nodoc
-    return :from_hash # TODO:
-    # unless ENV['HOLIDAYS_SOURCE']
-    #    :internal
-    # else
-    #   if File.exist? ENV['HOLIDAYS_SOURCE']
-    #     :from_spreadsheet
-    #   else
-    #     :file_not_found
-    #   end
-    # end
-  end
-
   private
 
   def build_result
-    result = []
-    result << @first
-    lfd = @first + 1
-    while lfd <= @last do
-      result << lfd
-      lfd += 1
-    end
+    result = (@first..@last).each.collect {|d| d} 
     @extra_days.each do |d|
       result << d
     end

data/test/test_rholidays.rb

@@ -2,11 +2,11 @@ require 'test/unit'
 require './lib/holidays'
 
 module Kernel
-	def after(date)
-		if Date.today >= date
-			yield
-		end
-	end
+  def after(date)
+    if Date.today >= date
+      yield
+    end
+  end
 end
 
 # Ferien werden bestimmt durch:
@@ -14,206 +14,165 @@ end
 # 2. Land
 # 3. Region (Bundesland in Deutschland oder Kantone in der Schweiz)
 # 4. Art der Ferien (z. B. Ostern)
+
 class TestRholidays < Test::Unit::TestCase
-	TESTDIR = 'test'
-	def setup
-	  ENV['HOLIDAYS_SOURCE'] = nil
-	end
-
-	def test_class
-		h = Holidays.new(2011,:de,:bayern,:pfingsten)
-		assert_kind_of Holidays, h
-	end
-
-    def test_ostern_de_bayern_2012
-      h = Holidays.new(2012,:de,:bayern,:ostern)
-      assert_equal(Date.new(2012,4,2), h.result.first)
-      assert_equal(Date.new(2012,4,14), h.result.last)
-    end
+  TESTDIR = 'test'
+  def test_class
+    h = Holidays.new(2011,:de,:bayern,:pfingsten)
+    assert_kind_of Holidays, h
+  end
+
+  def test_ostern_de_bayern_2012
+    h = Holidays.new(2012,:de,:bayern,:ostern)
+    assert_equal(Date.new(2012,4,2), h.result.first)
+    assert_equal(Date.new(2012,4,14), h.result.last)
+  end
 
-	def test_sommerferien_baden_wuerttemberg_2011
-		h = Holidays.new(2011,:de,:baden_wuerttemberg,:sommer)
-		assert_equal Date.new(2011,7,28), h.result.first
-		assert_equal Date.new(2011,9,10), h.result.last
-	end
-	def test_all_countries
-		countries = Holidays.countries
-		assert_equal [:de,:at], countries
-	end
-
-	def test_all_regions_for_germany
-		assert_equal [:baden_wuerttemberg, :bayern, :berlin, :brandenburg, :bremen,
+  def test_sommerferien_baden_wuerttemberg_2011
+    h = Holidays.new(2011,:de,:baden_wuerttemberg,:sommer)
+    assert_equal Date.new(2011,7,28), h.result.first
+    assert_equal Date.new(2011,9,10), h.result.last
+  end
+
+  def test_all_countries
+    countries = Holidays.countries
+    assert_equal [:de,:at], countries
+  end
+
+  def test_all_regions_for_germany
+    assert_equal [:baden_wuerttemberg, :bayern, :berlin, :brandenburg, :bremen,
       :hamburg, :hessen, :mecklenburg_vorpommern, :niedersachsen, 
       :nordrhein_westfalen, :rheinland_pfalz, :saarland, :sachsen, 
       :sachsen_anhalt, :schleswig_holstein, :thueringen
     ],
-      Holidays.regions(:de)
-	end
+    Holidays.regions(:de)
+  end
 
-	def test_all_holiday_types
-		assert_equal [:winter,:ostern,:pfingsten,:sommer,:herbst,:weihnachten],
-			Holidays.holiday_types(:de)
-    assert_equal       [:weihnachten, :semester, :ostern, :pfingsten, :sommer],
+  def test_all_holiday_types
+    assert_equal [:winter,:ostern,:pfingsten,:sommer,:herbst,:weihnachten],
+      Holidays.holiday_types(:de)
+    assert_equal [:weihnachten, :semester, :ostern, :pfingsten, :sommer],
       Holidays.holiday_types(:at)
-    assert_equal       [:sport, :fruehling, :sommer, :herbst, :weihnachten],
+    assert_equal [:sport, :fruehling, :sommer, :herbst, :weihnachten],
       Holidays.holiday_types(:ch)
     assert_raise(ArgumentError) {
       Holidays.holiday_types(:it)
     } # fuer Italien gibt es (momentan) noch keine Ferientermine
-	end
+  end
 
-    def test_ostern_baden_wuerttemberg_2011
-      assert_equal Date.new(2011,4,21),
-        Holidays.new(2011,:de,:baden_wuerttemberg,:ostern).days.first
-      assert_equal Date.new(2011,4,30),
-        Holidays.new(2011,:de,:baden_wuerttemberg,:ostern).days.last
-    end
+  def test_ostern_baden_wuerttemberg_2011
+    assert_equal Date.new(2011,4,21),
+      Holidays.new(2011,:de,:baden_wuerttemberg,:ostern).days.first
+    assert_equal Date.new(2011,4,30),
+      Holidays.new(2011,:de,:baden_wuerttemberg,:ostern).days.last
+  end
+
+  def test_sommer_baden_wuerttemberg_2011
+    assert_equal Date.new(2011,7,28), Holidays.new(2011,:de,:baden_wuerttemberg,:sommer).result.first
+    assert_equal Date.new(2011,9,10), Holidays.new(2011,:de,:baden_wuerttemberg,:sommer).result.last
+  end
+
+  def test_sommer_bayern_2011
+    assert_equal Date.new(2011,7,30), Holidays.new(2011,:de,:bayern,:sommer).result.first
+    assert_equal Date.new(2011,9,12), Holidays.new(2011,:de,:bayern,:sommer).result.last
+  end
+
+  def test_sommer_berlin_2011
+    assert_equal Date.new(2011,6,29), Holidays.new(2011,:de,:berlin,:sommer).result.first
+    assert_equal Date.new(2011,8,12), Holidays.new(2011,:de,:berlin,:sommer).result.last
+  end
+
+  def test_sommer_brandenburg_2011
+    assert_equal Date.new(2011,6,30), Holidays.new(2011,:de,:brandenburg,:sommer).result.first
+    assert_equal Date.new(2011,8,13), Holidays.new(2011,:de,:brandenburg,:sommer).result.last
+  end
+
+  def test_sommer_bremen_2011
+    assert_equal Date.new(2011,7,7), Holidays.new(2011,:de,:bremen,:sommer).result.first
+    assert_equal Date.new(2011,8,17), Holidays.new(2011,:de,:bremen,:sommer).result.last
+  end
 
-    def test_sommer_baden_wuerttemberg_2011
-		assert_equal Date.new(2011,7,28), Holidays.new(2011,:de,:baden_wuerttemberg,:sommer).result.first
-		assert_equal Date.new(2011,9,10), Holidays.new(2011,:de,:baden_wuerttemberg,:sommer).result.last
-	end
-
-	def test_sommer_bayern_2011
-		assert_equal Date.new(2011,7,30), Holidays.new(2011,:de,:bayern,:sommer).result.first
-		assert_equal Date.new(2011,9,12), Holidays.new(2011,:de,:bayern,:sommer).result.last
-	end
-
-	def test_sommer_berlin_2011
-		assert_equal Date.new(2011,6,29), Holidays.new(2011,:de,:berlin,:sommer).result.first
-		assert_equal Date.new(2011,8,12), Holidays.new(2011,:de,:berlin,:sommer).result.last
-	end
-
-	def test_sommer_brandenburg_2011
-		assert_equal Date.new(2011,6,30), Holidays.new(2011,:de,:brandenburg,:sommer).result.first
-		assert_equal Date.new(2011,8,13), Holidays.new(2011,:de,:brandenburg,:sommer).result.last
-	end
-
-	def test_sommer_bremen_2011
-		assert_equal Date.new(2011,7,7), Holidays.new(2011,:de,:bremen,:sommer).result.first
-		assert_equal Date.new(2011,8,17), Holidays.new(2011,:de,:bremen,:sommer).result.last
-	end
-
-	def test_sommer_hamburg_2011
-		assert_equal Date.new(2011,6,30), Holidays.new(2011,:de,:hamburg,:sommer).result.first
-		assert_equal Date.new(2011,8,10), Holidays.new(2011,:de,:hamburg,:sommer).result.last
-	end
-
-	def test_sommer_hessen_2011
-		assert_equal Date.new(2011,6,27), Holidays.new(2011,:de,:hessen,:sommer).result.first
-		assert_equal Date.new(2011,8,5), Holidays.new(2011,:de,:hessen,:sommer).result.last
-	end
-
-	def test_sommer_mecklenburg_vorpommern_2011
-		assert_equal Date.new(2011,7,4), Holidays.new(2011,:de,:mecklenburg_vorpommern,:sommer).result.first
-		assert_equal Date.new(2011,8,13), Holidays.new(2011,:de,:mecklenburg_vorpommern,:sommer).result.last
-	end
-
-	def test_sommer_niedersachsen_2011
-		assert_equal Date.new(2011,7,7), Holidays.new(2011,:de,:niedersachsen,:sommer).result.first
-		assert_equal Date.new(2011,8,17), Holidays.new(2011,:de,:niedersachsen,:sommer).result.last
-	end
-
-	def test_sommer_nordrhein_westfalen_2011
-		assert_equal Date.new(2011,7,25), Holidays.new(2011,:de,:nordrhein_westfalen,:sommer).result.first
-		assert_equal Date.new(2011,9,6), Holidays.new(2011,:de,:nordrhein_westfalen,:sommer).result.last
-	end
-
-	def test_sommer_rheinland_pfalz_2011
-		assert_equal Date.new(2011,6,27), Holidays.new(2011,:de,:rheinland_pfalz,:sommer).result.first
-		assert_equal Date.new(2011,8,5), Holidays.new(2011,:de,:rheinland_pfalz,:sommer).result.last
-	end
-
-	def test_sommer_saarland_2011
-		assert_equal Date.new(2011,6,24), Holidays.new(2011,:de,:saarland,:sommer).result.first
-		assert_equal Date.new(2011,8,6), Holidays.new(2011,:de,:saarland,:sommer).result.last
-	end
-
-	def test_sommer_sachsen_2011
-		assert_equal Date.new(2011,7,11), Holidays.new(2011,:de,:sachsen,:sommer).result.first
-		assert_equal Date.new(2011,8,19), Holidays.new(2011,:de,:sachsen,:sommer).result.last
-	end
-
-	def test_sommer_sachsen_anhalt_2011
-		assert_equal Date.new(2011,7,11), Holidays.new(2011,:de,:sachsen_anhalt,:sommer).result.first
-		assert_equal Date.new(2011,8,24), Holidays.new(2011,:de,:sachsen_anhalt,:sommer).result.last
-	end
-
-	def test_sommer_schleswig_holstein_2011
-		assert_equal Date.new(2011,7,4), Holidays.new(2011,:de,:schleswig_holstein,:sommer).result.first
-		assert_equal Date.new(2011,8,13), Holidays.new(2011,:de,:schleswig_holstein,:sommer).result.last
-	end
-
-	def test_sommer_thueringen_2011
-		assert_equal Date.new(2011,7,11), Holidays.new(2011,:de,:thueringen,:sommer).result.first
-		assert_equal Date.new(2011,8,19), Holidays.new(2011,:de,:thueringen,:sommer).result.last
-	end
-
-	def test_at_sommer_burgenland_2011
-		assert_equal Date.new(2011,7,2), Holidays.new(2011,:at,:burgenland,:sommer).result.first
-		assert_equal Date.new(2011,9,3), Holidays.new(2011,:at,:burgenland,:sommer).result.last
-	end
+  def test_sommer_hamburg_2011
+    assert_equal Date.new(2011,6,30), Holidays.new(2011,:de,:hamburg,:sommer).result.first
+    assert_equal Date.new(2011,8,10), Holidays.new(2011,:de,:hamburg,:sommer).result.last
+  end
+
+  def test_sommer_hessen_2011
+    assert_equal Date.new(2011,6,27), Holidays.new(2011,:de,:hessen,:sommer).result.first
+    assert_equal Date.new(2011,8,5), Holidays.new(2011,:de,:hessen,:sommer).result.last
+  end
+
+  def test_sommer_mecklenburg_vorpommern_2011
+    assert_equal Date.new(2011,7,4), Holidays.new(2011,:de,:mecklenburg_vorpommern,:sommer).result.first
+    assert_equal Date.new(2011,8,13), Holidays.new(2011,:de,:mecklenburg_vorpommern,:sommer).result.last
+  end
+
+  def test_sommer_niedersachsen_2011
+    assert_equal Date.new(2011,7,7), Holidays.new(2011,:de,:niedersachsen,:sommer).result.first
+    assert_equal Date.new(2011,8,17), Holidays.new(2011,:de,:niedersachsen,:sommer).result.last
+  end
+
+  def test_sommer_nordrhein_westfalen_2011
+    assert_equal Date.new(2011,7,25), Holidays.new(2011,:de,:nordrhein_westfalen,:sommer).result.first
+    assert_equal Date.new(2011,9,6), Holidays.new(2011,:de,:nordrhein_westfalen,:sommer).result.last
+  end
+
+  def test_sommer_rheinland_pfalz_2011
+    assert_equal Date.new(2011,6,27), Holidays.new(2011,:de,:rheinland_pfalz,:sommer).result.first
+    assert_equal Date.new(2011,8,5), Holidays.new(2011,:de,:rheinland_pfalz,:sommer).result.last
+  end
+
+  def test_sommer_saarland_2011
+    assert_equal Date.new(2011,6,24), Holidays.new(2011,:de,:saarland,:sommer).result.first
+    assert_equal Date.new(2011,8,6), Holidays.new(2011,:de,:saarland,:sommer).result.last
+  end
+
+  def test_sommer_sachsen_2011
+    assert_equal Date.new(2011,7,11), Holidays.new(2011,:de,:sachsen,:sommer).result.first
+    assert_equal Date.new(2011,8,19), Holidays.new(2011,:de,:sachsen,:sommer).result.last
+  end
+
+  def test_sommer_sachsen_anhalt_2011
+    assert_equal Date.new(2011,7,11), Holidays.new(2011,:de,:sachsen_anhalt,:sommer).result.first
+    assert_equal Date.new(2011,8,24), Holidays.new(2011,:de,:sachsen_anhalt,:sommer).result.last
+  end
+
+  def test_sommer_schleswig_holstein_2011
+    assert_equal Date.new(2011,7,4), Holidays.new(2011,:de,:schleswig_holstein,:sommer).result.first
+    assert_equal Date.new(2011,8,13), Holidays.new(2011,:de,:schleswig_holstein,:sommer).result.last
+  end
+
+  def test_sommer_thueringen_2011
+    assert_equal Date.new(2011,7,11), Holidays.new(2011,:de,:thueringen,:sommer).result.first
+    assert_equal Date.new(2011,8,19), Holidays.new(2011,:de,:thueringen,:sommer).result.last
+  end
+
+  def test_at_sommer_burgenland_2011
+    assert_equal Date.new(2011,7,2), Holidays.new(2011,:at,:burgenland,:sommer).result.first
+    assert_equal Date.new(2011,9,3), Holidays.new(2011,:at,:burgenland,:sommer).result.last
+  end
 
   def test_at_sommer_kaernten_2011
-		assert_equal Date.new(2011,7,9), Holidays.new(2011,:at,:kaernten,:sommer).result.first
-		assert_equal Date.new(2011,9,10), Holidays.new(2011,:at,:kaernten,:sommer).result.last
-	end
-
-  #def test_source
-  #  ENV['HOLIDAYS_SOURCE'] = nil
-  #  assert_equal :internal, Holidays.source
-  #  ENV['HOLIDAYS_SOURCE'] = File.join(TESTDIR,'nonexisting.ods')
-  #  assert_equal :file_not_found, Holidays.source
-  #  ENV['HOLIDAYS_SOURCE'] = File.join(TESTDIR,'ferien.ods')
-  #  assert_equal :from_spreadsheet, Holidays.source
-  #end
-
-  def test_entry_from_spreadsheet
-    #ENV['HOLIDAYS_SOURCE'] = File.join(TESTDIR,'ferien.ods')
-    #assert_equal :from_spreadsheet, Holidays.source
-    assert_equal Date.new(2011,11,1), Holidays.new(2011,:de,:baden_wuerttemberg,:herbst).result.first
-    assert_equal Date.new(2011,11,4), Holidays.new(2011,:de,:baden_wuerttemberg,:herbst).result.last
-  end
-
-  def test_entry2_from_spreadsheet
-    #ENV['HOLIDAYS_SOURCE'] = File.join(TESTDIR,'ferien.ods')
-    #assert_equal :from_spreadsheet, Holidays.source
-    assert_equal Date.new(2011,10,31), Holidays.new(2011,:de,:bayern,:herbst).result.first
-    assert_equal Date.new(2011,11,5), Holidays.new(2011,:de,:bayern,:herbst).result.last
-    # auch bei vorhandenem Spreadsheet sollen Termine die programmatisch
-    # festgelegt sind auch gefunden werden, wenn sie im Spreadsheet nicht
-    # vorhanden sind.
     assert_equal Date.new(2011,7,9), Holidays.new(2011,:at,:kaernten,:sommer).result.first
     assert_equal Date.new(2011,9,10), Holidays.new(2011,:at,:kaernten,:sommer).result.last
   end
 
   def test_pfingsten_schleswig_holstein_2012_nur_ein_tag
-    #ENV['HOLIDAYS_SOURCE'] = File.join(TESTDIR,'ferien.ods')
     assert_equal Date.new(2012,5,18), Holidays.new(2012,:de,:schleswig_holstein,:pfingsten).result.first
     assert_equal Date.new(2012,5,18), Holidays.new(2012,:de,:schleswig_holstein,:pfingsten).result.last
     assert_equal 1, Holidays.new(2012,:de,:schleswig_holstein,:pfingsten).result.size
   end
 
   def test_pfingsten_niedersachsen_2012_nur_ein_tag_und_extra_tag
-	  #ENV['HOLIDAYS_SOURCE'] = File.join(TESTDIR,'ferien.ods')
 	  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
-	  #ENV['HOLIDAYS_SOURCE'] = File.join(TESTDIR,'ferien.ods')
 	  assert_equal([Date.new(2012,5,18)],
 		       Holidays.new(2012,:de,:berlin,:pfingsten).result)
   end
 
-  def test_first_missing
-	  # problematisch, weil nicht jede Region jede Ferienart hat
-	  # z.B. BW mit Winterferien
-	  # TODO: 
-	  #assert_equal [2013,:de,:baden_wuerttemberg,:sommer], 
-		  #Holidays.check_next
-  end
-
   def test_from_hash_hessen_herbst
 	  assert_equal Date.new(2011,10,10),
 		  Holidays.new(2011,:de,:hessen,:herbst).days.first

data/version.txt

@@ -1 +1 @@
-0.2.0
+0.3.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rholidays
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-25 00:00:00.000000000Z
+date: 2011-10-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roo
-  requirement: &20035068 !ruby/object:Gem::Requirement
+  requirement: &21729600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *20035068
+  version_requirements: *21729600
 - !ruby/object:Gem::Dependency
   name: bones
-  requirement: &20034780 !ruby/object:Gem::Requirement
+  requirement: &21729216 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,30 +32,22 @@ dependencies:
         version: 3.7.1
   type: :development
   prerelease: false
-  version_requirements: *20034780
+  version_requirements: *21729216
 description: Rholidays ermittelt Ferientermine (zum Beispiel Sommerferien in Bayern
   im Jahr 2011)
 email: thopre@gmail.com
-executables:
-- rholidays
+executables: []
 extensions: []
 extra_rdoc_files:
 - History.txt
 - README.txt
-- bin/rholidays
 files:
 - History.txt
 - README.txt
 - Rakefile
-- bin/rholidays
-- lib/hash.rb
+- lib/hash_ferien.rb
 - lib/holidays.rb
 - lib/rholidays.rb
-- nbproject/private/private.properties
-- nbproject/project.properties
-- nbproject/project.xml
-- spec/rholidays_spec.rb
-- spec/spec_helper.rb
 - test/test_rholidays.rb
 - version.txt
 homepage: http://rholidays.rubyforge.net

data/bin/rholidays

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-
-require File.expand_path(
-    File.join(File.dirname(__FILE__), %w[.. lib rholidays]))
-require 'rubygems'
-require 'choice'
-# Put your code here
-

data/nbproject/private/private.properties

@@ -1,2 +0,0 @@
-file.reference.rholidays-lib=C:\\Users\\thopre\\rholidays\\lib
-file.reference.rholidays-test=C:\\Users\\thopre\\rholidays\\test

data/nbproject/project.properties

@@ -1,7 +0,0 @@
-file.reference.rholidays-lib=lib
-file.reference.rholidays-test=test
-main.file=
-platform.active=Ruby
-source.encoding=UTF-8
-src.dir=${file.reference.rholidays-lib}
-test.src.dir=${file.reference.rholidays-test}

data/nbproject/project.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.ruby.rubyproject</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/ruby-project/1">
-            <name>Rholidays</name>
-            <source-roots>
-                <root id="src.dir"/>
-            </source-roots>
-            <test-roots>
-                <root id="test.src.dir"/>
-            </test-roots>
-        </data>
-    </configuration>
-</project>

data/spec/rholidays_spec.rb

@@ -1,6 +0,0 @@
-
-require File.join(File.dirname(__FILE__), %w[spec_helper])
-
-describe Rholidays do
-end
-

data/spec/spec_helper.rb

@@ -1,15 +0,0 @@
-
-require File.expand_path(
-    File.join(File.dirname(__FILE__), %w[.. lib rholidays]))
-
-Spec::Runner.configure do |config|
-  # == Mock Framework
-  #
-  # RSpec uses it's own mocking framework by default. If you prefer to
-  # use mocha, flexmock or RR, uncomment the appropriate line:
-  #
-  # config.mock_with :mocha
-  # config.mock_with :flexmock
-  # config.mock_with :rr
-end
-