koyomi 0.0.1 → 0.0.2

data/lib/koyomi.rb

@@ -6,6 +6,7 @@ require "koyomi/version"
 require "koyomi/period"
 require "koyomi/month"
 require "koyomi/calendar"
+require "koyomi/helper"
 
 module Koyomi
 end

data/lib/koyomi/calendar.rb

@@ -7,12 +7,22 @@ class Koyomi::Calendar < Koyomi::Period
   #--------------------#
   # constant
   DEFAULT_WEEK_START = :mon
+  WEEK_DAYS = 7
   WEEK_START_RANGE = (0..6)
   WEEK_START_STRING = [:sun, :mon, :tue, :wed, :thu, :fri, :sat]
   
   #--------------------#
   # class methods
   
+  # create Koyomi::Calendar instance from date.
+  #
+  # @param  [Date]  date
+  # @param  [Object]  week_start
+  # @return [Koyomi::Calendar]
+  def self.of(date, week_start = nil)
+    self.new(date.year, date.month, week_start)
+  end
+  
   # week index
   #
   # @param  [Object]  value
@@ -112,7 +122,7 @@ class Koyomi::Calendar < Koyomi::Period
   def week_starts(date, week_start = nil)
     week_start ||= self.week_start
     diff = date.wday - self.class.windex(week_start)
-    date - diff - (diff < 0 ? 7 : 0)
+    date - diff - (diff < 0 ? WEEK_DAYS : 0)
   end
   
   # week end date
@@ -121,6 +131,6 @@ class Koyomi::Calendar < Koyomi::Period
   # @param  [Object]  week_start
   # @return [Date]
   def week_ends(date, week_start = nil)
-    week_starts(date, week_start) + 6
+    week_starts(date, week_start) + WEEK_DAYS - 1
   end
 end

data/lib/koyomi/helper.rb

@@ -0,0 +1,8 @@
+# encoding: utf-8
+
+require "koyomi/helper/init"
+require "koyomi/helper/date"
+
+module Koyomi::Helper
+end
+

data/lib/koyomi/helper/date.rb

@@ -0,0 +1,30 @@
+# encoding: utf-8
+
+require "date"
+require "koyomi/calendar"
+
+module Koyomi::Helper::Date
+  # check week end?
+  #
+  # @param  [Date]  date
+  # @param  [Object]  week_start
+  # @return [Boolean]
+  def week_ends?(date, week_start = nil)
+    wdays = Koyomi::Calendar::WEEK_DAYS
+    week_start ||= Koyomi::Calendar::DEFAULT_WEEK_START
+    week_ends = (Koyomi::Calendar.windex(week_start) + wdays - 1) % wdays
+    date.wday == week_ends
+  end
+end
+
+class Date
+  include Koyomi::Helper::Date
+  
+  # check week end?
+  #
+  # @param  [Object]  week_start
+  # @return [Boolean]
+  def week_end?(week_start = nil)
+    week_ends?(self, week_start)
+  end
+end

data/lib/koyomi/helper/init.rb

@@ -0,0 +1,5 @@
+# encoding: utf-8
+
+# define module
+module Koyomi::Helper
+end

data/lib/koyomi/version.rb

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

data/test/units.rb

@@ -2,3 +2,4 @@
 
 require File.expand_path("../units/test_month", __FILE__)
 require File.expand_path("../units/test_calendar", __FILE__)
+require File.expand_path("../units/test_date", __FILE__)

data/test/units/test_date.rb

@@ -0,0 +1,25 @@
+# encoding: utf-8
+
+class TestKoyomiDate < Test::Unit::TestCase
+  context "Koyomi::Date" do
+    setup do
+      @date = Date.new(2012, 12, 16)
+      @wdays = Koyomi::Calendar::WEEK_START_STRING
+    end # setup
+    
+    should "correct week end" do
+      cal = Koyomi::Calendar.of(@date)
+      
+      cal.each do |date|
+        @wdays.each do |wd|
+          if (date + 1).wday == @wdays.index(wd)
+            assert(date.week_end?(wd))
+          else
+            assert(!date.week_end?(wd))
+          end
+        end # each wd
+      end # each date
+    end # should "correct week end"
+    
+  end # context "Koyomi::Date"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: koyomi
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -42,6 +42,9 @@ files:
 - koyomi.gemspec
 - lib/koyomi.rb
 - lib/koyomi/calendar.rb
+- lib/koyomi/helper.rb
+- lib/koyomi/helper/date.rb
+- lib/koyomi/helper/init.rb
 - lib/koyomi/init.rb
 - lib/koyomi/month.rb
 - lib/koyomi/period.rb
@@ -49,6 +52,7 @@ files:
 - test/init.rb
 - test/units.rb
 - test/units/test_calendar.rb
+- test/units/test_date.rb
 - test/units/test_month.rb
 homepage: ''
 licenses: []
@@ -78,5 +82,6 @@ test_files:
 - test/init.rb
 - test/units.rb
 - test/units/test_calendar.rb
+- test/units/test_date.rb
 - test/units/test_month.rb
 has_rdoc: