bibtex-ruby 1.3.1 → 1.3.2

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.3.2
+
+* Fixed numeric keys issue
+* Fixed CiteProc/CSL date export
+* Implemented BibTeX month value conversion
+
 === 1.3.1
 
 * Added CiteProc/CSL export format

data/Manifest

@@ -15,6 +15,8 @@ features
 features/bibtex.feature
 features/entries.feature
 features/issues
+features/issues/number_keys.feature
+features/issues/parse_months.feature
 features/issues/slash_keys.feature
 features/names.feature
 features/preambles.feature

data/features/issues/number_keys.feature

@@ -0,0 +1,45 @@
+Feature: Keys containing '/' symbols
+	As a hacker who works with bibliographies
+	I want to parse BibTeX entries with keys starting with numbers
+	Because they frequently occur in key naming schemes
+	
+	Scenario: Two entries with keys starting with a number
+		When I parse the following file:
+		"""
+		@misc{2008knowledge,
+			Date-Added = {2011-04-24 17:41:02 -0400},
+			Date-Modified = {2011-04-27 20:13:35 -0400},
+			Howpublished = {http://oro.open.ac.uk/11766/},
+			Month = sep,
+			Note = {Knowledge Cartography is the discipline of mapping intellectual {landscapes.The} focus of this book is on the process by which manually crafting interactive, hypertextual maps clarifies one’s own understanding, as well as communicating {it.The} authors see mapping software as a set of visual tools for reading and writing in a networked age. In an information ocean, the primary challenge is to find meaningful patterns around which we can weave plausible narratives. Maps of concepts, discussions and arguments make the connections between ideas tangible and disputable. With 17 chapters from the leading researchers and practitioners, the reader will find the current state–of-the-art in the field. Part 1 focuses on educational applications in schools and universities, before Part 2 turns to applications in professional communities},
+			Shorttitle = {Knowledge Cartography},
+			Title = {Knowledge Cartography: Software tools and mapping techniques},
+			Type = {Edited Book},
+			Url = {http://oro.open.ac.uk/11766/},
+			Year = {2008},
+			Bdsk-File-1 = {YnBsaXN0MDDUAQIDBAUIJidUJHRvcFgkb2JqZWN0c1gkdmVyc2lvblkkYXJjaGl2ZXLRBgdUcm9vdIABqAkKFRYXGyIjVSRudWxs0wsMDQ4RFFpOUy5vYmplY3RzV05TLmtleXNWJGNsYXNzog8QgASABqISE4ACgAOAB1lhbGlhc0RhdGFccmVsYXRpdmVQYXRo0hgNGRpXTlMuZGF0YU8RAXwAAAAAAXwAAgAABEhvbWUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMmm5vlIKwAAABLivBEyMDA4a25vd2xlZGdlLnBkZgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEtx5ydoOuQAAAAAAAAAAAAIAAwAACQAAAAAAAAAAAAAAAAAAAAAHQmliZGVzawAAEAAIAADJpx85AAAAEQAIAADJ2kb5AAAAAQAMABLivAAAAF8AAABXAAIALkhvbWU6c3RpYW46RG9jdW1lbnRzOkJpYmRlc2s6MjAwOGtub3dsZWRnZS5wZGYADgAkABEAMgAwADAAOABrAG4AbwB3AGwAZQBkAGcAZQAuAHAAZABmAA8ACgAEAEgAbwBtAGUAEgAqL3N0aWFuL0RvY3VtZW50cy9CaWJkZXNrLzIwMDhrbm93bGVkZ2UucGRmABMADS9Wb2x1bWVzL0hvbWUAABUAAgAT//8AAIAF0hwdHh9YJGNsYXNzZXNaJGNsYXNzbmFtZaMfICFdTlNNdXRhYmxlRGF0YVZOU0RhdGFYTlNPYmplY3RfECkuLi8uLi9Eb2N1bWVudHMvQmliZGVzay8yMDA4a25vd2xlZGdlLnBkZtIcHSQloiUhXE5TRGljdGlvbmFyeRIAAYagXxAPTlNLZXllZEFyY2hpdmVyAAgAEQAWAB8AKAAyADUAOgA8AEUASwBSAF0AZQBsAG8AcQBzAHYAeAB6AHwAhgCTAJgAoAIgAiICJwIwAjsCPwJNAlQCXQKJAo4CkQKeAqMAAAAAAAACAQAAAAAAAAAoAAAAAAAAAAAAAAAAAAACtQ==}}
+
+		@misc{2007proceedings,
+			Date-Added = {2011-04-24 17:34:26 -0400},
+			Date-Modified = {2011-04-27 20:13:35 -0400},
+			Howpublished = {http://oro.open.ac.uk/9275/},
+			Month = oct,
+			Note = {Proceedings {ICPW'07:} 2nd International Conference on the Pragmatic Web, 22-23 Oct. 2007, Tilburg: {NL}},
+			Shorttitle = {Proceedings {ICPW'07}},
+			Title = {Proceedings {ICPW'07:} 2nd International Conference on the Pragmatic Web, 22-23 Oct. 2007, Tilburg: {NL}},
+			Type = {Edited Book},
+			Url = {http://oro.open.ac.uk/9275/},
+			Year = {2007},
+			Bdsk-File-1 = {YnBsaXN0MDDUAQIDBAUIJidUJHRvcFgkb2JqZWN0c1gkdmVyc2lvblkkYXJjaGl2ZXLRBgdUcm9vdIABqAkKFRYXGyIjVSRudWxs0wsMDQ4RFFpOUy5vYmplY3RzV05TLmtleXNWJGNsYXNzog8QgASABqISE4ACgAOAB1lhbGlhc0RhdGFccmVsYXRpdmVQYXRo0hgNGRpXTlMuZGF0YU8RAYQAAAAAAYQAAgAABEhvbWUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMmm5vlIKwAAABLivBMyMDA3cHJvY2VlZGluZ3MucGRmAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEuYBydoPoVBERiAAAAAAAAIAAwAACQAAAAAAAAAAAAAAAAAAAAAHQmliZGVzawAAEAAIAADJpx85AAAAEQAIAADJ2kfhAAAAAQAMABLivAAAAF8AAABXAAIAMEhvbWU6c3RpYW46RG9jdW1lbnRzOkJpYmRlc2s6MjAwN3Byb2NlZWRpbmdzLnBkZgAOACgAEwAyADAAMAA3AHAAcgBvAGMAZQBlAGQAaQBuAGcAcwAuAHAAZABmAA8ACgAEAEgAbwBtAGUAEgAsL3N0aWFuL0RvY3VtZW50cy9CaWJkZXNrLzIwMDdwcm9jZWVkaW5ncy5wZGYAEwANL1ZvbHVtZXMvSG9tZQAAFQACABP//wAAgAXSHB0eH1gkY2xhc3Nlc1okY2xhc3NuYW1lox8gIV1OU011dGFibGVEYXRhVk5TRGF0YVhOU09iamVjdF8QKy4uLy4uL0RvY3VtZW50cy9CaWJkZXNrLzIwMDdwcm9jZWVkaW5ncy5wZGbSHB0kJaIlIVxOU0RpY3Rpb25hcnkSAAGGoF8QD05TS2V5ZWRBcmNoaXZlcgAIABEAFgAfACgAMgA1ADoAPABFAEsAUgBdAGUAbABvAHEAcwB2AHgAegB8AIYAkwCYAKACKAIqAi8COAJDAkcCVQJcAmUCkwKYApsCqAKtAAAAAAAAAgEAAAAAAAAAKAAAAAAAAAAAAAAAAAAAAr8=}}
+		"""
+		Then my bibliography should contain a misc with id "2008knowledge"
+		And my bibliography should contain a misc with id "2007proceedings"		
+
+	Scenario: An entry with a number-only key
+		When I parse the following file:
+		"""
+		@book{2011,
+			Title = {Test}
+		}
+		"""
+		Then my bibliography should contain a book with id "2011"

data/features/issues/parse_months.feature

@@ -0,0 +1,23 @@
+Feature: Keys containing '/' symbols
+	As a hacker who works with bibliographies
+	I want to export BibTeX entries to the CiteProc format
+	
+	Scenario: An entry taken from the DBLP
+		When I parse the following file:
+		"""
+		@article{DBLP:journals/dq/RossinK99,
+		  author    = {Donald F. Rossin and
+		               Barbara D. Klein},
+		  title     = {Data Errors in Neural Network and Linear Regression Models:
+		               An Experimental Comparison},
+		  journal   = {Data Quality Journal},
+		  volume    = {5},
+			month     = sep,
+		  year      = {1999},
+		  ee        = {http://www.dataquality.com/999KR.htm},
+		  bibsource = {DBLP, http://dblp.uni-trier.de}
+		}
+		"""
+		Then my bibliography should contain these articles:
+			| issued                      |
+			| {"date-parts"=>[[1999, 9]]} |

data/features/step_definitions/bibtex_steps.rb

@@ -52,11 +52,17 @@ Then /^my bibliography should contain the following numbers of elements:$/ do |t
   end
 end
 
-Then /^my bibliography should contain an entry with key "([^"]*)"$/ do |key|
+Then /^my bibliography should contain an entry with (?:key|id) "([^"]*)"$/ do |key|
   refute_nil @bibliography[key.to_s]
 end
 
-Then /^my bibliography should not contain an entry with key "([^"]*)"$/ do |key|
+Then /^my bibliography should contain an entry with (?:key|id) "([^"]*)" and a?n? (\w+) value of "([^"]*)"$/ do |key,field,value|
+  refute_nil @bibliography[key.to_s]
+  assert_equal value, @bibliography[key.to_s][field].to_s
+end
+
+
+Then /^my bibliography should not contain an entry with (?:key|id) "([^"]*)"$/ do |key|
   assert_nil @bibliography[key.to_sym]
 end
 

data/lib/bibtex/bibliography.rb

@@ -44,7 +44,7 @@ module BibTeX
       #
       def open(path, options = {})
         b = parse(Kernel.open(path).read, options)
-        return b unless block_given?
+        return b unless !b.nil? and block_given?
 
         begin
           yield b
@@ -56,7 +56,8 @@ module BibTeX
       # Parses the given string and returns a corresponding Bibliography instance.
       def parse(bibtex, options = {})
         b = Parser.new(options).parse(bibtex)
-        b.parse_names unless options[:parse_names] == false
+        b.parse_names unless b.nil? || options[:parse_names] == false
+        b.parse_months unless b.nil? || options[:parse_months] == false
         b
       end
       
@@ -119,6 +120,11 @@ module BibTeX
       self
     end
     
+    def parse_months
+      q('@entry') { |e| e.parse_month }
+      self
+    end
+    
     #
     # Deletes an object, or a list of objects from the bibliography.
     # If a list of objects is to be deleted, you can either supply the list

data/lib/bibtex/bibtex.y

@@ -70,6 +70,7 @@ rule
 
   key : NAME                                       { result = val[0] }
       | NUMBER                                     { result = val[0] }
+      | NUMBER NAME                                { result = val[0,2].join }
 
   assignments : assignment                         { result = val[0] }
               | assignments COMMA assignment       { result.merge!(val[2]) }
@@ -125,8 +126,8 @@ require 'bibtex/lexer'
   end
   
   def on_error(tid, val, vstack)
-    #raise(ParseError, "Failed to parse BibTeX on value %s (%s) %s" % [val.inspect, token_to_str(tid) || '?', vstack.inspect])
     Log.error("Failed to parse BibTeX on value %s (%s) %s" % [val.inspect, token_to_str(tid) || '?', vstack.inspect])
+    #raise(ParseError, "Failed to parse BibTeX on value %s (%s) %s" % [val.inspect, token_to_str(tid) || '?', vstack.inspect])
   end
 
 # -*- racc -*-

data/lib/bibtex/elements.rb

@@ -29,7 +29,12 @@ module BibTeX
 		
 		# Returns an array of BibTeX elements.
     def self.parse(string, options = {})
-      BibTeX::Parser.new(options).parse(string).data
+      elements = BibTeX::Parser.new(options).parse(string).data
+      elements.each do |e|
+        e.parse_names unless !e.respond_to?(:parse_names) || options[:parse_names] == false
+        e.parse_month unless !e.respond_to?(:parse_month) || options[:parse_months] == false
+      end
+      elements
     end
     
 		# Returns a string containing the object's content.

data/lib/bibtex/entry.rb

@@ -44,10 +44,23 @@ module BibTeX
 			:unpublished   => [:author,:title,:note]
 		}).freeze
 
-    NAME_FIELDS = [:author, :editor, :translator].freeze
-    DATE_FIELDS = [:year].freeze
+    NAME_FIELDS = [:author,:editor,:translator].freeze
+    DATE_FIELDS = [:year,:month].freeze
+    
+    MONTHS = [:jan,:feb,:mar,:apr,:may,:jun,:jul,:aug,:sep,:oct,:nov,:dec].freeze
 
-    CSL_FIELDS = Hash.new {|h,k|k}.merge(Hash[*%w{
+    MONTHS_FILTER = Hash.new do |h,k|
+      case k.to_s.strip
+      when /^(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)/i
+        h[k] = Value.new(k.to_s[0,3].downcase.to_sym)
+      when /^\d\d?$/
+        h[k] = Value.new(MONTHS[k.to_i - 1] || k)
+      else
+        h[k] = Value.new(k)
+      end
+    end
+    
+    CSL_FILTER = Hash.new {|h,k|k}.merge(Hash[*%w{
       date      issued
       isbn      ISBN
       booktitle container-title
@@ -61,6 +74,18 @@ module BibTeX
       year      issued
     }.map(&:intern)]).freeze
 
+    CSL_FIELDS = %w{ abstract annote archive archive_location archive-place
+      authority call-number chapter-number citation-label citation-number
+      collection-title container-title DOI edition event event-place
+      first-reference-note-number genre ISBN issue jurisdiction keyword locator 
+      medium note number number-of-pages number-of-volumes original-publisher
+      original-publisher-place original-title page page-first publisher
+      publisher-place references section status title URL version volume
+      year-suffix accessed container event-date issued original-date
+      author editor translator recipient interviewer publisher composer
+      original-publisher original-author container-author collection-editor
+    }.map(&:intern).freeze
+    
     CSL_TYPES = Hash.new {|h,k|k}.merge(Hash[*%w{
       booklet        pamphlet
       conference     paper-conference
@@ -223,6 +248,17 @@ module BibTeX
       self
     end
 
+    def month=(month)
+      @fields[:month] = MONTHS_FILTER[month]
+    end
+    
+    def parse_month
+      @fields[:month] = MONTHS_FILTER[@fields[:month]] if @fields.has_key?(:month)
+      self
+    end
+    
+    alias :parse_months :parse_month
+    
     # Parses all name values of the entry. Tries to replace and join the
     # value prior to parsing.
     def parse_names
@@ -259,11 +295,20 @@ module BibTeX
 		  options[:quotes] ||= []
 		  hash = { 'id' => key.to_s, 'type' => CSL_TYPES[type].to_s }
       each_pair do |k,v|
-		    hash[CSL_FIELDS[k].to_s] = k == :year ? v.to_date : v.to_citeproc(options)
+		    hash[CSL_FILTER[k].to_s] = v.to_citeproc(options) unless DATE_FIELDS.include?(k)
 		  end
+		  hash['issued'] = citeproc_date
 		  hash
 		end
 		
+		def issued
+		  m = MONTHS.find_index(@fields[:month] && @fields[:month].v)
+		  m = m + 1 unless m.nil?
+		  { 'date-parts' => [[@fields[:year],m].compact.map(&:to_i)] }
+		end
+		
+		alias :citeproc_date :issued
+		
 		def to_xml(options = {})
 		  require 'rexml/document'
 	    

data/lib/bibtex/error.rb

@@ -1,4 +1,6 @@
 module BibTeX
+
+  class ParseError < StandardError; end
   
   #
   # Represents a lexical or syntactical error.

data/lib/bibtex/parser.output

@@ -29,12 +29,13 @@ rule 24 entry: entry_head RBRACE
 rule 25 entry_head: NAME LBRACE key COMMA
 rule 26 key: NAME
 rule 27 key: NUMBER
-rule 28 assignments: assignment
-rule 29 assignments: assignments COMMA assignment
-rule 30 assignment: NAME EQ value
-rule 31 value: string_value
-rule 32 value: NUMBER
-rule 33 value: LBRACE content RBRACE
+rule 28 key: NUMBER NAME
+rule 29 assignments: assignment
+rule 30 assignments: assignments COMMA assignment
+rule 31 assignment: NAME EQ value
+rule 32 value: string_value
+rule 33 value: NUMBER
+rule 34 value: LBRACE content RBRACE
 
 ------- Symbols -------
 
@@ -68,10 +69,10 @@ rule 33 value: LBRACE content RBRACE
     on right: 11
     on left : 22 23 24
   content (26)
-    on right: 12 33
+    on right: 12 34
     on left : 13 14
   string_value (27)
-    on right: 15 17 19 31
+    on right: 15 17 19 32
     on left : 18 19
   string_assignment (28)
     on right: 16
@@ -83,34 +84,34 @@ rule 33 value: LBRACE content RBRACE
     on right: 22 23 24
     on left : 25
   assignments (31)
-    on right: 22 23 29
-    on left : 28 29
+    on right: 22 23 30
+    on left : 29 30
   key (32)
     on right: 25
-    on left : 26 27
+    on left : 26 27 28
   assignment (33)
-    on right: 28 29
-    on left : 30
+    on right: 29 30
+    on left : 31
   value (34)
-    on right: 30
-    on left : 31 32 33
+    on right: 31
+    on left : 32 33 34
 
 **Terminals, with rules where they appear
 
   $end (0) 
   error (1) 
   AT (2) 5
-  COMMA (3) 23 25 29
+  COMMA (3) 23 25 30
   COMMENT (4) 12
   CONTENT (5) 14
   ERROR (6) 7
-  EQ (7) 17 30
-  LBRACE (8) 12 15 16 25 33
+  EQ (7) 17 31
+  LBRACE (8) 12 15 16 25 34
   META_CONTENT (9) 6
-  NAME (10) 17 20 25 26 30
-  NUMBER (11) 27 32
+  NAME (10) 17 20 25 26 28 31
+  NUMBER (11) 27 28 33
   PREAMBLE (12) 15
-  RBRACE (13) 12 15 16 22 23 24 33
+  RBRACE (13) 12 15 16 22 23 24 34
   SHARP (14) 19
   STRING (15) 16
   STRING_LITERAL (16) 21
@@ -309,7 +310,7 @@ state 23
 
   22) entry : entry_head assignments _ RBRACE
   23) entry : entry_head assignments _ COMMA RBRACE
-  29) assignments : assignments _ COMMA assignment
+  30) assignments : assignments _ COMMA assignment
 
   COMMA         shift, and go to state 37
   RBRACE        shift, and go to state 36
@@ -324,14 +325,14 @@ state 24
 
 state 25
 
-  28) assignments : assignment _
+  29) assignments : assignment _
 
-  $default      reduce using rule 28 (assignments)
+  $default      reduce using rule 29 (assignments)
 
 
 state 26
 
-  30) assignment : NAME _ EQ value
+  31) assignment : NAME _ EQ value
 
   EQ            shift, and go to state 38
 
@@ -413,7 +414,7 @@ state 36
 state 37
 
   23) entry : entry_head assignments COMMA _ RBRACE
-  29) assignments : assignments COMMA _ assignment
+  30) assignments : assignments COMMA _ assignment
 
   NAME          shift, and go to state 26
   RBRACE        shift, and go to state 47
@@ -422,7 +423,7 @@ state 37
 
 state 38
 
-  30) assignment : NAME EQ _ value
+  31) assignment : NAME EQ _ value
 
   LBRACE        shift, and go to state 52
   NAME          shift, and go to state 32
@@ -450,7 +451,9 @@ state 40
 state 41
 
   27) key : NUMBER _
+  28) key : NUMBER _ NAME
 
+  NAME          shift, and go to state 54
   $default      reduce using rule 27 (key)
 
 
@@ -475,7 +478,7 @@ state 44
   NAME          shift, and go to state 32
   STRING_LITERAL  shift, and go to state 33
 
-  string_literal  go to state 54
+  string_literal  go to state 55
 
 state 45
 
@@ -491,7 +494,7 @@ state 46
   NAME          shift, and go to state 32
   STRING_LITERAL  shift, and go to state 33
 
-  string_value  go to state 55
+  string_value  go to state 56
   string_literal  go to state 31
 
 state 47
@@ -503,42 +506,42 @@ state 47
 
 state 48
 
-  29) assignments : assignments COMMA assignment _
+  30) assignments : assignments COMMA assignment _
 
-  $default      reduce using rule 29 (assignments)
+  $default      reduce using rule 30 (assignments)
 
 
 state 49
 
   19) string_value : string_value _ SHARP string_literal
-  31) value : string_value _
+  32) value : string_value _
 
   SHARP         shift, and go to state 44
-  $default      reduce using rule 31 (value)
+  $default      reduce using rule 32 (value)
 
 
 state 50
 
-  30) assignment : NAME EQ value _
+  31) assignment : NAME EQ value _
 
-  $default      reduce using rule 30 (assignment)
+  $default      reduce using rule 31 (assignment)
 
 
 state 51
 
-  32) value : NUMBER _
+  33) value : NUMBER _
 
-  $default      reduce using rule 32 (value)
+  $default      reduce using rule 33 (value)
 
 
 state 52
 
-  33) value : LBRACE _ content RBRACE
+  34) value : LBRACE _ content RBRACE
 
   CONTENT       shift, and go to state 29
   $default      reduce using rule 13 (content)
 
-  content       go to state 56
+  content       go to state 57
 
 state 53
 
@@ -549,12 +552,19 @@ state 53
 
 state 54
 
+  28) key : NUMBER NAME _
+
+  $default      reduce using rule 28 (key)
+
+
+state 55
+
   19) string_value : string_value SHARP string_literal _
 
   $default      reduce using rule 19 (string_value)
 
 
-state 55
+state 56
 
   17) string_assignment : NAME EQ string_value _
   19) string_value : string_value _ SHARP string_literal
@@ -563,16 +573,16 @@ state 55
   $default      reduce using rule 17 (string_assignment)
 
 
-state 56
+state 57
 
-  33) value : LBRACE content _ RBRACE
+  34) value : LBRACE content _ RBRACE
 
-  RBRACE        shift, and go to state 57
+  RBRACE        shift, and go to state 58
 
 
-state 57
+state 58
 
-  33) value : LBRACE content RBRACE _
+  34) value : LBRACE content RBRACE _
 
-  $default      reduce using rule 33 (value)
+  $default      reduce using rule 34 (value)
 

data/lib/bibtex/parser.rb

@@ -11,7 +11,7 @@ require 'bibtex/lexer'
 module BibTeX
   class Parser < Racc::Parser
 
-module_eval(<<'...end bibtex.y/module_eval...', 'bibtex.y', 89)
+module_eval(<<'...end bibtex.y/module_eval...', 'bibtex.y', 90)
 
   attr_reader :lexer
   
@@ -51,8 +51,8 @@ module_eval(<<'...end bibtex.y/module_eval...', 'bibtex.y', 89)
   end
   
   def on_error(tid, val, vstack)
-    #raise(ParseError, "Failed to parse BibTeX on value %s (%s) %s" % [val.inspect, token_to_str(tid) || '?', vstack.inspect])
     Log.error("Failed to parse BibTeX on value %s (%s) %s" % [val.inspect, token_to_str(tid) || '?', vstack.inspect])
+    #raise(ParseError, "Failed to parse BibTeX on value %s (%s) %s" % [val.inspect, token_to_str(tid) || '?', vstack.inspect])
   end
 
 # -*- racc -*-
@@ -60,40 +60,40 @@ module_eval(<<'...end bibtex.y/module_eval...', 'bibtex.y', 89)
 ##### State transition tables begin ###
 
 racc_action_table = [
-    14,    52,    37,    32,    51,    38,    18,    32,    15,    33,
+    14,    52,    37,    32,    51,    35,    18,    32,    15,    33,
      4,    16,    36,    33,     6,     4,    29,     5,    32,     6,
-    32,    35,     5,    27,    33,    26,    33,    26,    24,    42,
-    47,    40,    41,    43,    44,    22,    45,    46,    21,    20,
-    53,    19,     7,    44,    29,    44,    57 ]
+    32,    38,     5,    27,    33,    26,    33,    26,    47,    42,
+    24,    43,    44,    40,    41,    22,    45,    46,    21,    20,
+    53,    54,    19,     7,    44,    29,    44,    58 ]
 
 racc_action_check = [
-     4,    38,    23,    38,    38,    26,     4,    46,     4,    38,
-     2,     4,    23,    46,     2,     0,    20,     2,    44,     0,
-    21,    22,     0,    18,    44,    17,    21,    37,    17,    28,
-    37,    27,    27,    30,    30,    16,    34,    35,    15,    14,
-    39,     7,     1,    49,    52,    55,    56 ]
+     4,    38,    23,    38,    38,    22,     4,    46,     4,    38,
+     2,     4,    23,    46,     2,     0,    20,     2,    21,     0,
+    44,    26,     0,    18,    21,    37,    44,    17,    37,    28,
+    17,    30,    30,    27,    27,    16,    34,    35,    15,    14,
+    39,    41,     7,     1,    49,    52,    56,    57 ]
 
 racc_action_pointer = [
-    13,    42,     8,   nil,    -4,   nil,   nil,    41,   nil,   nil,
-   nil,   nil,   nil,   nil,    31,    30,    27,    15,    15,   nil,
-    11,    10,    11,    -1,   nil,   nil,    -2,    21,    16,   nil,
-    20,   nil,   nil,   nil,    23,    30,   nil,    17,    -7,    37,
-   nil,   nil,   nil,   nil,     8,   nil,    -3,   nil,   nil,    29,
-   nil,   nil,    39,   nil,   nil,    31,    33,   nil ]
+    13,    43,     8,   nil,    -4,   nil,   nil,    42,   nil,   nil,
+   nil,   nil,   nil,   nil,    31,    30,    27,    17,    15,   nil,
+    11,     8,    -5,    -1,   nil,   nil,    14,    23,    16,   nil,
+    18,   nil,   nil,   nil,    23,    30,   nil,    15,    -7,    37,
+   nil,    31,   nil,   nil,    10,   nil,    -3,   nil,   nil,    30,
+   nil,   nil,    40,   nil,   nil,   nil,    32,    34,   nil ]
 
 racc_action_default = [
-    -1,   -34,    -2,    -3,   -34,    -6,    -7,   -34,    -4,    -5,
-    -8,    -9,   -10,   -11,   -34,   -34,   -34,   -34,   -34,    58,
-   -13,   -34,   -34,   -34,   -24,   -28,   -34,   -34,   -34,   -14,
-   -34,   -18,   -20,   -21,   -34,   -34,   -22,   -34,   -34,   -34,
-   -26,   -27,   -12,   -15,   -34,   -16,   -34,   -23,   -29,   -31,
-   -30,   -32,   -13,   -25,   -19,   -17,   -34,   -33 ]
+    -1,   -35,    -2,    -3,   -35,    -6,    -7,   -35,    -4,    -5,
+    -8,    -9,   -10,   -11,   -35,   -35,   -35,   -35,   -35,    59,
+   -13,   -35,   -35,   -35,   -24,   -29,   -35,   -35,   -35,   -14,
+   -35,   -18,   -20,   -21,   -35,   -35,   -22,   -35,   -35,   -35,
+   -26,   -27,   -12,   -15,   -35,   -16,   -35,   -23,   -30,   -32,
+   -31,   -33,   -13,   -25,   -28,   -19,   -17,   -35,   -34 ]
 
 racc_goto_table = [
     28,    30,    25,     3,     1,     8,    11,    12,    13,    10,
-     9,    34,    54,    17,    23,    39,     2,    50,    49,   nil,
-   nil,   nil,    48,   nil,   nil,   nil,    55,   nil,   nil,   nil,
-   nil,   nil,    56 ]
+     9,    34,    55,    17,    23,    39,     2,    50,    49,   nil,
+   nil,   nil,    48,   nil,   nil,   nil,    56,   nil,   nil,   nil,
+   nil,   nil,    57 ]
 
 racc_goto_check = [
      9,    10,    16,     3,     1,     3,     6,     7,     8,     5,
@@ -138,16 +138,17 @@ racc_reduce_table = [
   4, 30, :_reduce_25,
   1, 32, :_reduce_26,
   1, 32, :_reduce_27,
-  1, 31, :_reduce_28,
-  3, 31, :_reduce_29,
-  3, 33, :_reduce_30,
-  1, 34, :_reduce_31,
+  2, 32, :_reduce_28,
+  1, 31, :_reduce_29,
+  3, 31, :_reduce_30,
+  3, 33, :_reduce_31,
   1, 34, :_reduce_32,
-  3, 34, :_reduce_33 ]
+  1, 34, :_reduce_33,
+  3, 34, :_reduce_34 ]
 
-racc_reduce_n = 34
+racc_reduce_n = 35
 
-racc_shift_n = 58
+racc_shift_n = 59
 
 racc_token_table = {
   false => 0,
@@ -420,30 +421,30 @@ module_eval(<<'.,.,', 'bibtex.y', 71)
   end
 .,.,
 
-module_eval(<<'.,.,', 'bibtex.y', 73)
+module_eval(<<'.,.,', 'bibtex.y', 72)
   def _reduce_28(val, _values, result)
-     result = val[0] 
+     result = val[0,2].join 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'bibtex.y', 74)
   def _reduce_29(val, _values, result)
-     result.merge!(val[2]) 
+     result = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'bibtex.y', 76)
+module_eval(<<'.,.,', 'bibtex.y', 75)
   def _reduce_30(val, _values, result)
-     result = { val[0].downcase.to_sym => val[2] } 
+     result.merge!(val[2]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'bibtex.y', 78)
+module_eval(<<'.,.,', 'bibtex.y', 77)
   def _reduce_31(val, _values, result)
-     result = val[0] 
+     result = { val[0].downcase.to_sym => val[2] } 
     result
   end
 .,.,
@@ -457,6 +458,13 @@ module_eval(<<'.,.,', 'bibtex.y', 79)
 
 module_eval(<<'.,.,', 'bibtex.y', 80)
   def _reduce_33(val, _values, result)
+     result = val[0] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'bibtex.y', 81)
+  def _reduce_34(val, _values, result)
      result = val[1] 
     result
   end

data/lib/bibtex/version.rb

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

data/test/bibtex/test_entry.rb

@@ -9,6 +9,39 @@ module BibTeX
       end
     end
 
+    context 'month conversion' do
+      setup do
+        @entry = Entry.new
+      end
+      
+      [[:jan,'January'], [:feb,'February'], [:sep,'September']].each do |m|
+        should 'convert english months' do
+          @entry.month = m[1]
+          assert_equal m[0], @entry.month.v
+        end
+      end
+
+      [[:jan,:jan], [:feb,:feb], [:sep,:sep]].each do |m|
+        should 'convert bibtex abbreviations' do
+          @entry.month = m[1]
+          assert_equal m[0], @entry.month.v
+        end
+      end
+
+      [[:jan,1], [:feb,2], [:sep,9]].each do |m|
+        should 'convert numbers' do
+          @entry.month = m[1]
+          assert_equal m[0], @entry.month.v
+        end
+        should 'convert numbers when parsing' do
+          @entry = Entry.parse("@misc{id, month = #{m[1]}}")[0]
+          assert_equal m[0], @entry.month.v
+        end
+      end
+      
+    end
+    
+
     context 'given an entry' do
       setup do
         @entry = Entry.new do |e|
@@ -18,6 +51,7 @@ module BibTeX
           e.author = 'Herman Melville'
           e.publisher = 'Penguin'
           e.address = 'New York'
+          e.month = 'Nov'
           e.year = 1993
           e.parse_names
         end
@@ -33,7 +67,7 @@ module BibTeX
         e = @entry.to_citeproc
         assert_equal 'book', e['type']
         assert_equal 'New York', e['publisher-place']
-        assert_equal [1993], e['issued']['date-parts'][0]
+        assert_equal [1993,11], e['issued']['date-parts'][0]
         assert_equal 1, e['author'].length
         assert_equal 'Herman', e['author'][0]['given']
         assert_equal 'Melville', e['author'][0]['family']

metadata

@@ -2,7 +2,7 @@
 name: bibtex-ruby
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors: 
 - Sylvester Keil
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-14 00:00:00 +02:00
+date: 2011-05-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -102,6 +102,8 @@ files:
 - examples/markdown.bib
 - features/bibtex.feature
 - features/entries.feature
+- features/issues/number_keys.feature
+- features/issues/parse_months.feature
 - features/issues/slash_keys.feature
 - features/names.feature
 - features/preambles.feature