Merge pull request #24 from mikoto2000/add-isbn-validation

Fix ISBN validation to BookMaster model

Author: mikoto2000

Gemfile

@@ -68,3 +68,5 @@ gem "rubocop-i18n", group: "development"
 gem "rubocop-thread_safety", group: "development"
 gem "erb_lint", group: "development"
 gem "date_validator"
+
+gem "isbn_validation", "~> 1.2"

Gemfile.lock

@@ -131,6 +131,8 @@ GEM
     irb (1.14.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
+    isbn_validation (1.2.2)
+      activerecord (>= 3)
     jbuilder (2.12.0)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
@@ -329,6 +331,7 @@ DEPENDENCIES
   debug
   erb_lint
   importmap-rails
+  isbn_validation
   jbuilder
   pagy
   pg (~> 1.1)
@@ -351,4 +354,4 @@ DEPENDENCIES
   web-console
 
 BUNDLED WITH
-   2.5.11
+   2.5.16

app/models/book_master.rb

@@ -9,10 +9,7 @@ def self.ransackable_associations(_auth_object = nil)
     %w[authors book_author_relationship ndc_category]
   end
 
-  # TODO: ちゃんとした判定ロジックを作る
-  VALID_ISBN_PATTERN = /[0-9\-]+/
-
-  validates :isbn, presence: true, uniqueness: true, format: { with: VALID_ISBN_PATTERN }
+  validates :isbn, presence: true, uniqueness: true, isbn_format: true
   validates :title, presence: true
   validates :publication_date, presence: true
   validates :ndc_category, presence: true

test/models/book_master_test.rb

@@ -1,7 +1,68 @@
 require "test_helper"
 
 class BookMasterTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
+  test "valid ISBN-10" do
+    book = BookMaster.new(isbn: "0306406152", title: "Test Book", publication_date: Date.today, ndc_category: ndc_categories(:one))
+    assert book.valid?
+  end
+
+  test "invalid ISBN-10" do
+    book = BookMaster.new(isbn: "0306406153", title: "Test Book", publication_date: Date.today, ndc_category: ndc_categories(:one))
+    assert_not book.valid?
+  end
+
+  test "valid ISBN-13" do
+    book = BookMaster.new(isbn: "9780306406157", title: "Test Book", publication_date: Date.today, ndc_category: ndc_categories(:one))
+    assert book.valid?
+  end
+
+  test "invalid ISBN-13" do
+    book = BookMaster.new(isbn: "9780306406158", title: "Test Book", publication_date: Date.today, ndc_category: ndc_categories(:one))
+    assert_not book.valid?
+  end
+
+  test "ISBN-10 with X as checksum" do
+    book = BookMaster.new(isbn: "048665088X", title: "Test Book", publication_date: Date.today, ndc_category: ndc_categories(:one))
+    assert book.valid?
+  end
+
+  test "ISBN-10 with invalid characters" do
+    book = BookMaster.new(isbn: "03064O6152", title: "Test Book", publication_date: Date.today, ndc_category: ndc_categories(:one))
+    assert_not book.valid?
+  end
+
+  test "ISBN-13 with invalid characters" do
+    book = BookMaster.new(isbn: "978O306406157", title: "Test Book", publication_date: Date.today, ndc_category: ndc_categories(:one))
+    assert_not book.valid?
+  end
+
+  test "ISBN-10 with incorrect length" do
+    book = BookMaster.new(isbn: "030640615", title: "Test Book", publication_date: Date.today, ndc_category: ndc_categories(:one))
+    assert_not book.valid?
+  end
+
+  test "ISBN-13 with incorrect length" do
+    book = BookMaster.new(isbn: "978030640615", title: "Test Book", publication_date: Date.today, ndc_category: ndc_categories(:one))
+    assert_not book.valid?
+  end
+
+  test "valid hyphenated ISBN-10" do
+    book = BookMaster.new(isbn: "0-306-40615-2", title: "Test Book", publication_date: Date.today, ndc_category: ndc_categories(:one))
+    assert book.valid?
+  end
+
+  test "invalid hyphenated ISBN-10" do
+    book = BookMaster.new(isbn: "0-306-40615-3", title: "Test Book", publication_date: Date.today, ndc_category: ndc_categories(:one))
+    assert_not book.valid?
+  end
+
+  test "valid hyphenated ISBN-13" do
+    book = BookMaster.new(isbn: "978-0-306-40615-7", title: "Test Book", publication_date: Date.today, ndc_category: ndc_categories(:one))
+    assert book.valid?
+  end
+
+  test "invalid hyphenated ISBN-13" do
+    book = BookMaster.new(isbn: "978-0-306-40615-8", title: "Test Book", publication_date: Date.today, ndc_category: ndc_categories(:one))
+    assert_not book.valid?
+  end
 end