petrarca 0.6.6 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8bc4e6d2b94cc50fd61a5152335ff676dabbc3e45ff185c425cf47a5ef7117a
-  data.tar.gz: 339e02cec60630737b3473dc2a92864d1e0955d3e6da13da6f8a343a9fa11998
+  metadata.gz: 4132d184b7107b98f372097e6e2273360abd3ced931d5d6bcc0690eceae20e9b
+  data.tar.gz: 519bc872dd45f3bfec7fda6cbd85d3b33128c2e593c6467627a4481894e91800
 SHA512:
-  metadata.gz: 4ebe8344544e72a5f8089a0c5a9774020c06ed5f3291c2cdde7974ee48dec6d5b4c2f45adface835e7d6b97654fe9f7455a0d351520866aa969a87cbd7790a6e
-  data.tar.gz: b702f7590ef378a74a82a9acb8dd3e57999176bcdeede5467e480f4bbdd2c838711583ae7f119d69b7fadcf7543e22c899f1c51bd236a2ec51d83da8c6dca20f
+  metadata.gz: 5c0c7387558e3655a79370bece28b685df72ce5e2334bdcb4b059190886ad66fe44d9b3ac9142237915b9fa123a0582cabcb65e9e61fb3e53212d6ec37215710
+  data.tar.gz: de4ee6524415ccdc74e31a02f236d68077299b3f83cc2fd9e366616b7fdb98eb0a5790d8cc32ff7dfda3558bbc46b24a33abaac2e50855eee7aab2e17333048b

data/.gitignore

@@ -1,13 +1,13 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-/vendor/
-/Gemfile.lock
-*.txt
-*.xml
-.ruby-version
+/.bundle/
+/.yardoc
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+/vendor/
+/Gemfile.lock
+*.txt
+*.xml
+.ruby-version

data/.rspec

@@ -1 +1 @@
---require spec_helper
+--require spec_helper

data/Gemfile

@@ -1,4 +1,7 @@
-source "https://rubygems.org"
-
-# Specify your gem's dependencies in isbn_utils.gemspec
-gemspec
+source "https://rubygems.org"
+
+# Specify your gem's dependencies in isbn_utils.gemspec
+gemspec
+
+gem "rake", "~> 13.0"
+gem "rspec", "~> 3.0"

data/LICENSE.txt

@@ -1,22 +1,22 @@
-Copyright (c) 2020 takatoh
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright (c) 2020 takatoh
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,82 +1,84 @@
-# Petrarca
-
-This library Petrarca provides some utility functions to manipulate ISBN numbers:
-
-- Validation
-- Calculate check digit
-- Mutual conversion of ISBN-13 and ISBN-10
-- Hyphenation / Dehyphenation
-- Split to a array that includes ISBN segments
-
-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 July 6, 2024.
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'petrarca'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install petrarca
-
-## Usage
-
-    irb(main):001:0> require 'petrarca'
-    => true
-    irb(main):002:0> Petrarca.valid?("978-4-8156-0644-2")
-    => true
-    irb(main):003:0> Petrarca.calc_check_digit("978-4-8156-0644-2")
-    => "2"
-    irb(main):004:0> Petrarca.to_10("978-4-8156-0644-2")
-    => "4-8156-0644-7"
-    irb(main):005:0> Petrarca.to_13("4-8156-0644-7")
-    => "978-4-8156-0644-2"
-    irb(main):006:0> Petrarca.hyphenate("9784815606442")
-    => "978-4-8156-0644-2"
-    irb(main):007:0> Petrarca.dehyphenate("978-4-8156-0644-2")
-    => "9784815605442"
-    irb(main):008:0> Petrarca.split("9784815606442")
-    => ["978", "4", "8156", "0644", "2"]
-
-`Petrarca.dehyphenate` and `Petrarca.split` are new in v0.6.0.
-
-Accept Integer as ISBN, only if no `-` and `X` including. (New in v0.5.0)
-
-    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, registration group and registrant are considered 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
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at
-https://github.com/takatoh/Petrarca.
+# Petrarca
+
+This library Petrarca provides some utility functions to manipulate ISBN numbers:
+
+- Validation
+- Calculate check digit
+- Mutual conversion of ISBN-13 and ISBN-10
+- Hyphenation / Dehyphenation
+- Split to an array that includes ISBN segments
+
+All functions support both ISBN-13 and ISBN-10.
+
+All ranges of registration groups and registrants are supported.
+Those depend indirectly on data published by the [International ISBN agency](https://www.isbn-international.org/) through 'isbnranges' gem.
+
+**In version 1.0.0, the range files have been removed. Instead, the data provided by 'isbnranges' gem is used.** See https://github.com/takatoh/ISBNRanges for more information.
+
+**No longer update just for range files.**
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem "petrarca"
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install petrarca
+
+## Usage
+
+    irb(main):001:0> require "petrarca"
+    => true
+    irb(main):002:0> Petrarca.valid?("978-4-8156-0644-2")
+    => true
+    irb(main):003:0> Petrarca.calc_check_digit("978-4-8156-0644-2")
+    => "2"
+    irb(main):004:0> Petrarca.to_10("978-4-8156-0644-2")
+    => "4-8156-0644-7"
+    irb(main):005:0> Petrarca.to_13("4-8156-0644-7")
+    => "978-4-8156-0644-2"
+    irb(main):006:0> Petrarca.hyphenate("9784815606442")
+    => "978-4-8156-0644-2"
+    irb(main):007:0> Petrarca.dehyphenate("978-4-8156-0644-2")
+    => "9784815605442"
+    irb(main):008:0> Petrarca.split("9784815606442")
+    => ["978", "4", "8156", "0644", "2"]
+
+`Petrarca.dehyphenate` and `Petrarca.split` are new in v0.6.0.
+
+Accept Integer as ISBN, only if no `-` and `X` including. (New in v0.5.0)
+
+    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, registration group and registrant are considered 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
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at
+https://github.com/takatoh/Petrarca.

data/Rakefile

@@ -1,9 +1,2 @@
-require "bundler/gem_tasks"
-task :default => :spec
-
-namespace :range do
-  desc "Generate registrant range files"
-  task :generate do
-    ruby "scripts/generate_range_files.rb --dir data"
-  end
-end
+require "bundler/gem_tasks"
+task :default => :spec

data/bin/console

@@ -1,14 +1,14 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "petrarca"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "petrarca"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +1,8 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/lib/petrarca/helpers.rb

@@ -1,64 +1,51 @@
-module Petrarca
-
-  class InvalidEANPrefixError < StandardError; end
-  class InvalidRangeError < StandardError; end
-
-  module Helpers
-
-    extend self
-
-    def split(isbn)
-      isbn = Petrarca.dehyphenate(isbn)
-      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)
-      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)
-          [prefix, body[(prefix.size)..]]
-        else
-          nil
-        end
-      end.compact
-      unless parts.empty?
-        parts.first
-      else
-        raise InvalidRangeError.new(body)
-      end
-    end
-
-
-    def load_ranges(range_file)
-      ranges = {}
-      File.open(range_file, "r") do |f|
-        f.each_line do |line|
-          next if line.start_with?("#")
-          g, r = line.chomp.split(":")
-          ranges[g] = r.split(",") unless r.nil?
-        end
-      end
-      ranges
-    end
-
-  end
-end
+module Petrarca
+
+  class InvalidEANPrefixError < StandardError; end
+  class InvalidRangeError < StandardError; end
+
+  module Helpers
+
+    extend self
+
+    def split(isbn)
+      isbn = Petrarca.dehyphenate(isbn)
+      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)
+      parts = ranges.map do |range|
+        s, e = range
+        prefix = body[0, s.size]
+        if Range.new(s, e).cover?(prefix)
+          [prefix, body[(prefix.size)..]]
+        else
+          nil
+        end
+      end.compact
+      unless parts.empty?
+        parts.first
+      else
+        raise InvalidRangeError.new(body)
+      end
+    end
+
+  end
+end

data/lib/petrarca/isbn10.rb

@@ -1,54 +1,54 @@
-require "petrarca/helpers"
-
-
-module Petrarca
-  module ISBN10
-
-    extend self
-
-    def valid?(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 = dehyphenate(isbn)
-      !!(/\A\d{9}[0-9X]\z/ =~ isbn)
-    end
-
-    def calc_check_digit(isbn)
-      nums = dehyphenate(isbn).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
-      when 10
-        "X"
-      when 11
-        "0"
-      else
-        check_digit.to_s
-      end
-    end
-    
-    def dehyphenate(isbn)
-      Petrarca.dehyphenate(isbn)
-    end
-
-    def hyphenate(isbn)
-      split(isbn).join("-")
-    end
-
-    def split(isbn)
-      Helpers.split("978" + isbn.to_s).drop(1)
-    end
-
-  end
-end
+require "petrarca/helpers"
+
+
+module Petrarca
+  module ISBN10
+
+    extend self
+
+    def valid?(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 = dehyphenate(isbn)
+      !!(/\A\d{9}[0-9X]\z/ =~ isbn)
+    end
+
+    def calc_check_digit(isbn)
+      nums = dehyphenate(isbn).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
+      when 10
+        "X"
+      when 11
+        "0"
+      else
+        check_digit.to_s
+      end
+    end
+    
+    def dehyphenate(isbn)
+      Petrarca.dehyphenate(isbn)
+    end
+
+    def hyphenate(isbn)
+      split(isbn).join("-")
+    end
+
+    def split(isbn)
+      Helpers.split("978" + isbn.to_s).drop(1)
+    end
+
+  end
+end

data/lib/petrarca/isbn13.rb

@@ -1,47 +1,47 @@
-require "petrarca/helpers"
-
-
-module Petrarca
-  module ISBN13
-
-    extend self
-
-    def valid?(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 = dehyphenate(isbn)
-      !!(/\A97[89]\d{9}\d\z/ =~ isbn)
-    end
-
-    def calc_check_digit(isbn)
-      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)
-      split(isbn).join("-")
-    end
-
-    def split(isbn)
-      Helpers.split(isbn)
-    end
-
-  end
-end
+require "petrarca/helpers"
+
+
+module Petrarca
+  module ISBN13
+
+    extend self
+
+    def valid?(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 = dehyphenate(isbn)
+      !!(/\A97[89]\d{9}\d\z/ =~ isbn)
+    end
+
+    def calc_check_digit(isbn)
+      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)
+      split(isbn).join("-")
+    end
+
+    def split(isbn)
+      Helpers.split(isbn)
+    end
+
+  end
+end

data/lib/petrarca/version.rb

@@ -1,3 +1,3 @@
-module Petrarca
-  VERSION = "0.6.6"
-end
+module Petrarca
+  VERSION = "1.0.0"
+end