lib/petrarca/isbn13.rb in petrarca-0.5.15 vs lib/petrarca/isbn13.rb in petrarca-0.6.0

@@ -18,22 +18,30 @@
         false
       end
     end
 
     def correct_format?(isbn)
-      isbn = isbn.to_s.delete("-")
+      isbn = dehyphenate(isbn)
       !!(/\A97[89]\d{9}\d\z/ =~ isbn)
     end
 
     def calc_check_digit(isbn)
-      nums = isbn.to_s.delete("-").split("")[0, 12].map{|x| x.to_i }
+      nums = dehyphenate(isbn).split("")[0, 12].map{|x| x.to_i }
       sum = nums.zip([1, 3] * 6).map{|x, y| x * y }.inject(:+)
       check_digit = 10 - (sum % 10)
       check_digit == 10 ? "0" : check_digit.to_s
     end
 
+    def dehyphenate(isbn)
+      Petrarca.dehyphenate(isbn)
+    end
+
     def hyphenate(isbn)
-      Helpers.split(isbn).join("-")
+      split(isbn).join("-")
+    end
+
+    def split(isbn)
+      Helpers.split(isbn)
     end
 
   end
 end