hiccup 0.5.16 → 0.5.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5360432a77538aebc70858cfabaa86053f0de7d2
-  data.tar.gz: f6b1a1605bcb80ab578dda9b44c2dc6d50199c23
+  metadata.gz: 604218739c9eacb3fe347bb5ce9aaec11b9043c1
+  data.tar.gz: 8dfd6a12f48cdaec2dc78a6b2388e4153ea94a60
 SHA512:
-  metadata.gz: 0d1ed6207b1477718f353df54ff3b5bd430d0f4ff223fcf312a7419165decee220cf0b8981ad54c2d768b4528d2a8f101e4104206f2e499fa557e7a05e658829
-  data.tar.gz: 5b9dd9c74e8b5baf294e5a108a82933bdf179740cb1083d56d7339fc33576ed5defc074af775eb94a999a1ba1d284cff944c0470f949d579b7c555289367d59e
+  metadata.gz: dbb02a81c4a2fbc22d62d859208030166cebb5d5fcc558b2b8026cd003fef3294e1aae837bf4ad8a0f8a5730499720d09d03323bd58685bf309a24f9fa729ba5
+  data.tar.gz: 708ade0f9f4f66c75bb3834767a9cae0840d8906831a56cb22a4d6755f218f643079b2f7779c851ae2d3ca92c49cb78fb8670c511696b02ca0a8e6f022d1b585

data/lib/hiccup/validatable.rb

@@ -71,7 +71,7 @@ module Hiccup
         Date::DAYNAMES.member?(wd) && i.is_a?(Fixnum) && ((i == -1) || (1..6).include?(i))
       else
         i = occurrence
-        i.is_a?(Fixnum) && (1..31).include?(i)
+        i.is_a?(Fixnum) && ([-1] + (1..31).to_a).include?(i)
       end
     end
 

data/lib/hiccup/version.rb

@@ -1,3 +1,3 @@
 module Hiccup
-  VERSION = "0.5.16"
+  VERSION = "0.5.17"
 end

data/test/validatable_test.rb

@@ -1,118 +1,127 @@
-require "test_helper"
-
-
-class ValidatableTest < ActiveSupport::TestCase
-  include Hiccup
-  
-  
-  
-  def test_invalid_recurrence
-    # Test nil weekly recurrence
-    r = Schedule.new(:kind => :weekly)
-    assert !r.valid?,                                   "Recurrence should be invalid: weekly_pattern is empty"
-    assert r.errors[:weekly_pattern].any?,              "weekly_pattern should be invalid if empty and kind is 'weekly'"
-    
-    # Test nil monthly recurrence
-    r = Schedule.new(:kind => :monthly)
-    assert !r.valid?,                                   "Recurrence should be invalid: monthly_pattern is empty"
-    assert r.errors[:monthly_pattern].any?,             "monthly_pattern should be invalid if empty and kind is 'monthly'"
-    
-    # Test invalid monthly recurrence
-    r = Schedule.new(:kind => :monthly, :monthly_pattern => [[2, "holiday"]])
-    assert !r.valid?,                                   "Recurrence should be invalid: monthly_pattern is invalid"
-    assert r.errors[:monthly_pattern].any?,             "monthly_pattern should be invalid: 'holiday' is not a valid MonthlyOccurrenceType"
-  end
-  
-  
-  
-  def test_temporal_paradoxes
-    recurrence = Schedule.new({
-      :kind => :annually,
-      :ends => true,
-      :start_date => Date.today,
-      :end_date => 5.years.since(Date.today).to_date
-    })
-    assert_valid(recurrence)
-    recurrence = Schedule.new({
-      :kind => :annually,
-      :ends => true,
-      :start_date => Date.today,
-      :end_date => -5.years.since(Date.today).to_date
-    })
-    assert !recurrence.valid?,                          "Recurrence should be invalid: its recurrence ends before it starts"
-  end
-  
-  
-  
-  def test_valid_weekly_recurrence
-    recurrence = Schedule.new(:kind => :weekly, :weekly_pattern => %w{Tuesday})
-    assert_valid(recurrence)
-  end
-  
-  
-  
-  def test_valid_monthly_recurrence
-    recurrence = Schedule.new(:kind => :monthly, :monthly_pattern => [2])
-    assert_valid(recurrence)
-    
-    recurrence = Schedule.new(:kind => :monthly, :monthly_pattern => [[2, "Thursday"]])
-    assert_valid(recurrence)
-  end
-  
-  
-  
-  def test_valid_annual_recurrence
-    recurrence = Schedule.new(:kind => :annually)
-    assert_valid(recurrence)
-  end
-  
-  
-  
-  context "skip" do
-    should "be positive" do
-      schedule = Schedule.new
-      schedule.skip = -5
-      schedule.valid?
-      assert schedule.errors[:skip].any?, "Expected skip to be invalid"
-    end
-    
-    should "be present" do
-      schedule = Schedule.new
-      schedule.skip = nil
-      schedule.valid?
-      assert schedule.errors[:skip].any?, "Expected skip to be invalid"
-    end
-    
-    should "be nonzero" do
-      schedule = Schedule.new
-      schedule.skip = 0
-      schedule.valid?
-      assert schedule.errors[:skip].any?, "Expected skip to be invalid"
-    end
-  end
-  
-  
-  
-  context "When an end_date is supplied but not a start_date, it" do
-    should "record an error for the start_date but not for end_date" do
-      schedule = Schedule.new(kind: :weekly, ends: true, end_date: Date.today)
-      schedule.start_date = nil
-      refute schedule.valid?
-      assert schedule.errors[:start_date].any?
-      refute schedule.errors[:end_date].any?
-    end
-  end
-  
-  
-  
-private
-  
-  
-  
-  def assert_valid(record)
-    assert record.valid?, record.errors.inspect
-  end
-  
-  
-  
+require "test_helper"
+
+
+class ValidatableTest < ActiveSupport::TestCase
+  include Hiccup
+
+
+
+  def test_invalid_recurrence
+    # Test nil weekly recurrence
+    r = Schedule.new(:kind => :weekly)
+    assert !r.valid?,                                   "Recurrence should be invalid: weekly_pattern is empty"
+    assert r.errors[:weekly_pattern].any?,              "weekly_pattern should be invalid if empty and kind is 'weekly'"
+
+    # Test nil monthly recurrence
+    r = Schedule.new(:kind => :monthly)
+    assert !r.valid?,                                   "Recurrence should be invalid: monthly_pattern is empty"
+    assert r.errors[:monthly_pattern].any?,             "monthly_pattern should be invalid if empty and kind is 'monthly'"
+
+    # Test invalid monthly recurrence
+    r = Schedule.new(:kind => :monthly, :monthly_pattern => [[2, "holiday"]])
+    assert !r.valid?,                                   "Recurrence should be invalid: monthly_pattern is invalid"
+    assert r.errors[:monthly_pattern].any?,             "monthly_pattern should be invalid: 'holiday' is not a valid MonthlyOccurrenceType"
+  end
+
+
+
+  def test_temporal_paradoxes
+    recurrence = Schedule.new({
+      :kind => :annually,
+      :ends => true,
+      :start_date => Date.today,
+      :end_date => 5.years.since(Date.today).to_date
+    })
+    assert_valid(recurrence)
+    recurrence = Schedule.new({
+      :kind => :annually,
+      :ends => true,
+      :start_date => Date.today,
+      :end_date => -5.years.since(Date.today).to_date
+    })
+    assert !recurrence.valid?,                          "Recurrence should be invalid: its recurrence ends before it starts"
+  end
+
+
+
+  def test_valid_weekly_recurrence
+    recurrence = Schedule.new(:kind => :weekly, :weekly_pattern => %w{Tuesday})
+    assert_valid(recurrence)
+  end
+
+
+
+  context "monthly_pattern" do
+    should "be valid when it's an array of week index, day name" do
+      recurrence = Schedule.new(:kind => :monthly, :monthly_pattern => [[2, "Thursday"]])
+      assert_valid(recurrence)
+    end
+
+    should "be valid when it's a positive integer between 1-31" do
+      recurrence = Schedule.new(:kind => :monthly, :monthly_pattern => [2])
+      assert_valid(recurrence)
+    end
+
+    should "be valid when it's a -1 (last day of the month)" do
+      recurrence = Schedule.new(:kind => :monthly, :monthly_pattern => [-1])
+      assert_valid(recurrence)
+    end
+  end
+
+
+
+  def test_valid_annual_recurrence
+    recurrence = Schedule.new(:kind => :annually)
+    assert_valid(recurrence)
+  end
+
+
+
+  context "skip" do
+    should "be positive" do
+      schedule = Schedule.new
+      schedule.skip = -5
+      schedule.valid?
+      assert schedule.errors[:skip].any?, "Expected skip to be invalid"
+    end
+
+    should "be present" do
+      schedule = Schedule.new
+      schedule.skip = nil
+      schedule.valid?
+      assert schedule.errors[:skip].any?, "Expected skip to be invalid"
+    end
+
+    should "be nonzero" do
+      schedule = Schedule.new
+      schedule.skip = 0
+      schedule.valid?
+      assert schedule.errors[:skip].any?, "Expected skip to be invalid"
+    end
+  end
+
+
+
+  context "When an end_date is supplied but not a start_date, it" do
+    should "record an error for the start_date but not for end_date" do
+      schedule = Schedule.new(kind: :weekly, ends: true, end_date: Date.today)
+      schedule.start_date = nil
+      refute schedule.valid?
+      assert schedule.errors[:start_date].any?
+      refute schedule.errors[:end_date].any?
+    end
+  end
+
+
+
+private
+
+
+
+  def assert_valid(record)
+    assert record.valid?, record.errors.inspect
+  end
+
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiccup
 version: !ruby/object:Gem::Version
-  version: 0.5.16
+  version: 0.5.17
 platform: ruby
 authors:
 - Bob Lail