bibtex-ruby 2.1.1 → 2.1.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bibtex-ruby (2.1.0)
+    bibtex-ruby (2.1.2)
       latex-decode (>= 0.0.6)
       multi_json (~> 1.3)
 

data/History.txt

@@ -1,3 +1,8 @@
+2.1.1 / 2012-11-02
+==================
+
+* Fixed lexer issue with whitespace before cite keys (@lmullen)
+
 2.1.1 / 2012-09-14
 ==================
 

data/Manifest

@@ -24,6 +24,7 @@ features/issues/number_keys.feature
 features/issues/parse_months.feature
 features/issues/slash_keys.feature
 features/issues/trailing_comma.feature
+features/issues/whitespace_keys.feature
 features/names.feature
 features/preambles.feature
 features/query.feature

data/features/issues/whitespace_keys.feature

@@ -0,0 +1,23 @@
+Feature: Whitespace in before cite keys
+	As a hacker who works with bibliographies
+	I want to parse BibTeX entries with whitespace before the cite key
+	Because they frequently occur in the wild
+	
+	Scenario: An entry with spaces before the cite key
+		When I parse the following file:
+		"""
+    @InCollection{    brown:family:1997,
+      address       = {Princeton},
+      title         = {Family Strategies and Religious Practice: Baptism and the
+                      Lord's Supper in Early New England},
+      booktitle     = {Lived Religion in America: Toward a History of Practice},
+      shorttitle    = {Family Strategies},
+      publisher     = {Princeton University Press},
+      author        = {Brown, Anne S. and Hall, David D.},
+      editor        = {Hall, David D.},
+      year          = {1997},
+      pages         = {41--68},
+      crossref      = {hall:lived:1997}
+    }
+    """
+		Then my bibliography should contain an incollection with id "brown:family:1997"

data/lib/bibtex/lexer.rb

@@ -1,6 +1,6 @@
 #--
 # BibTeX-Ruby
-# Copyright (C) 2010-2011 Sylvester Keil <http://sylvester.keil.or.at>
+# Copyright (C) 2010-2012 Sylvester Keil <http://sylvester.keil.or.at>
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -59,8 +59,8 @@ module BibTeX
       :string       => /string/io,
       :comment      => /comment\b/io,
       :preamble     => /preamble\b/io,
-      :key          => /[[:alpha:]\d \/:_!$\?\.%&\*-]+,/io,
-      :optional_key => /[[:alpha:]\d \/:_!$\?\.%&\*-]*,/io
+      :key          => /\s*[[:alpha:]\d \/:_!$\?\.%&\*-]+,/io,
+      :optional_key => /\s*[[:alpha:]\d \/:_!$\?\.%&\*-]*,/io
     }.freeze
     
     MODE = Hash.new(:meta).merge({

data/lib/bibtex/version.rb

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

data/test/bibtex/test_lexer.rb

@@ -21,11 +21,15 @@ module BibTeX
       Lexer.new.analyse("@misc{foo, }").symbols.must_be :==, [:AT, :NAME, :LBRACE, :KEY, :RBRACE, false]
     end
 
-    it 'doesn\'t start a comment for types starting with but not equal @comment' do
+    it 'matches KEY tokens after whitespace' do
+      Lexer.new.analyse("@misc{  foo, }").symbols.must_be :==, [:AT, :NAME, :LBRACE, :KEY, :RBRACE, false]
+    end
+
+    it "doesn't start a comment for types starting with but not equal @comment" do
       Lexer.new.analyse("@commentary{staudinger, }").symbols.must_be :==, [:AT, :NAME, :LBRACE, :KEY, :RBRACE, false]
     end
 
-    it 'doesn\'t start a preamble for types starting with but not equal @preamble' do
+    it "doesn't start a preamble for types starting with but not equal @preamble" do
       Lexer.new.analyse("@preamblestring{ preamble }").symbols.must_be :==, [:AT, :NAME, :LBRACE, :NAME, :RBRACE, false]
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bibtex-ruby
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-14 00:00:00.000000000 Z
+date: 2012-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: latex-decode
@@ -90,6 +90,7 @@ files:
 - features/issues/parse_months.feature
 - features/issues/slash_keys.feature
 - features/issues/trailing_comma.feature
+- features/issues/whitespace_keys.feature
 - features/names.feature
 - features/preambles.feature
 - features/query.feature
@@ -159,12 +160,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3159089786637859707
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3159089786637859707
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24