DateUtils 0.3.1.1 → 0.4

data/lib/date_utils.rb

@@ -3,7 +3,7 @@
 #--
 # Copyright (c) 2007 Rene Paulokat
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General PublicF License as published by
+# it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
@@ -358,8 +358,6 @@ module DateUtils
       @num_days = 30 if [4,6,9,11].include?(@month)
       ( date.leap? ? (@num_days = 29) : (@num_days = 28) ) if @month == 2
       @last_day = @first_day + ( @num_days - 1 )
-      # XXX instance-variable 'year' added.
-      @year = @date.year
     end
     
   end
@@ -381,6 +379,9 @@ module DateUtils
     # last day of this year
     attr_reader :last_day
     
+    # number of weeks in year
+    attr_reader :num_weeks
+    
     # create a new Year -instance with given Date
     # 
     def initialize(date=nil)
@@ -392,6 +393,9 @@ module DateUtils
       @date = date
       @first_day = Date::parse("#{@year}-01-01")
       @last_day = Date::parse("#{@year}-12-31")
+      # there are 53 weeks, if year ends on thursdays: 
+      @num_weeks = @last_day.wday == 4 ? 53 : 52
+      
     end
     
 		# create a Year-instance 
@@ -425,7 +429,7 @@ module DateUtils
       arr = []
       week = Week.new(d)
       arr.push(week)
-      for i in 1..53
+      for i in 1..@num_weeks
         week = week.next
         arr.push(week)
       end
@@ -435,7 +439,11 @@ module DateUtils
     # returns Week 'num' of self
     #
     def get_week(num)
-      ! num.kind_of?(Fixnum) || num > 53 ? ArgumentError.new("invalid week-number 'num'"): self.weeks[num -1]
+      if ! num.kind_of?(Fixnum) || num > @num_weeks
+        ArgumentError.new("invalid week-number 'num'")
+      else
+        ( @num_weeks > 52 ) ? self.weeks[num-1] : self.weeks[num]
+      end
     end
     
     # returns Month 'num' of self

metadata

@@ -1,47 +1,56 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: DateUtils
 version: !ruby/object:Gem::Version 
-  version: 0.3.1.1
-date: 2007-11-04 00:00:00 +01:00
-summary: Some handy utils to deal with Date
-require_paths: 
-- lib
-email: rene@so36.net
-homepage: http://rcms.oopen.de
-rubyforge_project: 
-description: 
-autorequire: date_utils
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: "0.4"
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Rene Paulokat
-files: 
-- lib/date_utils.rb
-- README
-test_files: []
+autorequire: date_utils
+bindir: bin
+cert_chain: []
 
-rdoc_options: []
+date: 2010-03-16 00:00:00 +01:00
+default_executable: 
+dependencies: []
 
-extra_rdoc_files: 
-- README
+description: 
+email: rene@so36.net
 executables: []
 
 extensions: []
 
+extra_rdoc_files: 
+- README
+files: 
+- lib/date_utils.rb
+- README
+has_rdoc: true
+homepage: http://labs.so36.net
+licenses: []
+
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
+rubyforge_project: 
+rubygems_version: 1.3.5
+signing_key: 
+specification_version: 3
+summary: Some handy utils to deal with Date
+test_files: []