weekday 1.0.1 → 1.0.2

data/History.txt

@@ -1,3 +1,12 @@
+== 1.0.2 / 2011-02-23
+
+* 1 bugfix
+  * better error messages if no arguments where given
+* 3 enhancements
+  * new method Weekday.sundays(2011)
+  * new method Weekday.first_monday(2011)
+  * new method Weekday.last_tuesday(2011)
+
 == 1.0.1 / 2011-02-15
 
 * Documentation

data/examples/termine.rb

@@ -1,16 +1,12 @@
 #!/usr/bin/env ruby
+# encoding: utf-8
 
 require 'rubygems'
 require 'weekday' # Weekday-Gem
 require 'date'
 
-class Weekday
-  COUNTWORDS = %w(erster zweiter dritter vierter f�nfter)
-  DAYNAMES = %w(sonntag montag dienstag mittwoch donnerstag freitag samstag)
-  DAYNAMESS = %w(sonntage montage dienstage mittwoche donnerstage freitage samstage)
-end # class Weekday
-
 NEXTDAYS = ['heute','morgen','uebermorgen']
+PREVDAYS = ['gestern']
 
 def heute?(day)
   t = Time.now
@@ -25,11 +21,16 @@ def uebermorgen?(day)
   morgen? day-1
 end
 
+def gestern?(day)
+  heute? day+1
+end
+
 def puts_event(day,text,condition)
   if condition
     print NEXTDAYS[0]+", " if heute? day
     print NEXTDAYS[1]+", " if morgen? day
     print NEXTDAYS[2]+", " if uebermorgen? day
+    print PREVDAYS[0]+", " if gestern? day
     puts "#{day.day}.#{day.month}.#{day.year}"
     puts text
     puts
@@ -43,7 +44,7 @@ reichweite = ARGV[0].to_i if ARGV[0]
 ueberschrift = "Termine in den naechsten #{reichweite} Tagen"
 puts ueberschrift
 puts '-'*ueberschrift.length
-reichweite.times do
+-1.upto(reichweite-1) do 
   year = tag.year
   month = tag.month
   puts_event tag, "Blue Moon Freie Themenwahl (jeden 2. Di)", Weekday.second_tuesday(year,month) == tag

data/lib/wd.rb

@@ -5,13 +5,11 @@ module Weekday
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # Returns the version string for the library.
-  # :startdoc:
 
   def self.version
     @version ||= File.read(path('version.txt')).strip
   end
 
-  # :stopdoc:
   # Returns the library path for the module. If any arguments are given,
   # they will be joined to the end of the libray path using
   # <tt>File.join</tt>.

data/lib/weekday.rb

@@ -30,10 +30,22 @@ If a certain date like 'fifth_saturday' is not possible, nil is returned.
   # * Weekday.last_monday(2010,11)
   # The return value is a date object or nil if there is no Nth Xday in this month
   # * Weekday.mondays(2011,2) returns an array of all mondays in this month
+  # * Weekday.first_monday(2011) returns the very first monday in this year
+  # * Weekday.last_monday(2011) returns the very last monday in this year
+  # * Weekday.mondays(2011) returns all mondays in this year as an array of Date objects
   def self.method_missing(m, *args)
     # self.mondays .. self.sundays
     if DAYNAMESS.include?(m.to_s)
       wnum = DAYNAMESS.index(m.to_s)
+      raise ArgumentError, ILLEGAL_ARGUMENTS unless args[0] or args[1]
+      # mondays .. sundays without a month => calculate complete year
+      unless args[1]
+	result = []
+	1.upto(12) do |mm|
+	  result = (result + self.send(m,args[0],mm)).flatten
+	end
+	return result
+      end
       begin
         d = Date.new(args[0],args[1])
       rescue ArgumentError
@@ -64,6 +76,8 @@ If a certain date like 'fifth_saturday' is not possible, nil is returned.
     end
     # self.last_monday .. self.last_sunday
     if count == COUNTWORDS.index(COUNTWORDS[-1])+1
+      args[1] = 12 if args[1] == nil # december if no month was given at
+                                     # last_xxx(year)
       d = Date.new(args[0],args[1],-1)
       while not d.wday == wnum do
         d -= 1
@@ -72,6 +86,10 @@ If a certain date like 'fifth_saturday' is not possible, nil is returned.
     end
     case count
     when 1
+      # at least a year must be given
+      raise ArgumentError, ILLEGAL_ARGUMENTS unless args[0] or args[1]
+      args[1] = 1 if args[1] == nil # january if no month was given at
+                                    # first_xxx(year)
       begin
         d = Date.new(args[0],args[1],1)
       rescue ArgumentError

data/test/test_wd.rb

@@ -1,7 +1,7 @@
 require './lib/weekday'
 require 'test/unit'
 
-class TestSamstag < Test::Unit::TestCase
+class TestWd < Test::Unit::TestCase
 	def test_class
 	     assert_equal Date, Weekday.first_saturday(2010,12).class
 	end
@@ -122,5 +122,34 @@ class TestSamstag < Test::Unit::TestCase
 			assert_nil Weekday.first_monday(2010,20)
 		}
 	end
+
+	def test_no_arguments_given
+		assert_raises(ArgumentError) {
+			assert_nil Weekday.first_monday
+		}
+		assert_raises(ArgumentError) {
+			assert_nil Weekday.mondays
+		}
+	end
+
+	def test_first_in_a_year
+		assert_equal(Weekday.first_monday(2011,1),
+			     Weekday.first_monday(2011))
+	end
+
+	def test_last_in_a_year
+		assert_equal(Weekday.last_monday(2011,12),
+			     Weekday.last_monday(2011))
+	end
+
+	def test_all_mondays_in_a_year
+		mondays = []
+		1.upto 12 do |m|
+			mondays << Weekday.mondays(2011,m)
+		end
+		mondays.flatten!
+		assert_equal(mondays, Weekday.mondays(2011))
+	end
+
 end
 

data/version.txt

@@ -1 +1 @@
-1.0.1
+1.0.2

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Thomas Preymesser
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-16 00:00:00 +01:00
+date: 2011-02-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency