tempora 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df646739fb8d7d27a0bb3eed5a3981c668b300e7f105245cb340a233bf447a54
-  data.tar.gz: 45821e6f2200f5dc69838086ab76bcedfee33773bf7883dfd5fa82fb9a736195
+  metadata.gz: 829bad4acfece329fa910614c27da039a46933e2da7246d091df30fd1463cee5
+  data.tar.gz: 6d2d1e27e904b76d6f2661fb8328b8a3bceb83c142ffe376f76d261e66fdea07
 SHA512:
-  metadata.gz: 3bce9a11d0bc1fedc9f975392c629ebe449a3ddae1ed50584941d0f3256d4b09729a69da168f7fed2cd04cd34d33457788a3cb00a511e9256687d25a51a76fc1
-  data.tar.gz: d44541c8c7894193804b6d1fce6adf731c8acfa14ffe2d528487f4c839d66e85d2a01992f7209184d1d9323f4fa32ebbcb79be05364b424f03999d4d0ec0eb4e
+  metadata.gz: ff6c9aec13bd9eb4ce86085043887f750101a722d64a30d6b8af43e7e52962632e91b8dbb74561cf0df02d05acb7928234ab892eafbe3fe1930bbe6f05cf64cb
+  data.tar.gz: '08cc00d8bbac916783277803a0ef3279a7db353bd3a9e5743d2a0576824939e0b1b1039bea1143120068cf995060ac4bb0d827b553d73a2a368e902d69bbd40a'

data/lib/month.rb

@@ -1,10 +1,10 @@
 require_relative 'timeperiod'
-require_relative 'initialization'
-require_relative 'week'
+require_relative 'tempora/initialization'
+require_relative 'tempora/has_weeks'
 
-class Month
-  include TimePeriod
+class Month < TimePeriod
   extend Initialization
+  include HasWeeks
 
   def initialize(year, month)
     @year   = Integer(year)
@@ -38,14 +38,6 @@ class Month
     self.class.from(start_date.prev_month) # @start_date << 1
   end
   
-  def weeks
-    Week.from(start_date)..Week.from(end_date)
-  end
-  
-  def each_week(&block)
-    weeks.each(&block)
-  end
-  
   alias_method :month, :number
   alias_method :succ, :next
   alias_method :pred, :prev

data/lib/quarter.rb

@@ -1,11 +1,12 @@
 require_relative 'timeperiod'
-require_relative 'initialization'
-require_relative 'month'
-require_relative 'week'
+require_relative 'tempora/initialization'
+require_relative 'tempora/has_months'
+require_relative 'tempora/has_weeks'
 
-class Quarter
-  include TimePeriod
+class Quarter < TimePeriod
   extend Initialization
+  include HasMonths
+  include HasWeeks
 
   def initialize(year, quarter)
     @year   = Integer(year)
@@ -34,19 +35,14 @@ class Quarter
   
   alias_method :succ, :next
   alias_method :pred, :prev
-    
-  def months
-    Month.from(start_date)..Month.from(end_date)
-  end
-  
-  def weeks
-    Week.from(start_date)..Week.from(end_date)
-  end
   
   private
   
   def self.initialization_parameter(date)
-    quarter = ((date.month - 1) / 3) + 1
-    [date.year, quarter]
+    [date.year, quarter_from_date(date)]
+  end
+  
+  def self.quarter_from_date(date)
+    ((date.month - 1) / 3) + 1
   end
 end

data/lib/tempora/has_months.rb

@@ -0,0 +1,9 @@
+module HasMonths
+  def months
+    Month.from(start_date)..Month.from(end_date)
+  end
+
+  def each_month(&block)
+    months.each(&block)
+  end
+end

data/lib/tempora/has_weeks.rb

@@ -0,0 +1,11 @@
+require 'week'
+
+module HasWeeks
+  def weeks
+    Week.from(start_date)..Week.from(end_date)
+  end
+
+  def each_week(&block)
+    weeks.each(&block)
+  end
+end

data/lib/{initialization.rb → tempora/initialization.rb}

@@ -1,5 +1,3 @@
-require 'date'
-
 module Initialization
   def now
     from Time.now
@@ -8,7 +6,7 @@ module Initialization
   alias_method :current, :now
   
   def from(date)
-    new *initialization_parameter(date.to_date)
+    new(*initialization_parameter(date.to_date))
   end
   
   private

data/lib/tempora/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tempora
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/lib/tempora.rb

@@ -2,7 +2,6 @@
 
 require_relative "tempora/version"
 require_relative "timeperiod"
-require_relative "initialization"
 require_relative "year"
 require_relative "month"
 require_relative "week"

data/lib/timeperiod.rb

@@ -1,9 +1,14 @@
 require 'date'
 
-module TimePeriod
+class TimePeriod
   include Comparable
   
   attr_reader :start_date, :end_date, :year, :number
+  
+  def initialize(start_date, end_date)
+    @start_date = start_date
+    @end_date   = end_date
+  end
 
   def range
     start_date..end_date
@@ -26,7 +31,7 @@ module TimePeriod
   end
 
   def overlaps?(other)
-    range.overlaps?(other.range)
+    range.overlap?(other.range)
   end
 
   def intersection(other)
@@ -35,7 +40,7 @@ module TimePeriod
     new_start = [start_date, other.start_date].max
     new_end = [end_date, other.end_date].min
 
-    self.class.new(new_start, new_end)
+    TimePeriod.new(new_start, new_end)
   end
   
   def <=>(other)
@@ -45,5 +50,4 @@ module TimePeriod
   alias_method :begin, :start_date
   alias_method :end, :end_date
   alias_method :length, :duration
-end
-
+end

data/lib/week.rb

@@ -1,8 +1,7 @@
 require_relative 'timeperiod'
-require_relative 'initialization'
+require_relative 'tempora/initialization'
 
-class Week
-  include TimePeriod
+class Week < TimePeriod
   extend Initialization
     
   def initialize(year, week)

data/lib/year.rb

@@ -1,11 +1,12 @@
 require_relative 'timeperiod'
-require_relative 'initialization'
-require_relative 'month'
-require_relative 'week'
+require_relative 'tempora/initialization'
+require_relative 'tempora/has_months'
+require_relative 'tempora/has_weeks'
 
-class Year
-  include TimePeriod
+class Year < TimePeriod
   extend Initialization
+  include HasWeeks
+  include HasMonths
   
   def initialize(year)
     @year = Integer(year)
@@ -29,22 +30,6 @@ class Year
   def prev
     self.class.new(year - 1)
   end
-  
-  def months
-    Month.new(year, 1)..Month.new(year, 12)
-  end
-  
-  def weeks
-    Week.from(start_date)..Week.from(end_date)
-  end
-  
-  def each_month(&block)
-    months.each(&block)
-  end
-  
-  def each_week(&block)
-    weeks.each(&block)
-  end
 
   alias_method :succ, :next
   alias_method :pred, :prev

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tempora
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Max Power
@@ -21,10 +21,12 @@ files:
 - README.md
 - Rakefile
 - lib/_timespan.rb
-- lib/initialization.rb
 - lib/month.rb
 - lib/quarter.rb
 - lib/tempora.rb
+- lib/tempora/has_months.rb
+- lib/tempora/has_weeks.rb
+- lib/tempora/initialization.rb
 - lib/tempora/version.rb
 - lib/timeperiod.rb
 - lib/week.rb