bibtex-ruby 3.1.4 → 3.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 317de5c4dd2012e6f142328bbb333a691947fd9b
-  data.tar.gz: 29835b159b2edf43445c70bec6798f0fddc234c8
+  metadata.gz: a9c5960eac9a590e5f05b0a5527dd2ad0943d6ae
+  data.tar.gz: adb8c68069904a0d342bfdbad92bc1f0d8525cea
 SHA512:
-  metadata.gz: d20eef168fa79d500bb09fc1851eea6db8b110e7d74d0c1590e9639d166f767ec566e664142f588b6ddaec80f8c4968a1b2d5e6641d198205655288a85197092
-  data.tar.gz: 99c2fc3003f9c4629a7a7ecee5b04ae3416b6cd294c3f31093876565405b5982966a779561c1c03ac17ae815ba66fbeb6ad13bb4cde83727af958276b7cafda4
+  metadata.gz: bfb4aa621fcef9031ad62dece59b9c2efe4c506d4f20253f69e78fbc82487e7a43cae2bec14fa02fa7979ac26771b7fc78428e5da8ddfcd7de1a28fc4e54f2eb
+  data.tar.gz: 423c6b640f45762e512bb90ee9baa00f11247cfe7a1a5b04c0aa87d148a7e47bf1805d42fab8a3bdb30ced56916e1502e6798d9fba019b33698237fda5889a8e

data/History.txt

@@ -1,3 +1,9 @@
+3.1.5 / 2014-03-25
+==================
+
+* Improve Name#extend_initials
+* Add Name#normalize_initials
+
 3.1.4 / 2014-03-15
 ==================
 

data/Rakefile

@@ -92,8 +92,6 @@ end
 
 
 desc 'Updates the Manifest file'
-  require 'coveralls' if ENV['CI']
-  require 'coveralls' if ENV['CI']
 task :manifest => ['clean', 'racc'] do
   m = File.open('Manifest', 'w')
   m.print FileList['**/*'].reject{ |f|

data/lib/bibtex/names.rb

@@ -164,7 +164,14 @@ module BibTeX
 
     # Returns the first name (or the passed-in string) as initials.
     def initials(token = first)
-      token.to_s.gsub(/([[:upper:]])[[:lower:]]+\s*/, '\1.')
+      token.to_s.gsub(/([[:upper:]])[^[:upper:]\s-]*\s*/, '\1.')
+    end
+
+    def normalize_initials(token = first)
+      token = token.dup.to_s
+      token.gsub!(/([[:upper:]])([[:upper:]])/, '\1 \2')
+      token.gsub!(/\b([[:upper:]])\b[^[:alpha:]-]*/, '\1.')
+      token
     end
     
     # Returns true if the first name consists solely of initials.
@@ -176,7 +183,12 @@ module BibTeX
     # for_last and the current first name has the same initials as with_first.
     def extend_initials(with_first, for_last)
       rename_if :first => with_first do |name|
-        name.last == for_last && name.initials.gsub(/\s+/, '') == initials(with_first).gsub(/\s+/, '')
+        if name.last == for_last
+          mine = name.initials.split(/\.[^[:alpha:]]*/)
+          other = initials(with_first).split(/\.[^[:alpha:]]*/)
+
+          mine == other || mine.length < other.length && mine == other[0, mine.length]
+        end
       end
     end
     

data/lib/bibtex/version.rb

@@ -20,7 +20,7 @@ module BibTeX
   module Version
     MAJOR = 3
     MINOR = 1
-    PATCH = 4
+    PATCH = 5
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.').freeze

data/test/bibtex/test_names.rb

@@ -101,13 +101,41 @@ module BibTeX
       end
     end
   
+    describe '#normalize_initials' do
+      it 'returns normalized initials of existing initials only' do
+        Name.new(:first => 'Edgar A.', :last => 'Poe').normalize_initials.must_equal 'Edgar A.'
+        Name.new(:first => 'E.A.', :last => 'Poe').normalize_initials.must_equal 'E.A.'
+        Name.new(:first => 'E. A.', :last => 'Poe').normalize_initials.must_equal 'E.A.'
+        Name.new(:first => 'E. A', :last => 'Poe').normalize_initials.must_equal 'E.A.'
+        Name.new(:first => 'E A', :last => 'Poe').normalize_initials.must_equal 'E.A.'
+        Name.new(:first => 'Edgar A P', :last => 'Poe').normalize_initials.must_equal 'Edgar A.P.'
+      end
+    end
+
     describe '#extend_initials' do
       it 'extends the first name if the last name and initials match' do
         Name.new(:first => 'E.A.', :last => 'Poe').extend_initials('Edgar Allen', 'Poe').first.must_equal 'Edgar Allen'
         Name.new(:first => 'Edgar A.', :last => 'Poe').extend_initials('Edgar Allen', 'Poe').first.must_equal 'Edgar Allen'
         Name.new(:first => 'E. A.', :last => 'Poe').extend_initials('Edgar Allen', 'Poe').first.must_equal 'Edgar Allen'
+        Name.new(:first => 'E. A', :last => 'Poe').extend_initials('Edgar Allen', 'Poe').first.must_equal 'Edgar Allen'
+        Name.new(:first => 'E A', :last => 'Poe').extend_initials('Edgar Allen', 'Poe').first.must_equal 'Edgar Allen'
         Name.new(:first => 'E. Allen', :last => 'Poe').extend_initials('Edgar Allen', 'Poe').first.must_equal 'Edgar Allen'
         Name.new(:first => 'E.A.', :last => 'Poe').extend_initials('Edgar A.', 'Poe').first.must_equal 'Edgar A.'
+
+        Name.new(:first => 'Edgar-A.', :last => 'Poe').extend_initials('Edgar-Allen', 'Poe').first.must_equal 'Edgar-Allen'
+        Name.new(:first => 'E.-Allen', :last => 'Poe').extend_initials('Edgar-Allen', 'Poe').first.must_equal 'Edgar-Allen'
+        Name.new(:first => 'E.-A.', :last => 'Poe').extend_initials('Edgar-Allen', 'Poe').first.must_equal 'Edgar-Allen'
+        Name.new(:first => 'E.-A', :last => 'Poe').extend_initials('Edgar-Allen', 'Poe').first.must_equal 'Edgar-Allen'
+        Name.new(:first => 'E-A', :last => 'Poe').extend_initials('Edgar-Allen', 'Poe').first.must_equal 'Edgar-Allen'
+      end
+
+      it 'extends the first name if the last name and initials name match with extra middle names' do
+        Name.new(:first => 'E.', :last => 'Poe').extend_initials('Edgar Allen', 'Poe').first.must_equal 'Edgar Allen'
+        Name.new(:first => 'E', :last => 'Poe').extend_initials('Edgar Allen', 'Poe').first.must_equal 'Edgar Allen'
+        Name.new(:first => 'Edgar', :last => 'Poe').extend_initials('Edgar Allen', 'Poe').first.must_equal 'Edgar Allen'
+
+        Name.new(:first => 'E.A.', :last => 'Poe').extend_initials('Edgar', 'Poe').first.must_equal 'E.A.'
+        Name.new(:first => 'A.', :last => 'Poe').extend_initials('Edgar', 'Poe').first.must_equal 'A.'
       end
       
       it 'does not extend the first name if the last name or initials do not match' do

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: bibtex-ruby
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.1.5
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-15 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: latex-decode
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.0'
 description: |
@@ -135,12 +135,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -150,18 +150,18 @@ signing_key:
 specification_version: 4
 summary: A BibTeX parser, converter and API for Ruby.
 test_files:
-- test/bibtex/test_value.rb
+- test/bibtex/entry/test_rdf_converter.rb
+- test/bibtex/test_bibliography.rb
+- test/bibtex/test_elements.rb
+- test/bibtex/test_entry.rb
+- test/bibtex/test_filters.rb
 - test/bibtex/test_lexer.rb
+- test/bibtex/test_name_parser.rb
 - test/bibtex/test_names.rb
 - test/bibtex/test_parser.rb
-- test/bibtex/test_bibliography.rb
-- test/bibtex/test_filters.rb
-- test/bibtex/test_utilities.rb
 - test/bibtex/test_string.rb
-- test/bibtex/test_entry.rb
-- test/bibtex/test_name_parser.rb
-- test/bibtex/test_elements.rb
-- test/bibtex/entry/test_rdf_converter.rb
+- test/bibtex/test_utilities.rb
+- test/bibtex/test_value.rb
 - test/test_bibtex.rb
 - test/test_export.rb
 has_rdoc: yard