Merge pull request #173 from gsinclair/fix_165

Fixed #165: "Bug: comparison of Symbol with 0 failed"

Author: egonSchiele

lib/contracts/builtin_contracts.rb

@@ -29,21 +29,21 @@ def self.valid? val
   # Check that an argument is a positive number.
   class Pos
     def self.valid? val
-      val && val > 0
+      val && val.is_a?(Numeric) && val > 0
     end
   end
 
   # Check that an argument is a negative number.
   class Neg
     def self.valid? val
-      val && val < 0
+      val && val.is_a?(Numeric) && val < 0
     end
   end
 
   # Check that an argument is a natural number.
   class Nat
     def self.valid? val
-      val && val >= 0 && val.integer?
+      val && val.is_a?(Integer) && val >= 0
     end
   end
 

spec/builtin_contracts_spec.rb

@@ -12,14 +12,18 @@
       expect { @o.double(2.2) }.to_not raise_error
     end
 
-    it "should fail for Strings" do
-      expect { @o.double("bad") }.to raise_error(ContractError)
+    it "should fail for nil and other data types" do
+      expect { @o.double(nil) }.to raise_error(ContractError)
+      expect { @o.double(:x)  }.to raise_error(ContractError)
+      expect { @o.double("x") }.to raise_error(ContractError)
+      expect { @o.double(/x/) }.to raise_error(ContractError)
     end
   end
 
   describe "Pos:" do
     it "should pass for positive numbers" do
       expect { @o.pos_test(1) }.to_not raise_error
+      expect { @o.pos_test(1.6) }.to_not raise_error
     end
 
     it "should fail for 0" do
@@ -28,16 +32,21 @@
 
     it "should fail for negative numbers" do
       expect { @o.pos_test(-1) }.to raise_error(ContractError)
+      expect { @o.pos_test(-1.6) }.to raise_error(ContractError)
     end
 
-    it "should fail for nil" do
+    it "should fail for nil and other data types" do
       expect { @o.pos_test(nil) }.to raise_error(ContractError)
+      expect { @o.pos_test(:x)  }.to raise_error(ContractError)
+      expect { @o.pos_test("x") }.to raise_error(ContractError)
+      expect { @o.pos_test(/x/) }.to raise_error(ContractError)
     end
   end
 
   describe "Neg:" do
     it "should pass for negative numbers" do
       expect { @o.neg_test(-1) }.to_not raise_error
+      expect { @o.neg_test(-1.6) }.to_not raise_error
     end
 
     it "should fail for 0" do
@@ -46,10 +55,14 @@
 
     it "should fail for positive numbers" do
       expect { @o.neg_test(1) }.to raise_error(ContractError)
+      expect { @o.neg_test(1.6) }.to raise_error(ContractError)
     end
 
-    it "should fail for nil" do
+    it "should fail for nil and other data types" do
       expect { @o.neg_test(nil) }.to raise_error(ContractError)
+      expect { @o.neg_test(:x)  }.to raise_error(ContractError)
+      expect { @o.neg_test("x") }.to raise_error(ContractError)
+      expect { @o.neg_test(/x/) }.to raise_error(ContractError)
     end
   end
 
@@ -68,10 +81,14 @@
 
     it "should fail for negative numbers" do
       expect { @o.nat_test(-1) }.to raise_error(ContractError)
+      expect { @o.nat_test(-1.6) }.to raise_error(ContractError)
     end
 
-    it "should fail for nil" do
+    it "should fail for nil and other data types" do
       expect { @o.nat_test(nil) }.to raise_error(ContractError)
+      expect { @o.nat_test(:x)  }.to raise_error(ContractError)
+      expect { @o.nat_test("x") }.to raise_error(ContractError)
+      expect { @o.nat_test(/x/) }.to raise_error(ContractError)
     end
   end