weekday 1.0.2 → 1.0.3

data/History.txt

@@ -1,3 +1,9 @@
+== 1.0.3 / 2011-04-06
+
+* 2 enhancements
+  * new method nth
+  * new method Weekday.mondays(year) .. Weekday.sundays(year)
+
 == 1.0.2 / 2011-02-23
 
 * 1 bugfix

data/examples/termine.rb

@@ -53,5 +53,6 @@ puts '-'*ueberschrift.length
   puts_event tag, "rug-b Treffen (jeden 1. Do)",              Weekday.first_thursday(year,month) == tag
   puts_event tag, "Ocean Club Radio Eins (jeden 2. Sa 1-5 h)",      Weekday.second_saturday(year,month) == tag
   puts_event tag, "Ocean Club Radio Eins (jeden 4. Sa 1-5 h)",      Weekday.fourth_saturday(year,month) == tag
+  puts_event tag, "freiesMagazin erscheint (jeden 1. So",      Weekday.first_sunday(year,month) == tag
   tag += 1
 end

data/lib/weekday.rb

@@ -10,6 +10,7 @@ The Class Weekday can create date objects by calling class methods like
 * Weekday.third_thursday(2011, 3)     # third_thursday in march 2011
 * Weekday.last_sunday(2011, 8)        # last sunday in august 2011
 * Weekday.fridays(2011, 9)            # an array of date objects with all fridays in 9/2011
+* Weekday.first_thursdays(2011)       # an array of date objects with all first thursdays in 2011
 
 Every combination from 'first' to 'fifth' and 'last' and the a name of a weekday from 
 'monday' to 'sunday' is allowed.
@@ -33,18 +34,35 @@ If a certain date like 'fifth_saturday' is not possible, nil is returned.
   # * 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
+  # * Weekday.first_thursdays(2011) returns all first thursdays in this year as an array of Date objects
   def self.method_missing(m, *args)
+    # first_thursdays(year)
+    count_s,weekday = m.to_s.split('_')
+    if DAYNAMESS.include?(weekday) and args.size == 1
+      unless COUNTWORDS.include?(count_s)
+        raise NoMethodError, "undefined method `#{m}'"
+      end
+      count = COUNTWORDS.index(count_s)+1
+      wnum = DAYNAMESS.index(weekday)
+      year = args[0]
+      result = []
+      1.upto(12) do |month|
+	result << self.send(count_s+"_"+DAYNAMES[wnum],year,month) 
+      end
+      return result
+    end
+    # end first_thursdays
     # 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
+        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])
@@ -77,7 +95,7 @@ If a certain date like 'fifth_saturday' is not possible, nil is returned.
     # 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)
+      # last_xxx(year)
       d = Date.new(args[0],args[1],-1)
       while not d.wday == wnum do
         d -= 1
@@ -89,7 +107,7 @@ If a certain date like 'fifth_saturday' is not possible, nil is returned.
       # 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)
+      # first_xxx(year)
       begin
         d = Date.new(args[0],args[1],1)
       rescue ArgumentError
@@ -115,5 +133,20 @@ If a certain date like 'fifth_saturday' is not possible, nil is returned.
       raise NoMethodError, "undefined method `#{m}'"
     end
   end
-end
 
+  # just another notation if you have to calculate the weekdays programmatically
+  # * count: 1..5 first, second; -1 last
+  # * weekday: 0: sunday, 1: monday, ... 6: saturday
+  # * year
+  # * month
+  def Weekday.nth(count, weekday, year, month)
+    raise ArgumentError unless count >= 1 and count <=5 or count == -1
+    if count == -1
+      s = COUNTWORDS.last + '_' + DAYNAMES[weekday]
+    else
+      s = COUNTWORDS[count-1] + '_' + DAYNAMES[weekday]
+    end
+    self.send(s,year,month)
+  end
+
+end

data/test/test_wd.rb

@@ -3,12 +3,12 @@ require 'test/unit'
 
 class TestWd < Test::Unit::TestCase
 	def test_class
-	     assert_equal Date, Weekday.first_saturday(2010,12).class
+    assert_equal Date, Weekday.first_saturday(2010,12).class
 	end
 
 	def test_first_saturday_2010_12
 		assert_equal Date.new(2010,12,4),
-			     Weekday.first_saturday(2010,12)
+      Weekday.first_saturday(2010,12)
 	end
 
 	def test_second_saturday_2010_12
@@ -32,22 +32,22 @@ class TestWd < Test::Unit::TestCase
 
 	def test_first_sunday
 		assert_equal Date.new(2010,12,5),
-			     Weekday.first_sunday(2010,12)
+      Weekday.first_sunday(2010,12)
 	end
 
 	def test_second_sunday
 		assert_equal Date.new(2010,12,12),
-			     Weekday.second_sunday(2010,12)
+      Weekday.second_sunday(2010,12)
 	end
 
 	def test_third_sunday
 		assert_equal Date.new(2010,12,19),
-			     Weekday.third_sunday(2010,12)
+      Weekday.third_sunday(2010,12)
 	end
 
 	def test_fourth_sunday
 		assert_equal Date.new(2010,12,26),
-			     Weekday.fourth_sunday(2010,12)
+      Weekday.fourth_sunday(2010,12)
 	end
 
 	def test_fifth_sunday
@@ -74,8 +74,8 @@ class TestWd < Test::Unit::TestCase
 
 	def test_first_saturday_2010_12_deutsch
 		assert_raises(NoMethodError) {
-		assert_equal Date.new(2010,12,4),
-			     Weekday.erster_samstag(2010,12)
+      assert_equal Date.new(2010,12,4),
+      Weekday.erster_samstag(2010,12)
 		}
 	end
 
@@ -111,10 +111,10 @@ class TestWd < Test::Unit::TestCase
 
 	def test_saturdays
 		assert_equal([Date.new(2010,12,4),
-		              Date.new(2010,12,11),
-		              Date.new(2010,12,18),
-		              Date.new(2010,12,25)],
-			     Weekday.saturdays(2010,12))
+        Date.new(2010,12,11),
+        Date.new(2010,12,18),
+        Date.new(2010,12,25)],
+      Weekday.saturdays(2010,12))
 	end
 
 	def test_illegal_month_should_raise_exception
@@ -134,12 +134,12 @@ class TestWd < Test::Unit::TestCase
 
 	def test_first_in_a_year
 		assert_equal(Weekday.first_monday(2011,1),
-			     Weekday.first_monday(2011))
+      Weekday.first_monday(2011))
 	end
 
 	def test_last_in_a_year
 		assert_equal(Weekday.last_monday(2011,12),
-			     Weekday.last_monday(2011))
+      Weekday.last_monday(2011))
 	end
 
 	def test_all_mondays_in_a_year
@@ -151,5 +151,31 @@ class TestWd < Test::Unit::TestCase
 		assert_equal(mondays, Weekday.mondays(2011))
 	end
 
+  #	def test_second_in_year
+  #		assert_equal(Date.new(2011,1,8), Weekday.second_saturday(2011))
+  #	end
+
+  def test_third_sunday_with_nth
+    assert_equal(Date.new(2010,12,19),
+      Weekday.nth(3,     # third
+      0,     # sunday = 0, monday = 1 ... saturday = 6
+      2010,  # year
+      12     # month
+		 ))
+  end
+
+  def test_last_sunday_with_nth
+		assert_equal Date.new(2010,12,26),
+			Weekday.nth(-1,0,2010,12)
+	end
+
+  def test_first_thursdays
+	  expected = []
+	  y = 2011
+	  1.upto 12 do |m|
+		  expected << Weekday.first_thursday(y,m)
+	  end
+	  assert_equal expected, Weekday.first_thursdays(2011)
+  end
 end
 

data/version.txt

@@ -1 +1 @@
-1.0.2
+1.0.3

metadata

@@ -1,44 +1,33 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: weekday
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 2
-  version: 1.0.2
+version: !ruby/object:Gem::Version
+  version: 1.0.3
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Thomas Preymesser
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-23 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-04-06 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bones
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &19667736 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 6
-        - 5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.6.5
   type: :development
-  version_requirements: *id001
-description: This gem calculates date like 'first tuesday in december 2010' or 'third friday in may 2011' or 'last Saturday in december 2010'
+  prerelease: false
+  version_requirements: *19667736
+description: This gem calculates date like 'first tuesday in december 2010' or 'third
+  friday in may 2011' or 'last Saturday in december 2010'
 email: thopre@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
 - lib/doc/Object.html
 - lib/doc/Weekday.html
@@ -70,7 +59,7 @@ extra_rdoc_files:
 - lib/doc/js/thickbox-compressed.js
 - lib/doc/rdoc.css
 - lib/doc/weekday_rb.html
-files: 
+files:
 - History.txt
 - README.md
 - Rakefile
@@ -109,38 +98,32 @@ files:
 - lib/weekday.rb
 - test/test_wd.rb
 - version.txt
-has_rdoc: true
 homepage: http://weekday.rubyforge.net/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.md
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: weekday
-rubygems_version: 1.3.7
+rubygems_version: 1.7.1
 signing_key: 
 specification_version: 3
-summary: This gem calculates date like 'first tuesday in december 2010' or 'third friday in may 2011' or 'last Saturday in december 2010'
-test_files: 
+summary: This gem calculates date like 'first tuesday in december 2010' or 'third
+  friday in may 2011' or 'last Saturday in december 2010'
+test_files:
 - test/test_wd.rb