bibtex-ruby 2.0.4 → 2.0.5

data/Gemfile

@@ -2,7 +2,7 @@ source :rubygems
 gemspec
 
 group :debug do
-	gem 'ruby-debug19', :require => 'ruby-debug', :platforms => [:mri_19]
+	gem 'debugger', :platforms => [:mri_19]
 	gem 'ruby-debug', :platforms => [:mri_18]
 	gem 'rbx-trepanning', :platforms => [:rbx]
 end
@@ -16,5 +16,5 @@ end
 
 group :profile do
 	gem 'ruby-prof', ['~>0.10'], :platforms => [:mri_19, :mri_19]
-	gem 'gnuplot', ['~>2.3']
+	gem 'gnuplot', ['~>2.4']
 end

data/Gemfile.lock

@@ -1,71 +1,67 @@
 PATH
   remote: .
   specs:
-    bibtex-ruby (2.0.4)
+    bibtex-ruby (2.0.5)
       latex-decode (>= 0.0.6)
-      multi_json (~> 1.0)
+      multi_json (~> 1.3)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    archive-tar-minitar (0.5.2)
     autowatchr (0.1.5)
       watchr
     builder (3.0.0)
-    columnize (0.3.4)
-    cucumber (1.0.2)
+    coderay (1.0.5)
+    columnize (0.3.6)
+    cucumber (1.1.9)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.5)
+      gherkin (~> 2.9.0)
       json (>= 1.4.6)
-      term-ansicolor (>= 1.0.5)
-    diff-lcs (1.1.2)
-    gherkin (2.4.18)
+      term-ansicolor (>= 1.0.6)
+    debugger (1.0.0)
+      columnize (>= 0.3.1)
+      debugger-linecache
+      debugger-ruby_core_source
+    debugger-linecache (1.0.1)
+      debugger-ruby_core_source
+    debugger-ruby_core_source (1.0.1)
+    diff-lcs (1.1.3)
+    gherkin (2.9.0)
       json (>= 1.4.6)
-    gherkin (2.4.18-java)
+    gherkin (2.9.0-java)
       json (>= 1.4.6)
-    gnuplot (2.3.6)
-    json (1.5.4)
-    json (1.5.4-java)
-    latex-decode (0.0.10)
+    gnuplot (2.4.1)
+    json (1.6.5)
+    json (1.6.5-java)
+    latex-decode (0.0.12)
       unicode (~> 0.4)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
-    minitest (2.3.1)
-    multi_json (1.0.4)
+    minitest (2.11.3)
+    multi_json (1.3.2)
     mynyml-redgreen (0.7.1)
       term-ansicolor (>= 1.0.4)
-    racc (1.4.6)
-    rake (0.9.2)
+    racc (1.4.8)
+    rake (0.9.2.2)
     rbx-linecache (1.3)
       rbx-require-relative
-    rbx-require-relative (0.0.5)
-    rbx-trepanning (1.8.7)
+    rbx-require-relative (0.0.9)
+    rbx-trepanning (0.1.0)
+      coderay (>= 1.0)
       columnize
-      diff-lcs
-      rbx-linecache (~> 1.2)
+      rbx-linecache (~> 1.3)
       rbx-require-relative (>= 0.0.4)
-    rdoc (3.9.1)
+    rdoc (3.12)
+      json (~> 1.4)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
     ruby-prof (0.10.8)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
-    term-ansicolor (1.0.5)
-    unicode (0.4.0)
+    term-ansicolor (1.0.7)
+    unicode (0.4.2)
     watchr (0.7)
 
 PLATFORMS
@@ -76,7 +72,8 @@ DEPENDENCIES
   autowatchr (~> 0.1)
   bibtex-ruby!
   cucumber (~> 1.0)
-  gnuplot (~> 2.3)
+  debugger
+  gnuplot (~> 2.4)
   minitest
   mynyml-redgreen (~> 0.7)
   racc (~> 1.4)
@@ -84,5 +81,4 @@ DEPENDENCIES
   rbx-trepanning
   rdoc (~> 3.9)
   ruby-debug
-  ruby-debug19
   ruby-prof (~> 0.10)

data/History.txt

@@ -1,3 +1,9 @@
+2.0.5 /
+
+* Fixed Entry#dup (@JLimperg)
+* Implemented explicit caching of regular expressions (for MacRuby)
+* Switched to new MultiJson API
+
 2.0.4 / 2011-12-20
 ==================
 

data/Manifest

@@ -19,6 +19,7 @@ features/issues/braced_strings.feature
 features/issues/crossref.feature
 features/issues/latex_filter.feature
 features/issues/multiline_strings.feature
+features/issues/name_parsing.feature
 features/issues/number_keys.feature
 features/issues/parse_months.feature
 features/issues/slash_keys.feature
@@ -82,6 +83,8 @@ test/fixtures/no_bibtex.bib
 test/fixtures/preamble.bib
 test/fixtures/roundtrip.bib
 test/helper.rb
+test/macruby.d
+test/macruby.rb
 test/profile.rb
 test/test_bibtex.rb
 test/test_export.rb

data/bibtex-ruby.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
 	END_DESCRIPTION
 	
   s.add_runtime_dependency('latex-decode', ['>=0.0.6'])
-  s.add_runtime_dependency('multi_json', ['~>1.0'])
+  s.add_runtime_dependency('multi_json', ['~>1.3'])
 
   s.add_development_dependency('rake', ['~>0.9'])
   s.add_development_dependency('racc', ['~>1.4'])

data/examples/bib2html.rb

@@ -34,4 +34,4 @@ rescue LoadError
   exit
 end
 
-puts Redcarpet.new(content.join).to_html
+puts Redcarpet::Markdown.new(Redcarpet::Render::HTML).render(content.join)

data/features/issues/name_parsing.feature

@@ -0,0 +1,19 @@
+Feature: BibTeX Names
+  As a hacker who works with bibliographies
+  I want to be able to access individual parts of names in a BibTeX file
+  
+  Scenario Outline: Name Parsing
+    When I parse the name "<name>"
+    Then the parts should be:
+      |  first  |  von  |  last  |  jr  |
+      | <first> | <von> | <last> | <jr> |
+      
+  @names @issue-46
+  Scenarios: Names with LaTeX commands
+    | name               | first      | von        | last           | jr |
+    | G{\\"u}rkan, G.    | G.         |            | G{\\"u}rkan    |    |
+    | {\"O}zge, A.       | A.         |            | {\"O}zge       |    |
+    | Yonca Ozge, A.     | A.         |            | Yonca Ozge     |    |
+    | Yonca \"Ozge, A.   | A.         |            | Yonca \"Ozge   |    |
+    | Yonca Özge, A.     | A.         |            | Yonca Özge     |    |
+    | Yonca {\"O}Zge, A. | A.         |            | Yonca {\"O}Zge |    |

data/features/names.feature

@@ -8,7 +8,7 @@ Feature: BibTeX Names
 			|  first  |  von  |  last  |  jr  |
 			| <first> | <von> | <last> | <jr> |
 	
-	@display
+	@names @display
 	Scenarios: Decoret test suite (display order)
 		| name            | first      | von        | last    | jr |
 		| AA BB           | AA         |            | BB      |    |
@@ -32,7 +32,7 @@ Feature: BibTeX Names
 		| AA bb {cc} DD   | AA         | bb         | {cc} DD |    |
 		| AA {bb} CC      | AA {bb}    |            | CC      |    |
 
-	@sort
+	@names @sort
 	Scenarios: Decoret test suite (sort order)
 		| name            | first      | von        | last    | jr |
 		| bb CC, AA       | AA         | bb         | CC      |    |
@@ -46,7 +46,7 @@ Feature: BibTeX Names
 		| CC dd BB, AA    | AA         | CC dd      | BB      |    |
 		| BB, AA          | AA         |            | BB      |    |
 	
-	@sort
+	@names @sort
 	Scenarios: Long von parts
 		| name            | first      | von        | last    | jr |
 		| bb cc dd CC, AA | AA         | bb cc dd   | CC      |    |
@@ -54,7 +54,7 @@ Feature: BibTeX Names
 		| BB cc dd CC, AA | AA         | BB cc dd   | CC      |    |
 		| BB CC dd CC, AA | AA         | BB CC dd   | CC      |    |
 
-	
+	@names 
 	Scenarios: Decoret further remarks
 		| name                              | first                | von            | last                    | jr |
 		# | Paul \'Emile Victor               | Paul \'Emile        |                | Victor                  |    |
@@ -69,6 +69,7 @@ Feature: BibTeX Names
 		| Dominique {G}alouzeau de Villepin  | Dominique            | {G}alouzeau de | Villepin                |    |
 		| Galouzeau {de} Villepin, Dominique | Dominique            |                | Galouzeau {de} Villepin |    |
 
+  @names 
 	Scenarios: Some actual names
 		| name                              | first                   | von            | last                           | jr  |
 		| John Paul Jones                   | John Paul               |                | Jones                          |     |

data/lib/bibtex/bibliography.rb

@@ -316,7 +316,7 @@ module BibTeX
     
     # Returns a JSON representation of the bibliography.
     def to_json(options = {})
-      MultiJson.encode(to_a(options))
+      MultiJson.dump(to_a(options))
     end
     
     # Returns a CiteProc JSON representation of the bibliography. Only BibTeX enrties are exported.

data/lib/bibtex/elements.rb

@@ -124,7 +124,7 @@ module BibTeX
     end
     
     def to_json(options = {})
-      MultiJson.encode(to_hash(options))
+      MultiJson.dump(to_hash(options))
     end
     
     def to_xml(options = {})

data/lib/bibtex/entry.rb

@@ -335,9 +335,10 @@ module BibTeX
     # add(:author, "Edgar A. Poe", :title, "The Raven")
     # add([:author, "Edgar A. Poe", :title, "The Raven"])
     # add(:author => "Edgar A. Poe", :title => "The Raven")
+    # add(:author => Names.new(Name.new(:first => 'Edgar A.', :last => 'Poe')))
     def add(*arguments)
       Hash[*arguments.flatten].each_pair do |name, value|
-        fields[name.to_sym] = Value.new(value)
+        fields[name.to_sym] = Value.create(value)
       end
       
       self
@@ -374,7 +375,9 @@ module BibTeX
       end
       
       if bibliography.options.has_key?(:filter)
-        convert!(bibliography.options[:filter])
+				[*bibliography.options[:filter]].each do |filter|
+        	convert!(filter)
+				end
       end
       
       self

data/lib/bibtex/lexer.rb

@@ -37,6 +37,29 @@ module BibTeX
       :strip => true
     }.freeze
     
+    # Patterns Cache (#37: MacRuby does not cache regular expressions)
+    @patterns = {
+      :space       => /[\s]+/o,
+      :lbrace      => /\{/o,
+      :rbrace      => /\}/o,
+      :braces      => /\{|\}/o,
+      :eq          => /=/o,
+      :comma       => /,/o,
+      :number      => /\d+/o,
+      :name        => /[[:alpha:]\d \/:_!$\.%&*-]+/io,
+      :quote       => /"/o,
+      :unquote     => /[\{\}"]/o,
+      :sharp       => /#/o,
+      :object      => /@/o,
+      :period      => /./o,
+      :strict_next => /@[\t ]*/o,
+      :next        => /(^|\n)[\t ]*@[\t ]*/o,
+      :entry       => /[a-z\d:_!\.$%&*-]+/io,
+      :string      => /string/io,
+      :comment     => /comment/io,
+      :preamble    => /preamble/io
+    }.freeze
+    
     MODE = Hash.new(:meta).merge({
       :bibtex  => :bibtex,  :entry    => :bibtex,
       :string  => :bibtex,  :preamble => :bibtex,
@@ -45,7 +68,7 @@ module BibTeX
     }).freeze
     
     class << self
-      attr_accessor :defaults
+      attr_reader :defaults, :patterns
     end
     
     #
@@ -151,37 +174,37 @@ module BibTeX
     
     def parse_bibtex
       case
-      when @scanner.scan(/[\s]+/o)
-      when @scanner.scan(/\{/o)
+      when @scanner.scan(Lexer.patterns[:space])
+      when @scanner.scan(Lexer.patterns[:lbrace])
         @brace_level += 1
         push([:LBRACE,'{'])
         @mode = :content if @brace_level > 1 || @brace_level == 1 && active?(:comment)
-      when @scanner.scan(/\}/o)
+      when @scanner.scan(Lexer.patterns[:rbrace])
         @brace_level -= 1
         push([:RBRACE,'}'])
         return leave_object if @brace_level == 0
         return error_unbalanced_braces if @brace_level < 0
-      when @scanner.scan( /=/o)
+      when @scanner.scan(Lexer.patterns[:eq])
         push([:EQ,'='])
-      when @scanner.scan(/,/o)
+      when @scanner.scan(Lexer.patterns[:comma])
         push([:COMMA,','])
-      when @scanner.scan(/\d+/o)
+      when @scanner.scan(Lexer.patterns[:number])
         push([:NUMBER,@scanner.matched])
-      when @scanner.scan(/[[:alpha:]\d \/:_!$\.%&*-]+/io)
+      when @scanner.scan(Lexer.patterns[:name])
         push([:NAME,@scanner.matched.rstrip])
-      when @scanner.scan(/"/o)
+      when @scanner.scan(Lexer.patterns[:quote])
         @mode = :literal
-      when @scanner.scan(/#/o)
+      when @scanner.scan(Lexer.patterns[:sharp])
         push([:SHARP,'#'])
-      when @scanner.scan(/@/o)
+      when @scanner.scan(Lexer.patterns[:object])
         enter_object
-      when @scanner.scan(/./o)
+      when @scanner.scan(Lexer.patterns[:period])
         error_unexpected_token        
       end
     end
     
     def parse_meta
-      match = @scanner.scan_until(strict? ? /@[\t ]*/o : /(^|\n)[\t ]*@[\t ]*/o)
+      match = @scanner.scan_until(Lexer.patterns[strict? ? :strict_next : :next])
       if @scanner.matched
         push([:META_CONTENT,match.chop])
         enter_object
@@ -192,7 +215,7 @@ module BibTeX
     end
 
     def parse_content
-      match = @scanner.scan_until(/\{|\}/o)
+      match = @scanner.scan_until(Lexer.patterns[:braces])
       case @scanner.matched
       when '{'
         @brace_level += 1
@@ -222,7 +245,7 @@ module BibTeX
     end
     
     def parse_literal
-      match = @scanner.scan_until(/[\{\}"]/o)
+      match = @scanner.scan_until(Lexer.patterns[:unquote])
       case @scanner.matched
       when '{'
         @brace_level += 1
@@ -255,16 +278,16 @@ module BibTeX
       push [:AT,'@']
 
       case
-      when @scanner.scan(/string/io)
+      when @scanner.scan(Lexer.patterns[:string])
         @mode = @active_object = :string
         push [:STRING, @scanner.matched]
-      when @scanner.scan(/preamble/io)
+      when @scanner.scan(Lexer.patterns[:preamble])
         @mode = @active_object = :preamble
         push [:PREAMBLE, @scanner.matched]
-      when @scanner.scan(/comment/io)
+      when @scanner.scan(Lexer.patterns[:comment])
         @mode = @active_object = :comment
         push [:COMMENT, @scanner.matched]
-      when @scanner.scan(/[a-z\d:_!\.$%&*-]+/io)
+      when @scanner.scan(Lexer.patterns[:entry])
         @mode = @active_object = :entry
         push [:NAME, @scanner.matched]
       else

data/lib/bibtex/name_parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.6
+# This file is automatically generated by Racc 1.4.8
 # from Racc grammer file "".
 #
 
@@ -13,6 +13,24 @@ module BibTeX
 
 module_eval(<<'...end names.y/module_eval...', 'names.y', 94)
   
+  # Patterns Cache (#37: MacRuby does not cache regular expressions)
+  @patterns = {
+    :and => /,?\s+and\s+/io,
+    :space => /[\t\r\n\s]+/o,
+    :comma => /,/o,
+    :lower => /[[:lower:]][^\t\r\n\s\{\}\d\\,]*/o,
+    :upper => /[[:upper:]][^\t\r\n\s\{\}\d\\,]*/o,
+    :symbols => /(\d|\\.)+/o,
+    :lbrace => /\{/o,
+    :rbrace => /\}/o,
+    :period => /./o,
+    :braces => /[\{\}]/o
+  }.freeze
+  
+  class << self
+    attr_reader :patterns
+  end
+  
   def initialize(options = {})
     self.options.merge!(options)
   end
@@ -48,36 +66,36 @@ module_eval(<<'...end names.y/module_eval...', 'names.y', 94)
   def do_scan
     until @src.eos?
       case
-      when @src.scan(/,?\s+and\s+/io)
+      when @src.scan(NameParser.patterns[:and])
         push_word
         @stack.push([:AND,@src.matched])
         
-      when @src.scan(/[\t\r\n\s]+/o)
+      when @src.scan(NameParser.patterns[:space])
         push_word
       
-      when @src.scan(/,/o)
+      when @src.scan(NameParser.patterns[:comma])
         push_word
         @stack.push([:COMMA,@src.matched])
         
-      when @src.scan(/[[:lower:]][^\t\r\n\s\{\}\d\\,]*/o)
+      when @src.scan(NameParser.patterns[:lower])
         is_lowercase
         @word[1] << @src.matched
 
-      when @src.scan(/[[:upper:]][^\t\r\n\s\{\}\d\\,]*/o)
+      when @src.scan(NameParser.patterns[:upper])
         is_uppercase
         @word[1] << @src.matched
         
-      when @src.scan(/(\d|\\.)+/o)
+      when @src.scan(NameParser.patterns[:symbols])
         @word[1] << @src.matched
         
-      when @src.scan(/\{/o)
+      when @src.scan(NameParser.patterns[:lbrace])
         @word[1] << @src.matched
         scan_literal
         
-      when @src.scan(/\}/o)
+      when @src.scan(NameParser.patterns[:rbrace])
         error_unbalanced
 
-      when @src.scan(/./o)
+      when @src.scan(NameParser.patterns[:period])
         @word[1] << @src.matched
       end
     end
@@ -105,7 +123,7 @@ module_eval(<<'...end names.y/module_eval...', 'names.y', 94)
     @brace_level = 1
 
     while @brace_level > 0
-      @word[1] << @src.scan_until(/[\{\}]/o).to_s
+      @word[1] << @src.scan_until(NameParser.patterns[:braces]).to_s
 
       case @src.matched
       when '{'

data/lib/bibtex/names.y

@@ -92,6 +92,24 @@ require 'strscan'
 
 ---- inner
   
+  # Patterns Cache (#37: MacRuby does not cache regular expressions)
+  @patterns = {
+    :and => /,?\s+and\s+/io,
+    :space => /[\t\r\n\s]+/o,
+    :comma => /,/o,
+    :lower => /[[:lower:]][^\t\r\n\s\{\}\d\\,]*/o,
+    :upper => /[[:upper:]][^\t\r\n\s\{\}\d\\,]*/o,
+    :symbols => /(\d|\\.)+/o,
+    :lbrace => /\{/o,
+    :rbrace => /\}/o,
+    :period => /./o,
+    :braces => /[\{\}]/o
+  }.freeze
+  
+  class << self
+    attr_reader :patterns
+  end
+  
   def initialize(options = {})
     self.options.merge!(options)
   end
@@ -127,36 +145,36 @@ require 'strscan'
   def do_scan
     until @src.eos?
       case
-      when @src.scan(/,?\s+and\s+/io)
+      when @src.scan(NameParser.patterns[:and])
         push_word
         @stack.push([:AND,@src.matched])
         
-      when @src.scan(/[\t\r\n\s]+/o)
+      when @src.scan(NameParser.patterns[:space])
         push_word
       
-      when @src.scan(/,/o)
+      when @src.scan(NameParser.patterns[:comma])
         push_word
         @stack.push([:COMMA,@src.matched])
         
-      when @src.scan(/[[:lower:]][^\t\r\n\s\{\}\d\\,]*/o)
+      when @src.scan(NameParser.patterns[:lower])
         is_lowercase
         @word[1] << @src.matched
 
-      when @src.scan(/[[:upper:]][^\t\r\n\s\{\}\d\\,]*/o)
+      when @src.scan(NameParser.patterns[:upper])
         is_uppercase
         @word[1] << @src.matched
         
-      when @src.scan(/(\d|\\.)+/o)
+      when @src.scan(NameParser.patterns[:symbols])
         @word[1] << @src.matched
         
-      when @src.scan(/\{/o)
+      when @src.scan(NameParser.patterns[:lbrace])
         @word[1] << @src.matched
         scan_literal
         
-      when @src.scan(/\}/o)
+      when @src.scan(NameParser.patterns[:rbrace])
         error_unbalanced
 
-      when @src.scan(/./o)
+      when @src.scan(NameParser.patterns[:period])
         @word[1] << @src.matched
       end
     end
@@ -184,7 +202,7 @@ require 'strscan'
     @brace_level = 1
 
     while @brace_level > 0
-      @word[1] << @src.scan_until(/[\{\}]/o).to_s
+      @word[1] << @src.scan_until(NameParser.patterns[:braces]).to_s
 
       case @src.matched
       when '{'

data/lib/bibtex/parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.6
+# This file is automatically generated by Racc 1.4.8
 # from Racc grammer file "".
 #
 

data/lib/bibtex/value.rb

@@ -55,6 +55,16 @@ module BibTeX
     def_delegators :to_s, :=~, :===, *String.instance_methods(false).reject { |m| m =~ /^\W|^length$|^dup$|!$/ }
     def_delegators :@tokens, :[], :length
     def_delegator :@tokens, :each, :each_token
+
+    # call-seq:
+    #   create(other) => other.dup
+    #   create(*args) => Value.new(args)
+    #
+    # Duplicates a +Value+ object (or an object of any subclass of +Value+),
+    # or initializes a new one.
+    def self.create(*args)
+      args[0].class < Value && args.size == 1 ? args[0].dup : Value.new(args)
+    end
     
     def initialize(*arguments)
       @tokens = []
@@ -248,4 +258,4 @@ module BibTeX
     
   end
 
-end
+end

data/lib/bibtex/version.rb

@@ -18,6 +18,6 @@
 
 module BibTeX
   module Version
-    STRING = '2.0.4'.freeze
+    STRING = '2.0.5'.freeze
   end
 end

data/test/benchmark.rb

@@ -1,8 +1,10 @@
-require File.expand_path('../../lib/bibtex.rb', __FILE__)
+# ruby -Ilib -rrubygems test/benchmark.rb
 
 require 'benchmark'
 include Benchmark
 
+require 'bibtex'
+
 # data = File.open(BibTeX::Test.fixtures(:benchmark)).read
 
 input = <<-END
@@ -19,8 +21,8 @@ input = <<-END
 }
 END
 
-n, k = 1001, 20
-# lexer = BibTeX::Lexer.new
+n, k = 31, 10
+lexer = BibTeX::Lexer.new
 # parser = BibTeX::Parser.new
 
 f = []
@@ -35,18 +37,18 @@ Benchmark.benchmark((" "*15) + CAPTION, 7, format, '%14s:' % 'sum(f)', '%14s:' %
   
     f << b.report('%14s:' % "f(#{i})") do
       i.times do
-        # lexer.data = input
-        # lexer.analyse
-				BibTeX::Parser.new.parse(input)
+        lexer.data = input
+        lexer.analyse
+				# BibTeX::Parser.new.parse(input)
       end
     end
 
     data = input * i
   
     g << b.report('%14s:' % "g(#{i})") do
-      # lexer.data = data
-      # lexer.analyse
-			BibTeX::Parser.new.parse(data)
+      lexer.data = data
+      lexer.analyse
+			# BibTeX::Parser.new.parse(data)
     end
     
   end
@@ -54,29 +56,29 @@ Benchmark.benchmark((" "*15) + CAPTION, 7, format, '%14s:' % 'sum(f)', '%14s:' %
   [f.inject(:+), g.inject(:+)]
 end
 
-require 'gnuplot'
-
-f = f.map(&:total)
-g = g.map(&:total)
-
-x = 1.step(n,k).to_a
-
-Gnuplot.open do |gp|
-  Gnuplot::Plot.new(gp) do |plot|
-
-    plot.title  'BibTeX-Ruby Benchmark'
-    plot.ylabel 't'
-    plot.xlabel 'n'
-
-    plot.data << Gnuplot::DataSet.new([x,f]) do |ds|
-      ds.with = 'linespoints'
-      ds.title = 'f'
-    end
-
-    plot.data << Gnuplot::DataSet.new([x,g]) do |ds|
-      ds.with = 'linespoints'
-      ds.title = 'g'
-    end
-
-  end
-end
+# require 'gnuplot'
+# 
+# f = f.map(&:total)
+# g = g.map(&:total)
+# 
+# x = 1.step(n,k).to_a
+# 
+# Gnuplot.open do |gp|
+#   Gnuplot::Plot.new(gp) do |plot|
+# 
+#     plot.title  'BibTeX-Ruby Benchmark'
+#     plot.ylabel 't'
+#     plot.xlabel 'n'
+# 
+#     plot.data << Gnuplot::DataSet.new([x,f]) do |ds|
+#       ds.with = 'linespoints'
+#       ds.title = 'f'
+#     end
+# 
+#     plot.data << Gnuplot::DataSet.new([x,g]) do |ds|
+#       ds.with = 'linespoints'
+#       ds.title = 'g'
+#     end
+# 
+#   end
+# end

data/test/bibtex/test_bibliography.rb

@@ -34,6 +34,10 @@ module BibTeX
       it 'accepts filters' do
         Bibliography.parse("@misc{k, title = {\\''u}}", :filter => 'latex')[0].title.must_be :==, 'ü'         
       end
+
+      it 'accepts filters in an array' do
+        Bibliography.parse("@misc{k, title = {\\''u}}", :filter => ['latex'])[0].title.must_be :==, 'ü'         
+      end
     end
     
     describe 'given a populated biliography' do

data/test/bibtex/test_entry.rb

@@ -11,6 +11,14 @@ module BibTeX
       end
     end
 
+    describe '#add' do
+      it 'preserves BibTeX::Names (and other subclasses of BibTeX::Value)' do
+        e = Entry.new
+        e.add(:author, Names.new(Name.new(:first => 'first_name')))
+        assert_equal e[:author].class, Names
+      end
+    end
+
     describe 'cross-references' do
       it 'has no cross-reference by default' do
         assert_equal false, Entry.new.has_cross_reference?
@@ -452,4 +460,4 @@ module BibTeX
     end
     
   end
-end
+end

data/test/bibtex/test_value.rb

@@ -2,6 +2,20 @@ require 'helper.rb'
 
 module BibTeX
   class ValueTest < MiniTest::Spec
+
+    describe "::create" do
+      it "should return a duplicate when called with a Value subclass" do
+        val   = Value.new('value')
+        names = Names.new(Name.new(:first => 'first_name'))
+
+        assert_equal val.dup,   Value.create(val)
+        assert_equal names.dup, Value.create(names)
+      end
+
+      it "should return a new Value object when called with other arguments" do
+        assert_equal Value.new('value'), Value.create('value')
+      end
+    end
     
     describe "when empty" do
       it "should be equal to an empty string" do
@@ -132,4 +146,4 @@ module BibTeX
     end
     
   end
-end
+end

data/test/macruby.d

@@ -0,0 +1,21 @@
+/* time.d */
+
+#pragma D option quiet
+
+macruby$target:::method-entry
+{
+    self->starttime = walltimestamp / 1000;
+}
+
+macruby$target:::method-return
+{
+    @invoked_time[copyinstr(arg0), copyinstr(arg1)] = sum((walltimestamp / 1000) - self->starttime);
+}
+
+END
+{
+    printf("\n");
+    printf("%-10s  %-15s  %s\n", "CLASS", "METHOD", "TOTAL TIME µsec");
+    printf("--------------------------------------------------------------------------------\n");
+    printa("%-10s  %-15s  %@d\n", @invoked_time);
+}

data/test/macruby.rb

@@ -0,0 +1,22 @@
+
+# sudo dtrace -qs test/macruby.d -c "macruby -Ilib -rrubygems test/macruby.rb"
+
+require 'bibtex'
+
+input = <<-END
+@book{pickaxe,
+	Address = {Raleigh, North Carolina},
+	Author = {Thomas, Dave, and Fowler, Chad, and Hunt, Andy},
+	Date-Added = {2010-08-05 09:54:07 +0200},
+	Date-Modified = {2010-08-05 10:07:01 +0200},
+	Keywords = {ruby},
+	Publisher = {The Pragmatic Bookshelf},
+	Series = {The Facets of Ruby},
+	Title = {Programming Ruby 1.9: The Pragmatic Programmer's Guide},
+	Year = {2009}
+}
+END
+
+lexer = BibTeX::Lexer.new
+lexer.data = input * 100
+lexer.analyse

data/test/test_export.rb

@@ -22,7 +22,7 @@ module BibTeX
   
     def test_json
       bib = BibTeX::Bibliography.open(Test.fixtures(:bibdesk), :debug => false)
-      json = MultiJson.decode(bib.to_json)
+      json = MultiJson.load(bib.to_json)
       refute_nil(json)
       assert_equal(3, json.length)
       assert_equal(%w[ dragon pickaxe rails], json.map { |y| y['key'] }.sort)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bibtex-ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-20 00:00:00.000000000 Z
+date: 2012-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: latex-decode
-  requirement: &70168043749560 !ruby/object:Gem::Requirement
+  requirement: &70347703840520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70168043749560
+  version_requirements: *70347703840520
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70168043749040 !ruby/object:Gem::Requirement
+  requirement: &70347703829060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70168043749040
+  version_requirements: *70347703829060
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70168043748560 !ruby/object:Gem::Requirement
+  requirement: &70347703826940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70168043748560
+  version_requirements: *70347703826940
 - !ruby/object:Gem::Dependency
   name: racc
-  requirement: &70168043748080 !ruby/object:Gem::Requirement
+  requirement: &70347703825800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.4'
   type: :development
   prerelease: false
-  version_requirements: *70168043748080
+  version_requirements: *70347703825800
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70168043747580 !ruby/object:Gem::Requirement
+  requirement: &70347703823800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.9'
   type: :development
   prerelease: false
-  version_requirements: *70168043747580
+  version_requirements: *70347703823800
 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
@@ -99,6 +99,7 @@ files:
 - features/issues/crossref.feature
 - features/issues/latex_filter.feature
 - features/issues/multiline_strings.feature
+- features/issues/name_parsing.feature
 - features/issues/number_keys.feature
 - features/issues/parse_months.feature
 - features/issues/slash_keys.feature
@@ -154,6 +155,8 @@ files:
 - test/fixtures/preamble.bib
 - test/fixtures/roundtrip.bib
 - test/helper.rb
+- test/macruby.d
+- test/macruby.rb
 - test/profile.rb
 - test/test_bibtex.rb
 - test/test_export.rb
@@ -177,12 +180,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -230691617197525967
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -230691617197525967
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10