date_utils 0.1.3 → 0.2

data/lib/date_utils.rb

@@ -41,6 +41,11 @@ module DateUtils
       end
     end
     
+    def self.extract_options_from_args!(args)
+      options = args.last.is_a?(Hash) ? args.pop : {}
+      options
+    end
+    
     
   end
   
@@ -88,21 +93,30 @@ module DateUtils
     # create a new Week-instance with the given initial Date or Week-number
     # if 'date' is nil, create an instance with Date.today
     # 
-    def initialize(date=nil)
-      if date.nil?
+    def initialize(val=nil)
+      if val.nil?
         _date = Date.today
-      elsif date.kind_of?(Date)
-        _date = date
-      elsif date.kind_of?(Fixnum)
-        _date = Year.new.get_week(date).date
       else
-        raise ArgumentError, "needs Date object or Fixnum for Week as input."
+        _date = val.is_a?(Date) ? val : (raise ArgumentError.new("neither Fixnum nor Date given."))
+      end 
+      set_date(_date)
+      create_instance_variables
+    end
+    
+    # create a Week-instance 
+    # call with hash: year and week
+    # :call-seq:
+    # Week.create(:year => x, :week => y)
+    # Week.create(:week => x)
+    # Week.create(:year => x)
+    # 
+    def self.create(*args)
+      options = Common::extract_options_from_args!(args)
+      year_date = options.has_key?(:year) ? Date::civil(options[:year].to_i, 1,1) : Date.today
+      unless options.has_key?(:week) && !options[:week].nil?
+        return Week.new(year_date)
       end
-      @month = Month.new(_date)
-      @date = _date
-      @num_week = _date.cweek
-      @first_day = _date - ( _date.cwday - 1 )
-      @last_day = _date + ( 7 - _date.cwday ) 
+      return Year.new(year_date).get_week(options[:week].to_i)
     end
     
     # return new Week -instance one week after self
@@ -125,6 +139,23 @@ module DateUtils
       arr
     end
     
+    private
+    
+    # prepare instance variables
+    # 
+    def create_instance_variables
+      @month = Month.new(@date) 
+      @num_week = @date.cweek
+      @first_day = @date - ( @date.cwday - 1 )
+      @last_day = @date + ( 7 - @date.cwday ) 
+    end
+    
+    # set base-date for self
+    # 
+    def set_date(date)
+      @date = date
+    end
+    
   end
     
   # Represents a 'Month'
@@ -149,41 +180,71 @@ module DateUtils
       
     # create a new Month of given Date
     # 
-    def initialize(date=nil)
-      date = Date.today if date.nil?
-      if date.kind_of?(Date)
-        @date = date
-        @month = date.month
-        @first_day = date.mday > 1 ? (date - ( date.mday - 1)) : date 
-        @num_days = 31 if [1,3,5,7,8,10,12].include?(@month)
-        @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 )
+    def initialize(val=nil)
+      if val.nil?
+        _date = Date.today
       else
-        raise ArgumentError, "needs Date object as input!"
-      end
-      
-      # returns new Month -instance one Month later than self
-      # 
-      def next
-        return Month.new(@last_day + 1)
-      end
-      
-      # returns a new Month -instance one Month prior to self
-      # 
-      def previous
-        return Month.new((@first_day - 1).to_date)
-      end
+        if val.is_a?(Date) 
+          _date = val
+        elsif val.is_a?(Fixnum) && val <= 12
+          _date = Date::civil(Date.today.year.to_i,val,1)
+        else
+          raise ArgumentError.new("neither Fixnum nor Date given.")
+        end
+      end 
+      @date = _date
+      create_instance_variables
+    end
         
-      # returns collection of days as Date -instances of self
-      #  
-      def days
-        arr = []
-        @first_day.upto(@last_day) { |date| arr << date }
-        arr
-      end
+    # create a Month-instance 
+    # call with hash: year and month
+    # :call-seq:
+    # Month.create(:year => x, :month => y)
+    # Month.create(:month => x)
+    # Month.create(:year => x)
+    #     
+    def self.create(*args)
+      options = Common::extract_options_from_args!(args)
+      int_year = options.has_key?(:year) && options[:year].is_a?(Fixnum) ? options[:year] : nil
+      int_month = options.has_key?(:month) && options[:month].is_a?(Fixnum) && options[:month] <= 12 ? options[:month] : nil
+      return Month.new(Date::civil(int_year || Date.today.year, int_month || 1))
+    end
+    
+    # returns new Month -instance one Month later than self
+    # 
+    def next
+      return Month.new(@last_day + 1)
+    end
+      
+    # returns a new Month -instance one Month prior to self
+    # 
+    def previous
+      return Month.new((@first_day - 1).to_date)
+    end
         
+    # returns collection of days as Date -instances of self
+    #  
+    def days
+      arr = []
+      @first_day.upto(@last_day) { |date| arr << date }
+      arr
+    end
+      
+    private
+      
+    def set_date(date)
+      @date = date
     end
+      
+    def create_instance_variables
+      @month = @date.month
+      @first_day = @date.mday > 1 ? (@date - ( @date.mday - 1)) : @date 
+      @num_days = 31 if [1,3,5,7,8,10,12].include?(@month)
+      @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 )
+    end
+    
   end
     
   # represents a Year
@@ -205,6 +266,18 @@ module DateUtils
         raise ArgumentError, "needs Date as input!"
       end
       @year = date.year
+      @date = date
+    end
+    
+		# create a Year-instance 
+    # call with hash: year
+    # :call-seq:
+    # Year.create(:week => x)
+    # 
+    def self.create(*args)
+      options = Common::extract_options_from_args!(args)
+      date_year = options.has_key?(:year) ? Date.civil(options[:year]) : (raise ArgumentError.new("no key :year in hash."))
+      return Year.new(date_year) 
     end
     
     # returns collection of Month -instances of self
@@ -238,5 +311,11 @@ module DateUtils
       ! num.kind_of?(Fixnum) || num > 52 ? ArgumentError.new("invalid week-number 'num'"): self.weeks[num -1]
     end
     
+    # returns Month 'num' of self
+    # 
+    def get_month(num)
+      ! num.kind_of?(Fixnum) || num > 12 ? ArgumentError.new("invalid week-number 'num'"): self.months[num-1]
+    end
+    
   end
-end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: date_utils
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
-date: 2007-03-02 00:00:00 +01:00
+  version: "0.2"
+date: 2007-03-03 00:00:00 +01:00
 summary: Some handy utils to deal with Date
 require_paths: 
 - lib