petrarca 0.4.12 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb0ccff65ffe9d1c7e156994de57a1d24252cb4dde61f114903455cc68ab5763
-  data.tar.gz: 72d19fb813fe2eb03a702e2574d53980127b2bb463eb37af851b1b3da635f171
+  metadata.gz: 555636db6e3aff42afbd5f5d6dc82ae87fc93ce54cf0969824efcd55430d5a9a
+  data.tar.gz: 35bf3992488d8c4fbf928b7c44c89cede9fc82828cecf6ffed8e9ea79ff47b49
 SHA512:
-  metadata.gz: 01a5ac13121daa41cd7d106e1db42e3a7a80d712fccded276229780e606faf3bf33aad846b92445bb588a842a1b2b8937efc54c8ba7fb7accebbb93d75632c8b
-  data.tar.gz: 71c549ce192376ac2d413a94cfd77242edf58bae0627e513b129d03ff68c5552db5ef544ae6410cfb08888ede4e4d6ddcedba769f364d2884008e18dc695a268
+  metadata.gz: 6261436383f789b8fcfc67eccee809d6ce1c44d959dc137406354297e9dd0af53406f3c0556c0cd7784cc3aa0d24b3f01e6b75da08285d499a26a256f9482c88
+  data.tar.gz: d07edfb969d86a50b73ed9ce80c48f4519aa7e967e501c7cd10407ec2e0e73d1ee1da111fd3e7e761eff467fa3e81d632233bc34e4f1ef561d87e24d31e541ec

data/README.md

@@ -12,7 +12,7 @@ All functions support both ISBN-13 and ISBN-10.
 All ranges of registration groups and registrants are supported.
 Those depends on 'RangeMessage.xml' file, downloaded from [International ISBN Agency](https://www.isbn-international.org/range_file_generation).
 
-NOTE: Updated range files to latest version on February 8, 2022.
+NOTE: Updated range files to latest version on May 4, 2022.
 
 ## Installation
 
@@ -45,6 +45,28 @@ Or install it yourself as:
     irb(main):006:0> Petrarca.hyphenate("9784815606442")
     => "978-4-8156-0644-2"
 
+SINCE v0.5.0
+
+Accept Integer as ISBN, only if no `-` and `X` including.
+
+    irb(main):001:0> require 'petrarca'
+    => true
+    irb(main):002:0> Petrarca.calc_check_digit(978481560644)
+    => "2"
+    irb(main):003:0> Petrarca.to_10(9784815606442)
+    => "4-8156-0644-7"
+    irb(main):004:0> Petrarca.to_13(4815606447)
+    => "978-4-8156-0644-2"
+    irb(main):005:0> Petrarca.hyphenate(9784815606442)
+    => "978-4-8156-0644-2"
+
+If the ISBN is hyphenated, consider registration group and registrant in `Petrarca.valid?`. The second example below has the invalid registrant.
+
+    irb(main):006:0> Petrarca.valid?("978-4-8156-0644-2")
+    => true
+    irb(main):007:0> Petrarca.valid?("978-4-815-60644-2")
+    => false
+
 ## License
 
 MIT License

data/data/registrant_ranges.txt

@@ -1,7 +1,7 @@
 # Generated from RangeMessage.xml file, downloaded from https://www.isbn-international.org/range_file_generation.
 #
 # International ISBN Agency
-# Tue, 8 Feb 2022 02:45:23 GMT
+# Wed, 4 May 2022 07:09:56 BST
 #
 # English language
 978-0:00-19,200-227,2280-2289,229-368,3690-3699,370-638,6390-6397,6398000-6399999,640-644,6450000-6459999,646-647,6480000-6489999,649-654,6550-6559,656-699,7000-8499,85000-89999,900000-949999,9500000-9999999
@@ -60,9 +60,9 @@
 # Iran
 978-622:00-10,200-324,5650-7999,94000-99999
 # Indonesia
-978-623:00-09,200-499,5500-7999,90000-99999
+978-623:00-09,200-499,5250-7999,88000-99999
 # Sri Lanka
-978-624:00-04,200-249,5000-6249,95000-99999
+978-624:00-04,200-249,5000-6349,94500-99999
 # Turkey
 978-625:00-00,400-442,44300-44499,445-449,7000-7793,77940-77949,7795-8499
 # Taiwan
@@ -70,7 +70,9 @@
 # Pakistan
 978-627:30-31,500-524,7500-7999
 # Colombia
-978-628:00-09,500-549,7500-8499
+978-628:00-09,500-549,7500-8499,95000-99999
+# Malaysia
+978-629:00-02,470-499,7500-7999,96500-99999
 # Romania
 978-630:300-349,6500-6849
 # Brazil
@@ -187,6 +189,8 @@
 978-988:00-11,12000-19999,200-739,74000-76999,77000-79999,8000-9699,97000-99999
 # Portugal
 978-989:0-1,20-34,35000-36999,37-52,53000-54999,550-799,8000-9499,95000-99999
+# Montenegro
+978-9911:550-749
 # Tanzania
 978-9912:40-44,750-799,9850-9999
 # Uganda
@@ -196,7 +200,7 @@
 # Uruguay
 978-9915:40-59,650-799,9300-9999
 # Estonia
-978-9916:0-0,10-39,4-4,600-749,9500-9999
+978-9916:0-0,10-39,4-5,600-749,9500-9999
 # Bolivia
 978-9917:0-0,30-34,600-699,9800-9999
 # Malta
@@ -436,7 +440,7 @@
 # Eritrea
 978-99948:0-4,50-79,800-999
 # Mauritius
-978-99949:0-1,20-89,900-999
+978-99949:0-1,20-79,8-8,900-999
 # Cambodia
 978-99950:0-4,50-79,800-999
 # Reserved Agency
@@ -476,7 +480,7 @@
 # Botswana
 978-99968:0-3,400-599,60-89,900-999
 # Oman
-978-99969:0-4,50-79,800-999
+978-99969:0-4,50-79,800-949,95-99
 # Haiti
 978-99970:0-4,50-89,900-999
 # Myanmar
@@ -513,6 +517,8 @@
 978-99987:850-999
 # Sudan
 978-99988:0-0,50-54,800-824
+# Ethiopia
+978-99990:0-0,50-54,975-999
 # France
 979-10:00-19,200-699,7000-8999,90000-97599,976000-999999
 # Korea, Republic
@@ -520,4 +526,4 @@
 # Italy
 979-12:200-299,5450-5999,80000-84999
 # United States
-979-8:200-219,4000-7999,88500-89999,9850000-9869999
+979-8:200-219,4000-8499,88500-89999,9850000-9869999

data/data/registration_group_ranges.txt

@@ -1,7 +1,7 @@
 # Generated from RangeMessage.xml file, downloaded from https://www.isbn-international.org/range_file_generation.
 #
 # International ISBN Agency
-# Tue, 8 Feb 2022 02:45:23 GMT
+# Wed, 4 May 2022 07:09:56 BST
 #
 # International ISBN Agency
 978:0-5,600-649,65-65,7-7,80-94,950-989,9900-9989,99900-99999

data/lib/petrarca/helpers.rb

@@ -1,10 +1,37 @@
 module Petrarca
+
+  class InvalidEANPrefixError < StandardError; end
+  class InvalidRangeError < StandardError; end
+
   module Helpers
 
     extend self
 
+    def split(isbn)
+      isbn = isbn.to_s.delete("-")
+      ean_prefix = isbn[0, 3]
+      unless ean_prefix == "978" || ean_prefix == "979"
+        raise InvalidEANPrefixError.new("Invalid EAN prefix: #{ean_prefix}")
+      end
+      body = isbn[3, 9]
+      check_digit = isbn[12, 1]
+      begin
+        registration_group, body = Helpers.split_to_parts(body, REGISTRATION_GROUP_RANGES[ean_prefix])
+      rescue InvalidRangeError
+        raise InvalidRangeError.new("Registration group is not defined: #{body} (under #{ean_prefix})")
+      end
+      prefix = "#{ean_prefix}-#{registration_group}"
+      begin
+        registrant, publication = Helpers.split_to_parts(body, REGISTRANT_RANGES[prefix])
+      rescue InvalidRangeError
+        raise InvalidRangeError.new("Registrant is not defined: #{body} (under #{prefix})")
+      end
+      [ean_prefix, registration_group, registrant, publication, check_digit]
+    end
+
+
     def split_to_parts(body, ranges)
-      ranges.map do |range_str|
+      parts = ranges.map do |range_str|
         s, e = range_str.split("-")
         prefix = body[0, s.size]
         if Range.new(s.to_i, e.to_i).cover?(prefix.to_i)
@@ -12,7 +39,12 @@ module Petrarca
         else
           nil
         end
-      end.compact.first
+      end.compact
+      unless parts.empty?
+        parts.first
+      else
+        raise InvalidRangeError.new(body)
+      end
     end
 
 

data/lib/petrarca/isbn10.rb

@@ -7,16 +7,25 @@ module Petrarca
     extend self
 
     def valid?(isbn)
-      correct_format?(isbn) && isbn[-1] == calc_check_digit(isbn)
+      isbn = isbn.to_s
+      if correct_format?(isbn) && isbn[-1] == calc_check_digit(isbn)
+        if isbn.include?("-")
+          Helpers.split("978" + isbn).drop(1) == isbn.split("-")
+        else
+          true
+        end
+      else
+        false
+      end
     end
 
     def correct_format?(isbn)
-      isbn = isbn.delete("-")
+      isbn = isbn.to_s.delete("-")
       !!(/\A\d{9}[0-9X]\z/ =~ isbn)
     end
 
     def calc_check_digit(isbn)
-      nums = isbn.delete("-").split("")[0, 9].map{|x| x.to_i }
+      nums = isbn.to_s.delete("-").split("")[0, 9].map{|x| x.to_i }
       sum = nums.zip((2..10).to_a.reverse).map{|x, y| x * y }.inject(:+)
       check_digit = 11 - (sum % 11)
       case check_digit
@@ -30,8 +39,7 @@ module Petrarca
     end
 
     def hyphenate(isbn)
-      s = ISBN13.hyphenate("978" + isbn)
-      s.sub(/^978-/, "")
+      Helpers.split("978" + isbn.to_s).drop(1).join("-")
     end
 
   end

data/lib/petrarca/isbn13.rb

@@ -7,29 +7,32 @@ module Petrarca
     extend self
 
     def valid?(isbn)
-      correct_format?(isbn) && isbn[-1] == calc_check_digit(isbn)
+      isbn = isbn.to_s
+      if correct_format?(isbn) && isbn[-1] == calc_check_digit(isbn)
+        if isbn.include?("-")
+          Helpers.split(isbn) == isbn.split("-")
+        else
+          true
+        end
+      else
+        false
+      end
     end
 
     def correct_format?(isbn)
-      isbn = isbn.delete("-")
+      isbn = isbn.to_s.delete("-")
       !!(/\A97[89]\d{9}\d\z/ =~ isbn)
     end
 
     def calc_check_digit(isbn)
-      nums = isbn.delete("-").split("")[0, 12].map{|x| x.to_i }
+      nums = isbn.to_s.delete("-").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 hyphenate(isbn)
-      ean_prefix = isbn[0, 3]
-      body = isbn[3, 9]
-      check_digit = isbn[12, 1]
-      registration_group, body = Helpers.split_to_parts(body, REGISTRATION_GROUP_RANGES[ean_prefix])
-      prefix = "#{ean_prefix}-#{registration_group}"
-      registrant, publication = Helpers.split_to_parts(body, REGISTRANT_RANGES[prefix])
-      [ean_prefix, registration_group, registrant, publication, check_digit].join("-")
+      Helpers.split(isbn).join("-")
     end
 
   end

data/lib/petrarca/version.rb

@@ -1,3 +1,3 @@
 module Petrarca
-  VERSION = "0.4.12"
+  VERSION = "0.5.0"
 end

data/lib/petrarca.rb

@@ -15,7 +15,7 @@ module Petrarca
   extend self
 
   def valid?(isbn)
-    case isbn.delete("-").size
+    case isbn.to_s.delete("-").size
     when 13
       ISBN13.valid?(isbn)
     when 10
@@ -26,7 +26,7 @@ module Petrarca
   end
 
   def correct_format?(isbn)
-    case isbn.delete("-").size
+    case isbn.to_s.delete("-").size
     when 13
       ISBN13.correct_format?(isbn)
     when 10
@@ -37,7 +37,7 @@ module Petrarca
   end
 
   def calc_check_digit(isbn)
-    isbn = isbn.delete("-")
+    isbn = isbn.to_s.delete("-")
     case isbn.size
     when 12, 13
       ISBN13.calc_check_digit(isbn)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: petrarca
 version: !ruby/object:Gem::Version
-  version: 0.4.12
+  version: 0.5.0
 platform: ruby
 authors:
 - takatoh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-08 00:00:00.000000000 Z
+date: 2022-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler