date_ext 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/date_ext.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{date_ext}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["hasclass"]

data/lib/month.rb

@@ -109,6 +109,8 @@ class Month
     date
   end
 
+  def weekdays; (first_weekday..last_weekday).to_a; end
+
   def first_weekday
     d = first_day
     Weekday.civil_or_newer(d.year, d.month, d.day)

data/lib/quarter.rb

@@ -40,8 +40,8 @@ class Quarter
   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 weekdays; (first_weekday..last_weekday).to_a; end
 
   def first_weekday; first_month.first_weekday; end
-  def last_weekday; last_weekday.last_weekday; end
+  def last_weekday; last_month.last_weekday; end
 end

data/lib/year.rb

@@ -35,7 +35,7 @@ class Year
   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 weekdays; (first_weekday..last_weekday).to_a; end
 
   def first_weekday; first_month.first_weekday; end
   def last_weekday; last_month.last_weekday; end

data/test/month_test.rb

@@ -110,7 +110,7 @@ class MonthTest < Test::Unit::TestCase
   end
 
 
-  context "new" do
+  context "#new from date" do
     setup do 
       @d = Date.new(2009,2,1)
       @m = Month.new(@d)
@@ -123,23 +123,19 @@ class MonthTest < Test::Unit::TestCase
   end
 
 
-  context "new" do
+  context "#new" do
     setup { @m = Month.new(2009,2)}
     
-    should "have correct flag" do
+    should "assign year, month" do
       assert_equal @m.year, 2009
       assert_equal @m.month, 2    
-    end    
-  end
-  
-  context "new" do
-    setup { @m = Month.new("2009","02")}
+    end
+    
+    should "#weekdays have first and last_weekdays" do
+      assert_equal @m.first_weekday, @m.weekdays.first
+      assert_equal @m.last_weekday, @m.weekdays.last
+    end
     
-    should "initialize" do
-      assert_equal @m.year, 2009
-      assert_equal @m.month, 2    
-    end    
   end
   
-  
 end

data/test/quarter_test.rb

@@ -15,9 +15,15 @@ class QuarterTest < Test::Unit::TestCase
     should "have 2009-01-01 as first_date" do
       assert_equal Date.new(2009,1,1), @quarter.first_date
     end
+    should "have 2009-01-01 as first_weekday" do
+      assert_equal Date.new(2009,1,1), @quarter.first_weekday
+    end
     should "have 2009-12-31 as last_date" do
       assert_equal Date.new(2009,3,31), @quarter.last_date
     end
+    should "have 2009-12-31 as last_weekday" do
+      assert_equal Date.new(2009,3,31), @quarter.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.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - hasclass