petrarca 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78b04a2cf61f74ad207570c95631cf1a2187be066ee096ab0a321799e45fb986
-  data.tar.gz: 12625949933981779b0cc28a3b5267565e877a1e27dbe4ecfd9f92ecc68bee9a
+  metadata.gz: e588fc804e558ead549eeb33f9eeecf157c2d0652927a8ec8057f0057400f932
+  data.tar.gz: e25faf3cf900c1ced7f34884e347c21b3094db97e3ad49640ed8a721c07dc376
 SHA512:
-  metadata.gz: 58460aad6cbfc5b8c251a1dd9ab897cae10366cb46b8db8374c6242818364bca9875ce6bc3413262fc71a729f87ab1df87f5cd13fb4bc442e2bc1358634dff71
-  data.tar.gz: b25f466050d74bf9b2b2182aeb2174c5e480b71c31de54fa1aed7ce5168c40cd1c975ff1194ff8d30c0539413212e42e84d4ae550754f32e159b5bcf408887ab
+  metadata.gz: 4c0add5276c9ab9f1c1babae1d7838771eaf693eda6acf6840fb5c94e78fc85ac70b2e659db2c37e1afa8757f4cba205120f7687385e3406c8b44127dfbd8ce7
+  data.tar.gz: 0efc1a6cdda198cec9799242a976fc5403d9374ec54237027133d181507e79c933606fcba37d11214d712c7fc79748fd664d54bc385f5a44a0868cbc2fa7d136

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,28 +1,22 @@
 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|

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.3.0"
 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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: petrarca
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - takatoh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-30 00:00:00.000000000 Z
+date: 2020-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -76,7 +76,8 @@ files:
 - lib/petrarca/version.rb
 - petrarca.gemspec
 homepage: https://github.com/takatoh/Petrarca
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []