Merge pull request #536 from gjtorikian/do-time-yourself

Do time duration yourself

Author: gjtorikian

html-proofer.gemspec

@@ -26,7 +26,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'yell',            '~> 2.0'
   gem.add_dependency 'parallel',        '~> 1.3'
   gem.add_dependency 'addressable',     '~> 2.3'
-  gem.add_dependency 'timerizer',       '~> 0.3'
 
   gem.add_development_dependency 'redcarpet'
   gem.add_development_dependency 'rubocop'

lib/html-proofer/cache.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
 require_relative 'utils'
-
+require 'date'
 require 'json'
-require 'timerizer'
 
 module HTMLProofer
   class Cache
@@ -18,15 +17,16 @@ def initialize(logger, options)
       @logger = logger
       @cache_log = {}
 
+      @cache_datetime = DateTime.now
+      @cache_time = @cache_datetime.to_time
+
       if options.nil? || options.empty?
         define_singleton_method('use_cache?') { false }
       else
         define_singleton_method('use_cache?') { true }
         setup_cache!(options)
         @parsed_timeframe = parsed_timeframe(options[:timeframe])
       end
-
-      @cache_time = Time.now
     end
 
     def within_timeframe?(time)
@@ -46,13 +46,13 @@ def parsed_timeframe(timeframe)
       time = time.to_i
       case date
       when 'M'
-        time.months.ago
+        time_ago(time, :months)
       when 'w'
-        time.weeks.ago
+        time_ago(time, :weeks)
       when 'd'
-        time.days.ago
+        time_ago(time, :days)
       when 'h'
-        time.hours.ago
+        time_ago(time, :hours)
       else
         raise ArgumentError, "#{date} is not a valid timeframe!"
       end
@@ -162,5 +162,20 @@ def setup_cache!(options)
       contents = File.read(cache_file)
       @cache_log = contents.empty? ? {} : JSON.parse(contents)
     end
+
+    private
+
+    def time_ago(measurement, unit)
+      case unit
+      when :months
+        @cache_datetime >> -measurement
+      when :weeks
+        @cache_datetime - measurement * 7
+      when :days
+        @cache_datetime - measurement
+      when :hours
+        @cache_datetime - Rational(measurement/24.0)
+      end.to_time
+    end
   end
 end

spec/html-proofer/cache_spec.rb

@@ -9,10 +9,82 @@
 
   let(:default_cache_options) { { storage_dir: storage_dir } }
 
+  let (:logger) { HTMLProofer::Log.new(:debug) }
+
   def read_cache(cache_file)
     JSON.parse File.read(cache_file)
   end
 
+  context 'with time parser' do
+    it 'understands months' do
+      now_time = Time.local(2019, 9, 6, 12, 0, 0)
+      Timecop.freeze(now_time)
+
+      cache = HTMLProofer::Cache.new(logger, { timeframe: '2M' })
+
+      check_time = Time.local(2019, 8, 6, 12, 0, 0).to_s
+
+      expect(cache.within_timeframe?(check_time)).to be true
+
+      check_time = Time.local(2019, 5, 6, 12, 0, 0).to_s
+
+      expect(cache.within_timeframe?(check_time)).to be false
+
+      Timecop.return
+    end
+
+    it 'understands days' do
+      now_time = Time.local(2019, 9, 6, 12, 0, 0)
+      Timecop.freeze(now_time)
+
+      cache = HTMLProofer::Cache.new(logger, { timeframe: '2d' })
+
+      check_time = Time.local(2019, 9, 5, 12, 0, 0).to_s
+
+      expect(cache.within_timeframe?(check_time)).to be true
+
+      check_time = Time.local(2019, 5, 6, 12, 0, 0).to_s
+
+      expect(cache.within_timeframe?(check_time)).to be false
+
+      Timecop.return
+    end
+
+    it 'understands weeks' do
+      now_time = Time.local(2019, 9, 6, 12, 0, 0)
+      Timecop.freeze(now_time)
+
+      cache = HTMLProofer::Cache.new(logger, { timeframe: '2w' })
+
+      check_time = Time.local(2019, 8, 30, 12, 0, 0).to_s
+
+      expect(cache.within_timeframe?(check_time)).to be true
+
+      check_time = Time.local(2019, 5, 6, 12, 0, 0).to_s
+
+      expect(cache.within_timeframe?(check_time)).to be false
+
+      Timecop.return
+    end
+
+    it 'understands hours' do
+      now_time = Time.local(2019, 9, 6, 12, 0, 0)
+      Timecop.freeze(now_time)
+
+      cache = HTMLProofer::Cache.new(logger, { timeframe: '3h' })
+
+      check_time = Time.local(2019, 9, 6, 9, 0, 0).to_s
+
+      expect(cache.within_timeframe?(check_time)).to be true
+
+      check_time = Time.local(2019, 5, 6, 12, 0, 0).to_s
+
+      expect(cache.within_timeframe?(check_time)).to be false
+
+      Timecop.return
+    end
+  end
+
   context 'with .htmlproofer.log' do
     let(:cache_file_name) { '.htmlproofer.log' }