From 5742f12b781ecb212cb746d329e188cb4ff73f70 Mon Sep 17 00:00:00 2001
From: Benjamin Quorning <benjamin@quorning.net>
Date: Wed, 22 Feb 2012 10:13:27 +0100
Subject: Prefer || over 'or' for boolean operations

---
 activemodel/lib/active_model/validations/length.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activemodel/lib/active_model/validations')

diff --git a/activemodel/lib/active_model/validations/length.rb b/activemodel/lib/active_model/validations/length.rb
index f1beddf6d4..037f8c2db8 100644
--- a/activemodel/lib/active_model/validations/length.rb
+++ b/activemodel/lib/active_model/validations/length.rb
@@ -27,7 +27,7 @@ module ActiveModel
         keys.each do |key|
           value = options[key]
 
-          unless value.is_a?(Integer) && value >= 0 or value == Float::INFINITY
+          unless (value.is_a?(Integer) && value >= 0) || value == Float::INFINITY
             raise ArgumentError, ":#{key} must be a nonnegative Integer or Infinity"
           end
         end
-- 
cgit v1.2.3