isbn 2.0.8 → 2.0.9

data/README.md

@@ -6,23 +6,22 @@ Version 2.0
 
 This library provides methods to manipulate isbns. As of version 2.0 there has been a near complete rewrite of this library but this time there are tests. A few methods have been removed. Here is what remains:
 
-* ISBN.ten will return a 10 digit isbn if you give it a 10 or 13 digit isbn
- - it will raise a No10DigitISBNAvailable error if given an isbn starting with 979
+* `ISBN.ten` will return a 10 digit isbn if you give it a 10 or 13 digit isbn
+ - it will raise a `No10DigitISBNAvailable` error if given an isbn starting with 979
    because 979 isbns do NOT have a 10 digit counterpart.
+* `ISBN.thirteen` will return a 13 digit isbn if you give it 10 or thirteen digit isbn
 
-* ISBN.thirteen will return a 13 digit isbn if you give it 10 or thirteen digit isbn
-
-* ISBN.as_new will convert an isbn into the used book version for that isbn
+* `ISBN.as_new` will convert an isbn into the used book version for that isbn
  - for isbns starting with 978 it returns an isbn starting with 290
  - for isbns starting with 979 it returns an isbn starting with 291
 
-* ISBN.as_used will convert an isbn into the new book version for that isbn
+* `ISBN.as_used` will convert an isbn into the new book version for that isbn
  - for isbns starting with 290 it returns an isbn starting with 978
  - for isbns starting with 291 it returns an isbn starting with 979
 
-* ISBN.valid? will compare the check digit of the passed in isbn with that of one it computes
+* `ISBN.valid?` will compare the check digit of the passed in isbn with that of one it computes
 
-* ISBN.from_image accept a jpeg of an isbn and OCR it into an isbn.
+* `ISBN.from_image` accept a jpeg of an isbn and OCR it into an isbn.
  - it depends on the LibJpeg and Gocr libraries. I recommend [Homebrew](http://github.com/mxcl/homebrew).
  
-* ISBN.from_string fetches isbn from string
+* `ISBN.from_string` fetches isbn from string

data/Rakefile

@@ -1,27 +1,26 @@
 $:.unshift("lib") unless $:.include?("lib")
 require "isbn"
 
-require 'rake/gempackagetask'
-spec = eval(File.read("isbn.gemspec"))
-Rake::GemPackageTask.new(spec).define
+desc "Build, Install and Cleanup gem"
+task :install do
+  `gem build isbn.gemspec`
+  `gem install isbn-#{ISBN::VERSION}.gem`
+  `rm isbn-#{ISBN::VERSION}.gem`
+end
+
+task :default => :test
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << "test"
-  test.pattern = "test/**/*_test.rb"
+  test.pattern = FileList['test/**/*_test.rb', 'test/**/*_spec.rb']
+  test.verbose = true
 end
 
 desc "publish to rubygems.org"
-task :publish => :build do
+task :publish do
+  `gem build isbn.gemspec`
+  `gem install isbn-#{ISBN::VERSION}.gem`
   `gem push isbn-#{ISBN::VERSION}.gem`
   `rm isbn-#{ISBN::VERSION}.gem`
 end
-
-task :default => :test
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'test'
-  test.pattern = FileList['test/**/*_test.rb', 'test/**/*_spec.rb']
-  test.verbose = true
-end

data/lib/isbn.rb

@@ -1,7 +1,7 @@
 module ISBN
   extend self
   
-  VERSION = "2.0.8"
+  VERSION = "2.0.9"
   
   def ten(isbn)
     raise InvalidISBNError unless isbn.is_a? String
@@ -69,7 +69,7 @@ module ISBN
     isbn = isbn.delete("-")
     case isbn.size
     when 13 then isbn[-1] == thirteen(isbn)[-1]
-    when 10 then isbn[-1] == ten(isbn)[-1]
+    when 10 then isbn[-1].upcase == ten(isbn)[-1]
     else false
     end
   end
@@ -85,9 +85,12 @@ module ISBN
   end
   
   def from_string(source)
-    match = /(97[89][- ]){0,1}[0-9]{1,5}[- ][0-9]{1,7}[- ][0-9]{1,6}[- ][0-9X]/.match(source)
+    regex = /(?:ISBN[- ]*13|ISBN[- ]*10|)\s*((?:(?:97[89])?[ -]?(?:[0-9][ -]*){9})[ -]*(?:[0-9xX]))/
+    match = source.scan(regex).flatten
+    match.map! { |i| i.gsub(/[\s-]+/, "-") }
+    match = match.find {|i| ISBN.valid?(i) }
     raise InvalidSourceString unless match
-    match.to_a.first
+    match
   end
 
   def with_dashes(isbn)

data/test/isbn_spec.rb

@@ -59,11 +59,16 @@ describe ISBN do
     ISBN.valid?("012781910X").must_equal true
     ISBN.valid?("9887401392").must_equal false
     ISBN.valid?("082047267").must_equal false
+    ISBN.valid?("3-540-49698-X").must_equal true
+    ISBN.valid?("3-540-49698-x").must_equal true
     ISBN.valid?(nil).must_equal false
   end
   
   it "should get isbn from source string" do
     ISBN.from_string("ISBN:978-83-7659-303-6\nmore of content").must_equal "978-83-7659-303-6"
+    ISBN.from_string("ISBN-13 978-3-540-49698-4 and more content").must_equal "978-3-540-49698-4"
+    ISBN.from_string("ISBN-10 3-921099-34-X and more content").must_equal "3-921099-34-X"
+    ISBN.from_string("ISBN-10 3-921099-34- x and more content").must_equal "3-921099-34-x"
   end
 
   it "should add dashes to isbn 13 without dashes" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: isbn
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-26 00:00:00.000000000 Z
+date: 2013-01-04 00:00:00.000000000 Z
 dependencies: []
 description: ! '  library to transform ISBN''s from new to used, between 10 and 13,
   etc...