IsbnUtils 0.0.0.3 → 0.0.0.4

data/lib/Isbn10DigitValidator.rb

@@ -1,7 +1,6 @@
 require 'IsbnValidator'
 class Isbn10DigitValidator < IsbnValidator
 
-  
   def initialize(isbn10)
     @isbn = isbn10
   end
@@ -9,9 +8,9 @@ class Isbn10DigitValidator < IsbnValidator
   def checkDigit
     @strippedIsbn =  @isbn.gsub(/[^0-9a-z]/i,'')
     if @strippedIsbn.length != 10
-      raise "error not a 10 digit isbn"
+        return false
     end
-    
+   return true 
   end
   
 

data/lib/Isbn13DigitValidator.rb

@@ -7,29 +7,31 @@ class Isbn13DigitValidator < IsbnValidator
       @isbn = isbn13
    end
 
- def checkDigit
-    @strippedIsbn =  @isbn.gsub(/[^0-9a-z]/i,'')
-    if @strippedIsbn.length != 13
-      raise "error not a 13 digit isbn"
-    end
-    
-  end
+
+   def checkDigit
+     @strippedIsbn =  @isbn.gsub(/[^0-9a-z]/i,'')
+     if @strippedIsbn.length != 13
+       return false
+     end
+
+     return true
+   end
   
   
   def validateIsbn
      check = 0
      i = 0
      while i < 12 do
-       check = check +  @strippedIsbn[i].to_i
+       check = check +  @isbn[i].to_i
        i = i + 2 
       end 
       
       i = 1 
       while i < 12 do
-       check = check + 3* @strippedIsbn[i].to_i
+       check = check + 3* @isbn[i].to_i
        i = i + 2 
       end 
-      check = check +  @strippedIsbn[12].to_i
+      check = check +  @isbn[12].to_i
      return check % 10 == 0;
   end
 

data/lib/IsbnValidator.rb

@@ -1,4 +1,4 @@
-#
+
 # The IsbnValidator class defines a template method called validate , which represent 
 # a workflow to follow. The validate method calls checkDigit and validateIsbn methods
 # which have its custom implementation in the subclasses.
@@ -11,8 +11,10 @@ class IsbnValidator
     def validateIsbn; raise METHOD_MISSING; end
 
     def validate
-       checkDigit()
-       result = validateIsbn()
+        result = checkDigit()
+        if result?
+          result = validateIsbn()
+         end
        return result
     end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: IsbnUtils
 version: !ruby/object:Gem::Version
-  version: 0.0.0.3
+  version: 0.0.0.4
   prerelease: 
 platform: ruby
 authors: