koyomi 0.0.3 → 0.0.4

data/README.md

@@ -19,19 +19,36 @@ Or install it yourself as:
 ## Usage
 
 Handling calendar by this gem.
+(japanese) カレンダーを取り扱うための gem です。
 
 	require "koyomi"
 	cal = Koyomi::Calendar.new(2012, 12, :mon)
 	cal.first.to_s # => "2012-11-26"
 	
+	cal.first.week_end? # => false
+	cal.first.week_end?(:tue) # => true
+	
 	month = cal.the_month
 	month.first.to_s # => "2012-12-01"
 	
 	week = Koyomi::Week.new(month.first, :tue)
 	week.first.to_s # => "2012-11-27"
 	
-	cal.first.week_end? # => false
-	cal.first.week_end?(:tue) # => true
+	# weeks and week days.
+	
+	# nth week day.
+	cal.nth_wday(1, :sat).to_s # => "2012-12-01"
+	
+	# cycle: 1st, 3rd week's tuesday or friday.
+	# (japanese) 周期：第１、第３の火曜と金曜
+	cal.cycles([1, 3], [:tue, :fri]).collect { |d| d.to_s }
+	# => ["2012-12-04", "2012-12-07", "2012-12-18", "2012-12-21"]
+	
+	# cycle: every montday.
+	# (japanese) 周期：毎週月曜
+	cal.cycles(:every, [:mon]).collect { |d| d.to_s }
+	# => ["2012-12-03", "2012-12-10", "2012-12-17", "2012-12-24", "2012-12-31"]
+	
 
 ## Contributing
 

data/lib/koyomi/calendar.rb

@@ -70,6 +70,53 @@ class Koyomi::Calendar < Koyomi::Period
     self.koyomi_month
   end
   
+  # weeks of the calendar.
+  #
+  # @return [Array<Week>]
+  def weeks
+    a_date = self.first
+    the_last = self.last
+    weeks = []
+    
+    while (a_date < the_last)
+      weeks << Koyomi::Week.new(a_date, self.week_start)
+      a_date += WEEK_DAYS
+    end
+    weeks
+  end
+  
+  # week day of nth week.
+  #
+  # @param  [Integer] nth
+  # @param  [Object]  wday_name
+  # @return [Date]
+  def nth_wday(nth, wday_name)
+    self.koyomi_month.nth_wday(nth, wday_name)
+  end
+  
+  # week days
+  #
+  # @param  [Object]  wday_name
+  # @return [Array<Date>]
+  def wdays(wday_name)
+    _wdays = []
+    a_date = self.nth_wday(1, wday_name)
+    while ((a_date.month == self.month))
+      _wdays << a_date
+      a_date += WEEK_DAYS
+    end
+    _wdays
+  end
+  
+  # cycle dates
+  #
+  # @param  [Array<Integer>|Integer]  weeks
+  # @param  [Array<Object>|Object]  wdays
+  # @return [Array<Date>]
+  def cycles(weeks, wdays)
+    self.koyomi_month.cycles(weeks, wdays)
+  end
+  
   #--------------------#
   protected
   

data/lib/koyomi/month.rb

@@ -44,6 +44,32 @@ class Koyomi::Month < Koyomi::Period
     self.class.of(self.first - 1)
   end
   
+  # week days of nth weeks.
+  #
+  # @param  [Integer|Array<Integer>] nth
+  # @param  [Object|Array<Object>]  wday_name
+  # @return [Array<Date>]
+  def cycles(weeks, wdays)
+    _dates = []
+    cycle_weeks_filter(weeks).each do |n|
+      [wdays].flatten.each do |w|
+        a_date = self.nth_wday(n, w)
+        _dates << a_date if a_date.month == self.month
+      end
+    end
+    _dates.sort
+  end
+  
+  # week day of nth week.
+  #
+  # @param  [Integer] nth
+  # @param  [Object]  wday_name
+  # @return [Date]
+  def nth_wday(nth, wday_name)
+    a_date = Date.new(self.year, self.month, 1) + ((nth - 1) * Koyomi::Week::DAYS)
+    Koyomi::Week.new(a_date, a_date.wday).wday(wday_name)
+  end
+  
   #--------------------#
   protected
   
@@ -66,6 +92,20 @@ class Koyomi::Month < Koyomi::Period
   #--------------------#
   private
   
+  # filter cycle weeks
+  #
+  # @param  [Object]  weeks
+  # @return [Array|Range]
+  def cycle_weeks_filter(weeks)
+    case
+    when weeks.to_s =~ /every/
+      _weeks = (1..max_week)
+    else
+      _weeks = [weeks].flatten
+    end
+    _weeks
+  end
+  
   # a date next month of the date
   #
   # @param  [Date]  date
@@ -82,4 +122,13 @@ class Koyomi::Month < Koyomi::Period
     a_date = a_date_next_month(date)
     Date.new(a_date.year, a_date.month, 1)
   end
+  
+  # maximumn of weeks
+  #
+  # @return [Integer]
+  def max_week
+    _weeks = (self.last.day / Koyomi::Week::DAYS).to_i
+    _fraction = (self.last.day % Koyomi::Week::DAYS)
+    (_weeks + (_fraction == 0 ? 0 : 1))
+  end
 end

data/lib/koyomi/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Koyomi
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/units/test_calendar.rb

@@ -11,7 +11,7 @@ class TestKoyomiCalendar < Test::Unit::TestCase
     should "have koyomi month" do
       assert(@calendar.koyomi_month.is_a?(Koyomi::Month))
       assert(@calendar.the_month.is_a?(Koyomi::Month))
-    end
+    end # should "have koyomi month"
     
     should "have week start" do
       assert(@calendar.week_start.is_a?(Numeric))
@@ -25,7 +25,7 @@ class TestKoyomiCalendar < Test::Unit::TestCase
       assert_raise(RuntimeError) do
         @calendar.week_start = 7
       end
-    end
+    end # should "have week start"
     
     context "handle correct week" do
       setup do
@@ -75,6 +75,40 @@ class TestKoyomiCalendar < Test::Unit::TestCase
       end
       
     end # context "handle correct week"
-     
+    
+    context "week methods" do
+      
+      setup do
+        @cal = Koyomi::Calendar.new(2012, 12, :mon)
+      end
+      
+      should "have weeks" do
+        assert_equal(6, @cal.weeks.size)
+        
+        cal = Koyomi::Calendar.new(2012, 12, :tue)
+        assert_equal(5, cal.weeks.size)
+      end # should "have weeks"
+    
+      should "respond to nth_wday" do
+        assert_equal(Date.new(2012, 12, 1), @cal.nth_wday(1, :sat))
+      end # should "respond to nth_wday"
+      
+      should "respond to wdays" do
+        assert_equal(5, @cal.wdays(:sat).size)
+        assert_equal(4, @cal.wdays(:fri).size)
+      end # should "respond to wdays"
+      
+      should "respond to cycles" do
+        dates = @cal.cycles([1, 3], [:tue, :fri])
+        
+        assert_equal(4, dates.size)
+        
+        dates.each do |date|
+          assert((date.wday_name == :tue) || (date.wday_name == :fri))
+        end
+      end # should "respond to cycles"
+      
+    end # context "week day methods"
+    
   end # context "Koyomi::Calendar"
 end

data/test/units/test_month.rb

@@ -21,5 +21,22 @@ class TestKoyomiMonth < Test::Unit::TestCase
       assert(@month.prev.is_a?(Koyomi::Month))
     end
     
+    should "respond to nth_wday" do
+      month = Koyomi::Month.new(12, 2012)
+      assert_equal(Date.new(2012, 12, 1), month.nth_wday(1, :sat))
+    end
+    
+    should "respond to cycles" do
+      month = Koyomi::Month.new(12, 2012)
+      
+      assert_equal(4, month.cycles([1,3], [:tue, :fri]).size)
+      
+      dates = month.cycles(:every, [:mon, :thu])
+      assert_equal(9, dates.size)
+      
+      dates = month.cycles(:every, [:mon, :sun])
+      assert_equal(10, dates.size)
+    end
+    
   end # context "Koyomi::Month"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: koyomi
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-23 00:00:00.000000000 Z
+date: 2012-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda