bibtex-ruby 2.1.0 → 2.1.1

data/History.txt

@@ -1,3 +1,8 @@
+2.1.1 / 2012-09-14
+==================
+
+* Improved @comment and @preamble parsing (@JLimperg)
+
 2.1.0 / 2012-08-31
 ==================
 

data/lib/bibtex/lexer.rb

@@ -57,8 +57,8 @@ module BibTeX
       :next         => /(^|\n)[\t ]*@[\t ]*/o,
       :entry        => /[a-z\d:_!\.$%&*-]+/io,
       :string       => /string/io,
-      :comment      => /comment/io,
-      :preamble     => /preamble/io,
+      :comment      => /comment\b/io,
+      :preamble     => /preamble\b/io,
       :key          => /[[:alpha:]\d \/:_!$\?\.%&\*-]+,/io,
       :optional_key => /[[:alpha:]\d \/:_!$\?\.%&\*-]*,/io
     }.freeze

data/lib/bibtex/version.rb

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

data/test/bibtex/test_bibliography.rb

@@ -292,4 +292,4 @@ module BibTeX
         
     
   end
-end
+end

data/test/bibtex/test_entry.rb

@@ -323,7 +323,7 @@ module BibTeX
       bib = BibTeX::Bibliography.open(Test.fixtures(:entry), :debug => false)
       refute_nil(bib)
       assert_equal(BibTeX::Bibliography, bib.class)
-      assert_equal(3, bib.data.length)
+      assert_equal(4, bib.data.length)
       assert_equal([BibTeX::Entry], bib.data.map(&:class).uniq)
       assert_equal('key:0', bib.data[0].key)
       assert_equal('key:1', bib.data[1].key)

data/test/bibtex/test_lexer.rb

@@ -16,9 +16,17 @@ module BibTeX
       Lexer.new.analyse(%Q(@string{ x = "foo\n    bar" })).stack[-3].must_be :==,
         [:STRING_LITERAL, 'foo bar']
     end
-    
+
     it 'matches KEY tokens' 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
+      Lexer.new.analyse("@preamblestring{ preamble }").symbols.must_be :==, [:AT, :NAME, :LBRACE, :NAME, :RBRACE, false]
+    end
   end
-end
+end

data/test/bibtex/test_parser.rb

@@ -14,15 +14,15 @@ module BibTeX
       end
         
       it 'parses all entries' do
-        assert_equal 3, @bib.length
+        assert_equal 4, @bib.length
       end
       
       it 'parses the key values' do
-        assert_equal %w{ key:0 key:1 foo }, @bib.map(&:key)
+        assert_equal %w{ key:0 key:1 foo staudinger }, @bib.map(&:key)
       end
 
       it 'should parse the entry types' do
-        assert_equal [:book, :article, :article], @bib.map(&:type)
+        assert_equal [:book, :article, :article, :commentary], @bib.map(&:type)
       end
       
       it 'should parse all values correctly' do

data/test/fixtures/entry.bib

@@ -18,3 +18,8 @@
   year={2001},}
 
 @article{foo,}
+
+@commentary{staudinger,
+  editor = {Staudinger, Julius von}
+}
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bibtex-ruby
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-31 00:00:00.000000000 Z
+date: 2012-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: latex-decode
-  requirement: &70168050368080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70168050368080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70168050367300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +37,12 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70168050367300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 description: ! 'BibTeX-Ruby is the Rubyist''s swiss-army-knife for all things BibTeX.
   It
 
@@ -149,21 +159,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 769369451757676187
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 769369451757676187
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A BibTeX parser, converter and API for Ruby.