bibtex-ruby 3.1.2 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c042ba0b1e7763904a6e41fa5c0d3de2df2c1963
-  data.tar.gz: 8bbe22f8178cd6e3072093d2b3bb83fc03145061
+  metadata.gz: 776c0bde07264d1b4f928d73c70575ccda925aeb
+  data.tar.gz: 87529a9bf231b57e3cbd6f63c1f96de3ad8bc1f7
 SHA512:
-  metadata.gz: 296d227e81b7e250bf4bad9385d4a6e6cdc1183385ec4074faac0328824f9718446990b95f7adba20272c930b7ace932a61dddcb5bb68349900c2d0a4a4d3ad6
-  data.tar.gz: f15dfaff08f2883c5b304b164e01f0cb39f7ef8e0c267ecfad3d43260e1e6a295adb21c0df1592915534fcccc27e4d3fd956dd8ada0817e55ca007b42f33cfbd
+  metadata.gz: f0cdb11eba57bd1ddf8509a9f92c2e4bbdaa448ad0f8164b54990e70951d84693a233a61a2e200c9dcc8d4eb8f42b48e2efa52789fcd55ce75aa2635e8bf9eab
+  data.tar.gz: 49f8e36b32eb635b1c7a5367942378b802b7ce66aa004b2c69a491285afcec9fd9e6aa4d74afcc39cb9d938ee3659fd90450d327ab982b12b34427930bdc3bd6

data/History.txt

@@ -1,3 +1,8 @@
+3.1.3 / 2014-02-10
+==================
+
+* Fix Ruby warnings
+
 3.1.2 / 2014-01-29
 ==================
 

data/Rakefile

@@ -71,6 +71,13 @@ task :console, [:script] do |t,args|
   IRB.start
 end
 
+task :check_warnings do
+  $VERBOSE = true
+  require 'bibtex'
+
+  puts BibTeX::Version::STRING
+end
+
 
 desc 'Runs the benchmarks (and plots the results)'
 task :benchmark => ['racc'] do

data/lib/bibtex/bibliography/rdf_converter.rb

@@ -21,7 +21,7 @@ class BibTeX::Bibliography::RDFConverter
     graph
   end
 
-  private
+  protected
 
   attr_reader :bibtex, :graph, :agent
 end

data/lib/bibtex/compatibility.rb

@@ -1,24 +1,9 @@
 # coding: utf-8
 
-unless Symbol.include?(Comparable)
-  class Symbol
-    include Comparable
-    def <=>(other)
-      return nil unless other.is_a?(String) || other.is_a?(Symbol)
-      to_s <=> other.to_s
-    end
-  end
-end
-
-if RUBY_VERSION < '1.9'
-  $KCODE = 'u'
-  require 'jcode'
-
-  BibTeX::NameParser.patterns[:upper] = /[[:upper:]ÄÖÜ][^\t\r\n\s\{\}\d\\,]*/o
-end
-
 module BibTeX
   begin
+    original_verbosity, $VERBOSE = $VERBOSE, nil
+
     require 'iconv'
 
     @iconv = Iconv.new('ascii//translit//ignore', 'utf-8')
@@ -34,5 +19,7 @@ module BibTeX
     def self.transliterate(str)
       str.gsub(/[äöüÄÖÜß]/, @iconv_replacements)
     end
+  ensure
+    $VERBOSE = original_verbosity
   end
 end

data/lib/bibtex/entry.rb

@@ -109,24 +109,33 @@ module BibTeX
       self
     end
 
-    # Generate Accessors for required fields (#52)
-
+    # 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
+        get name
+      end unless method_defined? name
+
+      writer = "#{name}="
 
-      define_method("#{name}=") do |value|
+      define_method(writer) do |value|
         add name, value
-      end
+      end unless method_defined? writer
+    end
+
+    # Generate author, editor and translator accessors
+    NAME_FIELDS.each do |contributor|
+      define_method(contributor) do
+        get contributor
+      end unless method_defined? contributor
+
+      writer = "#{contributor}="
+
+      define_method(writer) do |value|
+        add contributor, value
+      end unless method_defined? writer
+
+      alias_method "#{contributor}s", contributor
+      alias_method "#{contributor}s=", writer
     end
 
     # call-seq:
@@ -336,16 +345,6 @@ module BibTeX
       add(name.to_sym, value)
     end
 
-    # Author, Editor and Translator readers
-    NAME_FIELDS.each do |contributor|
-      define_method(contributor) do
-        get(contributor)
-      end
-
-      alias_method "#{contributor}s", contributor
-    end
-
-
     # call-seq:
     #   add(:author, "Edgar A. Poe")
     #   add(:author, "Edgar A. Poe", :title, "The Raven")

data/lib/bibtex/entry/bibtexml_converter.rb

@@ -34,7 +34,7 @@ class BibTeX::Entry::BibTeXMLConverter
     end
   end
 
-  private
+  protected
 
   attr_reader :bibtex, :options
 

data/lib/bibtex/entry/citeproc_converter.rb

@@ -129,7 +129,7 @@ class BibTeX::Entry::CiteProcConverter
     end
   end
 
-  private
+  protected
 
   attr_reader :bibtex, :options
 

data/lib/bibtex/entry/rdf_converter.rb

@@ -512,10 +512,12 @@ class BibTeX::Entry::RDFConverter
     graph << [entry, RDF::DC.issued, date]
   end
 
-  private
+  protected
 
   attr_reader :bibtex, :graph
 
+  private
+
   def bibo
     @bibo ||= RDF::Vocabulary.new('http://purl.org/ontology/bibo/')
   end

data/lib/bibtex/name_parser.rb

@@ -12,24 +12,24 @@ module BibTeX
   class NameParser < Racc::Parser
 
 module_eval(<<'...end names.y/module_eval...', 'names.y', 94)
-  
+
   @patterns = {
     :and => /,?\s+and\s+/io,
-    :space => /[\t\r\n\s]+/o,
+    :space => /\s+/o,
     :comma => /,/o,
-    :lower => /[[:lower:]][^\t\r\n\s\{\}\d\\,]*/o,
-    :upper => /[[:upper:]][^\t\r\n\s\{\}\d\\,]*/uo,
+    :lower => /[[:lower:]][^\s\{\}\d\\,]*/o,
+    :upper => /[[:upper:]][^\s\{\}\d\\,]*/uo,
     :symbols => /(\d|\\.)+/o,
     :lbrace => /\{/o,
     :rbrace => /\}/o,
     :period => /./o,
     :braces => /[\{\}]/o
   }
-  
+
   class << self
     attr_reader :patterns
   end
-  
+
   def initialize(options = {})
     self.options.merge!(options)
   end
@@ -37,17 +37,17 @@ module_eval(<<'...end names.y/module_eval...', 'names.y', 94)
   def options
     @options ||= { :debug => ENV['DEBUG'] == true }
   end
-  
+
   def parse(input)
     @yydebug = options[:debug]
     scan(input)
     do_parse
   end
-  
+
   def next_token
     @stack.shift
   end
-  
+
   def on_error(tid, val, vstack)
     BibTeX.log.error("Failed to parse BibTeX Name on value %s (%s) %s" % [val.inspect, token_to_str(tid) || '?', vstack.inspect])
   end
@@ -59,7 +59,7 @@ module_eval(<<'...end names.y/module_eval...', 'names.y', 94)
     @word = [:PWORD,'']
     do_scan
   end
-  
+
   private
 
   def do_scan
@@ -68,14 +68,14 @@ module_eval(<<'...end names.y/module_eval...', 'names.y', 94)
       when @src.scan(NameParser.patterns[:and])
         push_word
         @stack.push([:AND,@src.matched])
-        
+
       when @src.scan(NameParser.patterns[:space])
         push_word
-      
+
       when @src.scan(NameParser.patterns[:comma])
         push_word
         @stack.push([:COMMA,@src.matched])
-        
+
       when @src.scan(NameParser.patterns[:lower])
         is_lowercase
         @word[1] << @src.matched
@@ -83,14 +83,14 @@ module_eval(<<'...end names.y/module_eval...', 'names.y', 94)
       when @src.scan(NameParser.patterns[:upper])
         is_uppercase
         @word[1] << @src.matched
-        
+
       when @src.scan(NameParser.patterns[:symbols])
         @word[1] << @src.matched
-        
+
       when @src.scan(NameParser.patterns[:lbrace])
         @word[1] << @src.matched
         scan_literal
-        
+
       when @src.scan(NameParser.patterns[:rbrace])
         error_unbalanced
 
@@ -98,18 +98,18 @@ module_eval(<<'...end names.y/module_eval...', 'names.y', 94)
         @word[1] << @src.matched
       end
     end
-    
+
     push_word
     @stack
   end
-  
+
   def push_word
     unless @word[1].empty?
       @stack.push(@word)
       @word = [:PWORD,'']
     end
   end
-  
+
   def is_lowercase
     @word[0] = :LWORD if @word[0] == :PWORD
   end
@@ -117,7 +117,7 @@ module_eval(<<'...end names.y/module_eval...', 'names.y', 94)
   def is_uppercase
     @word[0] = :UWORD if @word[0] == :PWORD
   end
-  
+
   def scan_literal
     @brace_level = 1
 
@@ -140,12 +140,12 @@ module_eval(<<'...end names.y/module_eval...', 'names.y', 94)
     @stack.push [:ERROR,@src.matched]
     BibTeX.log.warn("NameParser: unexpected token `#{@src.matched}' at position #{@src.pos}; brace level #{@brace_level}.")
   end
-  
+
   def error_unbalanced
     @stack.push [:ERROR,'}']
     BibTeX.log.warn("NameParser: unbalanced braces at position #{@src.pos}; brace level #{@brace_level}.")
   end
-  
+
 # -*- racc -*-
 ...end names.y/module_eval...
 ##### State transition tables begin ###
@@ -444,4 +444,4 @@ def _reduce_none(val, _values, result)
 end
 
   end   # class NameParser
-  end   # module BibTeX
+end   # module BibTeX

data/lib/bibtex/names.y

@@ -1,17 +1,17 @@
 #--
 # BibTeX-Ruby
 # Copyright (C) 2010-2011  Sylvester Keil <http://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
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #++
@@ -33,7 +33,7 @@ rule
 
   names : name           { result = [val[0]] }
         | names AND name { result << val[2] }
-  
+
   name : word
        {
          result = Name.new(:last => val[0])
@@ -69,10 +69,10 @@ rule
       | von u_words LWORD { result = val.join(' ') }
 
   last : LWORD | u_words
-  
+
   first : opt_words                 { result = [nil,val[0]] }
         | opt_words COMMA opt_words { result = [val[0],val[2]] }
-  
+
   u_words : u_word
           | u_words u_word { result = val.join(' ') }
 
@@ -82,7 +82,7 @@ rule
         | words word { result = val.join(' ') }
 
   opt_words : /* empty */ | words
-  
+
   word : LWORD | UWORD | PWORD
 
 end
@@ -91,24 +91,24 @@ end
 require 'strscan'
 
 ---- inner
-  
+
   @patterns = {
     :and => /,?\s+and\s+/io,
-    :space => /[\t\r\n\s]+/o,
+    :space => /\s+/o,
     :comma => /,/o,
-    :lower => /[[:lower:]][^\t\r\n\s\{\}\d\\,]*/o,
-    :upper => /[[:upper:]][^\t\r\n\s\{\}\d\\,]*/uo,
+    :lower => /[[:lower:]][^\s\{\}\d\\,]*/o,
+    :upper => /[[:upper:]][^\s\{\}\d\\,]*/uo,
     :symbols => /(\d|\\.)+/o,
     :lbrace => /\{/o,
     :rbrace => /\}/o,
     :period => /./o,
     :braces => /[\{\}]/o
   }
-  
+
   class << self
     attr_reader :patterns
   end
-  
+
   def initialize(options = {})
     self.options.merge!(options)
   end
@@ -116,17 +116,17 @@ require 'strscan'
   def options
     @options ||= { :debug => ENV['DEBUG'] == true }
   end
-  
+
   def parse(input)
     @yydebug = options[:debug]
     scan(input)
     do_parse
   end
-  
+
   def next_token
     @stack.shift
   end
-  
+
   def on_error(tid, val, vstack)
     BibTeX.log.error("Failed to parse BibTeX Name on value %s (%s) %s" % [val.inspect, token_to_str(tid) || '?', vstack.inspect])
   end
@@ -138,7 +138,7 @@ require 'strscan'
     @word = [:PWORD,'']
     do_scan
   end
-  
+
   private
 
   def do_scan
@@ -147,14 +147,14 @@ require 'strscan'
       when @src.scan(NameParser.patterns[:and])
         push_word
         @stack.push([:AND,@src.matched])
-        
+
       when @src.scan(NameParser.patterns[:space])
         push_word
-      
+
       when @src.scan(NameParser.patterns[:comma])
         push_word
         @stack.push([:COMMA,@src.matched])
-        
+
       when @src.scan(NameParser.patterns[:lower])
         is_lowercase
         @word[1] << @src.matched
@@ -162,14 +162,14 @@ require 'strscan'
       when @src.scan(NameParser.patterns[:upper])
         is_uppercase
         @word[1] << @src.matched
-        
+
       when @src.scan(NameParser.patterns[:symbols])
         @word[1] << @src.matched
-        
+
       when @src.scan(NameParser.patterns[:lbrace])
         @word[1] << @src.matched
         scan_literal
-        
+
       when @src.scan(NameParser.patterns[:rbrace])
         error_unbalanced
 
@@ -177,18 +177,18 @@ require 'strscan'
         @word[1] << @src.matched
       end
     end
-    
+
     push_word
     @stack
   end
-  
+
   def push_word
     unless @word[1].empty?
       @stack.push(@word)
       @word = [:PWORD,'']
     end
   end
-  
+
   def is_lowercase
     @word[0] = :LWORD if @word[0] == :PWORD
   end
@@ -196,7 +196,7 @@ require 'strscan'
   def is_uppercase
     @word[0] = :UWORD if @word[0] == :PWORD
   end
-  
+
   def scan_literal
     @brace_level = 1
 
@@ -219,10 +219,10 @@ require 'strscan'
     @stack.push [:ERROR,@src.matched]
     BibTeX.log.warn("NameParser: unexpected token `#{@src.matched}' at position #{@src.pos}; brace level #{@brace_level}.")
   end
-  
+
   def error_unbalanced
     @stack.push [:ERROR,'}']
     BibTeX.log.warn("NameParser: unbalanced braces at position #{@src.pos}; brace level #{@brace_level}.")
   end
-  
-# -*- racc -*-
+
+# -*- racc -*-

data/lib/bibtex/parser.rb

@@ -471,4 +471,4 @@ def _reduce_none(val, _values, result)
 end
 
   end   # class Parser
-  end   # module BibTeX
+end   # module BibTeX

data/lib/bibtex/value.rb

@@ -22,7 +22,7 @@ require 'forwardable'
 
 module BibTeX
 
-  #
+
   # A BibTeX Value is something very much like a string. In BibTeX files it
   # can appear on the right hand side of @string or @entry field assignments
   # or as @preamble contents. In the example below [VALUE] indicates possible
@@ -52,7 +52,11 @@ module BibTeX
     attr_reader :tokens
     alias to_a tokens
 
-    def_delegators :to_s, :=~, :===, *String.instance_methods(false).reject { |m| m =~ /^\W|^length$|^dup$|!$/ }
+    def_delegators :to_s, :=~, :===,
+      *String.instance_methods(false).reject { |m|
+        m =~ /^\W|^(length|dup|replace|to_s|inspect)$|!$/
+      }
+
     def_delegators :@tokens, :[], :length
     def_delegator :@tokens, :each, :each_token
 

data/lib/bibtex/version.rb

@@ -20,7 +20,7 @@ module BibTeX
   module Version
     MAJOR = 3
     MINOR = 1
-    PATCH = 2
+    PATCH = 3
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.').freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibtex-ruby
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.3
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2014-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: latex-decode