library_stdnums 1.4.1 → 1.6.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6e0b3b13d325d0819bac0d053fc76b394e7d5086
+  data.tar.gz: a858dc5935fd3ac806b5dd76d0f6539af1942af7
+SHA512:
+  metadata.gz: bf93f42ec0da3a9cd1d055e6fe3c734811631b0624c92598bed9ea63203a0e9ecce14de18a97e2dc40a5435b6d9a72391114c23a6646e9e36f55647e37ebeb2f
+  data.tar.gz: 7accbad483c800551e25a2d40be93c7926151aa5dbb72d5568bc0fda2898ae8c9d08cc9ae1de8630629c26fe4be9939153476e1e858451280b75a51b23aff290

data/.travis.yml

@@ -1,10 +1,16 @@
 language: ruby
-bundler_args: --without documentation
+cache: bundler
+sudo: false
 rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
   - jruby-19mode
-  - rbx-19mode
-  - jruby-18mode
-  - rbx-18mode
+  - jruby-9.0.4.0
+  - 1.9
+  - 2.2
+  - 2.3.3
+  - 2.4.0
+before_install:
+  - gem update --system
+  - gem uninstall bundler
+  - gem update bundler
+jdk:
+  - oraclejdk8

data/ChangeLog.md

@@ -1,3 +1,5 @@
+* 1.5.0
+  * Added method StdNum::Helpers. extract_multiple_numbers (Michael Harrison)
 * 1.4.1 (2013.12.02)
   * Fixed bug in issn at_least_trying?
 * 1.4.0 (2013.10.23)

data/Rakefile

@@ -1,25 +1,4 @@
 # encoding: utf-8
-
-require 'rubygems'
-
-begin
-  require 'bundler'
-rescue LoadError => e
-  warn e.message
-  warn "Run `gem install bundler` to install Bundler."
-  exit e.status_code
-end
-
-begin
-  Bundler.setup(:development)
-rescue Bundler::BundlerError => e
-  warn e.message
-  warn "Run `bundle install` to install missing gems."
-  exit e.status_code
-end
-
-require 'rake'
-
 require "bundler/gem_tasks"
 
 require 'yard'
@@ -34,4 +13,4 @@ Rake::TestTask.new do |test|
 end
 
 task :default => :test
-task :spec => :test
+task :spec => :test

data/lib/library_stdnums.rb

@@ -21,6 +21,18 @@ module StdNum
       return (match[1].gsub(/\-/, '')).upcase
     end
 
+    # Same as STDNUMPAT but allowing for all numbers in the provided string
+    STDNUMPAT_MULTIPLE = /.*?(\d[\d\-]{6,}[xX]?)/
+
+    # Extract the most likely looking numbers from the string. This will be each
+    # string with digits-and-hyphens-and-maybe-a-trailing-X, with the hypens removed
+    # @param [String] str The string from which to extract the ISBN/ISSNs
+    # @return [Array] An array of extracted identifiers
+    def extract_multiple_numbers(str)
+      return [] if str == '' || str.nil?
+      str.scan(STDNUMPAT_MULTIPLE).flatten.map{ |i| i.gsub(/\-/, '').upcase }
+    end
+
     # Given any string, extract what looks like the most likely ISBN/ISSN
     # of the given size(s), or nil if nothing matches at the correct size.
     # @param [String] rawnum The raw string containing (hopefully) an ISSN/ISBN
@@ -51,12 +63,15 @@ module StdNum
   # Validate, convert, and normalize ISBNs (10-digit or 13-digit)
   module ISBN
     extend Helpers
-    
+
+    TEN_TO_THIRTEEN_PREFIX = '978'.freeze
+    VALID_THIRTEEN_PREFIX = /\A97[89]/
+
     # Does it even look like an ISBN?
     def self.at_least_trying? isbn
       reduce_to_basics(isbn, [10,13]) ? true : false
     end
-    
+
 
     # Compute check digits for 10 or 13-digit ISBNs. See algorithm at
     # http://en.wikipedia.org/wiki/International_Standard_Book_Number
@@ -92,7 +107,7 @@ module StdNum
     # Check to see if the checkdigit is correct
     # @param [String] isbn The ISBN (we'll try to clean it up if possible)
     # @param [Boolean] preprocessed Set to true if the ISBN has already been through reduce_to_basics
-    # @return [Boolean] Whether or not the checkdigit is correct. Sneakily, return 'nil' for 
+    # @return [Boolean] Whether or not the checkdigit is correct. Sneakily, return 'nil' for
     #  values that don't even look like ISBNs, and 'false' for those that look possible but
     #  don't normalize / have bad checkdigits
     def self.valid? isbn, preprocessed = false
@@ -100,6 +115,7 @@ module StdNum
       isbn = reduce_to_basics(isbn, [10,13]) unless preprocessed
       return nil unless isbn
       return false unless isbn[-1..-1] == self.checkdigit(isbn, true)
+      return false unless isbn.size == 10 || valid_isbn13_prefix?(isbn)
       return true
     end
 
@@ -129,7 +145,7 @@ module StdNum
       return nil unless isbn
       return nil unless valid?(isbn, true)
       return isbn if isbn.size == 13
-      prefix = '978' + isbn[0..8]
+      prefix = TEN_TO_THIRTEEN_PREFIX + isbn[0..8]
       return prefix + self.checkdigit(prefix + '0', true)
     end
 
@@ -145,7 +161,7 @@ module StdNum
       return isbn if isbn.size == 10
 
       # Can't be converted to ISBN-10? Bail
-      return nil unless isbn[0..2] == '978'
+      return nil unless isbn[0..2] == TEN_TO_THIRTEEN_PREFIX
 
       prefix = isbn[3..11]
       return prefix + self.checkdigit(prefix + '0')
@@ -172,7 +188,14 @@ module StdNum
       end
     end
 
-
+    # Checks for a valid ISBN13 prefix
+    # ISBN13 always starts with 978 or 979. For example: 1000000000012 has a valid check digit, but
+    # is not a valid ISBN13.
+    # @param [String] isbn13 The ISBN13 to be checked.
+    # @return [Boolean] If true then the prefix is valid
+    def self.valid_isbn13_prefix?(isbn13)
+      isbn13.size == 13 and !!VALID_THIRTEEN_PREFIX.match(isbn13)
+    end
   end
 
   # Validate and and normalize ISSNs
@@ -210,7 +233,7 @@ module StdNum
     # Check to see if the checkdigit is correct
     # @param [String] issn The ISSN (we'll try to clean it up if possible)
     # @param [Boolean] preprocessed Set to true if the number has already been through reduce_to_basic
-    # @return [Boolean] Whether or not the checkdigit is correct. Sneakily, return 'nil' for 
+    # @return [Boolean] Whether or not the checkdigit is correct. Sneakily, return 'nil' for
     #  values that don't even look like ISBNs, and 'false' for those that look possible but
     #  don't normalize / have bad checkdigits
 

data/lib/library_stdnums/version.rb

@@ -1,4 +1,4 @@
 module StdNum
   # library_stdnums version
-  VERSION = "1.4.1"
+  VERSION = "1.6.0"
 end

data/library_stdnums.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |spec|
   spec.extra_rdoc_files = spec.files.grep(%r{^doc/})
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest"
-  spec.add_development_dependency "yard"
+  spec.add_development_dependency "rake", "~>11.0"
+  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "yard", ">= 0.9.5"
 end
 
 

data/spec/library_stdnums_spec.rb

@@ -14,7 +14,7 @@ describe "Extract" do
   end
 
   it "should return nil on a non-match" do
-    StdNum::ISBN.extractNumber('bill dueber').must_equal nil
+    StdNum::ISBN.extractNumber('bill dueber').must_be_nil
   end
 
   it "should allow a trailing X" do
@@ -30,9 +30,25 @@ describe "Extract" do
   end
 
   it "doesn't allow numbers that are too short" do
-    StdNum::ISBN.extractNumber('12345').must_equal nil
+    StdNum::ISBN.extractNumber('12345').must_be_nil
   end
 
+  let(:identifiers_string) { '9780987115423 (print ed) 9780987115430 (web ed)' }
+  it "will extract multiple identifiers" do
+    StdNum::ISBN.extract_multiple_numbers(identifiers_string).must_be_kind_of Array
+    StdNum::ISBN.extract_multiple_numbers(identifiers_string).count.must_equal 2
+    StdNum::ISBN.extract_multiple_numbers(identifiers_string)[0].must_equal '9780987115423'
+    StdNum::ISBN.extract_multiple_numbers(identifiers_string)[1].must_equal '9780987115430'
+  end
+
+  let(:string_with_no_identifiers) { 'This has no identifiers' }
+  it "will return an empty array when no identifiers are in the supplied string " do
+    StdNum::ISBN.extract_multiple_numbers(string_with_no_identifiers).must_be_kind_of Array
+    StdNum::ISBN.extract_multiple_numbers(string_with_no_identifiers).count.must_equal 0
+
+    StdNum::ISBN.extract_multiple_numbers('').must_be_kind_of Array
+    StdNum::ISBN.extract_multiple_numbers('').count.must_equal 0
+  end
   it "skips over short prefixing numbers" do
     StdNum::ISBN.extractNumber('ISBN13: 1234567890123').must_equal '1234567890123'
   end
@@ -64,25 +80,25 @@ describe "ISBN" do
   it "finds a good number valid" do
     StdNum::ISBN.valid?('9780306406157').must_equal true
   end
-  
+
   it "says a good number is trying" do
     StdNum::ISBN.at_least_trying?('9780306406157').must_equal true
   end
-  
+
   it "says bad data is not trying" do
     StdNum::ISBN.at_least_trying?('978006406157').must_equal false
     StdNum::ISBN.at_least_trying?('406157').must_equal false
     StdNum::ISBN.at_least_trying?('$22').must_equal false
     StdNum::ISBN.at_least_trying?('hello').must_equal false
   end
-    
+
 
   it "finds a bad number invalid" do
     StdNum::ISBN.valid?('9780306406154').must_equal false
   end
 
   it "returns nil when computing checksum for bad ISBN" do
-    StdNum::ISBN.checkdigit('12345').must_equal nil
+    StdNum::ISBN.checkdigit('12345').must_be_nil
   end
 
   it "converts 10 to 13" do
@@ -99,9 +115,9 @@ describe "ISBN" do
 
   it "normalizes" do
     StdNum::ISBN.normalize('0-306-40615-2').must_equal '9780306406157'
-    StdNum::ISBN.normalize('0-306-40615-X').must_equal nil
+    StdNum::ISBN.normalize('0-306-40615-X').must_be_nil
     StdNum::ISBN.normalize('ISBN: 978-0-306-40615-7').must_equal '9780306406157'
-    StdNum::ISBN.normalize('ISBN: 978-0-306-40615-3').must_equal nil
+    StdNum::ISBN.normalize('ISBN: 978-0-306-40615-3').must_be_nil
   end
 
   it "gets both normalized values" do
@@ -112,7 +128,10 @@ describe "ISBN" do
     a.sort.must_equal ['9780306406157', '0306406152' ].sort
   end
 
-
+  it "identifies an invalid ISBN13 due to the prefix" do
+    StdNum::ISBN.valid_isbn13_prefix?('9780000000002').must_equal true
+    StdNum::ISBN.valid?('1000000000012').must_equal false
+  end
 
 end
 
@@ -451,7 +470,6 @@ describe "LCCN tests from Business::LCCN perl module" do
                  :serial => '001234',
                  :prefix => 'a',
                  :year_cataloged => 1989,
-                 :serial => '001234',
               },
               {  :orig => 'http://lccn.loc.gov/ab89001234',
                  :canonical => 'ab 89001234 ',

data/spec/spec_helper.rb

@@ -1,5 +1,19 @@
-require 'minitest/spec'
-require 'minitest/autorun'
+# minitest has a circular reference somewhere
+# drives me crazy
+def silence_warnings(&block)
+  warn_level = $VERBOSE
+  $VERBOSE   = nil
+  result     = block.call
+  $VERBOSE   = warn_level
+  result
+end
+
+
+silence_warnings do
+  require 'minitest/spec'
+  require 'minitest/autorun'
+end
+
 
 require 'library_stdnums'
 

metadata

@@ -1,80 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: library_stdnums
 version: !ruby/object:Gem::Version
-  version: 1.4.1
-  prerelease: 
+  version: 1.6.0
 platform: ruby
 authors:
 - Bill Dueber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-02 00:00:00.000000000 Z
+date: 2017-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.5
 description: 
 email:
 - none@nowhere.org
@@ -82,9 +73,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".travis.yml"
+- ".yardopts"
 - ChangeLog.md
 - Gemfile
 - LICENSE.txt
@@ -98,36 +89,28 @@ files:
 homepage: https://github.com/billdueber/library_stdnums
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3816894525355175923
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3816894525355175923
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.6.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A simple set of module functions to normalize, validate, and convert common
   library standard numbers
 test_files:
 - spec/library_stdnums_spec.rb
 - spec/spec_helper.rb
-has_rdoc: