bibtex-ruby 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ebc35f0ed6cd31025b806b1dd863c89b345c88e
-  data.tar.gz: 9d238e137990f200ea53b92e19ddf96dd147a5df
+  metadata.gz: c042ba0b1e7763904a6e41fa5c0d3de2df2c1963
+  data.tar.gz: 8bbe22f8178cd6e3072093d2b3bb83fc03145061
 SHA512:
-  metadata.gz: f5ea802c71afacd7749595702d997e0da04d03dad30e70366765d384fa14a81f8dc7191e8de159fde6f51b755e880068a43cae403b1d43b8b715bc6baf94dd60
-  data.tar.gz: 0baa93fb426d8c8ceeca8f902fb6db70203ebff5bd37be53023b5e3b7abf4fa2f6f928445faaf265ba11d53e9707b63615b4c1af9aa26c27822d2db316220b3d
+  metadata.gz: 296d227e81b7e250bf4bad9385d4a6e6cdc1183385ec4074faac0328824f9718446990b95f7adba20272c930b7ace932a61dddcb5bb68349900c2d0a4a4d3ad6
+  data.tar.gz: f15dfaff08f2883c5b304b164e01f0cb39f7ef8e0c267ecfad3d43260e1e6a295adb21c0df1592915534fcccc27e4d3fd956dd8ada0817e55ca007b42f33cfbd

data/Gemfile

@@ -19,6 +19,9 @@ group :test do
   gem 'minitest-ansi'
   gem 'cucumber', '~>1.3'
   gem 'unicode', '~>0.4', :platforms => [:rbx, :mswin, :mingw, :mri_19, :mri_20, :mri_21]
+	gem 'simplecov', '~>0.8', :require => false, :platforms => [:ruby_21, :ruby_20]
+  gem 'rubinius-coverage', :require => false, :platforms => :rbx
+  gem 'coveralls', '~>0.7', :require => false
 end
 
 group :extra do
@@ -34,8 +37,6 @@ end
 group :profile do
 	gem 'ruby-prof', '~>0.14', :platforms => [:mri_19, :mri_20, :mri_21]
 	gem 'gnuplot', '~>2.4', :platforms => [:mri_19, :mri_20, :mri_21]
-	gem 'simplecov', '~>0.8', :require => false, :platforms => [:ruby_21, :ruby_20]
-  gem 'rubinius-coverage', :require => false, :platforms => :rbx
 end
 
 group :development do

data/History.txt

@@ -1,3 +1,8 @@
+3.1.2 / 2014-01-29
+==================
+
+* Improve CiteProc export (thanks @andriusvelykis)
+
 3.1.1 / 2014-01-20
 ==================
 

data/README.md

@@ -1,6 +1,7 @@
 BibTeX-Ruby
 ===========
 [![Build Status](https://secure.travis-ci.org/inukshuk/bibtex-ruby.png?branch=master)](http://travis-ci.org/inukshuk/bibtex-ruby)
+[![Coverage Status](https://coveralls.io/repos/inukshuk/bibtex-ruby/badge.png)](https://coveralls.io/r/inukshuk/bibtex-ruby)
 
 BibTeX-Ruby is the Rubyist's swiss-army-knife for all things BibTeX. It
 includes a parser for all common BibTeX objects (@string, @preamble, @comment

data/Rakefile

@@ -38,6 +38,9 @@ rescue LoadError
   end
 end
 
+require 'coveralls/rake/task'
+Coveralls::RakeTask.new
+task :test_with_coveralls => [:test, :features, 'coveralls:push']
 
 task :default => [:test, :features]
 
@@ -82,6 +85,8 @@ end
 
 
 desc 'Updates the Manifest file'
+  require 'coveralls' if ENV['CI']
+  require 'coveralls' if ENV['CI']
 task :manifest => ['clean', 'racc'] do
   m = File.open('Manifest', 'w')
   m.print FileList['**/*'].reject{ |f|

data/bibtex-ruby.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
     export/conversion to formats such as YAML, JSON, CSL, and XML (BibTeXML).
 	END_DESCRIPTION
 
-  s.add_runtime_dependency('latex-decode', ['>=0.0.6'])
+  s.add_runtime_dependency('latex-decode', ['~>0.0'])
 
   s.files        = File.open('Manifest').readlines.map(&:chomp)
   s.test_files   = Dir.glob('test/**/test*.rb')

data/features/support/env.rb

@@ -1,5 +1,6 @@
 begin
   require 'simplecov'
+  require 'coveralls' if ENV['CI']
 rescue LoadError
   # ignore
 end

data/lib/bibtex/entry/citeproc_converter.rb

@@ -1,17 +1,21 @@
 class BibTeX::Entry::CiteProcConverter
   CSL_FILTER = Hash.new { |h, k| k }.merge(Hash[*%w{
-    date      issued
-    isbn      ISBN
-    booktitle container-title
-    journal   container-title
-    series    collection-title
-    address   publisher-place
-    pages     page
-    number    issue
-    url       URL
-    doi       DOI
-    year      issued
-    type      genre
+    date         issued
+    isbn         ISBN
+    booktitle    container-title
+    journal      container-title
+    series       collection-title
+    address      publisher-place
+    pages        page
+    number       issue
+    url          URL
+    doi          DOI
+    year         issued
+    type         genre
+    school       publisher
+    institution  publisher
+    organization publisher
+    howpublished publisher
   }.map(&:intern)]).freeze
 
   CSL_FIELDS = %w{
@@ -35,9 +39,8 @@ class BibTeX::Entry::CiteProcConverter
     inproceedings  paper-conference
     manual         book
     mastersthesis  thesis
-    misc           article
     phdthesis      thesis
-    proceedings    paper-conference
+    proceedings    book
     techreport     report
     unpublished    manuscript
     article        article-journal
@@ -57,7 +60,15 @@ class BibTeX::Entry::CiteProcConverter
     bibtex.parse_month
 
     bibtex.each_pair do |key, value|
-      hash[CSL_FILTER[key].to_s] = value.to_citeproc(options) unless BibTeX::Entry::DATE_FIELDS.include?(key)
+      unless BibTeX::Entry::DATE_FIELDS.include?(key)
+        cp_key = CSL_FILTER[key].to_s
+
+        if hash.key?(cp_key)
+          hash[key] = value.to_citeproc(options)
+        else
+          hash[cp_key] = value.to_citeproc(options)
+        end
+      end
     end
 
     methods = self.class.instance_methods(false) - [:convert!]
@@ -66,6 +77,24 @@ class BibTeX::Entry::CiteProcConverter
     hash
   end
 
+  def conferences
+    return unless [:conference, :proceedings, :inproceedings].include?(bibtex.type)
+
+    if bibtex.field?(:organization) && bibtex.field?(:publisher)
+      hash['authority'] = bibtex[:organization]
+      hash['publisher'] = bibtex[:publisher]
+    end
+
+    if bibtex.field? :address
+      hash['event-place'] = bibtex[:address]
+    end
+  end
+
+  def techreport
+    return unless bibtex.type == :techreport
+    hash['number'] = bibtex[:number].to_s if bibtex.field? :number
+  end
+
   def date
     return unless bibtex.field?(:year)
 

data/lib/bibtex/version.rb

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

data/test/bibtex/test_entry.rb

@@ -259,27 +259,75 @@ module BibTeX
         assert_equal 'Moby Dick', e[:foo]
       end
 
-      it 'supports citeproc export' do
-        e = @entry.to_citeproc
-        assert_equal 'book', e['type']
-        assert_equal 'New York', e['publisher-place']
-        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']
-      end
+      describe 'citeproc export' do
+        it 'supports citeproc export' do
+          e = @entry.to_citeproc
+          assert_equal 'book', e['type']
+          assert_equal 'New York', e['publisher-place']
+          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']
+        end
+
+        it 'sets both issue and number in techreports' do
+          report = Entry.new { |r|
+            r.type = :techreport
+            r.number = 1
+          }.to_citeproc
+
+          assert_equal '1', report['number']
+          assert_equal '1', report['issue']
+        end
+
+        it 'uses authority and publisher for proceedings' do
+          proceedings = Entry.new { |p|
+            p.type = :inproceedings
+            p.publisher = 'Publisher'
+            p.organization = 'Organization'
+          }.to_citeproc
+
+          assert_equal 'Publisher', proceedings['publisher']
+          assert_equal 'Organization', proceedings['authority']
+
+          proceedings = Entry.new { |p|
+            p.type = :inproceedings
+            p.organization = 'Organization'
+          }.to_citeproc
+
+          assert_equal 'Organization', proceedings['publisher']
+          refute proceedings.key?('authority')
 
-      it 'support literal dates in citeproc export' do
-        @entry.year = 'Test'
-        e = @entry.to_citeproc
-        assert_equal({ 'literal' => 'Test' }, e['issued'])
+          proceedings = Entry.new { |p|
+            p.type = :inproceedings
+            p.publisher = 'Publisher'
+          }.to_citeproc
+
+          assert_equal 'Publisher', proceedings['publisher']
+          refute proceedings.key?('authority')
+        end
+
+        it 'uses event_place for conferences' do
+          conference = Entry.new { |p|
+            p.type = :conference
+            p.address = 'Place'
+          }.to_citeproc
+
+          assert_equal 'Place', conference['event-place']
+        end
+
+        it 'support literal dates in citeproc export' do
+          @entry.year = 'Test'
+          e = @entry.to_citeproc
+          assert_equal({ 'literal' => 'Test' }, e['issued'])
+        end
       end
 
       describe 'given a filter object or a filter name' do
         before do
           @filter = Object.new
           def @filter.apply (value); value.is_a?(::String) ? value.upcase : value; end
-          
+
           class SuffixB < BibTeX::Filter
             def apply(value)
               value.is_a?(::String) ? "#{value}b" : value

data/test/helper.rb

@@ -1,5 +1,6 @@
 begin
   require 'simplecov'
+  require 'coveralls' if ENV['CI']
 rescue LoadError
   # ignore
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: bibtex-ruby
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-20 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: latex-decode
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: '0.0'
 description: |
   BibTeX-Ruby is the Rubyist's swiss-army-knife for all things BibTeX. It
   includes a parser for all common BibTeX objects (@string, @preamble,