bibtex-ruby 4.0.8 → 4.0.9

data/lib/bibtex/replaceable.rb

@@ -1,30 +1,30 @@
 #--
 # BibTeX-Ruby
 # Copyright (C) 2010	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
 # 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/>.
 #++
 
 module BibTeX
-  
+
   #
   # The Replaceable module provides methods that expose a Value attribute
   # and the ability to join or replace the contained BibTeX symbols.
   #
   module Replaceable
     extend Forwardable
-    
+
     attr_reader :value
 
 		def value=(value)
@@ -45,8 +45,8 @@ module BibTeX
 			@value << value
 			self
 		end
-		
+
     alias :v :value
-    
+
   end
-end
+end

data/lib/bibtex/utilities.rb

@@ -1,17 +1,17 @@
 #--
 # BibTeX-Ruby
 # Copyright (C) 2011  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
 # 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/>.
 #++
@@ -19,14 +19,14 @@
 module BibTeX
 
   class << self
-    
+
     # Opens a BibTeX file or URI and returns a corresponding +Bibliography+
     # object or, if a block is given, yields the Bibliography to the block,
     # ensuring that the file is saved.
     def open(file, options = {}, &block)
       Bibliography.open(file, options, &block)
     end
-  
+
     # Parses the given string and returns a corresponding +Bibliography+ object.
     # Delegates to BibTeX.open if the string is a filename or URI.
     def parse(string, options = {}, &block)
@@ -36,21 +36,21 @@ module BibTeX
         Bibliography.parse(string, options)
       end
     end
-  
+
     # Returns true if the given file is a valid BibTeX bibliography.
     def valid?(file)
       Bibliography.open(file).valid?
     end
-    
+
     # Parses the given string as a BibTeX name value and returns a Names object.
     def names(string)
       Names.parse(string)
     end
-    
+
     alias :name :names
     alias :parse_name :names
     alias :parse_names :names
-    
+
   end
 
-end
+end

data/lib/bibtex/value.rb

@@ -2,7 +2,7 @@
 
 #--
 # BibTeX-Ruby
-# Copyright (C) 2010-2014  Sylvester Keil <sylvester.keil.or.at>
+# Copyright (C) 2010-2015  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
@@ -94,7 +94,7 @@ module BibTeX
     end
 
     def include_token?(token)
-      tokens.include?(token)
+      @tokens.include?(token)
     end
 
     def add(argument)
@@ -120,7 +120,7 @@ module BibTeX
 
     [:strip!, :upcase!, :downcase!, :sub!, :gsub!, :chop!, :chomp!, :rstrip!].each do |method_id|
       define_method(method_id) do |*arguments, &block|
-        tokens.each do |part|
+        @tokens.each do |part|
           part.send(method_id, *arguments, &block) unless part.nil?
         end
         self
@@ -193,7 +193,7 @@ module BibTeX
     def value
       case
       when numeric?
-        @tokens[0].to_i
+        to_i
       when atomic?
         @tokens[0]
       else
@@ -204,7 +204,7 @@ module BibTeX
     alias :v :value
 
     def inspect
-      "#<#{self.class} #{tokens.map(&:inspect).join(', ')}>"
+      "#<#{self.class} #{@tokens.map(&:inspect).join(', ')}>"
     end
 
     # Returns true if the Value is empty or consists of a single token.
@@ -238,7 +238,11 @@ module BibTeX
 
     # Returns true if the Value's content is numeric.
     def numeric?
-      atomic? && tokens[0] =~ /^\s*[+-]?\d+[\/\.]?\d*\s*$/
+      atomic? && @tokens[0] =~ /^\s*[+-]?\d+[\/\.]?\d*\s*$/
+    end
+
+    def to_i
+      @tokens[0].to_i
     end
 
     def to_citeproc (options = {})
@@ -247,14 +251,14 @@ module BibTeX
 
     # Returns true if the Value contains at least one symbol.
     def symbol?
-      tokens.detect { |v| v.is_a?(Symbol) }
+      @tokens.detect { |v| v.is_a?(Symbol) }
     end
 
     alias has_symbol? symbol?
 
     # Returns all symbols contained in the Value.
     def symbols
-      tokens.select { |v| v.is_a?(Symbol) }
+      @tokens.select { |v| v.is_a?(Symbol) }
     end
 
     # Returns a new Value with all string values converted according to the given filter(s).
@@ -266,7 +270,7 @@ module BibTeX
     def convert! (*filters)
       filters.flatten.each do |filter|
         f = Filters.resolve!(filter)
-        tokens.map! { |t| f.apply(t) }
+        @tokens.map! { |t| f.apply(t) }
       end
 
       self
@@ -286,7 +290,11 @@ module BibTeX
     end
 
     def <=> (other)
-      to_s <=> other.to_s
+      if numeric? && other.respond_to?(:numeric?) && other.numeric?
+        to_i <=> other.to_i
+      else
+        to_s <=> other.to_s
+      end
     end
 
   end

data/lib/bibtex/version.rb

@@ -1,6 +1,6 @@
 #--
 # BibTeX-Ruby
-# Copyright (C) 2010-2014	Sylvester Keil <sylvester.keil.or.at>
+# Copyright (C) 2010-2015	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
@@ -20,7 +20,7 @@ module BibTeX
   module Version
     MAJOR = 4
     MINOR = 0
-    PATCH = 8
+    PATCH = 9
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.').freeze

data/test/benchmark.rb

@@ -34,7 +34,7 @@ format = Benchmark.const_defined?(:FMTSTR) ? Benchmark::FMTSTR : Benchmark::FORM
 Benchmark.benchmark((" "*15) + CAPTION, 7, format, '%14s:' % 'sum(f)', '%14s:' % 'sum(g)') do |b|
 
   1.step(n,k) do |i|
-  
+
     f << b.report('%14s:' % "f(#{i})") do
       i.times do
         lexer.data = input
@@ -44,41 +44,41 @@ Benchmark.benchmark((" "*15) + CAPTION, 7, format, '%14s:' % 'sum(f)', '%14s:' %
     end
 
     data = input * i
-  
+
     g << b.report('%14s:' % "g(#{i})") do
       lexer.data = data
       lexer.analyse
 			# BibTeX::Parser.new.parse(data)
     end
-    
+
   end
-  
+
   [f.inject(:+), g.inject(:+)]
 end
 
 # require 'gnuplot'
-# 
+#
 # f = f.map(&:total)
 # g = g.map(&:total)
-# 
+#
 # x = 1.step(n,k).to_a
-# 
+#
 # Gnuplot.open do |gp|
 #   Gnuplot::Plot.new(gp) do |plot|
-# 
+#
 #     plot.title  'BibTeX-Ruby Benchmark'
 #     plot.ylabel 't'
 #     plot.xlabel 'n'
-# 
+#
 #     plot.data << Gnuplot::DataSet.new([x,f]) do |ds|
 #       ds.with = 'linespoints'
 #       ds.title = 'f'
 #     end
-# 
+#
 #     plot.data << Gnuplot::DataSet.new([x,g]) do |ds|
 #       ds.with = 'linespoints'
 #       ds.title = 'g'
 #     end
-# 
+#
 #   end
-# end
+# end

data/test/bibtex/test_bibliography.rb

@@ -331,7 +331,7 @@ module BibTeX
 
       describe 'sorting' do
 
-        before do 
+        before do
           @small_bib = BibTeX.parse <<-END
         @book{flanagan2008,
           title={{The ruby programming language}},

data/test/bibtex/test_elements.rb

@@ -1,49 +1,49 @@
 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({ :bibtex_type => :book })[0].type.must_be :==, :book
       end
-      
+
       it 'accepts an array of hashes' do
         Element.parse([{ :bibtex_type => :book }, { :bibtex_type => :misc }])[1].type.must_be :==, :misc
       end
-      
+
     end
-    
+
   end
 
   class PreambleTest < Minitest::Spec
-    
+
     describe 'a new preamble instance' do
       before do
         @preamble = Preamble.new
       end
-      
+
       it 'should not be nil' do
         assert @preamble
       end
     end
-    
+
     describe 'given a set of @preambles' do
       before do
         @bib = BibTeX.open(Test.fixtures(:preamble))
         @preambles = @bib.preambles
       end
-      
+
       it 'should support round-trips of all parsed preambles' do
         assert_equal %q[@preamble{ "This bibliography was created \today" }], @preambles[0].to_s
         assert_equal %q[@preamble{ "Bib\TeX" }], @preambles[1].to_s
@@ -60,5 +60,5 @@ module BibTeX
     end
 
   end
-  
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibtex-ruby
 version: !ruby/object:Gem::Version
-  version: 4.0.8
+  version: 4.0.9
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-12 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: latex-decode