bibtex-ruby 1.3.2 → 1.3.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bibtex-ruby (1.3.0)
+    bibtex-ruby (1.3.3)
 
 GEM
   remote: http://rubygems.org/
@@ -11,14 +11,14 @@ GEM
       watchr
     builder (3.0.0)
     columnize (0.3.2)
-    cucumber (0.10.2)
+    cucumber (0.10.3)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (>= 2.3.5)
+      gherkin (>= 2.3.8)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.5)
     diff-lcs (1.1.2)
-    gherkin (2.3.5)
+    gherkin (2.3.10)
       json (>= 1.4.6)
     json (1.5.1)
     linecache (0.43)
@@ -30,6 +30,7 @@ GEM
     mynyml-redgreen (0.7.1)
       term-ansicolor (>= 1.0.4)
     racc (1.4.6)
+    rake (0.9.0)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
@@ -59,5 +60,6 @@ DEPENDENCIES
   mini_shoulda (>= 0.3)
   mynyml-redgreen (>= 0.7)
   racc (>= 1.4)
+  rake (>= 0.8)
   ruby-debug
   ruby-debug19

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.3.3
+
+* Fixed name parsing of nested braced expressions
+
 === 1.3.2
 
 * Fixed numeric keys issue

data/Manifest

@@ -1,3 +1,4 @@
+Bibliography.bib
 Gemfile
 Gemfile.lock
 History.txt

data/Rakefile

@@ -2,6 +2,8 @@
 $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 
 require 'rubygems'
+require 'bundler/setup'
+
 require 'rake'
 require 'rake/clean'
 require 'rake/testtask'

data/bibtex-ruby.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = '>= 1.3.6'
   s.rubyforge_project = s.name
 
+  s.add_development_dependency('rake', ['>= 0.8'])
   s.add_development_dependency('racc', ['>= 1.4'])
   s.add_development_dependency('mini_shoulda', ['>= 0.3'])
   s.add_development_dependency('mynyml-redgreen', ['>= 0.7'])

data/features/names.feature

@@ -64,6 +64,8 @@ Feature: BibTeX Names
 		| Ludwig von Beethoven              | Ludwig                  | von            | Beethoven                      |     |
 		| von Beethoven, Ludwig             | Ludwig                  | von            | Beethoven                      |     |
 		| {von Beethoven}, Ludwig           | Ludwig                  |                | {von Beethoven}                |     |
+		| {{von} Beethoven}, Ludwig         | Ludwig                  |                | {{von} Beethoven}              |     |
+		| John {}Paul Jones                 | John {}Paul             |                | Jones                          |     |
 		| Ford, Jr., Henry                  | Henry                   |                | Ford                           | Jr. |
     | Brinch Hansen, Per                | Per                     |                | Brinch Hansen                  |     |
     | {Barnes and Noble, Inc.}          |                         |                | {Barnes and Noble, Inc.}       |     |

data/features/support/env.rb

@@ -1,4 +1,8 @@
 $LOAD_PATH << File.expand_path('../../../lib', __FILE__)
+
+require 'rubygems'
+require 'bundler/setup'
+
 require 'bibtex'
 require 'minitest/unit'
 

data/lib/bibtex.rb

@@ -19,6 +19,7 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
+require 'rubygems'
 
 require 'bibtex/version'
 require 'logger'
@@ -48,8 +49,8 @@ module BibTeX
 end
 
 # Load debugger
-# require 'ruby-debug'
-# Debugger.start
+require 'ruby-debug'
+Debugger.start
 
 require 'bibtex/extensions'
 require 'bibtex/value'

data/lib/bibtex/elements.rb

@@ -139,6 +139,7 @@ module BibTeX
 		end
 		
 		def <=>(other)
+		  return nil unless other.respond_to? :type and other.respond_to? :to_s
 		  [type, to_s] <=> [other.type, other.to_s]
 		end
 		

data/lib/bibtex/name_parser.rb

@@ -71,7 +71,8 @@ module_eval(<<'...end names.y/module_eval...', 'names.y', 80)
         @word[1] << @src.matched
         
       when @src.scan(/\{/o)
-        scan_literal(@src.matched)
+        @word[1] << @src.matched
+        scan_literal
         
       when @src.scan(/\}/o)
         error_unbalanced
@@ -100,21 +101,21 @@ module_eval(<<'...end names.y/module_eval...', 'names.y', 80)
     @word[0] = :UWORD if @word[0] == :PWORD
   end
   
-  def scan_literal(content = '')
-    @brace_level += 1
-    content << @src.scan_until(/[^\\][\{\}]/o).to_s # TODO accept empty braces {}
-    case @src.matched
-    when /\{/
-      scan_braced_expression(content)
-    when /\}/
-      @brace_level -= 1
-      if @brace_level >= 0
-        @word[1] << content
-      else
-        error_unbalanced
-      end
-    else
-      error_unbalanced
+  def scan_literal
+    @brace_level = 1
+
+ 		while @brace_level > 0
+			@word[1] << @src.scan_until(/[\{\}]/o).to_s
+
+    	case @src.matched
+			when '{'
+				@brace_level += 1
+			when '}'
+				@brace_level -= 1
+			else
+				@brace_level = 0
+				error_unbalanced
+			end
     end
   end
 

data/lib/bibtex/names.rb

@@ -143,7 +143,7 @@ module BibTeX
     [:strip!, :upcase!, :downcase!, :sub!, :gsub!, :chop!, :chomp!, :rstrip!].each do |method_id|
       define_method(method_id) do |*arguments, &block|
         each do |part|
-          part.send(method_id, *arguments, &block)
+          part.send(method_id, *arguments, &block) unless part.nil?
         end
         self
       end

data/lib/bibtex/names.y

@@ -136,7 +136,8 @@ require 'strscan'
         @word[1] << @src.matched
         
       when @src.scan(/\{/o)
-        scan_literal(@src.matched)
+        @word[1] << @src.matched
+        scan_literal
         
       when @src.scan(/\}/o)
         error_unbalanced
@@ -165,21 +166,21 @@ require 'strscan'
     @word[0] = :UWORD if @word[0] == :PWORD
   end
   
-  def scan_literal(content = '')
-    @brace_level += 1
-    content << @src.scan_until(/[^\\][\{\}]/o).to_s # TODO accept empty braces {}
-    case @src.matched
-    when /\{/
-      scan_braced_expression(content)
-    when /\}/
-      @brace_level -= 1
-      if @brace_level >= 0
-        @word[1] << content
-      else
-        error_unbalanced
-      end
-    else
-      error_unbalanced
+  def scan_literal
+    @brace_level = 1
+
+ 		while @brace_level > 0
+			@word[1] << @src.scan_until(/[\{\}]/o).to_s
+
+    	case @src.matched
+			when '{'
+				@brace_level += 1
+			when '}'
+				@brace_level -= 1
+			else
+				@brace_level = 0
+				error_unbalanced
+			end
     end
   end
 

data/lib/bibtex/value.rb

@@ -88,7 +88,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|
-          part.send(method_id, *arguments, &block)
+          part.send(method_id, *arguments, &block) unless part.nil?
         end
         self
       end

data/lib/bibtex/version.rb

@@ -18,6 +18,6 @@
 
 module BibTeX
   module Version
-    STRING = '1.3.2'.freeze
+    STRING = '1.3.3'.freeze
   end
 end

data/test/bibtex/test_bibliography.rb

@@ -137,5 +137,8 @@ module BibTeX
       
     end
     
+    
+    
+    
   end
 end

data/test/helper.rb

@@ -1,5 +1,8 @@
 require File.expand_path('../../lib/bibtex.rb', __FILE__)
 
+require 'rubygems'
+require 'bundler/setup'
+
 require 'mini_shoulda'
 require 'minitest/autorun'
 require 'redgreen'

data/test/test_export.rb

@@ -5,7 +5,13 @@ require 'json'
 
 module BibTeX
   class TestString < MiniTest::Unit::TestCase
-  
+
+    # def test_yaml_roundtrip
+    #   b1 = BibTeX.open(Test.fixtures(:bibdesk))
+    #   b2 = Bibliography.new(YAML.load(b1.to_yaml))
+    #   assert_equal b1, b2
+    # end
+    
     def test_yaml
       bib = BibTeX::Bibliography.open(Test.fixtures(:bibdesk), :debug => false)
       yaml = YAML.load(bib.to_yaml)
@@ -23,5 +29,6 @@ module BibTeX
       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.3.2
+  version: 1.3.3
 platform: ruby
 authors: 
 - Sylvester Keil
@@ -10,75 +10,86 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-21 00:00:00 +02:00
+date: 2011-06-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: racc
-  prerelease: false
+  name: rake
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "1.4"
+        version: "0.8"
   type: :development
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: mini_shoulda
-  prerelease: false
+  name: racc
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.3"
+        version: "1.4"
   type: :development
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: mynyml-redgreen
-  prerelease: false
+  name: mini_shoulda
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.7"
+        version: "0.3"
   type: :development
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: autowatchr
-  prerelease: false
+  name: mynyml-redgreen
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.1"
+        version: "0.7"
   type: :development
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: cucumber
-  prerelease: false
+  name: autowatchr
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.10"
+        version: "0.1"
   type: :development
+  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
+  name: cucumber
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "1.5"
+        version: "0.10"
   type: :development
+  prerelease: false
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: json
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "1.5"
+  type: :development
+  prerelease: false
+  version_requirements: *id007
 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: []
@@ -88,6 +99,7 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 files: 
+- Bibliography.bib
 - Gemfile
 - Gemfile.lock
 - History.txt
@@ -173,6 +185,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3560654511728718454
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false