lib/brid/ids/generic_id.rb in brid-0.2.0 vs lib/brid/ids/generic_id.rb in brid-0.2.1

@@ -1,15 +1,14 @@
 class GenericID
   def number_length; 0; end;
   def check_digits_length; 1; end;
 
+  attr_reader :number
   def initialize number
     @number = clear_number(number)
-
-    if number_length > 0 
-      raise ArgumentError.new "invalid number" if @number.length != number_length
-    end
+    
+    @number = @number.rjust number_length, '0' if number_length > 0 and @number.length != number_length
   end
 
   def check_digits
     @check_digits ||= begin
       @number[-check_digits_length, check_digits_length]
@@ -21,17 +20,25 @@
       @number[0, @number.length - check_digits_length]
     end
   end
 
   def valid?
+    return @valid if self.frozen?
+
     @valid ||= begin
       valid_number == @number and not invalid_sequential?
     rescue TypeError
       false
     end
   end
 
+  def freeze
+    check_digits
+    valid?
+    super
+  end
+
   def invalid_sequential?
     @invalid_sequential ||=begin
       sequential.chars.to_a.uniq.count.eql? 1
     end
   end
@@ -44,10 +51,10 @@
   def valid_number
     sequential.mod11(check_digits_length)
   end
 
   def clear_number number
-    number.to_s.scan(/\d/).join
+    number.to_s.gsub(/\D/, '')
   end
 end