bibtex-ruby 2.0.12 → 2.1.0

data/lib/bibtex/entry.rb

@@ -1,6 +1,6 @@
 #--
 # BibTeX-Ruby
-# Copyright (C) 2010-2011 Sylvester Keil <sylvester.keil.or.at>
+# Copyright (C) 2010-2012 Sylvester Keil <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
@@ -161,7 +161,28 @@ module BibTeX
       
       add(other.fields)
     end
-  
+
+
+    # Generate Accessors for required fields (#52)
+
+    REQUIRED_FIELDS.values.flatten.uniq.each do |name|
+
+      define_method(name) do
+        case
+        when fields.has_key?(name)
+          fields[name]
+        when has_parent? && parent.provides?(name)
+          parent.provide(name)
+        else
+          nil
+        end
+      end
+      
+      define_method("#{name}=") do |value|
+        add name, value
+      end
+    end
+    
     # call-seq:
     #   entry.each      { |key, value| block } -> entry
     #   entry.each_pair { |key, value| block } -> entry
@@ -379,15 +400,15 @@ module BibTeX
     end
     
     
+    # call-seq:
+    #   add(:author, "Edgar A. Poe")
+    #   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')))
+    #
     # Adds a new field (name-value pair) or multiple fields to the entry.
     # Returns the entry for chainability.
-    #
-    # call-seq:
-    # add(:author, "Edgar A. Poe")
-    # 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.create(value)
@@ -440,9 +461,9 @@ module BibTeX
       end
       
       if bibliography.options.has_key?(:filter)
-				[*bibliography.options[:filter]].each do |filter|
-        	convert!(filter)
-				end
+        [*bibliography.options[:filter]].each do |filter|
+          convert!(filter)
+        end
       end
       
       self

data/lib/bibtex/name_parser.rb

@@ -13,19 +13,18 @@ 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,
+    :upper => /[[:upper:]][^\t\r\n\s\{\}\d\\,]*/uo,
     :symbols => /(\d|\\.)+/o,
     :lbrace => /\{/o,
     :rbrace => /\}/o,
     :period => /./o,
     :braces => /[\{\}]/o
-  }.freeze
+  }
   
   class << self
     attr_reader :patterns

data/lib/bibtex/names.rb

@@ -279,7 +279,7 @@ module BibTeX
       hash['family'] = family unless family.nil?
       hash['given'] = given unless given.nil?
       hash['suffix'] = suffix unless suffix.nil?
-      hash[options[:particle] || 'dropping-particle'] = prefix unless prefix.nil?
+      hash[options[:particle] || 'non-dropping-particle'] = prefix unless prefix.nil?
       hash
     end
     

data/lib/bibtex/names.y

@@ -92,19 +92,18 @@ 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,
+    :upper => /[[:upper:]][^\t\r\n\s\{\}\d\\,]*/uo,
     :symbols => /(\d|\\.)+/o,
     :lbrace => /\{/o,
     :rbrace => /\}/o,
     :period => /./o,
     :braces => /[\{\}]/o
-  }.freeze
+  }
   
   class << self
     attr_reader :patterns

data/lib/bibtex/value.rb

@@ -2,7 +2,7 @@
 
 #--
 # BibTeX-Ruby
-# Copyright (C) 2010-2011  Sylvester Keil <sylvester.keil.or.at>
+# Copyright (C) 2010-2012  Sylvester Keil <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

data/lib/bibtex/version.rb

@@ -1,6 +1,6 @@
 #--
 # BibTeX-Ruby
-# Copyright (C) 2010-2011	Sylvester Keil <sylvester.keil.or.at>
+# Copyright (C) 2010-2012	Sylvester Keil <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
@@ -17,7 +17,12 @@
 #++
 
 module BibTeX
-  module Version
-    STRING = '2.0.12'.freeze
+  module Version    
+    MAJOR = 2
+    MINOR = 1
+    PATCH = 0
+    BUILD = nil
+
+    STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.').freeze
   end
 end

data/test/bibtex/test_elements.rb

@@ -2,29 +2,29 @@ require 'helper'
 
 module BibTeX
   
-	class ElementTest < MiniTest::Spec
-		
-		describe '.parse' do
-			
-			it 'accepts a BibTeX string' do
-				Element.parse('@misc{x,},@misc{y,}').length.must_be :==, 2
-			end
-			
-			it 'accepts an Element' do
-				Element.parse(Comment.new('blah')).length.must_be :==, 1
-			end
-			
-			it 'accepts a Hash and returns an Entry' do
-				Element.parse({ :type => :book })[0].type.must_be :==, :book
-			end
-			
-			it 'accepts an array of hashes' do
-				Element.parse([{ :type => :book }, { :type => :misc }])[1].type.must_be :==, :misc
-			end
-			
-		end
-		
-	end
+  class ElementTest < MiniTest::Spec
+    
+    describe '.parse' do
+      
+      it 'accepts a BibTeX string' do
+        Element.parse('@misc{x,},@misc{y,}').length.must_be :==, 2
+      end
+      
+      it 'accepts an Element' do
+        Element.parse(Comment.new('blah')).length.must_be :==, 1
+      end
+      
+      it 'accepts a Hash and returns an Entry' do
+        Element.parse({ :type => :book })[0].type.must_be :==, :book
+      end
+      
+      it 'accepts an array of hashes' do
+        Element.parse([{ :type => :book }, { :type => :misc }])[1].type.must_be :==, :misc
+      end
+      
+    end
+    
+  end
 
   class PreambleTest < MiniTest::Spec
     

data/test/bibtex/test_entry.rb

@@ -310,8 +310,8 @@ module BibTeX
         end
       end
       
-      it 'should use dropping-particle by default' do
-        assert_equal 'van', @entry.to_citeproc['author'][0]['dropping-particle']
+      it 'should use non-dropping-particle by default' do
+        assert_equal 'van', @entry.to_citeproc['author'][0]['non-dropping-particle']
       end
       
       it 'should accept option to use non-dropping-particle' do

data/test/helper.rb

@@ -1,6 +1,17 @@
+begin
+  if RUBY_VERSION > '1.8'
+    require 'debugger'
+    require 'simplecov'
+  else
+    require 'ruby-debug'
+    Debugger.start
+  end  
+rescue LoadError
+  # ignore
+end
 
 require 'minitest/autorun'
-require 'redgreen'
+require 'minitest/colorize'
 require 'tempfile'
 
 require 'bibtex'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bibtex-ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.12
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-28 00:00:00.000000000 Z
+date: 2012-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: latex-decode
-  requirement: &70280979721000 !ruby/object:Gem::Requirement
+  requirement: &70168050368080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70280979721000
+  version_requirements: *70168050368080
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70280979720280 !ruby/object:Gem::Requirement
+  requirement: &70168050367300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,63 +32,39 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70280979720280
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70280979735760 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: *70280979735760
-- !ruby/object:Gem::Dependency
-  name: racc
-  requirement: &70280979735280 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :development
-  prerelease: false
-  version_requirements: *70280979735280
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &70280979734680 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.9'
-  type: :development
-  prerelease: false
-  version_requirements: *70280979734680
-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
-  formatted names; BibTeX-Ruby recognizes BibTeX string\n    replacements, joins values
-  containing multiple strings or variables,\n    supports cross-references, and decodes
-  common LaTeX formatting\n    instructions to unicode; if you are in a hurry, it
-  also allows for easy\n    export/conversion to formats such as YAML, JSON, CSL,
-  and XML (BibTeXML).\n"
+  version_requirements: *70168050367300
+description: ! 'BibTeX-Ruby is the Rubyist''s swiss-army-knife for all things BibTeX.
+  It
+
+  includes a parser for all common BibTeX objects (@string, @preamble,
+
+  @comment and regular entries) and a sophisticated name parser that
+
+  tokenizes correctly formatted names; BibTeX-Ruby recognizes BibTeX string
+
+  replacements, joins values containing multiple strings or variables,
+
+  supports cross-references, and decodes common LaTeX formatting
+
+  instructions to unicode; if you are in a hurry, it also allows for easy
+
+  export/conversion to formats such as YAML, JSON, CSL, and XML (BibTeXML).
+
+'
 email:
-- http://sylvester.keil.or.at
+- sylvester@keil.or.at
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.md
+extra_rdoc_files: []
 files:
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - History.txt
 - LICENSE
 - Manifest
 - README.md
 - Rakefile
-- auto.watchr
 - bibtex-ruby.gemspec
 - examples/bib2html.rb
 - examples/bib2yaml.rb
@@ -164,14 +140,7 @@ homepage: http://inukshuk.github.com/bibtex-ruby
 licenses:
 - GPL-3
 post_install_message: 
-rdoc_options:
-- --line-numbers
-- --inline-source
-- --title
-- ! '"BibTeX-Ruby Documentation"'
-- --main
-- README.md
-- --webcvs=http://github.com/inukshuk/bibtex-ruby/tree/master/
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -180,12 +149,18 @@ 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
@@ -206,4 +181,4 @@ test_files:
 - test/bibtex/test_value.rb
 - test/test_bibtex.rb
 - test/test_export.rb
-has_rdoc: 
+has_rdoc: yard

data/auto.watchr

@@ -1,6 +0,0 @@
-require 'autowatchr'
-
-Autowatchr.new(self) do |config|
-	config.lib_dir  = 'lib'
-	config.test_dir = 'test'
-end