bibtex-ruby 4.2.0 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33d559b0ddd777368b60195ead0815128063bdbc
-  data.tar.gz: 9838ee28c0c7abc8dfd34e40b2b23b16a98f5672
+  metadata.gz: bc634591f21e9ea1d2e9a79a277e5637fa0f6c85
+  data.tar.gz: 4828e5209b60c9d582c8d63737f9ed15bb1331a7
 SHA512:
-  metadata.gz: c6cd94a82ad9668c2d7272727a67161c8f6d29d94cf1f579eeb30fbb2811d5735d884d8f64015fcf201ad7ec678332d98df66d6d327a8f52e619f3b331fbf996
-  data.tar.gz: 17c9a94681c74cdfdc260e6592685244372a9947645ff0e2c88a6d2127d6d526aa88c44d354002fd11d700acec8c1c5438ed4830a64861e34baf96afc7b5f6d6
+  metadata.gz: 8132ee6e23158667aae83447cda153fc5e50157530f2193302141de3c5675bb80e4c79a27a0dfe6f5acc1c65815cf6c499dc5ffaf1f9fa4da6a30587e2da6642
+  data.tar.gz: df3f6095f2de0bfc5e43b18cb2561ee6977093782b6998b956d267898a893fe28680d94b0362cc4f3e7da538eb7fe2a4be43a5480025b4ba789c8b065e3b66b6

data/bibtex-ruby.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.authors     = ['Sylvester Keil']
   s.email       = ['sylvester@keil.or.at']
   s.homepage    = 'http://inukshuk.github.com/bibtex-ruby'
-  s.license     = 'GPL-3'
+  s.license     = 'GPL-3.0'
 
   s.summary     = 'A BibTeX parser, converter and API for Ruby.'
   s.description = <<-END_DESCRIPTION.gsub(/^\s+/, '')

data/lib/bibtex/entry.rb

@@ -72,6 +72,7 @@ module BibTeX
     # Creates a new instance. If a hash is given, the entry is populated accordingly.
     def initialize(attributes = {})
       @fields = {}
+      @key = nil
 
       self.type = attributes.delete(:bibtex_type) if attributes.has_key?(:bibtex_type)
       self.key = attributes.delete(:bibtex_key) if attributes.has_key?(:bibtex_key)

data/lib/bibtex/entry/citeproc_converter.rb

@@ -62,15 +62,11 @@ class BibTeX::Entry::CiteProcConverter
     bibtex.parse_month
 
     bibtex.each_pair do |key, value|
-      unless BibTeX::Entry::DATE_FIELDS.include?(key)
-        cp_key = CSL_FILTER[key].to_s
+      convert key, value
+    end
 
-        if hash.key?(cp_key)
-          hash[key] = value.to_citeproc(options)
-        else
-          hash[cp_key] = value.to_citeproc(options)
-        end
-      end
+    bibtex.inherited_fields.each do |key|
+      convert key, bibtex.parent.provide(key)
     end
 
     methods = self.class.instance_methods(false) - [:convert!, :hash]
@@ -146,10 +142,22 @@ class BibTeX::Entry::CiteProcConverter
     end
   end
 
-  protected
+  private
 
   attr_reader :bibtex, :options
 
+  def convert(key, value)
+    return if BibTeX::Entry::DATE_FIELDS.include?(key)
+
+    cp_key = CSL_FILTER[key].to_s
+
+    if hash.key?(cp_key)
+      hash[key] = value.to_citeproc(options)
+    else
+      hash[cp_key] = value.to_citeproc(options)
+    end
+  end
+
   def hash
     @hash ||= {}
   end

data/lib/bibtex/lexer.rb

@@ -95,7 +95,6 @@ module BibTeX
 
     def reset
       @stack, @brace_level, @mode, @active_object = [], 0, :meta, nil
-      @scanner.reset if @scanner
 
       # cache options for speed
       @include_meta_content = @options[:include].include?(:meta_content)

data/lib/bibtex/utilities.rb

@@ -31,7 +31,7 @@ module BibTeX
     # Delegates to BibTeX.open if the string is a filename or URI.
     def parse(string, options = {}, &block)
       case
-      when string.length < 260 && File.exists?(string)
+      when string.length < 260 && File.exist?(string)
         Bibliography.open(string, options, &block)
       when string =~ /^[a-z]+:\/\//i
         Bibliography.open(string, options)

data/lib/bibtex/version.rb

@@ -19,7 +19,7 @@
 module BibTeX
   module Version
     MAJOR = 4
-    MINOR = 2
+    MINOR = 3
     PATCH = 0
     BUILD = nil
 

data/test/bibtex/test_bibliography.rb

@@ -327,7 +327,7 @@ module BibTeX
 
       describe 'given a filter' do
         before do
-          @filter = Object
+          @filter = Object.new
           def @filter.apply (value); value.is_a?(::String) ? value.upcase : value; end
         end
 

data/test/bibtex/test_entry.rb

@@ -123,6 +123,12 @@ module BibTeX
             end
           end
 
+          describe '#to_citeproc' do
+            it 'includes inherited values' do
+              @bib['a1'].to_citeproc['container-title'].must_be :==, @bib['a'].title.to_s
+            end
+          end
+
           describe '#save_inherited_fields' do
             it 'copies referenced values to the entry' do
               @bib['a1'].title = 'a1'
@@ -353,15 +359,16 @@ module BibTeX
       end
 
       describe 'given a filter object or a filter name' do
+
+        class SuffixB < BibTeX::Filter
+          def apply(value)
+            value.is_a?(::String) ? "#{value}b" : value
+          end
+        end
+
         before do
           @filter = Object.new
           def @filter.apply (value); value.is_a?(::String) ? value.upcase : value; end
-
-          class SuffixB < BibTeX::Filter
-            def apply(value)
-              value.is_a?(::String) ? "#{value}b" : value
-            end
-          end
         end
 
         it 'supports arbitrary conversion' do

data/test/bibtex/test_filters.rb

@@ -2,12 +2,12 @@ require 'helper.rb'
 
 module BibTeX
   class FiltersTest < Minitest::Spec
-    
+
     it "should Filters should be singleton classes" do
       assert_equal false, Filter.respond_to?(:new)
       assert_equal Filter.instance.object_id, Filter.instance.object_id
     end
-    
+
     describe 'Filters.resolve' do
       it "should return the filter if a filter is given" do
         assert_equal Filter.instance.object_id, Filters.resolve(Filter.instance).object_id
@@ -25,14 +25,12 @@ module BibTeX
         assert_equal FooBar.instance.object_id, Filters.resolve('foobar').object_id
         Filter.subclasses.delete(FooBar)
       end
-      
+
       it "should return nil if there is no filter by that name" do
         assert_equal nil, Filters.resolve(:foobar)
-        assert_equal nil, Filters.resolve(:upcase)
         assert_equal nil, Filters.resolve('foobar')
         assert_equal nil, Filters.resolve(nil)
       end
     end
-    
   end
-end
+end

data/test/bibtex/test_names.rb

@@ -4,11 +4,11 @@ require 'helper'
 
 module BibTeX
   class NamesTest < Minitest::Spec
-    
+
     before do
       @poe = Name.new(:first => 'Edgar Allen', :last => 'Poe')
     end
-    
+
     describe 'string behaviour' do
       before do
         @name = Name.new(:first => 'Charles Louis Xavier Joseph', :prefix => 'de la', :last => 'Vallee Poussin', :suffix => 'Jr.')
@@ -20,15 +20,15 @@ module BibTeX
         assert_equal 'de la vallee poussin, jr., charles louis xavier joseph', @name.downcase!.to_s
       end
       it 'should implement gsub!' do
-        assert_equal 'dX la VallXX PoussXn, Jr., CharlXs LouXs XavXXr JosXph', @name.gsub!(/[ei]/, 'X').to_s        
+        assert_equal 'dX la VallXX PoussXn, Jr., CharlXs LouXs XavXXr JosXph', @name.gsub!(/[ei]/, 'X').to_s
       end
     end
-    
+
     describe '#display_order' do
       it 'returns the name as "first last"' do
         @poe.display_order.must_be :==, 'Edgar Allen Poe'
       end
-      
+
       it 'accepts the :initials option' do
         @poe.display_order(:initials => true).must_be :==, 'E.A. Poe'
       end
@@ -38,16 +38,16 @@ module BibTeX
       it 'returns the name as "last, first"' do
         @poe.sort_order.must_be :==, 'Poe, Edgar Allen'
       end
-      
+
       it 'accepts the :initials option' do
         @poe.sort_order(:initials => true).must_be :==, 'Poe, E.A.'
       end
     end
-    
+
     describe '#initials?' do
       it 'returns true if the name contains a solely initials as a first name' do
         @poe.initials?.must_equal false
-        
+
         @poe.first = 'Edgar A.'
         @poe.initials?.must_equal false
 
@@ -61,7 +61,7 @@ module BibTeX
         @poe.initials?.must_equal false
       end
     end
-    
+
     describe '#rename_if' do
       it 'renames the name to the given attributes if no condition is given' do
         @poe.rename_if({ :first => 'E.A.' }).first.must_equal 'E.A.'
@@ -86,21 +86,21 @@ module BibTeX
         @poe.rename_if({ :first => 'E.A.' }) {|n| false}.first.wont_equal 'E.A.'
       end
     end
-    
+
     describe '#merge!' do
       it 'does not merge duplicates' do
         n1 = Names.new(@poe)
         n2 = Names.new(@poe)
         assert_equal @poe.to_s, n1.merge!(n2).to_s
       end
-      
+
       it 'merges different names' do
         n1 = Names.new(@poe)
         n2 = Names.new(Name.new(:last => 'Plato'))
         assert_equal "#{@poe.to_s} and Plato", n1.merge!(n2).to_s
       end
     end
-  
+
     describe '#normalize_initials' do
       it 'returns normalized initials of existing initials only' do
         Name.new(:first => 'Edgar A.', :last => 'Poe').normalize_initials.must_equal 'Edgar A.'
@@ -137,23 +137,21 @@ module BibTeX
         Name.new(:first => 'E.A.', :last => 'Poe').extend_initials('Edgar', 'Poe').first.must_equal 'E.A.'
         Name.new(:first => 'A.', :last => 'Poe').extend_initials('Edgar', 'Poe').first.must_equal 'A.'
       end
-      
+
       it 'does not extend the first name if the last name or initials do not match' do
         Name.new(:first => 'E.A.', :last => 'Poe').extend_initials('Edgar Allen', 'Poser').first.wont_equal 'Edgar Allen'
         Name.new(:first => 'E.A.', :last => 'Poe').extend_initials('Edgar Ellen', 'Poe').first.wont_equal 'Edgar Ellen'
         Name.new(:first => 'E.R.', :last => 'Poe').extend_initials('Edgar Allen', 'Poe').first.wont_equal 'Edgar Allen'
       end
     end
-    
+
 		describe "conversions" do
-      before do
-        class UpcaseAll < BibTeX::Filter
-          def apply (value)
-            value.upcase
-          end
+      class UpcaseAll < BibTeX::Filter
+        def apply (value)
+          value.upcase
         end
       end
-      
+
       describe "#convert" do
         it "converts the value when given a filter instance" do
 					Names.parse('Poe and Hawthorne').convert(UpcaseAll.instance).to_s.must_be :==, 'POE and HAWTHORNE'
@@ -164,7 +162,7 @@ module BibTeX
 				end
 			end
 		end
-    
+
   end
-  
+
 end

data/test/bibtex/test_value.rb

@@ -1,5 +1,17 @@
 require 'helper.rb'
 
+class Upcase < BibTeX::Filter
+  def apply(value)
+    value.is_a?(::String) ? value.upcase : value
+  end
+end
+
+class SuffixA < BibTeX::Filter
+  def apply(value)
+    value.is_a?(::String) ? "#{value}a" : value
+  end
+end
+
 module BibTeX
   class ValueTest < Minitest::Spec
 
@@ -93,18 +105,6 @@ module BibTeX
 
     describe "conversions" do
       before do
-        class Upcase < BibTeX::Filter
-          def apply(value)
-            value.is_a?(::String) ? value.upcase : value
-          end
-        end
-
-        class SuffixA < BibTeX::Filter
-          def apply(value)
-            value.is_a?(::String) ? "#{value}a" : value
-          end
-        end
-
         @values = [Value.new('foo'), Value.new('foo', :bar)]
       end
 

data/test/test_bibtex.rb

@@ -3,7 +3,7 @@ require 'timeout'
 
 module BibTeX
   class TestBibtex < Minitest::Unit::TestCase
-  
+
     def setup
     end
 
@@ -37,25 +37,25 @@ module BibTeX
       assert_equal('A {bunch {of} braces {in}} title', bib[:key03][:title])
       #TODO missing assertions
     end
-  
+
     # def test_errors
     #   bib = BibTeX.open(Test.fixtures(:errors), :debug => false)
     #   #refute_nil(bib)
     # 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.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.fixtures(:roundtrip))
       # bib = BibTeX::Bibliography.new
@@ -72,9 +72,9 @@ module BibTeX
       #   :title => 'Agile Web Development with Rails',
       #   :year => '2009'
       # })
-      # assert_equal(file.gsub(/[\s]+/, ''), bib.to_s.gsub(/[\s]+/, ''))    
+      # assert_equal(file.gsub(/[\s]+/, ''), bib.to_s.gsub(/[\s]+/, ''))
     end
-  
+
     def test_parse
       bib = BibTeX::Bibliography.new
       bib.add(BibTeX::Element.parse(%q( @string{ pragprog = "The Pragmatic Bookshelf" } )))
@@ -89,9 +89,9 @@ module BibTeX
         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
@@ -114,7 +114,7 @@ EOF
         @article{}
 EOF
       )
-      timeout(2) do
+      Timeout.timeout(2) do
         BibTeX.parse(<<EOF, allow_missing_keys: true)
         @article{},
         @article{}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibtex-ruby
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.3.0
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-02 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: latex-decode
@@ -127,7 +127,7 @@ files:
 - test/test_export.rb
 homepage: http://inukshuk.github.com/bibtex-ruby
 licenses:
-- GPL-3
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A BibTeX parser, converter and API for Ruby.