koyomi 0.0.4.1 → 0.0.5

data/README.md

@@ -38,16 +38,42 @@ Handling calendar by this gem.
 	# weeks and week days.
 	
 	# nth week day.
-	cal.nth_wday(1, :sat).to_s # => "2012-12-01"
+	#
+	# Version 0.0.5 or later, NOT compatible version 0.0.4.x.
+	# To get version 0.0.4 compatible result, use Koyomi::Month#nth_wday.
+	#
+	# (japanese)
+	# バージョン 0.0.5 以上では、バージョン 0.0.4.x と互換性がありません。
+	# 以前のバージョンと同様の結果を得るためには、 Koyomi::Month#nth_wday メソッドを利用して下さい。
+	# 
+	cal.nth_wday(1, :sat).to_s
+	# => "2012-12-01"
+	cal.nth_wday(1, :tue).to_s
+	# => "2012-11-27"
+	cal.the_month.nth_wday(1, :tue).to_s
+	# => "2012-12-04"
 	
 	# cycle: every monday.
 	# (japanese) 周期：毎週月曜
 	cal.cycles(:every, :mon).collect { |d| d.to_s }
+	# => ["2012-11-26", "2012-12-03", "2012-12-10", "2012-12-17", "2012-12-24", "2012-12-31"]
+	#
+	# Version 0.0.5 or later, NOT compatible version 0.0.4.x.
+	# To get version 0.0.4 compatible result, use Koyomi::Month#cycles.
+	#
+	# (japanese)
+	# バージョン 0.0.5 以上では、バージョン 0.0.4.x と互換性がありません。
+	# 以前のバージョンと同様の結果を得るためには、 Koyomi::Month#cycles メソッドを利用して下さい。
+	# 
+	cal.the_month.cycles(:every, :mon).collect { |d| d.to_s }
 	# => ["2012-12-03", "2012-12-10", "2012-12-17", "2012-12-24", "2012-12-31"]
 	
 	# cycle: 1st, 3rd week's tuesday or friday.
 	# (japanese) 周期：第１、第３の火曜と金曜
+	# 
 	cal.cycles([1, 3], [:tue, :fri]).collect { |d| d.to_s }
+	# => ["2012-11-27", "2012-11-30", "2012-12-11", "2012-12-14"]
+	cal.the_month.cycles([1, 3], [:tue, :fri]).collect { |d| d.to_s }
 	# => ["2012-12-04", "2012-12-07", "2012-12-18", "2012-12-21"]
 	
 

data/lib/koyomi/calendar.rb

@@ -18,9 +18,10 @@ class Koyomi::Calendar < Koyomi::Period
   
   #--------------------#
   # instance methods
-  attr_reader :year, :month, :koyomi_month
   attr_accessor :week_start
-  
+  attr_reader :year, :month, :koyomi_month
+  attr_reader :weeks
+    
   # initialize instance
   #
   # @param  [Integer] year optional, use instance create date.
@@ -30,16 +31,16 @@ class Koyomi::Calendar < Koyomi::Period
     super()
     self.year = year||self.created_at.year
     self.month = month||self.created_at.month
-    self.week_start = week_start||DEFAULT_WEEK_START
-    
     self.koyomi_month = Koyomi::Month.new(self.month, self.year)
+    self.week_start = week_start||DEFAULT_WEEK_START
   end
   
   # set week_start
   #
   # @param  [Object]  value
   def week_start=(value)
-    @week_start = self.class.windex(value)
+    self.setup_week_start(value)
+    @week_start
   end
   
   # first date of the calendar (NOT first date of the MONTH)
@@ -70,28 +71,13 @@ 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)
+    self.weeks[nth - 1].wday(wday_name)
   end
   
   # week days
@@ -99,13 +85,7 @@ class Koyomi::Calendar < Koyomi::Period
   # @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
+    self.weeks.collect { |w| w.wday(wday_name) }
   end
   
   # cycle dates
@@ -114,11 +94,56 @@ class Koyomi::Calendar < Koyomi::Period
   # @param  [Array<Object>|Object]  wdays
   # @return [Array<Date>]
   def cycles(weeks, wdays)
-    self.koyomi_month.cycles(weeks, wdays)
+    _dates = []
+    cycle_weeks_filter(weeks).each do |n|
+      [wdays].flatten.each do |w|
+        _dates << self.nth_wday(n, w)
+      end
+    end
+    _dates.sort
   end
   
   #--------------------#
   protected
   
   attr_writer :year, :month, :koyomi_month
-end
+  
+  # setup week start
+  #
+  # @param  [Object]  value
+  def setup_week_start(value)
+    @week_start = self.class.windex(value)
+    self.setup_weeks(@week_start)
+  end
+  
+  # setup weeks of the calendar.
+  #
+  # @return [Array<Week>]
+  def setup_weeks(week_start)
+    a_date = self.first
+    the_last = self.last
+    @weeks = []
+    
+    while (a_date < the_last)
+      @weeks << Koyomi::Week.new(a_date, week_start)
+      a_date += WEEK_DAYS
+    end
+    @weeks
+  end
+  
+  #--------------------#
+  private
+  
+  # cycle weeks filter
+  #
+  # @param  [Object]  weeks
+  # @return [Iterator]  Array or Range
+  def cycle_weeks_filter(weeks)
+    case
+    when weeks.to_s =~ /every/
+      (1..self.weeks.size)
+    else
+      [weeks].flatten
+    end
+  end
+end

data/lib/koyomi/helper/date.rb

@@ -15,6 +15,14 @@ class Date
     self.class.week_ends?(self, week_start)
   end
   
+  # check week start?
+  #
+  # @param  [Object]  week_start
+  # @return [Boolean]
+  def week_start?(week_start = nil)
+    self.class.week_starts?(self, week_start)
+  end
+  
   # week day index
   #
   # @return [Integer]
@@ -28,4 +36,32 @@ class Date
   def wday_name
     self.class.wday_name(self)
   end
+  
+  # nth week day of the month
+  #
+  # @return [Integer]
+  def nth_month_week
+    _week = (self.day / WEEK_DAYS).to_i
+    _fraction = (self.day % WEEK_DAYS)
+    (_week + (_fraction == 0 ? 0 : 1))
+  end
+  
+  # nth week, week day of the month
+  #
+  # @return [Array] [<Integer>nth_month_week, <Symbol>wday_name]
+  def nth_wday
+    [self.nth_month_week, self.wday_name]
+  end
+  
+  # monthly information
+  #
+  # @return [Hash]
+  def month_info
+    _info = {}
+    _infos = self.nth_wday.dup
+    _info[:nth] = _infos.shift
+    _info[:wday] = _infos.shift
+    
+    _info
+  end
 end

data/lib/koyomi/helper/week.rb

@@ -40,5 +40,14 @@ module Koyomi::Helper::Week
     def week_ends?(date, week_start = nil)
       Koyomi::Week.ends?(date, week_start)
     end
+    
+    # week start?
+    #
+    # @param  [Date]  date
+    # @param  [Object]  week_start  week start
+    # @return [Boolean]
+    def week_starts?(date, week_start = nil)
+      Koyomi::Week.starts?(date, week_start)
+    end
   end
 end

data/lib/koyomi/month.rb

@@ -70,6 +70,22 @@ class Koyomi::Month < Koyomi::Period
     Koyomi::Week.new(a_date, a_date.wday).wday(wday_name)
   end
   
+  
+  # week days
+  #
+  # @param  [Object]  wday_name
+  # @return [Array<Date>]
+  def wdays(wday_name)
+    _dates = []
+    a_date = self.nth_wday(1, wday_name)
+    
+    while (a_date.month == self.month)
+      _dates << a_date
+      a_date += Koyomi::Week::DAYS
+    end
+    _dates.sort
+  end
+  
   #--------------------#
   protected
   

data/lib/koyomi/version.rb

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

data/test/units/test_calendar.rb

@@ -90,22 +90,46 @@ class TestKoyomiCalendar < Test::Unit::TestCase
       end # should "have weeks"
     
       should "respond to nth_wday" do
-        assert_equal(Date.new(2012, 12, 1), @cal.nth_wday(1, :sat))
+        assert_equal(Date.new(2012,12,1), @cal.nth_wday(1, :sat))
+        
+        # version 0.0.5 or later
+        assert_equal(Date.new(2012,11,27), @cal.nth_wday(1, :tue))
       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)
+        # version 0.0.4.x
+        #assert_equal(5, @cal.wdays(:sat).size)
+        #assert_equal(4, @cal.wdays(:fri).size)
+        
+        # version 0.0.5 or later
+        assert_equal(6, @cal.wdays(:sat).size)
+        assert_equal(6, @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
+        
+        # version 0.0.5 or later
+        dates = @cal.cycles(:every, [:tue, :fri])
+        assert_equal(12, dates.size)
+        
+        dates.each do |date|
+          assert((date.wday_name == :tue) || (date.wday_name == :fri))
+        end
+        
+        @cal.week_start = :tue
+        dates = @cal.cycles(:every, [:tue, :fri])
+        assert_equal(10, 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"

data/test/units/test_date.rb

@@ -9,7 +9,7 @@ class TestKoyomiDate < Test::Unit::TestCase
       @wdays = Date::WEEK_WDAYS
     end # setup
     
-    should "correct week end" do
+    should "correct week start, end" do
       cal = Koyomi::Calendar.of(@date)
       
       cal.each do |date|
@@ -19,9 +19,24 @@ class TestKoyomiDate < Test::Unit::TestCase
           else
             assert(!date.week_end?(wd))
           end
+          
+          if (date).wday == @wdays.index(wd)
+            assert(date.week_start?(wd))
+          else
+            assert(!date.week_start?(wd))
+          end
         end # each wd
       end # each date
     end # should "correct week end"
     
+    should "respond to nth_wday" do
+      assert_equal(3, @date.nth_month_week)
+    end # should "respond to nth_wday"
+    
+    should "respond to info" do
+      assert_equal(3, @date.month_info[:nth])
+      assert_equal(:sun, @date.month_info[:wday])
+    end
+    
   end # context "Koyomi::Date"
 end

data/test/units/test_month.rb

@@ -26,6 +26,12 @@ class TestKoyomiMonth < Test::Unit::TestCase
       assert_equal(Date.new(2012, 12, 1), month.nth_wday(1, :sat))
     end
     
+    should "respond to wdays" do
+      month = Koyomi::Month.new(12, 2012)
+      assert_equal(5, @month.wdays(:sat).size)
+      assert_equal(4, @month.wdays(:fri).size)
+    end # should "respond to wdays"
+    
     should "respond to cycles" do
       month = Koyomi::Month.new(12, 2012)
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: koyomi
 version: !ruby/object:Gem::Version
-  version: 0.0.4.1
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors: