bibtex-ruby 1.2.1 → 1.3.0

data/test/{bib/06_preamble.bib → fixtures/preamble.bib}

@@ -2,7 +2,7 @@
 %% This is a valid BibTeX File
 %%
 
-% Testing @preamble statements
+% Testing preamble statements
 
 @preamble{"This bibliography was created \today"}
 @preamble {  "Bib\TeX"  }

data/test/{bib/11_roundtrip.bib → fixtures/roundtrip.bib}

@@ -1,6 +1,6 @@
 @book{rails,
   address = {Raleigh, North Carolina},
-  author = {Ruby, Sam, and Thomas, Dave, and Hansson, David Heinemeier},
+  author = {Ruby, Sam and Thomas, Dave and Hansson Heinemeier, David},
   booktitle = {Agile Web Development with Rails},
   edition = {third},
   keywords = {ruby, rails},

data/test/helper.rb

@@ -1,4 +1,19 @@
 require File.expand_path('../../lib/bibtex.rb', __FILE__)
-require 'rubygems'
-require 'minitest/unit'
+
+require 'mini_shoulda'
 require 'minitest/autorun'
+require 'redgreen'
+
+require 'tempfile'
+
+module BibTeX
+  module Test
+    
+    class << self
+      def fixtures(name)
+        File.expand_path("../fixtures/#{name}.bib", __FILE__)
+      end
+    end
+    
+  end
+end

data/test/test_bibtex.rb

@@ -1,108 +1,102 @@
 require 'helper.rb'
 
-class TestBibtex < MiniTest::Unit::TestCase
+module BibTeX
+  class TestBibtex < MiniTest::Unit::TestCase
   
-  def setup
-  end
+    def setup
+    end
 
-  def teardown
-  end
+    def teardown
+    end
 
-  def test_empty
-    bib = BibTeX::Bibliography.open('test/bib/00_empty.bib', :debug => true)
-    refute_nil(bib)
-    assert_equal(BibTeX::Bibliography, bib.class)
-    assert(bib.empty?)
-  end
+    def test_empty
+      bib = BibTeX::Bibliography.open(Test.fixtures(:empty), :debug => false)
+      refute_nil(bib)
+      assert_equal(BibTeX::Bibliography, bib.class)
+      assert(bib.empty?)
+    end
 
-  def test_no_bibtex
-    bib = BibTeX::Bibliography.open('test/bib/01_no_bibtex.bib', :debug => true)
-    refute_nil(bib)
-    assert_equal(BibTeX::Bibliography, bib.class)
-    assert(bib.empty?)
-  end
+    def test_no_bibtex
+      bib = BibTeX::Bibliography.open(Test.fixtures(:no_bibtex), :debug => false)
+      refute_nil(bib)
+      assert_equal(BibTeX::Bibliography, bib.class)
+      assert(bib.empty?)
+    end
 
-  def test_decoret
-    bib = BibTeX::Bibliography.open('test/bib/08_decoret.bib', :debug => true)
-    refute_nil(bib)
-    assert_equal(BibTeX::Bibliography, bib.class)
-    assert_equal(15, bib.length)
-    assert_equal([BibTeX::Entry,BibTeX::Comment,BibTeX::String,BibTeX::Preamble], bib.data.map(&:class).uniq)
-    assert_equal('py03', bib.data[0].key)
-    assert_equal(:article, bib['py03'].type)
-    assert_equal("Xavier D\\'ecoret", bib['py03'][:author])
-    assert_equal('PyBiTex', bib['py03'][:title])
-    assert_equal('2003', bib['py03'][:year])
-    assert_equal(:article, bib['key03'].type)
-    assert_equal('A {bunch {of} braces {in}} title', bib['key03'][:title])
-    #TODO missing assertions
-  end
+    def test_decoret
+      bib = BibTeX::Bibliography.open(Test.fixtures(:decoret), :debug => false)
+      assert_equal(15, bib.length)
+      assert_equal([BibTeX::Entry,BibTeX::Comment,BibTeX::String,BibTeX::Preamble], bib.data.map(&:class).uniq)
+      assert_equal(:py03, bib.data[0].key)
+      assert_equal(:article, bib[:py03].type)
+      assert_equal("D\\'ecoret, Xavier", bib[:py03][:author])
+      assert_equal('PyBiTex', bib[:py03][:title])
+      assert_equal('2003', bib[:py03][:year])
+      assert_equal(:article, bib[:key03].type)
+      assert_equal('A {bunch {of} braces {in}} title', bib[:key03][:title])
+      #TODO missing assertions
+    end
   
-  def test_errors
-    bib = BibTeX.open('test/bib/09_errors.bib', :debug => true)
-    #refute_nil(bib)
-  end
+    # def test_errors
+    #   bib = BibTeX.open(Test.fixtures(:errors), :debug => false)
+    #   #refute_nil(bib)
+    # end
   
-  def test_bibdesk
-    bib = BibTeX::Bibliography.open('test/bib/10_bibdesk.bib', :debug => true)
-    refute_nil(bib)
-    assert_equal(BibTeX::Bibliography, bib.class)
-    assert_equal(3, bib.length)
-    assert_equal('rails', bib.data[0].key)
-    assert_equal('2010-08-05 10:06:32 +0200', bib[:dragon]['date-modified'])
-  end
+    def test_bibdesk
+      bib = BibTeX::Bibliography.open(Test.fixtures(:bibdesk), :debug => false)
+      assert_equal 3, bib.length
+      assert_equal :rails, bib[0].key
+      assert_equal '2010-08-05 10:06:32 +0200', bib[:dragon]['date-modified']
+    end
   
-  def test_roundtrip
-    file = File.read('test/bib/11_roundtrip.bib')
-    bib = BibTeX.parse(file, :debug => true)
-    refute_nil(bib)
-    assert_equal(BibTeX::Bibliography, bib.class)
-    assert_equal(1, bib.length)
-    assert_equal(file.gsub(/[\s]+/, ''), bib.to_s.gsub(/[\s]+/, ''))
-  end
+    def test_roundtrip
+      file = File.read(Test.fixtures(:roundtrip))
+      bib = BibTeX.parse(file, :debug => false)
+      assert_equal file.gsub(/[\s]+/, ''), bib.to_s.gsub(/[\s]+/, '')
+    end
   
-  def test_construct
-    file = File.read('test/bib/11_roundtrip.bib')
-    bib = BibTeX::Bibliography.new
-    bib << BibTeX::Entry.new({
-      :type => :book,
-      :key => 'rails',
-      :address => 'Raleigh, North Carolina',
-      :author => 'Ruby, Sam, and Thomas, Dave, and Hansson, David Heinemeier',
-      :booktitle => 'Agile Web Development with Rails',
-      :edition => 'third',
-      :keywords => 'ruby, rails',
-      :publisher => 'The Pragmatic Bookshelf',
-      :series => 'The Facets of Ruby',
-      :title => 'Agile Web Development with Rails',
-      :year => '2009'
-    })
-    assert_equal(file.gsub(/[\s]+/, ''), bib.to_s.gsub(/[\s]+/, ''))    
-  end
+    def test_construct
+      file = File.read(Test.fixtures(:roundtrip))
+      bib = BibTeX::Bibliography.new
+      bib << BibTeX::Entry.new({
+        :type => :book,
+        :key => 'rails',
+        :address => 'Raleigh, North Carolina',
+        :author => 'Ruby, Sam and Thomas, Dave and Hansson Heinemeier, David',
+        :booktitle => 'Agile Web Development with Rails',
+        :edition => 'third',
+        :keywords => 'ruby, rails',
+        :publisher => 'The Pragmatic Bookshelf',
+        :series => 'The Facets of Ruby',
+        :title => 'Agile Web Development with Rails',
+        :year => '2009'
+      })
+      assert_equal(file.gsub(/[\s]+/, ''), bib.to_s.gsub(/[\s]+/, ''))    
+    end
   
-  def test_parse
-    file = File.read('test/bib/11_roundtrip.bib')
-    bib = BibTeX::Bibliography.new
-    bib.add(BibTeX::Element.parse(%q( @string{ pragprog = "The Pragmatic Booksehlf" } )))
-    bib.add(BibTeX::Element.parse(<<-END
-    @book{rails,
-      address = {Raleigh, North Carolina},
-      author = {Ruby, Sam, and Thomas, Dave, and Hansson, David Heinemeier},
-      booktitle = {Agile Web Development with Rails},
-      edition = {third},
-      keywords = {ruby, rails},
-      publisher = {The Pragmatic Bookshelf},
-      series = {The Facets of Ruby},
-      title = {Agile Web Development with Rails},
-      year = {2009}
-    }    
-    END
-    ))
+    def test_parse
+      file = File.read(Test.fixtures(:roundtrip))
+      bib = BibTeX::Bibliography.new
+      bib.add(BibTeX::Element.parse(%q( @string{ pragprog = "The Pragmatic Booksehlf" } )))
+      bib.add(BibTeX::Element.parse(<<-END))
+      @book{rails,
+        address = {Raleigh, North Carolina},
+        author = {Ruby, Sam and Thomas, Dave and Hansson Heinemeier, David},
+        booktitle = {Agile Web Development with Rails},
+        edition = {third},
+        keywords = {ruby, rails},
+        publisher = {The Pragmatic Bookshelf},
+        series = {The Facets of Ruby},
+        title = {Agile Web Development with Rails},
+        year = {2009}
+      }    
+      END
     
-    assert_equal(2, bib.length)
-    refute_nil(bib[:rails])
-    bib.replace_strings
-    assert_equal(file.gsub(/[\s]+/, ''), bib[:rails].to_s.gsub(/[\s]+/, ''))
+      assert_equal(2, bib.length)
+      refute_nil(bib[:rails])
+      bib.replace_strings
+      assert_equal(file.gsub(/[\s]+/, ''), bib[:rails].to_s.gsub(/[\s]+/, ''))
+    end
   end
-end
 
+end

data/test/test_export.rb

@@ -3,29 +3,25 @@ require 'helper.rb'
 require 'yaml'
 require 'json'
 
-class TestString < MiniTest::Unit::TestCase
+module BibTeX
+  class TestString < MiniTest::Unit::TestCase
   
-  def setup
-  end
-
-  def teardown
-  end
-
-  def test_yaml
-    bib = BibTeX::Bibliography.open('test/bib/10_bibdesk.bib', :debug => true)
-    yaml = YAML.load(bib.to_yaml)
-    refute_nil(yaml)
-    assert_equal(3, yaml.length)
-    assert_equal(['dragon', 'pickaxe', 'rails'], yaml.map { |y| y['key'] }.sort)
-    assert_equal('{The Facets of Ruby}', yaml[0]['series'])
-  end
+    def test_yaml
+      bib = BibTeX::Bibliography.open(Test.fixtures(:bibdesk), :debug => false)
+      yaml = YAML.load(bib.to_yaml)
+      refute_nil(yaml)
+      assert_equal(3, yaml.length)
+      assert_equal([:dragon, :pickaxe, :rails], yaml.map { |y| y[:key] }.sort)
+      assert_equal('{The Facets of Ruby}', yaml[0][:series])
+    end
   
-  def test_json
-    bib = BibTeX::Bibliography.open('test/bib/10_bibdesk.bib', :debug => true)
-    json = JSON.parse(bib.to_json)
-    refute_nil(json)
-    assert_equal(3, json.length)
-    assert_equal(['dragon', 'pickaxe', 'rails'], json.map { |y| y['key'] }.sort)
-    assert_equal('{The Facets of Ruby}', json[0]['series'])
+    def test_json
+      bib = BibTeX::Bibliography.open(Test.fixtures(:bibdesk), :debug => false)
+      json = JSON.parse(bib.to_json)
+      refute_nil(json)
+      assert_equal(3, json.length)
+      assert_equal(%w[ dragon pickaxe rails], json.map { |y| y['key'] }.sort)
+      assert_equal('{The Facets of Ruby}', json[0]['series'])
+    end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: bibtex-ruby
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors: 
 - Sylvester Keil
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 +02:00
+date: 2011-05-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,32 +21,65 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.4.6
+        version: "1.4"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: minitest
+  name: mini_shoulda
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.2
+        version: "0.3"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: mynyml-redgreen
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.0
+        version: "0.7"
   type: :development
   version_requirements: *id003
-description: A (fairly complete) BibTeX parser written in Ruby. Supports regular BibTeX entries, @comments, string replacement via @string. Allows for easy export/conversion to formats such as YAML, JSON, and XML.
+- !ruby/object:Gem::Dependency 
+  name: autowatchr
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0.1"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0.10"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "1.5"
+  type: :development
+  version_requirements: *id006
+description: A (fairly complete) BibTeX library and parser written in Ruby. Includes a name parser and supports regular BibTeX entries, @comments, string replacement via @string. Allows for easy export/conversion to formats such as YAML, JSON, and XML.
 email: http://sylvester.keil.or.at
 executables: []
 
@@ -62,10 +95,22 @@ files:
 - Manifest
 - README.md
 - Rakefile
+- auto.watchr
 - bibtex-ruby.gemspec
 - examples/bib2html.rb
 - examples/bib2yaml.rb
 - examples/markdown.bib
+- features/bibtex.feature
+- features/entries.feature
+- features/issues/slash_keys.feature
+- features/names.feature
+- features/preambles.feature
+- features/query.feature
+- features/replacement.feature
+- features/step_definitions/bibtex_steps.rb
+- features/step_definitions/name_steps.rb
+- features/strings.feature
+- features/support/env.rb
 - lib/bibtex/bibliography.rb
 - lib/bibtex/bibtex.y
 - lib/bibtex/elements.rb
@@ -73,31 +118,38 @@ files:
 - lib/bibtex/error.rb
 - lib/bibtex/extensions.rb
 - lib/bibtex/lexer.rb
+- lib/bibtex/name_parser.output
+- lib/bibtex/name_parser.rb
+- lib/bibtex/names.rb
+- lib/bibtex/names.y
 - lib/bibtex/parser.output
 - lib/bibtex/parser.rb
+- lib/bibtex/replaceable.rb
 - lib/bibtex/utilities.rb
+- lib/bibtex/value.rb
 - lib/bibtex/version.rb
 - lib/bibtex.rb
-- test/bib/00_empty.bib
-- test/bib/01_no_bibtex.bib
-- test/bib/02_string.bib
-- test/bib/03_string.bib
-- test/bib/04_string_replacement.bib
-- test/bib/05_comment.bib
-- test/bib/06_preamble.bib
-- test/bib/07_entry.bib
-- test/bib/08_decoret.bib
-- test/bib/09_errors.bib
-- test/bib/10_bibdesk.bib
-- test/bib/11_roundtrip.bib
+- test/benchmark.rb
+- test/bibtex/test_bibliography.rb
+- test/bibtex/test_elements.rb
+- test/bibtex/test_entry.rb
+- test/bibtex/test_names.rb
+- test/bibtex/test_parser.rb
+- test/bibtex/test_string.rb
+- test/bibtex/test_utilities.rb
+- test/bibtex/test_value.rb
+- test/fixtures/bibdesk.bib
+- test/fixtures/comment.bib
+- test/fixtures/decoret.bib
+- test/fixtures/empty.bib
+- test/fixtures/entry.bib
+- test/fixtures/errors.bib
+- test/fixtures/no_bibtex.bib
+- test/fixtures/preamble.bib
+- test/fixtures/roundtrip.bib
 - test/helper.rb
 - test/test_bibtex.rb
-- test/test_comment.rb
-- test/test_entry.rb
 - test/test_export.rb
-- test/test_preamble.rb
-- test/test_string.rb
-- test/test_utilities.rb
 has_rdoc: true
 homepage: http://inukshuk.github.com/bibtex-ruby
 licenses: []
@@ -134,10 +186,13 @@ signing_key:
 specification_version: 3
 summary: A BibTeX parser and converter written in Ruby.
 test_files: 
+- test/bibtex/test_bibliography.rb
+- test/bibtex/test_elements.rb
+- test/bibtex/test_entry.rb
+- test/bibtex/test_names.rb
+- test/bibtex/test_parser.rb
+- test/bibtex/test_string.rb
+- test/bibtex/test_utilities.rb
+- test/bibtex/test_value.rb
 - test/test_bibtex.rb
-- test/test_comment.rb
-- test/test_entry.rb
 - test/test_export.rb
-- test/test_preamble.rb
-- test/test_string.rb
-- test/test_utilities.rb