bibtex-ruby 2.3.3 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 931aa894b951ef65ed67c281d1e27cb72edc4c88
-  data.tar.gz: 252445f34c09dcced26ab3ea44bd58468f5eb92a
+  metadata.gz: 5b09dca8a81cca150971cdfabcc448c4ffdd2ee7
+  data.tar.gz: 68f2f2564edf0a61eb80944f25f684a7d9fab0e8
 SHA512:
-  metadata.gz: 43b2c3ef955acf21dc10bc70e885adc32f185f5b864620ae3db71203b8c5daee21e19c3b1105e55e4a57297bfc148548dc6b662d126ecea741a9fd09a240a520
-  data.tar.gz: c82a84bee43eb3172a2f8090fffdd39c3d388b1afee759ad9bb943256546c8ccf01bce21818d218906c5813eb3ef4cb2c30ad760eee944b316dca87b55c91d34
+  metadata.gz: 589c95707591059f965b4bfe7167211a707da6b5f125d349b9b2457657f4f3ac16d70b6039b7022a8d32161d2cc33f6a0409cd2c7ea3c7013041b5c7a890caef
+  data.tar.gz: 1406695031be8949fd6495328d99586e5b4e8d781f2d9fe6a93d3b8cf186d9f36ee0a64bfd00eaf789f7acb668070b82a07d32c12d24827e34ddd23d2cd44e05

data/History.txt

@@ -1,3 +1,8 @@
+2.3.4 / 2013-08-22
+==================
+
+* Fixed file-permissions in gem (thanks to @jwvdm)
+
 2.3.3 / 2013-07-29
 ==================
 

data/Manifest

@@ -1,5 +1,4 @@
 Gemfile
-Gemfile.lock
 Guardfile
 History.txt
 LICENSE

data/Rakefile

@@ -85,7 +85,7 @@ desc 'Updates the Manifest file'
 task :manifest => ['clean', 'racc'] do
   m = File.open('Manifest', 'w')
   m.print FileList['**/*'].reject{ |f|
-    f.start_with?('coverage') || f.end_with?('rbc')
+    f.start_with?('coverage') || f =~ /(rbc|swp|~|lock)$/
   }.join("\n")
   m.close
 end

data/lib/bibtex/bibliography.rb

@@ -1,6 +1,6 @@
 #--
 # BibTeX-Ruby
-# Copyright (C) 2010-2012  Sylvester Keil <sylvester.keil.or.at>
+# Copyright (C) 2010-2013  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
@@ -107,7 +107,12 @@ module BibTeX
       @errors = other.errors.dup
       @data, @strings = [], {}
       @entries = Hash.new { |h,k| h.fetch(k.to_s, nil) }
-      add(other.data)
+
+      other.each do |element|
+        add element.dup
+      end
+
+      self
     end
 
     # Adds a new element, or a list of new elements to the bibliography.
@@ -511,13 +516,17 @@ module BibTeX
 
     def select_duplicates_by(*arguments)
       arguments = [:year, :title] if arguments.empty?
+      block = Proc.new if block_given?
 
-      group_by(*arguments) { |digest|
+      group_by(*arguments) { |digest, entry|
 
         # 1.8 compatibility
-        digest = digest[0] if digest.is_a?(Array)
+        # digest = digest[0] if digest.is_a?(Array)
 
         digest.gsub(/\s+/, '').downcase
+        digest = block.call(disgest, entry) unless block.nil?
+        digest
+
       }.values.select { |d| d.length > 1 }
     end
 
@@ -527,6 +536,43 @@ module BibTeX
       !select_duplicates_by.empty?
     end
 
+    # call-seq:
+    #   bib.uniq!                                 -> bib
+    #   bib.uniq!(:title, :year)                  -> bib
+    #   bib.uniq! { |digest, entry| ... }         -> bib
+    #   bib.uniq!(:title) { |digest, entry| ... } -> bib
+    #
+    # Removes duplicate entries from the Bibliography.
+    #
+    # All arguments given will be used to calculate a digest
+    # for each entry. If a block is given, it will be be passed
+    # the computed digest as well as each entry; the block
+    # must then yield the final digest that will be used to
+    # compute duplicates.
+    #
+    # This method will always retain the first entry and will
+    # discard subsequent duplicates on the basis of each entry's
+    # digest.
+    #
+    # @see Entry#digest
+    # @see @duplicates_by
+    #
+    def uniq!(*arguments, &block)
+      select_duplicates_by(*arguments, &block).each do |dupes|
+        dupes.shift
+        dupes.each do |dupe|
+          self.remove dupe
+        end
+      end
+
+      self
+    end
+
+    # Experimental!
+    # Returns a new Bibliography with all duplicates removed.
+    def uniq(*arguments, &block)
+      dup.uniq!
+    end
 
     private
 

data/lib/bibtex/elements.rb

@@ -1,6 +1,6 @@
 #--
 # BibTeX-Ruby
-# Copyright (C) 2010-2012 Sylvester Keil <sylvester.keil.or.at>
+# Copyright (C) 2010-2013 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

data/lib/bibtex/entry.rb

@@ -1,6 +1,6 @@
 #--
 # BibTeX-Ruby
-# Copyright (C) 2010-2012 Sylvester Keil <sylvester.keil.or.at>
+# Copyright (C) 2010-2013 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

data/lib/bibtex/lexer.rb

@@ -1,6 +1,6 @@
 #--
 # BibTeX-Ruby
-# Copyright (C) 2010-2012 Sylvester Keil <http://sylvester.keil.or.at>
+# Copyright (C) 2010-2013 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

data/lib/bibtex/value.rb

@@ -2,7 +2,7 @@
 
 #--
 # BibTeX-Ruby
-# Copyright (C) 2010-2012  Sylvester Keil <sylvester.keil.or.at>
+# Copyright (C) 2010-2013  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

data/lib/bibtex/version.rb

@@ -1,6 +1,6 @@
 #--
 # BibTeX-Ruby
-# Copyright (C) 2010-2012	Sylvester Keil <sylvester.keil.or.at>
+# Copyright (C) 2010-2013	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 = 2
     MINOR = 3
-    PATCH = 3
+    PATCH = 4
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.').freeze

data/test/bibtex/test_bibliography.rb

@@ -279,6 +279,37 @@ module BibTeX
 
       end
 
+      describe '#uniq!' do
+        before do
+          @a = BibTeX.parse <<-END
+            @book{b1,
+              title = {FOO},
+              year = {2013},
+              author = {Doe, John}}
+            @book{b2,
+              title = {BAR},
+              year = {2013},
+              author = {Doe, John}}
+          END
+          @b = BibTeX.parse <<-END
+            @book{b3,
+              title = {FOO},
+              year = {2013},
+              author = {Doe, Jane}}
+          END
+        end
+
+        it 'returns the bibliography unchanged if there are no duplicates' do
+          assert @a.length == @a.uniq!.length
+          assert @b.length == @b.uniq!.length
+        end
+
+        it 'removes duplicate entries and returns the bibliography' do
+          assert @a.length > @a.uniq!(:author).length
+        end
+
+      end
+
       describe 'given a filter' do
         before do
           @filter = Object

data/test/bibtex/test_parser.rb

@@ -150,6 +150,18 @@ module BibTeX
 
     end
     
+    describe 'year values' do
+      it 'parses non-numeric year literals' do
+        assert_equal 'to appear',
+          Parser.new.parse("@article{x,  year = {to appear}}")['x'].year.to_s
+      end
+
+      it 'parses numeric year literals' do
+        assert_equal 1993,
+          Parser.new.parse("@article{x,  year = { 1993 }}")['x'].year.to_i
+      end
+    end
+
     describe 'given an entry with missing commas between fields' do
       before do
         @level = BibTeX.log.level

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibtex-ruby
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.3.4
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-29 00:00:00.000000000 Z
+date: 2013-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: latex-decode
@@ -54,7 +54,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - History.txt
 - LICENSE
@@ -158,17 +157,17 @@ signing_key:
 specification_version: 4
 summary: A BibTeX parser, converter and API for Ruby.
 test_files:
-- test/bibtex/test_value.rb
+- test/bibtex/test_bibliography.rb
+- test/bibtex/test_elements.rb
+- test/bibtex/test_entry.rb
+- test/bibtex/test_filters.rb
 - test/bibtex/test_lexer.rb
+- test/bibtex/test_name_parser.rb
 - test/bibtex/test_names.rb
 - test/bibtex/test_parser.rb
-- test/bibtex/test_bibliography.rb
-- test/bibtex/test_filters.rb
-- test/bibtex/test_utilities.rb
 - test/bibtex/test_string.rb
-- test/bibtex/test_entry.rb
-- test/bibtex/test_name_parser.rb
-- test/bibtex/test_elements.rb
+- test/bibtex/test_utilities.rb
+- test/bibtex/test_value.rb
 - test/test_bibtex.rb
 - test/test_export.rb
 has_rdoc: yard

data/Gemfile.lock

@@ -1,110 +0,0 @@
-PATH
-  remote: .
-  specs:
-    bibtex-ruby (2.3.3)
-      latex-decode (>= 0.0.6)
-      multi_json (~> 1.3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.3.5)
-    builder (3.2.2)
-    coderay (1.0.9)
-    columnize (0.3.6)
-    cucumber (1.3.5)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12.0)
-      multi_json (~> 1.7.5)
-      multi_test (>= 0.0.2)
-    debugger (1.6.1)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.2.3)
-    debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.2.3)
-    diff-lcs (1.2.4)
-    ffi (1.9.0)
-    formatador (0.2.4)
-    gherkin (2.12.0)
-      multi_json (~> 1.3)
-    gnuplot (2.6.2)
-    guard (1.8.1)
-      formatador (>= 0.2.4)
-      listen (>= 1.0.0)
-      lumberjack (>= 1.0.2)
-      pry (>= 0.9.10)
-      thor (>= 0.14.6)
-    guard-cucumber (1.4.0)
-      cucumber (>= 1.2.0)
-      guard (>= 1.1.0)
-    guard-minitest (1.0.1)
-      guard (>= 1.8)
-      minitest (>= 2.1)
-    latex-decode (0.1.1)
-      unicode (~> 0.4)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    listen (1.2.2)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
-    lumberjack (1.0.4)
-    method_source (0.8.2)
-    minitest (4.7.5)
-    minitest-colorize (0.0.5)
-      minitest (>= 2.0)
-    multi_json (1.7.7)
-    multi_test (0.0.2)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    racc (1.4.9)
-    rake (10.1.0)
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.0)
-      ffi (>= 0.5.0)
-    rb-kqueue (0.2.0)
-      ffi (>= 0.5.0)
-    rbx-require-relative (0.0.9)
-    rdf (0.3.11.1)
-      addressable (>= 2.2.6)
-    redcarpet (3.0.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    ruby-prof (0.13.0)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    slop (3.4.6)
-    thor (0.18.1)
-    unicode (0.4.4)
-    yard (0.8.7)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bibtex-ruby!
-  cucumber (~> 1.0)
-  debugger
-  gnuplot (~> 2.4)
-  guard-cucumber
-  guard-minitest
-  minitest (~> 4.0)
-  minitest-colorize
-  racc
-  rake
-  rdf (~> 0.3)
-  redcarpet
-  ruby-debug
-  ruby-prof (~> 0.10)
-  simplecov
-  unicode
-  yard