koyomi 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9fae146cc8b22c7813777006c1c558509aa3761
-  data.tar.gz: 1294496c32deba891b31dbe5334e44fb2db1db2f
+  metadata.gz: 2424c6cda5e48fb64ecee69b6fb8b292b0a13e3a
+  data.tar.gz: b21e94aff1c9fe720a79ce9bd7bd076d679749d3
 SHA512:
-  metadata.gz: 31eb8318ced1c68908e02837c9ca867ec673f8daa785f60b287f97d963edcfa285866c05c5f128c6456a50be968c6bd91387fb16609b3e5e67509c0cb010eb86
-  data.tar.gz: 3672260d0178567dd8b173e6dffc005fb769edd8d567567dafe676e8b4c445a771d79bcd91ddd2796ad3a005978123e018ef6081418943b60a97bef60305c45c
+  metadata.gz: da9ef2356634f30e02edd0794a6e12d0a3ca0c762611a2a4aae879755f85849a57141c3e53def14b6293289cd6ddc112b3bad36aa68e5f4c8a81860f9c14f389
+  data.tar.gz: a90d16687d127b8182c082859e8ad78e30c5c97227a80de6d03bf7ca93ba69e15b886c4ceae56b3682129db01a9f6b168230e1e2955085289a85c942c88e6526

data/.rspec

@@ -1,2 +1,3 @@
 --color
 --require spec_helper
+# --format documentation

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## 0.2.0 (2015-11-26)
+  * lib/koyomi/year.rb: Add Koyomi::Year class to treat years.
+  * lib/koyomi/month_cycle.rb: Add Koyomi::MonthCycle class to treat
+    cycles in month.
+  * lib/koyomi/wrong_range_error.rb: Added to raise error
+    outside of the month.
+  * lib/koyomi/month.rb: Changed to raise Koyomi::WrongRangeError
+    when specified date not within the month.
+
 ## 0.1.0 (2015-11-15)
 
   * use rspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    koyomi (0.1.1)
+    koyomi (0.2.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/koyomi.rb

@@ -1,13 +1,19 @@
 # encoding: utf-8
 
 require "koyomi/init"
-require "koyomi/version"
-
-require "koyomi/period"
-require "koyomi/month"
-require "koyomi/week"
-require "koyomi/calendar"
-require "koyomi/helper"
 
 module Koyomi
+  def self.year(year)
+    Koyomi::Year.new(year)
+  end
+
+  private
+
+  def self.method_missing(name, *args, &block)
+    if "#{name}".match(/^_[0-9]+$/)
+        self.year("#{name}".sub(/_/, "").to_i)
+    else
+      super
+    end
+  end
 end

data/lib/koyomi/calendar.rb

@@ -6,7 +6,7 @@ require "koyomi/helper/week"
 
 class Koyomi::Calendar < Koyomi::Period
   include Koyomi::Helper::Week
-  
+
   # create Koyomi::Calendar instance from date.
   #
   # @param  [Date]  date
@@ -15,26 +15,26 @@ class Koyomi::Calendar < Koyomi::Period
   def self.of(date, week_start = nil)
     self.new(date.year, date.month, week_start)
   end
-  
+
   #--------------------#
   # instance methods
   attr_accessor :week_start
   attr_reader :year, :month, :koyomi_month
   attr_reader :weeks
-    
+
   # initialize instance
   #
   # @param  [Integer] year optional, use instance create date.
   # @param  [Integer] month optional, use instance create date.
   # @param  [Object] week_start weekday which week starts with. optional, use DEFAULT_WEEK_START.
-  def initialize(year = nil, month = nil, week_start = nil)
+  def initialize(year = nil, month = nil, week_start = Koyomi::Week::DEFAULT_START)
     super()
     self.year = year||self.created_at.year
     self.month = month||self.created_at.month
     self.koyomi_month = Koyomi::Month.new(self.month, self.year)
-    self.week_start = week_start||DEFAULT_WEEK_START
+    self.week_start = week_start
   end
-  
+
   # set week_start
   #
   # @param  [Object]  value
@@ -42,44 +42,45 @@ class Koyomi::Calendar < Koyomi::Period
     self.setup_week_start(value)
     @week_start
   end
-  
+
   # first date of the calendar (NOT first date of the MONTH)
   #
   # @return [Date]
   def first
     Koyomi::Week.new(self.koyomi_month.first, self.week_start).first
   end
-  
+
   # last date of the calendar (NOT last date of the MONTH)
   #
   # @return [Date]
   def last
     Koyomi::Week.new(self.koyomi_month.last, self.week_start).last
   end
-  
+
   # range of the calendar.
   #
   # @return [Range]
   def range
     Range.new(self.first, self.last)
   end
-  
+
   # Koyomi::Month of the calendar's month.
   #
   # @return [Koyomi::Month]
   def the_month
     self.koyomi_month
   end
-  
+
   # week day of nth week.
   #
   # @param  [Integer] nth
   # @param  [Object]  wday_name
   # @return [Date]
   def nth_wday(nth, wday_name)
+    raise Koyomi::WrongRangeError if nth > weeks.size
     self.weeks[nth - 1].wday(wday_name)
   end
-  
+
   # week days
   #
   # @param  [Object]  wday_name
@@ -87,7 +88,7 @@ class Koyomi::Calendar < Koyomi::Period
   def wdays(wday_name)
     self.weeks.collect { |w| w.wday(wday_name) }
   end
-  
+
   # cycle dates
   #
   # @param  [Array<Integer>|Integer]  weeks
@@ -102,12 +103,12 @@ class Koyomi::Calendar < Koyomi::Period
     end
     _dates.sort
   end
-  
+
   #--------------------#
   protected
-  
+
   attr_writer :year, :month, :koyomi_month
-  
+
   # setup week start
   #
   # @param  [Object]  value
@@ -115,7 +116,7 @@ class Koyomi::Calendar < Koyomi::Period
     @week_start = self.class.windex(value)
     self.setup_weeks(@week_start)
   end
-  
+
   # setup weeks of the calendar.
   #
   # @return [Array<Week>]
@@ -123,17 +124,17 @@ class Koyomi::Calendar < Koyomi::Period
     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

data/lib/koyomi/error.rb

@@ -0,0 +1,5 @@
+dir = File.join(File.dirname(__FILE__), "error")
+
+Dir.glob(File.join(dir, "**/*.rb")).each do |f|
+  require f
+end

data/lib/koyomi/error/wrong_range_error.rb

@@ -0,0 +1,2 @@
+class Koyomi::WrongRangeError < StandardError
+end

data/lib/koyomi/init.rb

@@ -6,3 +6,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 # Define base module
 module Koyomi
 end
+
+Dir.glob(File.join(lib, "**/*.rb")).each do |f|
+  require f
+end

data/lib/koyomi/month.rb

@@ -3,10 +3,10 @@
 require "koyomi/period"
 
 class Koyomi::Month < Koyomi::Period
-  
+
   #--------------------#
   # class methods
-  
+
   # create instance from date
   #
   # @param  [Date]  date
@@ -14,36 +14,55 @@ class Koyomi::Month < Koyomi::Period
   def self.of(date)
     self.new(date.month, date.year)
   end
-  
+
   #--------------------#
   # instance methods
-  
+
   attr_reader :year, :month
   attr_reader :first, :last
-  
+
   # initialize instance.
   #
   # @param  [Integer] month optional, default use the month of instance created.
   # @param  [Integer] year  optional, default use the year of instance created.
   def initialize(month = nil, year = nil)
     super()
-    self.range = self.initialize_range(month, year) 
+    @year   = year||self.created_at.year
+    @month  = month||self.created_at.month
+    @first  = Date.new(self.year, self.month, 1)
+    @last   = (first_date_of_next_month - 1)
+    @range  = Range.new(self.first, self.last)
   end
-  
+
   # next month
   #
   # @return [Koyomi::Month]
   def next
     self.class.of(self.last + 1)
   end
-  
+
   # previous month
   #
   # @return [Koyomi::Month]
   def prev
     self.class.of(self.first - 1)
   end
-  
+
+  # Create Koyomi::Calendar
+  #
+  # @param  [Object]  week_start
+  # @return [Koyomi::Calendar]
+  def calendar(week_start = Koyomi::Week::DEFAULT_START)
+    Koyomi::Calendar.new(year, month, week_start)
+  end
+
+  # Create Koyomi::MonthCycle
+  #
+  # @return [Koyomi::Cycle]
+  def cycle
+    Koyomi::MonthCycle.new(self)
+  end
+
   # week days of nth weeks.
   #
   # @param  [Integer|Array<Integer>] nth
@@ -53,24 +72,45 @@ class Koyomi::Month < Koyomi::Period
     _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
+        begin
+          a_date = self.nth_wday!(n, w)
+        rescue Koyomi::WrongRangeError => e
+          next
+        else
+          _dates << a_date
+        end
       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)
+    case "#{nth}"
+    when /first/
+      calc_nth_wday(1, wday_name)
+    when /last/
+      self.next.nth_wday(1, wday_name) - Koyomi::Week::DAYS
+    else
+      calc_nth_wday(nth, wday_name)
+    end
+  end
+
+  # week day of nth week.
+  #
+  # @param  [Integer] nth
+  # @param  [Object]  wday_name
+  # @return [Date]
+  def nth_wday!(nth, wday_name)
+    date = nth_wday(nth, wday_name)
+    raise Koyomi::WrongRangeError if date.month != self.month
+    date
   end
-  
-  
+
   # week days
   #
   # @param  [Object]  wday_name
@@ -78,36 +118,38 @@ class Koyomi::Month < Koyomi::Period
   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
-  
-  attr_writer :year, :month
-  attr_writer :first, :last
-  
-  # initialize range
+
+  # date
   #
-  # @param  [Integer] month optional, default use the month of instance created.
-  # @param  [Integer] year  optional, default use the year of instance created.
-  # @return [Range]
-  def initialize_range(month = nil, year = nil)
-    self.year = year||self.created_at.year
-    self.month = month||self.created_at.month
-    self.first = Date.new(self.year, self.month, 1)
-    self.last = (first_date_next_month(self.first) - 1)
-    Range.new(self.first, self.last)
-  end
-  
+  # @param [Integer] days
+  # @return [Date]
+  def date(day)
+    begin
+      date!(day)
+    rescue ArgumentError => e
+      raise Koyomi::WrongRangeError
+    end
+  end
+
+  # date
+  #   don't catch exceptions
+  #
+  # @param [Integer] days
+  # @return [Date]
+  def date!(day)
+    Date.new(self.year, self.month, "#{day}".to_i)
+  end
+
   #--------------------#
   private
-  
+
   # filter cycle weeks
   #
   # @param  [Object]  weeks
@@ -121,24 +163,24 @@ class Koyomi::Month < Koyomi::Period
     end
     _weeks
   end
-  
+
   # a date next month of the date
   #
   # @param  [Date]  date
   # @return [Date]
-  def a_date_next_month(date)
-    Date.new(date.year, date.month, 1) + 32
+  def a_date_of_next_month
+    self.first + 32
   end
-  
+
   # first date of next month
   #
   # @param  [Date]  date
   # @return [Date]
-  def first_date_next_month(date)
-    a_date = a_date_next_month(date)
+  def first_date_of_next_month
+    a_date = a_date_of_next_month
     Date.new(a_date.year, a_date.month, 1)
   end
-  
+
   # maximumn of weeks
   #
   # @return [Integer]
@@ -147,4 +189,13 @@ class Koyomi::Month < Koyomi::Period
     _fraction = (self.last.day % Koyomi::Week::DAYS)
     (_weeks + (_fraction == 0 ? 0 : 1))
   end
-end
+
+  def calc_nth_wday(nth, wday_name)
+    a_date = self.first + ((nth - 1) * Koyomi::Week::DAYS)
+    Koyomi::Week.new(a_date, a_date.wday).wday(wday_name)
+  end
+
+  def method_missing(name, *args, &block)
+    date("#{name}".sub(/^_/, "")) if "#{name}".match(/^_[0-9]+$/)
+  end
+end

data/lib/koyomi/month_cycle.rb

@@ -0,0 +1,35 @@
+require "koyomi/month"
+
+class Koyomi::MonthCycle
+  attr_reader :koyomi_month
+  attr_reader :dates
+
+  def initialize(koyomi_month)
+    super()
+    @koyomi_month = koyomi_month
+    @dates = []
+  end
+
+  def add(*args)
+
+    while arg = args.shift
+      case arg
+      when Date
+        raise Koyomi::WrongRangeError unless koyomi_month.range.include?(arg)
+        @dates << arg
+      else
+        #_args = [arg]
+        #_args << args.shift
+        @dates += koyomi_month.cycles(*arg)
+      end
+    end
+    uniq_and_sort
+    self
+  end
+
+  private
+
+  def uniq_and_sort
+    @dates = @dates.uniq.sort
+  end
+end

data/lib/koyomi/version.rb

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

data/lib/koyomi/week.rb

@@ -5,18 +5,18 @@ require "koyomi/period"
 class Koyomi::Week < Koyomi::Period
   #--------------------#
   # constants
-  
+
   DEFAULT_START = :mon
   WDAYS = [:sun, :mon, :tue, :wed, :thu, :fri, :sat]
   DAYS = WDAYS.size
   START_RANGE = (0..(DAYS - 1))
-  
+
   #--------------------#
   # attributes
-  
+
   #--------------------#
   # class methods
-  
+
   # week index
   #
   # @param  [Object]  value
@@ -37,7 +37,7 @@ class Koyomi::Week < Koyomi::Period
     raise "Range overflow, required (#{START_RANGE})." unless START_RANGE.cover?(index)
     index
   end
-  
+
   # week day name
   #
   # @param  [Object]  value
@@ -45,40 +45,38 @@ class Koyomi::Week < Koyomi::Period
   def self.wday_name(value)
     WDAYS.at(self.windex(value))
   end
-  
+
   # week starts?
   #
   # @param  [Date]  date
   # @param  [Object]  start_wday  week start
   # @return [Boolean]
-  def self.starts?(date, start_wday = nil)
-    start_wday ||= DEFAULT_START
+  def self.starts?(date, start_wday = DEFAULT_START)
     (date).wday == self.windex(start_wday)
   end
-  
+
   # week end?
   #
   # @param  [Date]  date
   # @param  [Object]  start_wday  week start
   # @return [Boolean]
-  def self.ends?(date, start_wday = nil)
-    start_wday ||= DEFAULT_START
+  def self.ends?(date, start_wday = DEFAULT_START)
     (date + 1).wday == self.windex(start_wday)
   end
-  
+
   #--------------------#
   # instance methods
-  
+
   # initialize method
   #
   # @param  [Date]  date optional, default use Date.today.
   # @param  [Object]  start_wday  optionail, default use Koyomi::Week::DEFAULT_START
-  def initialize(date = nil, start_wday = nil)
+  def initialize(date = nil, start_wday = DEFAULT_START)
     super()
     self.date = date||self.created_at
-    self.start_wday = start_wday||DEFAULT_START
+    self.start_wday = start_wday
   end
-  
+
   # sepified week day
   #
   # @param  [Object]  wday_name
@@ -88,27 +86,27 @@ class Koyomi::Week < Koyomi::Period
     factor = diff + ((diff < 0) ? DAYS : 0)
     self.range.first + factor
   end
-  
+
   # start date
   #
   # @return [Date]  date
   def starts
     self.range.first
   end
-  
+
   # end date
   #
   # @return [Date]  date
   def ends
     self.range.last
   end
-  
+
   #--------------------#
   protected
-  
+
   attr_accessor :date
   attr_reader :start_wday
-  
+
   # set week starts
   #
   # @param  [Object]  value
@@ -117,17 +115,17 @@ class Koyomi::Week < Koyomi::Period
     self.setup_range
     @start_wday
   end
-  
+
   # setup week range with given week start
   def setup_range
     diff = self.date.wday - self.class.windex(self.start_wday)
     starts = self.date - (diff + ((diff < 0) ? DAYS : 0))
     @range = Range.new(starts, starts + DAYS - 1)
   end
-  
+
   #--------------------#
   private
-  
+
   def method_missing(name, *args, &block)
     case
     when WDAYS.include?(name.to_s.to_sym)

data/lib/koyomi/year.rb

@@ -0,0 +1,54 @@
+# encoding: utf-8
+
+require "koyomi/period"
+
+class Koyomi::Year < Koyomi::Period
+  #--------------------#
+  # class methods
+
+  # create instance from date
+  #
+  # @param  [Date]  date
+  # @return [Koyomi::Year]
+  def self.of(date = Date.today)
+    self.new(date.year)
+  end
+
+  #--------------------#
+  # instance methods
+
+  attr_reader :year
+  attr_reader :first, :last
+
+  # initialize instance.
+  #
+  # @param  [Integer] year  optional, default use the year of instance created.
+  def initialize(year = nil)
+    super()
+    @year   = year||created_at.year
+    @first  = Date.new(@year,  1,  1)
+    @last   = Date.new(@year, 12, 31)
+    @range  = (@first .. @last)
+  end
+
+  (1..12).each do |m|
+    define_method("_#{m}") do
+      Koyomi::Month.new(m, year)
+    end
+  end
+
+  def month(month)
+    Koyomi::Month.new(month, year)
+  end
+
+  def uruu?
+    begin
+      Date.new(year, 2, 29)
+    rescue ArgumentError => e
+      false
+    else
+      true
+    end
+  end
+  alias_method :leap?, :uruu?
+end

data/spec/feature/koyomi_sequence_spec.rb

@@ -0,0 +1,8 @@
+require "koyomi_helper"
+
+describe Koyomi do
+  describe "sequence" do
+    subject { described_class._2015._12._25 }
+    it { is_expected.to eq Date.new(2015, 12, 25) }
+  end
+end

data/spec/lib/koyomi/calendar_spec.rb

@@ -56,8 +56,8 @@ describe Koyomi::Calendar do
 
     describe "size" do
       subject { calendar.weeks.size }
-      let(:calendar) { described_class.new(*test_case) }
-      let(:test_case) { nil }
+      let(:calendar) { described_class.new(*given) }
+      let(:given) { nil }
 
       context "has 5 weeks" do
         # 2015-11 ~ 2015-12 start with sunday
@@ -69,7 +69,7 @@ describe Koyomi::Calendar do
         # 29 30  1  2  3  4  5
         #
         # #=> 5 weeks
-        let(:test_case) { [2015, 11, :sun] }
+        let(:given) { [2015, 11, :sun] }
         it { is_expected.to eq 5 }
       end # context "has 5 weeks"
 
@@ -84,7 +84,7 @@ describe Koyomi::Calendar do
         # 30  1  2  3  4  5  6
         #
         # #=> 6 weeks
-        let(:test_case) { [2015, 11, :mon] }
+        let(:given) { [2015, 11, :mon] }
         it { is_expected.to eq 6 }
       end # context "has 6 weeks"
     end # describe size
@@ -113,9 +113,7 @@ describe Koyomi::Calendar do
     context "range over" do
       subject { calendar.nth_wday(6, :mon) }
 
-      xit "[TODO] raise Koyomi::WrongRangeError" do
-        expect { subject }.to raise_error(NoMethodError)
-      end
+      it { expect { subject }.to raise_error(Koyomi::WrongRangeError) }
     end
   end
 
@@ -138,10 +136,10 @@ describe Koyomi::Calendar do
   end
 
   describe "#cycles" do
-    subject { calendar.cycles(*test_case) }
+    subject { calendar.cycles(*given) }
 
     context "first and third tuesday and friday" do
-      let(:test_case) { [[1, 3], [:tue, :fri]] }
+      let(:given) { [[1, 3], [:tue, :fri]] }
       it { expect(subject.size).to eq 4 }
 
       it "days has requested week day" do
@@ -152,7 +150,7 @@ describe Koyomi::Calendar do
     end # context "first and third tuesday and friday"
 
     context "every monday and friday" do
-      let(:test_case) { [:every, [:mon, :fri]] }
+      let(:given) { [:every, [:mon, :fri]] }
       let(:calendar) { described_class.new(2015, 12, :mon) }
       # 2015-11 ~ 2016-01 start with monday
       #

data/spec/lib/koyomi/month_cycle_spec.rb

@@ -0,0 +1,116 @@
+require "koyomi_helper"
+
+describe Koyomi::MonthCycle do
+  let(:month_cycle) { described_class.new(*initialized) }
+
+  describe ".new" do
+    it("initialized with Koyomi::Month") do
+      month = Koyomi::Month.new
+      expect { described_class.new(month) }.not_to raise_error
+    end
+  end
+
+  describe "#dates" do
+    subject { month_cycle.dates }
+    let(:initialized) { Koyomi::Month.new }
+    it { is_expected.to be_kind_of(Array) }
+  end
+
+  context "2015-11" do
+    let(:initialized) { Koyomi::Month.new(11, 2015) }
+    let(:action) { month_cycle.add(given) }
+
+    context "[[3, 1], :fri] given" do
+      let(:given) { [[3, 1], :fri] }
+      let(:expected) { [Date.new(2015, 11, 6), Date.new(2015, 11, 20)] }
+
+      describe "#add" do
+        subject { action }
+        it { expect { subject }.not_to raise_error }
+        it { expect { subject }.to change { month_cycle.dates.size }.from(0).to(expected.size) }
+      end
+
+      describe "#dates" do
+        subject { month_cycle.dates }
+        before { action }
+        it { is_expected.to eq expected }
+        it("sort") { expect(subject.first).to be < subject.last }
+        it("uniq") { expect(subject.size).to eq expected.size }
+      end
+    end
+
+    context "Date given" do
+      let(:given) { date }
+      let(:date) { Date.new(2015, 11, 1) }
+      let(:expected) { [date] }
+
+      describe "#add" do
+        subject { action }
+        it { expect { subject }.not_to raise_error }
+        it { expect { subject }.to change { month_cycle.dates.size }.from(0).to(expected.size) }
+      end
+
+      describe "#dates" do
+        subject { month_cycle.dates }
+        before { action }
+        it { is_expected.to eq expected }
+      end
+    end
+
+    context "invalid date given" do
+      let(:given) { date }
+      let(:date) { Date.new(2015, 12, 1) }
+      it { expect { month_cycle.add(date) }.to raise_error(Koyomi::WrongRangeError) }
+      let(:expected) { Koyomi::WrongRangeError }
+
+      describe "#add" do
+        subject { action }
+        it { expect { subject }.to raise_error(expected) }
+      end
+    end
+
+    context "add some times" do
+      let(:action) do
+        month_cycle.add(Date.new(2015, 11, 6)) # first friday
+        month_cycle.add([[1, 3], :fri]) # 2015-11-06, 2015-11-20
+        month_cycle.add(Date.new(2015, 11, 1))
+      end
+      let(:expected) { [Date.new(2015, 11,1), Date.new(2015, 11,6), Date.new(2015, 11,20)] }
+
+      describe "#add" do
+        subject { action }
+        it { expect { subject }.not_to raise_error }
+        it { expect { subject }.to change { month_cycle.dates.size }.from(0).to(expected.size) }
+      end
+
+      describe "#dates" do
+        subject { month_cycle.dates }
+        before { action }
+        it { is_expected.to eq expected }
+        it("is sorted") { expect(subject.first).to be < subject.last }
+        it("is uniqed") { expect(subject.size).to eq expected.size }
+      end
+    end
+
+    context "add sequencial" do
+      let(:action) do
+        month_cycle.add([[3, 1], :fri]).add(Date.new(2015, 11, 1))
+      end
+      let(:expected) { [Date.new(2015, 11,1), Date.new(2015, 11,6), Date.new(2015, 11,20)] }
+
+      describe "#add" do
+        subject { action }
+        it { expect { subject }.not_to raise_error }
+        it { expect { subject }.to change { month_cycle.dates.size }.from(0).to(expected.size) }
+      end
+
+      describe "#dates" do
+        subject { month_cycle.dates }
+        before { action }
+        it { is_expected.to eq expected }
+        it("is sorted") { expect(subject.first).to be < subject.last }
+        it("is uniqed") { expect(subject.size).to eq expected.size }
+      end
+    end
+  end
+end

data/spec/lib/koyomi/month_spec.rb

@@ -6,32 +6,44 @@ describe Koyomi::Month do
 
   describe "#range" do
     subject { month.range }
-
     it { is_expected.to be_kind_of(Range) }
   end
 
   describe "#month" do
     subject { month.month }
-
     it { is_expected.to eq today.month }
   end
 
   describe "#next" do
     subject { month.next }
-
     it { is_expected.to be_kind_of(described_class) }
     it { expect(subject.month).to eq ((month.first + 32).month) }
   end
 
   describe "#prev" do
     subject { month.prev }
-
     it { is_expected.to be_kind_of(described_class) }
     it { expect(subject.month).to eq ((month.first - 1).month) }
   end
 
+  describe "#nth_wday!" do
+    subject { month.nth_wday!(*given) }
+    let(:month) { described_class.new(12, 2015) }
+    # 2015-12
+    #     1  2  3  4  5  6
+    #  7  8  9 10 11 12 13
+    # 14 15 16 17 18 19 20
+    # 21 22 23 24 25 26 27
+    # 28 29 30 31
+
+    context "5th friday" do
+      let(:given) { [5, :fri] }
+      it { expect { subject }.to raise_error(Koyomi::WrongRangeError) }
+    end
+  end
+
   describe "#nth_wday" do
-    subject { month.nth_wday(*test_case) }
+    subject { month.nth_wday(*given) }
     let(:month) { described_class.new(12, 2015) }
     # 2015-12
     #     1  2  3  4  5  6
@@ -40,26 +52,30 @@ describe Koyomi::Month do
     # 21 22 23 24 25 26 27
     # 28 29 30 31
 
-    context "first saturday" do
-      let(:test_case) { [1, :sat] }
+    context "1st saturday" do
+      let(:given) { [1, :sat] }
       it { is_expected.to eq Date.new(2015, 12, 5) }
     end
 
+    context "first friday" do
+      let(:given) { [:first, :fri] }
+      it { is_expected.to eq Date.new(2015, 12, 4) }
+    end
+
     context "last saturday" do
-      let(:test_case) { [:last, :sat] }
-      xit { is_expected.to eq Date.new(2015, 12, 26) }
+      let(:given) { [:last, :sat] }
+      it { is_expected.to eq Date.new(2015, 12, 26) }
     end
 
     context "5th friday" do
-      let(:test_case) { [5, :fri] }
-      xit("[TODO] raise Koyomi::WrongRangeError") {
-        is_expected.to raise_error(Koyomi::WrongRangeError)
-      }
+      let(:given) { [5, :fri] }
+      it { expect { subject }.not_to raise_error }
+      it { is_expected.to eq Date.new(2016, 1, 1) }
     end
   end
 
   describe "#wdays" do
-    subject { month.wdays(test_case) }
+    subject { month.wdays(given) }
     let(:month) { described_class.new(12, 2015) }
     # 2015-12
     #     1  2  3  4  5  6
@@ -69,18 +85,18 @@ describe Koyomi::Month do
     # 28 29 30 31
 
     context "monday" do
-      let(:test_case) { :mon }
+      let(:given) { :mon }
       it { expect(subject.size).to eq 4 }
     end
 
     context "tuesday" do
-      let(:test_case) { :tue }
+      let(:given) { :tue }
       it { expect(subject.size).to eq 5 }
     end
   end
 
   describe "#cycles" do
-    subject { month.cycles(*test_case) }
+    subject { month.cycles(*given) }
     let(:month) { described_class.new(12, 2015) }
     # 2015-12
     #     1  2  3  4  5  6
@@ -91,7 +107,7 @@ describe Koyomi::Month do
 
     context "first and third monday, friday" do
       # 4, 7, 18, 21
-      let(:test_case) { [[1, 3], [:mon, :fri]] }
+      let(:given) { [[1, 3], [:mon, :fri]] }
       its(:size)  { is_expected.to eq 4 }
       its(:first) { is_expected.to eq Date.new(2015, 12, 4) }
       its(:last)  { is_expected.to eq Date.new(2015, 12, 21) }
@@ -99,10 +115,129 @@ describe Koyomi::Month do
 
     context "every monday, thursday" do
       # 3, 7, 10, 14, 17, 21, 24, 28, 31
-      let(:test_case) { [:every, [:mon, :thu]] }
+      let(:given) { [:every, [:mon, :thu]] }
       its(:size)  { is_expected.to eq 9 }
       its(:first) { is_expected.to eq Date.new(2015, 12, 3) }
       its(:last)  { is_expected.to eq Date.new(2015, 12, 31) }
     end
   end
+
+  describe "#first" do
+    subject { month.first }
+
+    context "given 2015-12" do
+      let(:month) { described_class.new(12, 2015) }
+      it { expect(subject.day).to eq 1 }
+    end
+  end
+
+  describe "#last" do
+    subject { month.last }
+
+    context "given 2015-12" do
+      let(:month) { described_class.new(12, 2015) }
+      it { expect(subject.day).to eq 31 }
+    end
+  end
+
+  describe "#date" do
+    let(:month) { described_class.new(*given) }
+
+    context "2015-11" do
+      let(:given) { [11, 2015] }
+      it { expect(month.date(1)).to eq Date.new(2015, 11, 1) }
+      it { expect(month._1).to eq Date.new(2015, 11, 1) }
+    end
+
+    context "2015-02" do
+      let(:given) { [2, 2015] }
+
+      context "day 28" do
+        let(:day) { 28 }
+        let(:expected) { Date.new(2015, 2, day) }
+        it { expect(month.date(day)).to eq expected }
+        it { expect(month._28).to eq expected }
+      end
+
+      context "day 29" do
+        let(:day) { 29 }
+        let(:expected) { Koyomi::WrongRangeError }
+        it { expect { month.date(day) }.to raise_error(expected) }
+        it { expect { month._29 }.to raise_error(expected) }
+      end
+    end
+  end
+
+  describe "#calendar" do
+    let(:month) { described_class.new(*given) }
+    context "week start not given" do
+      subject { month.calendar() }
+      context "2015-11" do
+        # 2015-11 month
+        #                    1
+        #  2  3  4  5  6  7  8
+        #  9 10 11 12 13 14 15
+        # 16 17 18 19 20 21 22
+        # 23 24 25 26 27 28 29
+        # 30
+        #
+        # expected calendar
+        # 2015-10 ~ 2015-12
+        # 26 27 28 29 30 31  1
+        #  2  3  4  5  6  7  8
+        #  9 10 11 12 13 14 15
+        # 16 17 18 19 20 21 22
+        # 23 24 25 26 27 28 29
+        # 30  1  2  3  4  5  6
+        #
+        let(:given) { [11, 2015] }
+        it { is_expected.to be_kind_of Koyomi::Calendar }
+        describe "calendar attributes" do
+          let(:expected_wday) { Koyomi::Week.windex(Koyomi::Week::DEFAULT_START) }
+          its("#year") { expect(subject.year).to  eq 2015 }
+          its("#month") { expect(subject.month).to eq 11 }
+          its("#week_start") { expect(subject.week_start).to eq expected_wday }
+          its("#first") { expect(subject.first).to eq Date.new(2015, 10, 26) }
+          its("#last") { expect(subject.last).to  eq Date.new(2015, 12, 6) }
+        end
+      end
+    end
+
+    context "week start sunday" do
+      subject { month.calendar(week_start) }
+      let(:week_start) { :sun }
+      context "2015-11" do
+        # 2015-11 month
+        #  1  2  3  4  5  6  7
+        #  8  9 10 11 12 13 14
+        # 15 16 17 18 19 20 21
+        # 22 23 24 25 26 27 28
+        # 29 30
+        #
+        # expected calendar
+        # 2015-11 ~ 2015-12
+        #  1  2  3  4  5  6  7
+        #  8  9 10 11 12 13 14
+        # 15 16 17 18 19 20 21
+        # 22 23 24 25 26 27 28
+        # 29 30  1  2  3  4  5
+        #
+        let(:given) { [11, 2015] }
+        it { is_expected.to be_kind_of Koyomi::Calendar }
+        describe "calendar attributes" do
+          let(:expected_wday) { Koyomi::Week::WDAYS.index(week_start) }
+          its("#year") { expect(subject.year).to  eq 2015 }
+          its("#month") { expect(subject.month).to eq 11 }
+          its("#week_start") { expect(subject.week_start).to eq expected_wday }
+          its("#first") { expect(subject.first).to eq Date.new(2015, 11, 1) }
+          its("#last") { expect(subject.last).to  eq Date.new(2015, 12, 5) }
+        end
+      end
+    end
+  end
+
+  describe "#cycle" do
+    subject { month.cycle }
+    it { is_expected.to be_kind_of(Koyomi::MonthCycle) }
+  end
 end

data/spec/lib/koyomi/year_spec.rb

@@ -0,0 +1,102 @@
+require "koyomi_helper"
+
+describe Koyomi::Year do
+  let(:year) { described_class.new(*given) }
+
+  describe ".of" do
+    subject { year }
+    let(:year) { described_class.of(*given) }
+    let!(:today) { Date.today }
+
+    context "given nothing" do
+      let(:given) { }
+      it { expect(subject.year).to eq today.year }
+    end
+
+    context "given today" do
+      let(:given) { today }
+      it { expect(subject.year).to eq today.year }
+    end
+
+    context "given next year's first" do
+      let(:given) { Date.new(today.year + 1, 1, 1) }
+      it { expect(subject.year).to eq (today.year + 1)}
+    end
+
+    context "given prev year's first" do
+      let(:given) { Date.new(today.year - 1, 1, 1) }
+      it { expect(subject.year).to eq (today.year - 1)}
+    end
+  end
+
+  describe "#first" do
+    subject { year.first }
+
+    context "given year 2015" do
+      let(:given) { 2015 }
+      it { is_expected.to eq Date.new(2015, 1, 1) }
+    end
+  end
+
+  describe "#last" do
+    subject { year.last }
+
+    context "given year 2015" do
+      let(:given) { 2015 }
+      it { is_expected.to eq Date.new(2015, 12, 31) }
+    end
+  end
+
+  describe "month mothods" do
+    (1..12).each do |month|
+      context "given month #{month}" do
+        let(:given) { month }
+        subject { year.__send__("_#{month}") }
+        it { is_expected.to be_kind_of(Koyomi::Month) }
+        describe "its month" do
+          it { expect(subject.month).to eq month }
+        end
+      end
+    end
+  end
+
+  describe "#month" do
+    subject { year.month(given) }
+    (1..12).each do |month|
+      context "given #{month}" do
+        let(:given) { month }
+        it { is_expected.to be_kind_of(Koyomi::Month) }
+        describe "its month" do
+          it { expect(subject.month).to eq month }
+        end
+      end
+    end
+  end
+
+  [:uruu?, :leap?].each do |method|
+    describe "##{method}" do
+      subject { year.__send__(method) }
+      let(:year) { described_class.new(given) }
+
+      context "given year 1999" do
+        let(:given) { 1999 }
+        it { is_expected.to be_falsy }
+      end
+
+      context "given year 2000" do
+        let(:given) { 2000 }
+        it { is_expected.to be_truthy }
+      end
+
+      context "given year 2004" do
+        let(:given) { 2004 }
+        it { is_expected.to be_truthy }
+      end
+
+      context "given year 2100" do
+        let(:given) { 2100 }
+        it { is_expected.to be_falsy }
+      end
+    end
+  end
+end

data/spec/lib/koyomi_spec.rb

@@ -0,0 +1,19 @@
+require "koyomi_helper"
+
+describe Koyomi do
+  describe ".year" do
+    subject { described_class.year(*given) }
+    context "given 2015" do
+      let(:given) { 2015 }
+      it { is_expected.to be_kind_of(Koyomi::Year) }
+    end
+  end
+
+  describe "._ year" do
+    context "given 2015" do
+      subject { described_class._2015 }
+      it { is_expected.to be_kind_of(Koyomi::Year)}
+      it { expect(subject.year).to eq 2015 }
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: koyomi
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - sekizo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-15 00:00:00.000000000 Z
+date: 2015-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -71,21 +71,29 @@ files:
 - koyomi.gemspec
 - lib/koyomi.rb
 - lib/koyomi/calendar.rb
+- lib/koyomi/error.rb
+- lib/koyomi/error/wrong_range_error.rb
 - lib/koyomi/helper.rb
 - lib/koyomi/helper/date.rb
 - lib/koyomi/helper/init.rb
 - lib/koyomi/helper/week.rb
 - lib/koyomi/init.rb
 - lib/koyomi/month.rb
+- lib/koyomi/month_cycle.rb
 - lib/koyomi/period.rb
 - lib/koyomi/version.rb
 - lib/koyomi/week.rb
+- lib/koyomi/year.rb
+- spec/feature/koyomi_sequence_spec.rb
 - spec/koyomi_helper.rb
 - spec/lib/koyomi/calendar_spec.rb
 - spec/lib/koyomi/date_spec.rb
+- spec/lib/koyomi/month_cycle_spec.rb
 - spec/lib/koyomi/month_spec.rb
 - spec/lib/koyomi/version_spec.rb
 - spec/lib/koyomi/week_spec.rb
+- spec/lib/koyomi/year_spec.rb
+- spec/lib/koyomi_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -112,10 +120,14 @@ signing_key:
 specification_version: 4
 summary: Add some classes to handle year, month, period.
 test_files:
+- spec/feature/koyomi_sequence_spec.rb
 - spec/koyomi_helper.rb
 - spec/lib/koyomi/calendar_spec.rb
 - spec/lib/koyomi/date_spec.rb
+- spec/lib/koyomi/month_cycle_spec.rb
 - spec/lib/koyomi/month_spec.rb
 - spec/lib/koyomi/version_spec.rb
 - spec/lib/koyomi/week_spec.rb
+- spec/lib/koyomi/year_spec.rb
+- spec/lib/koyomi_spec.rb
 - spec/spec_helper.rb