chupakabra_tools 0.0.2 → 0.0.3

data/chupakabra_tools.gemspec

@@ -19,5 +19,6 @@ Gem::Specification.new do |gem|
 
 	gem.add_dependency "activesupport"
 	gem.add_dependency "activerecord"
+	gem.add_dependency "active_enum"
 
 end

data/lib/chupakabra_tools/predefined_time_intervals.rb

@@ -0,0 +1,23 @@
+require "chupakabra_tools/time_interval"
+require "active_enum"
+
+class ChupakabraTools::PredefinedTimeIntervals < ActiveEnum::Base
+	value id: 1, name: I18n.t('chupakabra.time_intervals.this_hour'), seo_tag: 'this_hour', time_line: 'present', scale: 'hour', value: ChupakabraTools::TimeInterval.this_hour
+	value id: 2, name: I18n.t('chupakabra.time_intervals.last_hour'), seo_tag: 'last_hour', time_line: 'past', scale: 'hour', value: ChupakabraTools::TimeInterval.previous_hour
+	value id: 3, name: I18n.t('chupakabra.time_intervals.next_hour'), seo_tag: 'next_hour', time_line: 'future', scale: 'hour', value: ChupakabraTools::TimeInterval.next_hour
+	value id: 4, name: I18n.t('chupakabra.time_intervals.today'), seo_tag: 'today', time_line: 'present', scale: 'day', value: ChupakabraTools::TimeInterval.today
+	value id: 5, name: I18n.t('chupakabra.time_intervals.tomorrow'), seo_tag: 'tomorrow', time_line: 'future', scale: 'day', value: ChupakabraTools::TimeInterval.tomorrow
+	value id: 6, name: I18n.t('chupakabra.time_intervals.yesterday'), seo_tag: 'yesterday', time_line: 'past', scale: 'day', value: ChupakabraTools::TimeInterval.yesterday
+	value id: 7, name: I18n.t('chupakabra.time_intervals.this_week'), seo_tag: 'this_week', time_line: 'present', scale: 'week', value: ChupakabraTools::TimeInterval.this_week
+	value id: 8, name: I18n.t('chupakabra.time_intervals.last_week'), seo_tag: 'last_week', time_line: 'past', scale: 'week', value: ChupakabraTools::TimeInterval.previous_week
+	value id: 9, name: I18n.t('chupakabra.time_intervals.next_week'), seo_tag: 'next_week', time_line: 'future', scale: 'week', value: ChupakabraTools::TimeInterval.next_week
+	value id: 10, name: I18n.t('chupakabra.time_intervals.this_month'), seo_tag: 'this_month', time_line: 'present', scale: 'month', value: ChupakabraTools::TimeInterval.this_month
+	value id: 11, name: I18n.t('chupakabra.time_intervals.last_month'), seo_tag: 'last_month', time_line: 'past', scale: 'month', value: ChupakabraTools::TimeInterval.previous_month
+	value id: 12, name: I18n.t('chupakabra.time_intervals.next_month'), seo_tag: 'next_month', time_line: 'future', scale: 'month', value: ChupakabraTools::TimeInterval.next_month
+	value id: 13, name: I18n.t('chupakabra.time_intervals.this_quarter'), seo_tag: 'this_quarter', time_line: 'present', scale: 'quarter', value: ChupakabraTools::TimeInterval.this_quarter
+	value id: 14, name: I18n.t('chupakabra.time_intervals.last_quarter'), seo_tag: 'last_quarter', time_line: 'past', scale: 'quarter', value: ChupakabraTools::TimeInterval.previous_quarter
+	value id: 15, name: I18n.t('chupakabra.time_intervals.next_quarter'), seo_tag: 'next_quarter', time_line: 'future', scale: 'quarter', value: ChupakabraTools::TimeInterval.next_quarter
+	value id: 16, name: I18n.t('chupakabra.time_intervals.this_year'), seo_tag: 'this_year', time_line: 'present', scale: 'year', value: ChupakabraTools::TimeInterval.this_year
+	value id: 17, name: I18n.t('chupakabra.time_intervals.last_year'), seo_tag: 'last_year', time_line: 'past', scale: 'year', value: ChupakabraTools::TimeInterval.previous_year
+	value id: 18, name: I18n.t('chupakabra.time_intervals.next_year'), seo_tag: 'next_year', time_line: 'future', scale: 'year', value: ChupakabraTools::TimeInterval.next_year
+end

data/lib/chupakabra_tools/time_interval.rb

@@ -3,11 +3,16 @@ require "active_support/all"
 class ChupakabraTools::TimeInterval
 	attr_accessor :beginning, :ending
 
-	def initialize (hash={})
-		hash ||= {}
-		hash.stringify_keys!
-		self.beginning = hash['beginning']
-		self.ending = hash['ending']
+	def initialize (interval_beginning, interval_ending)
+		unless interval_beginning.is_a?(Time) || interval_beginning.is_a?(Date) ||  interval_beginning.is_a?(DateTime)
+			raise "Begining of Interval is Not A Time, Date or DateTime value"
+		end
+		unless interval_ending.is_a?(Time) || interval_ending.is_a?(Date) ||  interval_ending.is_a?(DateTime)
+			raise "End of Interval is Not A Time, Date or DateTime value"
+		end
+
+		@beginning = interval_beginning.to_time
+		@ending = interval_ending.to_time
 	end
 
 	def beginning
@@ -27,137 +32,257 @@ class ChupakabraTools::TimeInterval
 	end
 
 
+
 	def to_s
-		"#{beginning} - #{ending}"
+		"#{@beginning} - #{@ending}"
 	end
 
 	def to_hash
-		{beginning: self.beginning, ending: self.ending}
+		{beginning: @beginning, ending: @ending}
 	end
 
 	def to_json
 		to_hash.to_json
 	end
 
-	def add_days!(days_number)
-		@beginning += days_number.days if @beginning
-		@ending += days_number.days if @ending
-		to_s
+	def future?(time_zone = nil)
+		!@beginning.nil? && @beginning > Time.now
 	end
 
-	def add_weeks!(weeks_number)
-		@beginning += weeks_number.weeks if @beginning
-		@ending += weeks_number.weeks if @ending
-		to_s
+	def past?(time_zone = nil)
+		!@ending.nil? && @ending < Time.now
 	end
 
-	def add_years!(years_number)
-		@beginning += years_number.years if @beginning
-		@ending += years_number.years if @ending
-		to_s
+	def present?(time_zone = nil)
+		!(is_past? || is_future?)
 	end
 
-	def subtract_days!(days_number)
-		@beginning.ago(days_number.days) if @beginning
-		@ending.ago(days_number.days) if @ending
-		to_s
+	def valid?
+		return false unless @beginning
+		return false unless @ending
+		@beginning < @ending
 	end
 
-	def subtract_weeks!(weeks_number)
-		@beginning.ago(weeks_number.weeks) if @beginning
-		@ending.ago(weeks_number.weeks) if @ending
+
+	def time_line(time_zone = nil)
+		return "future" if is_future?(time_zone)
+		return "past" if is_past?(time_zone)
+		"present"
+	end
+
+
+
+
+	def inverse!
+		bg = @beginning
+		en = @ending
+
+		@beginning = en
+		@ending = bg
 		to_s
 	end
+	def add_hours!(number)
+		@beginning += number.hours if @beginning
+		@ending += number.hours if @ending
+		to_s
+	end
+	def add_days!(number)
+		@beginning += number.days if @beginning
+		@ending += number.days if @ending
+		to_s
+	end
+	def add_weeks!(number)
+		@beginning += number.weeks if @beginning
+		@ending += number.weeks if @ending
+		to_s
+	end
+	def add_months!(number)
+		@beginning += number.months if @beginning
+		@ending += number.months if @ending
+		to_s
+	end
+	def add_quarters!(number)
+		@beginning += number.quarters if @beginning
+		@ending += number.quarters if @ending
+		to_s
+	end
+	def add_years!(number)
+		@beginning += number.years if @beginning
+		@ending += number.years if @ending
+		to_s
+	end
+
 
-	def subtract_years!(years_number)
-		@beginning.ago(years_number.years) if @beginning
-		@ending.ago(years_number.years) if @ending
+
+
+	def subtract_hours!(number)
+		@beginning.ago(number.hours) if @beginning
+		@ending.ago(number.hours) if @ending
 		to_s
 	end
+	def subtract_days!(number)
+		@beginning.ago(number.days) if @beginning
+		@ending.ago(number.days) if @ending
+		to_s
+	end
+	def subtract_weeks!(number)
+		@beginning.ago(number.weeks) if @beginning
+		@ending.ago(number.weeks) if @ending
+		to_s
+	end
+	def subtract_months!(number)
+		@beginning.ago(number.months) if @beginning
+		@ending.ago(number.months) if @ending
+		to_s
+	end
+	def subtract_quarters!(number)
+		@beginning.ago(number.quarters) if @beginning
+		@ending.ago(number.quarters) if @ending
+		to_s
+	end
+	def subtract_years!(number)
+		@beginning.ago(number.years) if @beginning
+		@ending.ago(number.years) if @ending
+		to_s
+	end
+
+
+
 
-	def add_days(days_number)
-		@beginning += days_number.days if @beginning
-		@ending += days_number.days if @ending
-		ChupakabraTools::TimeInterval.new(beginning: @beginning, ending: @ending)
+	def inverse
+		ChupakabraTools::TimeInterval.new(@ending, @beginning)
+	end
+
+	def add_hours(number)
+		new_beginning = @beginning + number.hours
+		new_ending = @ending + number.hours
+		ChupakabraTools::TimeInterval.new( new_beginning, new_ending)
+	end
+	def add_days(number)
+		new_beginning = @beginning + number.days
+		new_ending = @ending + number.days
+		ChupakabraTools::TimeInterval.new(new_beginning, new_ending)
+	end
+	def add_weeks(number)
+		new_beginning = @beginning + number.weeks
+		new_ending = @ending + number.weeks
+		ChupakabraTools::TimeInterval.new(new_beginning, new_ending)
+	end
+	def add_months(number)
+		new_beginning = @beginning + number.months
+		new_ending = @ending + number.months
+		ChupakabraTools::TimeInterval.new(new_beginning, new_ending)
+	end
+	def add_quarters(number)
+		new_beginning = @beginning + number.quarters
+		new_ending = @ending + number.quarters
+		ChupakabraTools::TimeInterval.new(new_beginning, new_ending)
+	end
+	def add_years(number)
+		new_beginning = @beginning + number.years
+		new_ending = @ending + number.years
+		ChupakabraTools::TimeInterval.new(new_beginning, new_ending)
 	end
 
-	def add_weeks(weeks_number)
-		@beginning += weeks_number.weeks if @beginning
-		@ending += weeks_number.weeks if @ending
-		ChupakabraTools::TimeInterval.new(beginning: @beginning, ending: @ending)
+
+
+
+	def subtract_hours(number)
+		new_beginning = @beginning.ago(number.hours)
+		new_ending = @ending.ago(number.hours)
+		ChupakabraTools::TimeInterval.new(new_beginning, new_ending)
+	end	
+	def subtract_days(number)
+		new_beginning = @beginning.ago(number == 1 ? 1.day : number.days)
+		new_ending = @ending.ago(number == 1 ? 1.day : number.days)
+		ChupakabraTools::TimeInterval.new(new_beginning, new_ending)
+	end
+	def subtract_weeks(number)
+		new_beginning = @beginning.ago(number.weeks)
+		new_ending = @ending.ago(number.weeks)
+		ChupakabraTools::TimeInterval.new(new_beginning, new_ending)
 	end
+	def subtract_months(number)
+		new_beginning = @beginning.ago(number.months)
+		new_ending = @ending.ago(number.months)
+		ChupakabraTools::TimeInterval.new(new_beginning, new_ending)
+	end
+	def subtract_quarters(number)
+		new_beginning = @beginning.ago(number.quarters)
+		new_ending = @ending.ago(number.quarters)
+		ChupakabraTools::TimeInterval.new(new_beginning, new_ending)
+	end
+	def subtract_years(number)
+		new_beginning = @beginning.ago(number.years)
+		new_ending = @ending.ago(number.years)
+		ChupakabraTools::TimeInterval.new(new_beginning, new_ending)
+	end
+
+
+
+
+	# ************************************** HOURs **********************************
 
-	def add_years(years_number)
-		@beginning += years_number.years if @beginning
-		@ending += years_number.years if @ending
-		ChupakabraTools::TimeInterval.new(beginning: @beginning, ending: @ending)
+	def self.this_hour(time_zone = nil)
+		hour(Time.now, time_zone)
 	end
 
-	def subtract_days(days_number)
-		@beginning.ago(days_number.days) if @beginning
-		@ending.ago(days_number.days) if @ending
-		ChupakabraTools::TimeInterval.new(beginning: @beginning, ending: @ending)
+	def self.previous_hour(definite_time = nil, time_zone = nil)
+		hour(definite_time, time_zone).subtract_hours(1)
 	end
 
-	def subtract_weeks(weeks_number)
-		@beginning.ago(weeks_number.weeks) if @beginning
-		@ending.ago(weeks_number.weeks) if @ending
-		ChupakabraTools::TimeInterval.new(beginning: @beginning, ending: @ending)
+	def self.next_hour(definite_time = nil, time_zone = nil)
+		hour(definite_time, time_zone).add_hours(1)
 	end
 
-	def subtract_years(years_number)
-		@beginning.ago(years_number.years) if @beginning
-		@ending.ago(years_number.years) if @ending
-		ChupakabraTools::TimeInterval.new(beginning: @beginning, ending: @ending)
+	def self.hour(definite_time = nil, time_zone = nil)
+		if definite_time
+			definite_time = definite_time.to_time if definite_time.is_a?(Date)
+			if definite_time.is_a?(Integer)
+
+				definite_time = definite_time == 0 ? definite_time : (definite_time.abs - 1)
+				definite_time = Time.new(Time.now.year, Time.now.month, Time.now.day, definite_time, 0,0)
+			end
+
+		end
+		time = (definite_time.nil? || !definite_time.is_a?(Time) ? Time.now : definite_time)
+
+		ChupakabraTools::TimeInterval.new(time.beginning_of_hour, time.end_of_hour)
 	end
 
 
 	# ************************************* DAYS *****************************************
 
 	def self.tomorrow(time_zone = nil)
-		time = Time.now.tomorrow
-		ChupakabraTools::TimeInterval.new(beginning: time.beginning_of_day, ending: time.end_of_day)
+		next_day(Time.now, time_zone)
 	end
 
+	def self.yesterday(time_zone = nil)
+		previous_day(Time.now, time_zone)
+	end
 	def self.today(time_zone = nil)
-		time = Time.now
-		ChupakabraTools::TimeInterval.new(beginning: time.beginning_of_day, ending: time.end_of_day)
+		day(Time.now, time_zone)
 	end
 
-	def self.yesterday(time_zone = nil)
-		time = Time.now.yesterday
-		ChupakabraTools::TimeInterval.new(beginning: time.beginning_of_day, ending: time.end_of_day)
-	end
-
-	def self.day(val = nil, time_zone = nil)
-		if val.nil?
-			time = Time.now
-		elsif val.is_a?(Date)
-			time = val.today.to_time
-		elsif val.is_a?(Time)
-			time = val
-		elsif val.is_a?(String)
-			day_of_year = val.to_i
-			day_of_year -= 1 if day_of_year > 0
-			time = Time.now.beginning_of_year + day_of_year.days
-		elsif val.is_a?(Integer)
-			day_of_year = val
-			day_of_year -= 1 if day_of_year > 0
-			time = Time.now.beginning_of_year + day_of_year.days
-		elsif val.is_a?(Float)
-			day_of_year = val.to_i
-			day_of_year -= 1 if day_of_year > 0
-			time = Time.now.beginning_of_year + day_of_year.days
-		end
-		time ||= Time.now
-		ChupakabraTools::TimeInterval.new(beginning: time.beginning_of_day, ending: time.end_of_day)
+
+	def self.next_day(definite_time, time_zone = nil)
+		day(definite_time, time_zone).add_days(1)
+	end
+	def self.previous_day(definite_time, time_zone = nil)
+		day(definite_time, time_zone).subtract_days(1)
 	end
+	def self.day(definite_time = nil, time_zone = nil)
+		if definite_time
+			definite_time = definite_time.to_time if definite_time.is_a?(Date)
+			if definite_time.is_a?(Integer)
+				definite_time = definite_time == 0 ? definite_time : (definite_time.abs - 1)
+				definite_time = Time.new(Time.now.year, 1, 1) + definite_time.days
+			end
+		end
+
+		time = (definite_time.nil? || !definite_time.is_a?(Time) ? Time.now : definite_time)
 
-	def self.day_of_year(day, year, time_zone = nil)
-		day_of_year = day.to_i.days
-		day_of_year -= 1 if day_of_year > 0
-		time = Time.new(year, 1, 1) + day_of_year
-		ChupakabraTools::TimeInterval.new(beginning: time.beginning_of_day, ending: time.end_of_day)
+		ChupakabraTools::TimeInterval.new(time.beginning_of_day, time.end_of_day)
 	end
 
 
@@ -172,20 +297,11 @@ class ChupakabraTools::TimeInterval
 	end
 
 	def self.previous_week(definite_time = nil, time_zone = nil)
-		if definite_time
-			definite_time = definite_time.to_time if definite_time.is_a?(Date)
-		end
-		time = (definite_time.nil? || !definite_time.is_a?(Time) ? Time.now : definite_time).ago(1.week)
-		ChupakabraTools::TimeInterval.new(beginning: time.beginning_of_week, ending: time.end_of_week)
+		week(definite_time, time_zone).subtract_weeks(1)
 	end
 
 	def self.next_week(definite_time = nil, time_zone = nil)
-		if definite_time
-			definite_time = definite_time.to_time if definite_time.is_a?(Date)
-		end
-		time = (definite_time.nil? || !definite_time.is_a?(Time) ? Time.now : definite_time) + 1.week
-
-		ChupakabraTools::TimeInterval.new(beginning: time.beginning_of_week, ending: time.end_of_week)
+		week(definite_time, time_zone).add_weeks(1)
 	end
 
 	def self.week(definite_time = nil, time_zone = nil)
@@ -194,7 +310,7 @@ class ChupakabraTools::TimeInterval
 		end
 		time = (definite_time.nil? || !definite_time.is_a?(Time) ? Time.now : definite_time)
 
-		ChupakabraTools::TimeInterval.new(beginning: time.beginning_of_week, ending: time.end_of_week)
+		ChupakabraTools::TimeInterval.new(time.beginning_of_week, time.end_of_week)
 	end
 
 	# ************************************** MONTHS **********************************
@@ -214,7 +330,7 @@ class ChupakabraTools::TimeInterval
 		end
 		time = (definite_time.nil? || !definite_time.is_a?(Time) ? Time.now : definite_time).ago(1.month)
 
-		ChupakabraTools::TimeInterval.new(beginning: time.beginning_of_month, ending: time.end_of_month)
+		ChupakabraTools::TimeInterval.new(time.beginning_of_month, time.end_of_month)
 	end
 
 	def self.next_month(definite_time = nil, time_zone = nil)
@@ -224,7 +340,7 @@ class ChupakabraTools::TimeInterval
 		end
 		time = (definite_time.nil? || !definite_time.is_a?(Time) ? Time.now : definite_time) + 1.month
 
-		ChupakabraTools::TimeInterval.new(beginning: time.beginning_of_month, ending: time.end_of_month)
+		ChupakabraTools::TimeInterval.new(time.beginning_of_month, time.end_of_month)
 	end
 
 	def self.month(definite_time = nil, time_zone = nil)
@@ -234,12 +350,54 @@ class ChupakabraTools::TimeInterval
 		end
 		time = (definite_time.nil? || !definite_time.is_a?(Time) ? Time.now : definite_time)
 
-		ChupakabraTools::TimeInterval.new(beginning: time.beginning_of_month, ending: time.end_of_month)
+		ChupakabraTools::TimeInterval.new(time.beginning_of_month, time.end_of_month)
 	end
 
 	def self.month_of_year(month, year, time_zone = nil)
 		time = Time.new(year, month, 1)
-		ChupakabraTools::TimeInterval.new(beginning: time.beginning_of_month, ending: time.end_of_month)
+		ChupakabraTools::TimeInterval.new(time.beginning_of_month, time.end_of_month)
+	end
+
+
+
+	# ************************************** QUARTERS **********************************
+
+	def self.last_quarter(time_zone = nil)
+		previous_quarter(Time.now, time_zone)
+	end
+
+	def self.this_quarter(time_zone = nil)
+		quarter(Time.now, time_zone)
+	end
+
+
+	def self.previous_quarter(definite_time = nil, time_zone = nil)
+		if definite_time
+			definite_time = definite_time.to_time if definite_time.is_a?(Date)
+			definite_time = Time.new(Time.now.year, (definite_time - 1) * 3 + 1, 1, 0, 0) if definite_time.is_a?(Integer)
+		end
+		time = (definite_time.nil? || !definite_time.is_a?(Time) ? Time.now : definite_time).ago(3.months)
+
+		ChupakabraTools::TimeInterval.new(time.beginning_of_quarter, time.end_of_quarter)
+	end
+
+	def self.next_quarter(definite_time = nil, time_zone = nil)
+		if definite_time
+			definite_time = definite_time.to_time if definite_time.is_a?(Date)
+			definite_time = Time.new(Time.now.year, (definite_time - 1) * 3 + 1, 1, 0, 0) if definite_time.is_a?(Integer)
+		end
+		time = (definite_time.nil? || !definite_time.is_a?(Time) ? Time.now : definite_time) + 3.months
+		ChupakabraTools::TimeInterval.new(time.beginning_of_quarter, time.end_of_quarter)
+	end
+
+	def self.quarter(definite_time = nil, time_zone = nil)
+		if definite_time
+			definite_time = definite_time.to_time if definite_time.is_a?(Date)
+			definite_time = Time.new(Time.now.year, (definite_time - 1) * 3 + 1, 1, 0, 0) if definite_time.is_a?(Integer)
+		end
+		time = (definite_time.nil? || !definite_time.is_a?(Time) ? Time.now : definite_time)
+
+		ChupakabraTools::TimeInterval.new(time.beginning_of_quarter, time.end_of_quarter)
 	end
 
 
@@ -261,7 +419,7 @@ class ChupakabraTools::TimeInterval
 		end
 		time = (definite_time.nil? || !definite_time.is_a?(Time) ? Time.now : definite_time).ago(1.year)
 
-		ChupakabraTools::TimeInterval.new(beginning: time.beginning_of_year, ending: time.end_of_year)
+		ChupakabraTools::TimeInterval.new(time.beginning_of_year, time.end_of_year)
 	end
 
 	def self.next_year(definite_time = nil, time_zone = nil)
@@ -270,7 +428,7 @@ class ChupakabraTools::TimeInterval
 			definite_time = Time.new(definite_time, 1, 1, 0, 0) if definite_time.is_a?(Integer)
 		end
 		time = (definite_time.nil? || !definite_time.is_a?(Time) ? Time.now : definite_time) + 1.year
-		ChupakabraTools::TimeInterval.new(beginning: time.beginning_of_year, ending: time.end_of_year)
+		ChupakabraTools::TimeInterval.new(time.beginning_of_year, time.end_of_year)
 	end
 
 	def self.year(definite_time = nil, time_zone = nil)
@@ -280,7 +438,7 @@ class ChupakabraTools::TimeInterval
 		end
 		time = (definite_time.nil? || !definite_time.is_a?(Time) ? Time.now : definite_time)
 
-		ChupakabraTools::TimeInterval.new(beginning: time.beginning_of_year, ending: time.end_of_year)
+		ChupakabraTools::TimeInterval.new(time.beginning_of_year, time.end_of_year)
 	end
 
 
@@ -311,6 +469,12 @@ class ChupakabraTools::TimeInterval
 					interval = ChupakabraTools::TimeInterval.last_month
 				elsif ['next_month', 'next-month', 'next month'].include?(interval_request)
 					interval = ChupakabraTools::TimeInterval.next_month
+				elsif ['this_quarter', 'this-quarter', 'this quarter'].include?(interval_request)
+					interval = ChupakabraTools::TimeInterval.this_quarter
+				elsif ['last_quarter', 'last-quarter', 'last quarter', 'previous_quarter', 'previous-quarter', 'previous quarter'].include?(interval_request)
+					interval = ChupakabraTools::TimeInterval.last_quarter
+				elsif ['next_quarter', 'next-quarter', 'next quarter'].include?(interval_request)
+					interval = ChupakabraTools::TimeInterval.next_quarter							
 				elsif ['this_year', 'this-year', 'this year'].include?(interval_request)
 					interval = ChupakabraTools::TimeInterval.this_year
 				elsif ['last_year', 'last-year', 'last year', 'previous_year', 'previous-year', 'previous year'].include?(interval_request)
@@ -323,15 +487,12 @@ class ChupakabraTools::TimeInterval
 					time = time.to_time
 				end
 
-
-				interval_request = interval_request.to_s.strip.downcase
-
 				if ['this_day', 'this-day', 'this day'].include?(interval_request)
-					interval = ChupakabraTools::TimeInterval.this_day
+					interval = ChupakabraTools::TimeInterval.this_day(time)
 				elsif ['previous_day', 'previous_day', 'previous_day'].include?(interval_request)
-					interval = ChupakabraTools::TimeInterval.yesterday
+					interval = ChupakabraTools::TimeInterval.previous_day(time)
 				elsif ['next_day', 'next-day', 'next day'].include?(interval_request)
-					interval = ChupakabraTools::TimeInterval.tomorrow
+					interval = ChupakabraTools::TimeInterval.next_day(time)
 				elsif ['this_week', 'this-week', 'this week'].include?(interval_request)
 					interval = ChupakabraTools::TimeInterval.this_week
 				elsif ['last_week', 'last-week', 'last week'].include?(interval_request)
@@ -344,6 +505,12 @@ class ChupakabraTools::TimeInterval
 					interval = ChupakabraTools::TimeInterval.last_month
 				elsif ['next_month', 'next-month', 'next month'].include?(interval_request)
 					interval = ChupakabraTools::TimeInterval.next_month
+				elsif ['this_quarter', 'this-quarter', 'this quarter'].include?(interval_request)
+					interval[:start] = ChupakabraTools::TimeInterval.this_quarter
+				elsif ['last_quarter', 'last-quarter', 'last quarter', 'previous_quarter', 'previous-quarter', 'previous quarter'].include?(interval_request)
+					interval = ChupakabraTools::TimeInterval.last_quarter
+				elsif ['next_quarter', 'next-quarter', 'next quarter'].include?(interval_request)
+					interval = ChupakabraTools::TimeInterval.next_quarter
 				elsif ['this_year', 'this-year', 'this year'].include?(interval_request)
 					interval[:start] = ChupakabraTools::TimeInterval.this_year
 				elsif ['last_year', 'last-year', 'last year', 'previous_year', 'previous-year', 'previous year'].include?(interval_request)
@@ -351,10 +518,7 @@ class ChupakabraTools::TimeInterval
 				elsif ['next_year', 'next-year', 'next year'].include?(interval_request)
 					interval = ChupakabraTools::TimeInterval.next_year
 				end
-
 			end
-
-
 		else
 			nil
 		end

data/lib/chupakabra_tools/version.rb

@@ -1,3 +1,3 @@
 module ChupakabraTools
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chupakabra_tools
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: active_enum
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Chupakbara Tools Set for Easy Life
 email:
 - mdima@it-guru.biz
@@ -57,6 +73,7 @@ files:
 - Rakefile
 - chupakabra_tools.gemspec
 - lib/chupakabra_tools.rb
+- lib/chupakabra_tools/predefined_time_intervals.rb
 - lib/chupakabra_tools/time_interval.rb
 - lib/chupakabra_tools/version.rb
 homepage: ''