petrarca 0.4.14 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f30d4ed1e6dbb387565a884feda53df61cddd0cf13a85709ac4f0181c280b0b8
-  data.tar.gz: 3688e3d078594adec49661bf53143accbdb0ab6d8752967a35ca8f713e110dfd
+  metadata.gz: 1c7dd922e92b20bfdb753eabea5ed5ebc5a17047a28a2e9b626196922f5dc1be
+  data.tar.gz: 2459dd81b3d7c31acd1a5e5763e82d870e2e399f9580e445dec0c37b364ac0ab
 SHA512:
-  metadata.gz: b41868b2851ac750ea202ec618997463dc3266344826044394d593db593be0be66ec1a2772bc59c3321c4f01c355ac4913ea53b69b92ac020f731b990a464e9a
-  data.tar.gz: 6278fa8927717b25ceec8a42cb3fa301dee6cfff74bd665f24d55c6e570ea2d13fc689f1a7d2b16059babc60729bd91325820cac4f4a88291ee2ed05aedd984c
+  metadata.gz: 5ad250d61d24ab92931600c04e2027370d61c9da1358459fb5ee1aebfdcbb9515b6dd4fe1dda024c46a261e8469d01c33bd7a6d6f0a2d045bf8c10d4e589715b
+  data.tar.gz: 955ad99e4add12f5e4d437f6abae2d1f8fe3be64729b8213e2dd29cb9e20f43b43bb43b9573e77e9a7462b0b818a7217bcc4e07a658a7b7aca501f1e365df4af

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 April 2, 2022.
+NOTE: Updated range files to latest version on August 12, 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
-# Sat, 2 Apr 2022 22:26:31 BST
+# Fri, 12 Aug 2022 04:58:16 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
@@ -58,7 +58,7 @@
 # Philippines
 978-621:00-29,400-599,8000-8999,95000-99999
 # Iran
-978-622:00-10,200-324,5650-7999,94000-99999
+978-622:00-10,200-374,5200-7999,92500-99999
 # Indonesia
 978-623:00-09,200-499,5250-7999,88000-99999
 # Sri Lanka
@@ -166,7 +166,7 @@
 # Egypt
 978-977:00-19,200-499,5000-6999,700-849,85000-89999,90-98,990-999
 # Nigeria
-978-978:000-199,2000-2999,30000-79999,8000-8999,900-999
+978-978:000-199,2000-2999,30000-78999,790-799,8000-8999,900-999
 # Indonesia
 978-979:000-099,1000-1499,15000-19999,20-29,3000-3999,400-799,8000-9499,95000-99999
 # Venezuela
@@ -189,16 +189,18 @@
 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:20-24,550-749
 # Tanzania
 978-9912:40-44,750-799,9850-9999
 # Uganda
 978-9913:00-04,600-649,9800-9999
 # Kenya
-978-9914:40-44,700-749,9850-9999
+978-9914:40-49,700-749,9600-9999
 # 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
@@ -206,7 +208,7 @@
 # Mongolia
 978-9919:20-27,500-599,9500-9999
 # Morocco
-978-9920:30-39,550-799,9000-9999
+978-9920:30-41,500-799,8750-9999
 # Kuwait
 978-9921:0-0,30-39,700-899,9700-9999
 # Iraq
@@ -228,7 +230,7 @@
 # Costa Rica
 978-9930:00-49,500-939,9400-9999
 # Algeria
-978-9931:00-25,260-899,9000-9999
+978-9931:00-23,240-249,2500-2599,260-899,9000-9999
 # Lao People's Democratic Republic
 978-9932:00-39,400-849,8500-9999
 # Syria
@@ -492,7 +494,7 @@
 # Tajikistan
 978-99975:0-2,300-399,40-79,800-999
 # Srpska, Republic of
-978-99976:0-1,20-59,600-799,85-89,900-999
+978-99976:0-0,10-15,160-199,20-59,600-799,85-89,900-999
 # Rwanda
 978-99977:0-1,40-69,700-799,995-999
 # Mongolia
@@ -515,6 +517,8 @@
 978-99987:850-999
 # Sudan
 978-99988:0-0,50-54,800-824
+# Paraguay
+978-99989:0-0,50-64,900-999
 # Ethiopia
 978-99990:0-0,50-54,975-999
 # France
@@ -524,4 +528,4 @@
 # Italy
 979-12:200-299,5450-5999,80000-84999
 # United States
-979-8:200-219,4000-8499,88500-89999,9850000-9869999
+979-8:200-229,3500-3999,4000-8499,8500-8849,88500-89999,9850000-9899999

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
-# Sat, 2 Apr 2022 22:26:31 BST
+# Fri, 12 Aug 2022 04:58:16 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.14"
+  VERSION = "0.5.2"
 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.14
+  version: 0.5.2
 platform: ruby
 authors:
 - takatoh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-02 00:00:00.000000000 Z
+date: 2022-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler