anystyle-parser 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 575f1accfff0d04c318a023de9bd4d1f8720ff98
-  data.tar.gz: aa53148f49bb5e26947375016cda44f9c0b97f6d
+  metadata.gz: 0c9fa55f1ed5e371c241610ef5d77ae1f9696131
+  data.tar.gz: 7e6e3d024694dc1e8947bca12a9eb248f356c3cd
 SHA512:
-  metadata.gz: a962499569b1dfbf853392b447169498f4e7ad537d1ca7ef3b9bd1a0d20c893aa3c77bf5bc1794410cdea50390cce1e3fec3082b9c982c52e482a51d27615f1c
-  data.tar.gz: 92dac81d61b7cc52170f15396785187d0b5d99c1ea7819be1b03318fdd29d80faa669845010ff370fffc17b7ff4c2b5659ba95900b5c4be251cbf4e007e70756
+  metadata.gz: c6ab99a896fbe1cbc5e7ab2a9ab729c289a052ff1b98a7e870ace9260519ea9500284a05e89acf8752548a7972bf629529fb17e2e967bb4d87f75a36615638ad
+  data.tar.gz: 4f75412d5bfd364e492ffc6c83b2e77d4853d75359f5824fc556daa658138db46c3aa391600f03d247c15b272088ba300eb354cafeac57e6e1f088885930334f

data/HISTORY.md

@@ -1,3 +1,7 @@
+0.4.1 / 2014-03-03
+==================
+* Normalizer tweaks
+
 0.4.0 / 2014-02-27
 ==================
 * Update wapiti

data/lib/anystyle/parser/dictionary.rb

@@ -63,14 +63,14 @@ module Anystyle
 
       begin
         require 'redis'
-        @modes.unshift :redis
+        @modes.push :redis
       rescue LoadError
         # info 'no redis support detected'
       end
 
       begin
         require 'kyotocabinet'
-        @modes.unshift :kyoto
+        @modes.push :kyoto
       rescue LoadError
         # info 'no kyoto-cabinet support detected'
       end

data/lib/anystyle/parser/normalizer.rb

@@ -55,9 +55,6 @@ module Anystyle
         token.gsub!(/^[^[:alnum:]]+|[^[:alnum:]]+$/, '')
         hash[key] = token
         hash
-      rescue => e
-        warn e.message
-        hash
       end
 
       def normalize_author(hash)
@@ -68,14 +65,11 @@ module Anystyle
           hash[:editor] = hash.delete(:author)
           hash = normalize_editor(hash)
         else
-          hash['more-authors'] = true if !!authors.sub!(/\bet\.?\s*al.*$/i, '')
+          hash[:'more-authors'] = true if !!authors.sub!(/\bet\.?\s*al.*$/i, '')
           authors.gsub!(/^[^[:alnum:]]+|[^[:alnum:]]+$/, '')
           hash[:author] = normalize_names(authors)
         end
 
-        hash
-      rescue => e
-        warn e.message
         hash
       end
 
@@ -96,9 +90,9 @@ module Anystyle
           end
         end
 
-        hash['more-editors'] = true if !!editors.sub!(/\bet\.?\s*al.*$/i, '')
+        hash[:'more-editors'] = true if !!editors.sub!(/\bet\.?\s*al.*$/i, '')
 
-        editors.gsub!(/^[^[:alnum:]]+|[^[:alnum:]]+$/, '')
+        editors.gsub!(/^\W+|\W+$/, '')
         editors.gsub!(/^in\s+/i, '')
         editors.gsub!(/[^[:alpha:]]*[Ee]d(s|itors?|ited)?[^[:alpha:]]*/, '')
         editors.gsub!(/[^[:alpha:]]*([Hh]rsg|Herausgeber)[^[:alpha:]]*/, '')
@@ -107,37 +101,39 @@ module Anystyle
         is_trans = !!editors.gsub!(/[^[:alpha:]]*trans(lated)?[^[:alpha:]]*/i, '')
 
         hash[:editor] = normalize_names(editors)
-        hash[:translator] = hash[:editor] if is_trans
+        hash[:translator] = hash.delete :editor if is_trans
 
-        hash
-      rescue => e
-        warn e.message
         hash
       end
 
       def normalize_translator(hash)
         translators = hash[:translator]
 
-        translators.gsub!(/^[^[:alnum:]]+|[^[:alnum:]]+$/, '')
+        editors.gsub!(/^\W+|\W+$/, '')
         translators.gsub!(/[^[:alpha:]]*trans(lated)?[^[:alpha:]]*/i, '')
         translators.gsub!(/\bby\b/i, '')
 
         hash[:translator] = normalize_names(translators)
         hash
-      rescue => e
-        warn e.message
-        hash
       end
 
-      Namae::Parser.instance.options[:prefer_comma_as_separator] = true
-
       def normalize_names(names)
-        Namae.parse!(names).map(&:sort_order).join(' and ')
+        Namae.parse!(names).map { |name|
+          unless name.given.nil? || name.family.nil?
+            name.given.gsub!(/\b([[:upper:]])(\s|$)/, '\1.\2')
+          end
+
+          name.sort_order
+
+        }.join(' and ')
+
       rescue => e
         warn e.message
-        hash
+        names
       end
 
+      Namae.options[:prefer_comma_as_separator] = true
+
       def normalize_title(hash)
         title, container = hash[:title]
 
@@ -148,14 +144,11 @@ module Anystyle
 
         extract_edition(title, hash)
 
-        title.gsub!(/^[\s]+|[\.,:;\s]+$/, '')
+        title.gsub!(/^\s+|[\.,:;\s]+$/, '')
         title.gsub!(/^["'”’´‘“`]|["'”’´‘“`]$/, '')
 
         hash[:title] = title
 
-        hash
-      rescue => e
-        warn e.message
         hash
       end
 
@@ -189,16 +182,13 @@ module Anystyle
         booktitle, *dangling = hash[:booktitle]
         unmatched(:booktitle, hash, dangling) unless dangling.empty?
 
-        booktitle.gsub!(/^in\s*/i, '')
+        booktitle.gsub!(/^in\s+/i, '')
 
         extract_edition(booktitle, hash)
 
-        booktitle.gsub!(/^[\s]+|[\.,:;\s]+$/, '')
+        booktitle.gsub!(/^\s+|[\.,:;\s]+$/, '')
         hash[:booktitle] = booktitle
 
-        hash
-      rescue => e
-        warn e.message
         hash
       end
 
@@ -209,9 +199,6 @@ module Anystyle
         journal.gsub!(/^[\s]+|[\.,:;\s]+$/, '')
         hash[:journal] = journal
 
-        hash
-      rescue => e
-        warn e.message
         hash
       end
 
@@ -228,9 +215,6 @@ module Anystyle
 
         hash[:container] = container
         hash
-      rescue => e
-        warn e.message
-        hash
       end
 
       def normalize_date(hash)
@@ -246,9 +230,6 @@ module Anystyle
           hash.delete(:date)
         end
 
-        hash
-      rescue => e
-        warn e.message
         hash
       end
 
@@ -276,9 +257,6 @@ module Anystyle
           end
         end
 
-        hash
-      rescue => e
-        warn e.message
         hash
       end
 
@@ -302,9 +280,6 @@ module Anystyle
           hash[:pages] = $1
         end
 
-        hash
-      rescue => e
-        warn e.message
         hash
       end
 
@@ -321,9 +296,6 @@ module Anystyle
 
         hash[:location] = location
         hash
-      rescue => e
-        warn e.message
-        hash
       end
 
       def normalize_isbn(hash)
@@ -333,9 +305,6 @@ module Anystyle
         isbn = isbn[/[\d-]+/]
         hash[:isbn] = isbn
 
-        hash
-      rescue => e
-        warn e.message
         hash
       end
 
@@ -346,9 +315,6 @@ module Anystyle
         url.gsub!(/^\s+|[,\s]+$/, '')
         hash[:isbn] = isbn
         hash
-      rescue => e
-        warn e.message
-        hash
       end
 
       private

data/lib/anystyle/parser/parser.rb

@@ -163,8 +163,13 @@ module Anystyle
 
       def normalize(hash)
         hash.keys.each do |label|
-          normalizer.send("normalize_#{label}", hash)
+          begin
+            normalizer.send("normalize_#{label}", hash)
+          rescue => e
+            warn e.message
+          end
         end
+
         classify hash
       end
 

data/lib/anystyle/parser/version.rb

@@ -1,5 +1,5 @@
 module Anystyle
   module Parser
-    VERSION = '0.4.0'.freeze
+    VERSION = '0.4.1'.freeze
   end
 end

data/spec/anystyle/parser/normalizer_spec.rb

@@ -7,11 +7,11 @@ module Anystyle
       describe "#tokenize_names" do
 
         it "tokenizes 'A B'" do
-          Normalizer.instance.normalize_names('A B').should == 'B, A'
+          Normalizer.instance.normalize_names('A B').should == 'B, A.'
         end
 
         it "tokenizes 'A, B'" do
-          Normalizer.instance.normalize_names('A, B').should == 'A, B'
+          Normalizer.instance.normalize_names('A, B').should == 'A, B.'
         end
 
         # it "tokenizes 'A, jr., B'" do
@@ -23,11 +23,11 @@ module Anystyle
         # end
 
         it "tokenizes 'A, B, C, D'" do
-          Normalizer.instance.normalize_names('A, B, C, D').should == 'A, B and C, D'
+          Normalizer.instance.normalize_names('A, B, C, D').should == 'A, B. and C, D.'
         end
 
         it "tokenizes 'A, B, C'" do
-          Normalizer.instance.normalize_names('A, B, C').should == 'A, B and C'
+          Normalizer.instance.normalize_names('A, B, C').should == 'A, B. and C'
         end
 
         it "tokenizes 'Aa Bb, C.'" do
@@ -35,7 +35,7 @@ module Anystyle
         end
 
         it "tokenizes 'Aa Bb, Cc Dd, and E F G'" do
-          Normalizer.instance.normalize_names('Aa Bb, C D, and E F G').should == 'Bb, Aa and D, C and G, E F'
+          Normalizer.instance.normalize_names('Aa Bb, C D, and E F G').should == 'Bb, Aa and D, C. and G, E. F.'
         end
 
         [

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: anystyle-parser
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-27 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bibtex-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: wapiti
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
   name: namae
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
 description: A sophisticated parser for academic reference lists and bibliographies
@@ -96,27 +96,27 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- "--line-numbers"
-- "--inline-source"
-- "--title"
-- "\"Anystyle Parser\""
-- "--main"
+- --line-numbers
+- --inline-source
+- --title
+- '"Anystyle Parser"'
+- --main
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Smart and fast academic bibliography parser.