quirk 0.0.3 → 0.0.4

data/quirk.rb

@@ -2,7 +2,7 @@ require 'date'
 require 'colorize'
 
 module Quirk
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
   QUIRKFILE = ENV['QUIRKFILE'] || "#{ENV['HOME']}/.quirk"
   EDITOR = ENV['EDITOR'] || 'vi'
 
@@ -82,8 +82,8 @@ module Quirk
     def color_on(date)
       hit_color = quitting? ? :light_red : :light_green
       miss_color = quitting? ? :light_green : :light_red
-      last_date = quitting? ? (Quirk.today + 1) : Quirk.today
-      if @marks.empty? ||
+      last_date = Quirk.today
+      if first_date.nil? ||
          date < first_date ||
          date > last_date ||
          !days.include?(date.wday)

data/quirk_test.rb

@@ -47,11 +47,24 @@ class QuirkHabitTest < MiniTest::Unit::TestCase
     assert_equal(:white, quit.color_on(Date.new(2012, 1, 3)))
     assert_equal(:light_green, quit.color_on(Date.new(2012, 1, 4)))
     assert_equal(:light_green, quit.color_on(Date.new(2012, 1, 5)))
+    assert_equal(:white, quit.color_on(Date.new(2012, 1, 6)))
 
     quit.mark_first!(Date.new(2012, 1, 1))
     assert_equal(:light_green, quit.color_on(Date.new(2012, 1, 1)))
   end
 
+  def test_color_on_empty_quit
+    quit = Quirk::Habit.parse('^quit-tv: everyday')
+    quit.mark_first!(Date.new(2012, 1, 1))
+    assert_equal(:white, quit.color_on(Date.new(2011, 12, 31)))
+    assert_equal(:light_green, quit.color_on(Date.new(2012, 1, 1)))
+    assert_equal(:light_green, quit.color_on(Date.new(2012, 1, 2)))
+    assert_equal(:light_green, quit.color_on(Date.new(2012, 1, 3)))
+    assert_equal(:light_green, quit.color_on(Date.new(2012, 1, 4)))
+    assert_equal(:light_green, quit.color_on(Date.new(2012, 1, 5)))
+    assert_equal(:white, quit.color_on(Date.new(2012, 1, 6)))
+  end
+
   def test_streak
     missing = Quirk::Habit.parse('running: everyday')
     assert_equal(0, missing.streak)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quirk
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: .
 cert_chain: []
-date: 2012-05-29 00:00:00.000000000 Z
+date: 2012-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest