za-id-validator 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/za-id-validator.rb

@@ -1,31 +1,35 @@
 module ZaIdValidator
 
   def valid_za_identity_number?(id)
-    length_is_valid?(id) && id.to_s.chars.to_a.last.to_i == z(id)
+    id = id.to_s # force to a string
+    return false unless length_is_valid?(id)
+    id.chars.to_a.last.to_i == z(id)
   end
 
-  def length_is_valid?(id)
-    id =~ /^\d{13}$/
-  end
+  private
 
-  def a(id)
-    id.chars.to_a.values_at(0,2,4,6,8,10).inject(0) { |sum, v| sum += v.to_i }
-  end
+    def length_is_valid?(id)
+      id =~ /^\d{13}$/
+    end
 
-  def b(id)
-    id.chars.to_a.values_at(1,3,5,7,9,11).join
-  end
+    def a(id)
+      id.chars.to_a.values_at(0,2,4,6,8,10).inject(0) { |sum, v| sum += v.to_i }
+    end
 
-  def c(id)
-    (b(id).to_i * 2).to_s.chars.to_a.inject(0) { |sum, v| sum += v.to_i }
-  end
+    def b(id)
+      id.chars.to_a.values_at(1,3,5,7,9,11).join
+    end
 
-  def d(id)
-    a(id) + c(id)
-  end
+    def c(id)
+      (b(id).to_i * 2).to_s.chars.to_a.inject(0) { |sum, v| sum += v.to_i }
+    end
 
-  def z(id)
-    10 - (d(id) % 10)
-  end
+    def d(id)
+      a(id) + c(id)
+    end
+
+    def z(id)
+      10 - (d(id) % 10)
+    end
 
 end

data/test/test_za-id-validator.rb

@@ -11,6 +11,7 @@ class TestZaIdValidator < Test::Unit::TestCase
 
     setup do
       @valid = "8001015009087"
+      @valid_integer = 8001015009087
     end
 
     should "be the correct length" do
@@ -38,7 +39,15 @@ class TestZaIdValidator < Test::Unit::TestCase
     end
 
     should "be a valid ID number" do
-      assert valid_za_identity_number?(@valid)
+      result = valid_za_identity_number?(@valid)
+      assert_not_nil(result)
+      assert(result)
+    end
+
+    should "be a valid ID number (when passed as an int)" do
+      result = valid_za_identity_number?(@valid_integer)
+      assert_not_nil(result)
+      assert(result)
     end
 
   end
@@ -50,7 +59,30 @@ class TestZaIdValidator < Test::Unit::TestCase
     end
 
     should "not be a valid ID number" do
-      assert !valid_za_identity_number?(@invalid)
+      result = valid_za_identity_number?(@invalid)
+      assert_not_nil(result)
+      assert(!result)
+    end
+
+  end
+
+  context "an ID number that is too long" do
+
+    setup do
+      @too_long = "80010150090871"
+      @too_long_integer = 80010150090871
+    end
+
+    should "not be a valid ID number" do
+      result = valid_za_identity_number?(@too_long)
+      assert_not_nil(result)
+      assert(!result)
+    end
+
+    should "not be a valid ID number (when passed as an int)" do
+      result = valid_za_identity_number?(@too_long_integer)
+      assert_not_nil(result)
+      assert(!result)
     end
 
   end

data/za-id-validator.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{za-id-validator}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Craig Paterson"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: za-id-validator
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Craig Paterson