timeboss 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9e8eba82ecc236c031a9cd96befc6c3a7454dea1720653426af4db4df227a74
-  data.tar.gz: f13fecfd700ffadc07d665addf4d9e7905f042452ede028ab9aa5b517b31bff8
+  metadata.gz: a46b4d08fd0e17154dbb9f2f806d74e3e0dd83ad2a6dff04102dd5142a975809
+  data.tar.gz: e231795ad178299e99475a03f7fc589d234373ce672f525653b9e67c209d00cc
 SHA512:
-  metadata.gz: 860b8b74668c08a9ec37b37ae5c450babc26f0b130342081b40a94eec468af374618f369791a8ebeb31245ddd7e94b7c4a162e505a8924f12c2a9651e5dad1c2
-  data.tar.gz: be224a555d90519241d32b8e2232fe357b7feca228cdd789a011d6ea76ef388bfee1528adcafeefb9a19058c0aab276ca5576b41192e844a439f730f76705af8
+  metadata.gz: b4a01cd350e3df24190b5818e0cc71ea09b15e57ae73db9620e812b138b9badcb8acd8fb5fa33a35c52049e7893e37cf7a3beed40c8eebbbfddd46158d0ff72f
+  data.tar.gz: 493dd68afa5bd7df4b49c36881946ef869844f538a791780da86a966988be349debd9077a35cb0f834a20b5f0920088da2547cac33de1ec7618783d5f8f69b74

data/lib/timeboss/calendar/day.rb

@@ -21,7 +21,11 @@ module TimeBoss
       end
 
       def index
-        @_index ||= (start_date - calendar.year_for(start_date).start_date).to_i + 1
+        @_index ||= (start_date - year.start_date).to_i + 1
+      end
+
+      def year_index
+        @_year_index ||= year.year_index
       end
 
       private

data/lib/timeboss/calendar/support/month_based.rb

@@ -20,7 +20,7 @@ module TimeBoss
         def weeks
           base = calendar.year(year_index)
           num_weeks = (((base.end_date - base.start_date) + 1) / 7.0).to_i
-          num_weeks.times.map { |i| Week.new(calendar, year_index, i + 1, base.start_date + (i * 7).days, base.start_date + ((i * 7) + 6).days) }
+          num_weeks.times.map { |i| Week.new(calendar, base.start_date + (i * 7).days, base.start_date + ((i * 7) + 6).days) }
                          .select { |w| w.start_date.between?(start_date, end_date) }
         end
 

data/lib/timeboss/calendar/week.rb

@@ -4,12 +4,8 @@ require_relative './support/unit'
 module TimeBoss
   class Calendar
     class Week < Support::Unit
-      attr_reader :year_index, :index
-
-      def initialize(calendar, year_index, index, start_date, end_date)
+      def initialize(calendar, start_date, end_date)
         super(calendar, start_date, end_date)
-        @year_index = year_index
-        @index = index
       end
 
       def name
@@ -24,23 +20,22 @@ module TimeBoss
         "#{name}: #{start_date} thru #{end_date}"
       end
 
+      def index
+        @_index ||= (((start_date - year.start_date) + 1) / 7.0).to_i + 1
+      end
+
+      def year_index
+        @_year_index ||= year.year_index
+      end
+
       private
 
       def down
-        if index == 1
-          (calendar.year_for(start_date) - 1).weeks.last
-        else
-          self.class.new(calendar, year_index, index - 1, start_date - 1.week, end_date - 1.week)
-        end
+        self.class.new(calendar, start_date - 1.week, end_date - 1.week)
       end
 
       def up
-        weeks = calendar.year_for(start_date).weeks
-        if index == weeks.last.index
-          self.class.new(calendar, year_index + 1, 1, start_date + 1.week, end_date + 1.week)
-        else
-          weeks[index]
-        end
+        self.class.new(calendar, start_date + 1.week, end_date + 1.week)
       end
     end
   end

data/lib/timeboss/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module TimeBoss
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/spec/calendar/day_spec.rb

@@ -24,7 +24,7 @@ module TimeBoss
       end
 
       describe '#index' do
-        before(:each) { allow(calendar).to receive(:year_for).with(start_date).and_return double(start_date: start_date - 3) }
+        before(:each) { allow(subject).to receive(:year).and_return double(start_date: start_date - 3) }
 
         it 'gets its index within the year' do
           expect(subject.index).to eq 4

data/spec/calendar/support/month_based_spec.rb

@@ -32,7 +32,17 @@ module TimeBoss
           it 'can get the relevant weeks for the period' do
             result = subject.weeks
             result.each { |w| expect(w).to be_instance_of TimeBoss::Calendar::Week }
-            expect(result.map(&:name)).to eq %w[2018W26 2018W27 2018W28 2018W29 2018W30 2018W31 2018W32 2018W33 2018W34]
+            expect(result.map { |w| w.start_date.to_s }).to eq [
+              '2018-06-25',
+              '2018-07-02',
+              '2018-07-09',
+              '2018-07-16',
+              '2018-07-23',
+              '2018-07-30',
+              '2018-08-06',
+              '2018-08-13',
+              '2018-08-20'
+            ]
           end
         end
 

data/spec/calendar/week_spec.rb

@@ -4,7 +4,7 @@ module TimeBoss
       let(:calendar) { instance_double(TimeBoss::Calendar) }
       let(:start_date) { Date.parse('2048-04-06') }
       let(:end_date) { Date.parse('2048-04-12') }
-      let(:subject) { described_class.new(calendar, 2048, 15, start_date, end_date) }
+      let(:subject) { described_class.new(calendar, start_date, end_date) }
 
       it 'knows its stuff' do
         expect(subject.start_date).to eq start_date
@@ -12,18 +12,10 @@ module TimeBoss
         expect(subject.to_range).to eq start_date..end_date
       end
 
-      it 'knows its name' do
-        expect(subject.name).to eq '2048W15'
-      end
-
       it 'knows its title' do
         expect(subject.title).to eq "Week of April 6, 2048"
       end
 
-      it 'can stringify itself' do
-        expect(subject.to_s).to include(subject.name, start_date.to_s, end_date.to_s)
-      end
-
       describe '#current?' do
         it 'knows when it is' do
           allow(Date).to receive(:today).and_return start_date
@@ -46,13 +38,13 @@ module TimeBoss
           end
 
           it 'can wrap to the previous 52-week year' do
-            result = described_class.new(calendar, 2022, 1, Date.parse('2021-12-27'), Date.parse('2022-01-02')).previous
+            result = described_class.new(calendar, Date.parse('2021-12-27'), Date.parse('2022-01-02')).previous
             expect(result).to be_a described_class
             expect(result.to_s).to eq "2021W52: 2021-12-20 thru 2021-12-26"
           end
 
           it 'can wrap to the previous 53-week year' do
-            result = described_class.new(calendar, 2024, 1, Date.parse('2024-01-01'), Date.parse('2024-01-07')).previous
+            result = described_class.new(calendar, Date.parse('2024-01-01'), Date.parse('2024-01-07')).previous
             expect(result).to be_a described_class
             expect(result.to_s).to eq "2023W53: 2023-12-25 thru 2023-12-31"
           end
@@ -66,13 +58,13 @@ module TimeBoss
           end
 
           it 'can wrap from week 52 to the next year' do
-            result = described_class.new(calendar, 2021, 52, Date.parse('2021-12-20'), Date.parse('2021-12-26')).next
+            result = described_class.new(calendar, Date.parse('2021-12-20'), Date.parse('2021-12-26')).next
             expect(result).to be_a described_class
             expect(result.to_s).to eq "2022W1: 2021-12-27 thru 2022-01-02"
           end
 
           it 'can wrap from week 53 to the next year' do
-            result = described_class.new(calendar, 2023, 53, Date.parse('2023-12-25'), Date.parse('2023-12-31')).next
+            result = described_class.new(calendar, Date.parse('2023-12-25'), Date.parse('2023-12-31')).next
             expect(result).to be_a described_class
             expect(result.to_s).to eq "2024W1: 2024-01-01 thru 2024-01-07"
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timeboss
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Kevin McDonald