weekday 1.0.3 → 1.0.4

data/History.txt

@@ -1,3 +1,9 @@
+== 1.0.4 / 2011-09-21
+
+* 2 enhancements
+  * new method like next_first_thursday(date=Date.today).
+  * new method like previous_first_thursday(date=Date.today)
+
 == 1.0.3 / 2011-04-06
 
 * 2 enhancements

data/README.md

@@ -3,6 +3,11 @@ weekday
 
 This gem calculates date like 'first tuesday in december 2010' or 'third friday in may 2011' or 'last Saturday in december 2010'
 
+Support this project
+--------------------
+
+If you find this gem useful and you want to support this work, send Bitcoins to the address <b><code>1ASyu5EuTkUEmiNz3y2ikSDAjdySpDJSMb</code></b>.
+
 Features
 --------
 

data/README.txt

@@ -0,0 +1,89 @@
+= weekday
+
+This gem calculates date like 'first tuesday in december 2010' or 'third friday in may 2011' or 'last Saturday in december 2010'
+
+== Support this project
+
+If you find this gem useful and you want to support this work, send Bitcoins to the address <b><code>1ASyu5EuTkUEmiNz3y2ikSDAjdySpDJSMb</code></b>.
+
+== Features
+
+* All method names are a combination of 'first', 'second', 'third', 'fourth', 'fifth' and 'monday', 'tuesday', ...
+* Also 'last' + 'monday', 'tuesday', ... is possible
+* If there is for example no fifth saturday in a specific month then nil is returned
+* Calculations like next (previous) third friday
+* Calculations like all first mondays in a complete year
+
+== Examples
+
+    require 'rubygems'
+    require 'weekday'
+    require 'date'
+    #    
+    # calculate every first thursday in a year
+    1.upto 12 do |month|
+      day = Weekday.first_thursday(2010, month)
+      puts day
+    end
+    #
+    # calculate last monday in September 2011
+    puts Weekday.last_monday(2011,9)
+    #
+    # calculate fifth monday in September 2011
+    # this will return a nil value because there is no fifth monday in this month
+    puts Weekday.fifth_monday(2011,9)
+    #
+    # calculate all third wednesdays in 2011
+    # this returns an array of Date objects
+    days = Weekday.third_wednesdays(2011)
+    # 
+    # calculates the next second tuesdays from today
+    puts Weekday.next_second_tuesday
+    #
+    # if next_... is called with an argument of type Date this date is used for 
+    # next-calculation
+    puts Weekday.next_second_tuesday(Date.new(2012,1,1))
+    #
+    # there is also a calculation of the last previous date
+    puts Weekday.previous_second_tuesday
+    #
+    # next- and previous-calculations will automatically skip months if there
+    # is no such specified date in this month. This example results in the date
+    # 2011-06-30 because this was the last fifth thursday in a month when called
+    # with at 2011-09-20.
+    puts Weekday.previous_fifth_thursday(Date.new(2011,9,20))
+
+For a complete listing of all call syntax see the documentation of the Weekday class.
+
+== Install
+
+gem install weekday
+
+== Author
+
+Original author: Thomas Preymesser
+
+== License
+
+(The MIT License)
+
+Copyright (c) 2010-2011 Thomas Preymesser
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/weekday.rb

@@ -25,6 +25,8 @@ If a certain date like 'fifth_saturday' is not possible, nil is returned.
   PREV = %w(nil nil) + COUNTWORDS
   ILLEGAL_ARGUMENTS = "illegal month or year number"
   DAYS_PER_WEEK = 7
+  NEXT = 'next'
+  PREVIOUS = 'previous'
 
   # Weekday.method_missing implements the methods like
   # * Weekday.second_tuesday(2010,12) or
@@ -35,9 +37,61 @@ If a certain date like 'fifth_saturday' is not possible, nil is returned.
   # * 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
+  # * Weekday.next_first_tuesday returns the next specified date (today if this date matches today). This method can take a argument of type Date - if no argument is given, this argument defaults to the current date.
+  # * Weekday.previous_first_tuesday returns the previous specified date (today if this date matches today). This method can take a argument of type Date - if no argument is given, this argument defaults to the current date.
   def self.method_missing(m, *args)
-    # first_thursdays(year)
     count_s,weekday = m.to_s.split('_')
+    # next_first_thursday
+    if m.to_s.split('_').first == NEXT
+      n,count_s,weekday = m.to_s.split('_')
+      today = args[0]
+      today ||= Date.today
+      month = today.month
+      year = today.year
+      nn = nil
+      loop do
+        nn = self.send(count_s+'_'+weekday,year,month)
+        break if nn
+        year,month = next_month(year,month)
+      end
+      if nn < today
+        loop do
+          nn = self.send(count_s+'_'+weekday,next_month(year,month)[0],
+            next_month(year,month)[1])
+          break if nn
+          year,month = next_month(year,month)
+        end
+      end
+      return nn
+    end
+    # end next_first_thursday
+    
+    # previous_first_thursday
+    if m.to_s.split('_').first == PREVIOUS
+      n,count_s,weekday = m.to_s.split('_')
+      today = args[0]
+      today ||= Date.today
+      month = today.month
+      year = today.year
+      nn = nil
+      loop do
+        nn = self.send(count_s+'_'+weekday,year,month)
+        break if nn
+        year,month = previous_month(year,month)
+      end
+      if nn > today
+        loop do
+          nn = self.send(count_s+'_'+weekday, previous_month(year,month)[0],
+            previous_month(year,month)[1])
+          break if nn
+          year,month = previous_month(year,month)
+        end
+      end
+      return nn
+    end
+    # end previous_first_thursday
+
+    # first_thursdays(year)
     if DAYNAMESS.include?(weekday) and args.size == 1
       unless COUNTWORDS.include?(count_s)
         raise NoMethodError, "undefined method `#{m}'"
@@ -47,11 +101,12 @@ If a certain date like 'fifth_saturday' is not possible, nil is returned.
       year = args[0]
       result = []
       1.upto(12) do |month|
-	result << self.send(count_s+"_"+DAYNAMES[wnum],year,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)
@@ -149,4 +204,23 @@ If a certain date like 'fifth_saturday' is not possible, nil is returned.
     self.send(s,year,month)
   end
 
+  private
+
+  def self.next_month(year,month)
+    month += 1
+    if month > 12
+      month = 1
+      year += 1
+    end
+    return year,month
+  end
+
+  def self.previous_month(year,month)
+    month -= 1
+    if month < 1
+      month = 12
+      year -= 1
+    end
+    return year,month
+  end
 end

data/test/test_wd.rb

@@ -158,24 +158,62 @@ class TestWd < Test::Unit::TestCase
   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
-		 ))
+        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)
+		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)
+		  expected << Weekday.first_thursday(2011,m)
 	  end
 	  assert_equal expected, Weekday.first_thursdays(2011)
   end
+
+  def test_next_first_thursday
+	  # next month
+	  today = Date.new(2011,9,19)
+	  assert_equal Date.new(2011,10,6), Weekday.next_first_thursday(today)
+
+	  # today 
+	  today = Date.new(2011,10,6)
+	  assert_equal Date.new(2011,10,6), Weekday.next_first_thursday(today)
+
+	  # end of year
+	  today = Date.new(2011,12,25)
+	  assert_equal Date.new(2012,1,5), Weekday.next_first_thursday(today)
+	  
+	  # Monate ueberspringen, wenn z.B. kein fuenfter Donnerstag vorhanden
+	  today = Date.new(2011,9,30)
+	  assert_equal Date.new(2011,12,29), Weekday.next_fifth_thursday(today)
+  end
+
+  def test_previous_first_thursday
+	  # today 
+	  today = Date.new(2011,9,15)
+	  assert_equal Date.new(2011,9,15), Weekday.previous_third_thursday(today)
+
+	  # im gleichen Monat schon vergangen 
+	  today = Date.new(2011,9,21)
+	  assert_equal Date.new(2011,9,15), Weekday.previous_third_thursday(today)
+
+	  # im gleichen Monat noch nicht vergangen 
+	  today = Date.new(2011,9,8)
+	  assert_equal Date.new(2011,8,18), Weekday.previous_third_thursday(today)
+
+	  # previous year
+	  today = Date.new(2011,1,1)
+	  assert_equal Date.new(2010,12,2), Weekday.previous_first_thursday(today)
+
+	  # Monate ueberspringen, wenn z.B. kein fuenfter Donnerstag vorhanden
+	  today = Date.new(2011,9,1)
+	  assert_equal Date.new(2011,6,30), Weekday.previous_fifth_thursday(today)
+  end
 end
 

data/version.txt

@@ -1 +1 @@
-1.0.3
+1.0.4

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weekday
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-04-06 00:00:00.000000000Z
+date: 2011-09-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bones
-  requirement: &19667736 !ruby/object:Gem::Requirement
+  requirement: &16913364 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.6.5
+        version: 3.7.1
   type: :development
   prerelease: false
-  version_requirements: *19667736
+  version_requirements: *16913364
 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
@@ -29,6 +29,7 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - History.txt
+- README.txt
 - lib/doc/Object.html
 - lib/doc/Weekday.html
 - lib/doc/created.rid
@@ -62,6 +63,7 @@ extra_rdoc_files:
 files:
 - History.txt
 - README.md
+- README.txt
 - Rakefile
 - examples/termine.rb
 - lib/doc/Object.html
@@ -103,7 +105,7 @@ licenses: []
 post_install_message: 
 rdoc_options:
 - --main
-- README.md
+- README.txt
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -120,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: weekday
-rubygems_version: 1.7.1
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: This gem calculates date like 'first tuesday in december 2010' or 'third