bibtex-ruby 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8579fc07e8437d733ae2593adedd2e9b9a53cdc6
-  data.tar.gz: 8bc0cb71db6ce4b2e80fe1385251e8f261cc6b8b
+  metadata.gz: 4ebc35f0ed6cd31025b806b1dd863c89b345c88e
+  data.tar.gz: 9d238e137990f200ea53b92e19ddf96dd147a5df
 SHA512:
-  metadata.gz: 5fc0d42f2a46852bb5d3c9f837ae9870a6c0a12511da63157d9f6955fd86dc95ebf1ab67b6c8df355754d2c54f97b75934e1135573865b0066871f14d23a2354
-  data.tar.gz: 08560e71aae34c126709a9ea6ba7cb016702c246201948af8952ad81ea8e56370532d932fbc836d20a6950d1da7b0841b540f3835e1a5d11efd494552c56adbe
+  metadata.gz: f5ea802c71afacd7749595702d997e0da04d03dad30e70366765d384fa14a81f8dc7191e8de159fde6f51b755e880068a43cae403b1d43b8b715bc6baf94dd60
+  data.tar.gz: 0baa93fb426d8c8ceeca8f902fb6db70203ebff5bd37be53023b5e3b7abf4fa2f6f928445faaf265ba11d53e9707b63615b4c1af9aa26c27822d2db316220b3d

data/History.txt

@@ -1,3 +1,8 @@
+3.1.1 / 2014-01-20
+==================
+
+* RDF Export improvements (@tmaier)
+
 3.1.0 / 2014-01-20
 ==================
 

data/Rakefile

@@ -63,7 +63,7 @@ task :console, [:script] do |t,args|
 
   require 'irb'
   require 'bibtex'
-  
+
   IRB.conf[:SCRIPT] = args.script
   IRB.start
 end

data/lib/bibtex/entry/rdf_converter.rb

@@ -2,10 +2,10 @@ require 'uri/common'
 
 class BibTeX::Entry::RDFConverter
   DEFAULT_REMOVE_FROM_FALLBACK = %w(
-    date-modified
     bdsk-file-1
     bdsk-file-2
     bdsk-file-3
+    bdsk-file-4
   ).map(&:intern).freeze
 
   BIBO_TYPES = Hash[*%w{
@@ -66,6 +66,17 @@ class BibTeX::Entry::RDFConverter
     graph << [entry, bibo[:abstract], bibtex[:abstract].to_s]
   end
 
+  def annote
+    return unless bibtex.field?(:annote)
+    remove_from_fallback(:annote)
+
+    pub = RDF::Node.new
+    graph << [pub, RDF.type, bibo[:Note]]
+    graph << [pub, bibo[:content], bibtex[:annote]]
+
+    graph << [entry, bibo[:annotates], pub]
+  end
+
   def author
     return unless bibtex.field?(:author)
     remove_from_fallback(:author)
@@ -83,6 +94,17 @@ class BibTeX::Entry::RDFConverter
     end
   end
 
+  def bdsk_url
+    count = 1
+    while bibtex.field?("bdsk-url-#{count}".to_sym) do
+      field = "bdsk-url-#{count}".to_sym
+      remove_from_fallback(field)
+      graph << [entry, RDF::DC.URI, bibtex[field].to_s]
+      graph << [entry, bibo[:uri], bibtex[field].to_s]
+      count  += 1
+    end
+  end
+
   def booktitle
     return unless bibtex.field?(:booktitle)
     remove_from_fallback(:booktitle)
@@ -132,6 +154,13 @@ class BibTeX::Entry::RDFConverter
     graph << [entry, RDF::DC.created, bibtex[:'date-added'].to_s]
   end
 
+  def date_modified
+    return unless bibtex.field?(:'date-modified')
+    remove_from_fallback(:'date-modified')
+
+    graph << [entry, RDF::DC.modified, bibtex[:'date-modified'].to_s]
+  end
+
   def doi
     return unless bibtex.field?(:doi)
     remove_from_fallback(:doi)
@@ -244,7 +273,7 @@ class BibTeX::Entry::RDFConverter
     return unless bibtex.field?(:keywords)
     remove_from_fallback(:keywords)
 
-    bibtex[:keywords].to_s.split(/\s*,\s*/).each do |keyword|
+    bibtex[:keywords].to_s.split(/\s*[,;]\s*/).each do |keyword|
       graph << [entry, RDF::DC.subject, keyword]
     end
   end
@@ -338,7 +367,7 @@ class BibTeX::Entry::RDFConverter
   end
 
   def publisher
-    return unless bibtex.field?(:publisher) || bibtex.field?(:organization) || bibtex.field?(:school)
+    return unless bibtex.field?(:publisher, :organization, :school, :institution)
     remove_from_fallback(:publisher, :address)
 
     org =
@@ -349,6 +378,8 @@ class BibTeX::Entry::RDFConverter
         agent(bibtex[:organization].to_s) { create_agent(bibtex[:organization].to_s, :Organization) }
       when bibtex.field?(:school)
         agent(bibtex[:school].to_s) { create_agent(bibtex[:school].to_s, :Organization) }
+      when bibtex.field?(:institution)
+        agent(bibtex[:institution].to_s) { create_agent(bibtex[:institution].to_s, :Organization) }
       end
 
     if bibtex.field?(:address)
@@ -398,20 +429,26 @@ class BibTeX::Entry::RDFConverter
       case bibtex[:type]
       when 'mathesis' then bibo['degrees/ma']
       when 'phdthesis' then bibo['degrees/phd']
+      when /Dissertation/i then bibo['degrees/phd']
       when /Bachelor['s]{0,2} Thesis/i then "Bachelor's Thesis"
       when /Diplomarbeit/i then bibo['degrees/ms']
       when /Magisterarbeit/i then bibo['degrees/ma']
       else degree
       end
 
-    graph << [entry, bibo[:degree], degree] unless degree.nil?
+    unless degree.nil?
+      remove_from_fallback(:type)
+      graph << [entry, bibo[:degree], degree]
+    end
   end
 
   def title
     return unless bibtex.field?(:title)
     remove_from_fallback(:title)
 
-    title = [bibtex[:title].to_s, bibtex[:subtitle].to_s].join(': ')
+    title = [bibtex[:title].to_s, bibtex[:subtitle].to_s]
+      .reject { |t| t.nil? || t.empty? }
+      .join(': ')
     graph << [entry, RDF::DC.title, title]
     graph << [entry, bibo[:shortTitle], bibtex[:title].to_s] if bibtex.field?(:subtitle)
   end
@@ -429,7 +466,7 @@ class BibTeX::Entry::RDFConverter
   end
 
   def type
-    graph << [entry, RDF.type, bibo_class]
+    graph << [entry, RDF.type, bibo[bibo_class]]
 
     case bibtex.type
     when :proceedings, :journal
@@ -470,7 +507,7 @@ class BibTeX::Entry::RDFConverter
       month = BibTeX::Entry::MONTHS.find_index(bibtex[:month].to_s.intern)
       month += 1 unless month.nil?
     end
-    date = [year, month].join('-')
+    date = month.nil? ? year : [year, month].join('-')
 
     graph << [entry, RDF::DC.issued, date]
   end

data/lib/bibtex/version.rb

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

data/test/bibtex/entry/test_rdf_converter.rb

@@ -20,6 +20,14 @@ module BibTeX
       end
     end
 
+    describe '#annote' do
+      let(:entry) { Entry.new(annote: 'foo') }
+
+      it 'should run successfully' do
+        subject.annote
+      end
+    end
+
     describe '#author' do
       let(:entry) { Entry.new(author: 'Gustav Gans and Donald Duck') }
 
@@ -28,6 +36,14 @@ module BibTeX
       end
     end
 
+    describe '#bdsk_url' do
+      let(:entry) { Entry.new(:'bdsk-url-1' => 'http://www.example.com') }
+
+      it 'should run successfully' do
+        subject.bdsk_url
+      end
+    end
+
     describe '#booktitle' do
       let(:entry) { Entry.new(booktitle: 'Entenhausen brennt!') }
 
@@ -64,6 +80,14 @@ module BibTeX
       end
     end
 
+    describe '#date_modified' do
+      let(:entry) { Entry.new(:'date-modified' => '2014-01-20') }
+
+      it 'should run successfully' do
+        subject.date_modified
+      end
+    end
+
     describe '#doi' do
       let(:entry) { Entry.new(doi: '10.1000/182') }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bibtex-ruby
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Sylvester Keil