bibtex-ruby 2.0.0 → 2.0.1

data/Gemfile.lock

@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     bibtex-ruby (2.0.0)
-      latex-decode (>= 0.0.3)
+      latex-decode (>= 0.0.6)
       multi_json (~> 1.0)
 
 GEM
@@ -27,8 +27,8 @@ GEM
     gnuplot (2.3.6)
     json (1.5.4)
     json (1.5.4-java)
-    latex-decode (0.0.3)
-      unicode (>= 0.4)
+    latex-decode (0.0.6)
+      unicode (~> 0.4)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
     linecache19 (0.5.12)

data/History.txt

@@ -1,3 +1,9 @@
+2.0.1 / 2011-10-20
+==================
+
+* Fixed name parser incompatibility with Rails (kudos to @amattsmith)
+* Improved latex-decoder (kudos to @etc)
+
 2.0.0 / 2011-09-25
 ==================
 

data/README.md

@@ -144,7 +144,10 @@ Instead of parsing strings you can also create BibTeX elements directly in Ruby:
 
 ### Cross References
 
-From version 2.0, BibTeX-Ruby correctly resolves entry cross-references, which are commonly used for entries with type `inbook`, `incollection`, and `inproceedings`. When an entry has a valid citation key in field `crossref`, BibTeX-Ruby will return any fields inherited from the parent entry:
+From version 2.0, BibTeX-Ruby correctly resolves entry cross-references, which
+are commonly used for entries with type `inbook`, `incollection`, and
+`inproceedings`. When an entry has a valid citation key in field `crossref`,
+BibTeX-Ruby will return any fields inherited from the parent entry:
 
     > b = BibTeX.parse <<-END
     @inbook{fraassen_1989b,
@@ -162,7 +165,8 @@ From version 2.0, BibTeX-Ruby correctly resolves entry cross-references, which a
     }
     END
     > b['fraassen_1989b'].booktitle
-     => <"Laws and Symmetry">
+    => <"Laws and Symmetry">
+
 
 ### Queries
 
@@ -280,6 +284,16 @@ are parsed and can easily be mapped to their last names:
        END
     => ["Hawthorne", "Melville"]
 
+Another useful method is `Bibliography#names` which returns all names in
+your bibliography (authors, editors, translators). For example, to quickly
+expand the initials of a name across your entire bibliography, you could
+use the following snippet:
+
+    b.names.each do |name|
+      name.first = 'Edgar Allen' if name.first =~ /E\.\s*A\./ and name.last == 'Poe'
+    end
+
+
 ### Filters
 
 Since version 1.3.8 BibTeX-Ruby comes with a plugin framework for input

data/bibtex-ruby.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
     export/conversion to formats such as YAML, JSON, CSL, and XML (BibTeXML).
 	END_DESCRIPTION
 	
-  s.add_runtime_dependency('latex-decode', ['>=0.0.3'])
+  s.add_runtime_dependency('latex-decode', ['>=0.0.6'])
   s.add_runtime_dependency('multi_json', ['~>1.0'])
 
   s.add_development_dependency('rake', ['~>0.9'])

data/features/issues/latex_filter.feature

@@ -4,15 +4,168 @@ Feature: Parse BibTeX files and convert LaTeX to Unicode
 	convert them to Unicode
 
 	@latex
-	Scenario: A BibTeX file containing a LaTeX umlaut
-		When I parse the following file:
-		"""
-		@misc{issue16,
-		  author = {rbq},
-		  title  = {An umlaut: \"u!},
-		  year   = 2011,
-		}
-		"""
-		Then my bibliography should contain an entry with key "issue16"
+  Scenario: A BibTeX file containing a LaTeX umlaut
+     When I parse the following file:
+     """
+     @misc{issue16,
+       author = {rbq},
+       title  = {An umlaut: \"u!},
+       year   = 2011,
+     }
+     """
+     Then my bibliography should contain an entry with key "issue16"
+     When I convert all entries using the filter "latex"
+     Then the entry with key "issue16" should have a field "title" with the value "An umlaut: ü!"
+
+	@latex
+  Scenario: A BibTeX file containing a variety of LaTeX strings
+    When I parse the following file:
+    """
+    @book{proust_1996,
+      address = {Paris},
+      author = {Proust, Jo\"{e}lle},
+      booktitle = {Perception et Intermodalit\'{e}: Approches Actuelles De La Question De Molyneux},
+      editor = {Proust, Jo\"{e}lle},
+      keywords = {Perception; Molyneux's Problem},
+      publisher = {Presses Universitaires de France},
+      title = {Perception et Intermodalit\'{e}: Approches Actuelles De La Question De Molyneux},
+      year = {1996}
+    }
+    @incollection{bach-y-rita_1996,
+      author = {{Bach-y-Rita}, Paul},
+      crossref = {proust_1996},
+      keywords = {Perception; Molyneux's Problem; Vision},
+      note = {Reprinted in translation in \textcite[pp. 497--514]{noe_2002}.},
+      pages = {81--100},
+      title = {Substitution Sensorielle et Qualia}
+    }
+    @article{noe_2008,
+      author = {No\"{e}, Alva},
+      journal = {Philosophy and Phenomenological Research},
+      keywords = {Perception; Enactivism; Vision},
+      month = {may},
+      number = {3},
+      pages = {660--665},
+      title = {Pr\'{e}cis of \emph{Action in Perception}},
+      url = {http://dx.doi.org/10.1111/j.1933-1592.2008.00161.x},
+      volume = {76},
+      year = {2008}
+    }
+    @article{bermudez_2007,
+      author = {Berm\'{u}dez, Jos\'{e} Luis},
+      date-added = {2011-10-02 12:43:54 -0400},
+      date-modified = {2011-10-02 12:43:54 -0400},
+      journal = {Philosophical Perspectives},
+      keywords = {Nonconceptual Content; Mind; Perception},
+      month = {dec},
+      number = {1},
+      pages = {55--72},
+      title = {What is at Stake in the Debate on Nonconceptual Content?},
+      url = {http://dx.doi.org/10.1111/j.1520-8583.2007.00120.x},
+      volume = {21},
+      year = {2007}
+    }
+    @book{ellegard_1958,
+      address = {G\"{o}teborg},
+      author = {Elleg{\aa}rd, Alvar},
+      booktitle = {Darwin and the General Reader: The Reception of Darwin's Theory of Evolution in the British Periodical Press, 1859---1972},
+      keywords = {Darwin; History of Biology; History of Science; Sociology of Science},
+      note = {Reprinted by University of Chicago Press.},
+      publisher = {G\"{o}teborg Universitets {\AA}rsskrift},
+      title = {Darwin and the General Reader: The Reception of Darwin's Theory of Evolution in the British Periodical Press, 1859--1972},
+      volume = {64},
+      year = {1958}
+    }
+    @article{haggqvist_2007,
+      author = {H\"{a}ggqvist, S\"{o}ren and {\AA}sa Maria Wikforss},
+      journal = {Erkenntnis},
+      keywords = {Externalism; Content; Mind},
+      month = {nov},
+      number = {3},
+      pages = {373--386},
+      title = {Externalism and A Posteriori Semantics},
+      url = {http://dx.doi.org/10.1007/s10670-007-9051-4},
+      volume = {67},
+      year = {2007}
+    }
+    @article{hajek_1996,
+      abstract = {According to finite frequentism, the probability of an attribute A in a finite reference class B is the relative frequency of actual occurrences of A within B. I present fifteen arguments against this position.},
+      author = {H\'{a}jek, Alan},
+      journal = {Erkenntnis},
+      keywords = {Probability},
+      month = {nov},
+      number = {2-3},
+      pages = {209-227},
+      title = {``Mises redux''---Redux: Fifteen Arguments against Finite Frequentism},
+      volume = {45},
+      year = {1996}
+    }
+    @article{bergstrom_1970a,
+      author = {Bergstr\"{o}m, Ingvar},
+      journal = {Oud Holland},
+      keywords = {Holland; 17C; History of Art},
+      number = {1-4},
+      pages = {143-157},
+      title = {De Gheyn as a \emph{Vanitas} Painter},
+      url = {http://dx.doi.org/10.1163/187501770X00112},
+      volume = {85},
+      year = {1970}
+    }
+    @incollection{bricmont_2001,
+      address = {Heidelberg},
+      author = {Bricmont, Jean and D\"{u}rr, Detlef and Galavotti, Maria C. and Ghirardi, Giancarlo and Petruccione, Francesco and Zangh\`{i}, Nino},
+      booktitle = {Chance in Physics: Foundations and Perspectives},
+      editor = {Bricmont, Jean and D\"{u}rr, Detlef and Galavotti, Maria C. and Ghirardi, Giancarlo and Petruccione, Francesco and Zangh\`{i}, Nino},
+      keywords = {Philosophy of Science; Physics; Probability; Quantum Mechanics; Thermodynamics},
+      publisher = {Springer},
+      series = {Lecture Notes in Physics},
+      title = {Chance in Physics: Foundations and Perspectives},
+      year = {2001}
+    }
+    @article{bowler_1975,
+      author = {Bowler, Peter J.},
+      journal = {Journal of the History of Ideas},
+      keywords = {History of Biology; History of Science},
+      month = {mar},
+      number = {1},
+      pages = {95--114},
+      title = {The Changing Meaning of ``Evolution''\,},
+      url = {http://dx.doi.org/10.2307/2709013},
+      volume = {36},
+      year = {1975}
+    }
+    @article{wood_1995,
+      author = {Wood, Christopher S.},
+      issue = {October-December},
+      journal = {Word and Image},
+      keywords = {History of Art; Holland; 17C; Curiosity},
+      number = {4},
+      pages = {332-352},
+      title = {\,`Curious Pictures' and the Art of Description},
+      volume = {11},
+      year = {1995}
+    }
+    @article{worrall_2000a,
+      author = {Worrall, John},
+      journal = {British Journal for the Philosophy of Science},
+      keywords = {Newton; Underdetermination; Confirmation; Induction; Scientific Method; Philosophy of Science},
+      month = {mar},
+      number = {1},
+      pages = {45--80},
+      title = {The Scope, Limits, and Distinctiveness of the Method of `Deduction from the Phenomena': Some Lessons from Newton's `Demonstrations' in Optics},
+      url = {http://dx.doi.org/10.1093/bjps/51.1.45},
+      volume = {51},
+      year = {2000}
+    }
+    """
 		When I convert all entries using the filter "latex"
-		Then the entry with key "issue16" should have a field "title" with the value "An umlaut: ü!"
+		Then the entry with key "proust_1996" should have a field "author" with the value "Proust, Joëlle"
+		And the entry with key "proust_1996" should have a field "booktitle" with the value "Perception et Intermodalité: Approches Actuelles De La Question De Molyneux"
+		And the entry with key "bermudez_2007" should have a field "author" with the value "Bermúdez, José Luis"
+		And the entry with key "ellegard_1958" should have a field "address" with the value "Göteborg"
+		And the entry with key "ellegard_1958" should have a field "publisher" with the value "Göteborg Universitets Årsskrift"
+		And the entry with key "haggqvist_2007" should have a field "author" with the value "Häggqvist, Sören and Åsa Maria Wikforss"
+		And the entry with key "hajek_1996" should have a field "author" with the value "Hájek, Alan"
+		And the entry with key "hajek_1996" should have a field "title" with the value "“Mises redux”—Redux: Fifteen Arguments against Finite Frequentism"
+    And the entry with key "bergstrom_1970a" should have a field "author" with the value "Bergström, Ingvar"
+		And the entry with key "worrall_2000a" should have a field "title" with the value "The Scope, Limits, and Distinctiveness of the Method of ‘Deduction from the Phenomena’: Some Lessons from Newton’s ‘Demonstrations’ in Optics"

data/lib/bibtex/bibliography.rb

@@ -125,18 +125,22 @@ module BibTeX
     # Saves the bibliography to a file at the given path. Returns the bibliography.
     def save_to(path, options = {})
       options[:quotes] ||= %w({ })
-      File.open(path, 'w:UTF-8') { |f| f.write(to_s(options)) }
+
+      File.open(path, 'w:UTF-8') do |f|
+				f.write(to_s(options))
+			end
+			
       self
     end
     
 
     def parse_names
-      @entries.each_value { |e| e.parse_names }
+      entries.each_value { |e| e.parse_names }
       self
     end
 
     def parse_months
-      @entries.each_value { |e| e.parse_month }
+      entries.each_value { |e| e.parse_month }
       self
     end
 
@@ -145,7 +149,10 @@ module BibTeX
     # the block is used as a condition (the block will be called with each
     # entry). @see Entry#convert!
     def convert (filter)
-      @entries.each_value { |e| e.convert!(filter) if !block_given? || yield(e) }
+      entries.each_value do |entry|
+				entry.convert!(filter) if !block_given? || yield(entry)
+			end
+			
       self
     end
     		
@@ -156,7 +163,6 @@ module BibTeX
     #
     # Returns the object (or the list of objects) that were deleted; nil
     # if the object was not part of the bibliography.
-    #
     def delete(*arguments, &block)
       objects = q(*arguments, &block).map { |o| o.removed_from_bibliography(self) }
       @data = @data - objects
@@ -166,7 +172,7 @@ module BibTeX
     alias remove delete
     alias rm delete
 
-    #
+
     # Returns an element or a list of elements according to the given index,
     # range, or query. Contrary to the Bibliography#query this method does
     # not yield to a block for additional refinement of the query.
@@ -190,7 +196,6 @@ module BibTeX
     # => Returns all objects that match 'ruby' anywhere or []
     # >> bib['@book[keywords=ruby]']
     # => Returns all books whose keywords attribute equals 'ruby' or []
-    #
     def [](*arguments)
       raise(ArgumentError, "wrong number of arguments (#{arguments.length} for 1..2)") unless arguments.length.between?(1,2)
 

data/lib/bibtex/entry.rb

@@ -106,6 +106,7 @@ module BibTeX
       proceedings    paper-conference
       techreport     report
       unpublished    manuscript
+      article        article-journal
     }.map(&:intern)]).freeze
 
 	  
@@ -408,13 +409,15 @@ module BibTeX
     # value prior to parsing.
     def parse_names
       strings = bibliography ? bibliography.strings.values : []
+
       NAME_FIELDS.each do |key|
         if name = fields[key]
           name = name.dup.replace(strings).join.to_name
           fields[key] = name unless name.nil?
         end
       end
-      self
+
+  		self
     end
     
 		# Returns a list of all names (authors, editors, translators).
@@ -485,10 +488,16 @@ module BibTeX
 
 		def to_citeproc(options = {})
 		  options[:quotes] ||= []
+		
+			parse_names
+			parse_month
+			
 		  hash = { 'id' => key.to_s, 'type' => CSL_TYPES[type].to_s }
+		
       each_pair do |k,v|
 		    hash[CSL_FILTER[k].to_s] = v.to_citeproc(options) unless DATE_FIELDS.include?(k)
 		  end
+		
 		  hash['issued'] = citeproc_date
 		  hash
 		end
@@ -496,7 +505,7 @@ module BibTeX
 		def issued
 		  m = MONTHS.find_index(@fields[:month] && @fields[:month].v)
 		  m = m + 1 unless m.nil?
-		  { 'date-parts' => [[@fields[:year],m].compact.map(&:to_i)] }
+		  Hash['date-parts', [[@fields[:year],m].compact.map(&:to_i)]]
 		end
 		
 		alias citeproc_date issued
@@ -530,13 +539,13 @@ module BibTeX
 		# the block returns true (the block will be called with each key-value pair).
 		#
 		# @see #convert!
-		def convert (filter)
+		def convert(filter)
 		  block_given? ? dup.convert!(filter, &Proc.new) : dup.convert!(filter)
 		end
 		
 		# In-place variant of @see #convert
-		def convert! (filter)
-		  @fields.each_pair { |k,v| !block_given? || yield(k,v) ? v.convert!(filter) : v }
+		def convert!(filter)
+		  fields.each_pair { |k,v| !block_given? || yield(k,v) ? v.convert!(filter) : v }
 		  self
 		end
 		

data/lib/bibtex/names.rb

@@ -85,6 +85,12 @@ module BibTeX
     alias :<< :add
     alias :push :add
     
+    # Converts all string values according to the given filter.
+    def convert! (filter)
+			tokens.each { |t| t.convert!(filter) }      
+      self
+    end
+
     def <=>(other)
       other.respond_to?(:to_a) ? to_a <=> other.to_a  : super
     end
@@ -93,8 +99,9 @@ module BibTeX
 
   class Name < Struct.new(:first, :last, :prefix, :suffix)
     extend Forwardable
-    include Comparable
 
+    include Comparable
+		
     BibTeXML = {
 			:first  => :first,
 			:last   => :last,
@@ -102,7 +109,7 @@ module BibTeX
 			:suffix => :lineage
 		}.freeze
 		
-    def_delegators :to_s, :=~, :===, *(String.instance_methods(false).reject { |m| m =~ /^\W|each|!$/ })
+    def_delegators :to_s, :=~, :===, *(String.instance_methods(false).reject { |m| m =~ /^\W|each|first|last|!$/ })
     
     class << self    
       def parse(string)
@@ -174,6 +181,20 @@ module BibTeX
       end
     end
     
+		def convert(filter)
+			dup.convert!(filter)
+		end
+		
+		def convert!(filter)
+			if f = Filters.resolve(filter)
+				each_pair { |k,v| self[k] = f.apply(v) unless v.nil? }
+			else
+				raise ArgumentError, "Failed to load filter #{filter.inspect}"
+			end
+
+			self
+		end
+		
     def to_citeproc(options = {})
       hash = {}
       hash['family'] = family unless family.nil?

data/lib/bibtex/value.rb

@@ -89,7 +89,7 @@ module BibTeX
     
     [:strip!, :upcase!, :downcase!, :sub!, :gsub!, :chop!, :chomp!, :rstrip!].each do |method_id|
       define_method(method_id) do |*arguments, &block|
-        @tokens.each do |part|
+        tokens.each do |part|
           part.send(method_id, *arguments, &block) unless part.nil?
         end
         self
@@ -103,7 +103,7 @@ module BibTeX
         when ::String # simulates Ruby's String#replace
           @tokens = [argument]
         when String
-          @tokens = @tokens.map { |v| argument.key == v ? argument.value.tokens : v }.flatten
+         	@tokens = @tokens.map { |v| argument.key == v ? argument.value.tokens : v }.flatten
         when Hash
           @tokens = @tokens.map { |v| argument[v] || v }
         end
@@ -205,17 +205,17 @@ module BibTeX
     
     # Returns true if the Value contains at least one symbol.
     def symbol?
-      @tokens.detect { |v| v.is_a?(Symbol) }
+      tokens.detect { |v| v.is_a?(Symbol) }
     end
     
     alias has_symbol? symbol?
     
     # Returns all symbols contained in the Value.
     def symbols
-      @tokens.select { |v| v.is_a?(Symbol) }
+      tokens.select { |v| v.is_a?(Symbol) }
     end
     
-    def each_token; @tokens.each; end
+    def each_token; tokens.each; end
     
     # Returns a new Value with all string values converted according to the given filter.
     def convert (filter)
@@ -224,15 +224,12 @@ module BibTeX
     
     # Converts all string values according to the given filter.
     def convert! (filter)
-      f = Filters.resolve(filter)
-
-      unless f
-        message = "Failed to load filter #{f.inspect}"
-        Log.error message
-        raise ArgumentError.new(message)
+      if f = Filters.resolve(filter)
+				tokens.map! { |t| f.apply(t) }
+			else
+				raise ArgumentError, "Failed to load filter #{filter.inspect}"
       end
       
-      @tokens.map! { |t| f.apply(t) }
       self
     end
     

data/lib/bibtex/version.rb

@@ -18,6 +18,6 @@
 
 module BibTeX
   module Version
-    STRING = '2.0.0'.freeze
+    STRING = '2.0.1'.freeze
   end
 end

data/test/bibtex/test_bibliography.rb

@@ -16,7 +16,7 @@ module BibTeX
     end
 
     describe '.open' do
-      it 'should accept a block and save the file after execution' do
+      it 'accepts a block and save the file after execution' do
         tmp = Tempfile.new('bibtex')
         tmp.close
         b = BibTeX.open(Test.fixtures(:bibdesk)).save_to(tmp.path)
@@ -31,7 +31,7 @@ module BibTeX
     end
 
 		describe '.parse' do
-			it 'should accept filters' do
+			it 'accepts filters' do
 				Bibliography.parse("@misc{k, title = {\\''u}}", :filter => 'latex')[0].title.must_be :==, 'ü'					
 			end
 		end
@@ -150,12 +150,12 @@ module BibTeX
           def @filter.apply (value); value.is_a?(::String) ? value.upcase : value; end
         end
           
-        it 'should support arbitrary conversions' do
+        it 'supports arbitrary conversions' do
           @bib.convert(@filter)
           assert_equal 'RUBY, RAILS', @bib[:rails].keywords
         end
         
-        it 'should support conditional arbitrary conversions' do
+        it 'supports conditional arbitrary conversions' do
           @bib.convert(@filter) { |e| e.key != 'rails' }
           assert_equal 'ruby, rails', @bib[:rails].keywords
           assert_equal 'RUBY', @bib[:flanagan2008].keywords
@@ -163,6 +163,17 @@ module BibTeX
         
       end
       
+			describe 'LaTeX filter' do
+				before do
+					@bib['rails'].keywords = 'r\\"uby'
+				end
+				
+				it 'converts LaTeX umlauts' do
+					@bib.convert(:latex)['rails'].keywords.must_be :==, 'rüby'
+				end
+				
+			end
+			
 			describe 'BibTeXML export' do
 				before { @bibtexml = Tempfile.new('bibtexml') }
 				after  { @bibtexml.unlink }

data/test/bibtex/test_entry.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require 'helper.rb'
 
 module BibTeX
@@ -190,13 +192,13 @@ module BibTeX
         end
       end
       
-      it 'should support renaming! of field attributes' do
+      it 'supports renaming! of field attributes' do
         @entry.rename!(:title => :foo)
         refute @entry.has_field?(:title)
         assert_equal 'Moby Dick', @entry[:foo]
       end
 
-      it 'should support renaming of field attributes' do
+      it 'supports renaming of field attributes' do
         e = @entry.rename(:title => :foo)
 
         assert @entry.has_field?(:title)
@@ -210,7 +212,7 @@ module BibTeX
       end
 
       
-      it 'should support citeproc export' do
+      it 'supports citeproc export' do
         e = @entry.to_citeproc
         assert_equal 'book', e['type']
         assert_equal 'New York', e['publisher-place']
@@ -226,24 +228,24 @@ module BibTeX
           def @filter.apply (value); value.is_a?(::String) ? value.upcase : value; end
         end
         
-        it 'should support arbitrary conversion' do
+        it 'supports arbitrary conversion' do
           e = @entry.convert(@filter)
           assert_equal 'MOBY DICK', e.title
           assert_equal 'Moby Dick', @entry.title
         end
 
-        it 'should support arbitrary in-place conversion' do
+        it 'supports arbitrary in-place conversion' do
           @entry.convert!(@filter)
           assert_equal 'MOBY DICK', @entry.title
         end
 
-        it 'should support conditional arbitrary in-place conversion' do
+        it 'supports conditional arbitrary in-place conversion' do
           @entry.convert!(@filter) { |k,v| k.to_s =~ /publisher/i  }
           assert_equal 'Moby Dick', @entry.title
           assert_equal 'PENGUIN', @entry.publisher
         end
 
-        it 'should support conditional arbitrary conversion' do
+        it 'supports conditional arbitrary conversion' do
           e = @entry.convert(@filter) { |k,v| k.to_s =~ /publisher/i  }
           assert_equal 'Moby Dick', e.title
           assert_equal 'PENGUIN', e.publisher
@@ -252,6 +254,36 @@ module BibTeX
         
       end
       
+			describe 'LaTeX filter' do
+				before do
+					@entry.title = 'M\\"{o}by Dick'
+				end
+				
+				describe '#convert' do
+					it 'converts LaTeX umlauts' do
+						@entry.convert(:latex).title.must_be :==, 'Möby Dick'
+					end
+					
+					it 'does not change the original entry' do
+						e = @entry.convert(:latex)
+						e.wont_be :==, @entry
+						e.title.to_s.length.must_be :<, @entry.title.to_s.length
+					end
+				end
+
+				describe '#convert!' do
+					it 'converts LaTeX umlauts' do
+						@entry.convert!(:latex).title.must_be :==, 'Möby Dick'
+					end
+					
+					it 'changes the original entry in-place' do
+						e = @entry.convert!(:latex)
+						e.must_be :equal?, @entry
+						e.title.to_s.length.must_be :==, @entry.title.to_s.length
+					end
+				end
+				
+			end
     end
 
     describe 'citeproc export' do

data/test/bibtex/test_names.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'helper'
 
 module BibTeX
@@ -19,5 +21,26 @@ module BibTeX
       
     end
     
+		describe "conversions" do
+      before do
+        class Upcase < BibTeX::Filter
+          def apply (value)
+            value.upcase
+          end
+        end
+      end
+      
+      describe "#convert" do
+        it "converts the value when given a filter instance" do
+					Names.parse('Poe and Hawthorne').convert(Upcase.instance).to_s.must_be :==, 'POE and HAWTHORNE'
+        end
+
+				it "converts LaTeX umlauts" do
+					Names.parse("S{\\o}ren Kirkegaard and Emmanuel L\\'evinas").convert(:latex).to_s.must_be :==, 'Kirkegaard, Søren and Lévinas, Emmanuel'
+				end
+			end
+
+		end
+    
   end
 end

data/test/bibtex/test_parser.rb

@@ -8,26 +8,19 @@ module BibTeX
         @bib = Parser.new(:debug => false).parse(File.read(Test.fixtures(:entry)))
       end
       
-      it 'should return a Bibliography' do
+      it 'returns a Bibliography instance' do
         assert @bib
         refute @bib.empty?
       end
         
-      it 'should parse all entries' do
+      it 'parses all entries' do
         assert_equal 3, @bib.length
       end
       
-      it 'should parse the key values' do
+      it 'parses the key values' do
         assert_equal %w{ key:0 key:1 foo }, @bib.map(&:key)
       end
 
-      it 'should handle strange keys' do
-        input = "@Misc{George Martin06,title = {FEAST FOR CROWS}}"
-        bib = Parser.new(:debug => false, :strict => false).parse(input)
-        assert_equal "George Martin06", bib.first.key
-        assert bib[:"George Martin06"]
-      end
-
       it 'should parse the entry types' do
         assert_equal [:book, :article, :article], @bib.map(&:type)
       end
@@ -47,6 +40,44 @@ module BibTeX
       end     
     end
     
+		describe 'key parsing' do
+		  it 'handles whitespace in keys' do
+        input = "@Misc{George Martin06,title = {FEAST FOR CROWS}}"
+        bib = Parser.new(:debug => false, :strict => false).parse(input)
+        assert_equal "George Martin06", bib.first.key
+        assert bib[:"George Martin06"]
+      end
+    end
+		
+		describe 'backslashes and escape sequences' do
+			
+			it 'leaves backslashes intact' do
+				Parser.new.parse(%q(@misc{key, title = "a backslash: \"}))[0].title.must_be :==, 'a backslash: \\'
+			end
+			
+			it 'parses LaTeX escaped quotes {"}' do
+				Parser.new.parse(%q(@misc{key, title = "{"}"}))[0].title.must_be :==, '{"}'
+			end
+			
+			it 'parses complex LaTeX markup' do
+				b = Parser.new.parse(<<-END)[0]
+					@book{proust_1996,
+			      address = {Paris},
+			      author = {Proust, Jo\\"{e}lle},
+			      booktitle = {Perception et Intermodalit\\'{e}: Approches Actuelles De La Question De Molyneux},
+			      editor = {Proust, Jo\\"{e}lle},
+			      keywords = {Perception; Molyneux's Problem},
+			      publisher = {Presses Universitaires de France},
+			      title = {Perception et Intermodalit\\'{e}: Approches Actuelles De La Question De Molyneux},
+			      year = {1996}
+			    }
+				END
+				b.booktitle.must_be :==, "Perception et Intermodalit\\'{e}: Approches Actuelles De La Question De Molyneux"
+				b.editor.must_be :==, 'Proust, Jo\"{e}lle'
+			end
+			
+		end
+		
     describe 'given a set of explicit and implicit comments' do
       before do
         @bib = Parser.new(:debug => false, :include => [:meta_content]).parse(File.read(Test.fixtures(:comment)))

data/test/bibtex/test_value.rb

@@ -78,45 +78,45 @@ module BibTeX
       end
       
       describe "#convert" do
-        it "should convert the value when given a filter instance" do
+        it "converts the value when given a filter instance" do
           assert_equal ['FOO', '"FOO" # bar'], @values.map { |v| v.convert(Upcase.instance).to_s }
         end
 
-        it "should convert the value when given a filter class" do
+        it "converts the value when given a filter class" do
           assert_equal ['FOO', '"FOO" # bar'], @values.map { |v| v.convert(Upcase).to_s }
         end
 
-        it "should convert the value when given the name of a filter" do
+        it "converts the value when given the name of a filter" do
           assert_equal ['FOO', '"FOO" # bar'], @values.map { |v| v.convert(:upcase).to_s }
           assert_equal ['FOO', '"FOO" # bar'], @values.map { |v| v.convert('upcase').to_s }
         end
 
-        it "should convert the value when using a ghost method" do
+        it "converts the value when using a ghost method" do
           assert_equal ['FOO', '"FOO" # bar'], @values.map { |v| v.convert_upcase.to_s }
         end
         
-        it "should not alter the value when using a filter name" do
+        it "does not alter the value when using a filter name" do
           @values.each { |v| v.convert(:upcase) }
           assert_equal ['foo', '"foo" # bar'], @values.map(&:to_s)
         end
 
-        it "should not alter the value when using a ghost method" do
+        it "does not alter the value when using a ghost method" do
           @values.each { |v| v.convert_upcase }
           assert_equal ['foo', '"foo" # bar'], @values.map(&:to_s)
         end
       end
       
       describe "#convert!" do
-        it "should convert the value when given the name of a filter" do
+        it "converts the value when given the name of a filter" do
           assert_equal ['FOO', '"FOO" # bar'], @values.map { |v| v.convert!(:upcase).to_s }
         end
         
-        it "should alter the value when given the name of a filter" do
+        it "alters the value when given the name of a filter" do
           @values.each { |v| v.convert!(:upcase) }
           assert_equal ['FOO', '"FOO" # bar'], @values.map(&:to_s)
         end
 
-        it "should alter the value when using a ghost method" do
+        it "alters the value when using a ghost method" do
           @values.each { |v| v.convert_upcase! }
           assert_equal ['FOO', '"FOO" # bar'], @values.map(&:to_s)
         end
@@ -124,7 +124,7 @@ module BibTeX
       end
       
       describe "#to_s" do
-        it 'should accept a :filter option and convert the values accordingly without changing the value' do
+        it 'accepts a :filter option and convert the values accordingly without changing the value' do
           assert_equal '"FOO" # bar', @values[1].to_s(:filter => :upcase)
           assert_equal '"foo" # bar', @values[1].to_s
         end

data/test/profile.rb

@@ -20,7 +20,7 @@ data = data * 50
 # data = File.open(File.expand_path('../fixtures/benchmark.bib', __FILE__)).read
 
 result = RubyProf.profile do
-  BibTeX.parse(data)
+	 BibTeX.parse(data)
   # BibTeX::Lexer.new.analyse(data)
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bibtex-ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-25 00:00:00.000000000Z
+date: 2011-10-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: latex-decode
-  requirement: &2157691200 !ruby/object:Gem::Requirement
+  requirement: &2158238240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *2157691200
+  version_requirements: *2158238240
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &2157690680 !ruby/object:Gem::Requirement
+  requirement: &2158237720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157690680
+  version_requirements: *2158237720
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2157690200 !ruby/object:Gem::Requirement
+  requirement: &2158237240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *2157690200
+  version_requirements: *2158237240
 - !ruby/object:Gem::Dependency
   name: racc
-  requirement: &2157689720 !ruby/object:Gem::Requirement
+  requirement: &2158236760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.4'
   type: :development
   prerelease: false
-  version_requirements: *2157689720
+  version_requirements: *2158236760
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2157689240 !ruby/object:Gem::Requirement
+  requirement: &2158236280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.9'
   type: :development
   prerelease: false
-  version_requirements: *2157689240
+  version_requirements: *2158236280
 description: ! "\t\tBibTeX-Ruby is the Rubyist's swiss-army-knife for all things BibTeX.
   It\n    includes a parser for all common BibTeX objects (@string, @preamble,\n    @comment
   and regular entries) and a sophisticated name parser that\n    tokenizes correctly