bookworm 0.1.1 → 0.1.2

data/bookworm.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "bookworm"
-  s.version     = "0.1.1"
+  s.version     = "0.1.2"
   s.authors     = ["Tyler Johnston"]
   s.email       = ["tylerjohnst@gmail.com"]
   s.homepage    = "http://github.com/tylerjohnst/bookworm"

data/lib/bookworm.rb

@@ -45,8 +45,7 @@ class Bookworm
   end
 
   def to_thirteen(identifier)
-    identifier = strip_last(identifier)
-    identifier + thirteen_check_digit(identifier)
+    thirteen_strip(identifier) + thirteen_check_digit(identifier)
   end
 
   def scrub(string)
@@ -54,21 +53,29 @@ class Bookworm
     result ? result[1] : nil
   end
 
-  def thirteen_check_digit(identifier)
-    sum = 0
+  def thirteen_check_digit(identifier=isbn)
+    identifier, sum = identifier.rjust(13,"978")[/(.+)\w/,1], 0
+
     12.times do |index|
       digit = identifier[index].to_i
       sum += index.even? ? digit : digit * 3
     end
+
     checksum = (10 - sum % 10)
     checksum == 10 ? '0' : checksum.to_s
   end
 
-  def ten_check_digit(identifier)
+  def thirteen_strip(identifier)
+    identifier.rjust(13,"978")[0..-2]
+  end
+
+  def ten_check_digit(identifier=isbn)
     sum = 0
+    
     9.times do |index|
       sum += (10 - index) * identifier[index].to_i
     end
+
     checksum = 11 - sum % 11
 
     case checksum
@@ -79,10 +86,10 @@ class Bookworm
   end
 
   def is_valid?
-    !!(isbn && isbn[-1] == original[-1])
-  end
-
-  def strip_last(string)
-    string.rjust(13,"978")[/(.+)\w/,1]
+    case original
+    when /^\d{13}/ then original[12] == thirteen_check_digit(original)
+    when /^\d{10}/ then original[9] == ten_check_digit(original)
+    else false
+    end
   end
 end

data/test/bookworm_test.rb

@@ -10,21 +10,21 @@ class BookwormTest < Test::Unit::TestCase
     @bookworm.scrub('9780976805427999990')
   end
 
-  def test_should_create_from_used_and_store_as_new
-    assert_equal '9780976805427', Bookworm.new("2900976805426").isbn
-  end
-
   def test_should_calculate_thirteen_check_digit
-    assert_equal "6", @bookworm.thirteen_check_digit('290097680542')
+    assert_equal "6", @bookworm.thirteen_check_digit('2900976805426')
   end
 
   def test_should_calculate_ten_check_digit
-    assert_equal "1", @bookworm.ten_check_digit("097680542")
+    assert_equal "1", @bookworm.ten_check_digit("0976805421")
   end
 
-  def test_should_convert_from_ten_to_thirteen
+  def test_should_create_from_used
+    assert_equal '9780976805427', Bookworm.new("2900976805426").isbn
+  end
+  
+  def test_should_convert_from_ten
     assert_equal '9780976805427', Bookworm.new("0976805421").as_new
-    assert_equal '', Bookworm.new("0073324922").as_new
+    assert_equal '9780073324920', Bookworm.new("0073324922").as_new
   end
 
   def test_should_convert_to_new

metadata

@@ -2,7 +2,7 @@
 name: bookworm
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Tyler Johnston