trading_day_jp 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9205b753b14e42d931a01a8d90b46c9cd695e254
-  data.tar.gz: 94fa5f305d24b40632138dab2e3d51b859d4cadf
+  metadata.gz: e315bfe807f4ff907de1ba0d03da3a51f3290d55
+  data.tar.gz: 7cd6adc0580c37f497966de34407c1603264f750
 SHA512:
-  metadata.gz: 84d895e9523bf4112b9af8d6163375b25567a65e01017c4135ed2f82a33703e8268d31c9f6209f316dd64217b229108d9fdf868ac997469de6ee208e8d561d63
-  data.tar.gz: d2d49ab97d15ab8a3a10ced316fddc703a393cb73fbc3584dcbb89a0019e6a141450510722eb05d7890c8772fc2c823f1fd8228e07ffd578510ea7b140252794
+  metadata.gz: a979fdd2f7fe3835023b88b62901da8672cd054fc92af7586e11841e88b3f499b4d853619473429ee14f8b8e9c6d23df28133b9d8c4aafa06faa7797816edd45
+  data.tar.gz: 257734a3cbbbdfe7ca6cebc639175f596ebbabdee7f308c8203e5927682caad65e800035e6d2db3e651a03756576e48ea1b8dd98bbe354471ee57992188cc7eb

data/lib/trading_day_jp/version.rb

@@ -1,3 +1,3 @@
 module TradingDayJp
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/lib/trading_day_jp.rb

@@ -3,6 +3,8 @@ require "trading_day_jp/date"
 module TradingDayJp
 
   class << self
+    @@day_minus = [nil, 0, 1, 2, 3, 4, 5, 6]
+    @@day_add = [nil, 0, 4, 3, 2, 1, 0, -1, -2]
 
     def open?(date)
       date.trading_day_jp?
@@ -30,6 +32,38 @@ module TradingDayJp
       end
     end
 
+    def beginning_of_week(date)
+      date = date - @@day_minus[date.cwday]
+      cweek = date.cweek
+
+      loop do
+        if date.trading_day_jp?
+          return date
+        elsif date.cweek != cweek
+          return
+        end
+
+        cweek = date.cweek
+        date = date + 1
+      end
+    end
+
+    def end_of_week(date)
+      date = date + @@day_add[date.cwday]
+      cweek = date.cweek
+
+      loop do
+        if date.trading_day_jp?
+          return date
+        elsif date.cweek != cweek
+          return
+        end
+
+        cweek = date.cweek
+        date = date - 1
+      end
+    end
+
     def beginning_of_month(date)
       date = Date.new(date.year, date.month)
 

data/spec/trading_day_jp_spec.rb

@@ -49,6 +49,56 @@ describe TradingDayJp do
     end
   end
 
+  describe '.beginning_of_week' do
+    it 'その週の最初の取引日を取得する' do
+      date = Date.new 2015, 5, 8
+
+      expect(TradingDayJp.beginning_of_week date).to eq Date.new(2015, 5, 7)
+    end
+
+    context '月曜' do
+      let(:date) { Date.new 2014, 2, 3 }
+
+      it { expect(TradingDayJp.beginning_of_week date).to eq date }
+    end
+
+    context 'その週は取引日がない' do
+      it 'returns nil' do
+        allow_any_instance_of(Date).to receive(:trading_day_jp?) { false }
+
+        date = Date.new 2014, 2, 3
+
+        expect(TradingDayJp.beginning_of_week date).to be_nil
+      end
+    end
+  end
+
+  describe '.end_of_week' do
+    it 'その週の最後の取引日を取得する' do
+      date = Date.new 2014, 3, 19
+
+      expect(TradingDayJp.end_of_week date).to eq Date.new(2014, 3, 20)
+    end
+
+    context '日曜' do
+      it do
+        date  = Date.new 2014, 2, 23
+
+        expect(TradingDayJp.end_of_week date).to eq Date.new(2014, 2, 21)
+      end
+    end
+
+    context 'その週は取引日がない' do
+      it 'returns nil' do
+        allow_any_instance_of(Date).to receive(:trading_day_jp?) { false }
+
+        date = Date.new 2014, 2, 3
+
+        expect(TradingDayJp.end_of_week date).to be_nil
+      end
+    end
+  end
+
   describe '.beginning_of_month' do
     it 'その月の最初の取引日を取得する' do
       date = Date.new 2014, 6, 10

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trading_day_jp
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Takehiko Shinkura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-24 00:00:00.000000000 Z
+date: 2015-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,3 +100,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/trading_day_jp/date_spec.rb
 - spec/trading_day_jp_spec.rb
+has_rdoc: