timeboss 0.0.7 → 0.1.1

data/lib/timeboss/calendar/week.rb

@@ -4,41 +4,48 @@ 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
 
+      # Get a simple representation of this week.
+      # @return [String] (e.g. "2020W32")
       def name
         "#{year_index}W#{index}"
       end
 
+      # Get a "pretty" representation of this week.
+      # @return [String] (e.g. "Week of August 3, 2020")
       def title
         "Week of #{start_date.strftime('%B %-d, %Y')}"
       end
 
+      # Get a stringified representation of this week.
+      # @return [String] (e.g. "2020W32: 2020-08-03 thru 2020-08-09")
       def to_s
         "#{name}: #{start_date} thru #{end_date}"
       end
 
-      def previous
-        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
+      # Get the index of this week within its containing year.
+      # @return [Integer]
+      def index
+        @_index ||= (((start_date - year.start_date) + 1) / 7.0).to_i + 1
+      end
+
+      # Get the year number for this week.
+      # @return [Integer] (e.g. 2020)
+      def year_index
+        @_year_index ||= year.year_index
+      end
+
+      private
+
+      def down
+        self.class.new(calendar, start_date - 1.week, end_date - 1.week)
       end
 
-      def next
-        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
+      def up
+        self.class.new(calendar, start_date + 1.week, end_date + 1.week)
       end
     end
   end

data/lib/timeboss/calendar/year.rb

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
-require_relative './support/month_based'
+require_relative './support/monthly_unit'
 
 module TimeBoss
   class Calendar
-    class Year < Support::MonthBased
+    class Year < Support::MonthlyUnit
       NUM_MONTHS = 12
 
+      # Get a simple representation of this year.
+      # @return [String] (e.g. "2020")
       def name
         year_index.to_s
       end
 
-      def title
-        name
-      end
+      alias_method :title, :name
     end
   end
 end

data/lib/timeboss/calendars.rb

@@ -10,19 +10,34 @@ module TimeBoss
     extend Enumerable
     delegate :each, :length, to: :all
 
+    # Retrieve a list of all registered calendars.
+    # @return [Array<Entry>]
     def all
       @_all ||= TimeBoss::Calendar.subclasses.map do |klass|
         Entry.new(klass.to_s.demodulize.underscore.to_sym, klass)
       end
     end
 
+    # Retrieve an instance of the specified named calendar.
+    # @param name [String, Symbol] the name of the calendar to retrieve.
+    # @return [Calendar]
     def [](name)
-      find { |e| e.name == name.to_sym }&.calendar
+      find { |e| e.name == name&.to_sym }&.calendar
     end
 
     private
 
     Entry = Struct.new(:name, :klass) do
+      # @!method name
+      # Get the name of the calendar referenced in this entry.
+      # @return [Symbol]
+
+      # @!method klass
+      # The class implementing this calendar.
+      # @return [Class<Calendar>]
+
+      # Get an instance of the calendar referenced in this entry.
+      # @return [Calendar]
       def calendar
         @_calendar ||= klass.new
       end

data/lib/timeboss/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module TimeBoss
-  VERSION = "0.0.7"
+  VERSION = "0.1.1"
 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 → monthly_unit_spec.rb}

@@ -1,15 +1,15 @@
 module TimeBoss
   class Calendar
     module Support
-      describe MonthBased do
-        class ChunkMonthBased < described_class
+      describe MonthlyUnit do
+        class MonthBasedChunk < described_class
           NUM_MONTHS = 2
 
           def name
             "#{year_index}C#{index}"
           end
         end
-        let(:described_class) { ChunkMonthBased }
+        let(:described_class) { MonthBasedChunk }
         let(:calendar) { double }
         let(:start_date) { Date.parse('2018-06-25') }
         let(:end_date) { Date.parse('2018-08-26') }
@@ -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
 
@@ -41,24 +51,24 @@ module TimeBoss
 
           describe '#previous' do
             it 'moves easily within itself' do
-              expect(calendar).to receive(:chunk_month_based).with(48, 3).and_return result
+              expect(calendar).to receive(:month_based_chunk).with(48, 3).and_return result
               expect(described_class.new(calendar, 48, 4, nil, nil).previous).to eq result
             end
 
             it 'flips to the previous container' do
-              expect(calendar).to receive(:chunk_month_based).with(47, 6).and_return result
+              expect(calendar).to receive(:month_based_chunk).with(47, 6).and_return result
               expect(described_class.new(calendar, 48, 1, nil, nil).previous).to eq result
             end
           end
 
           describe '#next' do
             it 'moves easily within itself' do
-              expect(calendar).to receive(:chunk_month_based).with(48, 3).and_return result
+              expect(calendar).to receive(:month_based_chunk).with(48, 3).and_return result
               expect(described_class.new(calendar, 48, 2, nil, nil).next).to eq result
             end
 
             it 'flips to the previous container' do
-              expect(calendar).to receive(:chunk_month_based).with(48, 1).and_return result
+              expect(calendar).to receive(:month_based_chunk).with(48, 1).and_return result
               expect(described_class.new(calendar, 47, 6, nil, nil).next).to eq result
             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

data/spec/calendars/broadcast_spec.rb

@@ -2,6 +2,26 @@ module TimeBoss
   describe Calendars::Broadcast do
     let(:subject) { described_class.new }
 
+    context 'days' do
+      it 'can get today' do
+        day = subject.today
+        expect(day).to be_instance_of(TimeBoss::Calendar::Day)
+        expect(day.start_date).to eq Date.today
+      end
+
+      it 'can get yesterday' do
+        day = subject.yesterday
+        expect(day).to be_instance_of(TimeBoss::Calendar::Day)
+        expect(day.start_date).to eq Date.yesterday
+      end
+
+      it 'can get tomorrow' do
+        day = subject.tomorrow
+        expect(day).to be_instance_of(TimeBoss::Calendar::Day)
+        expect(day.start_date).to eq Date.tomorrow
+      end
+    end
+
     context 'quarters' do
       describe '#quarter' do
         it 'knows 2017Q2' do
@@ -113,8 +133,8 @@ module TimeBoss
           expect(quarters.map(&:name)).to eq ['2015Q3', '2015Q4', '2016Q1', '2016Q2', '2016Q3']
         end
 
-        it 'can get a quarter hence' do
-          quarter = subject.quarters_hence(4)
+        it 'can get a quarter ahead' do
+          quarter = subject.quarters_ahead(4)
           expect(quarter).to be_a TimeBoss::Calendar::Quarter
           expect(quarter.name).to eq '2016Q3'
         end
@@ -251,8 +271,8 @@ module TimeBoss
           expect(months.map(&:name)).to eq ['2015M3', '2015M4', '2015M5', '2015M6', '2015M7']
         end
 
-        it 'can get a month hence' do
-          month = subject.months_hence(4)
+        it 'can get a month ahead' do
+          month = subject.months_ahead(4)
           expect(month).to be_a TimeBoss::Calendar::Month
           expect(month.name).to eq '2015M7'
         end
@@ -490,7 +510,7 @@ module TimeBoss
       it 'can parse mathematic expressions' do
         result = subject.parse('this_month + 2')
         expect(result).to be_a TimeBoss::Calendar::Month
-        expect(result).to eq subject.months_hence(2)
+        expect(result).to eq subject.months_ahead(2)
       end
 
       context 'ranges' do
@@ -554,7 +574,7 @@ module TimeBoss
 
         it 'can shift to a different year' do
           allow(subject).to receive(:this_year).and_return subject.parse('2019')
-          result = basis.years_hence(3)
+          result = basis.years_ahead(3)
           expect(result).to be_a TimeBoss::Calendar::Day
           expect(result.to_s).to eq '2022-04-19'
           expect(basis.in_year).to eq 114
@@ -596,7 +616,7 @@ module TimeBoss
 
         it 'can shift to a different year' do
           allow(subject).to receive(:this_year).and_return subject.parse('2020')
-          result = basis.years_hence(4)
+          result = basis.years_ahead(4)
           expect(result).to be_a TimeBoss::Calendar::Month
           expect(result.name).to eq '2024M4'
           expect(basis.in_year).to eq 4

data/spec/calendars_spec.rb

@@ -28,10 +28,16 @@ module TimeBoss
         c2 = described_class[:broadcast]
         expect(c1).to be_instance_of TimeBoss::Calendars::Broadcast
         expect(c1).to be c2
+
+        expect(c1.name).to eq 'broadcast'
+        expect(c1.title).to eq 'Broadcast'
       end
 
       it 'can return a new calendar' do
-        expect(described_class[:my_test_calendar]).to be_instance_of MyTestCalendar
+        c1 = described_class[:my_test_calendar]
+        expect(c1).to be_instance_of MyTestCalendar
+        expect(c1.name).to eq 'my_test_calendar'
+        expect(c1.title).to eq 'My Test Calendar'
       end
 
       it 'can graceully give you nothing' do

data/timeboss.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rack-test"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "yard"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timeboss
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.1
 platform: ruby
 authors:
 - Kevin McDonald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-16 00:00:00.000000000 Z
+date: 2020-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -108,20 +108,40 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Broadcast Calendar navigation in Ruby made simple
 email:
 - kevinstuffandthings@gmail.com
-executables: []
+executables:
+- tbsh
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/feature_request.md"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- ".yardopts"
+- CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/tbsh
 - lib/tasks/calendars.rake
 - lib/tasks/timeboss.rake
 - lib/timeboss.rb
@@ -133,11 +153,15 @@ files:
 - lib/timeboss/calendar/period.rb
 - lib/timeboss/calendar/quarter.rb
 - lib/timeboss/calendar/support/formatter.rb
-- lib/timeboss/calendar/support/month_based.rb
 - lib/timeboss/calendar/support/month_basis.rb
+- lib/timeboss/calendar/support/monthly_unit.rb
+- lib/timeboss/calendar/support/navigable.rb
 - lib/timeboss/calendar/support/shiftable.rb
+- lib/timeboss/calendar/support/translatable.rb
 - lib/timeboss/calendar/support/unit.rb
 - lib/timeboss/calendar/waypoints.rb
+- lib/timeboss/calendar/waypoints/absolute.rb
+- lib/timeboss/calendar/waypoints/relative.rb
 - lib/timeboss/calendar/week.rb
 - lib/timeboss/calendar/year.rb
 - lib/timeboss/calendars.rb
@@ -146,7 +170,7 @@ files:
 - lib/timeboss/version.rb
 - spec/calendar/day_spec.rb
 - spec/calendar/quarter_spec.rb
-- spec/calendar/support/month_based_spec.rb
+- spec/calendar/support/monthly_unit_spec.rb
 - spec/calendar/support/unit_spec.rb
 - spec/calendar/week_spec.rb
 - spec/calendars/broadcast_spec.rb
@@ -172,14 +196,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubyforge_project: 
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Broadcast Calendar navigation in Ruby made simple
 test_files:
 - spec/calendar/day_spec.rb
 - spec/calendar/quarter_spec.rb
-- spec/calendar/support/month_based_spec.rb
+- spec/calendar/support/monthly_unit_spec.rb
 - spec/calendar/support/unit_spec.rb
 - spec/calendar/week_spec.rb
 - spec/calendars/broadcast_spec.rb