petrarca 0.2.0 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78b04a2cf61f74ad207570c95631cf1a2187be066ee096ab0a321799e45fb986
-  data.tar.gz: 12625949933981779b0cc28a3b5267565e877a1e27dbe4ecfd9f92ecc68bee9a
+  metadata.gz: e4d096eb521f4211740b769c35d15b5c4a707c62e14bc0b6299523cc9d66cd06
+  data.tar.gz: 51aa0420797105c2ff2323cf77c50b1cb51344e9ed859e5bc2c54c497e0d20d5
 SHA512:
-  metadata.gz: 58460aad6cbfc5b8c251a1dd9ab897cae10366cb46b8db8374c6242818364bca9875ce6bc3413262fc71a729f87ab1df87f5cd13fb4bc442e2bc1358634dff71
-  data.tar.gz: b25f466050d74bf9b2b2182aeb2174c5e480b71c31de54fa1aed7ce5168c40cd1c975ff1194ff8d30c0539413212e42e84d4ae550754f32e159b5bcf408887ab
+  metadata.gz: 1d9c167c08d74014361c760f71c82b8e825dd4e0c693b8c28f10eeab05a38edde01db908c634089f36f646c42232d6f811fccb9d55da14b795093c419e2498b4
+  data.tar.gz: d468f62ba32ce0fe075f5c691cc8091d58a6efe0708cfd9b901d111431c2cd551aeaad9a542faf0e9d3efd746e265ffd267ebb2374f049271fcd6df16f2766ce

data/.gitignore

@@ -9,3 +9,4 @@
 /vendor/
 /Gemfile.lock
 *.txt
+*.xml

data/README.md

@@ -9,7 +9,10 @@ This library Petrarca provides some utility functions to manipulate ISBN numbers
 
 All functions support both ISBN-13 and ISBN-10.
 
-Note: Only registrant ranges for Japan are currently supported.
+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 19, 2021.
 
 ## Installation
 

data/Rakefile

@@ -1,2 +1,9 @@
 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

data/lib/petrarca.rb

@@ -59,12 +59,12 @@ module Petrarca
   end
 
   def to_10(isbn13)
-    s = isbn13.to_s.delete("-")[3..11]
+    s = isbn13.to_s.delete("-")[3, 9]
     ISBN10.hyphenate(s + ISBN10.calc_check_digit(s))
   end
 
   def to_13(isbn10)
-    s = "978" + isbn10.to_s.delete("-")[0..8]
+    s = "978" + isbn10.to_s.delete("-")[0, 9]
     ISBN13.hyphenate(s + ISBN13.calc_check_digit(s))
   end
 

data/lib/petrarca/helpers.rb

@@ -1,34 +1,28 @@
 module Petrarca
   module Helpers
 
+    extend self
+
     def split_to_parts(body, ranges)
-      g = ""
-      ranges.each do |range_str|
+      ranges.map do |range_str|
         s, e = range_str.split("-")
-        g = body[0..(s.size - 1)]
-        break if Range.new(s.to_i, e.to_i).cover?(g.to_i)
-      end
-      [g, body[(g.size)..]]
-    end
-
-    def hyphenate13(isbn)
-      ean_prefix = isbn[0..2]
-      body = isbn[3..11]
-      check_digit = isbn[12..12]
-      registration_group, body = split_to_parts(body, REGISTRATION_GROUP_RANGES[ean_prefix])
-      prefix = "#{ean_prefix}-#{registration_group}"
-      registrant, publication = split_to_parts(body, REGISTRANT_RANGES[prefix])
-      [ean_prefix, registration_group, registrant, publication, check_digit].join("-")
+        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.first
     end
 
 
-    def self.load_ranges(range_file)
+    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(",")
+          ranges[g] = r.split(",") unless r.nil?
         end
       end
       ranges

data/lib/petrarca/isbn10.rb

@@ -4,8 +4,6 @@ require "petrarca/helpers"
 module Petrarca
   module ISBN10
 
-    include Helpers
-
     extend self
 
     def valid?(isbn)
@@ -18,7 +16,7 @@ module Petrarca
     end
 
     def calc_check_digit(isbn)
-      nums = isbn.delete("-").split("")[0..8].map{|x| x.to_i }
+      nums = isbn.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
@@ -32,7 +30,7 @@ module Petrarca
     end
 
     def hyphenate(isbn)
-      s = hyphenate13("978" + isbn)
+      s = ISBN13.hyphenate("978" + isbn)
       s.sub(/^978-/, "")
     end
 

data/lib/petrarca/isbn13.rb

@@ -4,8 +4,6 @@ require "petrarca/helpers"
 module Petrarca
   module ISBN13
 
-    include Helpers
-
     extend self
 
     def valid?(isbn)
@@ -18,14 +16,20 @@ module Petrarca
     end
 
     def calc_check_digit(isbn)
-      nums = isbn.delete("-").split("")[0..11].map{|x| x.to_i }
+      nums = isbn.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)
-      hyphenate13(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("-")
     end
 
   end

data/lib/petrarca/version.rb

@@ -1,3 +1,3 @@
 module Petrarca
-  VERSION = "0.2.0"
+  VERSION = "0.4.3"
 end

data/petrarca.gemspec

@@ -13,6 +13,8 @@ Gem::Specification.new do |spec|
   spec.description   = %q{Library to manipulate ISBN numbers for Ruby.}
   spec.homepage      = "https://github.com/takatoh/Petrarca"
 
+  spec.licenses      = ["MIT"]
+
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
 #  if spec.respond_to?(:metadata)
@@ -38,4 +40,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", ">= 3.0.0"
+  spec.add_development_dependency "nokogiri"
 end

data/scripts/generate_range_files.rb

@@ -0,0 +1,82 @@
+# encoding: utf-8
+
+require "nokogiri"
+require "optparse"
+
+
+RANGE_MESSAGE_FILE = "RangeMessage.xml"
+REGISTRATION_GROUP_RANGES_FILE = "registration_group_ranges.txt"
+REGISTRANT_RANGES_FILE = "registrant_ranges.txt"
+
+
+def main
+  options = {
+    dir: "."
+  }
+  opts = OptionParser.new
+  opts.on("-d", "--dir=DIR", String, "Set directory, output range fiels into."){|v|
+    options[:dir] = v
+  }
+  opts.parse!
+
+  doc = File.open(RANGE_MESSAGE_FILE, "r"){|f| Nokogiri::XML(f) }
+
+  metadata = {
+    source: doc.xpath("//MessageSource").text,
+    date: doc.xpath("//MessageDate").text
+  }
+
+  registration_groups = extract_ranges(doc.xpath("//EAN.UCC"))
+  registrants = extract_ranges(doc.xpath("//Group"))
+
+  output_range_file(
+    registration_groups,
+    File.join(options[:dir], REGISTRATION_GROUP_RANGES_FILE),
+    metadata
+  )
+  output_range_file(
+    registrants,
+    File.join(options[:dir], REGISTRANT_RANGES_FILE),
+    metadata
+  )
+end
+
+def extract_ranges(nodes)
+  nodes.map do |node|
+    prefix = node.xpath("Prefix").text
+    agency = node.xpath("Agency").text
+    ranges = node.xpath("Rules/Rule").map do |rule|
+      length = rule.xpath("Length").text.to_i
+      range = if length > 0
+        rule.xpath("Range").text.split("-").map{|s| s[0, length] }.join("-")
+      else
+        nil
+      end
+      range
+    end.compact
+    {
+      "prefix" => prefix,
+      "agency" => agency,
+      "ranges" => ranges
+    }
+  end
+end
+
+def output_range_file(ranges, range_file, metadata)
+  File.open(range_file, "w") do |f|
+    f.puts "# Generated from RangeMessage.xml file, downloaded from https://www.isbn-international.org/range_file_generation."
+    f.puts "#"
+    f.puts "# " + metadata[:source]
+    f.puts "# " + metadata[:date]
+    f.puts "#"
+    ranges.each do |range|
+      f.puts "# " + range["agency"]
+      f.puts range["prefix"] + ":" + range["ranges"].join(",")
+    end
+  end
+  $stderr.puts "Generated: #{range_file}"
+end
+
+
+
+main

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: petrarca
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.3
 platform: ruby
 authors:
 - takatoh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-30 00:00:00.000000000 Z
+date: 2021-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Library to manipulate ISBN numbers for Ruby.
 email:
 - takatoh.m@gmail.com
@@ -75,8 +89,10 @@ files:
 - lib/petrarca/isbn13.rb
 - lib/petrarca/version.rb
 - petrarca.gemspec
+- scripts/generate_range_files.rb
 homepage: https://github.com/takatoh/Petrarca
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []