bibtex-ruby 3.1.6 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 817e4bd6a66bba45eefcef6103c6ece1d8a1f9df
-  data.tar.gz: 9b69db7b3a997f2420fbb2d79be549289631b00e
+  metadata.gz: ed46f17c426f678a6782c0e226710d4508edc484
+  data.tar.gz: d70e405f4c1f9783cf3a2a8c515837eab7a7d3b9
 SHA512:
-  metadata.gz: e2b0ebcfaa88d4394471204ad951255cab24b195eb55bf70cebdd55200fc5377c651b9573e734272b736478df5069818ed37f9e8682942ab5bd953b475e4e4f8
-  data.tar.gz: 93d6bfa04a79ff16ffdd818bdba9271b7afb1faea41c5963b0dc1a9fbabb141361738b393712c527ddbdde83e17599c25d71f2bd3e33d007e9172a4a7fd1a647
+  metadata.gz: 24999b5c3f94cd6de3fc4dfc773399421829cac09189cbd5ae2599fa8c99ae195dfb8087a892582117b63b41ed46c782d2ecb925ece19de56b7fea98bc5bada9
+  data.tar.gz: b867a6b26356e16d650257edf0f27d770f19406729728376ed6ac58bdffdd1637c8fac9292c6623e0efe930f9bc2319b857db5707950aa31c6d361792a961273

data/History.txt

@@ -1,3 +1,9 @@
+4.0.0 / 2014-07-08
+==================
+
+* BREAKING: Support type/key fields. Rename type -> bibtex_type
+  and key -> bibtex_key in key-value exports.
+
 3.1.6 / 2014-06-17
 ==================
 

data/features/issues/non_ascii_default_keys.feature

@@ -8,7 +8,7 @@ Feature: Parse BibTeX files and convert LaTeX to Unicode
 		When I create an entry with these elements:
 			| type | author           | title | location | year |
 			| book | Christian Müller | Title | Berlin   | 2013 |
-		Then my bibliography should contain an entry with a key like "mu?.?ller2013a"
+		Then my bibliography should contain an entry with a key like "m(u|ue)?ller2013a"
 
   @default_keys
 	Scenario: Multiple entries with an author whose name contains non-ASCII characters
@@ -16,5 +16,5 @@ Feature: Parse BibTeX files and convert LaTeX to Unicode
 			| type | author           | title        | location | year |
 			| book | Christian Müller | First Title  | Berlin   | 2013 |
 			| book | Christian Müller | Second Title | Berlin   | 2013 |
-		Then my bibliography should contain an entry with a key like "mu?.?ller2013a"
-		And my bibliography should contain an entry with a key like "mu?.?ller2013b"
+		Then my bibliography should contain an entry with a key like "m(ue?)?ller2013a"
+		And my bibliography should contain an entry with a key like "m(ue?)?ller2013b"

data/lib/bibtex/bibtex.y

@@ -67,7 +67,7 @@ rule
         | entry_head assignments COMMA RBRACE      { result = val[0] << val[1] }
         | entry_head RBRACE                        { result = val[0] }
 
-  entry_head : NAME LBRACE opt_key                 { result = BibTeX::Entry.new(:type => val[0].downcase.to_sym, :key => val[2]) }
+  entry_head : NAME LBRACE opt_key                 { result = BibTeX::Entry.new(:bibtex_type => val[0].downcase.to_sym, :bibtex_key => val[2]) }
 
   opt_key :                                        { missing_key }
           | KEY
@@ -138,4 +138,4 @@ require 'bibtex/lexer'
     raise ParseError, message
   end
 
-# -*- racc -*-
+# -*- racc -*-

data/lib/bibtex/entry.rb

@@ -73,8 +73,8 @@ module BibTeX
     def initialize(attributes = {})
       @fields = {}
 
-      self.type = attributes.delete(:type) if attributes.has_key?(:type)
-      self.key = attributes.delete(:key) if attributes.has_key?(:key)
+      self.type = attributes.delete(:bibtex_type) if attributes.has_key?(:bibtex_type)
+      self.key = attributes.delete(:bibtex_key) if attributes.has_key?(:bibtex_key)
 
       add(attributes)
 
@@ -621,7 +621,7 @@ module BibTeX
 
     def to_hash(options = {})
       options[:quotes] ||= %w({ })
-      hash = { :key => key, :type => type }
+      hash = { :bibtex_key => key, :bibtex_type => type }
       each_pair { |k,v| hash[k] = v.to_s(options) }
       hash
     end
@@ -651,7 +651,7 @@ module BibTeX
     def default_key
       k = names[0]
       k = k.respond_to?(:family) ? k.family : k.to_s
-      k = BibTeX.transliterate(k)
+      k = BibTeX.transliterate(k).gsub(/["']/, '')
       k = k[/[A-Za-z-]+/] || 'unknown'
       k << (has_field?(:year) ? year : '-')
       k << 'a'

data/lib/bibtex/entry/citeproc_converter.rb

@@ -16,6 +16,7 @@ class BibTeX::Entry::CiteProcConverter
     institution  publisher
     organization publisher
     howpublished publisher
+    type         genre
   }.map(&:intern)]).freeze
 
   CSL_FIELDS = %w{
@@ -71,7 +72,7 @@ class BibTeX::Entry::CiteProcConverter
       end
     end
 
-    methods = self.class.instance_methods(false) - [:convert!]
+    methods = self.class.instance_methods(false) - [:convert!, :hash]
     methods.each { |m| send(m) }
 
     hash

data/lib/bibtex/name_parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.10
+# This file is automatically generated by Racc 1.4.11
 # from Racc grammer file "".
 #
 
@@ -444,4 +444,4 @@ def _reduce_none(val, _values, result)
 end
 
   end   # class NameParser
-end   # module BibTeX
+  end   # module BibTeX

data/lib/bibtex/parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.10
+# This file is automatically generated by Racc 1.4.11
 # from Racc grammer file "".
 #
 
@@ -417,7 +417,7 @@ module_eval(<<'.,.,', 'bibtex.y', 67)
 
 module_eval(<<'.,.,', 'bibtex.y', 69)
   def _reduce_26(val, _values, result)
-     result = BibTeX::Entry.new(:type => val[0].downcase.to_sym, :key => val[2]) 
+     result = BibTeX::Entry.new(:bibtex_type => val[0].downcase.to_sym, :bibtex_key => val[2]) 
     result
   end
 .,.,
@@ -471,4 +471,4 @@ def _reduce_none(val, _values, result)
 end
 
   end   # class Parser
-end   # module BibTeX
+  end   # module BibTeX

data/lib/bibtex/version.rb

@@ -18,9 +18,9 @@
 
 module BibTeX
   module Version
-    MAJOR = 3
-    MINOR = 1
-    PATCH = 6
+    MAJOR = 4
+    MINOR = 0
+    PATCH = 0
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.').freeze

data/test/bibtex/test_elements.rb

@@ -15,11 +15,11 @@ module BibTeX
       end
       
       it 'accepts a Hash and returns an Entry' do
-        Element.parse({ :type => :book })[0].type.must_be :==, :book
+        Element.parse({ :bibtex_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
+        Element.parse([{ :bibtex_type => :book }, { :bibtex_type => :misc }])[1].type.must_be :==, :misc
       end
       
     end
@@ -61,4 +61,4 @@ module BibTeX
 
   end
   
-end
+end

data/test/bibtex/test_entry.rb

@@ -216,12 +216,12 @@ module BibTeX
       end
 
       it 'includes type and all defined fields' do
-        assert_equal 'book', Entry.new(:type => 'book').digest
-        assert_equal 'book|title:foo', Entry.new(:type => 'book', :title => 'foo').digest
+        assert_equal 'book', Entry.new(:bibtex_type => 'book').digest
+        assert_equal 'book|title:foo', Entry.new(:bibtex_type => 'book', :title => 'foo').digest
       end
 
       it 'accepts a filter' do
-        assert_equal 'book|year:2012', Entry.new(:type => 'book', :title => 'foo', :year => 2012).digest([:year])
+        assert_equal 'book|year:2012', Entry.new(:bibtex_type => 'book', :title => 'foo', :year => 2012).digest([:year])
       end
     end
 
@@ -468,8 +468,8 @@ module BibTeX
 
     def test_creation_from_hash
       entry = BibTeX::Entry.new({
-        :type => 'book',
-        :key => :raven,
+        :bibtex_type => 'book',
+        :bibtex_key => :raven,
         :author => 'Poe, Edgar A.',
         :title => 'The Raven'
       })
@@ -496,10 +496,10 @@ module BibTeX
 
     def test_sorting
       entries = []
-      entries << Entry.new({ :type => 'book', :key => 'raven3', :author => 'Poe, Edgar A.', :title => 'The Raven'})
-      entries << Entry.new({ :type => 'book', :key => 'raven2', :author => 'Poe, Edgar A.', :title => 'The Raven'})
-      entries << Entry.new({ :type => 'book', :key => 'raven1', :author => 'Poe, Edgar A.', :title => 'The Raven'})
-      entries << Entry.new({ :type => 'book', :key => 'raven1', :author => 'Poe, Edgar A.', :title => 'The Aven'})
+      entries << Entry.new({ :bibtex_type => 'book', :bibtex_key => 'raven3', :author => 'Poe, Edgar A.', :title => 'The Raven'})
+      entries << Entry.new({ :bibtex_type => 'book', :bibtex_key => 'raven2', :author => 'Poe, Edgar A.', :title => 'The Raven'})
+      entries << Entry.new({ :bibtex_type => 'book', :bibtex_key => 'raven1', :author => 'Poe, Edgar A.', :title => 'The Raven'})
+      entries << Entry.new({ :bibtex_type => 'book', :bibtex_key => 'raven1', :author => 'Poe, Edgar A.', :title => 'The Aven'})
 
       entries.sort!
 
@@ -510,9 +510,9 @@ module BibTeX
 
     describe 'default keys' do
       before {
-        @e1 = Entry.new(:type => 'book', :author => 'Poe, Edgar A.', :title => 'The Raven', :editor => 'John Hopkins', :year => 1996)
-        @e2 = Entry.new(:type => 'book', :title => 'The Raven', :editor => 'John Hopkins', :year => 1996)
-        @e3 = Entry.new(:type => 'book', :author => 'Poe, Edgar A.', :title => 'The Raven', :editor => 'John Hopkins')
+        @e1 = Entry.new(:bibtex_type => 'book', :author => 'Poe, Edgar A.', :title => 'The Raven', :editor => 'John Hopkins', :year => 1996)
+        @e2 = Entry.new(:bibtex_type => 'book', :title => 'The Raven', :editor => 'John Hopkins', :year => 1996)
+        @e3 = Entry.new(:bibtex_type => 'book', :author => 'Poe, Edgar A.', :title => 'The Raven', :editor => 'John Hopkins')
       }
 
       it 'should return "unknown-a" for an empty Entry' do

data/test/test_bibtex.rb

@@ -59,7 +59,7 @@ module BibTeX
       # file = File.read(Test.fixtures(:roundtrip))
       # bib = BibTeX::Bibliography.new
       # bib << BibTeX::Entry.new({
-      #   :type => :book,
+      #   :bibtex_type => :book,
       #   :key => 'rails',
       #   :address => 'Raleigh, North Carolina',
       #   :author => 'Ruby, Sam and Thomas, Dave and Hansson Heinemeier, David',

data/test/test_export.rb

@@ -16,7 +16,7 @@ module BibTeX
       yaml = YAML.load(bib.to_yaml)
       refute_nil(yaml)
       assert_equal(3, yaml.length)
-      assert_equal(%w[ dragon pickaxe rails], yaml.map { |y| y[:key] }.sort)
+      assert_equal(%w[ dragon pickaxe rails], yaml.map { |y| y[:bibtex_key] }.sort)
       assert_equal('{The Facets of Ruby}', yaml[0][:series])
     end
 
@@ -25,7 +25,7 @@ module BibTeX
       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(%w[ dragon pickaxe rails], json.map { |y| y['bibtex_key'] }.sort)
       assert_equal('{The Facets of Ruby}', json[0]['series'])
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibtex-ruby
 version: !ruby/object:Gem::Version
-  version: 3.1.6
+  version: 4.0.0
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-17 00:00:00.000000000 Z
+date: 2014-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: latex-decode