tempora 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a945f2d08e09bed694a289ec99717a591e348d780329fc3d3b9e6d1c57354a8
-  data.tar.gz: a37eed5acf4ff7a0d4c423733b069e7afa195bf859742253c8474c47c3446d6f
+  metadata.gz: 459b4b52f06524a60b3a661aea7d7abdaff9893f92d1396b628e20003e26b985
+  data.tar.gz: 32bfd35efcbbb4342de00d19c1e08df914dcf85472ff576f745630d9d143d0dd
 SHA512:
-  metadata.gz: 5e9b967909906cd6f2511c19e455904d53d4797692f635c04a14a4b1a5fe20cd42badafe74e9fb5f0ed1f8722f85836b5424b0b71c7acf67614209fdc6c8e902
-  data.tar.gz: 35ef820b1e2133b6cb2af1b8d5ed80b86fd66f2fb6ef6112fd9fc44239e40c9a948bcd00208fd09776bec0b3884e8c9b98f76fea717bf0fe5a7a0a27555f8ab1
+  metadata.gz: b8eb1686ef5c168d8eb95a415012428e07703d2c531b8a424ab8fc4e2612f283c5295eb83a1fc00bb91d757e01262836a9cc9bfc1fcdc32f1a2ed30acebe8298
+  data.tar.gz: 6cdca41e418c828b85c31fb5140286b5585a49a776618d2d813bbd19a875d5c48657d80617a0de7d5da0420613fedeaf419d780c86a59acdc626bc56c545e8a5

data/lib/month.rb

@@ -15,27 +15,27 @@ class Month
   end
   
   def id(seperator="-")
-    "#{@year}#{seperator}#{@number.to_s.rjust(2, '0')}"
+    "#{year}#{seperator}#{number.to_s.rjust(2, '0')}"
   end
 
   def to_s
-    "#{month_name} #{@year}"
+    "#{month_name} #{year}"
   end
 
   def month_name
-    Date::MONTHNAMES[@number]
+    Date::MONTHNAMES[number]
   end
   
   def month_abbr
-    Date::ABBR_MONTHNAMES[@number]
+    Date::ABBR_MONTHNAMES[number]
   end
   
   def next
-    self.class.from(@start_date.next_month) # @start_date >> 1
+    self.class.from(start_date.next_month) # @start_date >> 1
   end
   
   def prev
-    self.class.from(@start_date.prev_month) # @start_date << 1
+    self.class.from(start_date.prev_month) # @start_date << 1
   end
   
   def weeks

data/lib/quarter.rb

@@ -17,30 +17,30 @@ class Quarter
   end
   
   def id(seperator="-")
-    "#{@year}#{seperator}Q#{@number}"
+    "#{year}#{seperator}Q#{number}"
   end
 
   def to_s
-    "Q#{@number} #{@year}"
+    "Q#{number} #{year}"
   end
   
   def next
-    self.class.from(@start_date >> 3)
+    self.class.from(start_date >> 3)
   end
 
   def prev
-    self.class.from(@start_date << 3)
+    self.class.from(start_date << 3)
   end
   
   alias_method :succ, :next
   alias_method :pred, :prev
     
   def months
-    Month.from(@start_date)..Month.from(@start_date.next_month(2))
+    Month.from(start_date)..Month.from(end_date)
   end
   
   def weeks
-    Week.from(@start_date)..Week.from(@end_date)
+    Week.from(start_date)..Week.from(end_date)
   end
   
   private

data/lib/tempora/version.rb

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

data/lib/timeperiod.rb

@@ -6,11 +6,11 @@ module TimePeriod
   attr_reader :start_date, :end_date, :year, :number
 
   def range
-    @start_date..@end_date
+    start_date..end_date
   end
 
   def duration
-    (@end_date - @start_date).to_i + 1
+    (end_date - start_date).to_i + 1
   end
   
   def days
@@ -32,14 +32,14 @@ module TimePeriod
   def intersection(other)
     return nil unless overlaps?(other)
 
-    new_start = [@start_date, other.start_date].max
-    new_end = [@end_date, other.end_date].min
+    new_start = [start_date, other.start_date].max
+    new_end = [end_date, other.end_date].min
 
     self.class.new(new_start, new_end)
   end
   
   def <=>(other)
-    @start_date <=> other.start_date
+    start_date <=> other.start_date
   end
   
   alias_method :begin, :start_date

data/lib/week.rb

@@ -14,19 +14,19 @@ class Week
   end
   
   def id(seperator="-")
-    "#{@year}#{seperator}W#{format('%02d', @number)}"
+    "#{year}#{seperator}W#{format('%02d', number)}"
   end
   
   def to_s
-    "Week #{@number}, #{@year}"
+    "Week #{number}, #{year}"
   end
   
   def next
-    self.class.from(@start_date + 7)
+    self.class.from(start_date + 7)
   end
 
   def prev
-    self.class.from(@start_date - 7)
+    self.class.from(start_date - 7)
   end
   
   alias_method :succ, :next

data/lib/year.rb

@@ -15,27 +15,27 @@ class Year
   end
   
   def id
-    @year
+    year
   end
 
   def to_s
-    @year.to_s
+    year.to_s
   end
   
   def next
-    self.class.new(@year + 1)
+    self.class.new(year + 1)
   end
   
   def prev
-    self.class.new(@year - 1)
+    self.class.new(year - 1)
   end
   
   def months
-    Month.new(@year, 1)..Month.new(@year, 12)
+    Month.new(year, 1)..Month.new(year, 12)
   end
   
   def weeks
-    Week.new(@year, 1)..Week.new(@year, 52)
+    Week.from(start_date)..Week.from(end_date)
   end
 
   alias_method :succ, :next

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tempora
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Max Power