Merge 8f7e279 into 64572e7

jetrockets · Aug 27, 2013 · 23fe84d · 23fe84d
2 parents 64572e7 + 8f7e279
commit 23fe84d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/attrio/types/integer.rb b/lib/attrio/types/integer.rb
@@ -4,10 +4,10 @@ module Attrio
   module Types
     class Integer < Base
       def self.typecast(value, options = {})
-        options[:base] ||= 10
+        base = options.is_a?(Hash) && options[:base] ? options[:base] : 10
 
         begin
-          return value.to_i(options[:base]) if value.is_a?(String)
+          return value.to_i(base) if value.is_a?(String)
           return value.to_i
         rescue NoMethodError => e
           nil