hiccup 0.5.9 → 0.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb92bb351bb70b127d803017a755fbb60486e493
-  data.tar.gz: b16ac99ffe79acf0874df41d347b23820fbf395c
+  metadata.gz: 31f89546345663c8eebbbef1213af5d5936758ae
+  data.tar.gz: 8c399d781f9d76e59661c23be50226a9c333f704
 SHA512:
-  metadata.gz: 4dfff15d9adb485161d7bc857e25a8836ad255d4bd9a49aaa8c1bd6a52eac5d25ace2ebca34ae5c2306bf7aad74477242b2c221eab4bbc9f47568bd838753dde
-  data.tar.gz: b972f70010604a6d1e7463351b6f60bf58ab1d8167101e0bed45ba9d033cb0cb4167fe7e8495be49fc0ca76d29a1d1808eac6452950e4d1bb00b722aadf7abb2
+  metadata.gz: 47e2c586234b76c82b49e0af90a9b9538d4db20b13d2ee9256b50add794ee398e1a56d8cf9f46409561fe776ae162d15c9af039e4389fff1e51c95d82cd1e7c6
+  data.tar.gz: 4d4843ce6c366ce85b871f3af7be0652869a008883702756b1f07320d67fd6427abc844d92d90c929ee8a665adb14d3e40975f35e1a6eb0cb57b42ba6b2b1c67

data/lib/hiccup/validatable.rb

@@ -10,6 +10,7 @@ module Hiccup
     
     # !todo: use ActiveModel:Validation rather than a custom method
     included do
+      validates :skip, numericality: {greater_than: 0}
       validate                    :validate_recurrence
     end
     
@@ -27,13 +28,12 @@ module Hiccup
       else;             invalid_kind!
       end
       
-      errors.add(:start_date, "is a #{self.start_date.class} not a Date") unless self.start_date.is_a?(Date)
-      errors.add(:skip, "is not a positive integer") unless (skip.is_a? Fixnum) and (skip > 0)
+      errors.add :start_date, "is a #{start_date.class} not a Date" unless start_date.is_a?(Date)
       if ends?
-        if self.end_date.is_a? Date
-          errors.add(:end_date, "cannot be before start") if (self.end_date < self.start_date)
+        if end_date.is_a?(Date)
+          errors.add :end_date, "cannot be before start" if start_date.is_a?(Date) && end_date < start_date
         else
-          errors.add(:end_date, "is a #{self.end_date.class} not a Date")
+          errors.add :end_date, "is a #{end_date.class} not a Date"
         end
       end
     end

data/lib/hiccup/version.rb

@@ -1,3 +1,3 @@
 module Hiccup
-  VERSION = "0.5.9"
+  VERSION = "0.5.10"
 end

data/test/validatable_test.rb

@@ -68,6 +68,43 @@ class ValidatableTest < ActiveSupport::TestCase
   
   
   
+  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
   
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiccup
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.5.10
 platform: ruby
 authors:
 - Bob Lail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2014-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport