date_ext 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/date_ext.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{date_ext}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["hasclass"]
-  s.date = %q{2009-12-09}
+  s.date = %q{2010-01-13}
   s.description = %q{Ruby classes for weekday, month, etc.}
   s.email = %q{sebastian.burkhard@gmail.com}
   s.extra_rdoc_files = [
@@ -28,10 +28,14 @@ Gem::Specification.new do |s|
      "lib/core_ext.rb",
      "lib/date_ext.rb",
      "lib/month.rb",
+     "lib/quarter.rb",
      "lib/weekday.rb",
+     "lib/year.rb",
      "test/month_test.rb",
+     "test/quarter_test.rb",
      "test/test_helper.rb",
-     "test/weekday_test.rb"
+     "test/weekday_test.rb",
+     "test/year_test.rb"
   ]
   s.homepage = %q{http://github.com/hasclass/test}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -40,8 +44,10 @@ Gem::Specification.new do |s|
   s.summary = %q{date extensions helps you work with weekdays, workdays, holidays, months, weeks, etc.}
   s.test_files = [
     "test/month_test.rb",
+     "test/quarter_test.rb",
      "test/test_helper.rb",
-     "test/weekday_test.rb"
+     "test/weekday_test.rb",
+     "test/year_test.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/core_ext.rb

@@ -1,3 +1,10 @@
 class Date
   include WeekDayCoreExt
+end
+
+class Date
+  # Creates a Month object of the current month
+  def to_month
+    Month.new(self)
+  end
 end

data/lib/date_ext.rb

@@ -1,3 +1,5 @@
 require 'month'
 require 'weekday'
+require 'year'
+require 'quarter'
 require 'core_ext'

data/lib/month.rb

@@ -40,7 +40,6 @@ class Month
     @year = year.to_i     
     @month = month.to_i
   end
-  
 
   #   If _months_ is a Numeric value, create a new Month object that is x months earlier than the current one.
   #
@@ -93,20 +92,12 @@ class Month
   
   # Returns the last weekday (everyday except saturday or sunday) of the current month.
   def last_cday
-    date = last_day
-    while date.cwday > 5
-      date = date -= 1
-    end
-    date
+    last_weekday
   end
   
   # Returns the first weekday (everyday except saturday or sunday) of the current month.
   def first_cday
-    date = first_day 
-    while date.cwday > 5
-      date = date += 1
-    end
-    date
+    first_weekday
   end
   
   # Returns the first commercial weekday with the given weekday number
@@ -117,7 +108,16 @@ class Month
     end
     date
   end
-  
+
+  def first_weekday
+    d = first_day
+    Weekday.civil_or_newer(d.year, d.month, d.day)
+  end
+
+  def last_weekday
+    last_day.to_weekday
+  end
+
   # Returns the last day of current month as a Date object.
   def last_day
     first_of_next_month = first_day + 32
@@ -135,9 +135,3 @@ class Month
   end  
 end
 
-class Date
-  # Creates a Month object of the current month
-  def to_month
-    Month.new(self)
-  end
-end

data/lib/quarter.rb

@@ -0,0 +1,47 @@
+class Quarter
+  attr_accessor :year, :quarter
+  
+  def initialize(year, quarter)
+    @year = year
+    @quarter = quarter
+  end
+
+  def to_year
+    Year.new(@year)
+  end
+
+# def -(x)
+#   if x.is_a?(Numeric)
+#     return self.class.new(@year - x)
+#   elsif x.is_a?(Quarter) 
+#     return @year - x.year
+#   else
+#     raise TypeError, 'expected numeric or year'
+#   end
+# end
+#
+# def +(x)
+#   if x.is_a?(Numeric)
+#     return self.class.new(@year + x)
+#   elsif x.is_a?(Quarter) 
+#     return @year + x.year
+#   else
+#     raise TypeError, 'expected numeric or year'
+#   end
+# end
+
+  def months; (first_month..last_month).to_a; end
+
+  def first_month; Month.new(@year,@quarter); end
+  def last_month; Month.new(@year,@quarter+2); end
+
+  def dates; (first_date..last_date).to_a; end
+
+  def first_date; first_month.first_day; end
+  def last_date; last_month.last_day; end
+
+  def weekdays; (first_weekday..last_date).to_a; end
+
+  def first_weekday; first_month.first_weekday; end
+  def last_weekday; last_weekday.last_weekday; end
+end

data/lib/weekday.rb

@@ -2,21 +2,39 @@ module WeekDayCoreExt
   def is_weekday?
     self.cwday < 6
   end
-  
+
+  # Returns a Weekday. Doesn't raise an exception if not a weekday, 
+  # but returns the most previous weekday.
+  #
   def to_weekday
-    self.is_a?(Weekday) ? self : Weekday.new(self.year, self.month, self.day)
+    Weekday.civil(self.year, self.month, self.day)
+  end
+
+  # Returns a Weekday. Raises Exception if not a weekday
+  #
+  def to_weekday!
+    Weekday.civil!(self.year, self.month, self.day)
   end
 end
 
+class Weekday < Date
+  OLDER = '-'
+  NEWER = '+'
 
+  def self.civil(y=-4712, m=1, d=1, sg=ITALY)
+    weekday_or_nearest(y,m,d,OLDER)
+  end
 
-class Weekday < Date  
-  
-  def initialize(ajd=0, of=0, sg=ITALY) 
-    super(ajd, of, sg)
-    raise 'Is not a weekday' unless self.is_weekday?
+  def self.civil_or_newer(y=-4712, m=1, d=1, sg=ITALY)
+    weekday_or_nearest(y,m,d,NEWER)
   end
-  
+
+  def self.civil!(y=-4712, m=1, d=1, sg=ITALY)
+    day = new(y,m,d)
+    raise "Is not a Weekday" unless day.is_weekday?
+    day
+  end
+
   def -(x)
     if x.is_a?(Numeric)
 #      weekend_offset = 0
@@ -33,7 +51,7 @@ class Weekday < Date
       raise TypeError, 'expected numeric or date'
     end
   end
-  
+
   def +(x)
     if x.is_a?(Numeric)
       days = x % 5
@@ -50,4 +68,17 @@ class Weekday < Date
   def self.today
     super.class.today.to_weekday
   end
+
+  def self.today!
+    super.class.today.to_weekday!
+  end
+
+private 
+  def self.weekday_or_nearest(y,m,d,operator = OLDER)
+    day = Date.new(y,m,d)
+    while !day.is_weekday?
+      day = day.send(operator, 1)
+    end
+    day.to_weekday!
+  end
 end

data/lib/year.rb

@@ -0,0 +1,42 @@
+class Year
+  attr_accessor :year
+  
+  def initialize(year)
+    @year = year
+  end
+
+  def -(x)
+    if x.is_a?(Numeric)
+      return self.class.new(@year - x)
+    elsif x.is_a?(Year) 
+      return @year - x.year
+    else
+      raise TypeError, 'expected numeric or year'
+    end
+  end
+
+  def +(x)
+    if x.is_a?(Numeric)
+      return self.class.new(@year + x)
+    elsif x.is_a?(Year) 
+      return @year + x.year
+    else
+      raise TypeError, 'expected numeric or year'
+    end
+  end
+
+  def months; (first_month..last_month).to_a; end
+
+  def first_month; Month.new(year,1); end
+  def last_month; Month.new(year,12); end
+
+  def dates; (first_date..last_date).to_a; end
+
+  def first_date; Date.new(year,1,1); end
+  def last_date; Date.new(year,12,31); end
+
+  def weekdays; (first_weekday..last_date).to_a; end
+
+  def first_weekday; first_month.first_weekday; end
+  def last_weekday; last_month.last_weekday; end
+end

data/test/month_test.rb

@@ -5,6 +5,19 @@ require File.dirname(__FILE__) + '/test_helper'
 
 class MonthTest < Test::Unit::TestCase
   
+  context "December" do
+    setup {
+      @month = Month.new(2011,12)
+    }
+    should "have last_day 2011-12-31" do
+      assert_equal Date.new(2011,12,31), @month.last_day
+    end
+    should "have last_weekday 2011-12-30" do
+      assert_equal Date.new(2011,12,30), @month.last_weekday
+    end
+
+  end
+  
   context "Date#to_month" do
     setup do 
       @d = Date.new(2009,2,1)

data/test/quarter_test.rb

@@ -0,0 +1,23 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+class QuarterTest < Test::Unit::TestCase
+
+  context "Quarter 2009" do
+    setup {
+      @quarter = Quarter.new(2009,1)
+    }
+    should "have 2009-01 as first_month" do
+      assert_equal Month.new(2009,1), @quarter.first_month
+    end
+    should "have 2009-12 as last_month" do
+      assert_equal Month.new(2009,3), @quarter.last_month
+    end
+    should "have 2009-01-01 as first_date" do
+      assert_equal Date.new(2009,1,1), @quarter.first_date
+    end
+    should "have 2009-12-31 as last_date" do
+      assert_equal Date.new(2009,3,31), @quarter.last_date
+    end
+  end
+
+end

data/test/weekday_test.rb

@@ -1,8 +1,5 @@
 require File.dirname(__FILE__) + '/test_helper'
 
-
-
-
 class WeekdayTest < Test::Unit::TestCase
   context "range friday ... friday_next_week" do
     setup {
@@ -10,35 +7,48 @@ class WeekdayTest < Test::Unit::TestCase
       @fri_next = Weekday.new(2009,12,11)
       @range = (@fri...@fri_next)
     }
-    
+
     should "have 5 elements" do
       assert_equal 5, @range.to_a.length
     end
-    
+
     should "all be weekdays" do
       assert @range.to_a.all?{|wd| wd.is_a?(Weekday)}
     end
   end
-  
+
   context "Weekday methods" do
     should "return a Weekday object on #new" do
       assert_equal Weekday, Weekday.new(2009,12,3).class
     end
-    
+
     should "return a Weekday object on #today" do
       assert_equal Weekday, Weekday.today.class
     end
   end
-  
+
+  context "On weekends" do
+    should "return previous friday if #civil on weekend" do
+      assert_equal Weekday.civil(2009,12,4), Weekday.civil(2009,12,5)
+      assert_equal Weekday.civil(2009,12,4), Weekday.civil(2009,12,6)
+    end
+
+    should "return next monday if #civil_or_newer on weekend" do
+      assert_equal Weekday.civil(2009,12,7), Weekday.civil_or_newer(2009,12,5)
+      assert_equal Weekday.civil(2009,12,7), Weekday.civil_or_newer(2009,12,6)
+    end
+  end
+
   context "Weekdays" do
     setup {
       @thu = Weekday.new(2009,12,3)
       @fri = Weekday.new(2009,12,4)
-      
+
       @mon = Weekday.new(2009,12,7)
       @tue = Weekday.new(2009,12,8)
       @wed = Weekday.new(2009,12,9)
     }
+
     context "Wednesday" do
       should "be valid" do
         assert Weekday, @wed
@@ -59,6 +69,7 @@ class WeekdayTest < Test::Unit::TestCase
         assert_equal Weekday.new(2009,12,2), @wed - 5
       end
     end
+
     context "Monday" do
       should "be valid" do
         assert Weekday, @mon

data/test/year_test.rb

@@ -0,0 +1,44 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+class YearTest < Test::Unit::TestCase
+
+  context "Year 2009" do
+    setup {
+      @year = Year.new(2009)
+    }
+    should "assign year" do
+      assert_equal 2009, @year.year
+    end
+    should "have 2009-01 as first_month" do
+      assert_equal Month.new(2009,1), @year.first_month
+    end
+    should "have 2009-12 as last_month" do
+      assert_equal Month.new(2009,12), @year.last_month
+    end
+    should "have 2009-01-01 as first_date" do
+      assert_equal Date.new(2009,1,1), @year.first_date
+    end
+    should "have 2009-12-31 as last_date" do
+      assert_equal Date.new(2009,12,31), @year.last_date
+    end
+    should "have 2009-01-01 as first_weekday" do
+      assert_equal Date.new(2009,1,1), @year.first_weekday
+    end
+    should "have 2009-12-31 as last_weekday" do
+      assert_equal Date.new(2009,12,31), @year.last_weekday
+    end
+  end
+
+  context "Year 2011" do
+    setup {
+      @year = Year.new(2011)
+    }
+    should "have 2011-01-03 as first_weekday" do
+      assert_equal Date.new(2011,1,3), @year.first_weekday
+    end
+    should "have 2011-12-30 as last_weekday" do
+      assert_equal Date.new(2011,12,30), @year.last_weekday
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: date_ext
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - hasclass
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-09 00:00:00 +01:00
+date: 2010-01-13 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,10 +43,14 @@ files:
 - lib/core_ext.rb
 - lib/date_ext.rb
 - lib/month.rb
+- lib/quarter.rb
 - lib/weekday.rb
+- lib/year.rb
 - test/month_test.rb
+- test/quarter_test.rb
 - test/test_helper.rb
 - test/weekday_test.rb
+- test/year_test.rb
 has_rdoc: true
 homepage: http://github.com/hasclass/test
 licenses: []
@@ -77,5 +81,7 @@ specification_version: 3
 summary: date extensions helps you work with weekdays, workdays, holidays, months, weeks, etc.
 test_files: 
 - test/month_test.rb
+- test/quarter_test.rb
 - test/test_helper.rb
 - test/weekday_test.rb
+- test/year_test.rb